Add more fill and stroke node tests

.gitlab-ci.yml

@@ -207,7 +207,9 @@ msys2-mingw64:
 
 macos-x86_64:
   rules:
-    # Do not run in forks as the runner is not available there.
+    # run merge request pipelines
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    # do not run in forks
     - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
   tags:
@@ -217,32 +219,25 @@ macos-x86_64:
     MESON_FORCE_BACKTRACKE: 1
     TMPDIR: /Users/Shared/work/tmp
     SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
+    CCACHE_DIR: /Users/Shared/work/ccache
     PIP_CACHE_DIR: /Users/Shared/build/cache
     PIPENV_CACHE_DIR: $PIP_CACHE_DIR
     PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
-    EXTRA_MESON_FLAGS: "-Dgobject-introspection:werror=false"
   before_script:
-    # Not using ccache on purpose as it accelerates the build so much that it
-    # can trigger race conditions in the gobject-introspection subproject.
     - bash .gitlab-ci/show-info-osx.sh
-    - /opt/macports/bin/python3.10 -m venv .venv
+    - python3 -m venv .venv
     - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
-    - ln -s /opt/pkg-config/bin/pkg-config .venv/bin
+    - ln -s /opt/ccache/ccache .venv/bin
-    - ln -s /opt/bison/bin/bison .venv/bin
     - source .venv/bin/activate
     - pip3 install meson==1.2.0
     - pip3 install ninja==1.11.1
-    - pip3 install /Users/Shared/build/pkgs/PyGObject-3.44.0-cp310-cp310-macosx_10_13_x86_64.whl
-                   /Users/Shared/build/pkgs/pycairo-1.23.0-cp310-cp310-macosx_10_13_x86_64.whl
   script:
-    - meson setup
+    - meson setup ${COMMON_MESON_FLAGS}
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
             -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
-            -Dintrospection=enabled
+            -Dintrospection=disabled
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled

.gitlab-ci/run-tests.sh

@@ -23,7 +23,6 @@ case "${backend}" in
                 --suite=gtk \
                 --no-suite=failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
@@ -46,7 +45,6 @@ case "${backend}" in
                 --suite=gtk \
                 --no-suite=failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=${backend}_failing \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
@@ -69,7 +67,6 @@ case "${backend}" in
                 --suite=gtk \
                 --no-suite=failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=gsk-compare-opengl
 
     kill ${server}

CONTRIBUTING.md

@@ -35,7 +35,8 @@ The issue tracker is meant to be used for actionable issues only.
 
 You should not open a new issue for security related questions.
 
