brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-renderer: Move the XEvent filters to be generic for all renderers

Browse Source 
Instead of having cogl_renderer_xlib_add_filter and friends there is
now cogl_renderer_add_native_filter which can be used regardless of
the backend. The callback function for the filter now just takes a
void pointer instead of an XEvent pointer which should be interpreted
differently depending on the backend. For example, on Xlib it would
still be an XEvent but on Windows it could be a MSG. This simplifies
the code somewhat because the _cogl_xlib_add_filter no longer needs to
have its own filter list when a stub renderer is used because there is
always a renderer available.

cogl_renderer_xlib_handle_event has also been renamed to
cogl_renderer_handle_native_event. This just forwards the event on to
all of the listeners. The backend renderer is expected to register its
own event filter if it wants to process the events in some way.
This commit is contained in:
Neil Roberts
2011-04-13 16:41:41 +01:00
parent cbbf76f280
commit f6ae9decaa
11 changed files with 190 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
cogl/cogl-xlib.c
View File

@ -52,35 +52,6 @@
context is created */
static Display *_cogl_xlib_display = NULL;
CoglXlibFilterReturn
cogl_xlib_handle_event (XEvent *xevent)
{
GSList *l;
_COGL_GET_CONTEXT (ctx, COGL_XLIB_FILTER_CONTINUE);
if (!ctx->stub_winsys)
return cogl_renderer_xlib_handle_event (ctx->display->renderer, xevent);
/* Pass the event on to all of the registered filters in turn */
for (l = ctx->event_filters; l; l = l->next)
{
CoglXlibFilterClosure *closure = l->data;
if (closure->func (xevent, closure->data) == COGL_XLIB_FILTER_REMOVE)
return COGL_XLIB_FILTER_REMOVE;
}
switch (xevent->type)
{
/* TODO... */
default:
break;
}
return COGL_XLIB_FILTER_CONTINUE;
}
Display *
cogl_xlib_get_display (void)
{
@ -104,59 +75,34 @@ cogl_xlib_set_display (Display *display)
_cogl_xlib_display = display;
}
void
_cogl_xlib_add_filter (CoglXlibFilterFunc func,
void *data)
/* These three functions are wrappers around the equivalent renderer
functions. They can be removed once all xlib-based backends in
Clutter know about the renderer */
CoglFilterReturn
cogl_xlib_handle_event (XEvent *xevent)
{
CoglXlibFilterClosure *closure;
_COGL_GET_CONTEXT (ctx, COGL_FILTER_CONTINUE);
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (!ctx->stub_winsys)
{
cogl_renderer_xlib_add_filter (ctx->display->renderer,
func, data);
return;
}
closure = g_slice_new (CoglXlibFilterClosure);
closure->func = func;
closure->data = data;
ctx->event_filters =
g_slist_prepend (ctx->event_filters, closure);
/* Pass the event on to the renderer */
return cogl_renderer_handle_native_event (ctx->display->renderer, xevent);
}
void
_cogl_xlib_remove_filter (CoglXlibFilterFunc func,
void *data)
_cogl_xlib_add_filter (CoglNativeFilterFunc func,
void *data)
{
GSList *l, *prev = NULL;
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (!ctx->stub_winsys)
{
cogl_renderer_xlib_remove_filter (ctx->display->renderer,
func, data);
return;
}
cogl_renderer_add_native_filter (ctx->display->renderer, func, data);
}
for (l = ctx->event_filters; l; prev = l, l = l->next)
{
CoglXlibFilterClosure *closure = l->data;
void
_cogl_xlib_remove_filter (CoglNativeFilterFunc func,
void *data)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (closure->func == func && closure->data == data)
{
g_slice_free (CoglXlibFilterClosure, closure);
if (prev)
prev->next = g_slist_delete_link (prev->next, l);
else
ctx->event_filters =
g_slist_delete_link (ctx->event_filters, l);
break;
}
}
cogl_renderer_remove_native_filter (ctx->display->renderer, func, data);
}
static int