gnome-terminal r2584 - trunk/src



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

Log:
Remove more of terminal-widget.h.


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

Modified: trunk/src/profile-editor.c
==============================================================================
--- trunk/src/profile-editor.c	(original)
+++ trunk/src/profile-editor.c	Thu May 29 19:35:52 2008
@@ -34,7 +34,9 @@
 #include <math.h>
 #include "terminal-widget.h"
 
-#define BYTES_PER_LINE (terminal_widget_get_estimated_bytes_per_scrollback_line ())
+/* One slot in the ring buffer, plus the array which holds the data for
+  * the line, plus about 80 vte_charcell structures. */
+#define BYTES_PER_LINE (sizeof(gpointer) + sizeof(GArray) + (80 * (sizeof(gunichar) + 4)))
 
 typedef struct _TerminalColorScheme TerminalColorScheme;
 

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Thu May 29 19:35:52 2008
@@ -693,7 +693,8 @@
     (object_class,
      PROP_BACKGROUND_DARKNESS,
      g_param_spec_double ("background-darkness", NULL, NULL,
-                          0.0, 1.0, /* FIXME? */
+                          /* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
+                          0.0, 1.0,
                           0.0,
                           G_PARAM_READWRITE |
                           G_PARAM_STATIC_NAME |

Modified: trunk/src/terminal-screen-container.c
==============================================================================
--- trunk/src/terminal-screen-container.c	(original)
+++ trunk/src/terminal-screen-container.c	Thu May 29 19:35:52 2008
@@ -34,7 +34,7 @@
 
   g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, terminal_widget_get_scroll_adjustment (GTK_WIDGET (screen)));
+  scrolled_window = gtk_scrolled_window_new (NULL, vte_terminal_get_adjustment (VTE_TERMINAL (screen)));
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
@@ -51,7 +51,7 @@
 
   hbox = gtk_hbox_new (FALSE, 0);
 
-  scrollbar = gtk_vscrollbar_new (terminal_widget_get_scroll_adjustment (GTK_WIDGET (screen)));
+  scrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (screen)));
 
   gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (screen), TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), scrollbar, FALSE, FALSE, 0);

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:35:52 2008
@@ -90,7 +90,7 @@
 static void terminal_screen_class_init  (TerminalScreenClass *klass);
 static void terminal_screen_dispose     (GObject             *object);
 static void terminal_screen_finalize    (GObject             *object);
-static void terminal_screen_update_on_realize (GtkWidget      *widget,
+static void terminal_screen_update_on_realize (VteTerminal *vte_terminal,
                                                TerminalScreen *screen);
 static void terminal_screen_change_font (TerminalScreen *screen);
 static gboolean terminal_screen_popup_menu         (GtkWidget      *term,
@@ -175,6 +175,16 @@
 }
 
 static void
+set_background_image_file (VteTerminal *terminal,
+                           const char *fname)
+{
+  if (fname && fname[0])
+    vte_terminal_set_background_image_file (terminal,fname);
+  else
+    vte_terminal_set_background_image (terminal, NULL);
+}
+
+static void
 connect_monospace_font_change (TerminalScreen *screen)
 {
   TerminalScreenPrivate *priv = screen->priv;
@@ -227,7 +237,7 @@
                 "gtk-cursor-blink", &blink,
                 NULL);
 
-  terminal_widget_set_cursor_blinks (priv->term, blink);
+  vte_terminal_set_cursor_blinks (VTE_TERMINAL (screen), blink);
 }
 
 static void
@@ -323,7 +333,7 @@
                      "terminal-screen",
                      screen);
 
-  g_signal_connect (G_OBJECT (priv->term),
+  g_signal_connect (screen,
                     "realize",
                     G_CALLBACK (terminal_screen_update_on_realize),
                     screen);
@@ -543,6 +553,7 @@
 terminal_screen_reread_profile (TerminalScreen *screen)
 {
   TerminalScreenPrivate *priv = screen->priv;
+  VteTerminal *vte_terminal = VTE_TERMINAL (screen);
   TerminalProfile *profile;
   GtkWidget *term;
   TerminalBackgroundType bg_type;
@@ -573,20 +584,16 @@
 
   update_color_scheme (screen);
 
-  terminal_widget_set_audible_bell (term,
-                                    !terminal_profile_get_silent_bell (profile));
-
-  terminal_widget_set_word_characters (term,
-                                       terminal_profile_get_word_chars (profile));
-
-  terminal_widget_set_scroll_on_keystroke (term,
-                                           terminal_profile_get_scroll_on_keystroke (profile));
-  
-  terminal_widget_set_scroll_on_output (term,
-                                        terminal_profile_get_scroll_on_output (profile));
-
-  terminal_widget_set_scrollback_lines (term,
-                                        terminal_profile_get_scrollback_lines (profile));
+  vte_terminal_set_audible_bell (vte_terminal,
+                                 !terminal_profile_get_silent_bell (profile));
+  vte_terminal_set_word_chars (vte_terminal,
+                               terminal_profile_get_word_chars (profile));
+  vte_terminal_set_scroll_on_keystroke (vte_terminal,
+                                        terminal_profile_get_scroll_on_keystroke (profile));
+  vte_terminal_set_scroll_on_output (vte_terminal,
+                                     terminal_profile_get_scroll_on_output (profile));
+  vte_terminal_set_scrollback_lines (vte_terminal,
+                                     terminal_profile_get_scrollback_lines (profile));
 
   if (terminal_profile_get_use_skey (priv->profile))
     {
@@ -606,42 +613,41 @@
   
   if (bg_type == TERMINAL_BACKGROUND_IMAGE)
     {
-      terminal_widget_set_background_image_file (term,
-                                                 terminal_profile_get_background_image_file (profile));
-      terminal_widget_set_background_scrolls (term,
-                                              terminal_profile_get_scroll_background (profile));
+      set_background_image_file (vte_terminal,
+                                 terminal_profile_get_background_image_file (profile));
+      vte_terminal_set_scroll_background (vte_terminal,
+                                          terminal_profile_get_scroll_background (profile));
     }
   else
     {
-      terminal_widget_set_background_image_file (term, NULL);
-      terminal_widget_set_background_scrolls (term, FALSE);
+      set_background_image_file (vte_terminal, NULL);
+      vte_terminal_set_scroll_background (vte_terminal, FALSE);
     }
 
   if (bg_type == TERMINAL_BACKGROUND_IMAGE ||
       bg_type == TERMINAL_BACKGROUND_TRANSPARENT)
     {
-    terminal_widget_set_background_darkness (term,
-                                             terminal_profile_get_background_darkness (profile));
-      terminal_widget_set_background_opacity (term,
-					      terminal_profile_get_background_darkness (profile));
+      vte_terminal_set_background_saturation (vte_terminal,
+                                              1.0 - terminal_profile_get_background_darkness (profile));
+      vte_terminal_set_opacity (vte_terminal,
+                                terminal_profile_get_background_darkness (profile) * 0xffff);
     }      
   else
     {
-    terminal_widget_set_background_darkness (term, 0.0); /* normal color */
-      terminal_widget_set_background_opacity (term, 1);
+      vte_terminal_set_background_saturation (vte_terminal, 1.0); /* normal color */
+      vte_terminal_set_opacity (vte_terminal, 0xffff);
     }
   
   window = terminal_screen_get_window (screen);
-  if (window == NULL || !terminal_window_uses_argb_visual (window))
-  terminal_widget_set_background_transparent (term,
-                                              bg_type == TERMINAL_BACKGROUND_TRANSPARENT);
-  else
-    terminal_widget_set_background_transparent (term, FALSE);
+  /* FIXME: Don't enable this if we have a compmgr. */
+  vte_terminal_set_background_transparent (vte_terminal,
+                                           bg_type == TERMINAL_BACKGROUND_TRANSPARENT &&
+                                           (!window || !terminal_window_uses_argb_visual (window)));
 
-  vte_terminal_set_backspace_binding (VTE_TERMINAL (screen),
+  vte_terminal_set_backspace_binding (vte_terminal,
                                       terminal_profile_get_backspace_binding (profile));
   
-  vte_terminal_set_delete_binding (VTE_TERMINAL (screen),
+  vte_terminal_set_delete_binding (vte_terminal,
                                    terminal_profile_get_delete_binding (profile));
 }
 
@@ -863,7 +869,7 @@
 }
 
 static void
-terminal_screen_update_on_realize (GtkWidget      *term,
+terminal_screen_update_on_realize (VteTerminal *vte_terminal,
                                    TerminalScreen *screen)
 {
   TerminalScreenPrivate *priv = screen->priv;
@@ -872,9 +878,10 @@
   profile = priv->profile;
 
   update_color_scheme (screen);
-  
-  terminal_widget_set_allow_bold (term,
-                                  terminal_profile_get_allow_bold (profile));
+
+  /* FIXMEchpe: why do this on realize? */
+  vte_terminal_set_allow_bold (vte_terminal,
+                               terminal_profile_get_allow_bold (profile));
   terminal_window_set_size (priv->window, screen, TRUE);
 }
 
@@ -884,7 +891,7 @@
   TerminalScreenPrivate *priv = screen->priv;
   
   terminal_screen_set_font (screen);
-  terminal_screen_update_on_realize (priv->term, screen);
+  terminal_screen_update_on_realize (VTE_TERMINAL (screen), screen);
 }
 
 static void

Modified: trunk/src/terminal-widget-vte.c
==============================================================================
--- trunk/src/terminal-widget-vte.c	(original)
+++ trunk/src/terminal-widget-vte.c	Thu May 29 19:35:52 2008
@@ -239,114 +239,6 @@
 }
 
 void
