rev |
line source |
al@19844
|
1 From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
|
al@19844
|
2 From: Christian Persch <chpe@gnome.org>
|
al@19844
|
3 Date: Sat, 12 May 2012 18:48:05 +0200
|
al@19844
|
4 Subject: [PATCH] keymap: Treat ALT as META
|
al@19844
|
5
|
al@19844
|
6 https://bugzilla.gnome.org/show_bug.cgi?id=663779
|
al@19844
|
7 ---
|
al@19844
|
8 src/vte.c | 23 ++++++++++++++---------
|
al@19844
|
9 1 files changed, 14 insertions(+), 9 deletions(-)
|
al@19844
|
10
|
al@19844
|
11 diff --git a/src/vte.c b/src/vte.c
|
al@19844
|
12 index dd27e9a..0657921 100644
|
al@19844
|
13 --- a/src/vte.c
|
al@19844
|
14 +++ b/src/vte.c
|
al@19844
|
15 @@ -5170,19 +5170,24 @@ static void
|
al@19844
|
16 vte_terminal_read_modifiers (VteTerminal *terminal,
|
al@19844
|
17 GdkEvent *event)
|
al@19844
|
18 {
|
al@19844
|
19 + GdkKeymap *keymap;
|
al@19844
|
20 GdkModifierType modifiers;
|
al@19844
|
21
|
al@19844
|
22 /* Read the modifiers. */
|
al@19844
|
23 - if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
|
al@19844
|
24 - GdkKeymap *keymap;
|
al@19844
|
25 -#if GTK_CHECK_VERSION (2, 90, 8)
|
al@19844
|
26 - keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
|
al@19844
|
27 -#else
|
al@19844
|
28 - keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
|
al@19844
|
29 + if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
|
al@19844
|
30 + return;
|
al@19844
|
31 +
|
al@19844
|
32 + keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
|
al@19844
|
33 +
|
al@19844
|
34 + gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
|
al@19844
|
35 +
|
al@19844
|
36 +#if 1
|
al@19844
|
37 + /* HACK! Treat ALT as META; see bug #663779. */
|
al@19844
|
38 + if (modifiers & GDK_MOD1_MASK)
|
al@19844
|
39 + modifiers |= VTE_META_MASK;
|
al@19844
|
40 #endif
|
al@19844
|
41 - gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
|
al@19844
|
42 - terminal->pvt->modifiers = modifiers;
|
al@19844
|
43 - }
|
al@19844
|
44 +
|
al@19844
|
45 + terminal->pvt->modifiers = modifiers;
|
al@19844
|
46 }
|
al@19844
|
47
|
al@19844
|
48 /* Read and handle a keypress event. */
|
al@19844
|
49 --
|
al@19844
|
50 1.7.5.1.217.g4e3aa.dirty |