Rename GDK_MOD1_MASK to GDK_ALT_MASK

We've hardcoded Mod1 = Alt for a long time, there is
no need to keep the confusing naming around anymore.

14 files changed, 39 insertions, 39 deletions

diff --git a/gdk/broadway/broadway.js b/gdk/broadway/broadway.js
index 6cb576d40c..bec7343b97 100644
--- a/gdk/broadway/broadway.js
+++ b/gdk/broadway/broadway.js
@@ -78,7 +78,7 @@ const GDK_CROSSING_UNGRAB = 2;
 const GDK_SHIFT_MASK    = 1 << 0;
 const GDK_LOCK_MASK     = 1 << 1;
 const GDK_CONTROL_MASK  = 1 << 2;
-const GDK_MOD1_MASK     = 1 << 3;
+const GDK_ALT_MASK      = 1 << 3;
 const GDK_MOD2_MASK     = 1 << 4;
 const GDK_MOD3_MASK     = 1 << 5;
 const GDK_MOD4_MASK     = 1 << 6;
@@ -1383,13 +1383,13 @@ function updateKeyboardStatus() {
 }
 
 function updateForEvent(ev) {
-    lastState &= ~(GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK);
+    lastState &= ~(GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_ALT_MASK);
     if (ev.shiftKey)
         lastState |= GDK_SHIFT_MASK;
     if (ev.ctrlKey)
         lastState |= GDK_CONTROL_MASK;
     if (ev.altKey)
-        lastState |= GDK_MOD1_MASK;
+        lastState |= GDK_ALT_MASK;
 
     lastTimeStamp = ev.timeStamp;
 }
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 5ab593eefb..b2c28b8262 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -2318,7 +2318,7 @@ gdk_event_get_match (GdkEvent        *event,
   accel_mods = gdk_event_get_modifier_state (event);
 
   if (accel_key == GDK_KEY_Sys_Req &&
-      (accel_mods & GDK_MOD1_MASK) != 0)
+      (accel_mods & GDK_ALT_MASK) != 0)
     {
       /* HACK: we don't want to use SysRq as a keybinding (but we do
        * want Alt+Print), so we avoid translation from Alt+Print to SysRq
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 25e9284e3c..4a908df6ef 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -558,7 +558,7 @@ gdk_keymap_lookup_key (GdkKeymap          *keymap,
  *
  * |[<!-- language="C" -->
  * // We want to ignore irrelevant modifiers like ScrollLock
- * #define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)
+ * #define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_ALT_MASK)
  * state = gdk_event_get_modifier_state (event);
  * gdk_keymap_translate_keyboard_state (keymap,
  *                                      gdk_key_event_get_keycode (event),
@@ -685,13 +685,13 @@ gdk_keymap_real_get_modifier_mask (GdkKeymap         *keymap,
       return GDK_CONTROL_MASK;
 
     case GDK_MODIFIER_INTENT_NO_TEXT_INPUT:
-      return GDK_MOD1_MASK | GDK_CONTROL_MASK;
+      return GDK_ALT_MASK | GDK_CONTROL_MASK;
 
     case GDK_MODIFIER_INTENT_SHIFT_GROUP:
       return 0;
 
     case GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK:
-      return (GDK_SHIFT_MASK   | GDK_CONTROL_MASK | GDK_MOD1_MASK    |
+      return (GDK_SHIFT_MASK   | GDK_CONTROL_MASK | GDK_ALT_MASK    |
 	      GDK_SUPER_MASK   | GDK_HYPER_MASK   | GDK_META_MASK);
 
     default:
@@ -708,7 +708,7 @@ gdk_keymap_real_get_modifier_mask (GdkKeymap         *keymap,
  * uses for a particular purpose.
  *
  * Note that this function always returns real hardware modifiers, not
- * virtual ones (e.g. it will return #GDK_MOD1_MASK rather than
+ * virtual ones (e.g. it will return #GDK_ALT_MASK rather than
  * #GDK_META_MASK if the backend maps MOD1 to META), so there are use
  * cases where the return value of this function has to be transformed
  * by gdk_keymap_add_virtual_modifiers() in order to contain the
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 69f16c40ed..4c9174388f 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -199,7 +199,7 @@ typedef enum
  * @GDK_LOCK_MASK: a Lock key (depending on the modifier mapping of the
  *  X server this may either be CapsLock or ShiftLock).
  * @GDK_CONTROL_MASK: the Control key.
- * @GDK_MOD1_MASK: the fourth modifier key (it depends on the modifier
+ * @GDK_ALT_MASK: the fourth modifier key (it depends on the modifier
  *  mapping of the X server which key is interpreted as this modifier, but
  *  normally it is the Alt key).
  * @GDK_MOD2_MASK: the fifth modifier key (it depends on the modifier
@@ -259,7 +259,7 @@ typedef enum
   GDK_SHIFT_MASK    = 1 << 0,
   GDK_LOCK_MASK     = 1 << 1,
   GDK_CONTROL_MASK  = 1 << 2,
-  GDK_MOD1_MASK     = 1 << 3,
+  GDK_ALT_MASK      = 1 << 3,
   GDK_MOD2_MASK     = 1 << 4,
   GDK_MOD3_MASK     = 1 << 5,
   GDK_MOD4_MASK     = 1 << 6,
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 775e14ba90..49d5cc6aa0 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -288,7 +288,7 @@ get_keyboard_modifiers_from_ns_flags (NSUInteger nsflags)
   if (nsflags & NSControlKeyMask)
     modifiers |= GDK_CONTROL_MASK;
   if (nsflags & NSAlternateKeyMask)
-    modifiers |= GDK_MOD1_MASK;
+    modifiers |= GDK_ALT_MASK;
   if (nsflags & NSCommandKeyMask)
     modifiers |= GDK_MOD2_MASK;
 
@@ -1162,7 +1162,7 @@ fill_key_event (GdkSurface    *window,
           break;
         case GDK_KEY_Alt_R:
         case GDK_KEY_Alt_L:
-          mask = GDK_MOD1_MASK;
+          mask = GDK_ALT_MASK;
           break;
         case GDK_KEY_Control_R:
         case GDK_KEY_Control_L:
@@ -1280,7 +1280,7 @@ _gdk_quartz_events_get_current_keyboard_modifiers (void)
       if (carbon_modifiers & controlKey)
         modifiers |= GDK_CONTROL_MASK;
       if (carbon_modifiers & optionKey)
-        modifiers |= GDK_MOD1_MASK;
+        modifiers |= GDK_ALT_MASK;
       if (carbon_modifiers & cmdKey)
         modifiers |= GDK_MOD2_MASK;
 
diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c
index 6ded6b1a34..6237d0d0cc 100644
--- a/gdk/quartz/gdkkeys-quartz.c
+++ b/gdk/quartz/gdkkeys-quartz.c
@@ -757,10 +757,10 @@ gdk_quartz_keymap_get_modifier_mask (GdkKeymap         *keymap,
       return GDK_MOD2_MASK | GDK_CONTROL_MASK;
 
     case GDK_MODIFIER_INTENT_SHIFT_GROUP:
-      return GDK_MOD1_MASK;
+      return GDK_ALT_MASK;
 
     case GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK:
-      return (GDK_SHIFT_MASK   | GDK_CONTROL_MASK | GDK_MOD1_MASK    |
+      return (GDK_SHIFT_MASK   | GDK_CONTROL_MASK | GDK_ALT_MASK    |
 	      GDK_MOD2_MASK    | GDK_SUPER_MASK   | GDK_HYPER_MASK   |
 	      GDK_META_MASK);
 
diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index b1992057a0..902b9a15b5 100644
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -258,7 +258,7 @@ get_xkb_modifiers (struct xkb_keymap *xkb_keymap,
     mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS);
   if (state & GDK_CONTROL_MASK)
     mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL);
-  if (state & GDK_MOD1_MASK)
+  if (state & GDK_ALT_MASK)
     mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT);
   if (state & GDK_MOD2_MASK)
     mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_NUM);
@@ -291,7 +291,7 @@ get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
   if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL)))
     state |= GDK_CONTROL_MASK;
   if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT)))
-    state |= GDK_MOD1_MASK;
+    state |= GDK_ALT_MASK;
   if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_NUM)))
     state |= GDK_MOD2_MASK;
   if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3")))
@@ -310,7 +310,7 @@ get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
    * rely on that behavior.
    */
   if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Meta")) &&
-      (state & GDK_MOD1_MASK) == 0)
+      (state & GDK_ALT_MASK) == 0)
     state |= GDK_META_MASK;
 
   return state;
diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c
index 569e31f499..dffb8d8c7d 100644
--- a/gdk/win32/gdkdevice-win32.c
+++ b/gdk/win32/gdkdevice-win32.c
@@ -79,7 +79,7 @@ get_current_mask (void)
   if (kbd[VK_CONTROL] & 0x80)
     mask |= GDK_CONTROL_MASK;
   if (kbd[VK_MENU] & 0x80)
-    mask |= GDK_MOD1_MASK;
+    mask |= GDK_ALT_MASK;
   if (kbd[VK_LBUTTON] & 0x80)
     mask |= GDK_BUTTON1_MASK;
   if (kbd[VK_MBUTTON] & 0x80)
diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c
index 2823a16406..5aed3e053a 100644
--- a/gdk/win32/gdkdevice-wintab.c
+++ b/gdk/win32/gdkdevice-wintab.c
@@ -54,7 +54,7 @@ get_current_mask (void)
   if (kbd[VK_CONTROL] & 0x80)
     mask |= GDK_CONTROL_MASK;
   if (kbd[VK_MENU] & 0x80)
-    mask |= GDK_MOD1_MASK;
+    mask |= GDK_ALT_MASK;
   if (kbd[VK_LBUTTON] & 0x80)
     mask |= GDK_BUTTON1_MASK;
   if (kbd[VK_MBUTTON] & 0x80)
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index 393fe6d7c1..592b52a8d4 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -844,7 +844,7 @@ get_modifier_key_state (void)
   if (GetKeyState (VK_SHIFT) < 0)
     state |= GDK_SHIFT_MASK;
   if (GetKeyState (VK_MENU) < 0)
