X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=fce0a2555e06ed5071a0d54a12cff2c8b3eed4ad;hb=051a404b66dfa4f87f98411da61320a93a146ec8;hp=5cbb59b8a178b88d64c27afd0cd669213c21cbe8;hpb=63d719023161c807242c01a2fe81a1097ca37447;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 5cbb59b..fce0a25 100644
--- a/dwm.c
+++ b/dwm.c
@@ -202,8 +202,10 @@ static void zoom(const Arg *arg);
 
 /* variables */
 static char stext[256];
-static int screen, sx, sy, sw, sh;
-static int by, bh, blw, wx, wy, ww, wh;
+static int screen;
+static int sx, sy, sw, sh; /* display geometry x, y, width, height */ 
+static int by, bh, blw;    /* bar geometry y, height and layout symbol width */
+static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */
 static unsigned int seltags = 0, sellt = 0;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
@@ -347,7 +349,7 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
-	Arg a = {.i = ~0};
+	Arg a = {.ui = ~0};
 	Layout foo = { "", NULL };
 
 	close(STDIN_FILENO);
@@ -865,8 +867,7 @@ killclient(const Arg *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
-	Status rettrans;
-	Window trans;
+	Window trans = 0;
 	XWindowChanges wc;
 
 	if(!(c = calloc(1, sizeof(Client))))
@@ -903,14 +904,14 @@ manage(Window w, XWindowAttributes *wa) {
 	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
 	grabbuttons(c, False);
 	updatetitle(c);
-	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-		for(t = clients; t && t->win != trans; t = t->next);
+	if(XGetTransientForHint(dpy, w, &trans))
+		t = getclient(trans);
 	if(t)
 		c->tags = t->tags;
 	else
 		applyrules(c);
 	if(!c->isfloating)
-		c->isfloating = (rettrans == Success) || c->isfixed;
+		c->isfloating = trans || c->isfixed;
 	if(c->isfloating)
 		XRaiseWindow(dpy, c->win);
 	attach(c);
@@ -1640,11 +1641,11 @@ updatewmhints(Client *c) {
 
 void
 view(const Arg *arg) {
-	if(arg && (arg->i & TAGMASK) == tagset[seltags])
+	if(arg && (arg->ui & TAGMASK) == tagset[seltags])
 		return;
 	seltags ^= 1; /* toggle sel tagset */
 	if(arg && (arg->ui & TAGMASK))
-		tagset[seltags] = arg->i & TAGMASK;
+		tagset[seltags] = arg->ui & TAGMASK;
 	clearurgent();
 	arrange();
 }