cogl-renderer: Move the XEvent filters to be generic for all renderers
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:
@ -41,18 +41,36 @@ static void _cogl_renderer_free (CoglRenderer *renderer);
|
||||
|
||||
COGL_OBJECT_DEFINE (Renderer, renderer);
|
||||
|
||||
typedef struct _CoglNativeFilterClosure
|
||||
{
|
||||
CoglNativeFilterFunc func;
|
||||
void *data;
|
||||
} CoglNativeFilterClosure;
|
||||
|
||||
GQuark
|
||||
cogl_renderer_error_quark (void)
|
||||
{
|
||||
return g_quark_from_static_string ("cogl-renderer-error-quark");
|
||||
}
|
||||
|
||||
static void
|
||||
native_filter_closure_free (CoglNativeFilterClosure *closure)
|
||||
{
|
||||
g_slice_free (CoglNativeFilterClosure, closure);
|
||||
}
|
||||
|
||||
static void
|
||||
_cogl_renderer_free (CoglRenderer *renderer)
|
||||
{
|
||||
#ifdef COGL_HAS_FULL_WINSYS
|
||||
_cogl_winsys_renderer_disconnect (renderer);
|
||||
#endif
|
||||
|
||||
g_slist_foreach (renderer->event_filters,
|
||||
(GFunc) native_filter_closure_free,
|
||||
NULL);
|
||||
g_slist_free (renderer->event_filters);
|
||||
|
||||
g_free (renderer);
|
||||
}
|
||||
|
||||
@ -62,6 +80,7 @@ cogl_renderer_new (void)
|
||||
CoglRenderer *renderer = g_new0 (CoglRenderer, 1);
|
||||
|
||||
renderer->connected = FALSE;
|
||||
renderer->event_filters = NULL;
|
||||
|
||||
return _cogl_renderer_object_new (renderer);
|
||||
}
|
||||
@ -127,3 +146,66 @@ cogl_renderer_connect (CoglRenderer *renderer, GError **error)
|
||||
renderer->connected = TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
CoglFilterReturn
|
||||
cogl_renderer_handle_native_event (CoglRenderer *renderer,
|
||||
void *event)
|
||||
{
|
||||
GSList *l, *next;
|
||||
|
||||
/* Pass the event on to all of the registered filters in turn */
|
||||
for (l = renderer->event_filters; l; l = next)
|
||||
{
|
||||
CoglNativeFilterClosure *closure = l->data;
|
||||
|
||||
/* The next pointer is taken now so that we can handle the
|
||||
closure being removed during emission */
|
||||
next = l->next;
|
||||
|
||||
if (closure->func (event, closure->data) == COGL_FILTER_REMOVE)
|
||||
return COGL_FILTER_REMOVE;
|
||||
}
|
||||
|
||||
/* If the backend for the renderer also wants to see the events, it
|
||||
should just register its own filter */
|
||||
|
||||
return COGL_FILTER_CONTINUE;
|
||||
}
|
||||
|
||||
void
|
||||
cogl_renderer_add_native_filter (CoglRenderer *renderer,
|
||||
CoglNativeFilterFunc func,
|
||||
void *data)
|
||||
{
|
||||
CoglNativeFilterClosure *closure;
|
||||
|
||||
closure = g_slice_new (CoglNativeFilterClosure);
|
||||
closure->func = func;
|
||||
closure->data = data;
|
||||
|
||||
renderer->event_filters = g_slist_prepend (renderer->event_filters, closure);
|
||||
}
|
||||
|
||||
void
|
||||
cogl_renderer_remove_native_filter (CoglRenderer *renderer,
|
||||
CoglNativeFilterFunc func,
|
||||
void *data)
|
||||
{
|
||||
GSList *l, *prev = NULL;
|
||||
|
||||
for (l = renderer->event_filters; l; prev = l, l = l->next)
|
||||
{
|
||||
CoglNativeFilterClosure *closure = l->data;
|
||||
|
||||
if (closure->func == func && closure->data == data)
|
||||
{
|
||||
native_filter_closure_free (closure);
|
||||
if (prev)
|
||||
prev->next = g_slist_delete_link (prev->next, l);
|
||||
else
|
||||
renderer->event_filters =
|
||||
g_slist_delete_link (renderer->event_filters, l);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user