[mutter/wip/gestures: 4/14] x11/events: Filter out all GDK events
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/gestures: 4/14] x11/events: Filter out all GDK events
- Date: Thu, 19 Jun 2014 21:45:47 +0000 (UTC)
commit ed289d118ea7c72714b479511fe8439432dcdf60
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Jun 19 21:54:01 2014 +0200
x11/events: Filter out all GDK events
Mutter does its own XEvent processing, including for the places
where interaction is wanted with the remaining GTK UI elements
(frames), so GDK is largely disposable.
Even though the GDK display connection remains, and events will
be delivered over there due to event selections on that display,
all events will be handled and filtered out by the GDK filter
function.
The dedicated event processing meant for frames in src/ui/ui.c
now hooks to the display connection through
meta_display_events_x11_add_func(), added to let all event filters
run and stop processing at a single point.
src/ui/ui.c | 15 +++++--------
src/x11/events.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---
src/x11/events.h | 5 ++++
3 files changed, 66 insertions(+), 13 deletions(-)
---
diff --git a/src/ui/ui.c b/src/ui/ui.c
index cb1f36b..a11adbb 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -26,6 +26,7 @@
#include <meta/util.h>
#include "core.h"
#include "theme-private.h"
+#include "x11/events.h"
#include <string.h>
#include <stdlib.h>
@@ -232,15 +233,11 @@ maybe_redirect_mouse_event (XEvent *xevent)
return TRUE;
}
-static GdkFilterReturn
-ui_filter_func (GdkXEvent *xevent,
- GdkEvent *event,
+static void
+ui_filter_func (gpointer xevent,
gpointer data)
{
- if (maybe_redirect_mouse_event (xevent))
- return GDK_FILTER_REMOVE;
- else
- return GDK_FILTER_CONTINUE;
+ maybe_redirect_mouse_event (xevent);
}
MetaUI*
@@ -266,7 +263,7 @@ meta_ui_new (Display *xdisplay,
*/
gtk_widget_show (GTK_WIDGET (ui->frames));
- gdk_window_add_filter (NULL, ui_filter_func, NULL);
+ meta_display_events_x11_add_func (ui_filter_func, NULL);
g_object_set_data (G_OBJECT (gdisplay), "meta-ui", ui);
@@ -283,7 +280,7 @@ meta_ui_free (MetaUI *ui)
gdisplay = gdk_x11_lookup_xdisplay (ui->xdisplay);
g_object_set_data (G_OBJECT (gdisplay), "meta-ui", NULL);
- gdk_window_remove_filter (NULL, ui_filter_func, NULL);
+ meta_display_events_x11_add_func (ui_filter_func, NULL);
g_free (ui);
}
diff --git a/src/x11/events.c b/src/x11/events.c
index 7355714..8b83382 100644
--- a/src/x11/events.c
+++ b/src/x11/events.c
@@ -38,6 +38,16 @@
#include "wayland/meta-xwayland.h"
#include "wayland/meta-wayland-private.h"
+typedef struct _EventFuncData EventFuncData;
+
+struct _EventFuncData
+{
+ GFunc func;
+ gpointer data;
+};
+
+static GList *event_funcs = NULL;
+
static XIEvent *
get_input_event (MetaDisplay *display,
XEvent *event)
@@ -1801,11 +1811,18 @@ xevent_filter (GdkXEvent *xevent,
gpointer data)
{
MetaDisplay *display = data;
+ EventFuncData *event_data;
+ GList *l;
- if (meta_display_handle_xevent (display, xevent))
- return GDK_FILTER_REMOVE;
- else
- return GDK_FILTER_CONTINUE;
+ meta_display_handle_xevent (display, xevent);
+
+ for (l = event_funcs; l; l = l->next)
+ {
+ event_data = l->data;
+ event_data->func (xevent, event_data->data);
+ }
+
+ return GDK_FILTER_REMOVE;
}
void
@@ -1819,3 +1836,37 @@ meta_display_free_events_x11 (MetaDisplay *display)
{
gdk_window_remove_filter (NULL, xevent_filter, display);
}
+
+void
+meta_display_events_x11_add_func (GFunc func,
+ gpointer user_data)
+{
+ EventFuncData *data;
+
+ data = g_slice_new0 (EventFuncData);
+ data->func = func;
+ data->data = user_data;
+ event_funcs = g_list_prepend (event_funcs, data);
+}
+
+void
+meta_display_events_x11_remove_func (GFunc func,
+ gpointer user_data)
+{
+ EventFuncData *data;
+ GList *l;
+
+ data = g_slice_new0 (EventFuncData);
+
+ for (l = event_funcs; l; l = l->next)
+ {
+ data = l->data;
+
+ if (data->func != func || data->data != user_data)
+ continue;
+
+ event_funcs = g_list_delete_link (event_funcs, l);
+ g_slice_free (EventFuncData, data);
+ break;
+ }
+}
diff --git a/src/x11/events.h b/src/x11/events.h
index 6aa073b..cc12ddb 100644
--- a/src/x11/events.h
+++ b/src/x11/events.h
@@ -28,4 +28,9 @@
void meta_display_init_events_x11 (MetaDisplay *display);
void meta_display_free_events_x11 (MetaDisplay *display);
+void meta_display_events_x11_add_func (GFunc func,
+ gpointer user_data);
+void meta_display_events_x11_remove_func (GFunc func,
+ gpointer user_data);
+
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]