X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=971098918efa6e23d74f411f4b3af79b674db6cd;hb=895902b57adbfe26f982a3eb4e2ee8f3aa4dd408;hp=6f6ed99853e9c4ebfa3bff94d8fc5d66f453b0d8;hpb=1d852259526e41ebaad7325ee42c118b1cc12f71;p=dwm.git diff --git a/client.c b/client.c index 6f6ed99..9710989 100644 --- a/client.c +++ b/client.c @@ -3,7 +3,6 @@ * See LICENSE file for license details. */ #include "dwm.h" - #include #include #include @@ -17,9 +16,9 @@ resizetitle(Client *c) int i; c->tw = 0; - for(i = 0; i < TLast; i++) + for(i = 0; i < ntags; i++) if(c->tags[i]) - c->tw += textw(c->tags[i]); + c->tw += textw(tags[i]); c->tw += textw(c->name); if(c->tw > c->w) c->tw = c->w + 2; @@ -50,6 +49,8 @@ ban(Client *c) void focus(Client *c) { + if (!issel) + return; Client *old = sel; XEvent ev; @@ -198,13 +199,6 @@ killclient(Arg *arg) } void -lower(Client *c) -{ - XLowerWindow(dpy, c->title); - XLowerWindow(dpy, c->win); -} - -void manage(Window w, XWindowAttributes *wa) { Client *c; @@ -212,6 +206,7 @@ manage(Window w, XWindowAttributes *wa) XSetWindowAttributes twa; c = emallocz(sizeof(Client)); + c->tags = emallocz(ntags * sizeof(Bool)); c->win = w; c->x = c->tx = wa->x; c->y = c->ty = wa->y; @@ -219,12 +214,13 @@ manage(Window w, XWindowAttributes *wa) c->h = wa->height; c->th = bh; - if(c->y < bh) + c->border = 0; + setsize(c); + + if(c->h != sh && c->y < bh) c->y = c->ty = bh; - c->border = 1; c->proto = getproto(c->win); - setsize(c); XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | EnterWindowMask); XGetTransientForHint(dpy, c->win, &trans); @@ -237,8 +233,6 @@ manage(Window w, XWindowAttributes *wa) DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); - settags(c); - if(clients) clients->prev = c; c->next = clients; @@ -246,16 +240,36 @@ manage(Window w, XWindowAttributes *wa) 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); + settags(c); if(!c->isfloat) - c->isfloat = trans || (c->maxw && c->minw && - (c->maxw == c->minw) && (c->maxh == c->minh)); - - + c->isfloat = trans + || (c->maxw && c->minw && + c->maxw == c->minw && c->maxh == c->minh); settitle(c); arrange(NULL); @@ -271,7 +285,8 @@ resize(Client *c, Bool sizehints, Corner sticky) { int bottom = c->y + c->h; int right = c->x + c->w; - XConfigureEvent e; + /*XConfigureEvent e;*/ + XWindowChanges wc; if(sizehints) { if(c->incw) @@ -287,30 +302,25 @@ 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(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) c->y = bottom - c->h; resizetitle(c); - XSetWindowBorderWidth(dpy, c->win, 1); - XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); - - e.type = ConfigureNotify; - e.event = c->win; - e.window = c->win; - e.x = c->x; - e.y = c->y; - e.width = c->w; - e.height = c->h; - e.border_width = c->border; - e.above = None; - e.override_redirect = False; - XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e); + wc.x = c->x; + wc.y = c->y; + wc.width = c->w; + wc.height = c->h; + if(c->w == sw && c->h == sh) + wc.border_width = 0; + else + wc.border_width = 1; + XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); XSync(dpy, False); } @@ -397,11 +407,11 @@ togglemax(Arg *arg) oh = sel->h; sel->x = sx; sel->y = sy + bh; - sel->w = sw - 2 * sel->border; - sel->h = sh - 2 * sel->border - bh; + sel->w = sw - 2; + sel->h = sh - 2 - bh; higher(sel); - resize(sel, False, TopLeft); + resize(sel, arrange == dofloat, TopLeft); sel->x = ox; sel->y = oy; @@ -428,13 +438,9 @@ unmanage(Client *c) 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); @@ -450,22 +456,22 @@ zoom(Arg *arg) { Client *c; - if(!sel) + if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax) return; - if(sel == getnext(clients) && sel->next) { + if(sel == getnext(clients)) { if((c = getnext(sel->next))) sel = c; + else + return; } /* pop */ - if(sel->prev) - sel->prev->next = sel->next; + sel->prev->next = sel->next; if(sel->next) sel->next->prev = sel->prev; sel->prev = NULL; - if(clients) - clients->prev = sel; + clients->prev = sel; sel->next = clients; clients = sel; arrange(NULL);