-    state |= GDK_MOD1_MASK;
+    state |= GDK_ALT_MASK;
   if (GetKeyState (VK_CAPITAL) & 0x1)
     state |= GDK_LOCK_MASK;
 
diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index e16ca9643e..a42a497152 100644
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -1869,7 +1869,7 @@ manufacture_keystate_from_GMT (GdkModifierType state)
 {
   DWORD key_state = 0;
 
-  if (state & GDK_MOD1_MASK)
+  if (state & GDK_ALT_MASK)
     key_state |= MK_ALT;
   if (state & GDK_CONTROL_MASK)
     key_state |= MK_CONTROL;
@@ -2415,22 +2415,22 @@ gdk_dnd_handle_key_event (GdkDrag  *drag,
 
         case GDK_KEY_Up:
         case GDK_KEY_KP_Up:
-          dy = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
+          dy = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
           break;
 
         case GDK_KEY_Down:
         case GDK_KEY_KP_Down:
-          dy = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
+          dy = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
           break;
 
         case GDK_KEY_Left:
         case GDK_KEY_KP_Left:
-          dx = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
+          dx = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
           break;
 
         case GDK_KEY_Right:
         case GDK_KEY_KP_Right:
-          dx = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
+          dx = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
           break;
         }
     }
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index b163667a77..fb2867ec83 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -662,14 +662,14 @@ build_key_event_state (BYTE *key_state)
       if (key_state[VK_RCONTROL] & 0x80)
 	state |= GDK_CONTROL_MASK;
       if (key_state[VK_LMENU] & 0x80)
