[mutter] cogl: Inline cogl_xlib_renderer_set_event_retrieval_enabled into its one caller
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Inline cogl_xlib_renderer_set_event_retrieval_enabled into its one caller
- Date: Fri, 25 Oct 2019 12:29:37 +0000 (UTC)
commit e17494f3bde99d265249c1a213dd0a8a405a1e26
Author: Adam Jackson <ajax redhat com>
Date: Thu Oct 24 16:13:05 2019 -0400
cogl: Inline cogl_xlib_renderer_set_event_retrieval_enabled into its one caller
https://gitlab.gnome.org/GNOME/mutter/merge_requests/885
cogl/cogl/cogl-renderer.c | 13 +------------
cogl/cogl/cogl-xlib-renderer.h | 24 +-----------------------
2 files changed, 2 insertions(+), 35 deletions(-)
---
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index 6632f3bff..b83f8d08c 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -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)
diff --git a/cogl/cogl/cogl-xlib-renderer.h b/cogl/cogl/cogl-xlib-renderer.h
index e8fe43a51..dd495dbc5 100644
--- a/cogl/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl/cogl-xlib-renderer.h
@@ -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)
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]