[vte/vte-next: 134/223] Move method to VteBuffer

[Christian Persch <chpe src gnome org>]

commit 8f112d8fab87040c1180064e2e11ff36c36ab272
Author: Christian Persch <chpe gnome org>
Date:   Thu Jun 9 22:17:12 2011 +0200

    Move method to VteBuffer

 src/vte-private.h |    2 +-
 src/vte.c         |   25 +++++++++++++------------
 src/vteseq.c      |    2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/src/vte-private.h b/src/vte-private.h
index e4d9e7d..cd6a45c 100644
--- a/src/vte-private.h
+++ b/src/vte-private.h
@@ -436,7 +436,6 @@ void _vte_terminal_adjust_adjustments(VteTerminal *terminal);
 void _vte_terminal_queue_contents_changed(VteTerminal *terminal);
 void _vte_terminal_emit_text_deleted(VteTerminal *terminal);
 void _vte_terminal_emit_text_inserted(VteTerminal *terminal);
-void _vte_terminal_cursor_down (VteTerminal *terminal);
 gboolean _vte_terminal_insert_char(VteTerminal *terminal, gunichar c,
 			       gboolean force_insert_mode,
 			       gboolean invalidate_cells);
@@ -482,6 +481,7 @@ gboolean _vte_buffer_get_tabstop(VteBuffer *buffer, int column);
 void _vte_buffer_set_tabstop(VteBuffer *buffer, int column);
 VteRowData *_vte_buffer_ensure_row(VteBuffer *buffer);
 void _vte_buffer_cleanup_tab_fragments_at_cursor (VteBuffer *buffer);
+void _vte_buffer_cursor_down (VteBuffer *buffer);
 
 /* private VteScreen methods */
 void _vte_screen_set_default_attributes(VteScreen *screen);
diff --git a/src/vte.c b/src/vte.c
index fdc6bdf..2f32632 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -2338,12 +2338,13 @@ _vte_buffer_cleanup_tab_fragments_at_cursor (VteBuffer *buffer)
 
 /* Cursor down, with scrolling. */
 void
-_vte_terminal_cursor_down (VteTerminal *terminal)
+_vte_buffer_cursor_down (VteBuffer *buffer)
 {
+        VteTerminal *terminal = buffer->pvt->terminal;
 	long start, end;
 	VteScreen *screen;
 
-	screen = terminal->pvt->screen;
+	screen = buffer->pvt->screen;
 
 	if (screen->scrolling_restricted) {
 		start = screen->insert_delta + screen->scrolling_region.start;
@@ -2356,8 +2357,8 @@ _vte_terminal_cursor_down (VteTerminal *terminal)
 		/* Match xterm and fill to the end of row when scrolling. */
 		if (screen->fill_defaults.attr.back != VTE_DEF_BG) {
 			VteRowData *rowdata;
-			rowdata = _vte_buffer_ensure_row (terminal->term_pvt->buffer);
-			_vte_row_data_fill (rowdata, &screen->fill_defaults, terminal->pvt->column_count);
+			rowdata = _vte_buffer_ensure_row (buffer);
+			_vte_row_data_fill (rowdata, &screen->fill_defaults, buffer->pvt->column_count);
 		}
 
 		if (screen->scrolling_restricted) {
@@ -2372,7 +2373,7 @@ _vte_terminal_cursor_down (VteTerminal *terminal)
 				 * to insert_delta. */
 				start++;
 				end++;
-				_vte_buffer_ring_insert (terminal->term_pvt->buffer, screen->cursor_current.row, FALSE);
+				_vte_buffer_ring_insert (buffer, screen->cursor_current.row, FALSE);
 				/* Force the areas below the region to be
 				 * redrawn -- they've moved. */
 				_vte_terminal_scroll_region(terminal, start,
@@ -2383,8 +2384,8 @@ _vte_terminal_cursor_down (VteTerminal *terminal)
 				/* If we're at the bottom of the scrolling
 				 * region, add a line at the top to scroll the
 				 * bottom off. */
-				_vte_buffer_ring_remove (terminal->term_pvt->buffer, start);
-				_vte_buffer_ring_insert (terminal->term_pvt->buffer, end, TRUE);
+				_vte_buffer_ring_remove (buffer, start);
+				_vte_buffer_ring_insert (buffer, end, TRUE);
 				/* Update the display. */
 				_vte_terminal_scroll_region(terminal, start,
 							   end - start + 1, -1);
@@ -2395,14 +2396,14 @@ _vte_terminal_cursor_down (VteTerminal *terminal)
 		} else {
 			/* Scroll up with history. */
 			screen->cursor_current.row++;
-			vte_buffer_update_insert_delta(terminal->term_pvt->buffer);
+			vte_buffer_update_insert_delta(buffer);
 		}
 
 		/* Match xterm and fill the new row when scrolling. */
 		if (screen->fill_defaults.attr.back != VTE_DEF_BG) {
 			VteRowData *rowdata;
-			rowdata = _vte_buffer_ensure_row (terminal->term_pvt->buffer);
-			_vte_row_data_fill (rowdata, &screen->fill_defaults, terminal->pvt->column_count);
+			rowdata = _vte_buffer_ensure_row (buffer);
+			_vte_row_data_fill (rowdata, &screen->fill_defaults, buffer->pvt->column_count);
 		}
 	} else {
 		/* Otherwise, just move the cursor down. */
@@ -2464,7 +2465,7 @@ _vte_terminal_insert_char(VteTerminal *terminal, gunichar c,
 			/* Mark this line as soft-wrapped. */
 			row = _vte_buffer_ensure_row (terminal->term_pvt->buffer);
 			row->attr.soft_wrapped = 1;
-			_vte_terminal_cursor_down (terminal);
+			_vte_buffer_cursor_down (terminal->term_pvt->buffer);
 		} else {
 			/* Don't wrap, stay at the rightmost column. */
 			col = screen->cursor_current.col =
@@ -2632,7 +2633,7 @@ _vte_terminal_insert_char(VteTerminal *terminal, gunichar c,
 			screen->cursor_current.col = 0;
 			/* Mark this line as soft-wrapped. */
 			row->attr.soft_wrapped = 1;
-			_vte_terminal_cursor_down (terminal);
+                        _vte_buffer_cursor_down (terminal->term_pvt->buffer);
 		}
 	}
 
diff --git a/src/vteseq.c b/src/vteseq.c
index aa59229..b48092f 100644
--- a/src/vteseq.c
+++ b/src/vteseq.c
@@ -1933,7 +1933,7 @@ vte_sequence_handler_se (VteTerminal *terminal, GValueArray *params)
 static void
 vte_sequence_handler_sf (VteTerminal *terminal, GValueArray *params)
 {
-	_vte_terminal_cursor_down (terminal);
+	_vte_buffer_cursor_down (terminal->term_pvt->buffer);
 }
 
 /* Cursor down, with scrolling. */