isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Tie activate / deactivate to appears-focused

Browse Source 
... rather than actual focus. This makes things behave better.
This commit is contained in:
Jasper St. Pierre 2014-02-18 23:03:56 -05:00
parent 374e30043b
commit 7615d17293
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/window.c
View File

@ -6360,6 +6360,14 @@ meta_window_appears_focused_changed (MetaWindow *window)
if (window->frame) if (window->frame)
meta_frame_queue_draw (window->frame); meta_frame_queue_draw (window->frame);
if (window->surface)
{
if (meta_window_appears_focused (window))
meta_wayland_surface_activated (window->surface);
else
meta_wayland_surface_deactivated (window->surface);
}
} }
/** /**

4
src/wayland/meta-wayland-keyboard.c
View File

@ -542,8 +542,6 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
struct wl_display *display = wl_client_get_display (client); struct wl_display *display = wl_client_get_display (client);
serial = wl_display_next_serial (display); serial = wl_display_next_serial (display);
wl_keyboard_send_leave (resource, serial, keyboard->focus_surface->resource); wl_keyboard_send_leave (resource, serial, keyboard->focus_surface->resource);
meta_wayland_surface_deactivated (keyboard->focus_surface);
} }
wl_list_remove (&keyboard->focus_resource_listener.link); wl_list_remove (&keyboard->focus_resource_listener.link);
@ -584,8 +582,6 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
&keyboard->keys); &keyboard->keys);
} }
meta_wayland_surface_activated (surface);
keyboard->focus_resource = resource; keyboard->focus_resource = resource;
keyboard->focus_surface = surface; keyboard->focus_surface = surface;