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

Bugfix: When handling an EnterNotify for a child window, access the correct con->layout

This commit is contained in:
Michael Stapelberg 2010-11-26 18:18:40 +01:00
parent 4d7c24b92c
commit e744b48b30
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/handlers.c
View File

@ -191,9 +191,12 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn,
if (event_is_ignored(event->sequence)) if (event_is_ignored(event->sequence))
return 1; return 1;
bool enter_child = false;
/* Get container by frame or by child window */ /* Get container by frame or by child window */
if ((con = con_by_frame_id(event->event)) == NULL) if ((con = con_by_frame_id(event->event)) == NULL) {
con = con_by_window_id(event->event); con = con_by_window_id(event->event);
enter_child = true;
}
/* If not, then the user moved his cursor to the root window. In that case, we adjust c_ws */ /* If not, then the user moved his cursor to the root window. In that case, we adjust c_ws */
if (con == NULL) { if (con == NULL) {
@ -203,7 +206,7 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn,
} }
/* see if the user entered the window on a certain window decoration */ /* see if the user entered the window on a certain window decoration */
int layout = con->layout; int layout = (enter_child ? con->parent->layout : con->layout);
Con *child; Con *child;
TAILQ_FOREACH(child, &(con->nodes_head), nodes) TAILQ_FOREACH(child, &(con->nodes_head), nodes)
if (rect_contains(child->deco_rect, event->event_x, event->event_y)) { if (rect_contains(child->deco_rect, event->event_x, event->event_y)) {