X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=main.c;h=de5924475b2554d265afc6ce383265b0a30d3d00;hp=2d132a5d84d50922843a6acdeea10afb7cda3259;hb=1f9614f82e14fa3a46e0db05346b41d6be611f88;hpb=e6cbe9c11e88537d74eb094ba5844f71ee57f268 diff --git a/main.c b/main.c index 2d132a5..de59244 100644 --- a/main.c +++ b/main.c @@ -14,31 +14,17 @@ #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]; -DC dc = {0}; -Client *clients = NULL; -Client *sel = NULL; +/* static */ static Bool otherwm; static int (*xerrorxlib)(Display *, XErrorEvent *); -/* static functions */ - static void cleanup() { while(sel) { - resize(sel, True); + resize(sel, True, TopLeft); unmanage(sel); } XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); @@ -97,7 +83,20 @@ xerrorstart(Display *dsply, XErrorEvent *ee) return -1; } -/* extern functions */ +/* extern */ + +char stext[1024]; +int tsel = Tdev; /* default tag */ +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) @@ -141,10 +140,9 @@ 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) @@ -181,14 +179,13 @@ main(int argc, char *argv[]) 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; + case 'v': + fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); + exit(EXIT_SUCCESS); + break; } } @@ -264,6 +261,7 @@ main(int argc, char *argv[]) XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); strcpy(stext, "dwm-"VERSION); + scan(); /* main event loop, reads status text from stdin as well */