From 5f9a4ab8ccdac3b2de647b147af1b2f26fb7a3af Mon Sep 17 00:00:00 2001
From: Tomas Frydrych <tf@linux.intel.com>
Date: Mon, 2 Feb 2009 15:28:26 +0000
Subject: [PATCH] Do not allocate the tab_pop up object at all when the
 --no-tab-popup option is set

  This option is intended primarily so that and Alt+Tab implementation can be
  provided in a plugin, so having the object around makes no sense.
---
 src/core/keybindings.c | 31 ++++++++++---------------------
 src/core/screen.c      | 13 +++++++------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index ce884847d..230f3a9e3 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1979,11 +1979,9 @@ process_tab_grab (MetaDisplay *display,
   Window      prev_xwindow;
   MetaWindow *prev_window;
 
-  if (screen != display->grab_screen)
+  if (screen != display->grab_screen || !screen->tab_popup)
     return FALSE;
 
-  g_return_val_if_fail (screen->tab_popup != NULL, FALSE);
-
   if (event->type == KeyRelease &&
       end_keyboard_grab (display, event->xkey.keycode))
     {
@@ -2592,11 +2590,9 @@ process_workspace_switch_grab (MetaDisplay *display,
 {
   MetaWorkspace *workspace;
 
-  if (screen != display->grab_screen)
+  if (screen != display->grab_screen || !screen->tab_popup)
     return FALSE;
 
-  g_return_val_if_fail (screen->tab_popup != NULL, FALSE);
-
   if (event->type == KeyRelease &&
       end_keyboard_grab (display, event->xkey.keycode))
     {
@@ -2887,7 +2883,9 @@ do_choose_window (MetaDisplay    *display,
           display->mouse_mode = FALSE;
           meta_window_activate (initial_selection, event->xkey.time);
         }
-      else if (meta_display_begin_grab_op (display,
+      else if (!meta_prefs_get_no_tab_popup ())
+        {
+          if (meta_display_begin_grab_op (display,
                                            screen,
                                            NULL,
                                            show_popup ?
@@ -2918,21 +2916,11 @@ do_choose_window (MetaDisplay    *display,
             }
           else
             {
-              if (!meta_prefs_get_no_tab_popup ())
-                {
-                  meta_ui_tab_popup_select (screen->tab_popup,
-                                (MetaTabEntryKey) initial_selection->xwindow);
+              meta_ui_tab_popup_select (screen->tab_popup,
+                                        (MetaTabEntryKey) initial_selection->xwindow);
 
-                  if (show_popup)
+              if (show_popup)
                     meta_ui_tab_popup_set_showing (screen->tab_popup, TRUE);
-                  else
-                    {
-                      meta_window_raise (initial_selection);
-                      initial_selection->tab_unminimized =
-                        initial_selection->minimized;
-                      meta_window_unminimize (initial_selection);
-                    }
-                }
               else
                 {
                   meta_window_raise (initial_selection);
@@ -2943,6 +2931,7 @@ do_choose_window (MetaDisplay    *display,
             }
         }
     }
+    }
 }
 
 static void
@@ -3311,7 +3300,7 @@ handle_workspace_switch  (MetaDisplay    *display,
       
       meta_workspace_activate (next, event->xkey.time);
 
-      if (grabbed_before_release)
+      if (grabbed_before_release && !meta_prefs_get_no_tab_popup ())
         {
           meta_ui_tab_popup_select (screen->tab_popup, (MetaTabEntryKey) next);
           
diff --git a/src/core/screen.c b/src/core/screen.c
index 603c1ef74..371bf0ab9 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1521,11 +1521,12 @@ meta_screen_ensure_tab_popup (MetaScreen      *screen,
       tmp = tmp->next;
     }
 
-  screen->tab_popup = meta_ui_tab_popup_new (entries, 
-                                             screen->number,
-                                             len,
-                                             5, /* FIXME */
-                                             !meta_prefs_get_no_tab_popup ());
+  if (!meta_prefs_get_no_tab_popup ())
+    screen->tab_popup = meta_ui_tab_popup_new (entries,
+                                               screen->number,
+                                               len,
+                                               5, /* FIXME */
+                                               TRUE);
 
   for (i = 0; i < len; i++) 
     g_object_unref (entries[i].icon);
@@ -1547,7 +1548,7 @@ meta_screen_ensure_workspace_popup (MetaScreen *screen)
   int n_workspaces;
   int current_workspace;
   
-  if (screen->tab_popup)
+  if (screen->tab_popup || meta_prefs_get_no_tab_popup ())
     return;
 
   current_workspace = meta_workspace_index (screen->active_workspace);