summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2003-02-27 22:44:36 +0000
committerMark McLoughlin <markmc@src.gnome.org>2003-02-27 22:44:36 +0000
commit6094763def1a3fda6553d349f55fd7080b696ead (patch)
treefddd5abe5656dd0fb17533c0bc79a7ba15bdafc2
parent4e96dd7ea6a9c1efae56c2415a5a4f5294fdf251 (diff)
downloadmetacity-6094763def1a3fda6553d349f55fd7080b696ead.tar.gz
Give me back my keys.
2003-02-28 Mark McLoughlin <mark@skynet.ie> Give me back my keys. * src/keybindings.c: (meta_window_grab_keys): don't grab keys on DOCK windows. * src/window.c: (recalc_window_type): re-grab the keys.
-rw-r--r--ChangeLog10
-rw-r--r--src/keybindings.c8
-rw-r--r--src/window.c2
3 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 54ed44d8..11b8f9c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-28 Mark McLoughlin <mark@skynet.ie>
+
+ Give me back my keys.
+
+ * src/keybindings.c: (meta_window_grab_keys): don't
+ grab keys on DOCK windows.
+
+ * src/window.c: (recalc_window_type): re-grab the
+ keys.
+
2003-02-26 Dmitry G. Mastrukov <dmitry@taurussoft.org>
* configure.in: Added Belarusian to ALL_LINGUAS.
diff --git a/src/keybindings.c b/src/keybindings.c
index 925ea315..e1fc24cd 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1080,6 +1080,14 @@ meta_window_grab_keys (MetaWindow *window)
{
if (window->all_keys_grabbed)
return;
+
+ if (window->type == META_WINDOW_DOCK)
+ {
+ if (window->keys_grabbed)
+ ungrab_all_keys (window->display, window->xwindow);
+ window->keys_grabbed = FALSE;
+ return;
+ }
if (window->keys_grabbed)
{
diff --git a/src/window.c b/src/window.c
index 2b0839bd..62c48c18 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5370,6 +5370,8 @@ recalc_window_type (MetaWindow *window)
/* update stacking constraints */
meta_window_update_layer (window);
+
+ meta_window_grab_keys (window);
}
}