From 376725e30e70c4182b8e81e55bfb1815a6580db0 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 17 Jun 2019 18:24:02 -0300 Subject: [PATCH] clutter/stage-view: Move unexported functions to private header Next commits will expose ClutterStageView as a public class, so move the functions private to Clutter to a private header. https://gitlab.gnome.org/GNOME/mutter/merge_requests/623 --- clutter/clutter/clutter-stage-view-private.h | 37 ++++++++++++++++++++ clutter/clutter/clutter-stage-view.c | 1 + clutter/clutter/clutter-stage-view.h | 13 ------- clutter/clutter/clutter-stage.c | 1 + clutter/clutter/cogl/clutter-stage-cogl.c | 1 + clutter/clutter/meson.build | 1 + 6 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 clutter/clutter/clutter-stage-view-private.h diff --git a/clutter/clutter/clutter-stage-view-private.h b/clutter/clutter/clutter-stage-view-private.h new file mode 100644 index 000000000..89c42599f --- /dev/null +++ b/clutter/clutter/clutter-stage-view-private.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2019 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +#ifndef __CLUTTER_STAGE_VIEW_PRIVATE_H__ +#define __CLUTTER_STAGE_VIEW_PRIVATE_H__ + +#include "clutter/clutter-stage-view.h" + +void clutter_stage_view_blit_offscreen (ClutterStageView *view, + const cairo_rectangle_int_t *clip); + +gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view); + +void clutter_stage_view_set_dirty_viewport (ClutterStageView *view, + gboolean dirty); + +gboolean clutter_stage_view_is_dirty_projection (ClutterStageView *view); + +void clutter_stage_view_set_dirty_projection (ClutterStageView *view, + gboolean dirty); + + +#endif /* __CLUTTER_STAGE_VIEW_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c index cd6cd35cb..2f39d30db 100644 --- a/clutter/clutter/clutter-stage-view.c +++ b/clutter/clutter/clutter-stage-view.c @@ -18,6 +18,7 @@ #include "clutter-build-config.h" #include "clutter/clutter-stage-view.h" +#include "clutter/clutter-stage-view-private.h" #include #include diff --git a/clutter/clutter/clutter-stage-view.h b/clutter/clutter/clutter-stage-view.h index 126498625..0c3448511 100644 --- a/clutter/clutter/clutter-stage-view.h +++ b/clutter/clutter/clutter-stage-view.h @@ -57,22 +57,9 @@ void clutter_stage_view_transform_to_onscreen (ClutterStageView *vie gfloat *x, gfloat *y); -void clutter_stage_view_blit_offscreen (ClutterStageView *view, - const cairo_rectangle_int_t *clip); - CLUTTER_EXPORT float clutter_stage_view_get_scale (ClutterStageView *view); -gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view); - -void clutter_stage_view_set_dirty_viewport (ClutterStageView *view, - gboolean dirty); - -gboolean clutter_stage_view_is_dirty_projection (ClutterStageView *view); - -void clutter_stage_view_set_dirty_projection (ClutterStageView *view, - gboolean dirty); - CLUTTER_EXPORT void clutter_stage_view_get_offscreen_transformation_matrix (ClutterStageView *view, CoglMatrix *matrix); diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 280eb0d49..8c4562e54 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -72,6 +72,7 @@ #include "clutter-private.h" #include "clutter-stage-manager-private.h" #include "clutter-stage-private.h" +#include "clutter-stage-view-private.h" #include "clutter-private.h" #include "cogl/cogl.h" diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c index 5b6eeb8bf..8898a3b64 100644 --- a/clutter/clutter/cogl/clutter-stage-cogl.c +++ b/clutter/clutter/cogl/clutter-stage-cogl.c @@ -45,6 +45,7 @@ #include "clutter-main.h" #include "clutter-private.h" #include "clutter-stage-private.h" +#include "clutter-stage-view-private.h" #include "cogl/cogl-trace.h" diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index 9ba49c319..b66384342 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -208,6 +208,7 @@ clutter_private_headers = [ 'clutter-stage-manager-private.h', 'clutter-stage-private.h', 'clutter-stage-view.h', + 'clutter-stage-view-private.h', 'clutter-stage-window.h', ]