Retain focus on clients moved across screens (fs#620)
Signed-off-by: Perry Hargrave <resixian@gmail.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
parent
45576b6c6f
commit
4be3ae0120
8
screen.c
8
screen.c
|
@ -342,10 +342,14 @@ screen_client_moveto(client_t *c, screen_t *new_screen, bool doresize)
|
|||
{
|
||||
screen_t *old_screen = c->screen;
|
||||
area_t from, to;
|
||||
bool had_focus = false;
|
||||
|
||||
if(new_screen == c->screen)
|
||||
return;
|
||||
|
||||
if (globalconf.focus.client == c)
|
||||
had_focus = true;
|
||||
|
||||
c->screen = new_screen;
|
||||
|
||||
/* If client was on a screen, remove old tags */
|
||||
|
@ -358,6 +362,8 @@ screen_client_moveto(client_t *c, screen_t *new_screen, bool doresize)
|
|||
luaA_object_push(globalconf.L, c);
|
||||
luaA_object_emit_signal(globalconf.L, -1, "property::screen", 0);
|
||||
lua_pop(globalconf.L, 1);
|
||||
if(had_focus)
|
||||
client_focus(c);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -386,6 +392,8 @@ screen_client_moveto(client_t *c, screen_t *new_screen, bool doresize)
|
|||
luaA_object_push(globalconf.L, c);
|
||||
luaA_object_emit_signal(globalconf.L, -1, "property::screen", 0);
|
||||
lua_pop(globalconf.L, 1);
|
||||
if(had_focus)
|
||||
client_focus(c);
|
||||
}
|
||||
|
||||
/** Push a screen onto the stack.
|
||||
|
|
Loading…
Reference in New Issue