-When in doubt, follow [security](https://security.gnome.org/).
+When in doubt, send an email to the [security](mailto:security@gnome.org)
+mailing list.
 
 ### Bug reports
 
@@ -243,11 +244,13 @@ people committing to GTK to follow a few rules:
    code, you should always ask. If your change is minor and you've been
    working on GTK for a while it probably isn't necessary to ask. But when
    in doubt, ask. Even if your change is correct, somebody may know a
-   better way to do things.
+   better way to do things. If you are making changes to GTK, you should
-   The `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org) is also a
+   be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
-   good place to find GTK developers to discuss changes, but if you live
+   mailing list; this is a good place to ask about intended changes.
-   outside of the EU/US time zones, the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
+   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
-   is the most certain and preferred method.
+   developers to discuss changes, but if you live outside of the EU/US time
+   zones, an email to the gtk-devel mailing list is the most certain and
+   preferred method.
 
 0. Ask _first_.
 

NEWS

@@ -1,95 +1,6 @@
-Overview of Changes in 4.13.2, xx-xx-xxxx
+Overview of Changes in 4.13.1, xx-xx-xxxx
 =========================================
 
-Overview of Changes in 4.13.1, 28-09-2023
-=========================================
-
-* GtkTooltip:
- - Don't cross native boundaries when looking for tooltips
-
-* GtkCenterLayout, GtkEntry, GtkSearchEntry:
- - Fix some issues with baseline handling
-
-* GtkColorButton, GtkFontButton:
- - Propagate focus-on-click
-
-* GtkFileChooser:
- - Make "Visit file" scroll to the file
-
-* GtkSwitch:
- - Respect text direction
-
-* GtkWindow:
- - Don't assume titlebars are GtkHeaderBars
-
-* Printing:
- - Fix some problems with the portal implementation
- - Add a new simple print API: GtkPrintDialog
-
-* Paths:
- - GskPathMeasure performance has been improved
- - Add custom contours for circles, rounded rectangles and rectangles
- - Simplify GskPathPoint handling
- - gsk_path_point_get_closest_point now returns the distance as well
- - Make GskPathBuilder simplify curves
-
-* Input:
- - Handle (some) single-key compose sequences
- - Fix active state tracking with sensitivity changes and grabs
-
-* GSK:
- - Make the repeated gradients match between GL and cairo
- - Make rounded rect shrinking match between Vulkan, GL and cairo
- - Fix parsing of text nodes with color glyphs
- - Restrict an optimization to the cases where it is crrect
- - Fix rendering of shadows with opacity
- - The Vulkan renderer now requires Vulkan 1.2
- - GL: Transition gradients unpremultiplied
- - GL: Fix clipping of shadows
- - GL: Some optimizations
- - Broadway: Fix memory leaks in the renderer
-
-* Wayland:
- - Make activation more reliable
-
-* macOS:
- - Clamp damage regions to the surface size
-
-* Tools:
- - gtk4-path-tool gained restrict and reverse commands
- - gtk4-path-tool show and render can show control points
-
-* Demos:
- - Add a demo for hit testing with paths
-
-* Build:
- - Fix build problems with C++ compilers
-
-* Deprecations:
- - gtk_window_present_with_time
-
-* Translation updates
- Brazilian Portuguese
- British English
- Catalan
- Chinese (China)
- Czech
- Danish
- Dutch
- Esperanto
- Galician
- Georgian
- Italian
- Korean
- Latvian
- Lithuanian
- Persian
- Polish
- Punjabi
- Slovenian
- Turkish
-
-
 Overview of Changes in 4.13.0, 25-08-2023
 =========================================
 

demos/gtk-demo/application.c

@@ -223,7 +223,7 @@ delete_messages (gpointer data)
 static void
 pop_message (GtkWidget *status)
 {
-  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
 
   if (messages)
     {
@@ -241,7 +241,7 @@ static void
 push_message (GtkWidget  *status,
               const char *message)
 {
-  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
 
   gtk_label_set_label (GTK_LABEL (status), message);
   messages = g_list_prepend (messages, g_strdup (message));

demos/gtk-demo/demo.gresource.xml

@@ -127,7 +127,6 @@
     <file>fishbowl.ui</file>
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
-    <file>tiger.node</file>
   </gresource>
   <gresource prefix="/frames">
     <file>frames.ui</file>
@@ -337,7 +336,6 @@
     <file>panes.c</file>
     <file>password_entry.c</file>
     <file>path_fill.c</file>
-    <file>path_maze.c</file>
     <file>path_spinner.c</file>
     <file>path_walk.c</file>
     <file>path_text.c</file>

demos/gtk-demo/demowidget.c

@@ -34,7 +34,7 @@ transition (GtkWidget     *widget,
 {
   DemoWidget *self = DEMO_WIDGET (widget);
   DemoLayout *demo_layout = DEMO_LAYOUT (gtk_widget_get_layout_manager (widget));
-  gint64 now = gdk_frame_clock_get_frame_time (frame_clock);
+  gint64 now = g_get_monotonic_time ();
 
   gtk_widget_queue_allocate (widget);
 
@@ -66,13 +66,11 @@ clicked (GtkGestureClick *gesture,
          gpointer         data)
 {
   DemoWidget *self = data;
-  GdkFrameClock *frame_clock;
 
   if (self->tick_id != 0)
     return;
 
-  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (self));
+  self->start_time = g_get_monotonic_time ();
-  self->start_time = gdk_frame_clock_get_frame_time (frame_clock);
   self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self), transition, NULL, NULL);
 }
 

demos/gtk-demo/fishbowl.c

@@ -11,9 +11,6 @@
 #include "gtkgears.h"
 #include "gskshaderpaintable.h"
 
-#include "nodewidget.h"
-#include "graphwidget.h"
-
 const char *const css =
 ".blurred-button {"
 "  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
@@ -74,7 +71,14 @@ create_blurred_button (void)
 static GtkWidget *
 create_font_button (void)
 {
-  return gtk_font_dialog_button_new (gtk_font_dialog_new ());
+  GtkFontDialog *dialog;
+  GtkWidget *button;
+
+  dialog = gtk_font_dialog_new ();
+  button = gtk_font_dialog_button_new (dialog);
+  g_object_unref (dialog);
+
+  return button;
 }
 
 static GtkWidget *
@@ -204,18 +208,6 @@ create_menu_button (void)
   return w;
 }
 
-static GtkWidget *
-create_tiger (void)
-{
-  return node_widget_new ("/fishbowl/tiger.node");
-}
-
-static GtkWidget *
-create_graph (void)
-{
-  return graph_widget_new ();
-}
-
 static const struct {
   const char *name;
   GtkWidget * (*create_func) (void);
@@ -233,8 +225,6 @@ static const struct {
   { "Switch",     create_switch         },
   { "Menubutton", create_menu_button    },
   { "Shader",     create_cogs           },
-  { "Tiger",      create_tiger          },
-  { "Graph",      create_graph          },
 };
 
 static int selected_widget_type = -1;

demos/gtk-demo/graphwidget.c

@@ -1,153 +0,0 @@
-#include "graphwidget.h"
-
-struct _GraphWidget
-{
-  GtkWidget parent_instance;
-
-  GskPath *path;
-  GskStroke *stroke;
-  GdkRGBA color;
-
-  guint tick_cb;
-  guint64 start_time;
-
-  double period;
-  double amplitude;
-};
-
-struct _GraphWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GraphWidget, graph_widget, GTK_TYPE_WIDGET)
-
-static void
-update_path (GraphWidget *self,
-             float        amplitude)
-{
-  graphene_point_t p[20];
-  GskPathBuilder *builder;
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-
-  for (int i = 0; i < 20; i++)
-    {
-      p[i].x = 10 * i;
-      p[i].y = 50;
-
-      if (i % 4 == 1 || i % 4 == 2)
-        {
-          if (i % 8 < 4)
-            p[i].y += amplitude;
-          else
-            p[i].y -= amplitude;
-        }
-    }
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_move_to (builder, p[0].x, p[0].y);
-
-  for (int i = 0; i < 20; i += 4)
-    gsk_path_builder_cubic_to (builder,
-                               p[i+1].x, p[i+1].y,
-                               p[i+2].x, p[i+2].y,
-                               p[i+3].x, p[i+3].y);
-
-  self->path = gsk_path_builder_free_to_path (builder);
-}
-
-static gboolean
-tick_cb (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       user_data)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-  guint64 now;
-  double angle;
-
-  now = gdk_frame_clock_get_frame_time (frame_clock);
-
-  if (self->start_time == 0)
-    self->start_time = now;
-
-  angle = 360 * (now - self->start_time) / (double)(self->period * G_TIME_SPAN_MINUTE);
-  update_path (self, sin (angle) * self->amplitude);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-graph_widget_init (GraphWidget *self)
-{
-  self->color.red = g_random_double_range (0, 1);
-  self->color.green = g_random_double_range (0, 1);
-  self->color.blue = g_random_double_range (0, 1);
-  self->color.alpha = 1;
-
-  self->period = g_random_double_range (0.5, 1);
-  self->amplitude = g_random_double_range (10, 25);
-
-  self->stroke = gsk_stroke_new (2);
-
-  update_path (self, 0);
-
-  self->start_time = 0;
-  self->tick_cb = gtk_widget_add_tick_callback (GTK_WIDGET (self), tick_cb, NULL, NULL);
-}
-
-static void
-graph_widget_dispose (GObject *object)
-{
-  GraphWidget *self = GRAPH_WIDGET (object);
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  gsk_stroke_free (self->stroke);
-
-  G_OBJECT_CLASS (graph_widget_parent_class)->dispose (object);
-}
-
-static void
-graph_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-
-  gtk_snapshot_append_stroke (snapshot, self->path, self->stroke, &self->color);
-}
-
-static void
-graph_widget_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum,
-                      int            *natural,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = 200;
-  else
-    *minimum = *natural = 100;
-}
-
-
-static void
-graph_widget_class_init (GraphWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = graph_widget_dispose;
-
-  widget_class->snapshot = graph_widget_snapshot;
-  widget_class->measure = graph_widget_measure;
-}
-
-GtkWidget *
-graph_widget_new (void)
-{
-  return g_object_new (GRAPH_TYPE_WIDGET, NULL);
-}

demos/gtk-demo/graphwidget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define GRAPH_TYPE_WIDGET (graph_widget_get_type ())
-G_DECLARE_FINAL_TYPE (GraphWidget, graph_widget, GRAPH, WIDGET, GtkWidget)
-
-GtkWidget * graph_widget_new       (void);

demos/gtk-demo/meson.build

@@ -73,7 +73,6 @@ demos = files([
   'panes.c',
   'password_entry.c',
   'path_fill.c',
-  'path_maze.c',
   'path_spinner.c',
   'path_walk.c',
   'path_text.c',
@@ -141,8 +140,6 @@ extra_demo_sources = files([
   'unicode-names.c',
   'suggestionentry.c',
   'language-names.c',
-  'nodewidget.c',
-  'graphwidget.c',
 ])
 
 if os_unix

demos/gtk-demo/nodewidget.c

@@ -1,76 +0,0 @@
-#include "nodewidget.h"
-
-struct _NodeWidget
-{
-  GtkWidget parent_instance;
-
-  GskRenderNode *node;
-};
-
-struct _NodeWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (NodeWidget, node_widget, GTK_TYPE_WIDGET)
-
-static void
-node_widget_init (NodeWidget *self)
-{
-}
-
-static void
-node_widget_dispose (GObject *object)
-{
-  NodeWidget *self = NODE_WIDGET (object);
-
-  gsk_render_node_unref (self->node);
-
-  G_OBJECT_CLASS (node_widget_parent_class)->dispose (object);
-}
-
-static void
-node_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  NodeWidget *self = NODE_WIDGET (widget);
-
-  gtk_snapshot_append_node (snapshot, self->node);
-}
-
-static void
-node_widget_class_init (NodeWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = node_widget_dispose;
-
-  widget_class->snapshot = node_widget_snapshot;
-}
-
-GtkWidget *
-node_widget_new (const char *resource)
-{
-  NodeWidget *self;
-  GBytes *bytes;
-  GskRenderNode *node;
-  graphene_rect_t bounds;
-  float scale;
-  GskTransform *transform;
-
-  self = g_object_new (NODE_TYPE_WIDGET, NULL);
-
-  bytes = g_resources_lookup_data (resource, 0, NULL);
-  node = gsk_render_node_deserialize (bytes, NULL, NULL);
-  g_bytes_unref (bytes);
-
-  gsk_render_node_get_bounds (node, &bounds);
-  scale = MIN (100.0/bounds.size.width, 100.0/bounds.size.height);
-  transform = gsk_transform_scale (NULL, scale, scale);
-  self->node = gsk_transform_node_new (node, transform);
-  gsk_transform_unref (transform);
-  gsk_render_node_unref (node);
-
-  return GTK_WIDGET (self);
-}

demos/gtk-demo/nodewidget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define NODE_TYPE_WIDGET (node_widget_get_type ())
-G_DECLARE_FINAL_TYPE (NodeWidget, node_widget, NODE, WIDGET, GtkWidget)
-
-GtkWidget * node_widget_new       (const char *file);

demos/gtk-demo/path_fill.c

@@ -2,13 +2,10 @@
  *
  * This demo shows how to use GskPath to draw shapes that are (a bit)
  * more complex than a rounded rectangle.
- *
- * It also demonstrates printing to a stream with GtkPrintDialog.
  */
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <cairo-pdf.h>
 
 #include "paintable.h"
 
@@ -168,89 +165,6 @@ gtk_logo_paintable_new (void)
   return GDK_PAINTABLE (self);
 }
 
-static cairo_status_t
-write_cairo (void                *closure,
-             const unsigned char *data,
-             unsigned int         length)
-{
-  GOutputStream *stream = closure;
-  gsize written;
-  GError *error = NULL;
-
-  if (!g_output_stream_write_all (stream, data, length, &written, NULL, &error))
-    {
-      g_print ("Error writing pdf stream: %s\n", error->message);
-      g_error_free (error);
-      return CAIRO_STATUS_WRITE_ERROR;
-    }
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-print_ready (GObject      *source,
-             GAsyncResult *result,
-             gpointer      data)
-{
-  GtkPrintDialog *dialog = GTK_PRINT_DIALOG (source);
-  GError *error = NULL;
-  GOutputStream *stream;
-  GtkSnapshot *snapshot;
-  GdkPaintable *paintable;
-  GskRenderNode *node;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-
-  stream = gtk_print_dialog_print_finish (dialog, result, &error);
-  if (stream == NULL)
-    {
-      g_print ("Failed to get output stream: %s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  snapshot = gtk_snapshot_new ();
-  paintable = gtk_picture_get_paintable (GTK_PICTURE (data));
-  gdk_paintable_snapshot (paintable, snapshot, 100, 100);
-  node = gtk_snapshot_free_to_node (snapshot);
-
-  surface = cairo_pdf_surface_create_for_stream (write_cairo, stream, 100, 100);
-  cr = cairo_create (surface);
-
-  gsk_render_node_draw (node, cr);
-
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-  gsk_render_node_unref (node);
-
-  if (!g_output_stream_close (stream, NULL, &error))
-    {
-      g_print ("Error from close: %s\n", error->message);
-      g_error_free (error);
-    }
-
-  g_object_unref (stream);
-}
-
-static void
-print (GtkButton *button,
-       gpointer   data)
-{
-  GtkWidget *picture = data;
-  GtkPrintDialog *dialog;
-
-  dialog = gtk_print_dialog_new ();
-
-  gtk_print_dialog_print (dialog,
-                          GTK_WINDOW (gtk_widget_get_root (picture)),
-                          NULL,
-                          NULL,
-                          print_ready,
-                          picture);
-
-  g_object_unref (dialog);
-}
-
 GtkWidget *
 do_path_fill (GtkWidget *do_widget)
 {
@@ -258,21 +172,12 @@ do_path_fill (GtkWidget *do_widget)
 
   if (!window)
     {
-      GtkWidget *header, *button, *label;
       GtkWidget *picture;
       GdkPaintable *paintable;
 
       window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_default_size (GTK_WINDOW (window), 100, 100);
       gtk_window_set_title (GTK_WINDOW (window), "Fill and Stroke");
-      header = gtk_header_bar_new ();
-      button = gtk_button_new_from_icon_name ("printer-symbolic");
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
-      label = gtk_label_new ("Fill and Stroke");
-      gtk_widget_add_css_class (label, "title");
-      gtk_header_bar_set_title_widget (GTK_HEADER_BAR (header), label);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paintable = gtk_logo_paintable_new ();
@@ -281,8 +186,6 @@ do_path_fill (GtkWidget *do_widget)
       gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
       g_object_unref (paintable);
 
-      g_signal_connect (button, "clicked", G_CALLBACK (print), picture);
-
       gtk_window_set_child (GTK_WINDOW (window), picture);
     }
 

demos/gtk-demo/path_maze.c

@@ -1,369 +0,0 @@
-/* Path/Maze
- *
- * This demo shows how to use a GskPath to create a maze and use
- * gsk_path_get_closest_point() to check the mouse stays
- * on the path.
- *
- * It also shows off the performance of GskPath (or not) as this
- * is a rather complex path.
- */
-
-#include "config.h"
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "paintable.h"
-
-#define MAZE_GRID_SIZE 20
-#define MAZE_STROKE_SIZE_ACTIVE (MAZE_GRID_SIZE - 4)
-#define MAZE_STROKE_SIZE_INACTIVE (MAZE_GRID_SIZE - 12)
-#define MAZE_WIDTH 31
-#define MAZE_HEIGHT 21
-
-#define GTK_TYPE_MAZE (gtk_maze_get_type ())
-G_DECLARE_FINAL_TYPE (GtkMaze, gtk_maze, GTK, MAZE, GtkWidget)
-
-struct _GtkMaze
-{
-  GtkWidget parent_instance;
-
-  int width;
-  int height;
-  GskPath *path;
-  GskPathMeasure *measure;
-  GdkPaintable *background;
-
-  gboolean active;
-};
-
-struct _GtkMazeClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GtkMaze, gtk_maze, GTK_TYPE_WIDGET)
-
-static void
-gtk_maze_measure (GtkWidget      *widget,
-                  GtkOrientation  orientation,
-                  int             for_size,
-                  int            *minimum,
-                  int            *natural,
-                  int            *minimum_baseline,
-                  int            *natural_baseline)
-{
-  GtkMaze *self = GTK_MAZE (widget);
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = self->width;
-  else
-    *minimum = *natural = self->height;
-}
-
-static void
-gtk_maze_snapshot (GtkWidget   *widget,
-                   GdkSnapshot *snapshot)
-{
-  GtkMaze *self = GTK_MAZE (widget);
-  double width = gtk_widget_get_width (widget);
-  double height = gtk_widget_get_height (widget);
-  GskStroke *stroke;
-
-  stroke = gsk_stroke_new (MAZE_STROKE_SIZE_INACTIVE);
-  if (self->active)
-    gsk_stroke_set_line_width (stroke, MAZE_STROKE_SIZE_ACTIVE);
-  gsk_stroke_set_line_join (stroke, GSK_LINE_JOIN_ROUND);
-  gsk_stroke_set_line_cap (stroke, GSK_LINE_CAP_ROUND);
-  gtk_snapshot_push_stroke (snapshot, self->path, stroke);
-  gsk_stroke_free (stroke);
-
-  if (self->background)
-    {
-      gdk_paintable_snapshot (self->background, snapshot, width, height);
-    }
-  else
-    {
-      gtk_snapshot_append_linear_gradient (snapshot,
-                                           &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                           &GRAPHENE_POINT_INIT (0, 0),
-                                           &GRAPHENE_POINT_INIT (width, height),
-                                           (GskColorStop[8]) {
-                                             { 0.0, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.2, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.3, { 1.0, 1.0, 0.0, 1.0 } },
-                                             { 0.4, { 0.0, 1.0, 0.0, 1.0 } },
-                                             { 0.6, { 0.0, 1.0, 1.0, 1.0 } },
-                                             { 0.7, { 0.0, 0.0, 1.0, 1.0 } },
-                                             { 0.8, { 1.0, 0.0, 1.0, 1.0 } },
-                                             { 1.0, { 1.0, 0.0, 1.0, 1.0 } }
-                                           },
-                                           8);
-    }
-
-  gtk_snapshot_pop (snapshot);
-
-}
-
-static void
-gtk_maze_dispose (GObject *object)
-{
-  GtkMaze *self = GTK_MAZE (object);
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  g_clear_pointer (&self->measure, gsk_path_measure_unref);
-  if (self->background)
-    {
-      g_signal_handlers_disconnect_matched (self->background, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
-      g_clear_object (&self->background);
-    }
-
-  G_OBJECT_CLASS (gtk_maze_parent_class)->dispose (object);
-}
-
-static void
-gtk_maze_class_init (GtkMazeClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gtk_maze_dispose;
-
-  widget_class->measure = gtk_maze_measure;
-  widget_class->snapshot = gtk_maze_snapshot;
-}
-
-static void
-celebrate (gboolean win)
-{
-  char *path;
-  GtkMediaStream *stream;
-
-  if (win)
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "complete.oga", NULL);
-  else
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "suspend-error.oga", NULL);
-  stream = gtk_media_file_new_for_filename (path);
-  gtk_media_stream_set_volume (stream, 1.0);
-  gtk_media_stream_play (stream);
-
-  g_signal_connect (stream, "notify::ended", G_CALLBACK (g_object_unref), NULL);
-  g_free (path);
-}
-
-static void
-pointer_motion (GtkEventControllerMotion *controller,
-                double                    x,
-                double                    y,
-                GtkMaze                  *self)
-{
-  GskPathPoint point;
-  float distance;
-
-  if (!self->active)
-    return;
-
-  if (gsk_path_get_closest_point (self->path,
-                                  &GRAPHENE_POINT_INIT (x, y),
-                                  INFINITY,
-                                  &point,
-                                  &distance))
-    {
-      if (distance < MAZE_STROKE_SIZE_ACTIVE / 2.f)
-        return;
-    }
-
-  celebrate (FALSE);
-
-  self->active = FALSE;
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-pointer_leave (GtkEventControllerMotion *controller,
-               GtkMaze                  *self)
-{
-  if (!self->active)
-    {
-      self->active = TRUE;
-      gtk_widget_queue_draw (GTK_WIDGET (self));
-    }
-}
-
-static void
-gtk_maze_init (GtkMaze *self)
-{
-  GtkEventController *controller;
-
-  controller = GTK_EVENT_CONTROLLER (gtk_event_controller_motion_new ());
-  g_signal_connect (controller, "motion", G_CALLBACK (pointer_motion), self);
-  g_signal_connect (controller, "leave", G_CALLBACK (pointer_leave), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-
-  self->active = TRUE;
-}
-
-static void
-gtk_maze_set_path (GtkMaze *self,
-                   GskPath *path)
-{
-  g_clear_pointer (&self->path, gsk_path_unref);
-  g_clear_pointer (&self->measure, gsk_path_measure_unref);
-  self->path = gsk_path_ref (path);
-  self->measure = gsk_path_measure_new (path);
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-GtkWidget *
-gtk_maze_new (GskPath      *path,
-              GdkPaintable *background,
-              int           width,
-              int           height)
-{
-  GtkMaze *self;
-
-  self = g_object_new (GTK_TYPE_MAZE, NULL);
-
-  gtk_maze_set_path (self, path);
-  gsk_path_unref (path);
-  self->background = background;
-  if (self->background)
-    {
-      g_signal_connect_swapped (self->background, "invalidate-contents", G_CALLBACK (gtk_widget_queue_draw), self);
-      g_signal_connect_swapped (self->background, "invalidate-size", G_CALLBACK (gtk_widget_queue_resize), self);
-    }
-  self->width = width;
-  self->height = height;
-
-  return GTK_WIDGET (self);
-}
-
-static void
-add_point_to_maze (GtkBitset      *maze,
-                   GskPathBuilder *builder,
-                   guint           x,
-                   guint           y)
-{
-  gboolean set[4] = { FALSE, FALSE, FALSE, FALSE };
-  guint dir;
-
-  gtk_bitset_add (maze, y * MAZE_WIDTH + x);
-
-  while (TRUE)
-    {
-      set[0] = set[0] || x == 0 || gtk_bitset_contains (maze, y * MAZE_WIDTH + x - 1);
-      set[1] = set[1] || y == 0 || gtk_bitset_contains (maze, (y - 1) * MAZE_WIDTH + x);
-      set[2] = set[2] || x + 1 == MAZE_WIDTH || gtk_bitset_contains (maze, y * MAZE_WIDTH + x + 1);
-      set[3] = set[3] || y + 1 == MAZE_HEIGHT || gtk_bitset_contains (maze, (y + 1) * MAZE_WIDTH + x);
-
-      if (set[0] && set[1] && set[2] && set[3])
-        return;
-      
-      do
-        {
-          dir = g_random_int_range (0, 4);
-        }
-      while (set[dir]);
-
-      switch (dir)
-        {
-          case 0:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x - 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x - 1, y);
-            break;
-
-          case 1:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y - 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x, y - 1);
-            break;
-
-          case 2:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 1.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x + 1, y);
-            break;
-
-          case 3:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 1.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x, y + 1);
-            break;
-
-          default:
-            g_assert_not_reached ();
-            break;
-        }
-    }
-}
-
-static GskPath *
-create_path_for_maze (GtkWidget *widget)
-{
-  GskPathBuilder *builder;
-  GtkBitset *maze;
-
-  builder = gsk_path_builder_new ();
-  maze = gtk_bitset_new_empty ();
-  /* make sure the outer lines are unreachable:
-   * Set the full range, then remove the center again. */
-  gtk_bitset_add_range (maze, 0, MAZE_WIDTH * MAZE_HEIGHT);
-  gtk_bitset_remove_rectangle (maze, MAZE_WIDTH + 1, MAZE_WIDTH - 2, MAZE_HEIGHT - 2, MAZE_WIDTH);
-
-  /* Fill the maze */
-  add_point_to_maze (maze, builder, MAZE_WIDTH / 2, MAZE_HEIGHT / 2);
-
-  /* Add start and stop lines */
-  gsk_path_builder_move_to (builder, 1.5 * MAZE_GRID_SIZE, -0.5 * MAZE_GRID_SIZE);
-  gsk_path_builder_line_to (builder, 1.5 * MAZE_GRID_SIZE, 1.5 * MAZE_GRID_SIZE);
-  gsk_path_builder_move_to (builder, (MAZE_WIDTH - 1.5) * MAZE_GRID_SIZE, (MAZE_HEIGHT - 1.5) * MAZE_GRID_SIZE);
-  gsk_path_builder_line_to (builder, (MAZE_WIDTH - 1.5) * MAZE_GRID_SIZE, (MAZE_HEIGHT + 0.5) * MAZE_GRID_SIZE);
-
-
-  gtk_bitset_unref (maze);
-
-  return gsk_path_builder_free_to_path (builder);
-}
-
-GtkWidget *
-do_path_maze (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *maze;
-      GtkMediaStream *stream;
-      GskPath *path;
-
-      window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_title (GTK_WINDOW (window), "Follow the maze with the mouse");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-#if 0
-      stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-#else
-      stream = gtk_nuclear_media_stream_new ();
-#endif
-      gtk_media_stream_play (stream);
-      gtk_media_stream_set_loop (stream, TRUE);
-
-      path = create_path_for_maze (window);
-
-      maze = gtk_maze_new (path,
-                           GDK_PAINTABLE (stream),
-                           MAZE_WIDTH * MAZE_GRID_SIZE,
-                           MAZE_HEIGHT * MAZE_GRID_SIZE);
-
-      gtk_window_set_child (GTK_WINDOW (window), maze);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/path_spinner.c

@@ -9,8 +9,6 @@
 
 #include "paintable.h"
 
-#undef SHOW_CONTROLS
-
 #define GTK_TYPE_SPINNER_PAINTABLE (gtk_spinner_paintable_get_type ())
 G_DECLARE_FINAL_TYPE (GtkSpinnerPaintable, gtk_spinner_paintable, GTK, SPINNER_PAINTABLE, GObject)
 
@@ -58,9 +56,9 @@ gtk_spinner_paintable_get_intrinsic_height (GdkPaintable *paintable)
 
 static void
 gtk_spinner_paintable_snapshot (GdkPaintable *paintable,
-                                GdkSnapshot  *snapshot,
+                             GdkSnapshot  *snapshot,
-                                double        width,
+                             double        width,
-                                double        height)
+                             double        height)
 {
   GtkSpinnerPaintable *self = GTK_SPINNER_PAINTABLE (paintable);
 
@@ -152,7 +150,6 @@ static gboolean
 add_controls (GskPathOperation        op,
               const graphene_point_t *pts,
               gsize                   n_pts,
-              float                   weight,
               gpointer                data)
 {
   GskPathBuilder *builder = data;
@@ -169,7 +166,7 @@ add_controls (GskPathOperation        op,
       break;
 
     case GSK_PATH_QUAD:
-    case GSK_PATH_CONIC:
+    case GSK_PATH_ARC:
       gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
       gsk_path_builder_line_to (builder, pts[2].x, pts[2].y);
       break;
@@ -193,21 +190,32 @@ update_path (GtkSpinnerPaintable *self)
 {
   GskPathBuilder *builder;
   GskPathPoint start, end;
-  graphene_point_t p0, p1;
+  GskTransform *t;
+  graphene_point_t p, p0, p1;
   float start_angle, end_angle;
 
+  p = GRAPHENE_POINT_INIT (40, 0);
   start_angle = self->angle;
   end_angle = fmod (self->angle + 360 * self->completion / 100, 360);
 
-  p0 = GRAPHENE_POINT_INIT (50 + 40 * cos (M_PI * start_angle / 180),
+  t = gsk_transform_translate (
-                            50 + 40 * sin (M_PI * start_angle / 180));
+        gsk_transform_rotate (
-  p1 = GRAPHENE_POINT_INIT (50 + 40 * cos (M_PI * end_angle / 180),
+          gsk_transform_translate (NULL, &GRAPHENE_POINT_INIT (50, 50)),
-                            50 + 40 * sin (M_PI * end_angle / 180));
+          start_angle),
+        &GRAPHENE_POINT_INIT (-50, -50));
+  gsk_transform_transform_point (t, &p, &p0);
+
+  t = gsk_transform_translate (
+        gsk_transform_rotate (
+          gsk_transform_translate (NULL, &GRAPHENE_POINT_INIT (50, 50)),
+          end_angle),
+        &GRAPHENE_POINT_INIT (-50, -50));
+  gsk_transform_transform_point (t, &p, &p1);
 
   g_clear_pointer (&self->path, gsk_path_unref);
 
-  gsk_path_get_closest_point (self->circle, &p0, INFINITY, &start, NULL);
+  gsk_path_get_closest_point (self->circle, &p0, INFINITY, &start);
-  gsk_path_get_closest_point (self->circle, &p1, INFINITY, &end, NULL);
+  gsk_path_get_closest_point (self->circle, &p1, INFINITY, &end);
 
   builder = gsk_path_builder_new ();
   gsk_path_builder_add_segment (builder, self->circle, &start, &end);

demos/gtk-demo/path_text.c

@@ -501,13 +501,15 @@ pointer_motion (GtkEventControllerMotion *controller,
                 GtkPathWidget            *self)
 {
   GskPathPoint point;
+  graphene_point_t pos;
 
   if (gsk_path_get_closest_point (self->line_path,
                                   &GRAPHENE_POINT_INIT (x, y),
                                   INFINITY,
-                                  &point,
+                                  &point))
-                                  NULL))
     {
+      gsk_path_point_get_position (&point, self->line_path, &pos);
+
       gtk_widget_queue_draw (GTK_WIDGET (self));
     }
 }

demos/gtk-demo/path_walk.ui

@@ -11,8 +11,6 @@
                 <property name="lower">0</property>
                 <property name="upper">5000</property>
                 <property name="value">500</property>
-                <property name="step-increment">1</property>
-                <property name="page-increment">10</property>
               </object>
             </property>
           </object>

demos/gtk-demo/pickers.c

@@ -1,9 +1,8 @@
 /* Pickers and Launchers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkPrintDialog, GtkFileLauncher, GtkUriLauncher
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
  *
  * The dialogs are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts and files. There is also a
+ * They allow to select colors, fonts and applications.
- * print dialog.
  *
  * The launchers let you open files or URIs in applications that
  * can handle them.
@@ -12,13 +11,11 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *app_picker;
-static GtkWidget *print_button;
 
 static void
 set_file (GFile    *file,
           gpointer  data)
 {
-  GFileInfo *info;
   char *name;
 
   if (!file)
@@ -34,13 +31,6 @@ set_file (GFile    *file,
 
   gtk_widget_set_sensitive (app_picker, TRUE);
   g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
-
-  info = g_file_query_info (file, "standard::content-type", 0, NULL, NULL);
-  if (strcmp (g_file_info_get_content_type (info), "application/pdf") == 0)
-    {
-      gtk_widget_set_sensitive (print_button, TRUE);
-      g_object_set_data_full (G_OBJECT (print_button), "file", g_object_ref (file), g_object_unref);
-    }
 }
 
 static void
@@ -57,10 +47,6 @@ file_opened (GObject *source,
     {
       g_print ("%s\n", error->message);
       g_error_free (error);
-      gtk_widget_set_sensitive (app_picker, FALSE);
-      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
-      gtk_widget_set_sensitive (print_button, FALSE);
-      g_object_set_data (G_OBJECT (print_button), "file", NULL);
     }
 
   set_file (file, data);
@@ -128,53 +114,6 @@ open_app (GtkButton *picker)
   g_object_unref (launcher);
 }
 
-static void
-print_file_done (GObject      *source,
-                 GAsyncResult *result,
-                 gpointer      data)
-{
-  GtkPrintDialog *dialog = GTK_PRINT_DIALOG (source);
-  GError *error = NULL;
-  GCancellable *cancellable;
-  unsigned int id;
-
-  cancellable = g_task_get_cancellable (G_TASK (result));
-  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (cancellable), "timeout"));
-  if (id)
-    g_source_remove (id);
-
-  if (!gtk_print_dialog_print_file_finish (dialog, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-print_file (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkPrintDialog *dialog;
-  GCancellable *cancellable;
-  GFile *file;
-  unsigned int id;
-
-  file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
-  dialog = gtk_print_dialog_new ();
-
-  cancellable = g_cancellable_new ();
-
-  id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
-                                   20,
-                                   abort_mission, g_object_ref (cancellable), g_object_unref);
-  g_object_set_data (G_OBJECT (cancellable), "timeout", GUINT_TO_POINTER (id));
-
-  gtk_print_dialog_print_file (dialog, parent, NULL, file, cancellable, print_file_done, NULL);
-
-  g_object_unref (cancellable);
-  g_object_unref (dialog);
-}
-
 static void
 open_uri_done (GObject      *source,
                GAsyncResult *result,
@@ -295,15 +234,9 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_sensitive (app_picker, FALSE);
     g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
     gtk_box_append (GTK_BOX (picker), app_picker);
-
-    print_button = gtk_button_new_from_icon_name ("printer-symbolic");
-    gtk_widget_set_tooltip_text (print_button, "Print file");
-    gtk_widget_set_sensitive (print_button, FALSE);
-    g_signal_connect (print_button, "clicked", G_CALLBACK (print_file), NULL);
-    gtk_box_append (GTK_BOX (picker), print_button);
-
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 
+
     label = gtk_label_new ("URI:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);
     gtk_widget_set_valign (label, GTK_ALIGN_CENTER);

demos/node-editor/node-format.md

@@ -149,16 +149,15 @@ Creates a node like `gsk_debug_node_new()` with the given properties.
 
 ### fill
 
-| property  | syntax          | default                | printed     |
+| property | syntax           | default                | printed     |
-| --------- | --------------- | ---------------------- | ----------- |
+| -------- | ---------------- | ---------------------- | ----------- |
-| child     | `<node>`        | *see below*            | always      |
+| child    | `<node>`         | *see below*            | always      |
-| path      | `<string>`      | ""                     | always      |
+| path     | `<string>`       | ""                     | always      |
-| fill-rule | `<fill-rule>`   | winding                | always      |
+| fill-rule| `<fill-rule>`    | winding                | always      |
 
 Creates a node like `gsk_fill_node_new()` with the given properties.
 
-The default child node is the default color node, but created with the
+The default child node is created with the bounds of the path.
-bounds of the path.
 
 ### glshader
 
@@ -317,8 +316,7 @@ Creates a node like `gsk_shadow_node_new()` with the given properties.
 
 Creates a node like `gsk_stroke_node_new()` with the given properties.
 
-The default child node is the default color node, but created with the
+The default child node is created with the stroke bounds of the path.
-stroke bounds of the path.
 
 ### text
 

docs/CODEOWNERS

@@ -2,9 +2,8 @@
 # a merge request for files listed here, please add the following people to
 # the list of reviewers
 
-# The syntax of this file is defined in the GitLab documentation:
+# The syntax of this file is similar to the GitHub CODEOWNERS file:
-#   https://docs.gitlab.com/ee/user/project/codeowners/reference.html
+#   https://help.github.com/articles/about-codeowners/
-#
 # Which, in turn, is similar to the .gitignore and .gitattributes files:
 #
 #  - comments start with `#`
@@ -15,61 +14,64 @@
 # If you want to be responsible for code reviews in specific sections of
 # the GTK code base, add yourself here.
 
-[Maintainer]
+# Maintainer
-*                        @matthiasc
+*                       @matthiasc
 
-[Build system]
+# Build system
-meson.build              @ebassi @nirbheek @xclaesse
+meson.build             @ebassi @nirbheek
-*.py                     @ebassi
+*.py                    @ebassi
 
-[CSS]
+# CSS
-/gtk/gtkcss*.[ch]        @otte @matthiasc
+gtk/gtkcss*.[ch]        @otte @baedert
-/gtk/gtkstyle*.[ch]      @otte @matthiasc
+gtk/gtkstyle*.[ch]      @otte @baedert
 
-[Gestures]
+# Gestures
-/gtk/gtkeventcontroller* @carlosg
+gtk/gtkeventcontroller* @carlosg
-/gtk/gtkgesture*.[ch]    @carlosg
+gtk/gtkgesture*.[ch]    @carlosg
 
-[Input methods]
+# GtkFileChooser
-/gtk/gtkimcontext*       @carlosg
+gtk/gtkfilechooser*     @federico @ebassi
+gtk/gtkfilesystem*      @federico @ebassi
+gtk/gtkfilefilter*      @federico @ebassi
 
-[Media]
+# GtkFontChooser
-/gtk/gtkmedia*           @otte
+gtk/gtkfontchooser*     @matthiasc
 
-[GSK]
+# Input methods
-/gsk/                    @otte @chergert @ebassi
+gtk/gtkimcontext*       @carlosg
 
-[GL rendering]
+# Media
-/gsk/gl/                 @otte @chergert
+gtk/gtkmedia*           @otte
 
-[Vulkan rendering]
+# GSK
-/gsk/vulkan              @otte
+gsk                     @otte @baedert @ebassi
 
-[Documentation]
+# GL rendering
-/docs/                   @ebassi @dboles
+gsk/gl                  @baedert @ebassi
-README.md                @ebassi
-CONTRIBUTING.md          @ebassi @matthiasc
 
-[Wayland]
+# Vulkan rendering
-/gdk/wayland             @jadahl
+gsk/vulkan
 
-[X11]
+# Documentation
-/gdk/x11                 @ofourdan @matthiasc @carlosg
+docs/                   @ebassi @dboles
 
-[macOS]
+# Wayland
-/gdk/macos               @chergert
+gdk/wayland             @jadahl
 
-[Themes]
+# X11
-/gtk/themes              @lapoc @jimmac
+gdk/x11                 @ofourdan @matthiasc
 
-[Inspector]
+# Themes
-/gtk/inspector           @otte @matthiasc
+gtk/themes              @lapoc @jimmac
 
-[Layout managers]
+# Inspector
-/gtk/gtklayout*          @ebassi
+gtk/inspector           @otte @matthiasc
-/gtk/gtkconstraint*      @ebassi
 
-[Accessibility]
+# Layout managers
-/gtk/gtkaccessible*.[ch] @ebassi @tyrylu @matthiasc
+gtk/gtklayout*          @ebassi
-/gtk/gtkatcontext*.[ch]  @ebassi @tyrylu @matthiasc
+gtk/gtkconstraint*      @ebassi
-/gtk/a11y                @ebassi @tyrylu
+
+# Accessibility
+gtk/gtkaccessible*.[ch] @ebassi
+gtk/gtkatcontext*.[ch]  @ebassi
+gtk/a11y                @ebassi

docs/reference/gtk/gtk4-path-tool.rst

@@ -15,7 +15,6 @@ SYNOPSIS
 |   **gtk4-path-tool** decompose [OPTIONS...] <PATH>
 |   **gtk4-path-tool** show [OPTIONS...] <PATH>
 |   **gtk4-path-tool** render [OPTIONS...] <PATH>
-|   **gtk4-path-tool** reverse [OPTIONS...] <PATH>
 |   **gtk4-path-tool** info [OPTIONS...] <PATH>
 
 DESCRIPTION
@@ -55,22 +54,6 @@ Showing
 The ``show`` command displays the given path in a window. The interior
 of the path is filled.
 
-``--fill``
-
-  Fill the path (this is the default).
-
-``--stroke``
-
-  Stroke the path instead of filling it.
-
-``--points``
-
-  Show points on the path.
-
-``--controls``
-
-  Show control points.
-
 ``--fill-rule=VALUE``
 
   The fill rule that is used to determine what areas are inside the path.
@@ -86,10 +69,13 @@ of the path is filled.
   The color that is used to render the background behind the path.
   If not specified, white is used.
 
-``--point-color=COLOR``
+``--fill``
 
-  The color that is used to render the points.
+  Fill the path (this is the default).
-  If not specified, red is used.
+
+``--stroke``
+
+  Stroke the path instead of filling it.
 
 ``--line-width=VALUE``
 
@@ -132,22 +118,6 @@ Rendering
 The ``render`` command renders the given path as a PNG image.
 The interior of the path is filled.
 
-``--fill``
-
-  Fill the path (this is the default).
-
-``--stroke``
-
-  Stroke the path instead of filling it.
-
-``--points``
-
-  Show points on the path.
-
-``--controls``
-
-  Show control points.
-
 ``--fill-rule=VALUE``
 
   The fill rule that is used to determine what areas are inside the path.
@@ -163,16 +133,19 @@ The interior of the path is filled.
   The color that is used to render the background behind the path.
   If not specified, white is used.
 
-``--point-color=COLOR``
-
-  The color that is used to render the points.
-  If not specified, red is used.
-
 ``--output-file=FILE``
 
   The file to save the PNG image to.
   If not specified, "path.png" is used.
 
+``--fill``
+
+  Fill the path (this is the default).
+
+``--stroke``
+
+  Stroke the path instead of filling it.
+
 ``--line-width=VALUE``
 
   The line width to use for the stroke. ``VALUE`` must be a positive number.
@@ -208,12 +181,6 @@ The interior of the path is filled.
   The offset into the dash pattern where dashing should begin.
   The default value is 0.
 
-Reversing
-^^^^^^^^^
-
-The ``reverse`` command changes the direction of the path. The resulting
-paths starts where the original path ends.
-
 Info
 ^^^^
 

docs/reference/gtk/running.md

@@ -170,41 +170,35 @@ This variable can be set to a list of debug options, which cause GDK to
 print out different types of debugging information. Some of these options
 are only available when GTK has been configured with `-Ddebug=true`.
 
-`misc`
+`cursor`
-: Miscellaneous information
+: Information about cursor objects (only win32)
-
-`events`
-: Information about events
-
-`dnd`
-: Information about drag-and-drop
-
-`input`
-: Information about input (mostly Windows)
 
 `eventloop`
 : Information about event loop operation (mostly macOS)
 
+`misc`
+: Miscellaneous information
+
 `frames`
 : Information about the frame clock
 
 `settings`
 : Information about xsettings
 
-`opengl`
-: Information about OpenGL
-
-`vulkan`
-: Information about Vulkan
-
 `selection`
 : Information about selections
 
 `clipboard`
 : Information about clipboards
 
-`dmabuf`
+`dnd`
-: Information about dmabuf handling (Linux-only)
+: Information about drag-and-drop
+
+`opengl`
+: Information about OpenGL
+
+`vulkan`
+: Information about Vulkan
 
 A number of options affect behavior instead of logging:
 
@@ -223,9 +217,6 @@ A number of options affect behavior instead of logging:
 `gl-fractional`
 : Enable fractional scaling for OpenGL. This is experimental
 
-`gl-debug`
-: Insert debugging information in OpenGL
-
 `gl-legacy`
 : Use a legacy OpenGL context
 
@@ -253,12 +244,6 @@ A number of options affect behavior instead of logging:
 `high-depth`
 : Use high bit depth rendering if possible
 
-`no-vsync`
-: Repaint instantly (uses 100% CPU with animations)
-
-`dmabuf-disable`
-: Disable dmabuf support
-
 The special value `all` can be used to turn on all debug options. The special
 value `help` can be used to obtain a list of all supported debug options.
 

gdk/gdk.c

@@ -117,8 +117,6 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "vulkan",          GDK_DEBUG_VULKAN, "Information about Vulkan" },
   { "selection",       GDK_DEBUG_SELECTION, "Information about selections" },
   { "clipboard",       GDK_DEBUG_CLIPBOARD, "Information about clipboards" },
