[vte] ring: Rename visible_rows_hint: it's no longer a hint only

[Egmont Koblinger <egmontkob src gnome org>]

commit 015acdc077b0ce016919b02e94d4dc5fb0f7445c
Author: Egmont Koblinger <egmont gmail com>
Date:   Sun Dec 28 23:51:17 2014 +0100

    ring: Rename visible_rows_hint: it's no longer a hint only

 src/ring.c |   20 ++++++++++----------
 src/ring.h |    4 ++--
 src/vte.c  |    4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/ring.c b/src/ring.c
index 2451871..5364aeb 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -78,7 +78,7 @@ _vte_ring_init (VteRing *ring, gulong max_rows, gboolean has_streams)
        _vte_row_data_init (&ring->cached_row);
        ring->cached_row_num = (gulong) -1;
 
-       ring->visible_rows_hint = 0;
+        ring->visible_rows = 0;
 
        _vte_ring_validate(ring);
 }
@@ -422,7 +422,7 @@ _vte_ring_discard_one_row (VteRing *ring)
 static void
 _vte_ring_maybe_freeze_one_row (VteRing *ring)
 {
-       if (G_LIKELY (ring->mask >= ring->visible_rows_hint && ring->writable + ring->mask + 1 == ring->end))
+        if (G_LIKELY (ring->mask >= ring->visible_rows && ring->writable + ring->mask + 1 == ring->end))
                _vte_ring_freeze_one_row (ring);
        else
                _vte_ring_ensure_writable_room (ring);
@@ -441,7 +441,7 @@ _vte_ring_ensure_writable_room (VteRing *ring)
        gulong new_mask, old_mask, i, end;
        VteRowData *old_array, *new_array;;
 
-       if (G_LIKELY (ring->mask >= ring->visible_rows_hint && ring->writable + ring->mask + 1 > ring->end))
+        if (G_LIKELY (ring->mask >= ring->visible_rows && ring->writable + ring->mask + 1 > ring->end))
                return;
 
        old_mask = ring->mask;
@@ -449,7 +449,7 @@ _vte_ring_ensure_writable_room (VteRing *ring)
 
        do {
                ring->mask = (ring->mask << 1) + 1;
-       } while (ring->mask < ring->visible_rows_hint || ring->writable + ring->mask + 1 <= ring->end);
+        } while (ring->mask < ring->visible_rows || ring->writable + ring->mask + 1 <= ring->end);
 
        _vte_debug_print(VTE_DEBUG_RING, "Enlarging writable array from %lu to %lu\n", old_mask, ring->mask);
 
@@ -616,17 +616,17 @@ _vte_ring_append (VteRing * ring)
 
 
 /**
- * _vte_ring_set_visible_rows_hint:
+ * _vte_ring_set_visible_rows:
  * @ring: a #VteRing
  *
- * Set the number of visible rows, a hint for better performance.
- * It's no longer a hint only; it's required to be set correctly
- * for the alternate screen so that it never hits the streams.
+ * Set the number of visible rows.
+ * It's required to be set correctly for the alternate screen so that it
+ * never hits the streams.
  */
 void
-_vte_ring_set_visible_rows_hint (VteRing *ring, gulong rows)
+_vte_ring_set_visible_rows (VteRing *ring, gulong rows)
 {
-       ring->visible_rows_hint = rows;
+        ring->visible_rows = rows;
 }
 
 
diff --git a/src/ring.h b/src/ring.h
index 1490ed5..7e6078a 100644
--- a/src/ring.h
+++ b/src/ring.h
@@ -66,7 +66,7 @@ struct _VteRing {
        gulong cached_row_num;
 
        gboolean has_streams;
-       gulong visible_rows_hint;  /* to keep at least a screenful of lines in memory, bug 646098 comment 12 
*/
+        gulong visible_rows;  /* to keep at least a screenful of lines in memory, bug 646098 comment 12 */
 };
 
 #define _vte_ring_contains(__ring, __position) \
@@ -87,7 +87,7 @@ void _vte_ring_shrink (VteRing *ring, gulong max_len);
 VteRowData *_vte_ring_insert (VteRing *ring, gulong position);
 VteRowData *_vte_ring_append (VteRing *ring);
 void _vte_ring_remove (VteRing *ring, gulong position);
-void _vte_ring_set_visible_rows_hint (VteRing *ring, gulong rows);
+void _vte_ring_set_visible_rows (VteRing *ring, gulong rows);
 void _vte_ring_rewrap (VteRing *ring, glong columns, VteVisualPosition **markers);
 gboolean _vte_ring_write_contents (VteRing *ring,
                                   GOutputStream *stream,
diff --git a/src/vte.c b/src/vte.c
index bcd4b21..362aa3b 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -7855,8 +7855,8 @@ vte_terminal_set_size(VteTerminal *terminal, glong columns, glong rows)
        if (old_rows != terminal->pvt->row_count || old_columns != terminal->pvt->column_count) {
                 terminal->pvt->scrolling_restricted = FALSE;
 
-               _vte_ring_set_visible_rows_hint(terminal->pvt->normal_screen.row_data, 
terminal->pvt->row_count);
-               _vte_ring_set_visible_rows_hint(terminal->pvt->alternate_screen.row_data, 
terminal->pvt->row_count);
+                _vte_ring_set_visible_rows(terminal->pvt->normal_screen.row_data, terminal->pvt->row_count);
+                _vte_ring_set_visible_rows(terminal->pvt->alternate_screen.row_data, 
terminal->pvt->row_count);
 
                /* Resize the normal screen and (if rewrapping is enabled) rewrap it even if the alternate 
screen is visible: bug 415277 */
                vte_terminal_screen_set_size(terminal, &terminal->pvt->normal_screen, old_columns, old_rows, 
terminal->pvt->rewrap_on_resize);