gnome-terminal r2585 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:36:00 2008
New Revision: 2585
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2585&view=rev

Log:
Remove more of terminal-widget.h.


Modified:
   trunk/src/terminal-screen.c
   trunk/src/terminal-screen.h
   trunk/src/terminal-widget-vte.c
   trunk/src/terminal-widget.h
   trunk/src/terminal-window.c
   trunk/src/terminal.c

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:36:00 2008
@@ -1367,7 +1367,7 @@
 
   term = priv->term;
 
-  terminal_widget_get_cell_size (term, &char_width, &char_height);
+  terminal_screen_get_cell_size (screen, &char_width, &char_height);
 
   matched_string =
     terminal_widget_check_match (term,
@@ -2219,3 +2219,25 @@
   terminal_screen_container_set_placement (parent, corner);
   terminal_screen_container_set_policy (parent, GTK_POLICY_NEVER, policy);
 }
+
+void
+terminal_screen_get_size (TerminalScreen *screen,
+			  int       *width_chars,
+			  int       *height_chars)
+{
+  VteTerminal *terminal = VTE_TERMINAL (screen);
+
+  *width_chars = terminal->column_count;
+  *height_chars = terminal->row_count;
+}
+
+void
+terminal_screen_get_cell_size (TerminalScreen *screen,
+			       int                  *cell_width_pixels,
+			       int                  *cell_height_pixels)
+{
+  VteTerminal *terminal = VTE_TERMINAL (screen);
+
+  *cell_width_pixels = terminal->char_width;
+  *cell_height_pixels = terminal->char_height;
+}

Modified: trunk/src/terminal-screen.h
==============================================================================
--- trunk/src/terminal-screen.h	(original)
+++ trunk/src/terminal-screen.h	Thu May 29 19:36:00 2008
@@ -116,6 +116,13 @@
                                                double          factor);
 double      terminal_screen_get_font_scale    (TerminalScreen *screen);
 
+void       terminal_screen_get_size (TerminalScreen *screen,
+                                     int *width_chars,
+                                     int *height_chars);
+void       terminal_screen_get_cell_size (TerminalScreen *screen,
+                                          int *width_chars,
+                                          int *height_chars);
+
 void terminal_screen_update_scrollbar (TerminalScreen *screen);
 
 /* Allow scales a bit smaller and a bit larger than the usual pango ranges */

Modified: trunk/src/terminal-widget-vte.c
==============================================================================
--- trunk/src/terminal-widget-vte.c	(original)
+++ trunk/src/terminal-widget-vte.c	Thu May 29 19:36:00 2008
@@ -78,52 +78,6 @@
 }
 
 void
-terminal_widget_set_size (GtkWidget *widget,
-			  int        width_chars,
-			  int        height_chars)
-{
-  VteTerminal *terminal;
-
-  terminal = VTE_TERMINAL (widget);
-
-  vte_terminal_set_size (terminal, width_chars, height_chars);
-}
-
-void
-terminal_widget_get_size (GtkWidget *widget,
-			  int       *width_chars,
-			  int       *height_chars)
-{
-  VteTerminal *terminal;
-
-  terminal = VTE_TERMINAL (widget);
-
-  *width_chars = terminal->column_count;
-  *height_chars = terminal->row_count;
-}
-
-void
-terminal_widget_get_cell_size (GtkWidget            *widget,
-			       int                  *cell_width_pixels,
-			       int                  *cell_height_pixels)
-{
-  VteTerminal *terminal;
-
-  terminal = VTE_TERMINAL (widget);
-
-  *cell_width_pixels = terminal->char_width;
-  *cell_height_pixels = terminal->char_height;
-}
-
-void
-terminal_widget_get_padding                (GtkWidget            *widget,
-					    int                  *xpad,
-					    int                  *ypad)
-{
-  vte_terminal_get_padding(VTE_TERMINAL(widget), xpad, ypad);
-}
-
-void
 terminal_widget_match_add                  (GtkWidget            *widget,
 					    const char           *regexp,
                                             int                   flavor)

Modified: trunk/src/terminal-widget.h
==============================================================================
--- trunk/src/terminal-widget.h	(original)
+++ trunk/src/terminal-widget.h	Thu May 29 19:36:00 2008
@@ -38,18 +38,6 @@
  */
 
 void       terminal_widget_set_implementation         (GtkWidget            *widget);
