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

Merge pull request #3170 from stapelberg/master-merge 

Fix incorrect merge *sigh*
This commit is contained in:
Ingo Bürk 2018-03-10 21:37:53 +01:00 committed by GitHub
parent de0ff844e0 ffcf2bca85
commit 74c0e1b866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/con.c
View File

@ -243,13 +243,6 @@ void con_focus(Con *con) {
workspace_update_urgent_flag(con_get_workspace(con)); workspace_update_urgent_flag(con_get_workspace(con));
ipc_send_window_event("urgent", con); ipc_send_window_event("urgent", con);
} }
/* Focusing a container with a floating parent should raise it to the top. Since
* con_focus is called recursively for each parent we don't need to use
* con_inside_floating(). */
if (con->type == CT_FLOATING_CON) {
floating_raise_con(con);
}
} }
/* /*

8
src/handlers.c
View File

@ -1207,6 +1207,14 @@ static bool handle_clientleader_change(void *data, xcb_connection_t *conn, uint8
*/ */
static void handle_focus_in(xcb_focus_in_event_t *event) { static void handle_focus_in(xcb_focus_in_event_t *event) {
DLOG("focus change in, for window 0x%08x\n", event->event); DLOG("focus change in, for window 0x%08x\n", event->event);
if (event->event == root) {
DLOG("Received focus in for root window, refocusing the focused window.\n");
con_focus(focused);
focused_id = XCB_NONE;
x_push_changes(croot);
}
Con *con; Con *con;
if ((con = con_by_window_id(event->event)) == NULL || con->window == NULL) if ((con = con_by_window_id(event->event)) == NULL || con->window == NULL)
return; return;