From 66171f104588a280e598ceb38dc90d9acdce060f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Sun, 21 Nov 2021 12:01:16 +0100
Subject: [PATCH] =?UTF-8?q?input:=20rename=20=E2=80=98meta=E2=80=99=20to?=
 =?UTF-8?q?=20=E2=80=98super=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 input.c    | 22 +++++++++++-----------
 terminal.c |  2 +-
 wayland.h  |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/input.c b/input.c
index 06f5b731..fed52a49 100644
--- a/input.c
+++ b/input.c
@@ -368,8 +368,8 @@ conf_modifiers_to_mask(const struct seat *seat,
         mods |= modifiers->ctrl << seat->kbd.mod_ctrl;
     if (seat->kbd.mod_alt != XKB_MOD_INVALID)
         mods |= modifiers->alt << seat->kbd.mod_alt;
-    if (seat->kbd.mod_meta != XKB_MOD_INVALID)
-        mods |= modifiers->meta << seat->kbd.mod_meta;
+    if (seat->kbd.mod_super != XKB_MOD_INVALID)
+        mods |= modifiers->meta << seat->kbd.mod_super;
     return mods;
 }
 
@@ -677,7 +677,7 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
         seat->kbd.mod_shift = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_SHIFT);
         seat->kbd.mod_alt = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_ALT) ;
         seat->kbd.mod_ctrl = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_CTRL);
-        seat->kbd.mod_meta = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_LOGO);
+        seat->kbd.mod_super = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_LOGO);
         seat->kbd.mod_caps = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_CAPS);
         seat->kbd.mod_num = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_NUM);
 
@@ -688,8 +688,8 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
             seat->kbd.bind_significant |= 1 << seat->kbd.mod_alt;
         if (seat->kbd.mod_ctrl != XKB_MOD_INVALID)
             seat->kbd.bind_significant |= 1 << seat->kbd.mod_ctrl;
-        if (seat->kbd.mod_meta != XKB_MOD_INVALID)
-            seat->kbd.bind_significant |= 1 << seat->kbd.mod_meta;
+        if (seat->kbd.mod_super != XKB_MOD_INVALID)
+            seat->kbd.bind_significant |= 1 << seat->kbd.mod_super;
 
         seat->kbd.kitty_significant = seat->kbd.bind_significant;
         if (seat->kbd.mod_caps != XKB_MOD_INVALID)
@@ -801,7 +801,7 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
     seat->kbd.shift = false;
     seat->kbd.alt = false;
     seat->kbd.ctrl = false;
-    seat->kbd.meta = false;
+    seat->kbd.super = false;
     if (seat->kbd.xkb_compose_state != NULL)
         xkb_compose_state_reset(seat->kbd.xkb_compose_state);
 
@@ -1028,7 +1028,7 @@ legacy_kbd_protocol(struct seat *seat, struct terminal *term,
     keymap_mods |= seat->kbd.shift ? MOD_SHIFT : MOD_NONE;
     keymap_mods |= seat->kbd.alt ? MOD_ALT : MOD_NONE;
     keymap_mods |= seat->kbd.ctrl ? MOD_CTRL : MOD_NONE;
-    keymap_mods |= seat->kbd.meta ? MOD_META : MOD_NONE;
+    keymap_mods |= seat->kbd.super ? MOD_META : MOD_NONE;
 
     const xkb_keysym_t sym = ctx->sym;
     const size_t count = ctx->utf8.count;
@@ -1181,8 +1181,8 @@ kitty_kbd_protocol(struct seat *seat, struct terminal *term,
         encoded_mods |= mods & (1 << seat->kbd.mod_alt)   ? (1 << 1) : 0;
     if (seat->kbd.mod_ctrl != XKB_MOD_INVALID)
         encoded_mods |= mods & (1 << seat->kbd.mod_ctrl)  ? (1 << 2) : 0;
-    if (seat->kbd.mod_meta != XKB_MOD_INVALID)
-        encoded_mods |= mods & (1 << seat->kbd.mod_meta)  ? (1 << 3) : 0;
+    if (seat->kbd.mod_super != XKB_MOD_INVALID)
+        encoded_mods |= mods & (1 << seat->kbd.mod_super)  ? (1 << 3) : 0;
     if (seat->kbd.mod_caps != XKB_MOD_INVALID)
         encoded_mods |= mods & (1 << seat->kbd.mod_caps)  ? (1 << 6) : 0;
     if (seat->kbd.mod_num != XKB_MOD_INVALID)
@@ -1618,9 +1618,9 @@ keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
             ? xkb_state_mod_index_is_active(
                 seat->kbd.xkb_state, seat->kbd.mod_ctrl, XKB_STATE_MODS_EFFECTIVE)
             : false;
-        seat->kbd.meta = seat->kbd.mod_meta != XKB_MOD_INVALID
+        seat->kbd.super = seat->kbd.mod_super != XKB_MOD_INVALID
             ? xkb_state_mod_index_is_active(
-                seat->kbd.xkb_state, seat->kbd.mod_meta, XKB_STATE_MODS_EFFECTIVE)
+                seat->kbd.xkb_state, seat->kbd.mod_super, XKB_STATE_MODS_EFFECTIVE)
             : false;
     }
 
diff --git a/terminal.c b/terminal.c
index a56ead03..e5c3ac65 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2829,7 +2829,7 @@ term_mouse_grabbed(const struct terminal *term, struct seat *seat)
     return term->mouse_tracking == MOUSE_NONE ||
         (seat->kbd_focus == term &&
          seat->kbd.shift &&
-         !seat->kbd.alt && /*!seat->kbd.ctrl &&*/ !seat->kbd.meta);
+         !seat->kbd.alt && /*!seat->kbd.ctrl &&*/ !seat->kbd.super);
 }
 
 void
diff --git a/wayland.h b/wayland.h
index a2e1d17e..d415588b 100644
--- a/wayland.h
+++ b/wayland.h
@@ -194,7 +194,7 @@ struct seat {
         xkb_mod_index_t mod_shift;
         xkb_mod_index_t mod_alt;
         xkb_mod_index_t mod_ctrl;
-        xkb_mod_index_t mod_meta;
+        xkb_mod_index_t mod_super;
         xkb_mod_index_t mod_caps;
         xkb_mod_index_t mod_num;
 
@@ -208,7 +208,7 @@ struct seat {
         bool shift;
         bool alt;
         bool ctrl;
-        bool meta;
+        bool super;
 
         struct {
             key_binding_list_t key;