implemented the maximization as I described on the mailinglist, this feels better...

[dwm.git] / main.c

diff --git a/main.c b/main.c
index daeaa0a..b3c753e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,9 +24,9 @@ unsigned int ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;

-Bool maximized = False;

 Client *clients = NULL;
 Client *sel = NULL;
 Client *clients = NULL;
 Client *sel = NULL;

+Client *stack = NULL;

 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};


@@ -38,8 +38,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *);
 static Bool otherwm, readin;
 
 static void
 static Bool otherwm, readin;
 
 static void

-cleanup()
-{
+cleanup() {

        close(STDIN_FILENO);
        while(sel) {
                resize(sel, True, TopLeft);
        close(STDIN_FILENO);
        while(sel) {
                resize(sel, True, TopLeft);


@@ -59,8 +58,7 @@ cleanup()
 }
 
 static void
 }
 
 static void

-scan()
-{
+scan() {

        unsigned int i, num;
        Window *wins, d1, d2;
        XWindowAttributes wa;
        unsigned int i, num;
        Window *wins, d1, d2;
        XWindowAttributes wa;


@@ -81,8 +79,7 @@ scan()
 }
 
 static void
 }
 
 static void

-setup()
-{
+setup() {

        int i, j;
        unsigned int mask;
        Window w;
        int i, j;
        unsigned int mask;
        Window w;


@@ -111,7 +108,8 @@ setup()
        }
        XFree(modmap);
 
        }
        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);
 
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 


@@ -162,8 +160,7 @@ setup()
  * is already running.
  */
 static int
  * is already running.
  */
 static int

-xerrorstart(Display *dsply, XErrorEvent *ee)
-{
+xerrorstart(Display *dsply, XErrorEvent *ee) {

        otherwm = True;
        return -1;
 }
        otherwm = True;
        return -1;
 }


@@ -171,8 +168,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 int
 /* extern */
 
 int

-getproto(Window w)
-{
+getproto(Window w) {

        int i, format, protos, status;
        unsigned long extra, res;
        Atom *protocols, real;
        int i, format, protos, status;
        unsigned long extra, res;
        Atom *protocols, real;


@@ -190,8 +186,7 @@ getproto(Window w)
 }
 
 void
 }
 
 void

-sendevent(Window w, Atom a, long value)
-{
+sendevent(Window w, Atom a, long value) {

        XEvent e;
 
        e.type = ClientMessage;
        XEvent e;
 
        e.type = ClientMessage;


@@ -205,35 +200,33 @@ sendevent(Window w, Atom a, long value)
 }
 
 void
 }
 
 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
        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
  */
 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)
        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 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
 }
 
 int

-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {

        int r, xfd;
        fd_set rd;
 
        int r, xfd;
        fd_set rd;