-void       terminal_widget_set_size                   (GtkWidget            *widget,
-                                                       int                   width_chars,
-                                                       int                   height_chars);
-void       terminal_widget_get_size                   (GtkWidget            *widget,
-                                                       int                  *width_chars,
-                                                       int                  *height_chars);
-void       terminal_widget_get_cell_size              (GtkWidget            *widget,
-                                                       int                  *cell_width_pixels,
-                                                       int                  *cell_height_pixels);
-void       terminal_widget_get_padding                (GtkWidget            *widget,
-                                                       int                  *xpad,
-                                                       int                  *ypad);
 void       terminal_widget_match_add                  (GtkWidget            *widget,
                                                        const char           *regexp,
                                                        int                   flavor);

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:36:00 2008
@@ -1805,15 +1805,15 @@
   w = toplevel_request.width - widget_request.width;
   h = toplevel_request.height - widget_request.height;
 
-  terminal_widget_get_cell_size (widget, &char_width, &char_height);
-  terminal_widget_get_size (widget, &grid_width, &grid_height);
+  terminal_screen_get_cell_size (screen, &char_width, &char_height);
+  terminal_screen_get_size (screen, &grid_width, &grid_height);
 
   if (force_grid_width >= 0)
     grid_width = force_grid_width;
   if (force_grid_height >= 0)
     grid_height = force_grid_height;
   
-  terminal_widget_get_padding (widget, &xpad, &ypad);
+  vte_terminal_get_padding (VTE_TERMINAL (screen), &xpad, &ypad);
   
   w += xpad + char_width * grid_width;
   h += ypad + char_height * grid_height;
@@ -1916,26 +1916,21 @@
   TerminalWindowPrivate *priv = window->priv;
   GtkWidget* page_widget;
   TerminalScreen *screen;
-  GtkWidget *menu_item;
   int old_grid_width, old_grid_height;
-  GtkWidget *old_widget, *new_widget;
 
   if (priv->active_term == NULL || priv->disposed)
     return;
 
-  old_widget = terminal_screen_get_widget (priv->active_term);
-  terminal_widget_get_size (old_widget, &old_grid_width, &old_grid_height);
+  terminal_screen_get_size (priv->active_term, &old_grid_width, &old_grid_height);
   
   page_widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook),
                                            page_num);
-
   screen = terminal_screen_container_get_screen (page_widget);
 
   g_assert (screen);
   
   /* This is so that we maintain the same grid */
-  new_widget = terminal_screen_get_widget (screen);
-  terminal_widget_set_size (new_widget, old_grid_width, old_grid_height);
+  vte_terminal_set_size (VTE_TERMINAL (screen), old_grid_width, old_grid_height);
 
   terminal_window_set_active (window, screen);
   terminal_window_update_tabs_menu_sensitivity (window);
@@ -1996,13 +1991,11 @@
   /* If we have an active screen, match its size and zoom */
   if (priv->active_term)
     {
-      GtkWidget *widget;
       int current_width, current_height;
       double scale;
 
-      widget = terminal_screen_get_widget (priv->active_term);
-      terminal_widget_get_size (widget, &current_width, &current_height);
-      terminal_widget_set_size (term, current_width, current_height);
+      terminal_screen_get_size (priv->active_term, &current_width, &current_height);
+      vte_terminal_set_size (VTE_TERMINAL (screen), current_width, current_height);
 
       scale = terminal_screen_get_font_scale (priv->active_term);
       terminal_screen_set_font_scale (screen, scale);
@@ -2114,7 +2107,7 @@
    * get some kind of union of all hints from all terms in the
    * window, but that doesn't make too much sense.
    */
-  terminal_widget_get_cell_size (widget, &char_width, &char_height);
+  terminal_screen_get_cell_size (priv->active_term, &char_width, &char_height);
   
   if (char_width != priv->old_char_width ||
       char_height != priv->old_char_height ||
@@ -2125,7 +2118,7 @@
       /* FIXME Since we're using xthickness/ythickness to compute
        * padding we need to change the hints when the theme changes.
        */
-      terminal_widget_get_padding (widget, &xpad, &ypad);
+      vte_terminal_get_padding (VTE_TERMINAL (priv->active_term), &xpad, &ypad);
       
       hints.base_width = xpad;
       hints.base_height = ypad;
@@ -2203,11 +2196,9 @@
 
   if (screen)
     {
-      GtkWidget *term;
       int width, height;
 
-      term = terminal_screen_get_widget (screen);
-      terminal_widget_get_size (term, &width, &height);
+      terminal_screen_get_size (screen, &width, &height);
       geometry = g_strdup_printf("%dx%d", width, height);
     }
   else

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Thu May 29 19:36:00 2008
@@ -2854,7 +2854,7 @@
 
                g_ptr_array_add (args, g_strdup ("--geometry"));
 
-              terminal_widget_get_size (terminal_screen_get_widget (screen), &w, &h);
+              terminal_screen_get_size (screen, &w, &h);
               gtk_window_get_position (GTK_WINDOW (window), &x, &y);
               g_ptr_array_add (args, g_strdup_printf ("%dx%d+%d+%d", w, h, x, y));
             }