o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

winwatch: Plan 9-ify.

Browse source 
This is new code, and custom to plan9port.  Make it
conform more closely to plan9 style.

Signed-off-by: Dan Cross <cross@gajendra.net>
This commit is contained in:
Dan Cross 2020-01-15 14:47:39 +00:00 • committed by Dan Cross
parent 0ac4bfee32
commit 6510a2d353
1 changed files with 367 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

180
src/cmd/rio/winwatch.c
View file

@ -1,13 +1,15 @@
/* slightly modified from /*
https://github.com/fhs/misc/blob/master/cmd/winwatch/winwatch.c * slightly modified from
so as to deal with memory leaks and certain X errors */ * https://github.com/fhs/misc/blob/master/cmd/winwatch/winwatch.c
* so as to deal with memory leaks and certain X errors
*/
#include <u.h> #include <u.h>
#include <libc.h> #include <libc.h>
#include <draw.h> #include <draw.h>
#include <event.h> #include <event.h>
#include <regexp.h> #include <regexp.h>
#include <stdio.h> #include <fmt.h>
#include "../devdraw/x11-inc.h" #include "../devdraw/x11-inc.h"
AUTOLIB(X11); AUTOLIB(X11);
@ -49,19 +51,20 @@ winwatchxerrorhandler(XDisplay *disp, XErrorEvent *xe)
char buf[100]; char buf[100];
XGetErrorText(disp, xe->error_code, buf, 100); XGetErrorText(disp, xe->error_code, buf, 100);
fprintf(stderr, "winwatch: X error %s, request code %d\n", buf, fprint(2, "winwatch: X error %s, request code %d\n",
xe->request_code); buf, xe->request_code);
XFlush(disp); XFlush(disp);
XSync(disp, False); XSync(disp, False);
XSetErrorHandler(oldxerrorhandler); XSetErrorHandler(oldxerrorhandler);
longjmp(savebuf, 1); longjmp(savebuf, 1);
return(0); /* Not reached */
} }
void* void*
erealloc(void *v, ulong n) erealloc(void *v, ulong n)
{ {
v = realloc(v, n); v = realloc(v, n);
if (v == nil) if(v==nil)
sysfatal("out of memory reallocating"); sysfatal("out of memory reallocating");
return v; return v;
} }
@ -70,9 +73,9 @@ char*
estrdup(char *s) estrdup(char *s)
{ {
s = strdup(s); s = strdup(s);
if (s == nil) if(s==nil)
sysfatal("out of memory allocating"); sysfatal("out of memory allocating");
return s; return(s);
} }
char* char*
@ -86,21 +89,18 @@ getproperty(XWindow w, Atom a)
n = 100; n = 100;
p = nil; p = nil;
oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler); oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler);
s = XGetWindowProperty(dpy, w, a, 0, 100L, 0, s = XGetWindowProperty(dpy, w, a, 0, 100L, 0,
AnyPropertyType, &type, &fmt, &n, &dummy, &p); AnyPropertyType, &type, &fmt, &n, &dummy, &p);
XFlush(dpy); XFlush(dpy);
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(oldxerrorhandler); XSetErrorHandler(oldxerrorhandler);
if(s!=0){
XFree(p);
if (s == 0) return(nil);
return (char *) p;
else {
free(p);
return nil;
} }
return((char*)p);
} }
XWindow XWindow
@ -114,16 +114,16 @@ findname(XWindow w)
Atom net_wm_name; Atom net_wm_name;
p = getproperty(w, XA_WM_NAME); p = getproperty(w, XA_WM_NAME);
if (p) { if(p){
free(p); free(p);
return w; return(w);
} }
net_wm_name = XInternAtom (dpy, "_NET_WM_NAME", FALSE); net_wm_name = XInternAtom(dpy, "_NET_WM_NAME", FALSE);
p = getproperty(w, net_wm_name); p = getproperty(w, net_wm_name);
if (p) { if(p){
free(p); free(p);
return w; return(w);
} }
oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler); oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler);
@ -131,8 +131,7 @@ findname(XWindow w)
XFlush(dpy); XFlush(dpy);
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(oldxerrorhandler); XSetErrorHandler(oldxerrorhandler);
if(s == 0) {
if (s == 0) {
if (xwin != NULL) if (xwin != NULL)
XFree(xwin); XFree(xwin);
return 0; return 0;
@ -145,7 +144,6 @@ findname(XWindow w)
return w; return w;
} }
} }
XFree(xwin); XFree(xwin);
return 0; return 0;
@ -208,19 +206,18 @@ refreshwin(void)
XFlush(dpy); XFlush(dpy);
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(oldxerrorhandler); XSetErrorHandler(oldxerrorhandler);
if(s==0){
if (s == 0) { if(xwin!=NULL)
if (xwin != NULL)
XFree(xwin); XFree(xwin);
return; return;
} }
qsort(xwin, nxwin, sizeof(xwin[0]), wcmp); qsort(xwin, nxwin, sizeof(xwin[0]), wcmp);
nw = 0; nw = 0;
for (i = 0; i < nxwin; i++) { for(i=0; i<nxwin; i++){
memset(&attr, 0, sizeof attr); memset(&attr, 0, sizeof attr);
xwin[i] = findname(xwin[i]); xwin[i] = findname(xwin[i]);
if (xwin[i] == 0) if(xwin[i]==0)
continue; continue;
oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler); oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler);
@ -228,11 +225,11 @@ refreshwin(void)
XFlush(dpy); XFlush(dpy);
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(oldxerrorhandler); XSetErrorHandler(oldxerrorhandler);
if(s==0)
if (s == 0)
continue; continue;
if (attr.width <= 0 || attr.override_redirect if (attr.width <= 0 ||
|| attr.map_state != IsViewable) attr.override_redirect ||
attr.map_state != IsViewable)
continue; continue;
oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler); oldxerrorhandler = XSetErrorHandler(winwatchxerrorhandler);
@ -241,34 +238,32 @@ refreshwin(void)
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(oldxerrorhandler); XSetErrorHandler(oldxerrorhandler);
if (s == 0) if(s==0)
continue; continue;
if (exclude != nil && regexec(exclude, class.res_name, nil, 0)) { if (exclude!=nil && regexec(exclude, class.res_name, nil, 0)) {
free(class.res_name); free(class.res_name);
free(class.res_class); free(class.res_class);
continue; continue;
} }
net_wm_name = XInternAtom (dpy, "_NET_WM_NAME", FALSE); net_wm_name = XInternAtom(dpy, "_NET_WM_NAME", FALSE);
wmname = getproperty(xwin[i], net_wm_name); wmname = getproperty(xwin[i], net_wm_name);
if (wmname == nil) { if(wmname==nil){
wmname = getproperty(xwin[i], XA_WM_NAME); wmname = getproperty(xwin[i], XA_WM_NAME);
if (wmname == nil) { if(wmname==nil){
free(class.res_name); free(class.res_name);
free(class.res_class); free(class.res_class);
continue; continue;
} }
} }
if (showwmnames == 1)
label = wmname;
else
label = class.res_name; label = class.res_name;
if(showwmnames==1)
label = wmname;
if (nw < nwin && win[nw].n == xwin[i] if(nw<nwin && win[nw].n==xwin[i] && strcmp(win[nw].label, label)==0) {
&& strcmp(win[nw].label, label) == 0) {
nw++; nw++;
free(wmname); free(wmname);
free(class.res_name); free(class.res_name);
@ -276,12 +271,12 @@ refreshwin(void)
continue; continue;
} }
if (nw < nwin) { if(nw<nwin){
free(win[nw].label); free(win[nw].label);
win[nw].label = nil; win[nw].label = nil;
} }
if (nw >= mwin) { if(nw>=mwin){
mwin += 8; mwin += 8;
win = erealloc(win, mwin * sizeof(win[0])); win = erealloc(win, mwin * sizeof(win[0]));
} }
@ -301,14 +296,12 @@ refreshwin(void)
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(oldxerrorhandler); XSetErrorHandler(oldxerrorhandler);
while (nwin > nw) while(nwin>nw)
free(win[--nwin].label); free(win[--nwin].label);
nwin = nw; nwin = nw;
if (sortlabels == 1) if(sortlabels==1)
qsort(win, nwin, sizeof(struct Win), winlabelcmp); qsort(win, nwin, sizeof(struct Win), winlabelcmp);
return;
} }
void void
@ -316,10 +309,9 @@ drawnowin(int i)
{ {
Rectangle r; Rectangle r;
r = Rect(0, 0, (Dx(screen->r) - 2 * MARGIN + PAD) / cols - PAD, r = Rect(0, 0, (Dx(screen->r) - 2 * MARGIN + PAD) / cols - PAD, font->height);
font->height); r = rectaddpt(
r = rectaddpt(rectaddpt rectaddpt(r,
(r,
Pt(MARGIN + (PAD + Dx(r)) * (i / rows), Pt(MARGIN + (PAD + Dx(r)) * (i / rows),
MARGIN + (PAD + Dy(r)) * (i % rows))), MARGIN + (PAD + Dy(r)) * (i % rows))),
screen->r.min); screen->r.min);
@ -345,20 +337,21 @@ geometry(void)
z = 0; z = 0;
rows = (Dy(screen->r) - 2 * MARGIN + PAD) / (font->height + PAD); rows = (Dy(screen->r) - 2 * MARGIN + PAD) / (font->height + PAD);
if (rows * cols < nwin || rows * cols >= nwin * 2) { if(rows*cols<nwin || rows*cols>=nwin*2){
ncols = nwin <= 0 ? 1 : (nwin + rows - 1) / rows; ncols = 1;
if (ncols != cols) { if(nwin>0)
ncols = (nwin + rows - 1) / rows;
if(ncols!=cols){
cols = ncols; cols = ncols;
z = 1; z = 1;
} }
} }
r = Rect(0, 0, (Dx(screen->r) - 2 * MARGIN + PAD) / cols - PAD, r = Rect(0, 0, (Dx(screen->r) - 2 * MARGIN + PAD) / cols - PAD, font->height);
font->height); for(i=0; i<nwin; i++)
for (i = 0; i < nwin; i++)
win[i].r = win[i].r =
rectaddpt(rectaddpt rectaddpt(
(r, rectaddpt(r,
Pt(MARGIN + (PAD + Dx(r)) * (i / rows), Pt(MARGIN + (PAD + Dx(r)) * (i / rows),
MARGIN + (PAD + Dy(r)) * (i % rows))), MARGIN + (PAD + Dy(r)) * (i % rows))),
screen->r.min); screen->r.min);
@ -372,22 +365,21 @@ redraw(Image *screen, int all)
int i; int i;
all |= geometry(); all |= geometry();
if (all) if(all)
draw(screen, screen->r, lightblue, nil, ZP); draw(screen, screen->r, lightblue, nil, ZP);
for (i = 0; i < nwin; i++) for(i=0; i<nwin; i++)
if (all || win[i].dirty) if(all || win[i].dirty)
drawwin(i); drawwin(i);
if (!all) if(!all)
for (; i < onwin; i++) for (; i<onwin; i++)
drawnowin(i); drawnowin(i);
onwin = nwin; onwin = nwin;
} }
void void
eresized(int new) eresized(int new)
{ {
if (new && getwindow(display, Refmesg) < 0) if(new && getwindow(display, Refmesg)<0)
fprint(2, "can't reattach to window"); fprint(2, "can't reattach to window");
geometry(); geometry();
redraw(screen, 1); redraw(screen, 1);
@ -414,38 +406,34 @@ selectwin(XWindow win)
XSync(dpy, False); XSync(dpy, False);
} }
void void
click(Mouse m) click(Mouse m)
{ {
int i, j; int i, j;
if (m.buttons == 0 || (m.buttons & ~4)) if(m.buttons==0 || (m.buttons&~4))
return; return;
for (i = 0; i < nwin; i++) for(i=0; i<nwin; i++)
if (ptinrect(m.xy, win[i].r)) if(ptinrect(m.xy, win[i].r))
break; break;
if (i == nwin) if(i==nwin)
return; return;
do do
m = emouse(); m = emouse();
while (m.buttons == 4); while(m.buttons==4);
if (m.buttons != 0) { if(m.buttons!=0){
do do
m = emouse(); m = emouse();
while (m.buttons); while(m.buttons);
return; return;
} }
for(j=0; j<nwin; j++)
for (j = 0; j < nwin; j++) if(ptinrect(m.xy, win[j].r))
if (ptinrect(m.xy, win[j].r))
break; break;
if (j != i) if(j==i)
return;
selectwin(win[i].n); selectwin(win[i].n);
} }
@ -466,7 +454,6 @@ main(int argc, char **argv)
sortlabels = 0; sortlabels = 0;
showwmnames = 0; showwmnames = 0;
fontname = "/lib/font/bit/lucsans/unicode.8.font"; fontname = "/lib/font/bit/lucsans/unicode.8.font";
ARGBEGIN { ARGBEGIN {
@ -478,7 +465,7 @@ main(int argc, char **argv)
break; break;
case 'e': case 'e':
exclude = regcomp(EARGF(usage())); exclude = regcomp(EARGF(usage()));
if (exclude == nil) if(exclude==nil)
sysfatal("Bad regexp"); sysfatal("Bad regexp");
break; break;
case 's': case 's':
@ -489,8 +476,9 @@ main(int argc, char **argv)
break; break;
default: default:
usage(); usage();
} } ARGEND;
ARGEND if (argc)
if(argc)
usage(); usage();
/* moved up from original winwatch.c for p9p because there can be only one but we want to restart when needed */ /* moved up from original winwatch.c for p9p because there can be only one but we want to restart when needed */
@ -498,8 +486,7 @@ main(int argc, char **argv)
Etimer = etimer(0, 1000); Etimer = etimer(0, 1000);
dpy = XOpenDisplay(""); dpy = XOpenDisplay("");
if(dpy==nil)
if (dpy == nil)
sysfatal("open display: %r"); sysfatal("open display: %r");
root = DefaultRootWindow(dpy); root = DefaultRootWindow(dpy);
@ -507,26 +494,25 @@ main(int argc, char **argv)
initdraw(0, 0, "winwatch"); initdraw(0, 0, "winwatch");
lightblue = allocimagemix(display, DPalebluegreen, DWhite); lightblue = allocimagemix(display, DPalebluegreen, DWhite);
if (lightblue == nil) if(lightblue==nil)
sysfatal("allocimagemix: %r"); sysfatal("allocimagemix: %r");
if ((font = openfont(display, fontname)) == nil) font = openfont(display, fontname);
if(font==nil)
sysfatal("font '%s' not found", fontname); sysfatal("font '%s' not found", fontname);
/* reentry point upon X server errors */ /* reentry point upon X server errors */
setjmp(savebuf); setjmp(savebuf);
refreshwin(); refreshwin();
redraw(screen, 1); redraw(screen, 1);
for(;;){
for (;;) { switch(eread(Emouse|Ekeyboard|Etimer, &e)){
switch (eread(Emouse | Ekeyboard | Etimer, &e)) {
case Ekeyboard: case Ekeyboard:
if (e.kbdc == 0x7F || e.kbdc == 'q') if(e.kbdc==0x7F || e.kbdc=='q')
exits(0); exits(0);
break; break;
case Emouse: case Emouse:
if (e.mouse.buttons) if(e.mouse.buttons)
click(e.mouse); click(e.mouse);
/* fall through */ /* fall through */
default: /* Etimer */ default: /* Etimer */