X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=c18d88b582a40584085370f3354357076c3b6036;hb=7e597ae204ce94398f8c722e335f20d5a4a30c8a;hp=646bcc16ff7578f083460f93acc46c7ea0e9c5f8;hpb=7b5638f61d5c8b5a76bc3f7a5962cb7490da3b6b;p=dwm.git

diff --git a/client.c b/client.c
index 646bcc1..c18d88b 100644
--- a/client.c
+++ b/client.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
@@ -12,24 +11,42 @@
 /* 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)
 {
 	int i;
 
-	c->tw = 0;
-	for(i = 0; i < TLast; i++)
-		if(c->tags[i])
-			c->tw += textw(c->tags[i]);
-	c->tw += textw(c->name);
+	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])
-		XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+	if(isvisible(c))
+		XMoveResizeWindow(dpy, c->twin, 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->twin, 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
@@ -44,62 +61,28 @@ void
 ban(Client *c)
 {
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+	XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
 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);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
 
-void
-focusnext(Arg *arg)
-{
-	Client *c;
-   
-	if(!sel)
+	if(!issel)
 		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)
-		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 *
@@ -119,7 +102,7 @@ getctitle(Window w)
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->title == w)
+		if(c->twin == w)
 			return c;
 	return NULL;
 }
@@ -180,38 +163,26 @@ gravitate(Client *c, Bool invert)
 }
 
 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;
+	unsigned int i;
+	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;
@@ -219,50 +190,56 @@ manage(Window w, XWindowAttributes *wa)
 	c->h = wa->height;
 	c->th = bh;
 
-	if(c->y < bh)
-		c->y = c->ty = bh;
+	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)
+		c->y = 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,
+	c->twin = 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, ButtonMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask,
-			GrabModeAsync, GrabModeSync, None, None);
+	grabbutton(c, Button1, MODKEY);
+	grabbutton(c, Button2, MODKEY);
+	grabbutton(c, Button3, MODKEY);
 
+	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));
-
-
+		c->isfloat = trans
+			|| (c->maxw && c->minw &&
+				c->maxw == c->minw && c->maxh == c->minh);
 	settitle(c);
+	if(isvisible(c))
+		sel = c;
 	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->twin);
+	if(isvisible(c))
 		focus(c);
 }
 
@@ -271,7 +248,7 @@ resize(Client *c, Bool sizehints, Corner sticky)
 {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
-	XConfigureEvent e;
+	XWindowChanges wc;
 
 	if(sizehints) {
 		if(c->incw)
@@ -287,30 +264,21 @@ 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(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);
 }
 
@@ -357,7 +325,7 @@ void
 settitle(Client *c)
 {
 	char **list = NULL;
-	int n;
+	int i, n;
 	XTextProperty name;
 
 	name.nitems = 0;
@@ -397,11 +365,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);
+		restack();
+		resize(sel, arrange == dofloat, TopLeft);
 
 		sel->x = ox;
 		sel->y = oy;
@@ -416,63 +384,27 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
-	Client **l;
-
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	XDestroyWindow(dpy, c->title);
+	XDestroyWindow(dpy, c->twin);
 
-	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);
-		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);
-}
-
-void
-zoom(Arg *arg)
-{
-	Client *c, **l;
-
-	if(!sel)
-		return;
-
-	if(sel == getnext(clients) && sel->next)  {
-		if((c = getnext(sel->next)))
-			sel = c;
-	}
-
-	/* pop */
-	for(l = &clients; *l && *l != sel; l = &(*l)->next);
-	if(sel->prev)
-		sel->prev->next = sel->next;
-	if(sel->next)
-		sel->next->prev = sel->prev;
-	*l = sel->next;
-
-	sel->prev = NULL;
-	if(clients)
-		clients->prev = sel;
-	sel->next = clients;
-	clients = sel;
 	arrange(NULL);
-	focus(sel);
 }