-terminal_widget_set_word_characters (GtkWidget  *widget,
-                                     const char *str)
-{
-  vte_terminal_set_word_chars(VTE_TERMINAL(widget), str);
-}
-
-void
-terminal_widget_set_cursor_blinks (GtkWidget *widget,
-				   gboolean   setting)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_cursor_blinks(VTE_TERMINAL(widget), setting);
-}
-
-void
-terminal_widget_set_audible_bell (GtkWidget *widget,
-				  gboolean   setting)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_audible_bell(VTE_TERMINAL(widget), setting);
-}
-
-void
-terminal_widget_set_scroll_on_keystroke (GtkWidget *widget,
-					 gboolean   setting)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(widget), setting);
-}
-
-void
-terminal_widget_set_scroll_on_output (GtkWidget *widget,
-				      gboolean   setting)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_scroll_on_output(VTE_TERMINAL(widget), setting);
-}
-
-void
-terminal_widget_set_scrollback_lines (GtkWidget *widget,
-				      int        lines)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_scrollback_lines(VTE_TERMINAL(widget), lines);
-}
-
-void
-terminal_widget_set_background_image (GtkWidget *widget,
-				      GdkPixbuf *pixbuf)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_background_image(VTE_TERMINAL(widget), pixbuf);
-}
-
-void
-terminal_widget_set_background_image_file (GtkWidget  *widget,
-					   const char *fname)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-
-  if ((fname != NULL) && (strlen(fname) > 0))
-    vte_terminal_set_background_image_file(VTE_TERMINAL(widget), fname);
-  else
-    vte_terminal_set_background_image(VTE_TERMINAL(widget), NULL);
-}
-
-void
-terminal_widget_set_background_transparent (GtkWidget *widget,
-					    gboolean   setting)
-{
-    /* FIXME: Don't enable this if we have a compmgr. */
-  vte_terminal_set_background_transparent(VTE_TERMINAL(widget), setting);
-}
-
-/* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
-void
-terminal_widget_set_background_darkness (GtkWidget *widget,
-					 double     factor)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_background_saturation(VTE_TERMINAL(widget), 1.0 - factor);
-}
-
-void
-terminal_widget_set_background_opacity (GtkWidget *widget,
-					double     factor)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_opacity(VTE_TERMINAL(widget), factor * 0xffff);
-}
-
-void
-terminal_widget_set_background_scrolls (GtkWidget *widget,
-					gboolean   setting)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_scroll_background(VTE_TERMINAL(widget), setting);
-}
-
-void
-terminal_widget_set_allow_bold (GtkWidget *widget,
-				gboolean   setting)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_set_allow_bold(VTE_TERMINAL(widget), setting);
-}
-
-void
 terminal_widget_set_colors (GtkWidget      *widget,
 			    const GdkColor *foreground,
 			    const GdkColor *background,
@@ -359,14 +251,6 @@
 }
 
 void
-terminal_widget_reset (GtkWidget *widget,
-		       gboolean   also_clear_afterward)
-{
-  g_return_if_fail(VTE_IS_TERMINAL(widget));
-  vte_terminal_reset (VTE_TERMINAL(widget), TRUE, also_clear_afterward);
-}
-
-void
 terminal_widget_connect_child_died (GtkWidget *widget,
 				    GCallback  callback,
 				    void      *data)
@@ -383,17 +267,6 @@
   g_signal_handlers_disconnect_by_func (widget, callback, data);
 }
 
-GtkAdjustment*
-terminal_widget_get_scroll_adjustment (GtkWidget *widget)
-{
-  VteTerminal *terminal;
-
-  terminal = VTE_TERMINAL (widget);
-
-  return terminal->adjustment;
-}
-
-
 gboolean
 terminal_widget_fork_command (GtkWidget   *widget,
                               gboolean     lastlog,
@@ -422,16 +295,6 @@
   return TRUE;
 }
 
-
-
-int
-terminal_widget_get_estimated_bytes_per_scrollback_line (void)
-{
-  /* One slot in the ring buffer, plus the array which holds the data for
-   * the line, plus about 80 vte_charcell structures. */
-  return sizeof(gpointer) + sizeof(GArray) + (80 * (sizeof(gunichar) + 4));
-}
-
 void
 terminal_widget_write_data_to_child (GtkWidget  *widget,
                                      const char *data,

Modified: trunk/src/terminal-widget.h
==============================================================================
--- trunk/src/terminal-widget.h	(original)
+++ trunk/src/terminal-widget.h	Thu May 29 19:35:52 2008
@@ -65,43 +65,11 @@
                                                        int                   row,
                                                        int                  *flavor);
 void       terminal_widget_skey_match_remove          (GtkWidget            *widget);
