[vte] Use inner-border property

[Christian Persch <chpe src gnome org>]

commit 74b824a278cc884be462855f148bcc8b349f2d46
Author: Christian Persch <chpe gnome org>
Date:   Wed Mar 17 19:19:22 2010 +0100

    Use inner-border property
    
    Replace deprecated vte_terminal_get_padding() with "inner-border" style
    property.

 src/vteaccess.c |   18 +++++++++----
 src/vteapp.c    |   72 +++++++++++++++++++++++++++++++++---------------------
 2 files changed, 56 insertions(+), 34 deletions(-)
---
diff --git a/src/vteaccess.c b/src/vteaccess.c
index 15730cb..2720da1 100644
--- a/src/vteaccess.c
+++ b/src/vteaccess.c
@@ -1769,21 +1769,27 @@ vte_terminal_accessible_set_size(AtkComponent *component,
 				 gint width, gint height)
 {
 	VteTerminal *terminal;
-	gint columns, rows, xpad, ypad;
+	gint columns, rows, char_width, char_height;
 	GtkWidget *widget;
+        GtkBorder *inner_border;
+
 	widget = GTK_ACCESSIBLE(component)->widget;
 	if (widget == NULL) {
 		return FALSE;
 	}
 	terminal = VTE_TERMINAL(widget);
-	vte_terminal_get_padding(terminal, &xpad, &ypad);
+
+        char_width = vte_terminal_get_char_width (terminal);
+        char_height = vte_terminal_get_char_height (terminal);
+        gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
 	/* If the size is an exact multiple of the cell size, use that,
 	 * otherwise round down. */
-        columns = (width - xpad) / terminal->char_width;
-        rows = (height - ypad) / terminal->char_height;
+        columns = (width - (inner_border ? (inner_border->left + inner_border->right) : 0)) / char_width;
+        rows = (height - (inner_border ? (inner_border->top + inner_border->bottom) : 0)) / char_height;
+        gtk_border_free (inner_border);
 	vte_terminal_set_size(terminal, columns, rows);
-	return (terminal->row_count == rows) &&
-	       (terminal->column_count == columns);
+	return (vte_terminal_get_row_count (terminal) == rows) &&
+	       (vte_terminal_get_column_count (terminal) == columns);
 }
 
 
diff --git a/src/vteapp.c b/src/vteapp.c
index 5c7375c..50c4663 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -71,7 +71,7 @@ char_size_changed(GtkWidget *widget, guint width, guint height, gpointer data)
 	VteTerminal *terminal;
 	GtkWindow *window;
 	GdkGeometry geometry;
-	int xpad, ypad;
+        GtkBorder *inner_border;
 
 	g_assert(GTK_IS_WINDOW(data));
 	g_assert(VTE_IS_TERMINAL(widget));
@@ -81,14 +81,14 @@ char_size_changed(GtkWidget *widget, guint width, guint height, gpointer data)
 	if (!GTK_WIDGET_REALIZED (window))
 		return;
 
-	vte_terminal_get_padding(terminal, &xpad, &ypad);
-
+        gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
 	geometry.width_inc = width;
 	geometry.height_inc = height;
