projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c4753a
)
Ignore enter events caused by closing openbox menus
author
Dana Jansens
<danakj@orodu.net>
Wed, 16 Dec 2009 15:43:22 +0000
(10:43 -0500)
committer
Dana Jansens
<danakj@orodu.net>
Wed, 16 Dec 2009 20:37:26 +0000
(15:37 -0500)
openbox/menuframe.c
patch
|
blob
|
history
diff --git
a/openbox/menuframe.c
b/openbox/menuframe.c
index
ad692d2
..
3d2bf82
100644
(file)
--- a/
openbox/menuframe.c
+++ b/
openbox/menuframe.c
@@
-23,6
+23,7
@@
#include "screen.h"
#include "prop.h"
#include "actions.h"
#include "screen.h"
#include "prop.h"
#include "actions.h"
+#include "event.h"
#include "grab.h"
#include "openbox.h"
#include "mainloop.h"
#include "grab.h"
#include "openbox.h"
#include "mainloop.h"
@@
-949,7
+950,6
@@
gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
gboolean mouse)
{
gint px, py;
gboolean mouse)
{
gint px, py;
- guint i;
if (menu_frame_is_visible(self))
return TRUE;
if (menu_frame_is_visible(self))
return TRUE;
@@
-1021,6
+1021,7
@@
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
static void menu_frame_hide(ObMenuFrame *self)
{
GList *it = g_list_find(menu_frame_visible, self);
static void menu_frame_hide(ObMenuFrame *self)
{
GList *it = g_list_find(menu_frame_visible, self);
+ gulong ignore_start;
if (!it)
return;
if (!it)
return;
@@
-1046,7
+1047,9
@@
static void menu_frame_hide(ObMenuFrame *self)
ungrab_keyboard();
}
ungrab_keyboard();
}
+ ignore_start = event_start_ignore_all_enters();
XUnmapWindow(ob_display, self->window);
XUnmapWindow(ob_display, self->window);
+ event_end_ignore_all_enters(ignore_start);
menu_frame_free(self);
}
menu_frame_free(self);
}