added sample command to config.default.h to highlight how to query class:instance...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index ecfd8f0..24d38c3 100644 (file)
--- a/client.c
+++ b/client.c
@@ -49,11 +49,12 @@ ban(Client *c)
 void
 focus(Client *c)
 {
-       if (!issel)
-               return;
        Client *old = sel;
-       XEvent ev;
 
+       if (!issel)
+               return;
+       if(sel && sel->ismax)
+               togglemax(NULL);
        sel = c;
        if(old && old != c)
                drawtitle(old);
@@ -69,9 +70,6 @@ focusnext(Arg *arg)
        if(!sel)
                return;
 
-       if(sel->ismax)
-               togglemax(NULL);
-
        if(!(c = getnext(sel->next)))
                c = getnext(clients);
        if(c) {
@@ -88,9 +86,6 @@ focusprev(Arg *arg)
        if(!sel)
                return;
 
-       if(sel->ismax)
-               togglemax(NULL);
-
        if(!(c = getprev(sel->prev))) {
                for(c = clients; c && c->next; c = c->next);
                c = getprev(c);
@@ -233,27 +228,27 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
 
        XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
 
        XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
 
        settags(c);
@@ -263,11 +258,13 @@ manage(Window w, XWindowAttributes *wa)
                                c->maxw == c->minw && c->maxh == c->minh);
        settitle(c);
 
+       if(isvisible(c))
+               sel = c;
+       arrange(NULL);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->title);
        if(isvisible(c))
                focus(c);
-       arrange(NULL);
 }
 
 void