summaryrefslogtreecommitdiff
path: root/src/lib/elput/elput_private.h
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-05-26 16:34:10 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-05-26 16:27:42 -0400
commite8fe0bcc47ff44a5afaf8442407248887f716b89 (patch)
tree4fd7e06b862670ab7f87b2aa313f763e77b99cfc /src/lib/elput/elput_private.h
parent6ddcd48fdeb57fc5b237825df709a2e3746e845e (diff)
elput/drm: redo xkb context/keymap setting
context and keymap need to be set at the same time in order to effectively update keyboard state, and active group should be accessible through api as well preserve old function ABI to ensure old binaries don't crash
Diffstat (limited to 'src/lib/elput/elput_private.h')
-rw-r--r--src/lib/elput/elput_private.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/elput/elput_private.h b/src/lib/elput/elput_private.h
index c6e3c81d83..4c7881e0ef 100644
--- a/src/lib/elput/elput_private.h
+++ b/src/lib/elput/elput_private.h
@@ -135,9 +135,9 @@ struct _Elput_Keyboard
135 } grab; 135 } grab;
136 136
137 Elput_Keyboard_Info *info; 137 Elput_Keyboard_Info *info;
138 unsigned int key_count;
138 139
139 struct xkb_state *state; 140 struct xkb_state *state;
140 struct xkb_keymap *pending_map;
141 struct xkb_state *maskless_state; 141 struct xkb_state *maskless_state;
142 struct xkb_context *context; 142 struct xkb_context *context;
143 struct xkb_rule_names names; 143 struct xkb_rule_names names;
@@ -146,7 +146,7 @@ struct _Elput_Keyboard
146 146
147 Elput_Seat *seat; 147 Elput_Seat *seat;
148 148
149 Eina_Bool external_map : 1; 149 Eina_Bool pending_keymap : 1;
150}; 150};
151 151
152struct _Elput_Pointer 152struct _Elput_Pointer
@@ -261,6 +261,7 @@ struct _Elput_Manager
261 { 261 {
262 struct xkb_keymap *keymap; 262 struct xkb_keymap *keymap;
263 struct xkb_context *context; 263 struct xkb_context *context;
264 int group;
264 } cached; 265 } cached;
265 266
266 Elput_Input input; 267 Elput_Input input;
@@ -292,4 +293,7 @@ Elput_Touch *_evdev_touch_get(Elput_Seat *seat);
292 293
293extern Elput_Interface _logind_interface; 294extern Elput_Interface _logind_interface;
294 295
296void _keyboard_keymap_update(Elput_Seat *seat);
297void _keyboard_group_update(Elput_Seat *seat);
298
295#endif 299#endif