-  { "dmabuf",          GDK_DEBUG_DMABUF, "Information about dmabuf buffers" },
-
   { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)", TRUE },
   { "portals",         GDK_DEBUG_PORTALS, "Force use of portals", TRUE },
   { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals", TRUE },
@@ -135,7 +133,6 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE },
   { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible", TRUE },
   { "no-vsync",        GDK_DEBUG_NO_VSYNC, "Repaint instantly (uses 100% CPU with animations)", TRUE },
-  { "dmabuf-disable",  GDK_DEBUG_DMABUF_DISABLE, "Disable dmabuf support", TRUE },
 };
 
 
@@ -266,7 +263,7 @@ gdk_parse_debug_var (const char        *variable,
         if (debug_enabled || keys[i].always_enabled)
           fprintf (stderr, "  %s%*s%s\n", keys[i].key, (int)(max_width - strlen (keys[i].key)), " ", keys[i].help);
       }
-      fprintf (stderr, "  %s%*s%s\n", "all", max_width - 3, " ", "Enable all values. Other given values are subtracted");
+      fprintf (stderr, "  %s%*s%s\n", "all", max_width - 3, " ", "Enable all values");
       fprintf (stderr, "  %s%*s%s\n", "help", max_width - 4, " ", "Print this help");
       fprintf (stderr, "\nMultiple values can be given, separated by : or space.\n");
     }

