applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Stapelberg 2012-02-15 22:05:28 +00:00
commit 5edacf4943
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/click.c
View File

@ -199,12 +199,18 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
goto done; goto done;
} }
/* 2: focus this con */ /* 2: focus this con. If the workspace is on another output we need to
* do a workspace_show in order for i3bar (and others) to notice the
* change in workspace. */
Con *ws = con_get_workspace(con);
Con *focused_workspace = con_get_workspace(focused);
if (ws != focused_workspace)
workspace_show(ws);
con_focus(con); con_focus(con);
/* 3: For floating containers, we also want to raise them on click. /* 3: For floating containers, we also want to raise them on click.
* We will skip handling events on floating cons in fullscreen mode */ * We will skip handling events on floating cons in fullscreen mode */
Con *ws = con_get_workspace(con);
Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL); Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL);
if (floatingcon != NULL && fs == NULL) { if (floatingcon != NULL && fs == NULL) {
floating_raise_con(floatingcon); floating_raise_con(floatingcon);