mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Improve focus handling when moving surfaces between workspaces

Browse Source 
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl
2012-08-29 22:13:03 +02:00
committed by Kristian Høgsberg
parent 14c92ff072
commit 8538b22ff4
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c
+23 -8
View File
@@ -439,6 +439,22 @@ focus_state_create(struct weston_seat *seat, struct workspace *ws)
return state; return state;
} }
static struct focus_state *
ensure_focus_state(struct desktop_shell *shell, struct weston_seat *seat)
{
struct workspace *ws = get_current_workspace(shell);
struct focus_state *state;
wl_list_for_each(state, &ws->focus_list, link)
if (state->seat == seat)
break;
if (&state->link == &ws->focus_list)
state = focus_state_create(seat, ws);
return state;
}
static void static void
restore_focus_state(struct desktop_shell *shell, struct workspace *ws) restore_focus_state(struct desktop_shell *shell, struct workspace *ws)
{ {
@@ -859,6 +875,7 @@ take_surface_to_workspace_by_seat(struct desktop_shell *shell,
struct shell_surface *shsurf; struct shell_surface *shsurf;
struct workspace *from; struct workspace *from;
struct workspace *to; struct workspace *to;
struct focus_state *state;
if (surface == NULL || if (surface == NULL ||
index == shell->workspaces.current) index == shell->workspaces.current)
@@ -902,6 +919,10 @@ take_surface_to_workspace_by_seat(struct desktop_shell *shell,
} }
broadcast_current_workspace_state(shell); broadcast_current_workspace_state(shell);
state = ensure_focus_state(shell, seat);
if (state != NULL)
state->keyboard_focus = surface;
} }
static void static void
@@ -2590,20 +2611,14 @@ static void
activate(struct desktop_shell *shell, struct weston_surface *es, activate(struct desktop_shell *shell, struct weston_surface *es,
struct weston_seat *seat) struct weston_seat *seat)
{ {
struct workspace *ws = get_current_workspace(shell);
struct focus_state *state; struct focus_state *state;
struct workspace *ws;
weston_surface_activate(es, seat); weston_surface_activate(es, seat);
wl_list_for_each(state, &ws->focus_list, link) state = ensure_focus_state(shell, seat);
if (state->seat == seat)
break;
if (&state->link == &ws->focus_list) {
state = focus_state_create(seat, ws);
if (state == NULL) if (state == NULL)
return; return;
}
state->keyboard_focus = es; state->keyboard_focus = es;
wl_list_remove(&state->surface_destroy_listener.link); wl_list_remove(&state->surface_destroy_listener.link);