Merge branch 'rename-window-to-surface' into 'master'

Rename window to surface

See merge request GNOME/gtk!72

9 files changed, 73 insertions, 73 deletions

diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 127f50e0f1..a429adfc2a 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -1886,7 +1886,7 @@ gsk_gl_renderer_create_programs (GskGLRenderer  *self,
 
 static gboolean
 gsk_gl_renderer_realize (GskRenderer  *renderer,
-                         GdkWindow    *window,
+                         GdkSurface    *window,
                          GError      **error)
 {
   GskGLRenderer *self = GSK_GL_RENDERER (renderer);
@@ -1896,7 +1896,7 @@ gsk_gl_renderer_realize (GskRenderer  *renderer,
    */
   if (self->gl_context == NULL)
     {
-      self->gl_context = gdk_window_create_gl_context (window, error);
+      self->gl_context = gdk_surface_create_gl_context (window, error);
       if (self->gl_context == NULL)
         return FALSE;
     }
@@ -1957,13 +1957,13 @@ gsk_gl_renderer_begin_draw_frame (GskRenderer          *renderer,
   cairo_region_t *damage;
   GdkDrawingContext *result;
   GdkRectangle whole_window;
-  GdkWindow *window;
+  GdkSurface *window;
 
-  window = gsk_renderer_get_window (renderer);
+  window = gsk_renderer_get_surface (renderer);
   whole_window = (GdkRectangle) {
                      0, 0,
-                     gdk_window_get_width (window) * self->scale_factor,
-                     gdk_window_get_height (window) * self->scale_factor
+                     gdk_surface_get_width (window) * self->scale_factor,
+                     gdk_surface_get_height (window) * self->scale_factor
                  };
   damage = gdk_gl_context_get_damage (self->gl_context);
   cairo_region_union (damage, update_area);
@@ -1985,7 +1985,7 @@ gsk_gl_renderer_begin_draw_frame (GskRenderer          *renderer,
         self->render_mode = RENDER_SCISSOR;
     }
 
-  result = gdk_window_begin_draw_frame (window,
+  result = gdk_surface_begin_draw_frame (window,
                                         GDK_DRAW_CONTEXT (self->gl_context),
                                         damage);
 
@@ -2048,7 +2048,7 @@ gsk_gl_renderer_setup_render_mode (GskGLRenderer *self)
     case RENDER_SCISSOR:
       {
         GdkDrawingContext *context = gsk_renderer_get_drawing_context (GSK_RENDERER (self));
-        GdkWindow *window = gsk_renderer_get_window (GSK_RENDERER (self));
+        GdkSurface *window = gsk_renderer_get_surface (GSK_RENDERER (self));
         cairo_region_t *clip = gdk_drawing_context_get_clip (context);
         cairo_rectangle_int_t extents;
         int window_height;
@@ -2062,7 +2062,7 @@ gsk_gl_renderer_setup_render_mode (GskGLRenderer *self)
 
         g_assert (cairo_region_num_rectangles (clip) == 1);
 
-        window_height = gdk_window_get_height (window) * self->scale_factor;
+        window_height = gdk_surface_get_height (window) * self->scale_factor;
 
         /*cairo_region_get_extents (clip, &extents);*/
         cairo_region_get_rectangle (clip, 0, &extents);
@@ -2567,7 +2567,7 @@ gsk_gl_renderer_render_texture (GskRenderer           *renderer,
   width = ceilf (viewport->size.width);
   height = ceilf (viewport->size.height);
 
-  self->scale_factor = gdk_window_get_scale_factor (gsk_renderer_get_window (renderer));
+  self->scale_factor = gdk_surface_get_scale_factor (gsk_renderer_get_surface (renderer));
   gdk_gl_context_make_current (self->gl_context);
 
   /* Prepare our framebuffer */
@@ -2605,19 +2605,19 @@ gsk_gl_renderer_render (GskRenderer   *renderer,
                         GskRenderNode *root)
 {
   GskGLRenderer *self = GSK_GL_RENDERER (renderer);
-  GdkWindow *window = gsk_renderer_get_window (renderer);
+  GdkSurface *window = gsk_renderer_get_surface (renderer);
   graphene_rect_t viewport;
 
   if (self->gl_context == NULL)
     return;
 
-  self->scale_factor = gdk_window_get_scale_factor (window);
+  self->scale_factor = gdk_surface_get_scale_factor (window);
   gdk_gl_context_make_current (self->gl_context);
 
   viewport.origin.x = 0;
   viewport.origin.y = 0;
-  viewport.size.width = gdk_window_get_width (window) * self->scale_factor;
-  viewport.size.height = gdk_window_get_height (window) * self->scale_factor;
+  viewport.size.width = gdk_surface_get_width (window) * self->scale_factor;
+  viewport.size.height = gdk_surface_get_height (window) * self->scale_factor;
 
   gsk_gl_renderer_do_render (renderer, root, &viewport, 0, self->scale_factor);
 
diff --git a/gsk/gskbroadwayrenderer.c b/gsk/gskbroadwayrenderer.c
index 887befdd4a..09896408bd 100644
--- a/gsk/gskbroadwayrenderer.c
+++ b/gsk/gskbroadwayrenderer.c
@@ -24,7 +24,7 @@ G_DEFINE_TYPE (GskBroadwayRenderer, gsk_broadway_renderer, GSK_TYPE_RENDERER)
 
 static gboolean
 gsk_broadway_renderer_realize (GskRenderer  *self,
-                               GdkWindow    *window,
+                               GdkSurface    *window,
                                GError      **error)
 {
   return TRUE;
@@ -43,16 +43,16 @@ gsk_broadway_renderer_begin_draw_frame (GskRenderer          *renderer,
   cairo_region_t *region;
   GdkDrawingContext *result;
   cairo_rectangle_int_t whole_window;
-  GdkWindow *window;
+  GdkSurface *window;
 
-  window = gsk_renderer_get_window (renderer);
+  window = gsk_renderer_get_surface (renderer);
   whole_window = (cairo_rectangle_int_t) {
     0, 0,
-    gdk_window_get_width (window),
-    gdk_window_get_height (window)
+    gdk_surface_get_width (window),
+    gdk_surface_get_height (window)
   };
   region = cairo_region_create_rectangle (&whole_window);
-  result = gdk_window_begin_draw_frame (window, NULL, region);
+  result = gdk_surface_begin_draw_frame (window, NULL, region);
   cairo_region_destroy (region);
 
   return result;
@@ -686,12 +686,12 @@ static void
 gsk_broadway_renderer_render (GskRenderer   *self,
                               GskRenderNode *root)
 {
-  GdkWindow *window = gsk_renderer_get_window (self);
+  GdkSurface *window = gsk_renderer_get_surface (self);
   GArray *nodes = g_array_new (FALSE, FALSE, sizeof(guint32));
   GPtrArray *node_textures = g_ptr_array_new_with_free_func (g_object_unref);
 
   gsk_broadway_renderer_add_node (self, nodes, node_textures, root, 0, 0);
-  gdk_broadway_window_set_nodes (window, nodes, node_textures);
+  gdk_broadway_surface_set_nodes (window, nodes, node_textures);
   g_array_unref (nodes);
   g_ptr_array_unref (node_textures);
 }
diff --git a/gsk/gskcairorenderer.c b/gsk/gskcairorenderer.c
index ca0b493b7a..12cbe1cae8 100644
--- a/gsk/gskcairorenderer.c
+++ b/gsk/gskcairorenderer.c
@@ -32,7 +32,7 @@ G_DEFINE_TYPE (GskCairoRenderer, gsk_cairo_renderer, GSK_TYPE_RENDERER)
 
 static gboolean
 gsk_cairo_renderer_realize (GskRenderer  *renderer,
-                            GdkWindow    *window,
+                            GdkSurface    *window,
                             GError      **error)
 {
   return TRUE;
@@ -99,7 +99,7 @@ gsk_cairo_renderer_render (GskRenderer   *renderer,
                            GskRenderNode *root)
 {
   GdkDrawingContext *context = gsk_renderer_get_drawing_context (renderer);
-  GdkWindow *window = gsk_renderer_get_window (renderer);
+  GdkSurface *window = gsk_renderer_get_surface (renderer);
 
   cairo_t *cr;
 
@@ -114,7 +114,7 @@ gsk_cairo_renderer_render (GskRenderer   *renderer,
       cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
       cairo_rectangle (cr,
                        0, 0,
-                       gdk_window_get_width (window), gdk_window_get_height (window));
+                       gdk_surface_get_width (window), gdk_surface_get_height (window));
       cairo_set_source_rgba (cr, 0, 0, 0.85, 0.5);
       cairo_stroke (cr);
       cairo_restore (cr);
diff --git a/gsk/gskrenderer.c b/gsk/gskrenderer.c
index 877aea7106..7b67e9ce4f 100644
--- a/gsk/gskrenderer.c
+++ b/gsk/gskrenderer.c
@@ -25,7 +25,7 @@
  * tree of #GskRenderNode instances.
  *
  * Typically you will use a #GskRenderer instance with a #GdkDrawingContext
- * associated to a #GdkWindow, and call gsk_renderer_render() with the
+ * associated to a #GdkSurface, and call gsk_renderer_render() with the
  * drawing context and the scene to be rendered.
  *
  * It is necessary to realize a #GskRenderer instance using gsk_renderer_realize()
@@ -69,7 +69,7 @@ typedef struct
   GskScalingFilter min_filter;
   GskScalingFilter mag_filter;
 
-  GdkWindow *window;
+  GdkSurface *window;
   GdkDrawingContext *drawing_context;
   GskRenderNode *root_node;
   GdkDisplay *display;
@@ -98,7 +98,7 @@ static GParamSpec *gsk_renderer_properties[N_PROPS];
 
 static gboolean
 gsk_renderer_real_realize (GskRenderer  *self,
-                           GdkWindow    *window,
+                           GdkSurface    *window,
                            GError      **error)
 {
   GSK_RENDERER_WARN_NOT_IMPLEMENTED_METHOD (self, realize);
@@ -126,7 +126,7 @@ gsk_renderer_real_begin_draw_frame (GskRenderer          *self,
 {
   GskRendererPrivate *priv = gsk_renderer_get_instance_private (self);
 
-  return gdk_window_begin_draw_frame (priv->window,
+  return gdk_surface_begin_draw_frame (priv->window,
                                       NULL,
                                       region);
 }
@@ -137,7 +137,7 @@ gsk_renderer_real_end_draw_frame (GskRenderer       *self,
 {
   GskRendererPrivate *priv = gsk_renderer_get_instance_private (self);
 
-  gdk_window_end_draw_frame (priv->window,
+  gdk_surface_end_draw_frame (priv->window,
                              context);
 }
 
@@ -155,7 +155,7 @@ gsk_renderer_real_create_cairo_surface (GskRenderer    *self,
                                         int             height)
 {
   GskRendererPrivate *priv = gsk_renderer_get_instance_private (self);
-  int scale_factor = priv->window ? gdk_window_get_scale_factor (priv->window) : 1;
+  int scale_factor = priv->window ? gdk_surface_get_scale_factor (priv->window) : 1;
   int real_width = width * scale_factor;
   int real_height = height * scale_factor;
 
@@ -286,7 +286,7 @@ gsk_renderer_class_init (GskRendererClass *klass)
     g_param_spec_object ("window",
                          "Window",
                          "The window associated to the renderer",
-                         GDK_TYPE_WINDOW,
+                         GDK_TYPE_SURFACE,
                          G_PARAM_READABLE |
                          G_PARAM_STATIC_STRINGS);
 
@@ -316,16 +316,16 @@ gsk_renderer_init (GskRenderer *self)
 }
 
 /**
- * gsk_renderer_get_window:
+ * gsk_renderer_get_surface:
  * @renderer: a #GskRenderer
  *
- * Retrieves the #GdkWindow set using gsk_renderer_realize(). If the renderer
+ * Retrieves the #GdkSurface set using gsk_renderer_realize(). If the renderer
  * has not been realized yet, %NULL will be returned.
  *
- * Returns: (transfer none) (nullable): a #GdkWindow
+ * Returns: (transfer none) (nullable): a #GdkSurface
  */
-GdkWindow *
-gsk_renderer_get_window (GskRenderer *renderer)
+GdkSurface *
+gsk_renderer_get_surface (GskRenderer *renderer)
 {
   GskRendererPrivate *priv = gsk_renderer_get_instance_private (renderer);
 
@@ -409,7 +409,7 @@ gsk_renderer_is_realized (GskRenderer *renderer)
 /**
  * gsk_renderer_realize:
  * @renderer: a #GskRenderer
- * @window: the #GdkWindow renderer will be used on
+ * @window: the #GdkSurface renderer will be used on
  * @error: return location for an error
  *
  * Creates the resources needed by the @renderer to render the scene
@@ -417,14 +417,14 @@ gsk_renderer_is_realized (GskRenderer *renderer)
  */
 gboolean
 gsk_renderer_realize (GskRenderer  *renderer,
-                      GdkWindow    *window,
+                      GdkSurface    *window,
                       GError      **error)
 {
   GskRendererPrivate *priv = gsk_renderer_get_instance_private (renderer);
 
   g_return_val_if_fail (GSK_IS_RENDERER (renderer), FALSE);
   g_return_val_if_fail (!gsk_renderer_is_realized (renderer), FALSE);
-  g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
+  g_return_val_if_fail (GDK_IS_SURFACE (window), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   priv->window = g_object_ref (window);
@@ -625,9 +625,9 @@ get_renderer_for_name (const char *renderer_name)
 }
 
 static GType
-get_renderer_for_display (GdkWindow *window)
+get_renderer_for_display (GdkSurface *window)
 {
-  GdkDisplay *display = gdk_window_get_display (window);
+  GdkDisplay *display = gdk_surface_get_display (window);
   const char *renderer_name;
 
   renderer_name = g_object_get_data (G_OBJECT (display), "gsk-renderer");
@@ -635,7 +635,7 @@ get_renderer_for_display (GdkWindow *window)
 }
 
 static GType
-get_renderer_for_env_var (GdkWindow *window)
+get_renderer_for_env_var (GdkSurface *window)
 {
   static GType env_var_type = G_TYPE_NONE;
 
@@ -649,18 +649,18 @@ get_renderer_for_env_var (GdkWindow *window)
 }
 
 static GType
-get_renderer_for_backend (GdkWindow *window)
+get_renderer_for_backend (GdkSurface *window)
 {
 #ifdef GDK_WINDOWING_X11
-  if (GDK_IS_X11_WINDOW (window))
+  if (GDK_IS_X11_SURFACE (window))
     return GSK_TYPE_GL_RENDERER; 
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_WINDOW (window))
+  if (GDK_IS_WAYLAND_SURFACE (window))
     return GSK_TYPE_GL_RENDERER;
 #endif
 #ifdef GDK_WINDOWING_BROADWAY
-  if (GDK_IS_BROADWAY_WINDOW (window))
+  if (GDK_IS_BROADWAY_SURFACE (window))
     return GSK_TYPE_BROADWAY_RENDERER;
 #endif
 
@@ -668,14 +668,14 @@ get_renderer_for_backend (GdkWindow *window)
 }
 
 static GType
-get_renderer_fallback (GdkWindow *window)
+get_renderer_fallback (GdkSurface *window)
 {
   return GSK_TYPE_CAIRO_RENDERER;
 }
 
 static struct {
   gboolean verbose;
-  GType (* get_renderer) (GdkWindow *window);
+  GType (* get_renderer) (GdkSurface *window);
 } renderer_possibilities[] = {
   { TRUE,  get_renderer_for_display },
   { TRUE,  get_renderer_for_env_var },
@@ -684,8 +684,8 @@ static struct {
 };
 
 /**
- * gsk_renderer_new_for_window:
- * @window: a #GdkWindow
+ * gsk_renderer_new_for_surface:
+ * @window: a #GdkSurface
  *
  * Creates an appropriate #GskRenderer instance for the given @window.
  *
@@ -694,7 +694,7 @@ static struct {
  * Returns: (transfer full) (nullable): a #GskRenderer
  */
 GskRenderer *
-gsk_renderer_new_for_window (GdkWindow *window)
+gsk_renderer_new_for_surface (GdkSurface *window)
 {
   GType renderer_type;
   GskRenderer *renderer;
@@ -702,7 +702,7 @@ gsk_renderer_new_for_window (GdkWindow *window)
   gboolean verbose = FALSE;
   guint i;
 
-  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+  g_return_val_if_fail (GDK_IS_SURFACE (window), NULL);
 
   for (i = 0; i < G_N_ELEMENTS (renderer_possibilities); i++)
     {
@@ -715,7 +715,7 @@ gsk_renderer_new_for_window (GdkWindow *window)
        */
       verbose |= renderer_possibilities[i].verbose;
       renderer = g_object_new (renderer_type,
-                               "display", gdk_window_get_display (window),
+                               "display", gdk_surface_get_display (window),
                                NULL);
 
       if (gsk_renderer_realize (renderer, window, &error))
@@ -784,8 +784,8 @@ gsk_renderer_begin_draw_frame (GskRenderer          *renderer,
 
       full_window = cairo_region_create_rectangle (&(GdkRectangle) {
                                                        0, 0,
-                                                       gdk_window_get_width (priv->window),
-                                                       gdk_window_get_height (priv->window)
+                                                       gdk_surface_get_width (priv->window),
+                                                       gdk_surface_get_height (priv->window)
                                                    });
 
       priv->drawing_context = GSK_RENDERER_GET_CLASS (renderer)->begin_draw_frame (renderer, full_window);
diff --git a/gsk/gskrenderer.h b/gsk/gskrenderer.h
index 46509bd814..0c867f9b4a 100644
--- a/gsk/gskrenderer.h
+++ b/gsk/gskrenderer.h
@@ -39,17 +39,17 @@ GDK_AVAILABLE_IN_ALL
 GType gsk_renderer_get_type (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-GskRenderer *           gsk_renderer_new_for_window             (GdkWindow               *window);
+GskRenderer *           gsk_renderer_new_for_surface             (GdkSurface               *window);
 
 GDK_AVAILABLE_IN_ALL
-GdkWindow *             gsk_renderer_get_window                 (GskRenderer             *renderer);
+GdkSurface *             gsk_renderer_get_surface                 (GskRenderer             *renderer);
 
 GDK_AVAILABLE_IN_ALL
 GdkDisplay *            gsk_renderer_get_display                (GskRenderer             *renderer);
 
 GDK_AVAILABLE_IN_ALL
 gboolean                gsk_renderer_realize                    (GskRenderer             *renderer,
-                                                                 GdkWindow               *window,
+                                                                 GdkSurface               *window,
                                                                  GError                 **error);
 GDK_AVAILABLE_IN_ALL
 void                    gsk_renderer_unrealize                  (GskRenderer             *renderer);
diff --git a/gsk/gskrendererprivate.h b/gsk/gskrendererprivate.h
index 9cd3c57034..c6b29f4242 100644
--- a/gsk/gskrendererprivate.h
+++ b/gsk/gskrendererprivate.h
@@ -39,7 +39,7 @@ struct _GskRendererClass
   GObjectClass parent_class;
 
   gboolean (* realize) (GskRenderer *renderer,
-                        GdkWindow *window,
+                        GdkSurface *window,
                         GError **error);
   void (* unrealize) (GskRenderer *renderer);
 
diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index 9775c926bf..5c7af11493 100644
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -210,7 +210,7 @@ gsk_render_node_get_name (GskRenderNode *node)
  *
  * Typically, you'll use this function to implement fallback rendering
  * of #GskRenderNodes on an intermediate Cairo context, instead of using
- * the drawing context associated to a #GdkWindow's rendering buffer.
+ * the drawing context associated to a #GdkSurface's rendering buffer.
  *
  * For advanced nodes that cannot be supported using Cairo, in particular
  * for nodes doing 3D operations, this function may fail.
diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index 66291b9ba5..f5d7ce0adb 100644
--- a/gsk/vulkan/gskvulkanrender.c
+++ b/gsk/vulkan/gskvulkanrender.c
@@ -67,7 +67,7 @@ gsk_vulkan_render_setup (GskVulkanRender       *self,
                          GskVulkanImage        *target,
                          const graphene_rect_t *rect)
 {
-  GdkWindow *window = gsk_renderer_get_window (self->renderer);
+  GdkSurface *window = gsk_renderer_get_surface (self->renderer);
 
   self->target = g_object_ref (target);
 
@@ -83,10 +83,10 @@ gsk_vulkan_render_setup (GskVulkanRender       *self,
     }
   else
     {
-      self->scale_factor = gdk_window_get_scale_factor (gsk_renderer_get_window (self->renderer));
+      self->scale_factor = gdk_surface_get_scale_factor (gsk_renderer_get_surface (self->renderer));
       self->viewport = GRAPHENE_RECT_INIT (0, 0,
-                                           gdk_window_get_width (window) * self->scale_factor,
-                                           gdk_window_get_height (window) * self->scale_factor);
+                                           gdk_surface_get_width (window) * self->scale_factor,
+                                           gdk_surface_get_height (window) * self->scale_factor);
       self->clip = gdk_drawing_context_get_clip (gsk_renderer_get_drawing_context (self->renderer));
     }
 }
diff --git a/gsk/vulkan/gskvulkanrenderer.c b/gsk/vulkan/gskvulkanrenderer.c
index 0a0cdab3bb..f00d900882 100644
--- a/gsk/vulkan/gskvulkanrenderer.c
+++ b/gsk/vulkan/gskvulkanrenderer.c
@@ -84,7 +84,7 @@ static void
 gsk_vulkan_renderer_update_images_cb (GdkVulkanContext  *context,
                                       GskVulkanRenderer *self)
 {
-  GdkWindow *window;
+  GdkSurface *window;
   gint scale_factor;
   gsize width, height;
   guint i;
@@ -94,10 +94,10 @@ gsk_vulkan_renderer_update_images_cb (GdkVulkanContext  *context,
   self->n_targets = gdk_vulkan_context_get_n_images (context);
   self->targets = g_new (GskVulkanImage *, self->n_targets);
 
-  window = gsk_renderer_get_window (GSK_RENDERER (self));
-  scale_factor = gdk_window_get_scale_factor (window);
-  width = gdk_window_get_width (window) * scale_factor;
-  height = gdk_window_get_height (window) * scale_factor;
+  window = gsk_renderer_get_surface (GSK_RENDERER (self));
+  scale_factor = gdk_surface_get_scale_factor (window);
+  width = gdk_surface_get_width (window) * scale_factor;
+  height = gdk_surface_get_height (window) * scale_factor;
 
   for (i = 0; i < self->n_targets; i++)
     {
@@ -110,12 +110,12 @@ gsk_vulkan_renderer_update_images_cb (GdkVulkanContext  *context,
 
 static gboolean
 gsk_vulkan_renderer_realize (GskRenderer  *renderer,
-                             GdkWindow    *window,
+                             GdkSurface    *window,
                              GError      **error)
 {
   GskVulkanRenderer *self = GSK_VULKAN_RENDERER (renderer);
 
-  self->vulkan = gdk_window_create_vulkan_context (window, error);
+  self->vulkan = gdk_surface_create_vulkan_context (window, error);
   if (self->vulkan == NULL)
     return FALSE;
 
@@ -256,7 +256,7 @@ gsk_vulkan_renderer_begin_draw_frame (GskRenderer          *renderer,
   GskVulkanRenderer *self = GSK_VULKAN_RENDERER (renderer);
   GdkDrawingContext *result;
 
-  result = gdk_window_begin_draw_frame (gsk_renderer_get_window (renderer),
+  result = gdk_surface_begin_draw_frame (gsk_renderer_get_surface (renderer),
                                         GDK_DRAW_CONTEXT (self->vulkan),
                                         region);