Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
dwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disabled XINULATOR code for now
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
e288ab6
..
e3afc9a
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-211,6
+211,7
@@
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
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);
static void unmanage(Client *c);
static void unmapnotify(XEvent *e);
static void updategeom(void);
@@
-391,9
+392,20
@@
buttonpress(XEvent *e) {
unsigned int i, x, click;
Arg arg = {0};
Client *c;
unsigned int i, x, click;
Arg arg = {0};
Client *c;
+ Monitor *m;
XButtonPressedEvent *ev = &e->xbutton;
click = ClkRootWin;
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) {
+ unfocus(selmon->stack);
+ selmon = m;
+ focus(NULL);
+ }
+ break;
+ }
if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
i = 0;
x = selmon->btx;
if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
i = 0;
x = selmon->btx;
@@
-757,10
+769,8
@@
void
focus(Client *c) {
if(!c || !ISVISIBLE(c))
for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
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;
if(c) {
if(c->mon != selmon)
selmon = c->mon;
@@
-797,6
+807,7
@@
focusmon(const Arg *arg) {
if(m->stack)
focus(m->stack);
else {
if(m->stack)
focus(m->stack);
else {
+ unfocus(selmon->stack);
selmon = m;
focus(NULL);
}
selmon = m;
focus(NULL);
}
@@
-1219,8
+1230,7
@@
resize(Client *c, int x, int y, int w, int h) {
c->w = wc.width = w;
c->h = wc.height = h;
wc.border_width = c->bw;
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);
}
configure(c);
XSync(dpy, False);
}
@@
-1590,6
+1600,15
@@
toggleview(const Arg *arg) {
}
void
}
void
+unfocus(Client *c) {
+ if(!c)
+ return;
+ grabbuttons(c, False);
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+void
unmanage(Client *c) {
XWindowChanges wc;
unmanage(Client *c) {
XWindowChanges wc;
@@
-1732,7
+1751,7
@@
updategeom(void) {
}
/* reassign left over clients of disappeared monitors */
}
/* 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;
while(tm->clients) {
c = tm->clients;
tm->clients = c->next;
@@
-1741,7
+1760,6
@@
updategeom(void) {
attach(c);
attachstack(c);
}
attach(c);
attachstack(c);
}
- }
/* select focused monitor */
selmon = newmons;
/* select focused monitor */
selmon = newmons;