-	state |= GDK_MOD1_MASK;
+	state |= GDK_ALT_MASK;
     }
   else
     {
       if (key_state[VK_CONTROL] & 0x80)
 	state |= GDK_CONTROL_MASK;
       if (key_state[VK_MENU] & 0x80)
-	state |= GDK_MOD1_MASK;
+	state |= GDK_ALT_MASK;
     }
 
   return state;
@@ -724,7 +724,7 @@ build_pointer_event_state (MSG *msg)
     state |= GDK_SHIFT_MASK;
 
   if (GetKeyState (VK_MENU) < 0)
-    state |= GDK_MOD1_MASK;
+    state |= GDK_ALT_MASK;
 
   if (GetKeyState (VK_CAPITAL) & 0x1)
     state |= GDK_LOCK_MASK;
@@ -741,7 +741,7 @@ print_event_state (guint state)
   CASE (SHIFT);
   CASE (LOCK);
   CASE (CONTROL);
-  CASE (MOD1);
+  CASE (ALT);
   CASE (MOD2);
   CASE (MOD3);
   CASE (MOD4);
@@ -2326,9 +2326,9 @@ gdk_event_translate (MSG  *msg,
       both_shift_pressed[0] = both_shift_pressed[1] = 0;
     }
 
-      /* Reset MOD1_MASK if it is the Alt key itself */
+      /* Reset ALT_MASK if it is the Alt key itself */
       if (msg->wParam == VK_MENU)
-	state &= ~GDK_MOD1_MASK;
+	state &= ~GDK_ALT_MASK;
 
       event = gdk_event_key_new ((msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN)
                                    ? GDK_KEY_PRESS
diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index f2856b891b..6aefc9466a 100644
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -2148,7 +2148,7 @@ gdk_drag_get_current_actions (GdkModifierType  state,
     {
       *possible_actions = actions;
 
-      if ((state & (GDK_MOD1_MASK)) && (actions & GDK_ACTION_ASK))
+      if ((state & (GDK_ALT_MASK)) && (actions & GDK_ACTION_ASK))
         *suggested_action = GDK_ACTION_ASK;
       else if (actions & GDK_ACTION_COPY)
         *suggested_action =  GDK_ACTION_COPY;
@@ -2237,22 +2237,22 @@ gdk_dnd_handle_key_event (GdkDrag           *drag,
 
         case GDK_KEY_Up:
         case GDK_KEY_KP_Up:
-          dy = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
+          dy = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
           break;
 
         case GDK_KEY_Down:
         case GDK_KEY_KP_Down:
-          dy = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
+          dy = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
           break;
 
         case GDK_KEY_Left:
         case GDK_KEY_KP_Left:
-          dx = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
+          dx = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
           break;
 
         case GDK_KEY_Right:
         case GDK_KEY_KP_Right:
-          dx = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
+          dx = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
           break;
 
         default:
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 65e40f4bdf..199d600b70 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -401,7 +401,7 @@ update_keymaps (GdkX11Keymap *keymap_x11)
 
           keymap_x11->modmap[i / keymap_x11->mod_keymap->max_keypermod] |= mask;
 
-          /* The fourth modifier, GDK_MOD1_MASK is 1 << 3.
+          /* The fourth modifier, GDK_ALT_MASK is 1 << 3.
            * Each group of max_keypermod entries refers to the same modifier.
            */
           mask = 1 << (i / keymap_x11->mod_keymap->max_keypermod);
@@ -427,7 +427,7 @@ update_keymaps (GdkX11Keymap *keymap_x11)
 
             case GDK_CONTROL_MASK:
             case GDK_SHIFT_MASK:
-            case GDK_MOD1_MASK:
+            case GDK_ALT_MASK:
               /* Some keyboard maps are known to map Mode_Switch as an
                * extra Mod1 key. In circumstances like that, it won't be
                * used to switch groups.