brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Immediately give keyboard focus to Wayland popups

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-10-06 16:58:39 -07:00
parent 993bec37d7
commit 082cc9c83a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1067,6 +1067,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
MetaWaylandSurface *parent_surf = wl_resource_get_user_data (parent_resource); MetaWaylandSurface *parent_surf = wl_resource_get_user_data (parent_resource);
MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource); MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
MetaWindow *window; MetaWindow *window;
MetaDisplay *display = meta_get_display ();
if (parent_surf == NULL || parent_surf->window == NULL) if (parent_surf == NULL || parent_surf->window == NULL)
return; return;
@ -1085,7 +1086,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
surface->xdg_shell_resource = resource; surface->xdg_shell_resource = resource;
window = meta_window_wayland_new (meta_get_display (), surface); window = meta_window_wayland_new (display, surface);
meta_window_move_frame (window, FALSE, meta_window_move_frame (window, FALSE,
parent_surf->window->rect.x + x, parent_surf->window->rect.x + x,
parent_surf->window->rect.y + y); parent_surf->window->rect.y + y);
@ -1096,6 +1097,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
meta_wayland_surface_set_window (surface, window); meta_wayland_surface_set_window (surface, window);
meta_window_focus (window, meta_display_get_current_time (display));
meta_wayland_pointer_start_popup_grab (&seat->pointer, surface); meta_wayland_pointer_start_popup_grab (&seat->pointer, surface);
} }