X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=b3c753e97e45f89777a3a6e5f75cc17728086a2b;hb=cff951c65086950eeef5723b65dc06cbe7cdfa19;hp=5dab0db43cfcba4c44681fdea794748c0c04a181;hpb=e995c1b5325f88d197675950c15762d001dd80ef;p=dwm.git diff --git a/main.c b/main.c index 5dab0db..b3c753e 100644 --- a/main.c +++ b/main.c @@ -26,6 +26,7 @@ Bool running = True; Bool issel = True; Client *clients = NULL; Client *sel = NULL; +Client *stack = NULL; Cursor cursor[CurLast]; Display *dpy; DC dc = {0}; @@ -37,8 +38,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *); static Bool otherwm, readin; static void -cleanup() -{ +cleanup() { close(STDIN_FILENO); while(sel) { resize(sel, True, TopLeft); @@ -54,11 +54,11 @@ cleanup() XDestroyWindow(dpy, barwin); XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); XSync(dpy, False); + free(seltag); } static void -scan() -{ +scan() { unsigned int i, num; Window *wins, d1, d2; XWindowAttributes wa; @@ -79,8 +79,7 @@ scan() } static void -setup() -{ +setup() { int i, j; unsigned int mask; Window w; @@ -109,7 +108,8 @@ setup() } XFree(modmap); - wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask; + wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask + | EnterWindowMask | LeaveWindowMask; wa.cursor = cursor[CurNormal]; XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); @@ -160,8 +160,7 @@ setup() * is already running. */ static int -xerrorstart(Display *dsply, XErrorEvent *ee) -{ +xerrorstart(Display *dsply, XErrorEvent *ee) { otherwm = True; return -1; } @@ -169,8 +168,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee) /* extern */ int -getproto(Window w) -{ +getproto(Window w) { int i, format, protos, status; unsigned long extra, res; Atom *protocols, real; @@ -188,8 +186,7 @@ getproto(Window w) } void -sendevent(Window w, Atom a, long value) -{ +sendevent(Window w, Atom a, long value) { XEvent e; e.type = ClientMessage; @@ -203,35 +200,33 @@ sendevent(Window w, Atom a, long value) } void -quit(Arg *arg) -{ +quit(Arg *arg) { readin = running = False; } /* * 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(). + * default error handler, which may call exit. */ int -xerror(Display *dpy, XErrorEvent *ee) -{ +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_GrabKey && ee->error_code == BadAccess) + || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) return 0; fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", ee->request_code, ee->error_code); - return xerrorxlib(dpy, ee); /* may call exit() */ + return xerrorxlib(dpy, ee); /* may call exit */ } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { int r, xfd; fd_set rd;