documented the new behavior in man page

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 9d583b2..488ebc1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,12 +19,11 @@
 
 char stext[1024];
 Bool *seltag;
 
 char stext[1024];
 Bool *seltag;

-int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
+int bx, by, bw, bh, bmw, master, screen, sx, sy, sw, sh;

 unsigned int ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
 unsigned int ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;

-Bool maximized = False;

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


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

-cleanup()
-{
+cleanup(void) {

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


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

-scan()
-{
+scan(void) {

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


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

-setup()
-{
+setup(void) {

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


@@ -112,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);
 


@@ -136,7 +133,7 @@ setup()
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

-       mw = (sw * MASTERW) / 100;
+       updatemaster();

 
        bx = by = 0;
        bw = sw;
 
        bx = by = 0;
        bw = sw;


@@ -163,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;
 }


@@ -172,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;


@@ -191,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;


@@ -206,8 +200,7 @@ sendevent(Window w, Atom a, long value)
 }
 
 void
 }
 
 void

-quit(Arg *arg)
-{
+quit(Arg *arg) {

        readin = running = False;
 }
 
        readin = running = False;
 }
 


@@ -217,15 +210,15 @@ quit(Arg *arg)
  * default error handler, which may call exit.
  */
 int
  * 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)
        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);


@@ -233,8 +226,7 @@ xerror(Display *dpy, XErrorEvent *ee)
 }
 
 int
 }
 
 int

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

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