-void       terminal_widget_set_word_characters        (GtkWidget            *widget,
-                                                       const char           *str);
-void       terminal_widget_set_cursor_blinks          (GtkWidget            *widget,
-                                                       gboolean              setting);
-void       terminal_widget_set_audible_bell           (GtkWidget            *widget,
-                                                       gboolean              setting);
-void       terminal_widget_set_scroll_on_keystroke    (GtkWidget            *widget,
-                                                       gboolean              setting);
-void       terminal_widget_set_scroll_on_output       (GtkWidget            *widget,
-                                                       gboolean              setting);
-void       terminal_widget_set_scrollback_lines       (GtkWidget            *widget,
-                                                       int                   lines);
-void       terminal_widget_set_background_image       (GtkWidget            *widget,
-                                                       GdkPixbuf            *pixbuf);
-void       terminal_widget_set_background_image_file  (GtkWidget            *widget,
-                                                       const char           *fname);
-void       terminal_widget_set_background_transparent (GtkWidget            *widget,
-                                                       gboolean              setting);
-/* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
-void       terminal_widget_set_background_darkness    (GtkWidget            *widget,
-                                                       double                factor);
-void	   terminal_widget_set_background_opacity     (GtkWidget            *widget,
-						       double                factor);
 
-void       terminal_widget_set_background_scrolls     (GtkWidget            *widget,
-                                                       gboolean              setting);
-void       terminal_widget_set_allow_bold             (GtkWidget            *widget,
-                                                       gboolean              setting);
 void       terminal_widget_set_colors                 (GtkWidget            *widget,
                                                        const GdkColor       *foreground,
                                                        const GdkColor       *background,
                                                        const GdkColor       *palette_entries);
-void       terminal_widget_copy_clipboard             (GtkWidget            *widget);
-void       terminal_widget_paste_clipboard            (GtkWidget            *widget);
-void       terminal_widget_reset                      (GtkWidget            *widget,
-                                                       gboolean              also_clear_afterward);
-
 void terminal_widget_connect_child_died            (GtkWidget *widget,
                                                     GCallback  callback,
                                                     void      *data);
@@ -109,8 +77,6 @@
                                                     GCallback  callback,
                                                     void      *data);
 
-GtkAdjustment* terminal_widget_get_scroll_adjustment (GtkWidget *widget);
-
 gboolean terminal_widget_fork_command      (GtkWidget   *widget,
                                             gboolean     lastlog,
                                             gboolean     update_records,
@@ -121,8 +87,6 @@
                                             int         *child_pid,
                                             GError     **err);
 
-int terminal_widget_get_estimated_bytes_per_scrollback_line (void);
-
 void terminal_widget_write_data_to_child (GtkWidget  *widget,
                                           const char *data,
                                           int         len);

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:35:52 2008
@@ -2543,15 +2543,11 @@
                          TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
-  GtkWidget *widget;
 
   if (priv->active_term == NULL)
     return;
       
-      
-  widget = terminal_screen_get_widget (priv->active_term);
-
-  terminal_widget_reset (widget, FALSE);
+  vte_terminal_reset (VTE_TERMINAL (priv->active_term), TRUE, FALSE);
 }
 
 static void
@@ -2559,14 +2555,11 @@
                                TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
-  GtkWidget *widget;
 
   if (priv->active_term == NULL)
     return;
       
-  widget = terminal_screen_get_widget (priv->active_term);
-
-  terminal_widget_reset (widget, TRUE);
+  vte_terminal_reset (VTE_TERMINAL (priv->active_term), TRUE, TRUE);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]