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

seat: Move the keyboard resource creation over to MetaWaylandKeyboard

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-17 18:22:26 -04:00
parent 5d43e33032
commit 7c6c4d63c5
3 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,12 @@
#include "meta-wayland-private.h" #include "meta-wayland-private.h"
static void
unbind_resource (struct wl_resource *resource)
{
wl_list_remove (wl_resource_get_link (resource));
}
static int static int
create_anonymous_file (off_t size, create_anonymous_file (off_t size,
GError **error) GError **error)
@ -551,3 +557,36 @@ meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard)
else else
return NULL; return NULL;
} }
static void
keyboard_release (struct wl_client *client,
struct wl_resource *resource)
{
wl_resource_destroy (resource);
}
static const struct wl_keyboard_interface keyboard_interface = {
keyboard_release,
};
void
meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
struct wl_client *client,
struct wl_resource *seat_resource,
uint32_t id)
{
struct wl_resource *cr;
cr = wl_resource_create (client, &wl_keyboard_interface,
MIN (META_WL_KEYBOARD_VERSION, wl_resource_get_version (seat_resource)), id);
wl_resource_set_implementation (cr, NULL, keyboard, unbind_resource);
wl_list_insert (&keyboard->resource_list, wl_resource_get_link (cr));
wl_keyboard_send_keymap (cr,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
keyboard->xkb_info.keymap_fd,
keyboard->xkb_info.keymap_size);
if (keyboard->focus_surface && wl_resource_get_client (keyboard->focus_surface->resource) == client)
meta_wayland_keyboard_set_focus (keyboard, keyboard->focus_surface);
}

6
src/wayland/meta-wayland-keyboard.h
View File

@ -143,4 +143,10 @@ meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
struct wl_client * struct wl_client *
meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard); meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard);
void
meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
struct wl_client *client,
struct wl_resource *seat_resource,
uint32_t id);
#endif /* __META_WAYLAND_KEYBOARD_H__ */ #endif /* __META_WAYLAND_KEYBOARD_H__ */

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

@ -32,7 +32,6 @@
#include "meta-wayland-private.h" #include "meta-wayland-private.h"
#include "meta-wayland-keyboard.h" #include "meta-wayland-keyboard.h"
#include "meta-wayland-pointer.h" #include "meta-wayland-pointer.h"
#include "meta-wayland-data-device.h"
#include "meta-window-actor-private.h" #include "meta-window-actor-private.h"
#include "meta/meta-shaped-texture.h" #include "meta/meta-shaped-texture.h"
#include "meta-shaped-texture-private.h" #include "meta-shaped-texture-private.h"
@ -56,17 +55,6 @@ seat_get_pointer (struct wl_client *client,
meta_wayland_pointer_create_new_resource (pointer, client, resource, id); meta_wayland_pointer_create_new_resource (pointer, client, resource, id);
} }
static void
keyboard_release (struct wl_client *client,
struct wl_resource *resource)
{
wl_resource_destroy (resource);
}
static const struct wl_keyboard_interface keyboard_interface = {
keyboard_release,
};
static void static void
seat_get_keyboard (struct wl_client *client, seat_get_keyboard (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
@ -74,20 +62,8 @@ seat_get_keyboard (struct wl_client *client,
{ {
MetaWaylandSeat *seat = wl_resource_get_user_data (resource); MetaWaylandSeat *seat = wl_resource_get_user_data (resource);
MetaWaylandKeyboard *keyboard = &seat->keyboard; MetaWaylandKeyboard *keyboard = &seat->keyboard;
struct wl_resource *cr;
cr = wl_resource_create (client, &wl_keyboard_interface, meta_wayland_keyboard_create_new_resource (keyboard, client, resource, id);
MIN (META_WL_KEYBOARD_VERSION, wl_resource_get_version (resource)), id);
wl_resource_set_implementation (cr, NULL, seat, unbind_resource);
wl_list_insert (&keyboard->resource_list, wl_resource_get_link (cr));
wl_keyboard_send_keymap (cr,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
keyboard->xkb_info.keymap_fd,
keyboard->xkb_info.keymap_size);
if (keyboard->focus_surface && wl_resource_get_client (keyboard->focus_surface->resource) == client)
meta_wayland_keyboard_set_focus (keyboard, keyboard->focus_surface);
} }
static void static void