jsuya
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore xim: Use ecore x modifiers 

So if the users do a strange remapping it will work for them

SVN revision: 72955
This commit is contained in:
Sebastian Dransfeld 2012-06-27 17:54:08 +00:00
parent 5b4186f41d
commit 199b08fccf
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/ecore/src/modules/immodules/xim/ecore_imf_xim.c
View File

@ -10,7 +10,6 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xlocale.h> #include <X11/Xlocale.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysym.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -565,23 +564,23 @@ _ecore_x_event_reverse_modifiers(unsigned int state)
/**< "Control" is pressed */ /**< "Control" is pressed */
if (state & ECORE_IMF_KEYBOARD_MODIFIER_CTRL) if (state & ECORE_IMF_KEYBOARD_MODIFIER_CTRL)
modifiers |= ControlMask; modifiers |= ECORE_X_MODIFIER_CTRL;
/**< "Alt" is pressed */ /**< "Alt" is pressed */
if (state & ECORE_IMF_KEYBOARD_MODIFIER_ALT) if (state & ECORE_IMF_KEYBOARD_MODIFIER_ALT)
modifiers |= Mod1Mask; modifiers |= ECORE_X_MODIFIER_ALT;
/**< "Shift" is pressed */ /**< "Shift" is pressed */
if (state & ECORE_IMF_KEYBOARD_MODIFIER_SHIFT) if (state & ECORE_IMF_KEYBOARD_MODIFIER_SHIFT)
modifiers |= ShiftMask; modifiers |= ECORE_X_MODIFIER_SHIFT;
/**< "Win" (between "Ctrl" and "Alt") is pressed */ /**< "Win" (between "Ctrl" and "Alt") is pressed */
if (state & ECORE_IMF_KEYBOARD_MODIFIER_WIN) if (state & ECORE_IMF_KEYBOARD_MODIFIER_WIN)
modifiers |= Mod4Mask; modifiers |= ECORE_X_MODIFIER_WIN;
/**< "AltGr" is pressed */ /**< "AltGr" is pressed */
if (state & ECORE_IMF_KEYBOARD_MODIFIER_MODE) if (state & ECORE_IMF_KEYBOARD_MODIFIER_MODE)
modifiers |= Mod5Mask; modifiers |= ECORE_X_MODIFIER_MODE;
return modifiers; return modifiers;
} }
@ -593,14 +592,14 @@ _ecore_x_event_reverse_locks(unsigned int state)
/**< "Num" lock is active */ /**< "Num" lock is active */
if (state & ECORE_IMF_KEYBOARD_LOCK_NUM) if (state & ECORE_IMF_KEYBOARD_LOCK_NUM)
locks |= Mod3Mask; locks |= ECORE_X_LOCK_NUM;
if (state & ECORE_IMF_KEYBOARD_LOCK_CAPS) if (state & ECORE_IMF_KEYBOARD_LOCK_CAPS)
locks |= LockMask; locks |= ECORE_X_LOCK_CAPS;
#if 0 /* FIXME: add mask. */ #if 0 /* FIXME: add mask. */
if (state & ECORE_IMF_KEYBOARD_LOCK_SCROLL) if (state & ECORE_IMF_KEYBOARD_LOCK_SCROLL)
; locks |= ECORE_X_LOCK_SCROLL;
#endif #endif
return locks; return locks;