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

wayland: Add a wrapper for set_input_focus

Browse Source 
So we're not poking into seat internals.
This commit is contained in:
Jasper St. Pierre 2014-07-10 10:13:54 -04:00
parent 664f6ef420
commit a977fcf3d0
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wayland/meta-wayland-seat.c
View File

@ -25,6 +25,7 @@
#include "meta-wayland-private.h" #include "meta-wayland-private.h"
#include "meta-wayland-versions.h" #include "meta-wayland-versions.h"
#include "meta-wayland-data-device.h"
static void static void
unbind_resource (struct wl_resource *resource) unbind_resource (struct wl_resource *resource)
@ -193,6 +194,14 @@ meta_wayland_seat_repick (MetaWaylandSeat *seat)
meta_wayland_pointer_repick (&seat->pointer); meta_wayland_pointer_repick (&seat->pointer);
} }
void
meta_wayland_seat_set_input_focus (MetaWaylandSeat *seat,
MetaWaylandSurface *surface)
{
meta_wayland_keyboard_set_focus (&seat->keyboard, surface);
meta_wayland_data_device_set_keyboard_focus (seat);
}
void void
meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat) meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat)
{ {

3
src/wayland/meta-wayland-seat.h
View File

@ -56,6 +56,9 @@ void meta_wayland_seat_update (MetaWaylandSeat *seat,
gboolean meta_wayland_seat_handle_event (MetaWaylandSeat *seat, gboolean meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
const ClutterEvent *event); const ClutterEvent *event);
void meta_wayland_seat_set_input_focus (MetaWaylandSeat *seat,
MetaWaylandSurface *surface);
void meta_wayland_seat_repick (MetaWaylandSeat *seat); void meta_wayland_seat_repick (MetaWaylandSeat *seat);
void meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat); void meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);

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

@ -187,9 +187,7 @@ meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
{ {
MetaWaylandSurface *surface = window ? window->surface : NULL; MetaWaylandSurface *surface = window ? window->surface : NULL;
meta_wayland_keyboard_set_focus (&compositor->seat->keyboard, meta_wayland_seat_set_input_focus (compositor->seat, surface);
surface);
meta_wayland_data_device_set_keyboard_focus (compositor->seat);
} }
void void