gnome-terminal r2460 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Mar 19 15:21:58 2008
New Revision: 2460
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2460&view=rev

Log:
Fix fullscreen state tracking.


Modified:
   trunk/src/terminal-window.c
   trunk/src/terminal-window.h
   trunk/src/terminal.c

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Wed Mar 19 15:21:58 2008
@@ -76,12 +76,6 @@
   guint use_mnemonics : 1;   /* config key value */
   guint using_mnemonics : 1; /* current menubar state */
 
-  /* FIXME we brokenly maintain this flag here instead of
-   * being event-driven, because it's too annoying to be
-   * event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
-   */
-  guint fullscreen : 1;
-
   /* Compositing manager integration */
   guint have_argb_visual : 1;
 
@@ -987,11 +981,12 @@
       TerminalWindow *window = TERMINAL_WINDOW (widget);
       TerminalWindowPrivate *priv = window->priv;
       GtkAction *action;
+      gboolean is_fullscreen;
 
-      priv->fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
+      is_fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
 
       action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen");
-      gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), priv->fullscreen);
+      gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_fullscreen);
     }
   
   if (window_state_event)
@@ -2371,30 +2366,6 @@
 #endif
 }
 
-void
-terminal_window_set_fullscreen (TerminalWindow *window,
-                                gboolean        setting)
-{
-  TerminalWindowPrivate *priv = window->priv;
-  
-  g_return_if_fail (GTK_WIDGET_REALIZED (window));
-
-  priv->fullscreen = setting;
-  
-  if (setting)
-    gtk_window_fullscreen (GTK_WINDOW (window));
-  else
-    gtk_window_unfullscreen (GTK_WINDOW (window));
-}
-
-gboolean
-terminal_window_get_fullscreen (TerminalWindow *window)
-{
-  TerminalWindowPrivate *priv = window->priv;
-  
-  return priv->fullscreen;
-}
-
 /*
  * Callbacks for the menus
  */
@@ -2632,7 +2603,14 @@
 view_fullscreen_toggled_callback (GtkToggleAction *action,
                                  TerminalWindow *window)
 {
-  terminal_window_set_fullscreen (window, gtk_toggle_action_get_active (action));
+  TerminalWindowPrivate *priv = window->priv;
+
+  g_return_if_fail (GTK_WIDGET_REALIZED (window));
+
+  if (gtk_toggle_action_get_active (action))
+    gtk_window_fullscreen (GTK_WINDOW (window));
+  else
+    gtk_window_unfullscreen (GTK_WINDOW (window));
 }
 
 static const double zoom_factors[] = {

Modified: trunk/src/terminal-window.h
==============================================================================
--- trunk/src/terminal-window.h	(original)
+++ trunk/src/terminal-window.h	Wed Mar 19 15:21:58 2008
@@ -90,10 +90,6 @@
                                           int             force_grid_width,
                                           int             force_grid_height);
 
-void     terminal_window_set_fullscreen (TerminalWindow *window,
-                                         gboolean        setting);
-gboolean terminal_window_get_fullscreen (TerminalWindow *window);
-
 GtkWidget* terminal_window_get_notebook (TerminalWindow *window);
 
 void terminal_window_reread_profile_list (TerminalWindow *window);

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Wed Mar 19 15:21:58 2008
@@ -1578,7 +1578,7 @@
 
   if (start_fullscreen)
     {
-      terminal_window_set_fullscreen (window, TRUE);
+      gtk_window_fullscreen (GTK_WINDOW (window));
     }
 
   /* don't present on new tab, or we can accidentally make the