mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
vte: patch for alt key (close #858)
Edit (vcunat): bump to latest version supporting gtk2.
This commit is contained in:
parent
378f94f5da
commit
93c4fd2855
2 changed files with 56 additions and 4 deletions
50
pkgs/desktops/gnome-2/desktop/vte/alt.patch
Normal file
50
pkgs/desktops/gnome-2/desktop/vte/alt.patch
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christian Persch <chpe@gnome.org>
|
||||||
|
Date: Sat, 12 May 2012 18:48:05 +0200
|
||||||
|
Subject: [PATCH] keymap: Treat ALT as META
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=663779
|
||||||
|
---
|
||||||
|
src/vte.c | 23 ++++++++++++++---------
|
||||||
|
1 files changed, 14 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/vte.c b/src/vte.c
|
||||||
|
index dd27e9a..0657921 100644
|
||||||
|
--- a/src/vte.c
|
||||||
|
+++ b/src/vte.c
|
||||||
|
@@ -5170,19 +5170,24 @@ static void
|
||||||
|
vte_terminal_read_modifiers (VteTerminal *terminal,
|
||||||
|
GdkEvent *event)
|
||||||
|
{
|
||||||
|
+ GdkKeymap *keymap;
|
||||||
|
GdkModifierType modifiers;
|
||||||
|
|
||||||
|
/* Read the modifiers. */
|
||||||
|
- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
|
||||||
|
- GdkKeymap *keymap;
|
||||||
|
-#if GTK_CHECK_VERSION (2, 90, 8)
|
||||||
|
- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
|
||||||
|
-#else
|
||||||
|
- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
|
||||||
|
+ if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
|
||||||
|
+
|
||||||
|
+ gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
|
||||||
|
+
|
||||||
|
+#if 1
|
||||||
|
+ /* HACK! Treat ALT as META; see bug #663779. */
|
||||||
|
+ if (modifiers & GDK_MOD1_MASK)
|
||||||
|
+ modifiers |= VTE_META_MASK;
|
||||||
|
#endif
|
||||||
|
- gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
|
||||||
|
- terminal->pvt->modifiers = modifiers;
|
||||||
|
- }
|
||||||
|
+
|
||||||
|
+ terminal->pvt->modifiers = modifiers;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Read and handle a keypress event. */
|
||||||
|
--
|
||||||
|
1.7.5.1.217.g4e3aa.dirty
|
|
@ -2,16 +2,18 @@
|
||||||
, pythonSupport ? false, python, pygtk}:
|
, pythonSupport ? false, python, pygtk}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vte-0.28.0";
|
name = "vte-0.28.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
|
url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
|
||||||
sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql";
|
sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./alt.patch ];
|
||||||
|
|
||||||
buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
|
buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
|
||||||
stdenv.lib.optionals pythonSupport [python pygtk];
|
stdenv.lib.optionals pythonSupport [python pygtk];
|
||||||
|
|
||||||
configureFlags = ''
|
configureFlags = ''
|
||||||
${if pythonSupport then "--enable-python" else "--disable-python"}
|
${if pythonSupport then "--enable-python" else "--disable-python"}
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue