ecore: Rename Mode to AltGr

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@72980 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h
index 135d656..d9cff62 100644 (file)
--- a/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@@ -117,7 +117,7 @@ typedef enum
    ECORE_IMF_KEYBOARD_MODIFIER_ALT   = 1 << 1, /**< "Alt" is pressed */
    ECORE_IMF_KEYBOARD_MODIFIER_SHIFT = 1 << 2, /**< "Shift" is pressed */
    ECORE_IMF_KEYBOARD_MODIFIER_WIN   = 1 << 3, /**< "Win" (between "Ctrl" and "Alt") is pressed */
-   ECORE_IMF_KEYBOARD_MODIFIER_MODE  = 1 << 4  /**< "AltGr" is pressed @since 1.3 */
+   ECORE_IMF_KEYBOARD_MODIFIER_ALTGR = 1 << 4  /**< "AltGr" is pressed @since 1.3 */
 } Ecore_IMF_Keyboard_Modifiers;
 
 /**

diff --git a/src/lib/ecore_imf_evas/ecore_imf_evas.c b/src/lib/ecore_imf_evas/ecore_imf_evas.c
index 549b38a..cd6ec41 100644 (file)
--- a/src/lib/ecore_imf_evas/ecore_imf_evas.c
+++ b/src/lib/ecore_imf_evas/ecore_imf_evas.c
@@ -33,8 +33,8 @@ _ecore_imf_evas_event_modifiers_wrap(Evas_Modifier *evas_modifiers,
      *imf_keyboard_modifiers |= ECORE_IMF_KEYBOARD_MODIFIER_SHIFT;
    if (evas_key_modifier_is_set(evas_modifiers, "Super") || evas_key_modifier_is_set(evas_modifiers, "Hyper"))
      *imf_keyboard_modifiers |= ECORE_IMF_KEYBOARD_MODIFIER_WIN;
-   if (evas_key_modifier_is_set(evas_modifiers, "Mode"))
-     *imf_keyboard_modifiers |= ECORE_IMF_KEYBOARD_MODIFIER_MODE;
+   if (evas_key_modifier_is_set(evas_modifiers, "AltGr"))
+     *imf_keyboard_modifiers |= ECORE_IMF_KEYBOARD_MODIFIER_ALTGR;
 }
 
 /* Converts the Evas locks to Ecore_IMF keyboard locks */

diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h
index c292308..f73dacf 100644 (file)
--- a/src/lib/ecore_input/Ecore_Input.h
+++ b/src/lib/ecore_input/Ecore_Input.h
@@ -57,7 +57,7 @@ extern "C" {
 #define ECORE_EVENT_LOCK_NUM            0x0100
 #define ECORE_EVENT_LOCK_CAPS           0x0200
 #define ECORE_EVENT_LOCK_SHIFT          0x0300
-#define ECORE_EVENT_MODIFIER_MODE       0x0400 /**< @since 1.3 */
+#define ECORE_EVENT_MODIFIER_ALTGR      0x0400 /**< @since 1.3 */
 
    typedef uintptr_t                        Ecore_Window;
    typedef struct _Ecore_Event_Key          Ecore_Event_Key;

diff --git a/src/lib/ecore_input/ecore_input.c b/src/lib/ecore_input/ecore_input.c
index 9d29d44..8917409 100644 (file)
--- a/src/lib/ecore_input/ecore_input.c
+++ b/src/lib/ecore_input/ecore_input.c
@@ -88,7 +88,7 @@ static const Ecore_Event_Modifier_Match matchs[] = {
   { "Caps_Lock", ECORE_CAPS, ECORE_EVENT_MODIFIER_CAPS },
   { "Super_L", ECORE_WIN, ECORE_EVENT_MODIFIER_WIN },
   { "Super_R", ECORE_WIN, ECORE_EVENT_MODIFIER_WIN },
-  { "ISO_Level3_Shift", ECORE_MODE, ECORE_EVENT_MODIFIER_MODE },
+  { "ISO_Level3_Shift", ECORE_MODE, ECORE_EVENT_MODIFIER_ALTGR },
   { "Scroll_Lock", ECORE_SCROLL, ECORE_EVENT_MODIFIER_SCROLL }
 };
 

diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c
index 8c149e5..d512dc0 100644 (file)
--- a/src/lib/ecore_input_evas/ecore_input_evas.c
+++ b/src/lib/ecore_input_evas/ecore_input_evas.c
@@ -55,9 +55,9 @@ ecore_event_evas_modifier_lock_update(Evas *e, unsigned int modifiers)
         evas_key_modifier_off(e, "Hyper");
      }
 
