[vte/vte-next: 213/223] Remove scroll-background property

[Christian Persch <chpe src gnome org>]

commit 3bf6b135e0b11e3c2c1cd187ad5b2586f152f98d
Author: Christian Persch <chpe gnome org>
Date:   Wed Jun 22 19:43:26 2011 +0200

    Remove scroll-background property

 src/vte-private.h |    1 -
 src/vte.c         |   39 ++-------------------------------------
 src/vteapp.c      |   10 +---------
 src/vtedraw.c     |    9 ---------
 src/vtedraw.h     |    3 ---
 5 files changed, 3 insertions(+), 59 deletions(-)
---
diff --git a/src/vte-private.h b/src/vte-private.h
index 9af68ba..f244273 100644
--- a/src/vte-private.h
+++ b/src/vte-private.h
@@ -348,7 +348,6 @@ struct _VteViewPrivate {
         gboolean allow_bold;
 
         /* Scrolling options. */
-        gboolean scroll_background;
         gboolean scroll_on_output;
         gboolean scroll_on_keystroke;
 
diff --git a/src/vte.c b/src/vte.c
index 2a1cb9e..dcd27e0 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -553,8 +553,7 @@ _vte_view_scroll_region (VteView *terminal,
 
         buffer = terminal->pvt->buffer;
 
-	if (terminal->pvt->scroll_background ||
-            count >= buffer->pvt->row_count) {
+	if (count >= buffer->pvt->row_count) {
 		/* We have to repaint the entire window. */
 		_vte_invalidate_all(terminal);
 	} else {
@@ -4543,7 +4542,7 @@ vte_view_update_style(VteView *terminal)
 {
         VteViewPrivate *pvt = terminal->pvt;
         GtkWidget *widget = &terminal->widget;
-        gboolean allow_bold, scroll_background, reverse;
+        gboolean allow_bold, reverse;
         PangoFontDescription *font_desc;
 
         vte_view_set_padding(terminal);
@@ -4552,7 +4551,6 @@ vte_view_update_style(VteView *terminal)
 
         gtk_widget_style_get(widget,
                              "allow-bold", &allow_bold,
-                             "scroll-background", &scroll_background,
                              "font", &font_desc,
                              "reverse", &reverse,
                              NULL);
@@ -4569,11 +4567,6 @@ vte_view_update_style(VteView *terminal)
 
                 _vte_invalidate_all(terminal);
         }
-
-        if (scroll_background != pvt->scroll_background) {
-                  pvt->scroll_background = scroll_background;
-                  vte_view_queue_background_update(terminal);
-        }
 }
 
 static void
@@ -7962,7 +7955,6 @@ vte_view_init(VteView *terminal)
 	terminal->pvt->strikethrough_position = 1;
 
 	/* Scrolling options. */
-        pvt->scroll_background = FALSE;
 	pvt->scroll_on_keystroke = TRUE;
 
 	/* Selection info. */
@@ -10629,17 +10621,6 @@ vte_view_draw(GtkWidget *widget,
         buffer = terminal->pvt->buffer;
 
         /* Designate the start of the drawing operation and clear the area. */
-        {
-                if (terminal->pvt->scroll_background && buffer != NULL) {
-                        _vte_draw_set_background_scroll(terminal->pvt->draw,
-                                                        0,
-                                                        buffer->pvt->screen->scroll_delta *
-                                                        terminal->pvt->char_height);
-                } else {
-                        _vte_draw_set_background_scroll(terminal->pvt->draw, 0, 0);
-                }
-        }
-
         _vte_draw_clear (terminal->pvt->draw, 0, 0,
                          allocated_width, allocated_height,
                          &terminal->pvt->palette[VTE_DEF_BG]);
@@ -11398,21 +11379,6 @@ vte_view_class_init(VteViewClass *klass)
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
         /**
-         * VteView:scroll-background:
-         *
-         * Controls whether or not the terminal will scroll the background image (if
-         * one is set) when the text in the window must be scrolled.
-         *
-         * Since: 0.30
-         */
-        gtk_widget_class_install_style_property
-                (widget_class,
-                 g_param_spec_boolean ("scroll-background", NULL, NULL,
-                                       FALSE,
-                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-
-        /**
          * VteView:reverse:
          *
          * In reverse mode, the terminal draws everything with foreground and
@@ -11509,7 +11475,6 @@ vte_view_class_init(VteViewClass *klass)
                                            "-VteView-cursor-blink-mode: system;\n"
                                            "-VteView-cursor-shape: block;\n"
                                            "-VteView-font: Monospace 10;\n"
-                                           "-VteView-scroll-background: false;\n"
 #include "vtepalettecss.h"
                                            "}\n",
                                          -1, NULL);
diff --git a/src/vteapp.c b/src/vteapp.c
index 33b47a9..6ca16c2 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -554,7 +554,7 @@ main(int argc, char **argv)
 		NULL};
 	gboolean audible = TRUE,
 		 debug = FALSE, use_builtin_dingus = FALSE, dbuffer = TRUE,
-		 console = FALSE, scroll = FALSE, keep = FALSE,
+		 console = FALSE, keep = FALSE,
 		 icon_title = FALSE, shell = TRUE,
 		 reverse = FALSE, use_geometry_hints = TRUE,
 		 use_scrolled_window = FALSE,
@@ -666,11 +666,6 @@ main(int argc, char **argv)
 			"Set cursor shape (block|underline|ibeam)", NULL
 		},
 		{
-			"scroll-background", 's', 0,
-			G_OPTION_ARG_NONE, &scroll,
-			"Enable a scrolling background", NULL
-		},
-		{
 			"termcap", 't', 0,
 			G_OPTION_ARG_STRING, &termcap,
 			"Specify the terminal emulation to use", NULL
@@ -828,9 +823,6 @@ main(int argc, char **argv)
                                         font);
                 g_free(font);
         }
-        if (scroll) {
-                g_string_append (css_string, "-VteView-scroll-background: true;\n");
-        }
         if (reverse) {
                 g_string_append (css_string, "-VteView-reverse: true;\n");
         }
diff --git a/src/vtedraw.c b/src/vtedraw.c
index 6b917c6..b8f0777 100644
--- a/src/vtedraw.c
+++ b/src/vtedraw.c
@@ -768,15 +768,6 @@ _vte_draw_set_cairo(struct _vte_draw *draw,
 }
 
 void
-_vte_draw_set_background_scroll (struct _vte_draw *draw,
-				 gint x, gint y)
-{
-	_vte_debug_print (VTE_DEBUG_DRAW,
-			"draw_set_scroll (%d, %d)\n",
-			x, y);
-}
-
-void
 _vte_draw_clear (struct _vte_draw *draw,
                  gint x,
                  gint y,
diff --git a/src/vtedraw.h b/src/vtedraw.h
index 4092d8a..b1a16a9 100644
--- a/src/vtedraw.h
+++ b/src/vtedraw.h
@@ -64,9 +64,6 @@ void _vte_draw_free(struct _vte_draw *draw);
 void _vte_draw_set_cairo(struct _vte_draw *draw,
                          cairo_t *cr);
 
-void _vte_draw_set_background_scroll(struct _vte_draw *draw,
-				     gint x, gint y);
-
 void _vte_draw_clear(struct _vte_draw *draw,
 		     gint x, gint y, gint width, gint height,
                      const GdkRGBA *background);