Implement autoscroll (Red Hat #70481).

* src/vte.c: Implement autoscroll (Red Hat #70481).

3 files changed, 113 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9eb44f79..04494bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2002-08-27 nalin
+	* src/vte.c: Implement autoscroll (Red Hat #70481).
+2002-08-27 nalin
 	* src/vte.c: Only perform cr-lf substitutions when pasting text, not
 	when inputting from a live user (Red Hat #72639).  Bind GDK_ISO_Left_Tab
 	to kB.  Formatting changes.
diff --git a/src/vte.c b/src/vte.c
index 05c6081d..c0a81b7e 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -76,7 +76,7 @@ typedef long wint_t;
 #define bindtextdomain(package,dir)
 #endif
 
-#define VTE_PAD_WIDTH			2
+#define VTE_PAD_WIDTH			1
 #define VTE_TAB_WIDTH			8
 #define VTE_LINE_WIDTH			1
 #define VTE_COLOR_SET_SIZE		8
@@ -277,6 +277,8 @@ struct _VteTerminalPrivate {
 	guint mouse_last_button;
 	gdouble mouse_last_x, mouse_last_y;
 	gboolean mouse_autohide;
+	gboolean mouse_autoscrolling;
+	guint mouse_autoscroll_tag;
 
 	/* State variables for handling match checks. */
 	char *match_contents;
@@ -7638,6 +7640,68 @@ vte_terminal_selection_recompute(VteTerminal *terminal)
 	terminal->pvt->selection_end.y = end.y;
 }
 
+static int
+vte_terminal_autoscroll(gpointer data)
+{
+	VteTerminal *terminal;
+	GtkWidget *widget;
+	double adj;
+	long row;
+
+	terminal = VTE_TERMINAL(data);
+	widget = GTK_WIDGET(terminal);
+	/* Provide immediate autoscroll for mouse wigglers. */
+	if (terminal->pvt->mouse_last_y < widget->allocation.y) {
+		if (terminal->adjustment) {
+			adj = CLAMP(terminal->adjustment->value - 1,
+				    terminal->adjustment->lower,
+				    terminal->adjustment->upper -
+				    terminal->row_count);
+			gtk_adjustment_set_value(terminal->adjustment,
+						 adj);
+			terminal->pvt->selection_last.x =
+				terminal->pvt->mouse_last_x;
+			terminal->pvt->selection_last.y =
+				terminal->pvt->mouse_last_y +
+				terminal->char_height * adj;
+			row = terminal->pvt->selection_start.y;
+			vte_terminal_selection_recompute(terminal);
+			vte_invalidate_cells(terminal,
+					     0,
+					     terminal->column_count,
+					     terminal->pvt->selection_start.y,
+					     row + 1 -
+					     terminal->pvt->selection_start.y);
+		}
+	} else
+	if (terminal->pvt->mouse_last_y + 2 * VTE_PAD_WIDTH >
+	    widget->allocation.y + widget->allocation.height) {
+			adj = CLAMP(terminal->adjustment->value + 1,
+				    terminal->adjustment->lower,
+				    terminal->adjustment->upper -
+				    terminal->row_count);
+			gtk_adjustment_set_value(terminal->adjustment,
+						 adj);
+			terminal->pvt->selection_last.x =
+				terminal->pvt->mouse_last_x;
+			terminal->pvt->selection_last.y =
+				terminal->pvt->mouse_last_y +
+				terminal->char_height * adj;
+			row = terminal->pvt->selection_end.y;
+			vte_terminal_selection_recompute(terminal);
+			vte_invalidate_cells(terminal,
+					     0,
+					     terminal->column_count,
+					     row,
+					     terminal->pvt->selection_end.y -
+					     row + 1);
+	} else {
+		terminal->pvt->mouse_autoscrolling = FALSE;
+		terminal->pvt->mouse_autoscroll_tag = -1;
+	}
+	return terminal->pvt->mouse_autoscrolling;
+}
+
 /* Read and handle a motion event. */
 static gint
 vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
@@ -7646,6 +7710,8 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
 	long delta;
 	GdkModifierType modifiers;
 	long top, height;
+	double adj;
+	gboolean need_autoscroll;
 
 	g_return_val_if_fail(VTE_IS_TERMINAL(widget), FALSE);
 	terminal = VTE_TERMINAL(widget);
@@ -7702,7 +7768,6 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
 		terminal->pvt->selection_last.x = event->x - VTE_PAD_WIDTH;
 		terminal->pvt->selection_last.y = event->y - VTE_PAD_WIDTH +
 						  terminal->char_height * delta;
-
 		vte_terminal_selection_recompute(terminal);
 
 #ifdef VTE_DEBUG
@@ -7720,10 +7785,43 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
 				     top, height);
 
 		vte_terminal_emit_selection_changed (terminal);
+
+		/* Provide immediate autoscroll for mouse wigglers. */
+		need_autoscroll = FALSE;
+		if (event->y < widget->allocation.y) {
+			if (terminal->adjustment) {
+				adj = CLAMP(terminal->adjustment->value - 1,
+					    terminal->adjustment->lower,
+					    terminal->adjustment->upper -
+					    terminal->row_count);
+				gtk_adjustment_set_value(terminal->adjustment,
+							 adj);
+				need_autoscroll = TRUE;
+			}
+		} else
+		if (event->y >=
+		    widget->allocation.y + widget->allocation.height) {
+				adj = CLAMP(terminal->adjustment->value + 1,
+					    terminal->adjustment->lower,
+					    terminal->adjustment->upper -
+					    terminal->row_count);
+				gtk_adjustment_set_value(terminal->adjustment,
+							 adj);
+				need_autoscroll = TRUE;
+		}
+		if (need_autoscroll && !terminal->pvt->mouse_autoscrolling) {
+			terminal->pvt->mouse_autoscroll_tag = g_timeout_add_full(G_PRIORITY_LOW,
+ 50,
+ vte_terminal_autoscroll,
+ terminal,
+ NULL);
+			terminal->pvt->mouse_autoscrolling = TRUE;
+		}
 	} else {
 #ifdef VTE_DEBUG
 		if (vte_debug_on(VTE_DEBUG_EVENTS)) {
-			fprintf(stderr, "Mouse move.\n");
+			fprintf(stderr, "Mouse move (button %d).\n",
+				terminal->pvt->mouse_last_button);
 		}
 #endif
 	}
@@ -9689,6 +9787,8 @@ vte_terminal_init(VteTerminal *terminal, gpointer *klass)
 	pvt->mouse_last_x = 0;
 	pvt->mouse_last_y = 0;
 	pvt->mouse_autohide = FALSE;
+	pvt->mouse_autoscrolling = FALSE;
+	pvt->mouse_autoscroll_tag = -1;
 
 	/* Matching data. */
 	pvt->match_contents = NULL;
@@ -10098,6 +10198,11 @@ vte_terminal_finalize(GObject *object)
 						     terminal);
 	}
 
+	/* Disconnect from autoscroll requests. */
+	if (terminal->pvt->mouse_autoscroll_tag != -1) {
+		g_source_remove(terminal->pvt->mouse_autoscroll_tag);
+	}
+
 	/* Tabstop information. */
 	if (terminal->pvt->tabstops != NULL) {
 		g_hash_table_destroy(terminal->pvt->tabstops);
diff --git a/vte.spec b/vte.spec
index 7675a9c6..fe759bc9 100644
--- a/vte.spec
+++ b/vte.spec
@@ -62,7 +62,9 @@ rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
 
 %changelog
 * Tue Aug 27 2002 Nalin Dahyabhai <nalin@redhat.com> 0.8.10-1
-- only perform cr-lf substitutions when pasting
+- autoscroll (#70481)
+- only perform cr-lf substitutions when pasting (#72639)
+- bind GDK_ISO_Left_Tab to "kB" (part of #70340)
 
 * Tue Aug 27 2002 Nalin Dahyabhai <nalin@redhat.com> 0.8.9-1
 - handle forward scrolling again