nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Use separate child_mapped instead of checking state->initial (makes t/02-fullscreen.t pass) 

This is necessary for windows which are mapped later, for example when there is
a fullscreen window in front of everything.
This commit is contained in:
Michael Stapelberg 2010-11-28 22:08:34 +01:00
parent 17caaf1159
commit 85b7e60bac
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/x.c
View File

@ -18,6 +18,7 @@ static xcb_window_t focused_id = XCB_NONE;
typedef struct con_state { typedef struct con_state {
xcb_window_t id; xcb_window_t id;
bool mapped; bool mapped;
bool child_mapped;
/* For reparenting, we have a flag (need_reparent) and the X ID of the old /* For reparenting, we have a flag (need_reparent) and the X ID of the old
* frame this window was in. The latter is necessary because we need to * frame this window was in. The latter is necessary because we need to
@ -111,6 +112,7 @@ void x_reinit(Con *con) {
LOG("resetting state %p to initial\n", state); LOG("resetting state %p to initial\n", state);
state->initial = true; state->initial = true;
state->child_mapped = false;
memset(&(state->window_rect), 0, sizeof(Rect)); memset(&(state->window_rect), 0, sizeof(Rect));
} }
@ -466,11 +468,12 @@ static void x_push_node(Con *con) {
atoms[WM_STATE], atoms[WM_STATE], 32, 2, data); atoms[WM_STATE], atoms[WM_STATE], 32, 2, data);
} }
if (state->initial && con->window != NULL) { if (!state->child_mapped && con->window != NULL) {
cookie = xcb_map_window(conn, con->window->id); cookie = xcb_map_window(conn, con->window->id);
LOG("mapping child window (serial %d)\n", cookie.sequence); LOG("mapping child window (serial %d)\n", cookie.sequence);
/* Ignore enter_notifies which are generated when mapping */ /* Ignore enter_notifies which are generated when mapping */
add_ignore_event(cookie.sequence); add_ignore_event(cookie.sequence);
state->child_mapped = true;
} }
cookie = xcb_map_window(conn, con->frame); cookie = xcb_map_window(conn, con->frame);