Attachment 601359 Details for Bug 844165 – Apply-new_windows_always_on_top-to-newly-raised-action

[patch] Apply-new_windows_always_on_top-to-newly-raised-action

Apply-new_windows_always_on_top-to-newly-raised-acti.patch (text/plain), 3.79 KB, created by Wolfgang Ulbrich on 2012-07-30 23:46:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wolfgang Ulbrich

Created: 2012-07-30 23:46:10 UTC

Size: 3.79 KB

patch

obsolete

>From c093802679a2232a115da35e8d3a3cfefef0e6dd Mon Sep 17 00:00:00 2001
>From: Owen W. Taylor <otaylor@fishsoup.net>
>Date: Wed, 23 Jun 2010 19:45:05 -0400
>Subject: [PATCH 2/2] Apply new_windows_always_on_top to newly raised/activated windows
>
>A window that raises itself or activates itself is in many ways
>like a completely new window. (Once a window is out of the user's
>site, they really have no idea if it's mapped or has been withdrawn
>by the user.)
>
>If the user has set the new_windows_always_on_top key to make the
>behavior for a focus-stealing-prevented *new* window "raise but not
>focus", then they'll want the same behavior in the case of
>windows that attempt to raise or activate themselves as well.
>
>https://bugzilla.gnome.org/show_bug.cgi?id=599261
>---
> src/core/window.c          |   35 +++++++++++++++++++++++++++++++----
> src/marco.schemas.in.in |    6 ++++++
> 2 files changed, 37 insertions(+), 4 deletions(-)
>
>diff --git a/src/core/window.c b/src/core/window.c
>index 399bb42..c51cdec 100644
>--- a/src/core/window.c
>+++ b/src/core/window.c
>@@ -3000,6 +3000,8 @@ window_activate (MetaWindow     *window,
>                  MetaWorkspace  *workspace)
> {
>   gboolean can_ignore_outdated_timestamps;
>+  gboolean only_raise = FALSE;
>+
>   meta_topic (META_DEBUG_FOCUS,
>               "_NET_ACTIVE_WINDOW message sent for %s at time %u "
>               "by client type %u.\n",
>@@ -3021,8 +3023,28 @@ window_activate (MetaWindow     *window,
>                   "last_user_time (%u) is more recent; ignoring "
>                   " _NET_ACTIVE_WINDOW message.\n",
>                   window->display->last_user_time);
>-      meta_window_set_demands_attention(window);
>-      return;
>+      if (meta_prefs_get_new_windows_always_on_top () &&
>+          meta_prefs_get_raise_on_click ())
>+        {
>+          /* The new_windows_only_on_top preference causes new
>+           * focus-denied windows to get raised but not focused
>+           * instead of set to demands attention. For consistency, we
>+           * do the same here with windows that are "new to the user"
>+           * - that self activate and are focus-stealing prevented. We
>+           * can't just raise the window and return here because the
>+           * window might be on a different workspace, so we need the
>+           * handling below. The check for meta_prefs_get_raise_on_click ()
>+           * is because that preference, if off, somewhat unexpectedl
>+           * akes windows not raise on self-activation.  If that is changed
>+           * than the test should be removed here.
>+           */
>+          only_raise = TRUE;
>+        }
>+      else
>+        {
>+          meta_window_set_demands_attention (window);
>+          return;
>+        }
>     }
> 
>   /* For those stupid pagers, get a valid timestamp and show a warning */  
>@@ -3071,7 +3093,8 @@ window_activate (MetaWindow     *window,
>   meta_topic (META_DEBUG_FOCUS,
>               "Focusing window %s due to activation\n",
>               window->desc);
>-  meta_window_focus (window, timestamp);
>+  if (!only_raise)
>+    meta_window_focus (window, timestamp);
> }
> 
> /* This function exists since most of the functionality in window_activate
>
>diff --git a/src/marco.schemas.in.in b/src/marco.schemas.in.in
>index e0dec3d..b8257c4 100644
>--- a/src/marco.schemas.in.in
>+++ b/src/marco.schemas.in.in
>@@ -193,6 +193,12 @@
> 	   invariant in the 'click' focus mode that the topmost window always
> 	   has focus, so its most suitable for use with the 'mouse' and
> 	   'sloppy' focus modes.
>+
>+	   This key also affects windows that try to activate or raise themselves
>+	   themselves but don't succeed in getting the the focus. Without
>+	   this key being set, such windows are flashed in the taskbar. With
>+	   this key set they, like entirely new windows, are raised but not
>+	   focused.
>          </long>
>       </locale>
>     </schema>
>-- 
>1.7.0.1
>

Actions: View | Diff

Attachments on bug 844165: 601356 | 601357 | 601358 | 601359 | 601360 | 601361 | 601362 | 601363 | 601364 | 601365 | 601366 | 601367