offscreen client appearance fixes

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 3578beb..33b3c56 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,19 +11,17 @@
 /* static functions */
 
 static void
 /* static functions */
 
 static void

-detachstack(Client *c)
-{
+detachstack(Client *c) {

        Client **tc;
        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }
 
 static void
        Client **tc;
        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }
 
 static void

-grabbuttons(Client *c, Bool focus)
-{
+grabbuttons(Client *c, Bool focused) {

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

-       if(focus) {
+       if(focused) {

                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,


@@ -54,12 +52,10 @@ grabbuttons(Client *c, Bool focus)
        else
                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
        else
                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);

-

 }
 
 static void
 }
 
 static void

-resizetitle(Client *c)
-{
+resizetitle(Client *c) {

        c->tw = textw(c->name);
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tw = textw(c->name);
        if(c->tw > c->w)
                c->tw = c->w + 2;


@@ -69,30 +65,26 @@ resizetitle(Client *c)
                XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
        else
                XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
                XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
        else
                XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);

-

 }
 
 static int
 }
 
 static int

-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {

        return 0;
 }
 
 /* extern functions */
 
 void
        return 0;
 }
 
 /* extern functions */
 
 void

-ban(Client *c)
-{
+ban(Client *c) {

        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void

-focus(Client *c)
-{
+focus(Client *c) {

        Client *old;
 
        Client *old;
 

-       if(!issel)
+       if(!issel || (c && !isvisible(c)))

                return;
        if(!sel)
                sel = c;
                return;
        if(!sel)
                sel = c;


@@ -119,8 +111,7 @@ focus(Client *c)
 }
 
 Client *
 }
 
 Client *

-getclient(Window w)
-{
+getclient(Window w) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)


@@ -130,8 +121,7 @@ getclient(Window w)
 }
 
 Client *
 }
 
 Client *

-getctitle(Window w)
-{
+getctitle(Window w) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)


@@ -141,8 +131,7 @@ getctitle(Window w)
 }
 
 void
 }
 
 void

-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {

        int dx = 0, dy = 0;
 
        switch(c->grav) {
        int dx = 0, dy = 0;
 
        switch(c->grav) {


@@ -196,8 +185,7 @@ gravitate(Client *c, Bool invert)
 }
 
 void
 }
 
 void

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

        if(!sel)
                return;
        if(sel->proto & PROTODELWIN)
        if(!sel)
                return;
        if(sel->proto & PROTODELWIN)


@@ -207,8 +195,7 @@ killclient(Arg *arg)
 }
 
 void
 }
 
 void

-manage(Window w, XWindowAttributes *wa)
-{
+manage(Window w, XWindowAttributes *wa) {

        Client *c;
        Window trans;
        XSetWindowAttributes twa;
        Client *c;
        Window trans;
        XSetWindowAttributes twa;


@@ -223,7 +210,7 @@ manage(Window w, XWindowAttributes *wa)
        c->th = bh;
 
        c->border = 0;
        c->th = bh;
 
        c->border = 0;

-       setsize(c);
+       updatesize(c);

 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;
 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;


@@ -260,7 +247,7 @@ manage(Window w, XWindowAttributes *wa)
        c->snext = stack;
        stack = clients = c;
 
        c->snext = stack;
        stack = clients = c;
 

-       settitle(c);
+       updatetitle(c);

        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);


@@ -270,8 +257,7 @@ manage(Window w, XWindowAttributes *wa)
 }
 
 void
 }
 
 void

-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {

        int bottom = c->y + c->h;
        int right = c->x + c->w;
        XWindowChanges wc;
        int bottom = c->y + c->h;
        int right = c->x + c->w;
        XWindowChanges wc;


@@ -295,6 +281,16 @@ resize(Client *c, Bool sizehints, Corner sticky)
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;
 
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;
 

+       /* offscreen appearance fixes */
+       if(c->x + c->w < 0)
+               c->x = 0;
+       if(c->y + c->h < bh)
+               c->y = bh;
+       if(c->x > sw)
+               c->x = sw - c->w;
+       if(c->y > sh)
+               c->y = sh - c->h;
+

        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;
        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;


@@ -304,13 +300,12 @@ resize(Client *c, Bool sizehints, Corner sticky)
                wc.border_width = 0;
        else
                wc.border_width = 1;
                wc.border_width = 0;
        else
                wc.border_width = 1;

-       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);

        XSync(dpy, False);
 }
 
 void
        XSync(dpy, False);
 }
 
 void

-setsize(Client *c)
-{
+updatesize(Client *c) {

        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 


@@ -348,8 +343,7 @@ setsize(Client *c)
 }
 
 void
 }
 
 void

-settitle(Client *c)
-{
+updatetitle(Client *c) {

        char **list = NULL;
        int n;
        XTextProperty name;
        char **list = NULL;
        int n;
        XTextProperty name;


@@ -376,8 +370,7 @@ settitle(Client *c)
 }
 
 void
 }
 
 void

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

        int ox, oy, ow, oh;
        Client *c;
        XEvent ev;
        int ox, oy, ow, oh;
        Client *c;
        XEvent ev;


@@ -412,27 +405,22 @@ togglemax(Arg *arg)
 }
 
 void
 }
 
 void

-unmanage(Client *c)
-{
-       Client *tc, *fc;
-       Window trans;
+unmanage(Client *c) {
+       Client *nc;
+

        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);

+       detachstack(c);

        if(sel == c) {
        if(sel == c) {

-               XGetTransientForHint(dpy, c->win, &trans);
-               if(trans && (tc = getclient(trans)) && isvisible(tc))
-                       fc = tc;
-               else
-                       fc = getnext(clients);
-               focus(fc);
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);

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

-       detachstack(c);

        free(c->tags);
        free(c);
 
        free(c->tags);
        free(c);