-   if (modifiers & ECORE_EVENT_MODIFIER_MODE)
-     evas_key_modifier_on(e, "Mode");
-   else evas_key_modifier_off(e, "Mode");
+   if (modifiers & ECORE_EVENT_MODIFIER_ALTGR)
+     evas_key_modifier_on(e, "AltGr");
+   else evas_key_modifier_off(e, "AltGr");
 
    if (modifiers & ECORE_EVENT_LOCK_SCROLL)
      evas_key_lock_on(e, "Scroll_Lock");
@@ -104,7 +104,7 @@ ecore_event_window_register(Ecore_Window id, void *window, Evas *evas,
    evas_key_modifier_add(evas, "Meta");
    evas_key_modifier_add(evas, "Hyper");
    evas_key_modifier_add(evas, "Super");
-   evas_key_modifier_add(evas, "Mode");
+   evas_key_modifier_add(evas, "AltGr");
    evas_key_lock_add(evas, "Caps_Lock");
    evas_key_lock_add(evas, "Num_Lock");
    evas_key_lock_add(evas, "Scroll_Lock");

diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 3dc13ab..97163ec 100644 (file)
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -989,7 +989,7 @@ EAPI extern int ECORE_X_MODIFIER_SHIFT; /**< @since 1.3 */
 EAPI extern int ECORE_X_MODIFIER_CTRL;  /**< @since 1.3 */
 EAPI extern int ECORE_X_MODIFIER_ALT;   /**< @since 1.3 */
 EAPI extern int ECORE_X_MODIFIER_WIN;   /**< @since 1.3 */
-EAPI extern int ECORE_X_MODIFIER_MODE;  /**< @since 1.3 */
+EAPI extern int ECORE_X_MODIFIER_ALTGR; /**< @since 1.3 */
 
 EAPI extern int ECORE_X_LOCK_SCROLL;
 EAPI extern int ECORE_X_LOCK_NUM;

diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c
index ce38fae..5b7d974 100644 (file)
--- a/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c
@@ -550,8 +550,8 @@ _ecore_xcb_events_modifiers_get(unsigned int state)
      modifiers |= ECORE_EVENT_MODIFIER_ALT;
    if (state & ECORE_X_MODIFIER_WIN)
      modifiers |= ECORE_EVENT_MODIFIER_WIN;
-   if (state & ECORE_X_MODIFIER_MODE)
-     modifiers |= ECORE_EVENT_MODIFIER_MODE;
+   if (state & ECORE_X_MODIFIER_ALTGR)
+     modifiers |= ECORE_EVENT_MODIFIER_ALTGR;
    if (state & ECORE_X_LOCK_SCROLL)
      modifiers |= ECORE_EVENT_LOCK_SCROLL;
    if (state & ECORE_X_LOCK_CAPS)

diff --git a/src/lib/ecore_x/xcb/ecore_xcb_keymap.c b/src/lib/ecore_x/xcb/ecore_xcb_keymap.c
index d707f02..6c11246 100644 (file)
--- a/src/lib/ecore_x/xcb/ecore_xcb_keymap.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_keymap.c
@@ -27,7 +27,7 @@ EAPI int ECORE_X_MODIFIER_SHIFT = 0;
 EAPI int ECORE_X_MODIFIER_CTRL = 0;
 EAPI int ECORE_X_MODIFIER_ALT = 0;
 EAPI int ECORE_X_MODIFIER_WIN = 0;
-EAPI int ECORE_X_MODIFIER_MODE = 0;
+EAPI int ECORE_X_MODIFIER_ALTGR = 0;
 EAPI int ECORE_X_LOCK_SCROLL = 0;
 EAPI int ECORE_X_LOCK_NUM = 0;
 EAPI int ECORE_X_LOCK_CAPS = 0;
@@ -73,7 +73,7 @@ _ecore_xcb_keymap_finalize(void)
    if (!ECORE_X_MODIFIER_WIN)
      ECORE_X_MODIFIER_WIN = _ecore_xcb_keymap_mask_get(reply, XK_Meta_L);
 
-   ECORE_X_MODIFIER_MODE = _ecore_xcb_keymap_mask_get(reply, XK_Mode_switch);
+   ECORE_X_MODIFIER_ALTGR = _ecore_xcb_keymap_mask_get(reply, XK_Mode_switch);
 
    if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT)
      ECORE_X_MODIFIER_WIN = 0;

diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window.c b/src/lib/ecore_x/xcb/ecore_xcb_window.c
index 065c296..8e38c5a 100644 (file)
--- a/src/lib/ecore_x/xcb/ecore_xcb_window.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window.c
@@ -2186,8 +2186,8 @@ _ecore_xcb_window_modifiers_get(unsigned int state)
      xmodifiers |= ECORE_X_MODIFIER_ALT;
    if (state & ECORE_EVENT_MODIFIER_WIN)
      xmodifiers |= ECORE_X_MODIFIER_WIN;
-   if (state & ECORE_EVENT_MODIFIER_MODE)
-     xmodifiers |= ECORE_X_MODIFIER_MODE;
+   if (state & ECORE_EVENT_MODIFIER_ALTGR)
+     xmodifiers |= ECORE_X_MODIFIER_ALTGR;
    if (state & ECORE_EVENT_LOCK_SCROLL)
      xmodifiers |= ECORE_X_LOCK_SCROLL;
    if (state & ECORE_EVENT_LOCK_NUM)

diff --git a/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c
index fc0d056..ce3cd57 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x.c
+++ b/src/lib/ecore_x/xlib/ecore_x.c
@@ -130,7 +130,7 @@ EAPI int ECORE_X_MODIFIER_SHIFT = 0;
 EAPI int ECORE_X_MODIFIER_CTRL = 0;
 EAPI int ECORE_X_MODIFIER_ALT = 0;
 EAPI int ECORE_X_MODIFIER_WIN = 0;
-EAPI int ECORE_X_MODIFIER_MODE = 0;
+EAPI int ECORE_X_MODIFIER_ALTGR = 0;
 
 EAPI int ECORE_X_LOCK_SCROLL = 0;
 EAPI int ECORE_X_LOCK_NUM = 0;
@@ -243,7 +243,7 @@ _ecore_x_modifiers_get(void)
    if (!ECORE_X_MODIFIER_WIN)
      ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L);
 
-   ECORE_X_MODIFIER_MODE = _ecore_x_key_mask_get(XK_Mode_switch);
+   ECORE_X_MODIFIER_ALTGR = _ecore_x_key_mask_get(XK_Mode_switch);
 
    if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT)
      ECORE_X_MODIFIER_WIN = 0;
@@ -2156,8 +2156,8 @@ _ecore_x_event_modifier(unsigned int state)
    if (state & ECORE_EVENT_MODIFIER_WIN)
      xmodifiers |= ECORE_X_MODIFIER_WIN;
 
-   if (state & ECORE_EVENT_MODIFIER_MODE)
-     xmodifiers |= ECORE_X_MODIFIER_MODE;
+   if (state & ECORE_EVENT_MODIFIER_ALTGR)
+     xmodifiers |= ECORE_X_MODIFIER_ALTGR;
 
    if (state & ECORE_EVENT_LOCK_SCROLL)
      xmodifiers |= ECORE_X_LOCK_SCROLL;

diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c
index 6125a4e..30a3924 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -183,8 +183,8 @@ _ecore_x_event_modifiers(unsigned int state)
    if (state & ECORE_X_MODIFIER_WIN)
      modifiers |= ECORE_EVENT_MODIFIER_WIN;
 
-   if (state & ECORE_X_MODIFIER_MODE)
-     modifiers |= ECORE_EVENT_MODIFIER_MODE;
+   if (state & ECORE_X_MODIFIER_ALTGR)
+     modifiers |= ECORE_EVENT_MODIFIER_ALTGR;
 
    if (state & ECORE_X_LOCK_SCROLL)
      modifiers |= ECORE_EVENT_LOCK_SCROLL;

diff --git a/src/modules/immodules/xim/ecore_imf_xim.c b/src/modules/immodules/xim/ecore_imf_xim.c
index 96520bd..f5aabd0 100644 (file)
--- a/src/modules/immodules/xim/ecore_imf_xim.c
+++ b/src/modules/immodules/xim/ecore_imf_xim.c
@@ -579,8 +579,8 @@ _ecore_x_event_reverse_modifiers(unsigned int state)
      modifiers |= ECORE_X_MODIFIER_WIN;
 
    /**< "AltGr" is pressed */
-   if (state & ECORE_IMF_KEYBOARD_MODIFIER_MODE)
-     modifiers |= ECORE_X_MODIFIER_MODE;
+   if (state & ECORE_IMF_KEYBOARD_MODIFIER_ALTGR)
+     modifiers |= ECORE_X_MODIFIER_ALTGR;
 
    return modifiers;
 }