updated man page

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 9b91ab6..af0190f 100644 (file)
--- a/client.c
+++ b/client.c
@@ -10,6 +10,19 @@
 
 /* static functions */
 
 
 /* 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)
 {
 static void
 resizetitle(Client *c)
 {


@@ -24,13 +37,22 @@ resizetitle(Client *c)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
        c->ty = c->y;
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
        c->ty = c->y;

-       if(c->tags[tsel])
+       if(isvisible(c))

                XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
        else
                XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
 
 }
 
                XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
        else
                XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
 
 }
 

+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)
 {
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee)
 {


@@ -50,57 +72,21 @@ void
 focus(Client *c)
 {
        Client *old = sel;
 focus(Client *c)
 {
        Client *old = sel;

-       XEvent ev;
-
-       sel = c;
-       if(old && old != c)
-               drawtitle(old);
-       drawtitle(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       XSync(dpy, False);
-       XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
-                       PropModeReplace, (unsigned char *)&c->win, 1);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}

 
 

-void
-focusnext(Arg *arg)
-{
-       Client *c;
-   
-       if(!sel)
+       if(!issel)

                return;
                return;

-
-       if(sel->ismax)
-               togglemax(NULL);
-
-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
-       if(c) {
-               higher(c);
-               focus(c);
-       }
-}
-
-void
-focusprev(Arg *arg)
-{
-       Client *c;
-

        if(!sel)
        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);
-       }
-       if(c) {
-               higher(c);
-               focus(c);
+               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);

 }
 
 Client *
 }
 
 Client *


@@ -180,13 +166,6 @@ gravitate(Client *c, Bool invert)
        c->y += dy;
 }
 
        c->y += dy;
 }
 

-void
-higher(Client *c)
-{
-       XRaiseWindow(dpy, c->win);
-       XRaiseWindow(dpy, c->title);
-}
-

 void
 killclient(Arg *arg)
 {
 void
 killclient(Arg *arg)
 {


@@ -198,17 +177,11 @@ killclient(Arg *arg)
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

-void
-lower(Client *c)
-{
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
-}
-

 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

-       Client *c;
+       unsigned int i;
+       Client *c, *tc;

        Window trans;
        XSetWindowAttributes twa;
 
        Window trans;
        XSetWindowAttributes twa;
 


@@ -224,8 +197,14 @@ manage(Window w, XWindowAttributes *wa)
        c->border = 0;
        setsize(c);
 
        c->border = 0;
        setsize(c);
 

+       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 + 2 > sh)
+               c->y = sh - c->h - 2;

        if(c->h != sh && c->y < bh)
        if(c->h != sh && c->y < bh)

-               c->y = c->ty = bh;
+               c->y = bh;

 
        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
 
        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,


@@ -245,45 +224,26 @@ manage(Window w, XWindowAttributes *wa)
        c->next = clients;
        clients = c;
 
        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((tc = getclient(trans))) /* inherit tags */
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = tc->tags[i];
+       else
+               settags(c);

        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
        settitle(c);
        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
        settitle(c);

+       if(isvisible(c))
+               sel = c;

        arrange(NULL);
        arrange(NULL);

-
-       /* mapping the window now prevents flicker */
-       XMapRaised(dpy, c->win);
-       XMapRaised(dpy, c->title);
-       if(c->tags[tsel])
+       XMapWindow(dpy, c->win);
+       XMapWindow(dpy, c->title);
+       if(isvisible(c))

                focus(c);
 }
 
                focus(c);
 }
 


@@ -292,7 +252,6 @@ resize(Client *c, Bool sizehints, Corner sticky)
 {
        int bottom = c->y + c->h;
        int right = c->x + c->w;
 {
        int bottom = c->y + c->h;
        int right = c->x + c->w;

-       /*XConfigureEvent e;*/

        XWindowChanges wc;
 
        if(sizehints) {
        XWindowChanges wc;
 
        if(sizehints) {


@@ -309,10 +268,6 @@ resize(Client *c, Bool sizehints, Corner sticky)
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }

-       if(c->x > right) /* might happen on restart */
-               c->x = right - c->w;
-       if(c->y > bottom)
-               c->y = bottom - c->h;

        if(sticky == TopRight || sticky == BotRight)
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)
        if(sticky == TopRight || sticky == BotRight)
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)


@@ -417,8 +372,8 @@ togglemax(Arg *arg)
                sel->w = sw - 2;
                sel->h = sh - 2 - bh;
 
                sel->w = sw - 2;
                sel->h = sh - 2 - bh;
 

-               higher(sel);
-               resize(sel, False, TopLeft);
+               restack();
+               resize(sel, arrange == dofloat, TopLeft);

 
                sel->x = ox;
                sel->y = oy;
 
                sel->x = ox;
                sel->y = oy;


@@ -445,52 +400,15 @@ unmanage(Client *c)
                c->next->prev = c->prev;
        if(c == clients)
                clients = c->next;
                c->next->prev = c->prev;
        if(c == clients)
                clients = c->next;

-       if(sel == c) {
-               sel = getnext(c->next);
-               if(!sel)
-                       sel = getprev(c->prev);
-               if(!sel)
-                       sel = clients;
-       }
+       if(sel == c)
+               sel = getnext(clients);

        free(c->tags);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        free(c->tags);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       arrange(NULL);

        if(sel)
                focus(sel);
        if(sel)
                focus(sel);

-       else
-               XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
-                               PropModeReplace, (unsigned char *)NULL, 1);
-}
-
-void
-zoom(Arg *arg)
-{
-       Client *c;
-
-       if(!sel || (arrange != dotile) || sel->isfloat)
-               return;
-
-       if(sel == getnext(clients))  {
-               if((c = getnext(sel->next)))
-                       sel = c;
-               else
-                       return;
-       }
-
-       /* pop */
-       if(sel->prev)
-               sel->prev->next = sel->next;
-       if(sel->next)
-               sel->next->prev = sel->prev;
-       sel->prev = NULL;
-       if(clients)
-               clients->prev = sel;
-       sel->next = clients;
-       clients = sel;

        arrange(NULL);
        arrange(NULL);

-       focus(sel);

 }
 }