after switching to OpenBSD again, I switched back to a saner color scheme

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 02aff83..8b98c19 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,6 +11,19 @@
 /* static functions */
 
 static void
+grabbutton(Client *c, unsigned int button, unsigned int modifier)
+{
+       XGrabButton(dpy, button, modifier, c->win, False, BUTTONMASK,
+                       GrabModeAsync, GrabModeSync, None, None);
+       XGrabButton(dpy, button, modifier | LockMask, c->win, False, BUTTONMASK,
+                       GrabModeAsync, GrabModeSync, None, None);
+       XGrabButton(dpy, button, modifier | numlockmask, c->win, False, BUTTONMASK,
+                       GrabModeAsync, GrabModeSync, None, None);
+       XGrabButton(dpy, button, modifier | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                       GrabModeAsync, GrabModeSync, None, None);
+}
+
+static void
 resizetitle(Client *c)
 {
        int i;
@@ -31,6 +44,15 @@ resizetitle(Client *c)
 
 }
 
+static void
+ungrabbutton(Client *c, unsigned int button, unsigned int modifier)
+{
+       XUngrabButton(dpy, button, modifier, c->win);
+       XUngrabButton(dpy, button, modifier | LockMask, c->win);
+       XUngrabButton(dpy, button, modifier | numlockmask, c->win);
+       XUngrabButton(dpy, button, modifier | numlockmask | LockMask, c->win);
+}
+
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee)
 {
@@ -51,13 +73,18 @@ focus(Client *c)
 {
        Client *old = sel;
 
-       if (!issel)
+       if(!issel)
                return;
-       if(sel && sel->ismax)
-               togglemax(NULL);
-       sel = c;
-       if(old && old != c)
+       if(!sel)
+               sel = c;
+       else if(sel != c) {
+               if(sel->ismax)
+                       togglemax(NULL);
+               sel = c;
+               grabbutton(old, AnyButton, 0);
                drawtitle(old);
+       }
+       ungrabbutton(c, AnyButton, 0);
        drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
@@ -203,11 +230,11 @@ manage(Window w, XWindowAttributes *wa)
        c->border = 0;
        setsize(c);
 
-       if(c->x + c->w > sw)
+       if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;
        if(c->x < 0)
                c->x = 0;
-       if(c->y + c->h > sh)
+       if(c->y + c->h + 2 > sh)
                c->y = sh - c->h - 2;
        if(c->h != sh && c->y < bh)
                c->y = bh;
@@ -230,32 +257,9 @@ manage(Window w, XWindowAttributes *wa)
        c->next = clients;
        clients = c;
 
-       XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
-                       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,
-                       GrabModeAsync, GrabModeSync, None, None);
-       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,
-                       GrabModeAsync, GrabModeSync, None, None);
-       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,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
+       grabbutton(c, Button1, MODKEY);
+       grabbutton(c, Button2, MODKEY);
+       grabbutton(c, Button3, MODKEY);
 
        settags(c);
        if(!c->isfloat)
@@ -293,10 +297,6 @@ resize(Client *c, Bool sizehints, Corner sticky)
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }
-       if(c->x > sw) /* might happen on restart */
-               c->x = sw - c->w;
-       if(c->y > sh)
-               c->y = sh - c->h;
        if(sticky == TopRight || sticky == BotRight)
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)