← Back to branch summary

~ubuntu-branches/ubuntu/precise/vte/precise

« back to all changes in this revision

Viewing changes to debian/patches/01_scroll_notebook.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-06-16 17:59:49 UTC
  • mfrom: (1.1.65 upstream) (3.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110616175949-dexr6gu2dxiifi00
Tags: 1:0.28.1-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Add 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently
    when using alternate screen or scrolling is restricted.
  - Add lp246701_scroll_region_updates.patch: Bug fix. (LP #246701)
  - 91_keep_fds.patch:
    vte-2.90 does not yet support G_SPAWN_LEAVE_DESCRIPTORS_OPEN
    when calling vte_terminal_fork_command_full() until that is
    fixed we need to keep this patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_scroll_notebook.patch
 
1
With the addition of 043_notebook_scroll.patch in gtk+3.0, it is 
 
2
possible to switch tabs with Alt+mouse wheel from anywhere on the 
 
3
notebook. This patch prevents vte from interecepting the signal.
 
4
 
 
5
Corresponding GTK+ bug: GNOME #145244
 
6
 
 
7
Index: vte-0.28.0/src/vte.c
 
8
===================================================================
 
9
--- vte-0.28.0.orig/src/vte.c   2011-06-05 01:48:33.224480856 +0200
 
10
+++ vte-0.28.0/src/vte.c        2011-06-05 01:59:00.267546314 +0200
 
11
@@ -11361,6 +11361,13 @@ vte_terminal_scroll(GtkWidget *widget, G
 
12
 
 
13
        vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
 
14
 
 
15
+#if GTK_CHECK_VERSION (2, 90, 8)
 
16
+       /* Do not intercept Alt+scroll, let the GtkNotebook handle it to switch tabs.
 
17
+          Requires a fixed GTK+, see https://bugzilla.gnome.org/show_bug.cgi?id=145244 */
 
18
+       if (event->state & GDK_MOD1_MASK)
 
19
+               return FALSE;
 
20
+#endif
 
21
+
 
22
        _VTE_DEBUG_IF(VTE_DEBUG_EVENTS)
 
23
                switch (event->direction) {
 
24
                case GDK_SCROLL_UP: