Restore the 'bring windows which require attention to the current

workspace' feature.

Author: mtwebster

src/core/prefs.c

@@ -59,6 +59,7 @@
 #define KEY_XKB_OPTIONS "xkb-options"
 
 #define KEY_MOUSEWHEEL_ZOOM_ENABLED "screen-magnifier-enabled"
+#define KEY_BRING_ACTIVATED_WINDOWS_TO_CURRENT_WORKSPACE "bring-windows-to-current-workspace"
 
 #define KEY_OVERLAY_KEY "overlay-key"
 #define KEY_WORKSPACES_ONLY_ON_PRIMARY "workspaces-only-on-primary"
@@ -74,6 +75,7 @@
 #define SCHEMA_INPUT_SOURCES   "org.cinnamon.desktop.input-sources"
 #define SCHEMA_MOUSE           "org.cinnamon.desktop.peripherals.mouse"
 #define SCHEMA_A11Y_APPLICATIONS "org.cinnamon.desktop.a11y.applications"
+#define SCHEMA_CINNAMON        "org.cinnamon"
 
 #define SETTINGS(s) g_hash_table_lookup (settings_schemas, (s))
 
@@ -141,6 +143,7 @@ static gboolean unredirect_fullscreen_windows = FALSE;
 static gboolean tile_maximize = FALSE;
 static char *gtk_theme = NULL;
 static char *bell_sound = NULL;
+static gboolean bring_user_activated_windows_to_current_workspace = FALSE;
 
 static void handle_preference_update_enum (GSettings *settings,
                                            gchar     *key);
@@ -461,6 +464,13 @@ static MetaBoolPreference preferences_bool[] =
       },
       &tile_maximize,
     },
+    {
+      { "bring-windows-to-current-workspace",
+        SCHEMA_CINNAMON,
+        META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE,
+      },
+      &bring_user_activated_windows_to_current_workspace,
+    },
     { { NULL, 0, 0 }, NULL },
   };
 
@@ -1103,9 +1113,13 @@ meta_prefs_init (void)
   settings = g_settings_new (SCHEMA_A11Y_APPLICATIONS);
   g_signal_connect (settings, "changed::" KEY_MOUSEWHEEL_ZOOM_ENABLED,
                     G_CALLBACK (settings_changed), NULL);
-  
   g_hash_table_insert (settings_schemas, g_strdup (SCHEMA_A11Y_APPLICATIONS), settings);
 
+  settings = g_settings_new (SCHEMA_CINNAMON);
+  g_signal_connect (settings, "changed::" KEY_BRING_ACTIVATED_WINDOWS_TO_CURRENT_WORKSPACE,
+                    G_CALLBACK (settings_changed), NULL);
+  g_hash_table_insert (settings_schemas, g_strdup (SCHEMA_CINNAMON), settings);
+
   /* Individual keys we watch outside of our schemas */
   settings = g_settings_new (SCHEMA_INTERFACE);
   g_signal_connect (settings, "changed::" KEY_GNOME_ACCESSIBILITY,
@@ -1313,6 +1327,15 @@ meta_prefs_get_raise_on_click (void)
   return raise_on_click;
 }
 
+gboolean
+meta_prefs_get_bring_windows_to_current_workspace (void)
+{
+  /* Windows that the user activates (with a current timestamp) will
+   * be brought to the currently active workspace if necessary. Normally
+   * the user is brought to the window's workspace instead. */
+  return bring_user_activated_windows_to_current_workspace;
+}
+
 gboolean
 meta_prefs_get_show_fallback_app_menu (void)
 {
@@ -1929,6 +1952,9 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_BELL_SOUND:
       return "BELL_SOUND";
+
+    case META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE:
+      return "BRING_WINDOWS_TO_CURRENT_WORKSPACE";
     }
 
   return "(unknown)";

src/core/window.c

@@ -3969,16 +3969,30 @@ meta_window_activate_full (MetaWindow     *window,
   if (workspace == NULL)
     workspace = workspace_manager->active_workspace;
 
-  /* For non-transient windows, we just set up a pulsing indicator,
-     rather than move windows or workspaces.
-     See http://bugzilla.gnome.org/show_bug.cgi?id=482354 */
-  if (window->transient_for == NULL &&
-      !allow_workspace_switch &&
-      !meta_window_located_on_workspace (window, workspace))
-    {
-      meta_window_set_demands_attention (window);
-      /* We've marked it as demanding, don't need to do anything else. */
-      return;
+  // allow_workspace_switch == "user action"
+
+  if (window->transient_for == NULL)
+    {
+      if (!allow_workspace_switch &&
+          !meta_window_located_on_workspace (window, workspace))
+        {
+          meta_window_set_demands_attention (window);
+          return;
+        }
+      else
+        {
+          if (!meta_window_located_on_workspace (window, workspace))
+            {
+              if (meta_prefs_get_bring_windows_to_current_workspace ())
+                {
+                  meta_window_change_workspace (window, workspace);
+                }
+              else
+                {
+                  meta_workspace_activate (window->workspace, timestamp);
+                }
+            }
+        }
     }
   else if (window->transient_for != NULL)
     {

src/meta/prefs.h

@@ -70,6 +70,7 @@
  * @META_PREF_LOCATE_POINTER: show pointer location
  * @META_PREF_GTK_THEME: gtk theme name
  * @META_PREF_BELL_SOUND: sound to use for audible event bell
+ * @META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE: behavior when use activates an off-workspace window.
  */
 
 /* Keep in sync with GSettings schemas! */
@@ -119,7 +120,8 @@ typedef enum
   META_PREF_MOUSE_ZOOM_ENABLED,
   META_PREF_TILE_MAXIMIZE,
   META_PREF_GTK_THEME,
-  META_PREF_BELL_SOUND
+  META_PREF_BELL_SOUND,
+  META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -160,6 +162,9 @@ CDesktopFocusMode           meta_prefs_get_focus_mode         (void);
 META_EXPORT
 CDesktopFocusNewWindows     meta_prefs_get_focus_new_windows  (void);
 
+META_EXPORT
+gboolean                    meta_prefs_get_bring_windows_to_current_workspace (void);
+
 META_EXPORT
 gboolean                    meta_prefs_get_attach_modal_dialogs (void);