summaryrefslogtreecommitdiff
path: root/src/wayland/meta-wayland-keyboard.h
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-04-17 18:50:16 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-04-17 19:15:51 -0400
commit4f2dc77ec3304166fc75d6f9270aef5b74c9d9ff (patch)
tree32e415ea3599ed5234702564f51667e00a26be89 /src/wayland/meta-wayland-keyboard.h
parent678fa52ae19b45620cfa87aece4ce082cd82ef56 (diff)
downloadmutter-4f2dc77ec3304166fc75d6f9270aef5b74c9d9ff.tar.gz
keyboard: Reorder
The correct order is: init release update handle_event set_focus start_grab end_grab other stuff
Diffstat (limited to 'src/wayland/meta-wayland-keyboard.h')
-rw-r--r--src/wayland/meta-wayland-keyboard.h29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/wayland/meta-wayland-keyboard.h b/src/wayland/meta-wayland-keyboard.h
index 38011c980..972bfc5ac 100644
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -105,18 +105,13 @@ gboolean
meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
struct wl_display *display);
-typedef enum {
- META_WAYLAND_KEYBOARD_SKIP_XCLIENTS = 1,
-} MetaWaylandKeyboardSetKeymapFlags;
+void
+meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard);
void
-meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
- const char *rules,
- const char *model,
- const char *layout,
- const char *variant,
- const char *options,
- int flags);
+meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
+ const ClutterKeyEvent *event);
+
gboolean
meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
const ClutterKeyEvent *event);
@@ -132,12 +127,18 @@ meta_wayland_keyboard_start_grab (MetaWaylandKeyboard *device,
void
meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard);
-void
-meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard);
+typedef enum {
+ META_WAYLAND_KEYBOARD_SKIP_XCLIENTS = 1,
+} MetaWaylandKeyboardSetKeymapFlags;
void
-meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
- const ClutterKeyEvent *event);
+meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
+ const char *rules,
+ const char *model,
+ const char *layout,
+ const char *variant,
+ const char *options,
+ int flags);
struct wl_client *
meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard);