sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl/renderer: Never try to enable X11 event retrieval

Browse source 
It is always disabled as we always set a foreign display
when creating the renderer.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3887>
This commit is contained in:
Bilal Elmoussaoui 2024-07-15 22:12:58 +02:00 committed by Marge Bot
parent a7b87f250f
commit 1d0680471e
3 changed files with 0 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cogl/cogl/cogl-renderer-private.h
View file

@ -62,7 +62,6 @@ struct _CoglRenderer
#ifdef HAVE_X11
Display *foreign_xdpy;
gboolean xlib_enable_event_retrieval;
#endif
CoglDriver driver;

7
cogl/cogl/cogl-renderer.c
View file

@ -201,10 +201,6 @@ cogl_renderer_new (void)
_cogl_list_init (&renderer->idle_closures);
#ifdef HAVE_X11
renderer->xlib_enable_event_retrieval = TRUE;
#endif
return renderer;
}
@ -220,9 +216,6 @@ cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
renderer->foreign_xdpy = xdisplay;
/* If the application is using a foreign display then we can assume
it will also do its own event retrieval */
renderer->xlib_enable_event_retrieval = FALSE;
}
#endif /* HAVE_X11 */

36
cogl/cogl/cogl-xlib-renderer.c
View file

@ -394,32 +394,6 @@ randr_filter (XEvent *event,
return COGL_FILTER_CONTINUE;
}
static int64_t
prepare_xlib_events_timeout (void *user_data)
{
CoglRenderer *renderer = user_data;
CoglXlibRenderer *xlib_renderer = _cogl_xlib_renderer_get_data (renderer);
return XPending (xlib_renderer->xdpy) ? 0 : -1;
}
static void
dispatch_xlib_events (void *user_data, int revents)
{
CoglRenderer *renderer = user_data;
CoglXlibRenderer *xlib_renderer = _cogl_xlib_renderer_get_data (renderer);
if (renderer->xlib_enable_event_retrieval)
while (XPending (xlib_renderer->xdpy))
{
XEvent xevent;
XNextEvent (xlib_renderer->xdpy, &xevent);
cogl_xlib_renderer_handle_event (renderer, &xevent);
}
}
gboolean
_cogl_xlib_renderer_connect (CoglRenderer *renderer, GError **error)
{
@ -448,16 +422,6 @@ _cogl_xlib_renderer_connect (CoglRenderer *renderer, GError **error)
&randr_error))
x11_renderer->randr_base = -1;
if (renderer->xlib_enable_event_retrieval)
{
_cogl_poll_renderer_add_fd (renderer,
ConnectionNumber (xlib_renderer->xdpy),
COGL_POLL_FD_EVENT_IN,
prepare_xlib_events_timeout,
dispatch_xlib_events,
renderer);
}
XRRSelectInput(xlib_renderer->xdpy,
DefaultRootWindow (xlib_renderer->xdpy),
RRScreenChangeNotifyMask