applied Frederik Ternerot's grabbuttons patch with slight modifications

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index d4ce1e4..e135715 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -723,19 +723,18 @@ gettextprop(Window w, Atom atom, char *text, uint size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
 
 void
 grabbuttons(Client *c, Bool focused) {

-       int i, j;
-       uint buttons[]   = { Button1, Button2, Button3 };
-       uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
+       uint i, j;
+       uint modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };

 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

-       if(focused)
+       if(focused) {

                for(i = 0; i < LENGTH(buttons); i++)
                for(i = 0; i < LENGTH(buttons); i++)

-                       for(j = 0; j < LENGTH(modifiers); j++)
-                               XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
-                                       BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-       else
+                       if(buttons[i].click == ClkClientWin)
+                               for(j = 0; j < LENGTH(modifiers); j++)
+                                       XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+        } else

                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,

-                       BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+                           BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);

 }
 
 void
 }
 
 void


@@ -929,7 +928,7 @@ manage(Window w, XWindowAttributes *wa) {
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);

-       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+       XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */

        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();


@@ -962,7 +961,7 @@ monocle(void) {
        Client *c;
 
        for(c = nexttiled(clients); c; c = nexttiled(c->next))
        Client *c;
 
        for(c = nexttiled(clients); c; c = nexttiled(c->next))

-               resize(c, wx, wy, ww, wh, resizehints);
+               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);

 }
 
 void
 }
 
 void


@@ -1704,7 +1703,9 @@ main(int argc, char *argv[]) {
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 

-       setlocale(LC_CTYPE, "");
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fprintf(stderr, "warning: no locale support\n");
+

        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
 
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");