uint16_t locks[8];
uint16_t ev;
- m = mod;
+ m = _ecore_x_event_modifier(mod);
if (any_mod) m = XCB_BUTTON_MASK_ANY;
locks[0] = 0;
locks[1] = ECORE_X_LOCK_CAPS;
uint16_t m;
uint16_t locks[8];
- m = mod;
+ m = _ecore_x_event_modifier(mod);
if (any_mod) m = XCB_BUTTON_MASK_ANY;
locks[0] = 0;
locks[1] = ECORE_X_LOCK_CAPS;
/* } */
if (keycode == 0) return;
- m = mod;
+ m = _ecore_x_event_modifier(mod);
if (any_mod) m = XCB_BUTTON_MASK_ANY;
locks[0] = 0;
locks[1] = ECORE_X_LOCK_CAPS;
/* } */
if (keycode == 0) return;
- m = mod;
+ m = _ecore_x_event_modifier(mod);
if (any_mod) m = XCB_BUTTON_MASK_ANY;
locks[0] = 0;
locks[1] = ECORE_X_LOCK_CAPS;
/*****************************************************************************/
/*****************************************************************************/
/*****************************************************************************/
+
+static int
+_ecore_x_event_modifier(unsigned int state)
+{
+ int xmodifiers = 0;
+
+ if (state & ECORE_EVENT_MODIFIER_SHIFT) xmodifiers |= ECORE_X_MODIFIER_SHIFT;
+ if (state & ECORE_EVENT_MODIFIER_CTRL) xmodifiers |= ECORE_X_MODIFIER_CTRL;
+ if (state & ECORE_EVENT_MODIFIER_ALT) xmodifiers |= ECORE_X_MODIFIER_ALT;
+ if (state & ECORE_EVENT_MODIFIER_WIN) xmodifiers |= ECORE_X_MODIFIER_WIN;
+ if (state & ECORE_EVENT_LOCK_SCROLL) xmodifiers |= ECORE_X_LOCK_SCROLL;
+ if (state & ECORE_EVENT_LOCK_NUM) xmodifiers |= ECORE_X_LOCK_NUM;
+ if (state & ECORE_EVENT_LOCK_CAPS) xmodifiers |= ECORE_X_LOCK_CAPS;
+
+ return xmodifiers;
+}