[vte] lib: Meta really is Alt
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] lib: Meta really is Alt
- Date: Fri, 1 May 2020 21:10:24 +0000 (UTC)
commit d63523a26cf68c3b8d5540dd304d1293233d8d3a
Author: Christian Persch <chpe src gnome org>
Date: Fri May 1 23:08:42 2020 +0200
lib: Meta really is Alt
The sequences vte sends are those for Alt, not Meta; so rename
all occurrences of 'meta' to alt.
src/keymap.cc | 42 ++++++++++++++++++++--------------------
src/keymap.h | 2 +-
src/mev.c | 8 ++++----
src/modes-private.hh | 4 ++--
src/modes-test.cc | 2 +-
src/modes.hh | 2 +-
src/vte.cc | 54 ++++++++++++++++++++++++++--------------------------
7 files changed, 57 insertions(+), 57 deletions(-)
---
diff --git a/src/keymap.cc b/src/keymap.cc
index 601707f6..f6d68bbe 100644
--- a/src/keymap.cc
+++ b/src/keymap.cc
@@ -37,8 +37,8 @@ _vte_keysym_print(guint keyval,
if (modifiers & GDK_CONTROL_MASK) {
g_printerr("Control+");
}
- if (modifiers & VTE_META_MASK) {
- g_printerr("Meta+");
+ if (modifiers & VTE_ALT_MASK) {
+ g_printerr("Alt+");
}
if (modifiers & VTE_NUMLOCK_MASK) {
g_printerr("NumLock+");
@@ -86,10 +86,10 @@ enum _vte_modifier_encoding_method {
};
static const struct _vte_keymap_entry _vte_keymap_GDK_space[] = {
- /* Control+Meta+space = ESC+NUL */
- {cursor_all, keypad_all, GDK_CONTROL_MASK | VTE_META_MASK, _VTE_CAP_ESC "\0", 2},
- /* Meta+space = ESC+" " */
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_ESC " ", 2},
+ /* Control+Alt+space = ESC+NUL */
+ {cursor_all, keypad_all, GDK_CONTROL_MASK | VTE_ALT_MASK, _VTE_CAP_ESC "\0", 2},
+ /* Alt+space = ESC+" " */
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_ESC " ", 2},
/* Control+space = NUL */
{cursor_all, keypad_all, GDK_CONTROL_MASK, "\0", 1},
/* Regular space. */
@@ -101,20 +101,20 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_Tab[] = {
/* Shift+Tab = Back-Tab */
{cursor_all, keypad_all, GDK_SHIFT_MASK, _VTE_CAP_CSI "Z", -1},
/* Alt+Tab = Esc+Tab */
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_ESC "\t", -1},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_ESC "\t", -1},
/* Regular tab. */
{cursor_all, keypad_all, 0, "\t", 1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
static const struct _vte_keymap_entry _vte_keymap_GDK_Return[] = {
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_ESC "\r", 2},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_ESC "\r", 2},
{cursor_all, keypad_all, 0, "\r", 1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
static const struct _vte_keymap_entry _vte_keymap_GDK_Escape[] = {
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_ESC _VTE_CAP_ESC, 2},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_ESC _VTE_CAP_ESC, 2},
{cursor_all, keypad_all, 0, _VTE_CAP_ESC, 1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
@@ -130,14 +130,14 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_ISO_Left_Tab[] = {
};
static const struct _vte_keymap_entry _vte_keymap_GDK_slash[] = {
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_ESC "/", 2},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_ESC "/", 2},
{cursor_all, keypad_all, GDK_CONTROL_MASK, "\037", 1},
{cursor_all, keypad_all, 0, "/", 1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
static const struct _vte_keymap_entry _vte_keymap_GDK_question[] = {
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_ESC "?", 2},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_ESC "?", 2},
{cursor_all, keypad_all, GDK_CONTROL_MASK, "\177", 1},
{cursor_all, keypad_all, 0, "?", 1},
{cursor_all, keypad_all, 0, X_NULL, 0},
@@ -417,7 +417,7 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_KP_Page_Up[] = {
static const struct _vte_keymap_entry _vte_keymap_GDK_F1[] = {
{cursor_all, keypad_all, GDK_CONTROL_MASK, _VTE_CAP_CSI "P", -1},
{cursor_all, keypad_all, GDK_SHIFT_MASK, _VTE_CAP_CSI "P", -1},
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_CSI "P", -1},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_CSI "P", -1},
{cursor_all, keypad_all, 0, _VTE_CAP_SS3 "P", -1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
@@ -425,7 +425,7 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_F1[] = {
static const struct _vte_keymap_entry _vte_keymap_GDK_F2[] = {
{cursor_all, keypad_all, GDK_CONTROL_MASK, _VTE_CAP_CSI "Q", -1},
{cursor_all, keypad_all, GDK_SHIFT_MASK, _VTE_CAP_CSI "Q", -1},
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_CSI "Q", -1},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_CSI "Q", -1},
{cursor_all, keypad_all, 0, _VTE_CAP_SS3 "Q", -1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
@@ -433,7 +433,7 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_F2[] = {
static const struct _vte_keymap_entry _vte_keymap_GDK_F3[] = {
{cursor_all, keypad_all, GDK_CONTROL_MASK, _VTE_CAP_CSI "R", -1},
{cursor_all, keypad_all, GDK_SHIFT_MASK, _VTE_CAP_CSI "R", -1},
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_CSI "R", -1},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_CSI "R", -1},
{cursor_all, keypad_all, 0, _VTE_CAP_SS3 "R", -1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
@@ -441,7 +441,7 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_F3[] = {
static const struct _vte_keymap_entry _vte_keymap_GDK_F4[] = {
{cursor_all, keypad_all, GDK_CONTROL_MASK, _VTE_CAP_CSI "S", -1},
{cursor_all, keypad_all, GDK_SHIFT_MASK, _VTE_CAP_CSI "S", -1},
- {cursor_all, keypad_all, VTE_META_MASK, _VTE_CAP_CSI "S", -1},
+ {cursor_all, keypad_all, VTE_ALT_MASK, _VTE_CAP_CSI "S", -1},
{cursor_all, keypad_all, 0, _VTE_CAP_SS3 "S", -1},
{cursor_all, keypad_all, 0, X_NULL, 0},
};
@@ -748,7 +748,7 @@ _vte_keymap_map(guint keyval,
/* Build mode masks. */
cursor_mode = app_cursor_keys ? cursor_app : cursor_default;
keypad_mode = app_keypad_keys ? keypad_app : keypad_default;
- modifiers &= GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK;
+ modifiers &= GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_ALT_MASK | VTE_NUMLOCK_MASK;
/* Search for the conditions. */
for (i = 0; entries[i].normal_length; i++)
@@ -951,7 +951,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
significant_modifiers = GDK_SHIFT_MASK |
GDK_CONTROL_MASK |
- VTE_META_MASK;
+ VTE_ALT_MASK;
modifier_encoding_method = _vte_keymap_key_get_modifier_encoding_method(keyval);
if (modifier_encoding_method == MODIFIER_ENCODING_NONE) {
@@ -965,10 +965,10 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
case GDK_SHIFT_MASK:
modifier = 2;
break;
- case VTE_META_MASK:
+ case VTE_ALT_MASK:
modifier = 3;
break;
- case GDK_SHIFT_MASK | VTE_META_MASK:
+ case GDK_SHIFT_MASK | VTE_ALT_MASK:
modifier = 4;
break;
case GDK_CONTROL_MASK:
@@ -977,10 +977,10 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
case GDK_SHIFT_MASK | GDK_CONTROL_MASK:
modifier = 6;
break;
- case VTE_META_MASK | GDK_CONTROL_MASK:
+ case VTE_ALT_MASK | GDK_CONTROL_MASK:
modifier = 7;
break;
- case GDK_SHIFT_MASK | VTE_META_MASK | GDK_CONTROL_MASK:
+ case GDK_SHIFT_MASK | VTE_ALT_MASK | GDK_CONTROL_MASK:
modifier = 8;
break;
default:
diff --git a/src/keymap.h b/src/keymap.h
index c1c800e1..64cf8d03 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
-#define VTE_META_MASK GDK_META_MASK
+#define VTE_ALT_MASK GDK_MOD1_MASK
#define VTE_NUMLOCK_MASK GDK_MOD2_MASK
/* Map the specified keyval/modifier setup, dependent on the mode, to either
diff --git a/src/mev.c b/src/mev.c
index 2d8b7de1..ff14ab02 100644
--- a/src/mev.c
+++ b/src/mev.c
@@ -133,7 +133,7 @@ parse_legacy_mouse_mode(guint8 *data,
gsize len)
{
int button = 0;
- const char *shift = "", *control = "", *meta = "";
+ const char *shift = "", *control = "", *alt = "";
gboolean motion = FALSE;
int x, y;
guint8 b;
@@ -168,8 +168,8 @@ parse_legacy_mouse_mode(guint8 *data,
shift = b & 4 ?
"[shift]" :
"";
- meta = b & 8 ?
- "[meta]" :
+ alt = b & 8 ?
+ "[alt]" :
"";
control = b & 16 ?
"[control]" :
@@ -182,7 +182,7 @@ parse_legacy_mouse_mode(guint8 *data,
motion ? "motion " : "",
(!motion && button) ? "press" : "",
(!motion && !button) ? "release" : "",
- meta, control, shift,
+ alt, control, shift,
x, y);
return 6;
diff --git a/src/modes-private.hh b/src/modes-private.hh
index 2dab1f8d..099eb91d 100644
--- a/src/modes-private.hh
+++ b/src/modes-private.hh
@@ -157,7 +157,7 @@ MODE(XTERM_MOUSE_ANY_EVENT, 1003)
MODE(XTERM_FOCUS, 1004)
MODE(XTERM_MOUSE_EXT_SGR, 1006)
MODE(XTERM_ALTBUF_SCROLL, 1007)
-MODE(XTERM_META_SENDS_ESCAPE, 1036)
+MODE(XTERM_ALT_SENDS_ESCAPE, 1039)
MODE(XTERM_OPT_ALTBUF, 1047)
MODE(XTERM_SAVE_CURSOR, 1048)
MODE(XTERM_OPT_ALTBUF_SAVE_CURSOR, 1049)
@@ -846,8 +846,8 @@ MODE_FIXED(XTERM_LOGGING, 46, ALWAYS_RESET)
MODE_FIXED(XTERM_MOUSE_EXT, 1005, ALWAYS_RESET)
MODE_FIXED(XTERM_8BIT_META, 1034, ALWAYS_RESET)
MODE_FIXED(XTERM_NUMLOCK, 1035, ALWAYS_RESET)
+MODE_FIXED(XTERM_META_SENDS_ESCAPE, 1036, ALWAYS_RESET)
MODE_FIXED(XTERM_DELETE_IS_DEL, 1037, ALWAYS_RESET)
-MODE_FIXED(XTERM_ALT_SENDS_ESCAPE, 1039, ALWAYS_RESET)
MODE_FIXED(XTERM_KEEP_SELECTION, 1040, ALWAYS_RESET)
MODE_FIXED(XTERM_KEEP_CLIPBOARD, 1044, ALWAYS_RESET)
MODE_FIXED(XTERM_SELECT_TO_CLIPBOARD, 1041, ALWAYS_RESET)
diff --git a/src/modes-test.cc b/src/modes-test.cc
index 5841485c..91109c2b 100644
--- a/src/modes-test.cc
+++ b/src/modes-test.cc
@@ -59,7 +59,7 @@ test_modes_private(void)
vte::terminal::modes::Private modes{};
g_assert_true(modes.DEC_AUTOWRAP());
- g_assert_true(modes.XTERM_META_SENDS_ESCAPE());
+ g_assert_true(modes.XTERM_ALT_SENDS_ESCAPE());
g_assert_false(modes.XTERM_FOCUS());
modes.set_XTERM_FOCUS(true);
diff --git a/src/modes.hh b/src/modes.hh
index 48b1b2ce..83165399 100644
--- a/src/modes.hh
+++ b/src/modes.hh
@@ -228,7 +228,7 @@ public:
eDEC_TEXT_CURSOR,
eVTE_BIDI_SWAP_ARROW_KEYS,
eXTERM_ALTBUF_SCROLL,
- eXTERM_META_SENDS_ESCAPE} { }
+ eXTERM_ALT_SENDS_ESCAPE} { }
inline void push_saved(int mode)
{
diff --git a/src/vte.cc b/src/vte.cc
index ccd1a5dd..a7425afc 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -4543,9 +4543,9 @@ Terminal::read_modifiers(GdkEvent *event)
mask = (guint)mods;
#if 1
- /* HACK! Treat ALT as META; see bug #663779. */
+ /* HACK! Treat ALT as ALT; see bug #663779. */
if (mask & GDK_MOD1_MASK)
- mask |= VTE_META_MASK;
+ mask |= VTE_ALT_MASK;
#endif
m_modifiers = mask;
@@ -4558,7 +4558,7 @@ Terminal::widget_key_press(GdkEventKey *event)
gsize normal_length = 0;
struct termios tio;
gboolean scrolled = FALSE, steal = FALSE, modifier = FALSE, handled,
- suppress_meta_esc = FALSE, add_modifiers = FALSE;
+ suppress_alt_esc = FALSE, add_modifiers = FALSE;
guint keyval = 0;
gunichar keychar = 0;
char keybuf[VTE_UTF8_BPC];
@@ -4603,7 +4603,7 @@ Terminal::widget_key_press(GdkEventKey *event)
default:
break;
}
- if (m_modifiers & VTE_META_MASK) {
+ if (m_modifiers & VTE_ALT_MASK) {
steal = TRUE;
}
switch (keyval) {
@@ -4696,18 +4696,18 @@ Terminal::widget_key_press(GdkEventKey *event)
case EraseMode::eASCII_BACKSPACE:
normal = g_strdup("");
normal_length = 1;
- suppress_meta_esc = FALSE;
+ suppress_alt_esc = FALSE;
break;
case EraseMode::eASCII_DELETE:
normal = g_strdup("");
normal_length = 1;
- suppress_meta_esc = FALSE;
+ suppress_alt_esc = FALSE;
break;
case EraseMode::eDELETE_SEQUENCE:
normal = g_strdup("\e[3~");
normal_length = 4;
add_modifiers = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
break;
case EraseMode::eTTY:
if (pty() &&
@@ -4716,7 +4716,7 @@ Terminal::widget_key_press(GdkEventKey *event)
normal = g_strdup_printf("%c", tio.c_cc[VERASE]);
normal_length = 1;
}
- suppress_meta_esc = FALSE;
+ suppress_alt_esc = FALSE;
break;
case EraseMode::eAUTO:
default:
@@ -4734,9 +4734,9 @@ Terminal::widget_key_press(GdkEventKey *event)
{
normal = g_strdup("");
normal_length = 1;
- suppress_meta_esc = FALSE;
+ suppress_alt_esc = FALSE;
}
- suppress_meta_esc = FALSE;
+ suppress_alt_esc = FALSE;
break;
}
/* Toggle ^H vs ^? if Ctrl is pressed */
@@ -4766,7 +4766,7 @@ Terminal::widget_key_press(GdkEventKey *event)
normal = g_strdup_printf("%c", tio.c_cc[VERASE]);
normal_length = 1;
}
- suppress_meta_esc = FALSE;
+ suppress_alt_esc = FALSE;
break;
case EraseMode::eDELETE_SEQUENCE:
case EraseMode::eAUTO:
@@ -4778,7 +4778,7 @@ Terminal::widget_key_press(GdkEventKey *event)
}
handled = TRUE;
/* FIXMEchpe: why? this overrides the FALSE set above? */
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
break;
case GDK_KEY_KP_Insert:
case GDK_KEY_Insert:
@@ -4786,16 +4786,16 @@ Terminal::widget_key_press(GdkEventKey *event)
if (m_modifiers & GDK_CONTROL_MASK) {
emit_paste_clipboard();
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
} else {
widget_paste(GDK_SELECTION_PRIMARY);
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
}
} else if (m_modifiers & GDK_CONTROL_MASK) {
emit_copy_clipboard();
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
}
break;
/* Keypad/motion keys. */
@@ -4807,7 +4807,7 @@ Terminal::widget_key_press(GdkEventKey *event)
scroll_lines(-1);
scrolled = TRUE;
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
}
break;
case GDK_KEY_KP_Down:
@@ -4818,7 +4818,7 @@ Terminal::widget_key_press(GdkEventKey *event)
scroll_lines(1);
scrolled = TRUE;
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
}
break;
case GDK_KEY_KP_Page_Up:
@@ -4828,7 +4828,7 @@ Terminal::widget_key_press(GdkEventKey *event)
scroll_pages(-1);
scrolled = TRUE;
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
}
break;
case GDK_KEY_KP_Page_Down:
@@ -4838,7 +4838,7 @@ Terminal::widget_key_press(GdkEventKey *event)
scroll_pages(1);
scrolled = TRUE;
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
}
break;
case GDK_KEY_KP_Home:
@@ -4867,12 +4867,12 @@ Terminal::widget_key_press(GdkEventKey *event)
case GDK_KEY_KP_Add:
emit_increase_font_size();
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
break;
case GDK_KEY_KP_Subtract:
emit_decrease_font_size();
handled = TRUE;
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
break;
}
}
@@ -4935,9 +4935,9 @@ Terminal::widget_key_press(GdkEventKey *event)
&normal,
&normal_length);
/* If we found something this way, suppress
- * escape-on-meta. */
+ * escape-on-alt. */
if (normal != NULL && normal_length > 0) {
- suppress_meta_esc = TRUE;
+ suppress_alt_esc = TRUE;
}
}
@@ -4992,10 +4992,10 @@ Terminal::widget_key_press(GdkEventKey *event)
&normal,
&normal_length);
}
- if (m_modes_private.XTERM_META_SENDS_ESCAPE() &&
- !suppress_meta_esc &&
+ if (m_modes_private.XTERM_ALT_SENDS_ESCAPE() &&
+ !suppress_alt_esc &&
(normal_length > 0) &&
- (m_modifiers & VTE_META_MASK)) {
+ (m_modifiers & VTE_ALT_MASK)) {
feed_child(_VTE_CAP_ESC, 1);
}
if (normal_length > 0) {
@@ -5610,7 +5610,7 @@ Terminal::feed_mouse_event(vte::grid::coords const& rowcol /* confined */,
if (m_modifiers & GDK_SHIFT_MASK) {
cb |= 4;
}
- if (m_modifiers & VTE_META_MASK) {
+ if (m_modifiers & VTE_ALT_MASK) {
cb |= 8;
}
if (m_modifiers & GDK_CONTROL_MASK) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
