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

EWMH: Fix focus on _NET_WM_STATE_FULLSCREEN (Bug #42 signaled by tamtam)

Browse Source
This commit is contained in:
Martin Duquesnoy
2010-04-08 13:20:51 +02:00
parent fbb36877dc
commit 466ebca9ea
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ewmh.c
View File

@@ -301,10 +301,9 @@ ewmh_manage_net_wm_state(long data_l[], Client *c)
/* Manage _NET_WM_STATE_FULLSCREEN */ /* Manage _NET_WM_STATE_FULLSCREEN */
if(data_l[1] == net_atom[net_wm_state_fullscreen]) if(data_l[1] == net_atom[net_wm_state_fullscreen])
{ {
if(data_l[0] == _NET_WM_STATE_ADD) if(data_l[0] == _NET_WM_STATE_ADD && !(c->flags & FSSFlag))
{ {
c->screen = screen_get_with_geo(c->geo.x, c->geo.y); c->screen = screen_get_with_geo(c->geo.x, c->geo.y);
client_unmap(c);
c->flags &= ~UnmapFlag; c->flags &= ~UnmapFlag;
XMapWindow(dpy, c->win); XMapWindow(dpy, c->win);
XReparentWindow(dpy, c->win, ROOT, spgeo[c->screen].x, spgeo[c->screen].y); XReparentWindow(dpy, c->win, ROOT, spgeo[c->screen].x, spgeo[c->screen].y);
@@ -318,16 +317,18 @@ ewmh_manage_net_wm_state(long data_l[], Client *c)
c->ogeo = c->geo; c->ogeo = c->geo;
c->flags |= (FSSFlag | MaxFlag); c->flags |= (FSSFlag | MaxFlag);
client_raise(c);
client_focus(c);
XUnmapWindow(dpy, c->frame);
} }
else if(data_l[0] == _NET_WM_STATE_REMOVE) else if(data_l[0] == _NET_WM_STATE_REMOVE && (c->flags & FSSFlag))
{ {
c->flags &= ~(FSSFlag | MaxFlag); c->flags &= ~(FSSFlag | MaxFlag);
client_map(c); client_map(c);
XReparentWindow(dpy, c->win, c->frame, BORDH, TBARH); XReparentWindow(dpy, c->win, c->frame, BORDH, TBARH);
client_moveresize(c, c->tmp_geo, False); client_moveresize(c, c->tmp_geo, False);
} }
XRaiseWindow(dpy, c->win);
client_focus(c);
} }
/* Manage _NET_WM_STATE_DEMANDS_ATTENTION */ /* Manage _NET_WM_STATE_DEMANDS_ATTENTION */
else if(data_l[1] == net_atom[net_wm_state_demands_attention]) else if(data_l[1] == net_atom[net_wm_state_demands_attention])