[mutter/wip/xinput2: 15/49] compositor: Use helper functions for input events
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/xinput2: 15/49] compositor: Use helper functions for input events
- Date: Fri, 15 Jul 2011 16:30:21 +0000 (UTC)
commit 5819e74c220b7cc13b65486db033d6579f981c13
Author: Carlos Garnacho <carlosg gnome org>
Date: Sat Jun 11 18:51:51 2011 +0200
compositor: Use helper functions for input events
src/compositor/compositor.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 8c03b4a..26b81f7 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -18,6 +18,7 @@
#include "meta-background-actor.h"
#include "window-private.h" /* to check window->hidden */
#include "display-private.h" /* for meta_display_lookup_x_window() */
+#include "input-events.h"
#include <X11/extensions/shape.h>
#include <X11/extensions/Xcomposite.h>
@@ -658,9 +659,15 @@ meta_compositor_set_updates (MetaCompositor *compositor,
}
static gboolean
-is_grabbed_event (XEvent *event)
+is_grabbed_event (MetaDisplay *display,
+ XEvent *event)
{
- switch (event->xany.type)
+ guint evtype;
+
+ if (!meta_input_event_get_type (display, event, &evtype))
+ return FALSE;
+
+ switch (evtype)
{
case ButtonPress:
case ButtonRelease:
@@ -683,7 +690,8 @@ meta_compositor_process_event (MetaCompositor *compositor,
XEvent *event,
MetaWindow *window)
{
- if (compositor->modal_plugin && is_grabbed_event (event))
+ if (compositor->modal_plugin &&
+ is_grabbed_event (compositor->display, event))
{
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]