X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=0e94e2c1d0a9c38b84cd5b7ba757829d83f59531;hb=a73a88280681acdab047bd11a9ba77d97d6a0b72;hp=2d132a5d84d50922843a6acdeea10afb7cda3259;hpb=e6cbe9c11e88537d74eb094ba5844f71ee57f268;p=dwm.git diff --git a/main.c b/main.c index 2d132a5..0e94e2c 100644 --- a/main.c +++ b/main.c @@ -10,35 +10,22 @@ #include #include #include +#include #include #include #include -Display *dpy; -Window root, barwin; -Atom wmatom[WMLast], netatom[NetLast]; -Cursor cursor[CurLast]; -Bool running = True; -Bool issel = True; -int tsel = Tdev; /* default tag */ -int screen, sx, sy, sw, sh, bx, by, bw, bh, mw; -char stext[1024]; +/* static */ -DC dc = {0}; -Client *clients = NULL; -Client *sel = NULL; - -static Bool otherwm; static int (*xerrorxlib)(Display *, XErrorEvent *); - -/* static functions */ +static Bool otherwm; static void cleanup() { while(sel) { - resize(sel, True); + resize(sel, True, TopLeft); unmanage(sel); } XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); @@ -48,9 +35,8 @@ static void scan() { unsigned int i, num; - Window *wins; + Window *wins, d1, d2; XWindowAttributes wa; - Window d1, d2; if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { for(i = 0; i < num; i++) { @@ -69,10 +55,9 @@ scan() static int win_property(Window w, Atom a, Atom t, long l, unsigned char **prop) { - Atom real; - int format; + int status, format; unsigned long res, extra; - int status; + Atom real; status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format, &res, &extra, prop); @@ -97,15 +82,28 @@ xerrorstart(Display *dsply, XErrorEvent *ee) return -1; } -/* extern functions */ +/* extern */ + +char stext[1024]; +int tsel = DEFTAG; +int screen, sx, sy, sw, sh, bx, by, bw, bh, mw; +Atom wmatom[WMLast], netatom[NetLast]; +Bool running = True; +Bool issel = True; +Client *clients = NULL; +Client *sel = NULL; +Cursor cursor[CurLast]; +Display *dpy; +DC dc = {0}; +Window root, barwin; int getproto(Window w) { - unsigned char *protocols; - long res; int protos = 0; int i; + long res; + unsigned char *protocols; res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols); if(res <= 0) { @@ -141,56 +139,43 @@ quit(Arg *arg) } /* - * There's no way to check accesses to destroyed windows, thus - * those cases are ignored (especially on UnmapNotify's). - * Other types of errors call Xlib's default error handler, which - * calls exit(). + * There's no way to check accesses to destroyed windows, thus those cases are + * ignored (especially on UnmapNotify's). Other types of errors call Xlibs + * default error handler, which calls exit(). */ int xerror(Display *dpy, XErrorEvent *ee) { if(ee->error_code == BadWindow - || (ee->request_code == X_SetInputFocus - && ee->error_code == BadMatch) - || (ee->request_code == X_PolyText8 - && ee->error_code == BadDrawable) - || (ee->request_code == X_PolyFillRectangle - && ee->error_code == BadDrawable) - || (ee->request_code == X_PolySegment - && ee->error_code == BadDrawable) - || (ee->request_code == X_ConfigureWindow - && ee->error_code == BadMatch) - || (ee->request_code == X_GrabKey - && ee->error_code == BadAccess)) + || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) + || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) + || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable) + || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) + || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) + || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)) return 0; fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", - ee->request_code, ee->error_code); + ee->request_code, ee->error_code); return xerrorxlib(dpy, ee); /* may call exit() */ } int main(int argc, char *argv[]) { - int i, n; - fd_set rd; - XSetWindowAttributes wa; + int i; unsigned int mask; - Bool readstdin = True; + fd_set rd; + Bool readin = True; Window w; XEvent ev; + XSetWindowAttributes wa; - for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { - switch (argv[i][1]) { - case 'v': - fprintf(stdout, "%s", - "dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n"); - exit(0); - break; - default: - eprint("usage: dwm [-v]\n"); - break; - } + if(argc == 2 && !strncmp("-v", argv[1], 3)) { + fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); + exit(EXIT_SUCCESS); } + else if(argc != 1) + eprint("usage: dwm [-v]\n"); dpy = XOpenDisplay(0); if(!dpy) @@ -257,20 +242,17 @@ main(int argc, char *argv[]) issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); - wa.event_mask = SubstructureRedirectMask | EnterWindowMask \ - | LeaveWindowMask; + wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask; wa.cursor = cursor[CurNormal]; - XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); strcpy(stext, "dwm-"VERSION); scan(); /* main event loop, reads status text from stdin as well */ -Mainloop: while(running) { FD_ZERO(&rd); - if(readstdin) + if(readin) FD_SET(STDIN_FILENO, &rd); FD_SET(ConnectionNumber(dpy), &rd); @@ -287,20 +269,12 @@ Mainloop: (handler[ev.type])(&ev); /* call handler */ } } - if(readstdin && FD_ISSET(STDIN_FILENO, &rd)) { - i = n = 0; - for(;;) { - if((i = getchar()) == EOF) { - /* broken pipe/end of producer */ - readstdin = False; - strcpy(stext, "broken pipe"); - goto Mainloop; - } - if(i == '\n' || n >= sizeof(stext) - 1) - break; - stext[n++] = i; - } - stext[n] = 0; + if(readin && FD_ISSET(STDIN_FILENO, &rd)) { + readin = NULL != fgets(stext, sizeof(stext), stdin); + if(readin) + stext[strlen(stext) - 1] = 0; + else + strcpy(stext, "broken pipe"); drawstatus(); } }