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

cogl: Inline cogl_xlib_renderer_set_event_retrieval_enabled into its one caller

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/885
This commit is contained in:
Adam Jackson 2019-10-24 16:13:05 -04:00
parent c36c865987
commit e17494f3bd
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cogl/cogl/cogl-renderer.c
View File

@ -228,7 +228,7 @@ cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
/* If the application is using a foreign display then we can assume
it will also do its own event retrieval */
cogl_xlib_renderer_set_event_retrieval_enabled (renderer, FALSE);
renderer->xlib_enable_event_retrieval = FALSE;
}
Display *
@ -239,17 +239,6 @@ cogl_xlib_renderer_get_foreign_display (CoglRenderer *renderer)
return renderer->foreign_xdpy;
}
void
cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
gboolean enable)
{
g_return_if_fail (cogl_is_renderer (renderer));
/* NB: Renderers are considered immutable once connected */
g_return_if_fail (!renderer->connected);
renderer->xlib_enable_event_retrieval = enable;
}
void
cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
gboolean enable)

24
cogl/cogl/cogl-xlib-renderer.h
View File

@ -136,8 +136,7 @@ cogl_xlib_renderer_get_foreign_display (CoglRenderer *renderer);
* Sets a foreign Xlib display that Cogl will use for and Xlib based winsys
* backend.
*
* Note that calling this function will automatically call
* cogl_xlib_renderer_set_event_retrieval_enabled() to disable Cogl's
* Note that calling this function will automatically disable Cogl's
* event retrieval. Cogl still needs to see all of the X events so the
* application should also use cogl_xlib_renderer_handle_event() if it
* uses this function.
@ -146,27 +145,6 @@ void
cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
Display *display);
/**
* cogl_xlib_renderer_set_event_retrieval_enabled: (skip)
* @renderer: a #CoglRenderer
* @enable: The new value
*
* Sets whether Cogl should automatically retrieve events from the X
* display. This defaults to %TRUE unless
* cogl_xlib_renderer_set_foreign_display() is called. It can be set
* to %FALSE if the application wants to handle its own event
* retrieval. Note that Cogl still needs to see all of the X events to
* function properly so the application should call
* cogl_xlib_renderer_handle_event() for each event if it disables
* automatic event retrieval.
*
* Since: 1.10
* Stability: unstable
*/
void
cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
gboolean enable);
/**
* cogl_xlib_renderer_get_display: (skip)
*/