isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-09 03:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

keyboard: Don't use a grab interface for sending key events

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-28 16:29:28 -04:00
parent 19e97ec567
commit eb0c4db46d
3 changed files with 12 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,10 +220,9 @@ keyboard_handle_focus_surface_destroy (struct wl_listener *listener, void *data)
} }
static gboolean static gboolean
default_grab_key (MetaWaylandKeyboardGrab *grab, notify_key (MetaWaylandKeyboard *keyboard,
uint32_t time, uint32_t key, uint32_t state) uint32_t time, uint32_t key, uint32_t state)
{ {
MetaWaylandKeyboard *keyboard = grab->keyboard;
struct wl_resource *resource; struct wl_resource *resource;
struct wl_list *l; struct wl_list *l;
@ -245,11 +244,10 @@ default_grab_key (MetaWaylandKeyboardGrab *grab,
} }
static void static void
default_grab_modifiers (MetaWaylandKeyboardGrab *grab, uint32_t serial, notify_modifiers (MetaWaylandKeyboard *keyboard, uint32_t serial,
uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_depressed, uint32_t mods_latched,
uint32_t mods_locked, uint32_t group) uint32_t mods_locked, uint32_t group)
{ {
MetaWaylandKeyboard *keyboard = grab->keyboard;
struct wl_resource *resource; struct wl_resource *resource;
struct wl_list *l; struct wl_list *l;
@ -261,11 +259,6 @@ default_grab_modifiers (MetaWaylandKeyboardGrab *grab, uint32_t serial,
} }
} }
static const MetaWaylandKeyboardGrabInterface default_keyboard_grab_interface = {
default_grab_key,
default_grab_modifiers,
};
void void
meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard, meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
struct wl_display *display) struct wl_display *display)
@ -279,10 +272,6 @@ meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
keyboard->focus_surface_listener.notify = keyboard_handle_focus_surface_destroy; keyboard->focus_surface_listener.notify = keyboard_handle_focus_surface_destroy;
keyboard->default_grab.interface = &default_keyboard_grab_interface;
keyboard->default_grab.keyboard = keyboard;
keyboard->grab = &keyboard->default_grab;
wl_array_init (&keyboard->keys); wl_array_init (&keyboard->keys);
keyboard->xkb_context = xkb_context_new (0 /* flags */); keyboard->xkb_context = xkb_context_new (0 /* flags */);
@ -370,7 +359,6 @@ void
meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard, meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
const ClutterKeyEvent *event) const ClutterKeyEvent *event)
{ {
MetaWaylandKeyboardGrab *grab = keyboard->grab;
gboolean is_press = event->type == CLUTTER_KEY_PRESS; gboolean is_press = event->type == CLUTTER_KEY_PRESS;
struct xkb_state *state = keyboard->xkb_info.state; struct xkb_state *state = keyboard->xkb_info.state;
enum xkb_state_component changed_state; enum xkb_state_component changed_state;
@ -383,12 +371,12 @@ meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
if (changed_state == 0) if (changed_state == 0)
return; return;
grab->interface->modifiers (grab, notify_modifiers (keyboard,
wl_display_next_serial (keyboard->display), wl_display_next_serial (keyboard->display),
xkb_state_serialize_mods (state, XKB_STATE_MODS_DEPRESSED), xkb_state_serialize_mods (state, XKB_STATE_MODS_DEPRESSED),
xkb_state_serialize_mods (state, XKB_STATE_MODS_LATCHED), xkb_state_serialize_mods (state, XKB_STATE_MODS_LATCHED),
xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED), xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED),
xkb_state_serialize_layout (state, XKB_STATE_LAYOUT_EFFECTIVE)); xkb_state_serialize_layout (state, XKB_STATE_LAYOUT_EFFECTIVE));
} }
gboolean gboolean
@ -407,10 +395,7 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
is_press ? "press" : "release", is_press ? "press" : "release",
event->hardware_keycode); event->hardware_keycode);
handled = keyboard->grab->interface->key (keyboard->grab, handled = notify_key (keyboard, event->time, evdev_code (event), is_press);
event->time,
evdev_code (event),
is_press);
if (handled) if (handled)
meta_verbose ("Sent event to wayland client\n"); meta_verbose ("Sent event to wayland client\n");

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

@ -49,23 +49,6 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
struct _MetaWaylandKeyboardGrabInterface
{
gboolean (*key) (MetaWaylandKeyboardGrab * grab, uint32_t time,
uint32_t key, uint32_t state);
void (*modifiers) (MetaWaylandKeyboardGrab * grab, uint32_t serial,
uint32_t mods_depressed, uint32_t mods_latched,
uint32_t mods_locked, uint32_t group);
};
struct _MetaWaylandKeyboardGrab
{
const MetaWaylandKeyboardGrabInterface *interface;
MetaWaylandKeyboard *keyboard;
MetaWaylandSurface *focus;
uint32_t key;
};
typedef struct typedef struct
{ {
struct xkb_keymap *keymap; struct xkb_keymap *keymap;
@ -86,19 +69,10 @@ struct _MetaWaylandKeyboard
struct wl_listener focus_surface_listener; struct wl_listener focus_surface_listener;
uint32_t focus_serial; uint32_t focus_serial;
MetaWaylandKeyboardGrab *grab;
MetaWaylandKeyboardGrab default_grab;
uint32_t grab_key;
uint32_t grab_serial;
uint32_t grab_time;
struct wl_array keys; struct wl_array keys;
struct xkb_context *xkb_context; struct xkb_context *xkb_context;
MetaWaylandXkbInfo xkb_info; MetaWaylandXkbInfo xkb_info;
MetaWaylandKeyboardGrab input_method_grab;
struct wl_resource *input_method_resource;
}; };
void meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard, void meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,

2
src/wayland/meta-wayland-types.h
View File

@ -27,8 +27,6 @@ typedef struct _MetaWaylandPointer MetaWaylandPointer;
typedef struct _MetaWaylandPointerGrab MetaWaylandPointerGrab; typedef struct _MetaWaylandPointerGrab MetaWaylandPointerGrab;
typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface; typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface;
typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard; typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard;
typedef struct _MetaWaylandKeyboardGrab MetaWaylandKeyboardGrab;
typedef struct _MetaWaylandKeyboardGrabInterface MetaWaylandKeyboardGrabInterface;
typedef struct _MetaWaylandDataOffer MetaWaylandDataOffer; typedef struct _MetaWaylandDataOffer MetaWaylandDataOffer;
typedef struct _MetaWaylandDataSource MetaWaylandDataSource; typedef struct _MetaWaylandDataSource MetaWaylandDataSource;