Treat option 1049 as a combination of 1047 and 1048. When finalizing whilevte_0_4_4

* src/vte.c (vte_sequence_handler_decset_internal): Treat option 1049 as a
	combination of 1047 and 1048.
* src/vte.c (vte_terminal_finalize): When finalizing while holding the
	selection, try to throw the selection onto the clipboard without an
	owner so that it doesn't just disappear.

3 files changed, 32 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bfe417a..ca5c447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-24 nalin
+	* src/vte.c (vte_sequence_handler_decset_internal): Treat option 1049
+	as a combination of 1047 and 1048.
+	* src/vte.c (vte_terminal_finalize): When finalizing while holding the
+	selection, throw the selection onto the clipboard without an owner so
+	that it doesn't just disappear.
 2002-06-19 nalin
 	* src/vte.c (vte_sequence_handler_set_title_int): Fix a logic bug
 	that got rid of the title always, not just when conversion failed.
diff --git a/src/vte.c b/src/vte.c
index 4a9fba8..52bf2f2 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -3286,6 +3286,16 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
 		 NULL,
 		 vte_sequence_handler_rc,
 		 vte_sequence_handler_sc,},
+		/* Use alternate screen buffer, saving the cursor position. */
+		{1049, NULL, NULL, (gpointer*) &terminal->pvt->screen,
+		 &terminal->pvt->normal_screen,
+		 &terminal->pvt->alternate_screen,
+		 NULL, NULL,},
+		{1049, NULL, NULL, NULL,
+		 NULL,
+		 NULL,
+		 vte_sequence_handler_rc,
+		 vte_sequence_handler_sc,},
 	};
 
 	g_return_if_fail(VTE_IS_TERMINAL(terminal));
@@ -3374,6 +3384,7 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
 			break;
 		case 47:
 		case 1047:
+		case 1049:
 			/* Clear the alternate screen if we're switching
 			 * to it. */
 			if (set) {
@@ -8539,6 +8550,7 @@ vte_terminal_finalize(GObject *object)
 	GtkWidget *toplevel;
 	GObjectClass *object_class;
 	GtkWidgetClass *widget_class;
+	GtkClipboard *clipboard;
 	struct vte_match_regex *regex;
 	int i;
 
@@ -8568,8 +8580,16 @@ vte_terminal_finalize(GObject *object)
 						     terminal);
 	}
 
-	/* Free any selected text. */
+	/* Free any selected text, but if we currently own the selection,
+	 * throw the text onto the clipboard without an owner so that it
+	 * doesn't just disappear. */
 	if (terminal->pvt->selection != NULL) {
+		clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+		if (gtk_clipboard_get_owner(clipboard) == G_OBJECT(terminal)) {
+			gtk_clipboard_set_text(clipboard,
+					       terminal->pvt->selection,
+					       -1);
+		}
 		g_free(terminal->pvt->selection);
 		terminal->pvt->selection = NULL;
 	}
diff --git a/vte.spec b/vte.spec
index 4f3b97b..bd0074c 100644
--- a/vte.spec
+++ b/vte.spec
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.4.3
+Version: 0.4.4
 Release: 1
 Summary: An experimental terminal emulator.
 License: LGPL
@@ -56,6 +56,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jun 25 2002 Nalin Dahyabhai <nalin@redhat.com> 0.4.4-1
+- clear alternate buffer when switching screens (#67094)
+- fix setting of titles, but crept in when cleaning up GIConv usage (#67236)
+
 * Tue Jun 18 2002 Nalin Dahyabhai <nalin@redhat.com> 0.4.3-1
 - correct referencing/dereferencing of I/O channels
 - correct package description to not mention the sample app which is no longer