small renamings of two static functions

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 24d38c3..dff398a 100644 (file)
--- a/client.c
+++ b/client.c
@@ -187,7 +187,7 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

-       Client *c;
+       Client *c, *tc;

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


@@ -203,8 +203,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,


@@ -257,7 +263,6 @@ manage(Window w, XWindowAttributes *wa)
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
        settitle(c);
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
        settitle(c);

-

        if(isvisible(c))
                sel = c;
        arrange(NULL);
        if(isvisible(c))
                sel = c;
        arrange(NULL);


@@ -272,7 +277,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) {


@@ -289,10 +293,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)