summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm2/ecore_drm2_device.c
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/ecore_drm2/ecore_drm2_device.c
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/ecore_drm2/ecore_drm2_device.c')
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_device.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c
index dbd95fe465..f225ad8129 100644
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -777,19 +777,19 @@ ecore_drm2_device_pointer_max_set(Ecore_Drm2_Device *device, int w, int h)
777} 777}
778 778
779EAPI void 779EAPI void
780ecore_drm2_device_keyboard_cached_context_set(Ecore_Drm2_Device *device, void *context) 780ecore_drm2_device_keyboard_info_set(Ecore_Drm2_Device *device, void *context, void *keymap, int group)
781{ 781{
782 EINA_SAFETY_ON_NULL_RETURN(device); 782 EINA_SAFETY_ON_NULL_RETURN(device);
783 783
784 elput_input_keyboard_cached_context_set(device->em, context); 784 elput_input_keyboard_info_set(device->em, context, keymap, group);
785} 785}
786 786
787EAPI void 787EAPI void
788ecore_drm2_device_keyboard_cached_keymap_set(Ecore_Drm2_Device *device, void *keymap) 788ecore_drm2_device_keyboard_group_set(Ecore_Drm2_Device *device, int group)
789{ 789{
790 EINA_SAFETY_ON_NULL_RETURN(device); 790 EINA_SAFETY_ON_NULL_RETURN(device);
791 791
792 elput_input_keyboard_cached_keymap_set(device->em, keymap); 792 elput_input_keyboard_group_set(device->em, group);
793} 793}
794 794
795EAPI unsigned int * 795EAPI unsigned int *
@@ -848,3 +848,7 @@ ecore_drm2_device_prefer_shadow(Ecore_Drm2_Device *device)
848 else 848 else
849 return EINA_FALSE; 849 return EINA_FALSE;
850} 850}
851
852/* prevent crashing with old apps compiled against these functions */
853EAPI void ecore_drm2_device_keyboard_cached_context_set(){};
854EAPI void ecore_drm2_device_keyboard_cached_keymap_set(){};