diff -u xfce4-terminal-0.4.3/debian/changelog xfce4-terminal-0.4.3/debian/changelog --- xfce4-terminal-0.4.3/debian/changelog +++ xfce4-terminal-0.4.3/debian/changelog @@ -1,3 +1,13 @@ +xfce4-terminal (0.4.3-1ubuntu2) lucid; urgency=low + + * debian/patches/xubuntu-scroll-alternate-screen-configurable.patch: add + support for vte's scroll alternate screen feature (thanks Nils Rennebarth + for the patch!). Feature disabled by default, will be enabled by + xubuntu-default-settings. lp: #358796 + * debian/README.Debian: explain how to manually disable/enable this feature. + + -- Lionel Le Folgoc Sat, 09 Jan 2010 13:27:00 +0100 + xfce4-terminal (0.4.3-1ubuntu1) lucid; urgency=low * Merge from Debian testing, remaining Ubuntu changes: diff -u xfce4-terminal-0.4.3/debian/README.Debian xfce4-terminal-0.4.3/debian/README.Debian --- xfce4-terminal-0.4.3/debian/README.Debian +++ xfce4-terminal-0.4.3/debian/README.Debian @@ -28,0 +29,12 @@ + +* Scrolling the alternate screen + +In Terminal when you use the scroll wheel when a program is running that uses +the alternate screen and is not mouse aware, the program is sent three up or +down keys instead. + +For xfce4-terminal, we have a hidden option in ~/.config/Terminal/terminalrc, +called ScrollingAlternateScreen, which is set to FALSE by default, disabling +the alternate screen scrolling feature. You can enable the feature by adding a +line with ScrollingAlternateScreen=TRUE in the terminalrc file (however, if you +installed xubuntu-default-settings, this feature is enabled by default). only in patch2: unchanged: --- xfce4-terminal-0.4.3.orig/debian/patches/xubuntu-scroll-alternate-screen-configurable.patch +++ xfce4-terminal-0.4.3/debian/patches/xubuntu-scroll-alternate-screen-configurable.patch @@ -0,0 +1,87 @@ +Index: xfce4-terminal-0.4.2/terminal/terminal-preferences-dialog.c +=================================================================== +--- xfce4-terminal-0.4.2.orig/terminal/terminal-preferences-dialog.c 2010-01-02 17:33:41.000000000 +0100 ++++ xfce4-terminal-0.4.2/terminal/terminal-preferences-dialog.c 2010-01-02 17:34:18.000000000 +0100 +@@ -85,7 +85,7 @@ + const gchar *props_active[] = { "title-mode", "command-login-shell", + "command-update-records", "scrolling-single-line", + "scrolling-on-output", "scrolling-on-keystroke", +- "scrolling-bar", "font-allow-bold", ++ "scrolling-bar", "scrolling-alternate-screen", "font-allow-bold", + "misc-menubar-default", "misc-toolbars-default", + "misc-borders-default", "color-selection-use-default", + "shortcuts-no-mnemonics", "shortcuts-no-menukey", +Index: xfce4-terminal-0.4.2/terminal/terminal-preferences.c +=================================================================== +--- xfce4-terminal-0.4.2.orig/terminal/terminal-preferences.c 2010-01-02 17:33:41.000000000 +0100 ++++ xfce4-terminal-0.4.2/terminal/terminal-preferences.c 2010-01-06 22:35:03.000000000 +0100 +@@ -121,6 +121,7 @@ + PROP_MISC_TAB_CLOSE_MIDDLE_CLICK, + PROP_MISC_TAB_POSITION, + PROP_MISC_HIGHLIGHT_URLS, ++ PROP_SCROLLING_ALTERNATE_SCREEN, + PROP_SCROLLING_BAR, + PROP_SCROLLING_LINES, + PROP_SCROLLING_ON_OUTPUT, +@@ -1146,6 +1147,16 @@ + "MiscTabCloseMiddleClick", + TRUE, + EXO_PARAM_READWRITE)); ++ /** ++ * TerminalPreferences:scrolling-alternate-screen: ++ **/ ++ g_object_class_install_property (gobject_class, ++ PROP_SCROLLING_ALTERNATE_SCREEN, ++ g_param_spec_boolean("scrolling-alternate-screen", ++ "scrolling-alternate-screen", ++ "ScrollingAlternateScreen", ++ FALSE, ++ EXO_PARAM_READWRITE)); + + /** + * TerminalPreferences:misc-tab-position: +Index: xfce4-terminal-0.4.2/terminal/terminal-screen.c +=================================================================== +--- xfce4-terminal-0.4.2.orig/terminal/terminal-screen.c 2010-01-02 17:33:41.000000000 +0100 ++++ xfce4-terminal-0.4.2/terminal/terminal-screen.c 2010-01-06 22:35:19.000000000 +0100 +@@ -95,6 +95,7 @@ + static void terminal_screen_update_misc_cursor_blinks (TerminalScreen *screen); + static void terminal_screen_update_misc_cursor_shape (TerminalScreen *screen); + static void terminal_screen_update_misc_mouse_autohide (TerminalScreen *screen); ++static void terminal_screen_update_scrolling_alternate (TerminalScreen *screen); + static void terminal_screen_update_scrolling_bar (TerminalScreen *screen); + static void terminal_screen_update_scrolling_lines (TerminalScreen *screen); + static void terminal_screen_update_scrolling_on_output (TerminalScreen *screen); +@@ -277,6 +278,7 @@ + "swapped-signal::notify::misc-cursor-blinks", G_CALLBACK (terminal_screen_update_misc_cursor_blinks), screen, + "swapped-signal::notify::misc-cursor-shape", G_CALLBACK (terminal_screen_update_misc_cursor_shape), screen, + "swapped-signal::notify::misc-mouse-autohide", G_CALLBACK (terminal_screen_update_misc_mouse_autohide), screen, ++ "swapped-signal::notify::scrolling-alternate-screen", G_CALLBACK (terminal_screen_update_scrolling_alternate), screen, + "swapped-signal::notify::scrolling-bar", G_CALLBACK (terminal_screen_update_scrolling_bar), screen, + "swapped-signal::notify::scrolling-lines", G_CALLBACK (terminal_screen_update_scrolling_lines), screen, + "swapped-signal::notify::scrolling-on-output", G_CALLBACK (terminal_screen_update_scrolling_on_output), screen, +@@ -295,6 +297,7 @@ + terminal_screen_update_misc_cursor_blinks (screen); + terminal_screen_update_misc_cursor_shape (screen); + terminal_screen_update_misc_mouse_autohide (screen); ++ terminal_screen_update_scrolling_alternate (screen); + terminal_screen_update_scrolling_bar (screen); + terminal_screen_update_scrolling_lines (screen); + terminal_screen_update_scrolling_on_output (screen); +@@ -780,6 +783,16 @@ + + + static void ++terminal_screen_update_scrolling_alternate (TerminalScreen *screen) ++{ ++ gboolean scroll; ++ g_object_get (G_OBJECT (screen->preferences), "scrolling-alternate-screen", &scroll, NULL); ++ vte_terminal_set_alternate_screen_scroll (VTE_TERMINAL (screen->terminal), scroll); ++} ++ ++ ++ ++static void + terminal_screen_update_scrolling_bar (TerminalScreen *screen) + { + TerminalScrollbar scrollbar;