[hackers] [dwm] several other focus fixes, introduced unfocus() || Anselm R Garbe

changeset: 1417:8d447b21ca19
tag: tip
user: Anselm R Garbe <anselm_AT_garbe.us>
date: Wed Jun 24 19:45:47 2009 +0100
files: dwm.c
description:
several other focus fixes, introduced unfocus()

diff -r e802c6186f6c -r 8d447b21ca19 dwm.c
--- a/dwm.c Wed Jun 24 15:37:32 2009 +0100
+++ b/dwm.c Wed Jun 24 19:45:47 2009 +0100
@@ -1,4 +1,4 @@
-//#define XINULATOR /* debug, simulates dual head */
+#define XINULATOR /* debug, simulates dual head */
 /* See LICENSE file for copyright and license details.
  *
  * dynamic window manager is designed like any other X client as well. It is
@@ -211,6 +211,7 @@
 static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
+static void unfocus(Client *c);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);
 static void updategeom(void);
@@ -391,9 +392,23 @@
         unsigned int i, x, click;
         Arg arg = {0};
         Client *c;
+ Monitor *m;
         XButtonPressedEvent *ev = &e->xbutton;
 
         click = ClkRootWin;
+ /* focus monitor if necessary */
+ for(m = mons; m; m = m->next)
+ if(ev->window == m->barwin) {
+ if(m != selmon) {
+ if(selmon->stack)
+ focus(selmon->stack);
+ else {
+ selmon = m;
+ focus(NULL);
+ }
+ }
+ break;
+ }
         if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
                 i = 0;
                 x = selmon->btx;
@@ -757,10 +772,8 @@
 focus(Client *c) {
         if(!c || !ISVISIBLE(c))
                 for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
- if(selmon->sel && selmon->sel != c) {
- grabbuttons(selmon->sel, False);
- XSetWindowBorder(dpy, selmon->sel->win, dc.norm[ColBorder]);
- }
+ if(selmon->sel)
+ unfocus(selmon->sel);
         if(c) {
                 if(c->mon != selmon)
                         selmon = c->mon;
@@ -797,6 +810,7 @@
                         if(m->stack)
                                 focus(m->stack);
                         else {
+ unfocus(selmon->stack);
                                 selmon = m;
                                 focus(NULL);
                         }
@@ -1219,8 +1233,7 @@
                 c->w = wc.width = w;
                 c->h = wc.height = h;
                 wc.border_width = c->bw;
- XConfigureWindow(dpy, c->win,
- CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+ XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
                 configure(c);
                 XSync(dpy, False);
         }
@@ -1590,6 +1603,14 @@
 }
 
 void
+unfocus(Client *c) {
+ if(!c)
+ return;
+ grabbuttons(c, False);
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+}
+
+void
 unmanage(Client *c) {
         XWindowChanges wc;
 
@@ -1732,7 +1753,7 @@
         }
 
         /* reassign left over clients of disappeared monitors */
- for(tm = mons; tm; tm = tm->next) {
+ for(tm = mons; tm; tm = tm->next)
                 while(tm->clients) {
                         c = tm->clients;
                         tm->clients = c->next;
@@ -1741,7 +1762,6 @@
                         attach(c);
                         attachstack(c);
                 }
- }
 
         /* select focused monitor */
         selmon = newmons;
Received on Wed Jun 24 2009 - 18:45:57 UTC