[mutter] window: add _NET_WM_STATE_FOCUSED hint to _NET_WM_STATE
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] window: add _NET_WM_STATE_FOCUSED hint to _NET_WM_STATE
- Date: Tue, 8 Nov 2011 19:58:13 +0000 (UTC)
commit 6e47f0e846968ebf7e9637f09af17bbf3cd36fca
Author: Rui Matos <tiagomatos gmail com>
Date: Wed Oct 26 19:00:18 2011 +0100
window: add _NET_WM_STATE_FOCUSED hint to _NET_WM_STATE
This hint reflects whether a window appears focused.
https://bugzilla.gnome.org/show_bug.cgi?id=661427
src/core/window.c | 35 +++++++++++++++++++++--------------
src/meta/atomnames.h | 1 +
2 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index 475d595..95ae2bb 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1897,7 +1897,7 @@ static void
set_net_wm_state (MetaWindow *window)
{
int i;
- unsigned long data[12];
+ unsigned long data[13];
i = 0;
if (window->shaded)
@@ -1960,6 +1960,11 @@ set_net_wm_state (MetaWindow *window)
data[i] = window->display->atom__NET_WM_STATE_STICKY;
++i;
}
+ if (meta_window_appears_focused (window))
+ {
+ data[i] = window->display->atom__NET_WM_STATE_FOCUSED;
+ ++i;
+ }
meta_verbose ("Setting _NET_WM_STATE with %d atoms\n", i);
@@ -6629,6 +6634,17 @@ meta_window_client_message (MetaWindow *window,
return FALSE;
}
+static void
+meta_window_appears_focused_changed (MetaWindow *window)
+{
+ set_net_wm_state (window);
+
+ g_object_notify (G_OBJECT (window), "appears-focused");
+
+ if (window->frame)
+ meta_frame_queue_draw (window->frame);
+}
+
/**
* meta_window_propagate_focus_appearance:
* @window: the window to start propagating from
@@ -6674,9 +6690,7 @@ meta_window_propagate_focus_appearance (MetaWindow *window,
if (child_focus_state_changed && !parent->has_focus &&
parent != window->display->expected_focus_window)
{
- g_object_notify (G_OBJECT (parent), "appears-focused");
- if (parent->frame)
- meta_frame_queue_draw (parent->frame);
+ meta_window_appears_focused_changed (parent);
}
child = parent;
@@ -6830,11 +6844,8 @@ meta_window_notify_focus (MetaWindow *window,
g_object_notify (G_OBJECT (window->display), "focus-window");
if (!window->attached_focus_window)
- {
- g_object_notify (G_OBJECT (window), "appears-focused");
- if (window->frame)
- meta_frame_queue_draw (window->frame);
- }
+ meta_window_appears_focused_changed (window);
+
meta_window_propagate_focus_appearance (window, TRUE);
}
}
@@ -6867,11 +6878,7 @@ meta_window_notify_focus (MetaWindow *window,
window->has_focus = FALSE;
if (!window->attached_focus_window)
- {
- g_object_notify (G_OBJECT (window), "appears-focused");
- if (window->frame)
- meta_frame_queue_draw (window->frame);
- }
+ meta_window_appears_focused_changed (window);
meta_error_trap_push (window->display);
XUninstallColormap (window->display->xdisplay,
diff --git a/src/meta/atomnames.h b/src/meta/atomnames.h
index bcdbd40..bfbc778 100644
--- a/src/meta/atomnames.h
+++ b/src/meta/atomnames.h
@@ -164,6 +164,7 @@ item(_NET_WM_ACTION_ABOVE)
item(_NET_WM_ACTION_BELOW)
item(_NET_WM_STATE_STICKY)
item(_NET_WM_FULLSCREEN_MONITORS)
+item(_NET_WM_STATE_FOCUSED)
#if 0
/* We apparently never use: */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]