[packages/vte2.90] - restored alt-meta patch

[baggins]

commit cabefcc12d08fb5302ccc06036caf6e22e0e7337
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Nov 20 21:02:06 2014 +0100

    - restored alt-meta patch

 vte-alt-meta.patch | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/vte-alt-meta.patch b/vte-alt-meta.patch
index e842ec4..bd364be 100644
--- a/vte-alt-meta.patch
+++ b/vte-alt-meta.patch
@@ -20,18 +20,14 @@ diff --git a/src/keymap.c b/src/keymap.c
 index 9a21669..95b4c5b 100644
 --- a/src/keymap.c
 +++ b/src/keymap.c
-@@ -708,6 +708,21 @@
- 	{GDK_KEY_F35,			_vte_keymap_GDK_F35},
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ 	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
  };
  
 +/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
 + * despite being a compound mask, is treated as indivisible. */
 +GdkModifierType
 +_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
-+		GdkModifierType mask);
-+
-+GdkModifierType
-+_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
 +		GdkModifierType mask)
 +{
 +	if (modifiers & VTE_META_MASK)
@@ -39,19 +35,19 @@ index 9a21669..95b4c5b 100644
 +	return modifiers & mask;
 +}
 +
- /* Map the specified keyval/modifier setup, dependent on the mode, to
-  * a literal string. */
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+  * a literal string or a capability name. */
  void
-@@ -751,7 +766,7 @@
- 	/* Build mode masks. */
- 	cursor_mode = app_cursor_keys ? cursor_app : cursor_default;
- 	keypad_mode = app_keypad_keys ? keypad_app : keypad_default;
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ 	} else {
+ 		fkey_mode = fkey_default;
+ 	}
 -	modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
 +	modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
  
  	/* Search for the conditions. */
- 	for (i = 0; entries[i].normal_length; i++)
-@@ -952,7 +967,7 @@
+ 	for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
  		return;
  	}
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vte2.90.git/commitdiff/cabefcc12d08fb5302ccc06036caf6e22e0e7337