summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib/ecore_x/xlib
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2012-06-28 07:30:32 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2012-06-28 07:30:32 +0000
commit1676ef5aad8ee8f4ab93b1c7ed1ef1650752bd28 (patch)
tree59c27b72016d4e8d0a8a1d8a8a974b283e926188 /legacy/ecore/src/lib/ecore_x/xlib
parent1374ce7d6b97ec50ba316dde82ab639f8a3baf41 (diff)
ecore: Rename Mode to AltGr
SVN revision: 72980
Diffstat (limited to 'legacy/ecore/src/lib/ecore_x/xlib')
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c8
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
index fc0d056..ce3cd57 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
@@ -130,7 +130,7 @@ EAPI int ECORE_X_MODIFIER_SHIFT = 0;
130EAPI int ECORE_X_MODIFIER_CTRL = 0; 130EAPI int ECORE_X_MODIFIER_CTRL = 0;
131EAPI int ECORE_X_MODIFIER_ALT = 0; 131EAPI int ECORE_X_MODIFIER_ALT = 0;
132EAPI int ECORE_X_MODIFIER_WIN = 0; 132EAPI int ECORE_X_MODIFIER_WIN = 0;
133EAPI int ECORE_X_MODIFIER_MODE = 0; 133EAPI int ECORE_X_MODIFIER_ALTGR = 0;
134 134
135EAPI int ECORE_X_LOCK_SCROLL = 0; 135EAPI int ECORE_X_LOCK_SCROLL = 0;
136EAPI int ECORE_X_LOCK_NUM = 0; 136EAPI int ECORE_X_LOCK_NUM = 0;
@@ -243,7 +243,7 @@ _ecore_x_modifiers_get(void)
243 if (!ECORE_X_MODIFIER_WIN) 243 if (!ECORE_X_MODIFIER_WIN)
244 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L); 244 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L);
245 245
246 ECORE_X_MODIFIER_MODE = _ecore_x_key_mask_get(XK_Mode_switch); 246 ECORE_X_MODIFIER_ALTGR = _ecore_x_key_mask_get(XK_Mode_switch);
247 247
248 if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT) 248 if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT)
249 ECORE_X_MODIFIER_WIN = 0; 249 ECORE_X_MODIFIER_WIN = 0;
@@ -2156,8 +2156,8 @@ _ecore_x_event_modifier(unsigned int state)
2156 if (state & ECORE_EVENT_MODIFIER_WIN) 2156 if (state & ECORE_EVENT_MODIFIER_WIN)
2157 xmodifiers |= ECORE_X_MODIFIER_WIN; 2157 xmodifiers |= ECORE_X_MODIFIER_WIN;
2158 2158
2159 if (state & ECORE_EVENT_MODIFIER_MODE) 2159 if (state & ECORE_EVENT_MODIFIER_ALTGR)
2160 xmodifiers |= ECORE_X_MODIFIER_MODE; 2160 xmodifiers |= ECORE_X_MODIFIER_ALTGR;
2161 2161
2162 if (state & ECORE_EVENT_LOCK_SCROLL) 2162 if (state & ECORE_EVENT_LOCK_SCROLL)
2163 xmodifiers |= ECORE_X_LOCK_SCROLL; 2163 xmodifiers |= ECORE_X_LOCK_SCROLL;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
index 6125a4e..30a3924 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -183,8 +183,8 @@ _ecore_x_event_modifiers(unsigned int state)
183 if (state & ECORE_X_MODIFIER_WIN) 183 if (state & ECORE_X_MODIFIER_WIN)
184 modifiers |= ECORE_EVENT_MODIFIER_WIN; 184 modifiers |= ECORE_EVENT_MODIFIER_WIN;
185 185
186 if (state & ECORE_X_MODIFIER_MODE) 186 if (state & ECORE_X_MODIFIER_ALTGR)
187 modifiers |= ECORE_EVENT_MODIFIER_MODE; 187 modifiers |= ECORE_EVENT_MODIFIER_ALTGR;
188 188
189 if (state & ECORE_X_LOCK_SCROLL) 189 if (state & ECORE_X_LOCK_SCROLL)
190 modifiers |= ECORE_EVENT_LOCK_SCROLL; 190 modifiers |= ECORE_EVENT_LOCK_SCROLL;