vte r2297 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Tue Dec  2 13:08:16 2008
New Revision: 2297
URL: http://svn.gnome.org/viewvc/vte?rev=2297&view=rev

Log:
2008-12-02  Behdad Esfahbod  <behdad gnome org>

        * src/vte-private.h:
        * src/vte.c (vte_terminal_start_selection),
        (vte_terminal_extend_selection):
        Merge selection_origin and selection_restart_origin as only one was
        being used at a time.



Modified:
   trunk/ChangeLog
   trunk/src/vte-private.h
   trunk/src/vte.c

Modified: trunk/src/vte-private.h
==============================================================================
--- trunk/src/vte-private.h	(original)
+++ trunk/src/vte-private.h	Tue Dec  2 13:08:16 2008
@@ -293,7 +293,7 @@
 	} selection_type;
 	struct selection_event_coords {
 		double x, y;
-	} selection_origin, selection_last, selection_restart_origin;
+	} selection_origin, selection_last;
 	struct selection_cell_coords {
 		long row, col;
 	} selection_start, selection_end, last_selection_start, last_selection_end;

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Tue Dec  2 13:08:16 2008
@@ -6213,8 +6213,7 @@
 		terminal->pvt->has_selection = FALSE;
 		terminal->pvt->selecting_had_delta = FALSE;
 
-		terminal->pvt->selection_restart_origin =
-			terminal->pvt->selection_last;
+		terminal->pvt->selection_origin = terminal->pvt->selection_last;
 		break;
 	case selection_type_word:
 	case selection_type_line:
@@ -6295,9 +6294,6 @@
 	if (terminal->pvt->selecting_restart) {
 		vte_terminal_deselect_all(terminal);
 		invalidate_selected = TRUE;
-		/* Record the origin of the selection. */
-		terminal->pvt->selection_origin =
-			terminal->pvt->selection_restart_origin;
 		_vte_debug_print(VTE_DEBUG_SELECTION,
 				"Selection delayed start at (%lf,%lf).\n",
 				terminal->pvt->selection_origin.x / width,