* See LICENSE file for license details.
*/
#include "dwm.h"
-
#include <stdlib.h>
#include <string.h>
#include <X11/Xatom.h>
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;
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);
focus(Client *c)
{
Client *old = sel;
- XEvent ev;
+ if (!issel)
+ return;
+ if(sel && sel->ismax)
+ togglemax(NULL);
sel = c;
if(old && old != c)
drawtitle(old);
drawtitle(c);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
if(!sel)
return;
- if(sel->ismax)
- togglemax(NULL);
-
- if(!(c = getnext(sel->next, tsel)))
- c = getnext(clients, tsel);
+ if(!(c = getnext(sel->next)))
+ c = getnext(clients);
if(c) {
- higher(c);
focus(c);
+ restack();
}
}
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);
+ restack();
}
}
c->y += dy;
}
-void
-higher(Client *c)
-{
- XRaiseWindow(dpy, c->win);
- XRaiseWindow(dpy, c->title);
-}
-
void
killclient(Arg *arg)
{
if(!sel)
return;
- if(sel->proto & WM_PROTOCOL_DELWIN)
+ if(sel->proto & PROTODELWIN)
sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
else
XKillClient(dpy, sel->win);
}
-void
-lower(Client *c)
-{
- XLowerWindow(dpy, c->title);
- XLowerWindow(dpy, c->win);
-}
-
void
manage(Window w, XWindowAttributes *wa)
{
- Client *c;
+ Client *c, *tc;
Window trans;
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;
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);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
- twa.event_mask = ExposureMask;
+ twa.event_mask = ExposureMask | EnterWindowMask;
c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
- settags(c);
-
if(clients)
clients->prev = c;
c->next = clients;
clients = c;
- XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
+ 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);
- if(!c->isfloat)
- c->isfloat = trans || (c->maxw && c->minw &&
- (c->maxw == c->minw) && (c->maxh == c->minh));
+ 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);
settitle(c);
- arrange(NULL);
- /* mapping the window now prevents flicker */
- if(c->tags[tsel]) {
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
- focus(c);
+ if(trans && (tc = getclient(trans))) {
+ c->x = (tc->x + tc->w / 2) - (c->w / 2);
+ c->y = (tc->y + tc->h / 2) - (c->h / 2);
+ if(c->x < 0 || c->x >= sw)
+ c->x = (sw / 2) - (c->w / 2);
+ if(c->y < 0 || c->y >= sh)
+ c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
}
else {
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
-
+ c->x = (sw / 2) - (c->w / 2);
+ c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
}
-}
-
-void
-pop(Client *c)
-{
- Client **l;
-
- for(l = &clients; *l && *l != c; l = &(*l)->next);
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- *l = c->next;
- c->prev = NULL;
- if(clients)
- clients->prev = c;
- c->next = clients;
- clients = c;
+ if(isvisible(c))
+ sel = c;
arrange(NULL);
+ XMapWindow(dpy, c->win);
+ XMapWindow(dpy, c->title);
+ if(isvisible(c))
+ focus(c);
}
void
{
int bottom = c->y + c->h;
int right = c->x + c->w;
- XConfigureEvent e;
+ /*XConfigureEvent e;*/
+ XWindowChanges wc;
if(sizehints) {
if(c->incw)
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);
}
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);
+ restack();
+ resize(sel, arrange == dofloat, TopLeft);
sel->x = ox;
sel->y = oy;
void
unmanage(Client *c)
{
- Client **l;
-
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
XDestroyWindow(dpy, c->title);
- for(l = &clients; *l && *l != c; l = &(*l)->next);
if(c->prev)
c->prev->next = c->next;
if(c->next)
c->next->prev = c->prev;
- *l = c->next;
- if(sel == c) {
- sel = getnext(c->next, tsel);
- if(!sel)
- sel = getprev(c->prev);
- if(!sel)
- sel = clients;
- }
+ if(c == clients)
+ clients = c->next;
+ if(sel == c)
+ sel = getnext(clients);
+ free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange(NULL);
if(sel)
focus(sel);
+ arrange(NULL);
}
void
{
Client *c;
- if(!sel)
+ if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
return;
- if(sel == getnext(clients, tsel) && sel->next) {
- if((c = getnext(sel->next, tsel)))
+ if(sel == getnext(clients)) {
+ if((c = getnext(sel->next)))
sel = c;
+ else
+ return;
}
- pop(sel);
+ /* pop */
+ sel->prev->next = sel->next;
+ if(sel->next)
+ sel->next->prev = sel->prev;
+ sel->prev = NULL;
+ clients->prev = sel;
+ sel->next = clients;
+ clients = sel;
focus(sel);
+ arrange(NULL);
}