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

Merge pull request #3171 from i3/revert-3170-master-merge 

Partially revert "Fix incorrect merge *sigh*"
This commit is contained in:
Ingo Bürk 2018-03-10 21:48:14 +01:00 committed by GitHub
parent 74c0e1b866 010e86605d
commit c54f500839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/handlers.c
View File

@ -1207,14 +1207,6 @@ 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;