godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Fix endless focus bug with raisefocus option.

Browse Source
This commit is contained in:
Martin Duquesnoy 2009-06-28 19:57:36 +02:00
parent d49a2b4dfc
commit d8f3db227a
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client.c
View File

@ -141,6 +141,9 @@ uicb_client_next(uicb_t cmd)
void void
client_focus(Client *c) client_focus(Client *c)
{ {
Window w;
int d;
if(sel && sel != c) if(sel && sel != c)
{ {
sel->colors.frame = conf.client.bordernormal; sel->colors.frame = conf.client.bordernormal;
@ -163,8 +166,17 @@ client_focus(Client *c)
c->titlebar->stipple_color = conf.titlebar.stipple.colors.focus; c->titlebar->stipple_color = conf.titlebar.stipple.colors.focus;
frame_update(c); frame_update(c);
mouse_grabbuttons(c, True); mouse_grabbuttons(c, True);
if(conf.raisefocus) if(conf.raisefocus)
client_raise(c); {
XQueryPointer(dpy, ROOT, &w, &w, &d, &d, &d, &d, (uint *)&d);
if(c == client_gb_win(w)
|| c == client_gb_frame(w)
|| c == client_gb_titlebar(w))
client_raise(c);
}
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
} }
else else

4
src/infobar.c
View File

@ -211,8 +211,7 @@ infobar_draw_statustext(int sc, char *str)
if(str[i] == '\\' && str[i + 1] == '#' && str[i + 8] == '\\') if(str[i] == '\\' && str[i + 1] == '#' && str[i + 8] == '\\')
{ {
/* Store current color in col[] */ /* Store current color in col[] */
for(j = 0, ++i; str[i + j] != '\\'; col[j] = str[i + j], ++j); for(j = 0, ++i; str[i] != '\\'; col[j++] = str[i++]);
i += 8;
buf += k; buf += k;
/* Draw a rectangle with the bar color to draw the text properly */ /* Draw a rectangle with the bar color to draw the text properly */
@ -225,6 +224,7 @@ infobar_draw_statustext(int sc, char *str)
FHINFOBAR, col, 0, buf); FHINFOBAR, col, 0, buf);
buf = _strdup(strwc); buf = _strdup(strwc);
++i;
} }
} }