summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2013-03-11 14:17:07 +0000
committerChris Michael <cp.michael@samsung.com>2013-03-21 07:21:46 +0000
commit964012accd2ba7f91e00770ed8c285b89affa23c (patch)
treea6af3aec6a3290c16dae572b0bffc1c699b50c79
parent2f8ac337894913b3d063b5d49189950ae9b04e20 (diff)
downloadenlightenment-964012accd2ba7f91e00770ed8c285b89affa23c.tar.gz
Add include header for xkbcommon.
Add Keyboard Information structure Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/bin/e_comp_wl.h21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 199e318b7e..d360d908e8 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -4,6 +4,7 @@
# define E_COMP_WL_H
# include <wayland-server.h>
+# include <xkbcommon/xkbcommon.h>
# define LOGFNS 1
@@ -27,6 +28,7 @@ typedef struct _E_Wayland_Shell_Interface E_Wayland_Shell_Interface;
typedef struct _E_Wayland_Region E_Wayland_Region;
typedef struct _E_Wayland_Frame_Cb E_Wayland_Frame_Cb;
typedef struct _E_Wayland_Compositor E_Wayland_Compositor;
+typedef struct _E_Wayland_Kbd_Info E_Wayland_Kbd_Info;
typedef struct _E_Wayland_Input E_Wayland_Input;
enum _E_Wayland_Compositor_State
@@ -170,11 +172,24 @@ struct _E_Wayland_Compositor
E_Wayland_Input *input;
+ struct
+ {
+ struct xkb_rule_names names;
+ struct xkb_context *context;
+ } xkb;
+
Ecore_Fd_Handler *fd_handler;
void (*ping_cb) (E_Wayland_Surface *ews, unsigned int serial);
};
+struct _E_Wayland_Kbd_Info
+{
+ struct xkb_keymap *keymap;
+ xkb_mod_index_t mod_shift, mod_caps, mod_ctrl, mod_alt, mod_super;
+ /* TODO: handle leds ? */
+};
+
struct _E_Wayland_Input
{
struct
@@ -186,6 +201,12 @@ struct _E_Wayland_Input
struct wl_list link;
} wl;
+ struct
+ {
+ E_Wayland_Kbd_Info *info;
+ struct xkb_state *state;
+ } xkb;
+
/* E_Wayland_Surface *sprite; */
struct wl_surface *focus;