-	geometry.base_width = xpad;
-	geometry.base_height = ypad;
-	geometry.min_width = xpad + width * 2;
-	geometry.min_height = ypad + height * 2;
+	geometry.base_width = inner_border ? (inner_border->left + inner_border->right) : 0;
+	geometry.base_height = inner_border ? (inner_border->top + inner_border->bottom) : 0;
+	geometry.min_width = geometry.base_width + width * 2;
+	geometry.min_height = geometry.base_height + height * 2;
+        gtk_border_free (inner_border);
 
 	gtk_window_set_geometry_hints(window, widget, &geometry,
 				      GDK_HINT_RESIZE_INC |
@@ -103,7 +103,7 @@ char_size_realized(GtkWidget *widget, gpointer data)
 	GtkWindow *window;
 	GdkGeometry geometry;
 	guint width, height;
-	int xpad, ypad;
+        GtkBorder *inner_border;
 
 	g_assert(GTK_IS_WINDOW(data));
 	g_assert(VTE_IS_TERMINAL(widget));
@@ -113,16 +113,16 @@ char_size_realized(GtkWidget *widget, gpointer data)
 	if (!GTK_WIDGET_REALIZED (window))
 		return;
 
-	vte_terminal_get_padding(terminal, &xpad, &ypad);
-
+        gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
 	width = vte_terminal_get_char_width (terminal);
 	height = vte_terminal_get_char_height (terminal);
 	geometry.width_inc = width;
 	geometry.height_inc = height;
-	geometry.base_width = xpad;
-	geometry.base_height = ypad;
-	geometry.min_width = xpad + width * 2;
-	geometry.min_height = ypad + height * 2;
+	geometry.base_width = inner_border ? (inner_border->left + inner_border->right) : 0;
+	geometry.base_height = inner_border ? (inner_border->top + inner_border->bottom) : 0;
+	geometry.min_width = geometry.base_width + width * 2;
+	geometry.min_height = geometry.base_height + height * 2;
+        gtk_border_free (inner_border);
 
 	gtk_window_set_geometry_hints(window, widget, &geometry,
 				      GDK_HINT_RESIZE_INC |
@@ -188,17 +188,21 @@ button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data)
 	VteTerminal *terminal;
 	char *match;
 	int tag;
-	gint xpad, ypad;
+        GtkBorder *inner_border;
+        int char_width, char_height;
+
 	switch (event->button) {
 	case 3:
 		terminal = VTE_TERMINAL(widget);
-		vte_terminal_get_padding(terminal, &xpad, &ypad);
+
+                gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
+                char_width = vte_terminal_get_char_width (terminal);
+                char_height = vte_terminal_get_char_height (terminal);
 		match = vte_terminal_match_check(terminal,
-						 (event->x - xpad / 2) /
-						 terminal->char_width,
-						 (event->y - ypad / 2) /
-						 terminal->char_height,
+						 (event->x - (inner_border ? inner_border->left : 0)) / char_width,
+						 (event->y - (inner_border ? inner_border->top : 0)) / char_height,
 						 &tag);
+                gtk_border_free (inner_border);
 		if (match != NULL) {
 			g_print("Matched `%s' (%d).\n", match, tag);
 			g_free(match);
@@ -294,19 +298,31 @@ static void
 resize_window(GtkWidget *widget, guint width, guint height, gpointer data)
 {
 	VteTerminal *terminal;
-	gint owidth, oheight, xpad, ypad;
+
 	if ((GTK_IS_WINDOW(data)) && (width >= 2) && (height >= 2)) {
+                gint owidth, oheight, char_width, char_height, column_count, row_count;
+                GtkBorder *inner_border;
+
 		terminal = VTE_TERMINAL(widget);
-		/* Take into account border overhead. */
+
 		gtk_window_get_size(GTK_WINDOW(data), &owidth, &oheight);
-		owidth -= terminal->char_width * terminal->column_count;
-		oheight -= terminal->char_height * terminal->row_count;
-		/* Take into account padding, which needn't be re-added. */
-		vte_terminal_get_padding(VTE_TERMINAL(widget), &xpad, &ypad);
-		owidth -= xpad;
-		oheight -= ypad;
+
+		/* Take into account border overhead. */
+                char_width = vte_terminal_get_char_width (terminal);
+                char_height = vte_terminal_get_char_height (terminal);
+                column_count = vte_terminal_get_column_count (terminal);
+                row_count = vte_terminal_get_row_count (terminal);
+                gtk_widget_style_get (widget, "inner-border", &inner_border, NULL);
+
+                owidth -= char_width * column_count;
+                oheight -= char_height * row_count;
+                if (inner_border != NULL) {
+                        owidth -= inner_border->left + inner_border->right;
+                        oheight -= inner_border->top + inner_border->bottom;
+                }
 		gtk_window_resize(GTK_WINDOW(data),
 				  width + owidth, height + oheight);
+                gtk_border_free (inner_border);
 	}
 }