gdk/gdk.h

@@ -42,9 +42,6 @@
 #include <gdk/gdkdevicetool.h>
 #include <gdk/gdkdisplay.h>
 #include <gdk/gdkdisplaymanager.h>
-#include <gdk/gdkdmabufformats.h>
-#include <gdk/gdkdmabuftexture.h>
-#include <gdk/gdkdmabuftexturebuilder.h>
 #include <gdk/gdkdrag.h>
 #include <gdk/gdkdragsurface.h>
 #include <gdk/gdkdragsurfacesize.h>

gdk/gdkarrayimpl.c

@@ -82,18 +82,6 @@ gdk_array(init) (GdkArray *self)
 #endif
 }
 
-G_GNUC_UNUSED static inline gsize
-gdk_array(get_capacity) (const GdkArray *self)
-{
-  return self->end_allocation - self->start;
-}
-
-G_GNUC_UNUSED static inline gsize
-gdk_array(get_size) (const GdkArray *self)
-{
-  return self->end - self->start;
-}
-
 static inline void
 gdk_array(free_elements) (_T_ *start,
                           _T_ *end)
@@ -122,38 +110,6 @@ gdk_array(clear) (GdkArray *self)
   gdk_array(init) (self);
 }
 
-/*
- * gdk_array_steal:
- * @self: the array
- *
- * Steals all data in the array and clears the array.
- *
- * If you need to know the size of the data, you should query it
- * beforehand.
- *
- * Returns: The array's data
- **/
-G_GNUC_UNUSED static inline _T_ *
-gdk_array(steal) (GdkArray *self)
-{
-  _T_ *result;
-
-#ifdef GDK_ARRAY_PREALLOC
-  if (self->start == self->preallocated)
-    {
-      gsize size = GDK_ARRAY_REAL_SIZE (gdk_array(get_size) (self));
-      result = g_new (_T_, size);
-      memcpy (result, self->preallocated, sizeof (_T_) * size);
-    }
-  else
-#endif
-    result = self->start;
-
-  gdk_array(init) (self);
-
-  return result;
-}
-
 G_GNUC_UNUSED static inline _T_ *
 gdk_array(get_data) (const GdkArray *self)
 {
@@ -167,6 +123,18 @@ gdk_array(index) (const GdkArray *self,
   return self->start + pos;
 }
 
+G_GNUC_UNUSED static inline gsize
+gdk_array(get_capacity) (const GdkArray *self)
+{
+  return self->end_allocation - self->start;
+}
+
+G_GNUC_UNUSED static inline gsize
+gdk_array(get_size) (const GdkArray *self)
+{
+  return self->end - self->start;
+}
+
 G_GNUC_UNUSED static inline gboolean
 gdk_array(is_empty) (const GdkArray *self)
 {
@@ -183,7 +151,7 @@ gdk_array(reserve) (GdkArray *self,
     return;
 
   size = gdk_array(get_size) (self);
-  new_size = ((gsize) 1) << g_bit_storage (MAX (GDK_ARRAY_REAL_SIZE (n), 16) - 1);
+  new_size = 1 << g_bit_storage (MAX (GDK_ARRAY_REAL_SIZE (n), 16) - 1);
 
 #ifdef GDK_ARRAY_PREALLOC
   if (self->start == self->preallocated)
@@ -215,11 +183,7 @@ gdk_array(splice) (GdkArray *self,
                    gsize      pos,
                    gsize      removed,
                    gboolean   stolen,
-#ifdef GDK_ARRAY_BY_VALUE
-                   const _T_ *additions,
-#else
                    _T_       *additions,
-#endif
                    gsize      added)
 {
   gsize size;
@@ -322,5 +286,3 @@ gdk_array(get) (const GdkArray *self,
 #undef GDK_ARRAY_TYPE_NAME
 #undef GDK_ARRAY_NO_MEMSET
 #endif
-
-G_END_DECLS

gdk/gdkdebugprivate.h

@@ -36,26 +36,23 @@ typedef enum {
   GDK_DEBUG_VULKAN          = 1 <<  8,
   GDK_DEBUG_SELECTION       = 1 <<  9,
   GDK_DEBUG_CLIPBOARD       = 1 << 10,
-  GDK_DEBUG_DMABUF          = 1 << 11,
-
   /* flags below are influencing behavior */
-  GDK_DEBUG_NOGRABS         = 1 << 12,
+  GDK_DEBUG_NOGRABS         = 1 << 11,
-  GDK_DEBUG_PORTALS         = 1 << 13,
+  GDK_DEBUG_PORTALS         = 1 << 12,
-  GDK_DEBUG_NO_PORTALS      = 1 << 14,
+  GDK_DEBUG_NO_PORTALS      = 1 << 13,
-  GDK_DEBUG_GL_DISABLE      = 1 << 15,
+  GDK_DEBUG_GL_DISABLE      = 1 << 14,
-  GDK_DEBUG_GL_FRACTIONAL   = 1 << 16,
+  GDK_DEBUG_GL_FRACTIONAL   = 1 << 15,
-  GDK_DEBUG_GL_LEGACY       = 1 << 17,
+  GDK_DEBUG_GL_LEGACY       = 1 << 16,
-  GDK_DEBUG_GL_GLES         = 1 << 18,
+  GDK_DEBUG_GL_GLES         = 1 << 17,
-  GDK_DEBUG_GL_DEBUG        = 1 << 19,
+  GDK_DEBUG_GL_DEBUG        = 1 << 18,
-  GDK_DEBUG_GL_EGL          = 1 << 20,
+  GDK_DEBUG_GL_EGL          = 1 << 19,
-  GDK_DEBUG_GL_GLX          = 1 << 21,
+  GDK_DEBUG_GL_GLX          = 1 << 20,
-  GDK_DEBUG_GL_WGL          = 1 << 22,
+  GDK_DEBUG_GL_WGL          = 1 << 21,
-  GDK_DEBUG_VULKAN_DISABLE  = 1 << 23,
+  GDK_DEBUG_VULKAN_DISABLE  = 1 << 22,
-  GDK_DEBUG_VULKAN_VALIDATE = 1 << 24,
+  GDK_DEBUG_VULKAN_VALIDATE = 1 << 23,
-  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 25,
+  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 24,
-  GDK_DEBUG_HIGH_DEPTH      = 1 << 26,
+  GDK_DEBUG_HIGH_DEPTH      = 1 << 25,
-  GDK_DEBUG_NO_VSYNC        = 1 << 27,
+  GDK_DEBUG_NO_VSYNC        = 1 << 26,
-  GDK_DEBUG_DMABUF_DISABLE  = 1 << 28,
 } GdkDebugFlags;
 
 extern guint _gdk_debug_flags;

gdk/gdkdisplay.c

@@ -31,9 +31,6 @@
 #include "gdkclipboardprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkdmabufformatsbuilderprivate.h"
-#include "gdkdmabufformatsprivate.h"
-#include "gdkdmabuftextureprivate.h"
 #include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
 #include "gdkglcontextprivate.h"
@@ -72,7 +69,6 @@ enum
   PROP_COMPOSITED,
   PROP_RGBA,
   PROP_INPUT_SHAPES,
-  PROP_DMABUF_FORMATS,
   LAST_PROP
 };
 
@@ -142,10 +138,6 @@ gdk_display_get_property (GObject    *object,
       g_value_set_boolean (value, gdk_display_supports_input_shapes (display));
       break;
 
-    case PROP_DMABUF_FORMATS:
-      g_value_set_boxed (value, gdk_display_get_dmabuf_formats (display));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -247,11 +239,6 @@ gdk_display_class_init (GdkDisplayClass *class)
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  props[PROP_DMABUF_FORMATS] =
-    g_param_spec_boxed ("dmabuf-formats", NULL, NULL,
-                        GDK_TYPE_DMABUF_FORMATS,
-                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
   g_object_class_install_properties (object_class, LAST_PROP, props);
 
   /**
@@ -417,8 +404,6 @@ gdk_display_finalize (GObject *object)
 
   g_list_free_full (display->seats, g_object_unref);
 
-  g_clear_pointer (&display->dmabuf_formats, gdk_dmabuf_formats_unref);
-
   G_OBJECT_CLASS (gdk_display_parent_class)->finalize (object);
 }
 
@@ -488,7 +473,8 @@ gdk_display_get_event (GdkDisplay *display)
  * @display: a `GdkDisplay`
  * @event: (transfer none): a `GdkEvent`
  *
- * Adds the given event to the event queue for @display.
+ * Appends the given event onto the front of the event
+ * queue for @display.
  *
  * Deprecated: 4.10: This function is only useful in very
  * special situations and should not be used by applications.
@@ -1839,76 +1825,6 @@ gdk_display_get_egl_display (GdkDisplay *self)
 #endif
 }
 
-#ifdef HAVE_LINUX_DMA_BUF_H
-static void
-gdk_display_add_dmabuf_downloader (GdkDisplay                *display,
-                                   const GdkDmabufDownloader *downloader,
-                                   GdkDmabufFormatsBuilder   *builder)
-{
-  gsize i;
-
-  downloader->add_formats (downloader, display, builder);
-
-  /* dmabuf_downloaders is NULL-terminated */
-  for (i = 0; i < G_N_ELEMENTS (display->dmabuf_downloaders) - 1; i++)
-    {
-      if (display->dmabuf_downloaders[i] == NULL)
-        break;
-    }
-
-  g_assert (i < G_N_ELEMENTS (display->dmabuf_downloaders));
-
-  display->dmabuf_downloaders[i] = downloader;
-}
-#endif
-
-/* To support a drm format, we must be able to import it into GL
- * using the relevant EGL extensions, and download it into a memory
- * texture, possibly doing format conversion with shaders (in GSK).
- */
-static void
-init_dmabuf_formats (GdkDisplay *display)
-{
-  GdkDmabufFormatsBuilder *builder;
-
-  if (display->dmabuf_formats != NULL)
-    return;
-
-  builder = gdk_dmabuf_formats_builder_new ();
-
-#ifdef HAVE_LINUX_DMA_BUF_H
-  if (!GDK_DEBUG_CHECK (DMABUF_DISABLE))
-    {
-      gdk_display_prepare_gl (display, NULL);
-
-      gdk_display_add_dmabuf_downloader (display, gdk_dmabuf_get_direct_downloader (), builder);
-    }
-#endif
-
-  display->dmabuf_formats = gdk_dmabuf_formats_builder_free_to_formats (builder);
-} 
-
-/**
- * gdk_display_get_dmabuf_formats:
- * @display: a `GdkDisplay`
- *
- * Returns the dma-buf formats that are supported on this display.
- *
- * GTK may use OpenGL or Vulkan to support some formats.
- * Calling this function will then initialize them if they aren't yet.
- *
- * Returns: (transfer none): a `GdkDmabufFormats` object
- *
- * Since: 4.14
- */
-GdkDmabufFormats *
-gdk_display_get_dmabuf_formats (GdkDisplay *display)
-{
-  init_dmabuf_formats (display);
-
-  return display->dmabuf_formats;
-}
-
 GdkDebugFlags
 gdk_display_get_debug_flags (GdkDisplay *display)
 {

gdk/gdkdisplay.h

@@ -134,10 +134,6 @@ gboolean     gdk_display_get_setting (GdkDisplay *display,
                                       const char *name,
                                       GValue     *value);
 
-GDK_AVAILABLE_IN_4_14
-GdkDmabufFormats *
-             gdk_display_get_dmabuf_formats (GdkDisplay *display);
-
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref)
 
 G_END_DECLS