From dae838c10d41082df7cfc7279704984e7f0e898f Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Tue, 14 Dec 2004 17:45:26 +0000
Subject: [PATCH] Ungrab keys on on client window when unframing as spotted by
Jochen Baier <Jochen.Baier@stud.uni-karlsruhe.de>
(Old svn revision: 12208)
---
po/xfwm4.pot | 2 +-
src/client.c | 6 +++---
src/focus.c | 8 ++++----
src/focus.h | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 347d9183a..395a74f9e 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-12 16:55+0100\n"
+"POT-Creation-Date: 2004-12-13 22:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/client.c b/src/client.c
index 03266101c..b23630523 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1114,9 +1114,9 @@ clientFree (Client * c)
{
clientClearLastRaise (c->screen_info);
}
- if (clientGetLastGrab () == c)
+ if (clientGetLastUngrab () == c)
{
- clientClearLastGrab ();
+ clientClearLastUngrab ();
}
if (c->blink_timeout_id)
{
@@ -1753,7 +1753,7 @@ clientUnframe (Client * c, gboolean remap)
myDisplayGrabServer (display_info);
gdk_error_trap_push ();
clientUngrabKeys (c);
- clientGrabButtons (c);
+ clientUngrabButtons (c);
compositorRemoveWindow (display_info, c->frame);
XUnmapWindow (display_info->dpy, c->frame);
clientGravitate (c, REMOVE);
diff --git a/src/focus.c b/src/focus.c
index fa9141c3a..c38f6081d 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -561,7 +561,7 @@ clientGrabMouseButtonForAll (ScreenInfo *screen_info)
{
clientGrabMouseButton (c);
}
- clientClearLastGrab ();
+ clientClearLastUngrab ();
}
void
@@ -577,7 +577,7 @@ clientUngrabMouseButtonForAll (ScreenInfo *screen_info)
{
clientUngrabMouseButton (c);
}
- clientClearLastGrab ();
+ clientClearLastUngrab ();
}
void
@@ -611,13 +611,13 @@ clientPassGrabMouseButton (Client * c)
}
Client *
-clientGetLastGrab (void)
+clientGetLastUngrab (void)
{
return last_ungrab;
}
void
-clientClearLastGrab (void)
+clientClearLastUngrab (void)
{
last_ungrab = NULL;
}
diff --git a/src/focus.h b/src/focus.h
index a83d76251..10ee74de7 100644
--- a/src/focus.h
+++ b/src/focus.h
@@ -52,8 +52,8 @@ void clientUngrabMouseButton (Client *);
void clientGrabMouseButtonForAll (ScreenInfo *);
void clientUngrabMouseButtonForAll (ScreenInfo *);
void clientPassGrabMouseButton (Client *);
-Client *clientGetLastGrab (void);
-void clientClearLastGrab (void);
+Client *clientGetLastUngrab (void);
+void clientClearLastUngrab (void);
#endif /* INC_FOCUS_H */
--
GitLab