gsk: Rename ngl to gl

For now, this is just doing the code reshuffling. The environment variable still expects you to set GSK_RENDERER=ngl gsk_ngl_renderer_new is still around, deprecated, and returns a renderer that fails to realize. The gsk/gl/gskglrenderer.h is still installed, but including it triggers a deprecation warning.
Use the gl renderer again everywhere
2024-10-03 21:53:58 -04:00 · 2024-10-03 21:53:58 -04:00 · 2024-10-03 21:53:58 -04:00 · 2024-10-03 21:53:58 -04:00
407 changed files with 17448 additions and 36344 deletions
@@ -1,4 +1,2 @@
 /subprojects/*/
 .flatpak-builder/
-.vscode/
-subprojects/*.wrap
@@ -22,7 +22,7 @@ stages:

 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpcre2:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
@@ -62,16 +62,18 @@ style-check-diff:
 .build-fedora-default:
  image: $FEDORA_IMAGE
  artifacts:
-    name: "gtk-${CI_COMMIT_REF_NAME}"
    when: always
    reports:
      junit:
-        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-x11.junit.xml"
-        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-wayland.junit.xml"
-        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-wayland_gl.junit.xml"
-        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-broadway.junit.xml"
+        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
+        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
+    name: "gtk-${CI_COMMIT_REF_NAME}"
    paths:
      - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - "${CI_PROJECT_DIR}/_build/report*.xml"
+      - "${CI_PROJECT_DIR}/_build/report*.html"
      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.node"
      - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
@@ -196,11 +198,11 @@ fedora-mingw64:
      - subprojects/libepoxy/
      - subprojects/pango/

-msys2-ucrt64:
+msys2-mingw64:
  extends: .mingw-defaults
  needs: []
  variables:
-    MSYSTEM: "UCRT64"
+    MSYSTEM: "MINGW64"
    CHERE_INVOKING: "yes"
  artifacts:
    when: always
@@ -216,7 +218,7 @@ macos:
      when: never
    - if: $RUNNER == "macosintel"
      variables:
-        SDKROOT: /opt/sdks/MacOSX10.15.6.sdk
+        SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
        NINJA_PKG: $CI_API_V4_URL/projects/30745/packages/generic/ninja_macos/v1.11.1.1+9/ninja-1.11.1.1-cp38-cp38-macosx_11_0_x86_64.whl
      when: manual
      allow_failure: true
@@ -240,7 +242,6 @@ macos:
    PIPENV_CACHE_DIR: $PIP_CACHE_DIR
    PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
  before_script:
-    - ls /opt/sdks/
    - .gitlab-ci/show-info-macos.sh
    - python3 -m venv .venv
    # Building the introspection feature requires pkg-config and bison.
@@ -264,7 +265,7 @@ macos:
    paths:
      - "${CI_PROJECT_DIR}/_build/meson-logs"

-vs2019-x64:
+vs2017-x64:
  # TODO: Uncomment this when ready to merge.
  # rules:
  #   - if: $CI_PROJECT_NAMESPACE == "GNOME"
@@ -273,7 +274,7 @@ vs2019-x64:
    - win32-ps
  needs: []
  script:
-    - .gitlab-ci/test-msvc.bat ${COMMON_MESON_FLAGS}
+    - .gitlab-ci/test-msvc.bat
  artifacts:
    when: always
    paths:
@@ -326,6 +327,20 @@ flatpak:widget-factory:aarch64:
  variables:
    APPID: org.gtk.WidgetFactory4

+flatpak:icon-browser:
+  extends: '.flatpak-defaults'
+  needs: []
+  variables:
+    APPID: org.gtk.IconBrowser4
+
+flatpak:icon-browser:aarch64:
+  extends: '.flatpak-defaults'
+  needs: []
+  tags:
+    - flatpak-aarch64
+  variables:
+    APPID: org.gtk.IconBrowser4
+
 flatpak:node-editor:
  extends: '.flatpak-defaults'
  needs: []
@@ -359,6 +374,14 @@ nightly factory aarch64:
    extends: '.publish_nightly'
    needs: ['flatpak:widget-factory:aarch64']

+nightly icon-browser:
+    extends: '.publish_nightly'
+    needs: ['flatpak:icon-browser']
+
+nightly icon-browser aarch64:
+    extends: '.publish_nightly'
+    needs: ['flatpak:icon-browser:aarch64']
+
 nightly node-editor:
    extends: '.publish_nightly'
    needs: ['flatpak:node-editor']
@@ -11,9 +11,7 @@ multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 n_processes=${MESON_TEST_MAX_PROCESSES:-1}

 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1:symbolize=1
-export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer
-
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1

 case "${setup}" in
  x11*)
@@ -95,6 +93,13 @@ esac

 cd ${builddir}

+$srcdir/.gitlab-ci/meson-junit-report.py \
+            --project-name=gtk \
+            --backend="${setup}" \
+            --job-id="${CI_JOB_NAME}" \
+            --output="report-${setup}.xml" \
+            "meson-logs/testlog-${setup}.json"
+
 $srcdir/.gitlab-ci/meson-html-report.py \
            --project-name=gtk \
            --backend="${setup}" \
@@ -1,11 +1,12 @@
@echo on
 :: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the
 :: specified build architecture
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
@echo on

-pip3 install --upgrade --user meson~=1.2 || goto :error
-meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled -Dvulkan=disabled %~1 _build || goto :error
+:: FIXME: make warnings fatal
+pip3 install --upgrade --user meson~=0.64 || goto :error
+meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled -Dvulkan=disabled _build || goto :error
 ninja -C _build || goto :error

 goto :EOF
@@ -2,6 +2,12 @@

 set -e

+if [[ "$MSYSTEM" == "MINGW32" ]]; then
+    export MSYS2_ARCH="i686"
+else
+    export MSYS2_ARCH="x86_64"
+fi
+
 # Update everything
 pacman --noconfirm -Suy

@@ -9,27 +15,27 @@ pacman --noconfirm -Suy
 pacman --noconfirm -S --needed \
    base-devel \
    git \
-    ${MINGW_PACKAGE_PREFIX}-cc \
-    ${MINGW_PACKAGE_PREFIX}-ccache \
-    ${MINGW_PACKAGE_PREFIX}-pkgconf \
-    ${MINGW_PACKAGE_PREFIX}-gobject-introspection \
-    ${MINGW_PACKAGE_PREFIX}-meson \
-    ${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme \
-    ${MINGW_PACKAGE_PREFIX}-atk \
-    ${MINGW_PACKAGE_PREFIX}-cairo \
-    ${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2 \
-    ${MINGW_PACKAGE_PREFIX}-glib2 \
-    ${MINGW_PACKAGE_PREFIX}-graphene \
-    ${MINGW_PACKAGE_PREFIX}-json-glib \
-    ${MINGW_PACKAGE_PREFIX}-libepoxy \
-    ${MINGW_PACKAGE_PREFIX}-pango \
-    ${MINGW_PACKAGE_PREFIX}-fribidi \
-    ${MINGW_PACKAGE_PREFIX}-gst-plugins-bad-libs \
-    ${MINGW_PACKAGE_PREFIX}-shared-mime-info \
-    ${MINGW_PACKAGE_PREFIX}-python-gobject \
-    ${MINGW_PACKAGE_PREFIX}-shaderc \
-    ${MINGW_PACKAGE_PREFIX}-vulkan \
-    ${MINGW_PACKAGE_PREFIX}-vulkan-headers
+    mingw-w64-$MSYS2_ARCH-cc \
+    mingw-w64-$MSYS2_ARCH-ccache \
+    mingw-w64-$MSYS2_ARCH-pkgconf \
+    mingw-w64-$MSYS2_ARCH-gobject-introspection \
+    mingw-w64-$MSYS2_ARCH-meson \
+    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
+    mingw-w64-$MSYS2_ARCH-atk \
+    mingw-w64-$MSYS2_ARCH-cairo \
+    mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \
+    mingw-w64-$MSYS2_ARCH-glib2 \
+    mingw-w64-$MSYS2_ARCH-graphene \
+    mingw-w64-$MSYS2_ARCH-json-glib \
+    mingw-w64-$MSYS2_ARCH-libepoxy \
+    mingw-w64-$MSYS2_ARCH-pango \
+    mingw-w64-$MSYS2_ARCH-fribidi \
+    mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
+    mingw-w64-$MSYS2_ARCH-shared-mime-info \
+    mingw-w64-$MSYS2_ARCH-python-gobject \
+    mingw-w64-$MSYS2_ARCH-shaderc \
+    mingw-w64-$MSYS2_ARCH-vulkan \
+    mingw-w64-$MSYS2_ARCH-vulkan-headers

 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -1,117 +1,6 @@
-Overview of Changes in 4.17.1, xx-xx-xxxx
+Overview of Changes in 4.17.0, xx-xx-xxxx
 =========================================

-Overview of Changes in 4.17.0, 06-11-2024
-=========================================
-
-* GtkScrolledWindow
- - Fix criticals in size allocation code
-
-* GtkFileChooser
- - Fix a crash in the portal code
-
-* GtkFontChoser
- - Make the dialog more shrinkable
-
-* GtkPicture
- - Avoid unnecessary resizes
-
-* GtkVideo
- - Make dmabufs work without GL
-
-* GtkListBox:
- - Add a tab-behavior property to influence keynav
-
-* GtkEmojiChooser:
- - Fix problems with insertion and selection
-
-* GtkStringList:
- - Add gtk_string_list_find
-
-* GtkApplication:
- - Respect GDK_DEBUG=no-portals
- - Set default window icon from app ID
-
-* GtkTextView:
- - Vertical and horizontal positioning of the textview is now quantized
-   to the nearest device pixel. This should improve the perceived smoothness
-   of scrolling with fractional scaling and font hinting.
- - Incorrect re-use of cached styling was fixed
- - Fix some missing CSS invalidation
- - Handle charsets in clipboard datatypes
-
-* Printing:
- - Avoid warnings for avahi errors
- - Fix a segfault in the print dialog setup code
-
-* Accessibility:
- - Always realize non-widget accessibles, to help webkit
- - Fix list view selection implementation
- - Handle NULL values in more places
-
-* Gstreamer:
- - Make dmabufs works without GL
-
-* Gdk:
- - Add OKLAB and OKLCH color states
- - GL: Drop support for GLES 2 and GL < 3.3
- - GL: Use the ngl dmabuf downloader instead of the GL downloader
- - Vulkan: Drop the GDK_VULKAN_DEVICE env var. Use MESA_VK_DEVICE_SELECT instead
- - Vulkan: Use the swapchain maintenance extension to release swap images
- - Forbid opening displays before gtk_init()
-
-* Gsk:
- - Many improvements to the dmabuf downloaders
- - ngl: Avoid glBufferSubData for globals, speeding up llvmpipe
- - Renderer selection will no longer consider the GL renderer
- - Allow Vulkan software rendering as fallback
- - Support gradient interpolation in different color states
-
-* Wayland:
- - Improve settings portal handling
- - Improve fallback for cursor themes
- - Make cursor theme changes apply immediately
- - Use a viewporter for cursor image scaling
- - Improve cursor size handling
- - Use the system bell protocol if available
- - Fix possible deadlock with high-priority sources triggering roundtrips
-
-* Windows:
- - Improve the backend code
- - Fix some problems with WGL on NVidia
- - Many testsuite fixes for Windows compatibility
- - Make all pixbuf loaders builtin in the gdk-pixbuf subproject
- - Add GDK_DISABLE=aerosnap to disable aerosnap
- - Improve clipboard handling
- - Fix behavior or gdk_display_open() on Windows
- - Numerous papercut fixes
- - Require Windows 10
-
-* Macos:
- - Fix crashes when dragging libadwaita TabView tabs
- - Require macOS 10.15
-
-* Tools and demos
- - gtk4-demo: Make demos standalone
- - gtk4-demo: Drop GL shader demos
- - gtk4-demo: Improve scrolling benchmarks
- - gtk4-builder-tool: Improve separator handling
- - gtk4-image-tool: Better color state support
-
-* Build:
- - Don't set GSK_RENDERER in our flatpaks
- - Require meson 1.2
-
-* Translation updates
- Belarusian
- Brazilian Portuguese
- British English
- Galician
- Lithuanian
- Romanian
- Slovenian
- Swedish
-

 Overview of Changes in 4.16.2, 09-25-2024
 =========================================
@@ -196,5 +196,10 @@
                }
            ]
        }
-    ]
+    ],
+    "build-options" : {
+        "env" : {
+            "GSK_RENDERER" : "opengl"
+        }
+    }
 }
@@ -129,6 +129,7 @@
    "build-options" : {
        "env" : {
            "DBUS_SESSION_BUS_ADDRESS" : "''",
+            "GSK_RENDERER" : "opengl",
            "G_ENABLE_DEBUG" : "true"
        }
    }
@@ -129,6 +129,7 @@
    "build-options" : {
        "env" : {
            "DBUS_SESSION_BUS_ADDRESS" : "''",
+            "GSK_RENDERER" : "opengl",
            "G_ENABLE_DEBUG" : "true"
        }
    }
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#include "config.h"
+
+#include "constraint-editor-application.h"
+#include "constraint-editor-window.h"
+
+struct _ConstraintEditorApplication
+{
+  GtkApplication parent_instance;
+};
+
+G_DEFINE_TYPE(ConstraintEditorApplication, constraint_editor_application, GTK_TYPE_APPLICATION);
+
+static void
+constraint_editor_application_init (ConstraintEditorApplication *app)
+{
+}
+
+static void
+quit_activated (GSimpleAction *action,
+                GVariant      *parameter,
+                gpointer       data)
+{
+  g_application_quit (G_APPLICATION (data));
+}
+
+static GActionEntry app_entries[] =
+{
+  { "quit", quit_activated, NULL, NULL, NULL }
+};
+
+static void
+constraint_editor_application_startup (GApplication *app)
+{
+  const char *quit_accels[2] = { "<Ctrl>Q", NULL };
+  const char *open_accels[2] = { "<Ctrl>O", NULL };
+  GtkCssProvider *provider;
+
+  G_APPLICATION_CLASS (constraint_editor_application_parent_class)->startup (app);
+
+  g_action_map_add_action_entries (G_ACTION_MAP (app),
+                                   app_entries, G_N_ELEMENTS (app_entries),
+                                   app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app), "app.quit", quit_accels);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app), "win.open", open_accels);
+
+  provider = gtk_css_provider_new ();
+  gtk_css_provider_load_from_resource (provider, "/org/gtk/gtk4/constraint-editor/constraint-editor.css");
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
+                                              GTK_STYLE_PROVIDER (provider),
+                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
+static void
+constraint_editor_application_activate (GApplication *app)
+{
+  ConstraintEditorWindow *win;
+
+  win = constraint_editor_window_new (CONSTRAINT_EDITOR_APPLICATION (app));
+  gtk_window_present (GTK_WINDOW (win));
+}
+
+static void
+constraint_editor_application_open (GApplication  *app,
+                                    GFile        **files,
+                                    int            n_files,
+                                    const char    *hint)
+{
+  ConstraintEditorWindow *win;
+  int i;
+
+  for (i = 0; i < n_files; i++)
+    {
+      win = constraint_editor_window_new (CONSTRAINT_EDITOR_APPLICATION (app));
+      constraint_editor_window_load (win, files[i]);
+      gtk_window_present (GTK_WINDOW (win));
+    }
+}
+
+static void
+constraint_editor_application_class_init (ConstraintEditorApplicationClass *class)
+{
+  GApplicationClass *application_class = G_APPLICATION_CLASS (class);
+
+  application_class->startup = constraint_editor_application_startup;
+  application_class->activate = constraint_editor_application_activate;
+  application_class->open = constraint_editor_application_open;
+}
+
+ConstraintEditorApplication *
+constraint_editor_application_new (void)
+{
+  return g_object_new (CONSTRAINT_EDITOR_APPLICATION_TYPE,
+                       "application-id", "org.gtk.gtk4.ConstraintEditor",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
+}
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#define CONSTRAINT_EDITOR_APPLICATION_TYPE (constraint_editor_application_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintEditorApplication, constraint_editor_application, CONSTRAINT, EDITOR_APPLICATION, GtkApplication)
+
+ConstraintEditorApplication *constraint_editor_application_new (void);
@@ -0,0 +1,652 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#include "config.h"
+
+#include "constraint-editor-window.h"
+#include "constraint-view.h"
+#include "constraint-editor.h"
+#include "guide-editor.h"
+
+struct _ConstraintEditorWindow
+{
+  GtkApplicationWindow parent_instance;
+
+  GtkWidget *paned;
+  GtkWidget *view;
+  GtkWidget *list;
+};
+
+G_DEFINE_TYPE(ConstraintEditorWindow, constraint_editor_window, GTK_TYPE_APPLICATION_WINDOW);
+
+static GtkConstraintTarget *
+find_target (GListModel          *model,
+             GtkConstraintTarget *orig)
+{
+  const char *name;
+  const char *model_name;
+  gpointer item;
+  int i;
+
+  if (orig == NULL)
+    return NULL;
+
+  if (GTK_IS_LABEL (orig))
+    name = gtk_label_get_label (GTK_LABEL (orig));
+  else if (GTK_IS_CONSTRAINT_GUIDE (orig))
+    name = gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (orig));
+  else
+    {
+      g_warning ("Don't know how to handle %s targets", G_OBJECT_TYPE_NAME (orig));
+      return NULL;
+    }
+  for (i = 0; i < g_list_model_get_n_items (model); i++)
+    {
+      item = g_list_model_get_item (model, i);
+      g_object_unref (item);
+      if (GTK_IS_WIDGET (item))
+        model_name = gtk_widget_get_name (GTK_WIDGET (item));
+      else
+        model_name = gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (item));
+
+      if (strcmp (name, model_name) == 0)
+        return GTK_CONSTRAINT_TARGET (item);
+    }
+  g_warning ("Failed to find target '%s'", name);
+
+  return NULL;
+}
+
+gboolean
+constraint_editor_window_load (ConstraintEditorWindow *self,
+                               GFile            *file)
+{
+  char *path;
+  GtkBuilder *builder;
+  GError *error = NULL;
+  GtkWidget *view;
+  GtkLayoutManager *layout;
+  GtkWidget *child;
+  const char *name;
+  gpointer item;
+  int i;
+  GListModel *list;
+
+  path = g_file_get_path (file);
+
+  builder = gtk_builder_new ();
+  if (!gtk_builder_add_from_file (builder, path, &error))
+    {
+      g_print ("Could not load %s: %s", path, error->message);
+      g_error_free (error);
+      g_free (path);
+      g_object_unref (builder);
+      return FALSE;
+    }
+
+  view = GTK_WIDGET (gtk_builder_get_object (builder, "view"));
+  if (!GTK_IS_BOX (view))
+    {
+      g_print ("Could not load %s: No GtkBox named 'view'", path);
+      g_free (path);
+      g_object_unref (builder);
+      return FALSE;
+    }
+  layout = gtk_widget_get_layout_manager (view);
+  if (!GTK_IS_CONSTRAINT_LAYOUT (layout))
+    {
+      g_print ("Could not load %s: Widget 'view' does not use GtkConstraintLayout", path);
+      g_free (path);
+      g_object_unref (builder);
+      return FALSE;
+    }
+
+  for (child = gtk_widget_get_first_child (view);
+       child;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      if (!GTK_IS_LABEL (child))
+        {
+          g_print ("Skipping non-GtkLabel child\n");
+          continue;
+        }
+
+      name = gtk_label_get_label (GTK_LABEL (child));
+      constraint_view_add_child (CONSTRAINT_VIEW (self->view), name);
+    }
+
+  list = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (layout));
+  for (i = 0; i < g_list_model_get_n_items (list); i++)
+    {
+      GtkConstraintGuide *guide, *clone;
+      int w, h;
+
+      item = g_list_model_get_item (list, i);
+      guide = GTK_CONSTRAINT_GUIDE (item);
+
+      /* need to clone here, to attach to the right targets */
+      clone = gtk_constraint_guide_new ();
+      gtk_constraint_guide_set_name (clone, gtk_constraint_guide_get_name (guide));
+      gtk_constraint_guide_set_strength (clone, gtk_constraint_guide_get_strength (guide));
+      gtk_constraint_guide_get_min_size (guide, &w, &h);
+      gtk_constraint_guide_set_min_size (clone, w, h);
+      gtk_constraint_guide_get_nat_size (guide, &w, &h);
+      gtk_constraint_guide_set_nat_size (clone, w, h);
+      gtk_constraint_guide_get_max_size (guide, &w, &h);
+      gtk_constraint_guide_set_max_size (clone, w, h);
+      constraint_view_add_guide (CONSTRAINT_VIEW (self->view), clone);
+      g_object_unref (guide);
+      g_object_unref (clone);
+    }
+  g_object_unref (list);
+
+  list = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (layout));
+  for (i = 0; i < g_list_model_get_n_items (list); i++)
+    {
+      GtkConstraint *constraint;
+      GtkConstraint *clone;
+      GtkConstraintTarget *target;
+      GtkConstraintTarget *source;
+      GtkConstraintAttribute source_attr;
+
+      item = g_list_model_get_item (list, i);
+      constraint = GTK_CONSTRAINT (item);
+
+      target = gtk_constraint_get_target (constraint);
+      source = gtk_constraint_get_source (constraint);
+      source_attr = gtk_constraint_get_source_attribute (constraint);
+
+      if (source == NULL && source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE)
+        clone = gtk_constraint_new_constant (find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), target),
+                                  gtk_constraint_get_target_attribute (constraint),
+                                  gtk_constraint_get_relation (constraint),
+                                  gtk_constraint_get_constant (constraint),
+                                  gtk_constraint_get_strength (constraint));
+      else
+        clone = gtk_constraint_new (find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), target),
+                                    gtk_constraint_get_target_attribute (constraint),
+                                    gtk_constraint_get_relation (constraint),
+                                    find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), source),
+                                    source_attr,
+                                    gtk_constraint_get_multiplier (constraint),
+                                    gtk_constraint_get_constant (constraint),
+                                    gtk_constraint_get_strength (constraint));
+
+      constraint_view_add_constraint (CONSTRAINT_VIEW (self->view), clone);
+
+      g_object_unref (constraint);
+      g_object_unref (clone);
+    }
+  g_object_unref (list);
+
+  g_free (path);
+  g_object_unref (builder);
+
+  return TRUE;
+}
+
+static void
+open_response_cb (GObject *source,
+                  GAsyncResult *result,
+                  void *user_data)
+{
+  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
+  ConstraintEditorWindow *self = user_data;
+  GFile *file;
+
+  file = gtk_file_dialog_open_finish (dialog, result, NULL);
+  if (file)
+    {
+      constraint_editor_window_load (self, file);
+      g_object_unref (file);
+    }
+}
+
+static void
+open_cb (GtkWidget              *button,
+         ConstraintEditorWindow *self)
+{
+  GtkFileDialog *dialog;
+  GFile *cwd;
+
+  dialog = gtk_file_dialog_new ();
+  gtk_file_dialog_set_title (dialog, "Open file");
+  cwd = g_file_new_for_path (".");
+  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  g_object_unref (cwd);
+  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, open_response_cb, self);
+  g_object_unref (dialog);
+}
+
+static void
+serialize_child (GString   *str,
+                 int        indent,
+                 GtkWidget *child)
+{
+  const char *name;
+
+  name = gtk_widget_get_name (child);
+  g_string_append_printf (str, "%*s<child>\n", indent, "");
+  g_string_append_printf (str, "%*s  <object class=\"GtkLabel\" id=\"%s\">\n", indent, "", name);
+  g_string_append_printf (str, "%*s    <property name=\"label\">%s</property>\n", indent, "", name);
+  g_string_append_printf (str, "%*s  </object>\n", indent, "");
+  g_string_append_printf (str, "%*s</child>\n", indent, "");
+}
+
+static char *
+serialize_model (GListModel *list)
+{
+  GString *str = g_string_new ("");
+  int i;
+
+  g_string_append (str, "<interface>\n");
+  g_string_append (str, "  <object class=\"GtkBox\" id=\"view\">\n");
+  g_string_append (str, "    <property name=\"layout-manager\">\n");
+  g_string_append (str, "      <object class=\"GtkConstraintLayout\">\n");
+  g_string_append (str, "        <constraints>\n");
+  for (i = 0; i < g_list_model_get_n_items (list); i++)
+    {
+      gpointer item = g_list_model_get_item (list, i);
+      g_object_unref (item);
+      if (GTK_IS_CONSTRAINT (item))
+        constraint_editor_serialize_constraint (str, 10, GTK_CONSTRAINT (item));
+      else if (GTK_IS_CONSTRAINT_GUIDE (item))
+        guide_editor_serialize_guide (str, 10, GTK_CONSTRAINT_GUIDE (item));
+    }
+  g_string_append (str, "        </constraints>\n");
+  g_string_append (str, "      </object>\n");
+  g_string_append (str, "    </property>\n");
+  for (i = 0; i < g_list_model_get_n_items (list); i++)
+    {
+      gpointer item = g_list_model_get_item (list, i);
+      g_object_unref (item);
+      if (GTK_IS_WIDGET (item))
+        serialize_child (str, 4, GTK_WIDGET (item));
+    }
+  g_string_append (str, "  </object>\n");
+  g_string_append (str, "</interface>\n");
+
+  return g_string_free (str, FALSE);
+}
+
+
+static void
+save_response_cb (GObject *source,
+                  GAsyncResult *result,
+                  void *user_data)
+{
+  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
+  ConstraintEditorWindow *self = user_data;
+  GFile *file;
+
+  file = gtk_file_dialog_save_finish (dialog, result, NULL);
+  if (file)
+    {
+      GListModel *model;
+      char *text;
+      GError *error = NULL;
+
+      model = constraint_view_get_model (CONSTRAINT_VIEW (self->view));
+      text = serialize_model (model);
+      g_file_replace_contents (file, text, strlen (text),
+                               NULL, FALSE,
+                               G_FILE_CREATE_NONE,
+                               NULL,
+                               NULL,
+                               &error);
+      if (error != NULL)
+        {
+          GtkAlertDialog *alert;
+
+          alert = gtk_alert_dialog_new ("Saving failed");
+          gtk_alert_dialog_set_detail (alert, error->message);
+          gtk_alert_dialog_show (alert,
+                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))));
+          g_object_unref (alert);
+          g_error_free (error);
+        }
+
+      g_free (text);
+      g_object_unref (file);
+    }
+}
+
+static void
+save_cb (GtkWidget              *button,
+         ConstraintEditorWindow *self)
+{
+  GtkFileDialog *dialog;
+  GFile *cwd;
+
+  dialog = gtk_file_dialog_new ();
+  gtk_file_dialog_set_title (dialog, "Save constraints");
+  cwd = g_file_new_for_path (".");
+  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  g_object_unref (cwd);
+  gtk_file_dialog_save (dialog,
+                        GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
+                        NULL,
+                        save_response_cb, self);
+  g_object_unref (dialog);
+}
+
+static void
+constraint_editor_window_dispose (GObject *object)
+{
+  gtk_widget_dispose_template (GTK_WIDGET (object), CONSTRAINT_EDITOR_WINDOW_TYPE);
+
+  G_OBJECT_CLASS (constraint_editor_window_parent_class)->dispose (object);
+}
+
+static int child_counter;
+static int guide_counter;
+
+static void
+add_child (ConstraintEditorWindow *win)
+{
+  char *name;
+
+  child_counter++;
+  name = g_strdup_printf ("Child %d", child_counter);
+  constraint_view_add_child (CONSTRAINT_VIEW (win->view), name);
+  g_free (name);
+}
+
+static void
+add_guide (ConstraintEditorWindow *win)
+{
+  char *name;
+  GtkConstraintGuide *guide;
+
+  guide_counter++;
+  name = g_strdup_printf ("Guide %d", guide_counter);
+  guide = gtk_constraint_guide_new ();
+  gtk_constraint_guide_set_name (guide, name);
+  g_free (name);
+
+  constraint_view_add_guide (CONSTRAINT_VIEW (win->view), guide);
+}
+
+static void
+constraint_editor_done (ConstraintEditor *editor,
+                        GtkConstraint    *constraint,
+                        ConstraintEditorWindow *win)
+{
+  GtkConstraint *old_constraint;
+
+  g_object_get (editor, "constraint", &old_constraint, NULL);
+
+  if (old_constraint)
+    constraint_view_remove_constraint (CONSTRAINT_VIEW (win->view), old_constraint);
+
+  constraint_view_add_constraint (CONSTRAINT_VIEW (win->view), constraint);
+
+  g_clear_object (&old_constraint);
+
+  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
+}
+
+static void
+edit_constraint (ConstraintEditorWindow *win,
+                 GtkConstraint          *constraint)
+{
+  GtkWidget *window;
+  ConstraintEditor *editor;
+  GListModel *model;
+
+  window = gtk_window_new ();
+  gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
+  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+  if (constraint)
+    gtk_window_set_title (GTK_WINDOW (window), "Edit Constraint");
+  else
+    gtk_window_set_title (GTK_WINDOW (window), "Create Constraint");
+
+  model = constraint_view_get_model (CONSTRAINT_VIEW (win->view));
+
+  editor = constraint_editor_new (model, constraint);
+
+  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
+
+  g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);
+
+  gtk_window_present (GTK_WINDOW (window));
+}
+
+static void
+add_constraint (ConstraintEditorWindow *win)
+{
+  edit_constraint (win, NULL);
+}
+
+static void
+guide_editor_done (GuideEditor            *editor,
+                   GtkConstraintGuide     *guide,
+                   ConstraintEditorWindow *win)
+{
+  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
+}
+
+static void
+edit_guide (ConstraintEditorWindow *win,
+            GtkConstraintGuide     *guide)
+{
+  GtkWidget *window;
+  GuideEditor *editor;
+
+  window = gtk_window_new ();
+  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+  gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
+  gtk_window_set_title (GTK_WINDOW (window), "Edit Guide");
+
+  editor = guide_editor_new (guide);
+  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
+
+  g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
+  gtk_window_present (GTK_WINDOW (window));
+}
+
+static void
+row_activated (GtkListBox *list,
+               GtkListBoxRow *row,
+               ConstraintEditorWindow *win)
+{
+  GObject *item;
+
+  item = G_OBJECT (g_object_get_data (G_OBJECT (row), "item"));
+
+  if (GTK_IS_CONSTRAINT (item))
+    edit_constraint (win, GTK_CONSTRAINT (item));
+  else if (GTK_IS_CONSTRAINT_GUIDE (item))
+    edit_guide (win, GTK_CONSTRAINT_GUIDE (item));
+}
+
+static void
+constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  g_type_ensure (CONSTRAINT_VIEW_TYPE);
+
+  object_class->dispose = constraint_editor_window_dispose;
+
+  gtk_widget_class_set_template_from_resource (widget_class,
+                                               "/org/gtk/gtk4/constraint-editor/constraint-editor-window.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, paned);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, view);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, list);
+
+  gtk_widget_class_bind_template_callback (widget_class, open_cb);
+  gtk_widget_class_bind_template_callback (widget_class, save_cb);
+  gtk_widget_class_bind_template_callback (widget_class, add_child);
+  gtk_widget_class_bind_template_callback (widget_class, add_guide);
+  gtk_widget_class_bind_template_callback (widget_class, add_constraint);
+  gtk_widget_class_bind_template_callback (widget_class, row_activated);
+}
+
+static void
+row_edit (GtkButton *button,
+          ConstraintEditorWindow *win)
+{
+  GtkWidget *row;
+  GObject *item;
+
+  row = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_LIST_BOX_ROW);
+  item = (GObject *)g_object_get_data (G_OBJECT (row), "item");
+  if (GTK_IS_CONSTRAINT (item))
+    edit_constraint (win, GTK_CONSTRAINT (item));
+  else if (GTK_IS_CONSTRAINT_GUIDE (item))
+    edit_guide (win, GTK_CONSTRAINT_GUIDE (item));
+}
+
+static void
+mark_constraints_invalid (ConstraintEditorWindow *win,
+                          gpointer                removed)
+{
+  GtkWidget *child;
+  GObject *item;
+
+  for (child = gtk_widget_get_first_child (win->list);
+       child;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      item = (GObject *)g_object_get_data (G_OBJECT (child), "item");
+      if (GTK_IS_CONSTRAINT (item))
+        {
+          GtkConstraint *constraint = GTK_CONSTRAINT (item);
+
+          if (gtk_constraint_get_target (constraint) == (GtkConstraintTarget *)removed ||
+              gtk_constraint_get_source (constraint) == (GtkConstraintTarget *)removed)
+            {
+              GtkWidget *button;
+              button = (GtkWidget *)g_object_get_data (G_OBJECT (child), "edit");
+              gtk_button_set_icon_name (GTK_BUTTON (button), "dialog-warning-symbolic");
+              gtk_widget_set_tooltip_text (button, "Constraint is invalid");
+            }
+        }
+    }
+}
+
+static void
+row_delete (GtkButton *button,
+            ConstraintEditorWindow *win)
+{
+  GtkWidget *row;
+  GObject *item;
+
+  row = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_LIST_BOX_ROW);
+  item = (GObject *)g_object_get_data (G_OBJECT (row), "item");
+  if (GTK_IS_CONSTRAINT (item))
+    constraint_view_remove_constraint (CONSTRAINT_VIEW (win->view),
+                                       GTK_CONSTRAINT (item));
+  else if (GTK_IS_CONSTRAINT_GUIDE (item))
+    {
+      mark_constraints_invalid (win, item);
+      constraint_view_remove_guide (CONSTRAINT_VIEW (win->view),
+                                    GTK_CONSTRAINT_GUIDE (item));
+    }
+  else if (GTK_IS_WIDGET (item))
+    {
+      mark_constraints_invalid (win, item);
+      constraint_view_remove_child (CONSTRAINT_VIEW (win->view),
+                                    GTK_WIDGET (item));
+    }
+}
+
+static GtkWidget *
+create_widget_func (gpointer item,
+                    gpointer user_data)
+{
+  ConstraintEditorWindow *win = user_data;
+  const char *name;
+  char *freeme = NULL;
+  GtkWidget *row, *box, *label, *button;
+
+  if (GTK_IS_WIDGET (item))
+    name = gtk_widget_get_name (GTK_WIDGET (item));
+  else if (GTK_IS_CONSTRAINT_GUIDE (item))
+    name = gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (item));
+  else if (GTK_IS_CONSTRAINT (item))
+    name = freeme = constraint_editor_constraint_to_string (GTK_CONSTRAINT (item));
+  else
+    name = "";
+
+  row = gtk_list_box_row_new ();
+  g_object_set_data_full (G_OBJECT (row), "item", g_object_ref (item), g_object_unref);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  label = gtk_label_new (name);
+  if (GTK_IS_WIDGET (item) || GTK_IS_CONSTRAINT_GUIDE (item))
+    g_object_bind_property (item, "name",
+                            label, "label",
+                            G_BINDING_DEFAULT);
+  gtk_widget_set_margin_start (label, 10);
+  gtk_widget_set_margin_end (label, 10);
+  gtk_widget_set_margin_top (label, 10);
+  gtk_widget_set_margin_bottom (label, 10);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_widget_set_hexpand (label, TRUE);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
+  gtk_box_append (GTK_BOX (box), label);
+
+  if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
+    {
+      button = gtk_button_new_from_icon_name ("document-edit-symbolic");
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
+      g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
+      g_object_set_data (G_OBJECT (row), "edit", button);
+      gtk_box_append (GTK_BOX (box), button);
+      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
+      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
+      gtk_box_append (GTK_BOX (box), button);
+    }
+  else if (GTK_IS_WIDGET (item))
+    {
+      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
+      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
+      gtk_box_append (GTK_BOX (box), button);
+    }
+
+  g_free (freeme);
+
+  return row;
+}
+
+static void
+constraint_editor_window_init (ConstraintEditorWindow *self)
+{
+  gtk_widget_init_template (GTK_WIDGET (self));
+
+  gtk_list_box_bind_model (GTK_LIST_BOX (self->list),
+                           constraint_view_get_model (CONSTRAINT_VIEW (self->view)),
+                           create_widget_func,
+                           self,
+                           NULL);
+}
+
+ConstraintEditorWindow *
+constraint_editor_window_new (ConstraintEditorApplication *application)
+{
+  return g_object_new (CONSTRAINT_EDITOR_WINDOW_TYPE,
+                       "application", application,
+                       NULL);
+}
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "constraint-editor-application.h"
+
+
+#define CONSTRAINT_EDITOR_WINDOW_TYPE (constraint_editor_window_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintEditorWindow, constraint_editor_window, CONSTRAINT, EDITOR_WINDOW, GtkApplicationWindow)
+
+ConstraintEditorWindow * constraint_editor_window_new  (ConstraintEditorApplication  *application);
+
+gboolean                 constraint_editor_window_load (ConstraintEditorWindow       *self,
+                                                        GFile                        *file);
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="ConstraintEditorWindow" parent="GtkApplicationWindow">
+    <property name="title" translatable="yes">GTK Constraint Editor</property>
+    <property name="default-width">1024</property>
+    <property name="default-height">768</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header">
+        <child type="start">
+          <object class="GtkButton">
+            <property name="icon-name">document-open-symbolic</property>
+            <property name="tooltip-text">Open ui file</property>
+            <signal name="clicked" handler="open_cb"/>
+          </object>
+        </child>
+        <child type="start">
+          <object class="GtkButton">
+            <property name="icon-name">document-save-symbolic</property>
+            <property name="tooltip-text">Save to ui file</property>
+            <signal name="clicked" handler="save_cb"/>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkPaned" id="paned">
+        <property name="orientation">horizontal</property>
+        <child>
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">horizontal</property>
+                <child>
+                  <object class="GtkButton">
+                    <property name="label">Add Child</property>
+                    <signal name="clicked" handler="add_child" swapped="yes"/>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="label">Add Guide</property>
+                    <signal name="clicked" handler="add_guide" swapped="yes"/>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="label">Add Constraint</property>
+                    <signal name="clicked" handler="add_constraint" swapped="yes"/>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="hscrollbar-policy">never</property>
+                <property name="vscrollbar-policy">automatic</property>
+                <property name="vexpand">1</property>
+                <child>
+                  <object class="GtkListBox" id="list">
+                    <property name="show-separators">1</property>
+                    <property name="selection-mode">none</property>
+                    <signal name="row-activated" handler="row_activated"/>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="ConstraintView" id="view">
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
@@ -0,0 +1,716 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#include "config.h"
+
+#include "constraint-editor.h"
+#include "constraint-view.h"
+
+struct _ConstraintEditor
+{
+  GtkWidget parent_instance;
+
+  GtkWidget *grid;
+  GtkWidget *target;
+  GtkWidget *target_attr;
+  GtkWidget *relation;
+  GtkWidget *source;
+  GtkWidget *source_attr;
+  GtkWidget *multiplier;
+  GtkWidget *constant;
+  GtkWidget *strength;
+  GtkWidget *preview;
+  GtkWidget *button;
+
+  GtkConstraint *constraint;
+  GListModel *model;
+
+  gboolean constructed;
+};
+
+enum {
+  PROP_MODEL = 1,
+  PROP_CONSTRAINT,
+  LAST_PROP
+};
+
+static GParamSpec *pspecs[LAST_PROP];
+
+enum {
+  DONE,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+G_DEFINE_TYPE(ConstraintEditor, constraint_editor, GTK_TYPE_WIDGET);
+
+static const char *
+get_target_name (GtkConstraintTarget *target)
+{
+  if (target == NULL)
+    return "Super";
+  else if (GTK_IS_WIDGET (target))
+    return gtk_widget_get_name (GTK_WIDGET (target));
+  else if (GTK_IS_CONSTRAINT_GUIDE (target))
+    return gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (target));
+  else
+    return "";
+}
+
+static void
+constraint_target_combo (GListModel *model,
+                         GtkWidget  *combo,
+                         gboolean    is_source)
+{
+  GtkStringList *targets;
+  int i;
+
+  targets = gtk_string_list_new (NULL);
+
+  gtk_string_list_append (targets, "Super");
+
+  if (model)
+    {
+      for (i = 0; i < g_list_model_get_n_items (model); i++)
+        {
+          GObject *item = g_list_model_get_object (model, i);
+
+          if (GTK_IS_CONSTRAINT (item))
+            continue;
+
+          gtk_string_list_append (targets, get_target_name (GTK_CONSTRAINT_TARGET (item)));
+          g_object_unref (item);
+        }
+    }
+
+  gtk_drop_down_set_model (GTK_DROP_DOWN (combo), G_LIST_MODEL (targets));
+  g_object_unref (targets);
+}
+
+static gpointer
+get_target (GListModel *model,
+            const char *id)
+{
+  int i;
+
+  if (id == NULL)
+    return NULL;
+
+  if (strcmp ("Super", id) == 0)
+    return NULL;
+
+  for (i = 0; i < g_list_model_get_n_items (model); i++)
+    {
+      GObject *item = g_list_model_get_object (model, i);
+      g_object_unref (item);
+      if (GTK_IS_CONSTRAINT (item))
+        continue;
+      else if (GTK_IS_WIDGET (item))
+        {
+          if (strcmp (id, gtk_widget_get_name (GTK_WIDGET (item))) == 0)
+            return item;
+        }
+      else if (GTK_IS_CONSTRAINT_GUIDE (item))
+        {
+          if (strcmp (id, gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (item))) == 0)
+            return item;
+        }
+    }
+
+  return NULL;
+}
+
+static void
+select_target (GtkDropDown *combo,
+               const char  *target_name)
+{
+  GListModel *model = gtk_drop_down_get_model (combo);
+
+  for (unsigned int i = 0; i < g_list_model_get_n_items (model); i++)
+    {
+      GtkStringObject *s = g_list_model_get_item (model, i);
+
+      g_object_unref (s);
+      if (strcmp (target_name, gtk_string_object_get_string (s)) == 0)
+        {
+          gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), i);
+          return;
+        }
+    }
+}
+
+static GtkConstraintAttribute
+get_attr (unsigned int id)
+{
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_ATTRIBUTE_NONE;
+    case 1: return GTK_CONSTRAINT_ATTRIBUTE_LEFT;
+    case 2: return GTK_CONSTRAINT_ATTRIBUTE_RIGHT;
+    case 3: return GTK_CONSTRAINT_ATTRIBUTE_TOP;
+    case 4: return GTK_CONSTRAINT_ATTRIBUTE_BOTTOM;
+    case 5: return GTK_CONSTRAINT_ATTRIBUTE_START;
+    case 6: return GTK_CONSTRAINT_ATTRIBUTE_END;
+    case 7: return GTK_CONSTRAINT_ATTRIBUTE_WIDTH;
+    case 8: return GTK_CONSTRAINT_ATTRIBUTE_HEIGHT;
+    case 9: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_X;
+    case 10: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y;
+    case 11: return GTK_CONSTRAINT_ATTRIBUTE_BASELINE;
+    default: g_assert_not_reached ();
+    }
+}
+
+static unsigned int
+get_attr_id (GtkConstraintAttribute attr)
+{
+  switch (attr)
+    {
+    case GTK_CONSTRAINT_ATTRIBUTE_NONE: return 0;
+    case GTK_CONSTRAINT_ATTRIBUTE_LEFT: return 1;
+    case GTK_CONSTRAINT_ATTRIBUTE_RIGHT: return 2;
+    case GTK_CONSTRAINT_ATTRIBUTE_TOP: return 3;
+    case GTK_CONSTRAINT_ATTRIBUTE_BOTTOM: return 4;
+    case GTK_CONSTRAINT_ATTRIBUTE_START: return 5;
+    case GTK_CONSTRAINT_ATTRIBUTE_END: return 6;
+    case GTK_CONSTRAINT_ATTRIBUTE_WIDTH: return 7;
+    case GTK_CONSTRAINT_ATTRIBUTE_HEIGHT: return 8;
+    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_X: return 9;
+    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y: return 10;
+    case GTK_CONSTRAINT_ATTRIBUTE_BASELINE: return 11;
+    default: g_assert_not_reached ();
+    }
+}
+
+static const char *
+get_attr_nick (GtkConstraintAttribute attr)
+{
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
+  GEnumValue *value = g_enum_get_value (class, attr);
+  const char *nick = value->value_nick;
+  g_type_class_unref (class);
+
+  return nick;
+}
+
+static GtkConstraintRelation
+get_relation (unsigned int id)
+{
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_RELATION_LE;
+    case 1: return GTK_CONSTRAINT_RELATION_EQ;
+    case 2: return GTK_CONSTRAINT_RELATION_GE;
+    default: g_assert_not_reached ();
+    }
+}
+
+static unsigned int
+get_relation_id (GtkConstraintRelation relation)
+{
+  switch (relation)
+    {
+    case GTK_CONSTRAINT_RELATION_LE: return 0;
+    case GTK_CONSTRAINT_RELATION_EQ: return 1;
+    case GTK_CONSTRAINT_RELATION_GE: return 2;
+    default: g_assert_not_reached ();
+    }
+}
+
+static const char *
+get_relation_nick (GtkConstraintRelation relation)
+{
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
+  GEnumValue *value = g_enum_get_value (class, relation);
+  const char *nick = value->value_nick;
+  g_type_class_unref (class);
+
+  return nick;
+}
+
+static const char *
+get_relation_display_name (GtkConstraintRelation relation)
+{
+  switch (relation)
+    {
+    case GTK_CONSTRAINT_RELATION_LE:
+      return "≤";
+    case GTK_CONSTRAINT_RELATION_EQ:
+      return "=";
+    case GTK_CONSTRAINT_RELATION_GE:
+      return "≥";
+    default:
+      return "?";
+    }
+}
+
+static GtkConstraintStrength
+get_strength (unsigned int id)
+{ 
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
+    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
+    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
+    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
+    default: g_assert_not_reached ();
+    }
+}
+
+static unsigned int
+get_strength_id (GtkConstraintStrength strength)
+{
+  switch (strength)
+    {
+    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
+    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
+    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
+    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
+    default: g_assert_not_reached ();
+    }
+}
+
+static const char *
+get_strength_nick (GtkConstraintStrength strength)
+{
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
+  GEnumValue *value = g_enum_get_value (class, strength);
+  const char *nick = value->value_nick;
+  g_type_class_unref (class);
+
+  return nick;
+}
+
+void
+constraint_editor_serialize_constraint (GString       *str,
+                                        int            indent,
+                                        GtkConstraint *constraint)
+{
+  const char *target;
+  const char *target_attr;
+  const char *relation;
+  const char *source;
+  const char *source_attr;
+  double multiplier;
+  double constant;
+  const char *strength;
+
+  target = get_target_name (gtk_constraint_get_target (constraint));
+  target_attr = get_attr_nick (gtk_constraint_get_target_attribute (constraint));
+  relation = get_relation_nick (gtk_constraint_get_relation (constraint));
+  source = get_target_name (gtk_constraint_get_source (constraint));
+  source_attr = get_attr_nick (gtk_constraint_get_source_attribute (constraint));
+  multiplier = gtk_constraint_get_multiplier (constraint);
+  constant = gtk_constraint_get_constant (constraint);
+  strength = get_strength_nick (gtk_constraint_get_strength (constraint));
+
+  g_string_append_printf (str, "%*s<constraint target=\"%s\" target-attribute=\"%s\"\n", indent, "", target, target_attr);
+  g_string_append_printf (str, "%*s            relation=\"%s\"\n", indent, "", relation);
+  if (strcmp (source_attr, "none") != 0)
+    {
+      g_string_append_printf (str, "%*s            source=\"%s\" source-attribute=\"%s\"\n", indent, "", source, source_attr);
+      g_string_append_printf (str, "%*s            multiplier=\"%g\"\n", indent, "", multiplier);
+    }
+  g_string_append_printf (str, "%*s            constant=\"%g\"\n", indent, "", constant);
+  g_string_append_printf (str, "%*s            strength=\"%s\" />\n", indent, "", strength);
+}
+
+static void
+create_constraint (GtkButton        *button,
+                   ConstraintEditor *editor)
+{
+  gpointer obj;
+  gpointer target;
+  GtkConstraintAttribute target_attr;
+  gpointer source;
+  GtkConstraintAttribute source_attr;
+  GtkConstraintRelation relation;
+  double multiplier;
+  double constant;
+  int strength;
+  GtkConstraint *constraint;
+
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
+  if (obj)
+    target = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
+  else
+    target = NULL;
+  target_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->target_attr)));
+
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
+  if (obj)
+    source = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
+  else
+    source = NULL;
+  source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN(editor->source_attr)));
+
+  relation = get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation)));
+
+  multiplier = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->multiplier)), NULL);
+
+  constant = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->constant)), NULL);
+
+  strength = get_strength (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength)));
+
+  constraint = gtk_constraint_new (target, target_attr,
+                                   relation,
+                                   source, source_attr,
+                                   multiplier,
+                                   constant,
+                                   strength);
+  g_signal_emit (editor, signals[DONE], 0, constraint);
+  g_object_unref (constraint);
+}
+
+static void
+source_attr_changed (ConstraintEditor *editor)
+{
+  if (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))) == GTK_CONSTRAINT_ATTRIBUTE_NONE)
+    {
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source), GTK_INVALID_LIST_POSITION);
+      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "");
+      gtk_widget_set_sensitive (editor->source, FALSE);
+      gtk_widget_set_sensitive (editor->multiplier, FALSE);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (editor->source, TRUE);
+      gtk_widget_set_sensitive (editor->multiplier, TRUE);
+      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1");
+    }
+}
+
+char *
+constraint_editor_constraint_to_string (GtkConstraint *constraint)
+{
+  GString *str;
+  const char *name;
+  const char *attr;
+  const char *relation;
+  double c, m;
+
+  str = g_string_new ("");
+
+  name = get_target_name (gtk_constraint_get_target (constraint));
+  attr = get_attr_nick (gtk_constraint_get_target_attribute (constraint));
+  relation = get_relation_display_name (gtk_constraint_get_relation (constraint));
+
+  if (name == NULL)
+    name = "[ ]";
+
+  g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
+
+  c = gtk_constraint_get_constant (constraint);
+
+  attr = get_attr_nick (gtk_constraint_get_source_attribute (constraint));
+  if (strcmp (attr, "none") != 0)
+    {
+      name = get_target_name (gtk_constraint_get_source (constraint));
+      m = gtk_constraint_get_multiplier (constraint);
+
+      if (name == NULL)
+        name = "[ ]";
+
+      g_string_append_printf (str, "%s.%s", name, attr);
+
+      if (m != 1.0)
+        g_string_append_printf (str, " × %g", m);
+
+      if (c > 0.0)
+        g_string_append_printf (str, " + %g", c);
+      else if (c < 0.0)
+        g_string_append_printf (str, " - %g", -c);
+    }
+  else
+    g_string_append_printf (str, "%g", c);
+
+  return g_string_free (str, FALSE);
+}
+
+static void
+update_preview (ConstraintEditor *editor)
+{
+  GString *str;
+  const char *name;
+  const char *attr;
+  const char *relation;
+  const char *multiplier;
+  const char *constant;
+  double c, m;
+
+  if (!editor->constructed)
+    return;
+
+  str = g_string_new ("");
+
+  name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target))));
+  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected ((GTK_DROP_DOWN (editor->target_attr)))));
+  relation = get_relation_nick (get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation))));
+
+  if (name == NULL)
+    name = "[ ]";
+
+  g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
+
+  constant = gtk_editable_get_text (GTK_EDITABLE (editor->constant));
+  c = g_ascii_strtod (constant, NULL);
+
+  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))));
+  if (strcmp (attr, "none") != 0)
+    {
+       name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source))));
+      multiplier = gtk_editable_get_text (GTK_EDITABLE (editor->multiplier));
+      m = g_ascii_strtod (multiplier, NULL);
+
+      if (name == NULL)
+        name = "[ ]";
+
+      g_string_append_printf (str, "%s.%s", name, attr);
+
+      if (m != 1.0)
+        g_string_append_printf (str, " × %g", m);
+
+      if (c > 0.0)
+        g_string_append_printf (str, " + %g", c);
+      else if (c < 0.0)
+        g_string_append_printf (str, " - %g", -c);
+    }
+  else
+    g_string_append_printf (str, "%g", c);
+
+  gtk_label_set_label (GTK_LABEL (editor->preview), str->str);
+
+  g_string_free (str, TRUE);
+}
+
+static void
+update_button (ConstraintEditor *editor)
+{
+  gpointer obj;
+  const char *target;
+  const char *source;
+  GtkConstraintAttribute source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr)));
+
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
+  target = obj ? gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
+
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
+  source = obj ?  gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
+
+  if (target && (source || (source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
+    gtk_widget_set_sensitive (editor->button, TRUE);
+  else
+    gtk_widget_set_sensitive (editor->button, FALSE);
+}
+
+static void
+constraint_editor_init (ConstraintEditor *editor)
+{
+  gtk_widget_init_template (GTK_WIDGET (editor));
+}
+
+static void
+constraint_editor_constructed (GObject *object)
+{
+  ConstraintEditor *editor = CONSTRAINT_EDITOR (object);
+
+  constraint_target_combo (editor->model, editor->target, FALSE);
+  constraint_target_combo (editor->model, editor->source, TRUE);
+
+  if (editor->constraint)
+    {
+      GtkConstraintTarget *target;
+      GtkConstraintAttribute attr;
+      GtkConstraintRelation relation;
+      GtkConstraintStrength strength;
+      char *val;
+      double multiplier;
+      double constant;
+
+      target = gtk_constraint_get_target (editor->constraint);
+      select_target (GTK_DROP_DOWN (editor->target), get_target_name (target));
+
+      attr = gtk_constraint_get_target_attribute (editor->constraint);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (attr));
+
+      target = gtk_constraint_get_source (editor->constraint);
+      select_target (GTK_DROP_DOWN (editor->source), get_target_name (target));
+
+      attr = gtk_constraint_get_source_attribute (editor->constraint);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (attr));
+
+      relation = gtk_constraint_get_relation (editor->constraint);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (relation));
+
+      multiplier = gtk_constraint_get_multiplier (editor->constraint);
+      val = g_strdup_printf ("%g", multiplier);
+      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), val);
+      g_free (val);
+
+      constant = gtk_constraint_get_constant (editor->constraint);
+      val = g_strdup_printf ("%g", constant);
+      gtk_editable_set_text (GTK_EDITABLE (editor->constant), val);
+      g_free (val);
+
+      strength = gtk_constraint_get_strength (editor->constraint);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+
+      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
+    }
+  else
+    {
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (GTK_CONSTRAINT_RELATION_EQ));
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_REQUIRED));
+
+      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1.0");
+      gtk_editable_set_text (GTK_EDITABLE (editor->constant), "0.0");
+
+      gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
+    }
+
+  editor->constructed = TRUE;
+  update_preview (editor);
+  update_button (editor);
+}
+
+static void
+constraint_editor_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  ConstraintEditor *self = CONSTRAINT_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_MODEL:
+      self->model = g_value_dup_object (value);
+      break;
+
+    case PROP_CONSTRAINT:
+      self->constraint = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+constraint_editor_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  ConstraintEditor *self = CONSTRAINT_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_MODEL:
+      g_value_set_object (value, self->model);
+      break;
+
+    case PROP_CONSTRAINT:
+      g_value_set_object (value, self->constraint);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+constraint_editor_dispose (GObject *object)
+{
+  ConstraintEditor *self = (ConstraintEditor *)object;
+
+  g_clear_object (&self->model);
+  g_clear_object (&self->constraint);
+
+  gtk_widget_dispose_template (GTK_WIDGET (object), CONSTRAINT_EDITOR_TYPE);
+
+  G_OBJECT_CLASS (constraint_editor_parent_class)->dispose (object);
+}
+
+static void
+constraint_editor_class_init (ConstraintEditorClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->constructed = constraint_editor_constructed;
+  object_class->dispose = constraint_editor_dispose;
+  object_class->set_property = constraint_editor_set_property;
+  object_class->get_property = constraint_editor_get_property;
+
+  pspecs[PROP_CONSTRAINT] =
+    g_param_spec_object ("constraint", "constraint", "constraint",
+                         GTK_TYPE_CONSTRAINT,
+                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
+
+  pspecs[PROP_MODEL] =
+    g_param_spec_object ("model", "model", "model",
+                         G_TYPE_LIST_MODEL,
+                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
+
+  g_object_class_install_properties (object_class, LAST_PROP, pspecs);
+
+  signals[DONE] =
+    g_signal_new ("done",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE, 1, GTK_TYPE_CONSTRAINT);
+
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
+
+  gtk_widget_class_set_template_from_resource (widget_class,
+                                               "/org/gtk/gtk4/constraint-editor/constraint-editor.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, grid);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, target);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, target_attr);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, relation);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, source);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, source_attr);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, multiplier);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, constant);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, strength);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, preview);
+  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, button);
+
+  gtk_widget_class_bind_template_callback (widget_class, update_preview);
+  gtk_widget_class_bind_template_callback (widget_class, update_button);
+  gtk_widget_class_bind_template_callback (widget_class, create_constraint);
+  gtk_widget_class_bind_template_callback (widget_class, source_attr_changed);
+}
+
+ConstraintEditor *
+constraint_editor_new (GListModel    *model,
+                       GtkConstraint *constraint)
+{
+  return g_object_new (CONSTRAINT_EDITOR_TYPE,
+                       "model", model,
+                       "constraint", constraint,
+                       NULL);
+}
@@ -0,0 +1,12 @@
+constraintview {
+  background: black;
+  color: white;
+}
+
+constraintview .child {
+  background: red;
+}
+
+constraintview .guide {
+  background: blue;
+}
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gtk/gtk4/constraint-editor">
+    <file preprocess="xml-stripblanks">constraint-editor-window.ui</file>
+    <file preprocess="xml-stripblanks">constraint-editor.ui</file>
+    <file preprocess="xml-stripblanks">guide-editor.ui</file>
+    <file>constraint-editor.css</file>
+  </gresource>
+</gresources>
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#define CONSTRAINT_EDITOR_TYPE (constraint_editor_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintEditor, constraint_editor, CONSTRAINT, EDITOR, GtkWidget)
+
+ConstraintEditor * constraint_editor_new (GListModel    *model,
+                                          GtkConstraint *constraint);
+
+void constraint_editor_serialize_constraint (GString       *str,
+                                             int            indent,
+                                             GtkConstraint *constraint);
+char *constraint_editor_constraint_to_string (GtkConstraint *constraint);
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkStringList" id="targets">
+    <items>
+      <item>None</item>
+      <item>Left</item>
+      <item>Right</item>
+      <item>Top</item>
+      <item>Bottom</item>
+      <item>Start</item>
+      <item>End</item>
+      <item>Width</item>
+      <item>Height</item>
+      <item>Center X</item>
+      <item>Center Y</item>
+      <item>Baseline</item>
+    </items>
+  </object>
+  <template class="ConstraintEditor" parent="GtkWidget">
+    <child>
+      <object class="GtkGrid" id="grid">
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
+        <property name="row-spacing">10</property>
+        <property name="column-spacing">10</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Target</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkDropDown" id="target">
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkDropDown" id="target_attr">
+            <property name="model">targets</property>
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Relation</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkDropDown" id="relation">
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <property name="model">
+              <object class="GtkStringList">
+                <items>
+                  <item>≤</item>
+                  <item>=</item>
+                  <item>≥</item>
+                </items>
+              </object>
+            </property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Source</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkDropDown" id="source">
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkDropDown" id="source_attr">
+            <property name="model">targets</property>
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <signal name="notify::selected" handler="source_attr_changed" swapped="yes"/>
+            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Multiplier</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">4</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkEntry" id="multiplier">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">4</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Constant</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">5</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkEntry" id="constant">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">5</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Strength</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">6</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkDropDown" id="strength">
+            <property name="model">
+              <object class="GtkStringList">
+                <items>
+                  <item>Weak</item>
+                  <item>Medium</item>
+                  <item>Strong</item>
+                  <item>Required</item>
+                </items>
+              </object>
+            </property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">6</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="preview">
+            <property name="xalign">0</property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">7</property>
+              <property name="column-span">2</property>
+            </layout>
+            <attributes>
+              <attribute name="scale" value="1.44"/>
+            </attributes>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="button">
+            <property name="label">Create</property>
+            <signal name="clicked" handler="create_constraint"/>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">8</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#include "constraint-view-child.h"
+
+struct _ConstraintViewChild
+{
+  GObject parent_instance;
+
+  char *name;
+};
+
+enum {
+  PROP_NAME = 1,
+  LAST_PROP
+};
+
+static GParamSpec props[LAST_PROP];
+
+G_DEFINE_TYPE (ConstraintViewChild, constraint_view_child, G_TYPE_OBJECT)
+
+static void
+constraint_view_child_init (ConstraintViewChild *child)
+{
+}
+
+static void
+constraint_view_child_finalize (GObject *object)
+{
+  ConstraintViewChild *child = CONSTRAINT_VIEW_CHILD (object);
+
+  g_free (child->name);
+
+  G_OBJECT_CLASS (constraint_view_child_parent_class)->finalize (object);
+}
+
+static void
+constraint_view_child_set_property (GObject *object,
+                                    
+static void
+constraint_view_child_class_init (ConstraintViewChildClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->finalize = constraint_view_child_finalize;
+  object_class->get_property = constraint_view_child_get_property;
+  object_class->set_property = constraint_view_child_set_property;
+
+  props[PROP_NAME] =
+    g_param_spec_string ("name", "name", "name",
+                         NULL,
+                         G_PARAM_READWRITE);
+
+  g_object_class_install_properties (object_class, LAST_PROP, props);
+}
+
+#define CONSTRAINT_VIEW_CHILD_TYPE (constraint_view_get_type ())
+
+G_DECLARE_TYPE (ConstraintViewChild, constraint_view_child, CONSTRAINT, VIEW_CHILD, GObject)
+
+#define CONSTRAINT_VIEW_WIDGET_TYPE (constraint_view_widget_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintViewWidget, constraint_view_widget, CONSTRAINT, VIEW_WIDGET, ConstraintViewChild)
+
+ConstraintViewWidget * constraint_view_widget_new (void);
+
+#define CONSTRAINT_VIEW_GUIDE_TYPE (constraint_view_guide_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintViewGuide, constraint_view_guide, CONSTRAINT, VIEW_GUIDE, ConstraintViewChild)
+
+ConstraintViewGuide * constraint_view_guide_new (void);
+
+#define CONSTRAINT_VIEW_CONSTRAINT_TYPE (constraint_view_constraint_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintViewConstraint, constraint_view_constraint, CONSTRAINT, VIEW_CONSTRAINT, ConstraintViewChild)
+
+ConstraintViewGuide * constraint_view_constraint_new (void);
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#define CONSTRAINT_VIEW_CHILD_TYPE (constraint_view_get_type ())
+
+G_DECLARE_TYPE (ConstraintViewChild, constraint_view_child, CONSTRAINT, VIEW_CHILD, GObject)
+
+#define CONSTRAINT_VIEW_WIDGET_TYPE (constraint_view_widget_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintViewWidget, constraint_view_widget, CONSTRAINT, VIEW_WIDGET, ConstraintViewChild)
+
+ConstraintViewWidget * constraint_view_widget_new (void);
+
+#define CONSTRAINT_VIEW_GUIDE_TYPE (constraint_view_guide_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintViewGuide, constraint_view_guide, CONSTRAINT, VIEW_GUIDE, ConstraintViewChild)
+
+ConstraintViewGuide * constraint_view_guide_new (void);
+
+#define CONSTRAINT_VIEW_CONSTRAINT_TYPE (constraint_view_constraint_get_type ())
+
+G_DECLARE_FINAL_TYPE (ConstraintViewConstraint, constraint_view_constraint, CONSTRAINT, VIEW_CONSTRAINT, ConstraintViewChild)
+
+ConstraintViewGuide * constraint_view_constraint_new (void);
@@ -0,0 +1,345 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtk/gtk.h>
+#include "constraint-view.h"
+
+struct _ConstraintView
+{
+  GtkWidget parent;
+
+  GListModel *model;
+
+  GtkWidget *drag_widget;
+};
+
+G_DEFINE_TYPE (ConstraintView, constraint_view, GTK_TYPE_WIDGET);
+
+static void
+constraint_view_dispose (GObject *object)
+{
+  ConstraintView *view = CONSTRAINT_VIEW (object);
+  GtkWidget *child;
+
+  while ((child = gtk_widget_get_first_child (GTK_WIDGET (view))) != NULL)
+    gtk_widget_unparent (child);
+
+  g_clear_object (&view->model);
+
+  G_OBJECT_CLASS (constraint_view_parent_class)->dispose (object);
+}
+
+static void
+constraint_view_class_init (ConstraintViewClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose = constraint_view_dispose;
+
+  gtk_widget_class_set_css_name (widget_class, "constraintview");
+}
+
+static void
+update_weak_position (ConstraintView *self,
+                      GtkWidget      *child,
+                      double          x,
+                      double          y)
+{
+  GtkLayoutManager *manager;
+  GtkConstraint *constraint;
+
+  manager = gtk_widget_get_layout_manager (GTK_WIDGET (self));
+  constraint = (GtkConstraint *)g_object_get_data (G_OBJECT (child), "x-constraint");
+  if (constraint)
+    {
+      gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
+                                               constraint);
+      g_object_set_data (G_OBJECT (child), "x-constraint", NULL);
+    }
+  if (x != -100)
+    {
+      constraint = gtk_constraint_new_constant (child,
+                                                GTK_CONSTRAINT_ATTRIBUTE_CENTER_X,
+                                                GTK_CONSTRAINT_RELATION_EQ,
+                                                x,
+                                                GTK_CONSTRAINT_STRENGTH_WEAK);
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
+      gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
+                                            constraint);
+      g_object_set_data (G_OBJECT (child), "x-constraint", constraint);
+    }
+
+  constraint = (GtkConstraint *)g_object_get_data (G_OBJECT (child), "y-constraint");
+  if (constraint)
+    {
+      gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
+                                                   constraint);
+      g_object_set_data (G_OBJECT (child), "y-constraint", NULL);
+    }
+  if (y != -100)
+    {
+      constraint = gtk_constraint_new_constant (child,
+                                                GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y,
+                                                GTK_CONSTRAINT_RELATION_EQ,
+                                                y,
+                                                GTK_CONSTRAINT_STRENGTH_WEAK);
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
+      gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
+                                            constraint);
+      g_object_set_data (G_OBJECT (child), "y-constraint", constraint);
+    }
+}
+
+static void
+drag_begin (GtkGestureDrag *drag,
+            double          start_x,
+            double          start_y,
+            ConstraintView *self)
+{
+  GtkWidget *widget;
+
+  widget = gtk_widget_pick (GTK_WIDGET (self), start_x, start_y, GTK_PICK_DEFAULT);
+
+  if (GTK_IS_LABEL (widget))
+    {
+      widget = gtk_widget_get_ancestor (widget, GTK_TYPE_FRAME);
+      if (widget &&
+          gtk_widget_get_parent (widget) == (GtkWidget *)self)
+        {
+          self->drag_widget = widget;
+        }
+    }
+}
+
+static void
+drag_update (GtkGestureDrag *drag,
+             double          offset_x,
+             double          offset_y,
+             ConstraintView *self)
+{
+  double x, y;
+
+  if (!self->drag_widget)
+    return;
+
+  gtk_gesture_drag_get_start_point (drag, &x, &y);
+  update_weak_position (self, self->drag_widget, x + offset_x, y + offset_y);
+}
+
+static void
+drag_end (GtkGestureDrag *drag,
+          double          offset_x,
+          double          offset_y,
+          ConstraintView *self)
+{
+  self->drag_widget = NULL;
+}
+
+static gboolean
+omit_internal (gpointer item, gpointer user_data)
+{
+  if (g_object_get_data (G_OBJECT (item), "internal"))
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+constraint_view_init (ConstraintView *self)
+{
+  GtkLayoutManager *manager;
+  GtkEventController *controller;
+  GListStore *list;
+  GListModel *all_children;
+  GListModel *all_constraints;
+  GListModel *guides;
+  GListModel *children;
+  GListModel *constraints;
+  GtkFilter *filter;
+
+  manager = gtk_constraint_layout_new ();
+  gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);
+
+  guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
+
+  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
+  filter = GTK_FILTER (gtk_custom_filter_new (omit_internal, NULL, NULL));
+  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
+
+  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
+  filter = GTK_FILTER (gtk_custom_filter_new (omit_internal, NULL, NULL));
+  children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
+
+  list = g_list_store_new (G_TYPE_LIST_MODEL);
+  g_list_store_append (list, children);
+  g_list_store_append (list, guides);
+  g_list_store_append (list, constraints);
+  g_object_unref (children);
+  g_object_unref (guides);
+  g_object_unref (constraints);
+
+  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));
+
+  controller = (GtkEventController *)gtk_gesture_drag_new ();
+  g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);
+  g_signal_connect (controller, "drag-update", G_CALLBACK (drag_update), self);
+  g_signal_connect (controller, "drag-end", G_CALLBACK (drag_end), self);
+  gtk_widget_add_controller (GTK_WIDGET (self), controller);
+}
+
+ConstraintView *
+constraint_view_new (void)
+{
+  return g_object_new (CONSTRAINT_VIEW_TYPE, NULL);
+}
+
+void
+constraint_view_add_child (ConstraintView *view,
+                           const char     *name)
+{
+  GtkWidget *frame;
+  GtkWidget *label;
+
+  label = gtk_label_new (name);
+  frame = gtk_frame_new (NULL);
+  gtk_widget_add_css_class (frame, "child");
+  gtk_widget_set_name (frame, name);
+  gtk_frame_set_child (GTK_FRAME (frame), label);
+  gtk_widget_set_parent (frame, GTK_WIDGET (view));
+
+  update_weak_position (view, frame, 100, 100);
+}
+
+void
+constraint_view_remove_child (ConstraintView *view,
+                              GtkWidget      *child)
+{
+  update_weak_position (view, child, -100, -100);
+  gtk_widget_unparent (child);
+}
+
+void
+constraint_view_add_guide (ConstraintView *view,
+                           GtkConstraintGuide *guide)
+{
+  GtkConstraintLayout *layout;
+  GtkWidget *frame;
+  GtkWidget *label;
+  const char *name;
+  GtkConstraint *constraint;
+  struct {
+    const char *name;
+    GtkConstraintAttribute attr;
+  } names[] = {
+    { "left-constraint", GTK_CONSTRAINT_ATTRIBUTE_LEFT },
+    { "top-constraint", GTK_CONSTRAINT_ATTRIBUTE_TOP },
+    { "width-constraint", GTK_CONSTRAINT_ATTRIBUTE_WIDTH },
+    { "height-constraint", GTK_CONSTRAINT_ATTRIBUTE_HEIGHT },
+  };
+  int i;
+
+  name = gtk_constraint_guide_get_name (guide);
+  label = gtk_label_new (name);
+  g_object_bind_property (guide, "name",
+                          label, "label",
+                          G_BINDING_DEFAULT);
+
+  frame = gtk_frame_new (NULL);
+  gtk_widget_add_css_class (frame, "guide");
+  g_object_set_data (G_OBJECT (frame), "internal", (char *)"yes");
+  gtk_frame_set_child (GTK_FRAME (frame), label);
+  gtk_widget_insert_after (frame, GTK_WIDGET (view), NULL);
+
+  g_object_set_data (G_OBJECT (guide), "frame", frame);
+
+  layout = GTK_CONSTRAINT_LAYOUT (gtk_widget_get_layout_manager (GTK_WIDGET (view)));
+  gtk_constraint_layout_add_guide (layout, g_object_ref (guide));
+
+  for (i = 0; i < G_N_ELEMENTS (names); i++)
+    {
+      constraint = gtk_constraint_new (frame,
+                                       names[i].attr,
+                                       GTK_CONSTRAINT_RELATION_EQ,
+                                       guide,
+                                       names[i].attr,
+                                       1.0, 0.0,
+                                       GTK_CONSTRAINT_STRENGTH_REQUIRED);
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
+      gtk_constraint_layout_add_constraint (layout, constraint);
+      g_object_set_data (G_OBJECT (guide), names[i].name, constraint);
+    }
+
+  update_weak_position (view, frame, 150, 150);
+}
+
+void
+constraint_view_remove_guide (ConstraintView     *view,
+                              GtkConstraintGuide *guide)
+{
+  GtkConstraintLayout *layout;
+  GtkWidget *frame;
+  GtkConstraint *constraint;
+  const char *names[] = {
+    "left-constraint",
+    "top-constraint",
+    "width-constraint",
+    "height-constraint"
+  };
+  int i;
+
+  layout = GTK_CONSTRAINT_LAYOUT (gtk_widget_get_layout_manager (GTK_WIDGET (view)));
+
+  for (i = 0; i < G_N_ELEMENTS (names); i++)
+    {
+      constraint = (GtkConstraint*)g_object_get_data (G_OBJECT (guide), names[i]);
+      gtk_constraint_layout_remove_constraint (layout, constraint);
+    }
+
+  frame = (GtkWidget *)g_object_get_data (G_OBJECT (guide), "frame");
+  update_weak_position (view, frame, -100, -100);
+  gtk_widget_unparent (frame);
+
+  gtk_constraint_layout_remove_guide (layout, guide);
+}
+
+void
+constraint_view_add_constraint (ConstraintView *view,
+                                GtkConstraint  *constraint)
+{
+  GtkLayoutManager *manager;
+
+  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
+  gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
+                                        g_object_ref (constraint));
+}
+
+void
+constraint_view_remove_constraint (ConstraintView *view,
+                                   GtkConstraint  *constraint)
+{
+  GtkLayoutManager *manager;
+
+  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
+  gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
+                                           constraint);
+}
+
+GListModel *
+constraint_view_get_model (ConstraintView *view)
+{
+  return view->model;
+}
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#define CONSTRAINT_VIEW_TYPE (constraint_view_get_type ())
+
+G_MODULE_EXPORT
+G_DECLARE_FINAL_TYPE (ConstraintView, constraint_view, CONSTRAINT, VIEW, GtkWidget)
+
+ConstraintView * constraint_view_new (void);
+
+void             constraint_view_add_child (ConstraintView *view,
+                                            const char     *name);
+void             constraint_view_remove_child (ConstraintView *view,
+                                               GtkWidget      *child);
+void             constraint_view_add_guide (ConstraintView     *view,
+                                            GtkConstraintGuide *guide);
+void             constraint_view_remove_guide (ConstraintView     *view,
+                                               GtkConstraintGuide *guide);
+void             constraint_view_guide_changed (ConstraintView     *view,
+                                                GtkConstraintGuide *guide);
+void             constraint_view_add_constraint (ConstraintView *view,
+                                                 GtkConstraint  *constraint);
+void             constraint_view_remove_constraint (ConstraintView *view,
+                                                    GtkConstraint  *constraint);
+GListModel *     constraint_view_get_model (ConstraintView *view);
@@ -0,0 +1,355 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen
+ */
+
+#include "config.h"
+
+#include "guide-editor.h"
+
+struct _GuideEditor
+{
+  GtkWidget parent_instance;
+
+  GtkWidget *grid;
+  GtkWidget *name;
+  GtkWidget *min_width;
+  GtkWidget *min_height;
+  GtkWidget *nat_width;
+  GtkWidget *nat_height;
+  GtkWidget *max_width;
+  GtkWidget *max_height;
+  GtkWidget *strength;
+  GtkWidget *button;
+
+  GtkConstraintGuide *guide;
+
+  gboolean constructed;
+};
+
+enum {
+  PROP_GUIDE = 1,
+  LAST_PROP
+};
+
+static GParamSpec *pspecs[LAST_PROP];
+
+enum {
+  DONE,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+G_DEFINE_TYPE(GuideEditor, guide_editor, GTK_TYPE_WIDGET);
+
+static GtkConstraintStrength
+get_strength (unsigned int id)
+{
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
+    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
+    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
+    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
+    default: g_assert_not_reached ();
+    }
+}
+
+static unsigned int
+get_strength_id (GtkConstraintStrength strength)
+{
+  switch (strength)
+    {
+    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
+    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
+    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
+    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
+    default: g_assert_not_reached ();
+    }
+}
+
+static const char *
+get_strength_nick (GtkConstraintStrength strength)
+{
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
+  GEnumValue *value = g_enum_get_value (class, strength);
+  const char *nick = value->value_nick;
+  g_type_class_unref (class);
+
+  return nick;
+}
+
+void
+guide_editor_serialize_guide (GString *str,
+                              int      indent,
+                              GtkConstraintGuide *guide)
+{
+  int min_width, min_height;
+  int nat_width, nat_height;
+  int max_width, max_height;
+  const char *name;
+  const char *strength;
+
+  gtk_constraint_guide_get_min_size (guide, &min_width, &min_height);
+  gtk_constraint_guide_get_nat_size (guide, &nat_width, &nat_height);
+  gtk_constraint_guide_get_max_size (guide, &max_width, &max_height);
+  name = gtk_constraint_guide_get_name (guide);
+  strength = get_strength_nick (gtk_constraint_guide_get_strength (guide));
+
+  g_string_append_printf (str, "%*s<guide min-width=\"%d\" min-height=\"%d\"\n", indent, "", min_width, min_height);
+  g_string_append_printf (str, "%*s       nat-width=\"%d\" nat-height=\"%d\"\n", indent, "", nat_width, nat_height);
+  g_string_append_printf (str, "%*s       max-width=\"%d\" max-height=\"%d\"\n", indent, "", max_width, max_height);
+  g_string_append_printf (str, "%*s       name=\"%s\" strength=\"%s\" />\n", indent, "", name, strength);
+}
+
+static void
+create_guide (GtkButton   *button,
+              GuideEditor *editor)
+{
+  int strength;
+  const char *name;
+  int w, h;
+  GtkConstraintGuide *guide;
+  unsigned int id;
+
+  if (editor->guide)
+    guide = g_object_ref (editor->guide);
+  else
+    guide = gtk_constraint_guide_new ();
+
+  name = gtk_editable_get_text (GTK_EDITABLE (editor->name));
+  gtk_constraint_guide_set_name (guide, name);
+
+  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->min_width));
+  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->min_height));
+  gtk_constraint_guide_set_min_size (guide, w, h);
+
+  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->nat_width));
+  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->nat_height));
+  gtk_constraint_guide_set_nat_size (guide, w, h);
+
+  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_width));
+  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_height));
+  gtk_constraint_guide_set_max_size (guide, w, h);
+
+  id = gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength));
+  strength = get_strength (id);
+  gtk_constraint_guide_set_strength (guide, strength);
+
+  g_signal_emit (editor, signals[DONE], 0, guide);
+  g_object_unref (guide);
+}
+
+static void
+guide_editor_init (GuideEditor *editor)
+{
+  gtk_widget_init_template (GTK_WIDGET (editor));
+}
+
+static int guide_counter;
+
+static int
+min_input (GtkSpinButton *spin_button,
+           double        *new_val)
+{
+  if (strcmp (gtk_editable_get_text (GTK_EDITABLE (spin_button)), "") == 0)
+    {
+      *new_val = 0.0;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static int
+max_input (GtkSpinButton *spin_button,
+           double        *new_val)
+{
+  if (strcmp (gtk_editable_get_text (GTK_EDITABLE (spin_button)), "") == 0)
+    {
+      *new_val = G_MAXINT;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+guide_editor_constructed (GObject *object)
+{
+  GuideEditor *editor = GUIDE_EDITOR (object);
+
+  g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
+  g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
+
+  if (editor->guide)
+    {
+      GtkConstraintStrength strength;
+      const char *nick;
+      int w, h;
+
+      nick = gtk_constraint_guide_get_name (editor->guide);
+      if (nick)
+        gtk_editable_set_text (GTK_EDITABLE (editor->name), nick);
+
+      gtk_constraint_guide_get_min_size (editor->guide, &w, &h);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_width), w);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_height), h);
+
+      gtk_constraint_guide_get_nat_size (editor->guide, &w, &h);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_width), w);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_height), h);
+
+      gtk_constraint_guide_get_max_size (editor->guide, &w, &h);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), w);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), h);
+
+      strength = gtk_constraint_guide_get_strength (editor->guide);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+
+      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
+    }
+  else
+    {
+      char *name;
+
+      guide_counter++;
+      name = g_strdup_printf ("Guide %d", guide_counter);
+      gtk_editable_set_text (GTK_EDITABLE (editor->name), name);
+      g_free (name);
+
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_width), 0.0);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_height), 0.0);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_width), 0.0);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_height), 0.0);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), G_MAXINT);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), G_MAXINT);
+
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_MEDIUM));
+
+      gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
+    }
+
+  editor->constructed = TRUE;
+}
+
+static void
+guide_editor_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GuideEditor *self = GUIDE_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GUIDE:
+      self->guide = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+guide_editor_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  GuideEditor *self = GUIDE_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GUIDE:
+      g_value_set_object (value, self->guide);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+guide_editor_dispose (GObject *object)
+{
+  GuideEditor *self = (GuideEditor *)object;
+
+  g_clear_object (&self->guide);
+
+  gtk_widget_dispose_template (GTK_WIDGET (self), GUIDE_EDITOR_TYPE);
+
+  G_OBJECT_CLASS (guide_editor_parent_class)->dispose (object);
+}
+
+static void
+guide_editor_class_init (GuideEditorClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->constructed = guide_editor_constructed;
+  object_class->dispose = guide_editor_dispose;
+  object_class->set_property = guide_editor_set_property;
+  object_class->get_property = guide_editor_get_property;
+
+  pspecs[PROP_GUIDE] =
+    g_param_spec_object ("guide", "guide", "guide",
+                         GTK_TYPE_CONSTRAINT_GUIDE,
+                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
+
+  g_object_class_install_properties (object_class, LAST_PROP, pspecs);
+
+  signals[DONE] =
+    g_signal_new ("done",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE, 1, GTK_TYPE_CONSTRAINT_GUIDE);
+
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
+
+  gtk_widget_class_set_template_from_resource (widget_class,
+                                               "/org/gtk/gtk4/constraint-editor/guide-editor.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, grid);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, name);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, min_width);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, min_height);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, nat_width);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, nat_height);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, max_width);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, max_height);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, strength);
+  gtk_widget_class_bind_template_child (widget_class, GuideEditor, button);
+
+  gtk_widget_class_bind_template_callback (widget_class, create_guide);
+}
+
+GuideEditor *
+guide_editor_new (GtkConstraintGuide *guide)
+{
+  return g_object_new (GUIDE_EDITOR_TYPE,
+                       "guide", guide,
+                       NULL);
+}
@@ -1,6 +1,5 @@
-/* gskglrendererprivate.h
- *
- * Copyright 2021 Christian Hergert <chergert@redhat.com>
+/*
+ * Copyright © 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
@@ -13,26 +12,21 @@
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
- * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Authors: Matthias Clasen
 */

 #pragma once

-#include "gskglrenderer.h"
+#include <gtk/gtk.h>

-#include "gskglshader.h"
+#define GUIDE_EDITOR_TYPE (guide_editor_get_type ())

-G_BEGIN_DECLS
+G_DECLARE_FINAL_TYPE (GuideEditor, guide_editor, GUIDE, EDITOR, GtkWidget)

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-gboolean gsk_gl_renderer_try_compile_gl_shader (GskGLRenderer  *renderer,
-                                                GskGLShader    *shader,
-                                                GError        **error);
-
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-G_END_DECLS
+GuideEditor * guide_editor_new (GtkConstraintGuide  *guide);

+void guide_editor_serialize_guide (GString            *str,
+                                   int                 indent,
+                                   GtkConstraintGuide *guide);
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkAdjustment" id="min_width_adj">
+    <property name="lower">0</property>
+    <property name="upper">2147483647</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+    <property name="page-size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="min_height_adj">
+    <property name="lower">0</property>
+    <property name="upper">2147483647</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+    <property name="page-size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="nat_width_adj">
+    <property name="lower">0</property>
+    <property name="upper">2147483647</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+    <property name="page-size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="nat_height_adj">
+    <property name="lower">0</property>
+    <property name="upper">2147483647</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+    <property name="page-size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="max_width_adj">
+    <property name="lower">0</property>
+    <property name="upper">2147483647</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+    <property name="page-size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="max_height_adj">
+    <property name="lower">0</property>
+    <property name="upper">2147483647</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+    <property name="page-size">0</property>
+  </object>
+  <template class="GuideEditor" parent="GtkWidget">
+    <child>
+      <object class="GtkGrid" id="grid">
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
+        <property name="row-spacing">10</property>
+        <property name="column-spacing">10</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Name</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">0</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkEntry" id="name">
+            <property name="max-width-chars">20</property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">0</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Min Size</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="min_width">
+            <property name="adjustment">min_width_adj</property>
+            <property name="max-width-chars">5</property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="min_height">
+            <property name="adjustment">min_height_adj</property>
+            <property name="max-width-chars">5</property>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Nat Size</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="nat_width">
+            <property name="adjustment">nat_width_adj</property>
+            <property name="max-width-chars">5</property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="nat_height">
+            <property name="adjustment">nat_height_adj</property>
+            <property name="max-width-chars">5</property>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Max Size</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="max_width">
+            <property name="adjustment">max_width_adj</property>
+            <property name="max-width-chars">5</property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="max_height">
+            <property name="adjustment">max_height_adj</property>
+            <property name="max-width-chars">5</property>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Strength</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">4</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkDropDown" id="strength">
+            <property name="model">
+              <object class="GtkStringList">
+                <items>
+                  <item>Weak</item>
+                  <item>Medium</item>
+                  <item>Strong</item>
+                  <item>Required</item>
+                </items>
+              </object>
+            </property>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">4</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="button">
+            <property name="label">Create</property>
+            <signal name="clicked" handler="create_guide"/>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">5</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 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.1 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen <mclasen@redhat.com>
+ */
+
+#include "config.h"
+
+#include <constraint-editor-application.h>
+
+int
+main (int argc, char *argv[])
+{
+  return g_application_run (G_APPLICATION (constraint_editor_application_new ()), argc, argv);
+}
@@ -0,0 +1,23 @@
+constraint_editor_sources = [
+  'main.c',
+  'constraint-editor-application.c',
+  'constraint-editor-window.c',
+  'constraint-view.c',
+  'constraint-editor.c',
+  'guide-editor.c',
+]
+
+constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
+  'constraint-editor.gresource.xml',
+  source_dir: meson.current_source_dir(),
+)
+
+executable('gtk4-constraint-editor',
+  sources: [ constraint_editor_sources, constraint_editor_resources, ],
+  c_args: common_cflags,
+  dependencies: libgtk_dep,
+  include_directories: confinc,
+  win_subsystem: 'windows',
+  link_args: extra_demo_ldflags,
+  install: false,
+)
@@ -579,8 +579,6 @@ released_cb (GtkGesture *gesture,

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
  child = gtk_widget_pick (widget, x, y, 0);
-  if (!child)
-    return;
  item = (CanvasItem *)gtk_widget_get_ancestor (child, canvas_item_get_type ());
  if (!item)
    return;
@@ -12,13 +12,11 @@

 static GtkWidget *window = NULL;

-static gboolean
-close_request_cb (GtkWidget *win, gpointer user_data)
+static void
+response_cb (GtkDialog *dialog, int response_id)
 {
-  g_assert (window == win);
-  gtk_window_destroy ((GtkWindow *)window);
+  gtk_window_destroy (GTK_WINDOW (window));
  window = NULL;
-  return TRUE;
 }

 static void
@@ -119,7 +117,7 @@ do_expander (GtkWidget *do_widget)
      g_signal_connect (expander, "notify::expanded",
                        G_CALLBACK (expander_cb), window);

-      g_signal_connect (window, "close-request", G_CALLBACK (close_request_cb), NULL);
+      g_signal_connect (window, "response", G_CALLBACK (response_cb), NULL);
  }

  if (!gtk_widget_get_visible (window))
@@ -811,7 +811,7 @@ tag_pair_equal (gconstpointer a, gconstpointer b)
 }


-static int
+static GtkOrdering
 script_sort (const void *item1,
             const void *item2,
             void       *data)
@@ -1869,4 +1869,4 @@ do_font_features (GtkWidget *do_widget)
  return window;
 }

-/* vim:set foldmethod=marker: */
+/* vim:set foldmethod=marker expandtab: */
@@ -101,7 +101,7 @@ setup_centered_label (GtkSignalListItemFactory *factory,
                      GObject                  *listitem)
 {
  GtkWidget *label;
-  label = gtk_inscription_new ("");
+  label = gtk_label_new ("");
  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
 }

@@ -110,8 +110,8 @@ setup_label (GtkSignalListItemFactory *factory,
             GObject                  *listitem)
 {
  GtkWidget *label;
-  label = gtk_inscription_new ("");
-  gtk_inscription_set_xalign (GTK_INSCRIPTION (label), 0);
+  label = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (label), 0);
  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
 }

@@ -120,10 +120,10 @@ setup_ellipsizing_label (GtkSignalListItemFactory *factory,
                         GObject                  *listitem)
 {
  GtkWidget *label;
-  label = gtk_inscription_new ("");
-  gtk_inscription_set_xalign (GTK_INSCRIPTION (label), 0);
-  gtk_inscription_set_text_overflow (GTK_INSCRIPTION (label), GTK_INSCRIPTION_OVERFLOW_ELLIPSIZE_END);
-  gtk_inscription_set_nat_chars (GTK_INSCRIPTION (label), 20);
+  label = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (label), 0);
+  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gtk_label_set_width_chars (GTK_LABEL (label), 20);
  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
 }

@@ -141,7 +141,7 @@ bind_codepoint (GtkSignalListItemFactory *factory,
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

  g_snprintf (buffer, 10, "%#06x", codepoint);
-  gtk_inscription_set_text (GTK_INSCRIPTION (label), buffer);
+  gtk_label_set_label (GTK_LABEL (label), buffer);
 }

 static void
@@ -160,7 +160,7 @@ bind_char (GtkSignalListItemFactory *factory,
  if (g_unichar_isprint (codepoint))
    g_unichar_to_utf8 (codepoint, buffer);

-  gtk_inscription_set_text (GTK_INSCRIPTION (label), buffer);
+  gtk_label_set_label (GTK_LABEL (label), buffer);
 }

 static void
@@ -175,7 +175,7 @@ bind_name (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  name = ucd_item_get_name (UCD_ITEM (item));

-  gtk_inscription_set_text (GTK_INSCRIPTION (label), name);
+  gtk_label_set_label (GTK_LABEL (label), name);
 }

 static void
@@ -190,7 +190,7 @@ bind_type (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

-  gtk_inscription_set_text (GTK_INSCRIPTION (label), get_unicode_type_name (g_unichar_type (codepoint)));
+  gtk_label_set_label (GTK_LABEL (label), get_unicode_type_name (g_unichar_type (codepoint)));
 }

 static void
@@ -205,7 +205,7 @@ bind_break_type (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

-  gtk_inscription_set_text (GTK_INSCRIPTION (label), get_break_type_name (g_unichar_break_type (codepoint)));
+  gtk_label_set_label (GTK_LABEL (label), get_break_type_name (g_unichar_break_type (codepoint)));
 }

 static void
@@ -220,7 +220,7 @@ bind_combining_class (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

-  gtk_inscription_set_text (GTK_INSCRIPTION (label), get_combining_class_name (g_unichar_combining_class (codepoint)));
+  gtk_label_set_label (GTK_LABEL (label), get_combining_class_name (g_unichar_combining_class (codepoint)));
 }

 static void
@@ -237,7 +237,7 @@ bind_script (GtkSignalListItemFactory *factory,
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
  script = g_unichar_get_script (codepoint);

-  gtk_inscription_set_text (GTK_INSCRIPTION (label), get_script_name (script));
+  gtk_label_set_label (GTK_LABEL (label), get_script_name (script));
 }

 static void
@@ -255,7 +255,7 @@ selection_changed (GObject    *object,
  if (g_unichar_isprint (codepoint))
    g_unichar_to_utf8 (codepoint, buffer);

-  gtk_inscription_set_text (GTK_INSCRIPTION (label), buffer);
+  gtk_label_set_label (GTK_LABEL (label), buffer);
 }

 GtkWidget *
@@ -165,6 +165,10 @@ activate_about (GSimpleAction *action,
                gpointer       user_data)
 {
  GtkApplication *app = user_data;
+  const char *authors[] = {
+    "The GTK Team",
+    NULL
+  };
  char *version;
  char *os_name;
  char *os_version;
@@ -202,11 +206,11 @@ activate_about (GSimpleAction *action,
                                         ? "GTK Demo (Development)"
                                         : "GTK Demo",
                         "version", version,
-                         "copyright", "© 1997—2024 The GTK Team",
+                         "copyright", "© 1997—2021 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK widgets",
-                         "authors", (const char *[]) { "The GTK Team", NULL },
+                         "authors", authors,
                         "logo-icon-name", "org.gtk.Demo4",
                         "title", "About GTK Demo",
                         "system-information", s->str,
@@ -1056,6 +1060,8 @@ command_line (GApplication            *app,

  window = gtk_application_get_windows (GTK_APPLICATION (app))->data;

+  gtk_window_set_icon_name (GTK_WINDOW (window), "org.gtk.Demo4");
+
  if (name == NULL)
    goto out;

@@ -1144,8 +1150,6 @@ main (int argc, char **argv)
  };
  int i;

-  gtk_init ();
-
  app = gtk_application_new ("org.gtk.Demo4", G_APPLICATION_NON_UNIQUE|G_APPLICATION_HANDLES_COMMAND_LINE);

  g_action_map_add_action_entries (G_ACTION_MAP (app),
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="https://specifications.freedesktop.org/metainfo/1.0" type="desktop">
+<component type="desktop">
  <id>org.gtk.Demo4</id>
  <launchable type="desktop-id">org.gtk.Demo4.desktop</launchable>
  <metadata_license>CC0-1.0</metadata_license>
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="org.gtk.IconBrowser4-symbolic.svg"
+   height="16.03125"
+   id="svg7384"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   version="1.1"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="-2.5662459"
+     inkscape:cy="11.558672"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#555753"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="true"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="1375"
+     inkscape:window-maximized="1"
+     inkscape:window-width="2560"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="1">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="-203"
+       originy="-251.96875"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       id="linearGradient7212"
+       osb:paint="solid">
+      <stop
+         id="stop7214"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="apps"
+     style="display:inline"
+     transform="translate(-444.0002,35)">
+    <path
+       style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+       d="m 457.9846,-27.96875 v -3 h 1 l -3,-3 -3,3 h 1 v 3 z"
+       id="path2809"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+       d="m 451.9846,-23.96875 v 2 h 1 l 2,2 v -6 l -2,2 z"
+       id="path2811"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+       d="m 455.9846,-24.96875 v 4 c 0,0 1,-1 1,-2 0,-1.31515 -1,-2 -1,-2 z"
+       id="path2813"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+       d="m 457.9846,-25.96875 v 6 c 0,0 1,-1.94591 1,-3 0,-1.05409 -1,-3 -1,-3 z"
+       id="path2815"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;enable-background:new"
+       d="m 450.53751,-25.96846 c 0.24647,0 0.44708,0.19694 0.44708,0.44708 v 0.0289 c -0.008,3.05189 -2.48438,5.5237 -5.53812,5.5237 h -0.0148 c -0.25145,0 -0.44711,-0.20581 -0.44711,-0.4615 v -0.46152 -0.92302 c 0,-0.25567 0.20581,-0.4615 0.4615,-0.4615 h 0.92302 c 0.25569,0 0.46152,0.20581 0.46152,0.4615 v 0.21634 c 1.18002,-0.41715 2.10674,-1.34386 2.52389,-2.52388 h -0.21635 c -0.25566,0 -0.4615,-0.20581 -0.4615,-0.46152 v -0.92302 c 0,-0.25567 0.20581,-0.4615 0.4615,-0.4615 h 0.46152 0.4615 0.44709 0.0148 0.0148 z"
+       id="rect5922-7-3" />
+    <g
+       id="g904-6"
+       transform="matrix(0.26785369,0,0,0.26785369,436.44908,-87.00581)"
+       style="display:inline;fill:#000000;fill-opacity:1;stroke-width:3.73338151;enable-background:new">
+      <path
+         sodipodi:nodetypes="csscccssssccccccsccsssssccccccsssss"
+         inkscape:connector-curvature="0"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.46676302;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 37,198.00759 c -2.76142,0 -5,2.23858 -5,5 0,2.76142 2.23858,5 5,5 0.89216,0 1.71236,-0.27804 2.4375,-0.6875 l 3.9375,3.6875 -3.9375,3.6875 c -0.72514,-0.40946 -1.54534,-0.6875 -2.4375,-0.6875 -2.76142,0 -5,2.23858 -5,5 0,2.76142 2.23858,5 5,5 2.76142,0 5,-2.23858 5,-5 0,-0.45832 -0.072,-0.89082 -0.1874,-1.3125 l 4.25,-4.125 8.9374,8.4375 h 3 v -2 l -16.1875,-15.6875 c 0.1156,-0.42168 0.1874,-0.85418 0.1874,-1.3125 0,-2.76142 -2.23858,-5 -5,-5 z m 0,3 c 1.10456,0 2,0.89544 2,2 0,1.10456 -0.89544,2 -2,2 -1.10456,0 -2,-0.89544 -2,-2 0,-1.10456 0.89544,-2 2,-2 z m 18,-1 -7.875,7.4375 2.625,2.5625 8.25,-8 v -2 z m -18,17 c 1.10456,0 2,0.89544 2,2 0,1.10456 -0.89544,2 -2,2 -1.10456,0 -2,-0.89544 -2,-2 0,-1.10456 0.89544,-2 2,-2 z"
+         id="path1079-7" />
+    </g>
+  </g>
+</svg>
@@ -0,0 +1,517 @@
+[volume]
+Name=Volume
+Description=Icons related to audio input and output volume
+
+audio-volume-high=The icon used to indicate high audio volume
+audio-volume-low=The icon used to indicate low audio volume
+audio-volume-medium=The icon used to indicate medium audio volume
+audio-volume-muted=The icon used to indicate the muted state for audio playback
+microphone-sensitivity-high=The icon used to indicate high microphone sensitivity
+microphone-sensitivity-low=The icon used to indicate low microphone sensitivity
+microphone-sensitivity-medium=The icon used to indicate medium microphone sensitivity
+microphone-sensitivity-muted=The icon used to indicate that a microphone is muted
+
+[multimedia]
+Name=Multimedia
+Description=Icons related to playback of media
+
+media-playlist-repeat=The icon for the repeat mode of a media player
+media-playlist-repeat-song=The icon for repeating a song in a media player
+media-playlist-shuffle=The icon for the shuffle mode of a media player
+media-playlist-consecutive=The icon for consecutive mode of a media player
+media-skip-backward=The icon for the skip backward action of a media player
+media-seek-backward=The icon for the seek backward action of a media player
+media-playback-start=The icon for the start playback action of a media player
+media-seek-forward=The icon for the seek forward action of a media player
+media-skip-forward=The icon for the skip forward action of a media player
+media-playback-stop=The icon for the stop action of a media player
+media-playback-pause=The icon for the pause action of a media player
+media-eject=The icon for the eject action of a media player or file manager
+media-record=The icon for the record action of a media application
+media-view-subtitles=The icon used to show subtitles in a media player
+
+[network]
+Name=Network
+Description=Icons related to network status
+
+network-transmit-receive=The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network
+network-transmit=The icon used when data is being transmitted, while the computing device is connected to a network
+network-receive=The icon used when data is being received, while the computing device is connected to a network
+network-idle=The icon used when no data is being transmitted or received, while the computing device is connected to a network
+network-error=The icon used when an error occurs trying to initialize the network connection of the computing device
+network-offline=The icon used when the computing device is disconnected from the network
+
+[weather]
+Name=Weather
+Description=Icons about weather conditions
+
+weather-clear=The icon used while the weather for a region is “clear skies”
+weather-clear-night=The icon used while the weather for a region is “clear skies” during the night
+weather-few-clouds=The icon used while the weather for a region is “partly cloudy”
+weather-few-clouds-night=The icon used while the weather for a region is “partly cloudy” during the night
+weather-fog=The icon used while the weather for a region is “foggy”
+weather-overcast=The icon used while the weather for a region is “overcast”
+weather-severe-alert=The icon used while a sever weather alert is in effect for a region
+weather-showers=The icon used while rain showers are occurring in a region
+weather-showers-scattered=The icon used while scattered rain showers are occurring in a region
+weather-snow=The icon used while snow showers are occurring in a region
+weather-storm=The icon used while storms are occurring in a region
+weather-windy=The icon used while the weather is windy
+
+[navigation]
+Name=Navigation
+Description=Icons for navigation in the user interface of a program
+
+go-first=The icon for the go to the first item in a list
+go-previous=The icon for the go to the previous item in a list
+go-next=The icon for the go to the next item in a list
+go-last=The icon for the go to the last item in a list
+go-bottom=The icon for the go to bottom of a list
+go-down=The icon for the go down in a list
+go-up=The icon for the go up in a list
+go-top=The icon for the go to the top of a list
+go-home=The icon for the go to home location
+go-jump=The icon for the jump to action
+
+[editing]
+Name=Editing
+Description=Icons related to editing a document
+format-indent-less=The icon for the decrease indent formatting action
+format-indent-more=The icon for the increase indent formatting action
+format-justify-center=The icon for the center justification formatting action
+format-justify-fill=The icon for the fill justification formatting action
+format-justify-left=The icon for the left justification formatting action
+format-justify-right=The icon for the right justification action
+format-text-direction-ltr=The icon for the left-to-right text formatting action
+format-text-direction-rtl=The icon for the right-to-left formatting action
+format-text-bold=The icon for the bold text formatting action
+format-text-italic=The icon for the italic text formatting action
+format-text-underline=The icon for the underlined text formatting action
+format-text-strikethrough=The icon for the strikethrough text formatting action
+edit-clear=The icon for the clear action
+edit-clear-all=
+edit-copy=The icon for the copy action
+edit-cut=The icon for the cut action
+edit-delete=The icon for the delete action
+edit-find-replace=The icon for the find and replace action
+edit-paste=The icon for the paste action
+edit-redo=The icon for the redo action
+edit-select-all=The icon for the select all action
+edit-select=
+edit-undo=The icon for the undo action
+error-correct=
+document-properties=The icon for the action to view the properties of a document in an application
+document-new=The icon used for the action to create a new document
+document-open=The icon used for the action to open a document
+document-open-recent=The icon used for the action to open a document that was recently opened
+document-save=The icon for the save action. Should be an arrow pointing down and toward a hard disk
+document-save-as=The icon for the save as action
+document-send=The icon for the send action. Should be an arrow pointing up and away from a hard disk
+document-page-setup=The icon for the page setup action of a document editor
+document-edit=The icon for the action to edit a document
+object-flip-horizontal=The icon for the action to flip an object horizontally
+object-flip-vertical=The icon for the action to flip an object vertically
+object-rotate-left=The icon for the rotate left action performed on an object
+object-rotate-right=The icon for the rotate right action performed on an object
+insert-image=The icon for the insert image action of an application
+insert-link=The icon for the insert link action of an application
+insert-object=The icon for the insert object action of an application
+insert-text=The icon for the insert text action of an application
+accessories-text-editor=The icon used for the desktop's text editing accessory program
+
+[view]
+Name=View Controls
+Description=Icons for view controls in a user interface
+
+view-list=The icon used for “List“ view mode
+view-grid=The icon used for “Grid“ view mode (as opposed to “List“)
+view-fullscreen=The icon used for the “Fullscreen” item in the application's “View” menu
+view-restore=The icon used by an application for leaving the fullscreen view, and returning to a normal windowed view
+zoom-fit-best=The icon used for the “Best Fit” item in the application's “View” menu
+zoom-in=The icon used for the “Zoom in” item in the application's “View” menu
+zoom-out=The icon used for the “Zoom Out” item in the application's “View” menu
+zoom-original=The icon used for the “Original Size” item in the application's “View” menu
+view-continuous=The icon used for a continuous view mode
+view-paged=The icon used for a paged view mode (as opposed to continuous)
+view-dual=The icon used for a side-by-side view of paginated content
+view-wrapped=The icon used to indicate a wrap-around to the beginning
+view-pin=The icon used for 'pin a view'
+
+[calendar]
+Name=Calendar, Tasks and Alarms
+Description=Icons related to calendars, tasks and alarms
+
+task-due=The icon used when a task is due soon
+task-past-due=The icon used when a task that was due, has been left incomplete
+appointment-soon=The icon used when an appointment will occur soon
+appointment-missed=The icon used when an appointment was missed
+alarm=The icon used for alarms when a task or appointment is due
+
+[communication]
+Name=Communication
+Description=Icons related email, phone calls, IM and other forms of communication
+
+mail-unread=The icon used for an electronic mail that is unread
+mail-read=The icon used for an electronic mail that is read
+mail-replied=The icon used for an electronic mail that has been replied to
+mail-attachment=The icon used for an electronic mail that contains attachments
+mail-mark-important=The icon for the mark as important action of an electronic mail application
+mail-send=The icon for the send action of an electronic mail application
+mail-send-receive=The icon for the send and receive action of an electronic mail application
+call-start=The icon used for initiating or accepting a call
+call-stop=The icon used for stopping a current call
+call-missed=The icon used to show a missed call
+user-available=The icon used when a user on a chat network is available to initiate a conversation with
+user-offline=The icon used when a user on a chat network is not available
+user-idle=The icon used when a user on a chat network has not been an active participant in any chats on the network, for an extended period of time
+user-invisible=The icon used when a user is on a chat network, but is invisible to others
+user-busy=The icon used when a user is on a chat network, and has marked himself as busy
+user-away=The icon used when a user on a chat network is away from their keyboard and the chat program
+user-status-pending=The icon used when the current user status on a chat network is not known
+
+[devices]
+Name=Devices and Media
+Description=Icons for devices and media
+
+audio-input-microphone=The icon used for the microphone audio input device
+camera-web=The fallback icon for web cameras
+camera-photo=The icon used for a digital still camera devices
+input-keyboard=The icon used for the keyboard input device
+printer=The icon used for a printer device
+video-display=The icon used for the monitor that video gets displayed to
+computer=The icon used for the computing device as a whole
+media-optical=The icon used for physical optical media such as CD and DVD
+phone=The icon used for phone devices which support connectivity to the PC, such as VoIP, cellular, or possibly landline phones
+input-dialpad=The icon used for dialpad input devices
+input-touchpad=The icon used for touchpad input devices
+scanner=The icon used for a scanner device
+audio-card=The icon used for the audio rendering device
+input-gaming=The icon used for the gaming input device
+input-mouse=The icon used for the mousing input device
+multimedia-player=The icon used for generic multimedia playing devices
+audio-headphones=The icon used for headphones
+audio-headset=The icon used for headsets
+display-projector=The icon used for projectors
+media-removable=The icon used for generic removable media
+printer-network=The icon used for printers which are connected via the network
+audio-speakers=The icon used for speakers
+camera-video=The fallback icon for video cameras
+drive-optical=The icon used for optical media drives such as CD and DVD
+drive-removable-media=The icon used for removable media drives
+input-tablet=The icon used for graphics tablet input devices
+network-wireless=The icon used for wireless network connections
+network-wired=The icon used for wired network connections
+media-floppy=The icon used for physical floppy disk media
+media-flash=The fallback icon used for flash media, such as memory stick and SD
+
+[contenttypes]
+Name=Content Types
+Description=Icons for different types of data, such as audio or image files
+
+application-certificate=
+application-rss+xml=
+application-x-appliance=
+audio-x-generic=The icon used for generic audio file types
+folder=The standard folder icon used to represent directories on local filesystems, mail folders, and other hierarchical groups
+text-x-generic=The icon used for generic text file types
+video-x-generic=The icon used for generic video file types
+x-office-calendar=The icon used for generic calendar file types
+
+[emotes]
+Name=Emotes
+Description=Icons for emotions that are expressed through text chat applications such as :-) or :-P in IRC or instant messengers
+
+face-angel=The icon used for the 0:-) emote
+face-angry=The icon used for the X-( emote
+face-cool=The icon used for the B-) emote
+face-crying=The icon used for the :'( emote
+face-devilish=The icon used for the >:-) emote
+face-embarrassed=The icon used for the :-[ emote
+face-kiss=The icon used for the :-* emote
+face-laugh=The icon used for the :-)) emote
+face-monkey=The icon used for the :-(|) emote
+face-plain=The icon used for the :-| emote
+face-raspberry=The icon used for the :-P emote
+face-sad=The icon used for the :-( emote
+face-shutmouth=The 'shut mouth' emote
+face-sick=The icon used for the :-& emote
+face-smile=The icon used for the :-) emote
+face-smile-big=The icon used for the :-D emote
+face-smirk=The icon used for the :-! emote
+face-surprise=The icon used for the :-0 emote
+face-tired=The icon used for the |-) emote
+face-uncertain=The icon used for the :-/ emote
+face-wink=The icon used for the ;-) emote
+face-worried=The icon used for the :-S emote
+face-yawn=
+
+[general]
+Name=General
+Description=Generally useful icons that don't fit in a particular category
+
+edit-find=The icon for generic search actions
+content-loading=The icon used to indicate that content is loading
+open-menu=The icon used for a menu button in the header bar
+view-more=The icon used for a  “View More“ action
+tab-new=The icon used for a “New Tab“ action
+bookmark-new=The icon used for creating a new bookmark
+mark-location=The icon used to mark a location on a map
+find-location=The icon used for a  “Search location“ action
+send-to=The icon used for a  “Send to“ action
+object-select=The icon used for generic selection actions
+window-close=The icon used for actions that close a view, such as window or tab close button
+view-refresh=The icon used for the “Refresh” item in the application's “View” menu
+process-stop=The icon used for the “Stop” action in applications with actions that may take a while to process, such as web page loading in a browser
+action-unavailable=The icon used to indicate that an action is currently unavailable, such as “Pause“ when no media is playing
+document-print=The icon for the print action of an application
+printer-printing=The icon used while a print job is successfully being spooled to a printing device
+printer-warning=The icon used when a recoverable problem occurs while attempting to printing
+printer-error=The icon used when an error occurs while attempting to print
+dialog-information=The icon used when a dialog is opened to give information to the user that may be pertinent to the requested action
+dialog-question=The icon used when a dialog is opened to ask a simple question of the user
+dialog-warning=The icon used when a dialog is opened to warn the user of impending issues with the requested action
+dialog-password=The icon used when a dialog requesting the authentication credentials for a user is opened
+dialog-error=The icon used when a dialog is opened to explain an error condition to the user
+list-add=The icon for the add to list action
+list-remove=The icon for the remove from list action
+non-starred=The icon used to indicate that an object is not 'starred'
+semi-starred=The icon used to indicate that an object has is 'half-starred'
+starred=The icon used to indicate that an object is 'starred'
+star-new=The used for the “New Star“ action
+security-low=The icon used to indicate that the security level of a connection is presumed to be insecure, either by using weak encryption, or by using a certificate that the could not be automatically verified, and which the user has not chosent to trust
+security-medium=The icon used to indicate that the security level of a connection is presumed to be secure, using strong encryption, and a certificate that could not be automatically verified, but which the user has chosen to trust
+security-high=The icon used to indicate that the security level of a connection is known to be secure, using strong encryption and a valid certificate
+user-trash=The icon for the user's “Trash” place in the file system
+user-trash-full=The icon for the user's “Trash” in the file system, when there are items in the “Trash” waiting for disposal or recovery
+emblem-system=The icon used as an emblem for directories that contain system libraries, settings, and data
+avatar-default=The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar
+emblem-synchronizing=The icon used as an emblem to indicate that a synchronizing operation is in process
+emblem-shared=The icon used as an emblem for files and directories that are shared to other users
+help-browser=The icon used for the desktop's help browsing application
+
+[other]
+Name=Other
+Description=Icons which have may be too specialized and not of general interest
+
+changes-allow=
+changes-prevent=
+view-sort-ascending=The icon used for the “Sort Ascending” item in the application's “View” menu, or in a button for changing the sort method for a list
+view-sort-descending=The icon used for the “Sort Descending” item in the application's “View” menu, or in a button for changing the sort method for a list
+document-revert=The icon for the action of reverting to a previous version of a document
+address-book-new=The icon used for the action to create a new address book
+application-exit=The icon used for exiting an application. Typically this is seen in the application's menus as File->Quit
+appointment-new=The icon used for the action to create a new appointment in a calendaring application
+contact-new=The icon used for the action to create a new contact in an address book application
+document-print-preview=The icon for the print preview action of an application
+folder-new=The icon for creating a new folder
+help-about=The icon for the About item in the Help menu
+help-contents=The icon for Contents item in the Help menu
+help-faq=The icon for the FAQ item in the Help menu
+list-remove-all=
+mail-forward=The icon for the forward action of an electronic mail application
+mail-mark-junk=The icon for the mark as junk action of an electronic mail application
+mail-mark-notjunk=The icon for the mark as not junk action of an electronic mail application
+mail-mark-read=The icon for the mark as read action of an electronic mail application
+mail-mark-unread=The icon for the mark as unread action of an electronic mail application
+mail-message-new=The icon for the compose new mail action of an electronic mail application
+mail-reply-all=The icon for the reply to all action of an electronic mail application
+mail-reply-sender=The icon for the reply to sender action of an electronic mail application
+pan-down=
+pan-end=
+pan-start=
+pan-up=
+system-lock-screen=The icon used for the “Lock Screen” item in the desktop's panel application
+system-log-out=The icon used for the “Log Out” item in the desktop's panel application
+system-run=The icon used for the “Run Application...” item in the desktop's panel application
+system-search=The icon used for the “Search” item in the desktop's panel application
+system-reboot=The icon used for the “Reboot” item in the desktop's panel application
+system-shutdown=The icon used for the “Shutdown” item in the desktop's panel application
+tools-check-spelling=The icon used for the “Check Spelling” item in the application's “Tools” menu
+window-maximize=
+window-minimize=
+window-restore=
+window-new=The icon used for the “New Window” item in the application's “Windows” menu
+accessories-calculator=The icon used for the desktop's calculator accessory program
+accessories-character-map=The icon used for the desktop's international and extended text character accessory program
+accessories-dictionary=The icon used for the desktop's dictionary accessory program
+multimedia-volume-control=The icon used for the desktop's hardware volume control application
+preferences-desktop-accessibility=The icon used for the desktop's accessibility preferences
+preferences-desktop-display=
+preferences-desktop-font=The icon used for the desktop's font preferences
+preferences-desktop-keyboard=The icon used for the desktop's keyboard preferences
+preferences-desktop-keyboard-shortcuts=
+preferences-desktop-locale=The icon used for the desktop's locale preferences
+preferences-desktop-remote-desktop=
+preferences-desktop-multimedia=The icon used for the desktop's multimedia preferences
+preferences-desktop-screensaver=The icon used for the desktop's screen saving preferences
+preferences-desktop-theme=The icon used for the desktop's theme preferences
+preferences-desktop-wallpaper=The icon used for the desktop's wallpaper preferences
+preferences-system-privacy=
+preferences-system-windows=
+system-file-manager=The icon used for the desktop's file management application
+system-software-install=The icon used for the desktop's software installer application
+system-software-update=The icon used for the desktop's software updating application
+system-users=
+user-info=
+utilities-system-monitor=The icon used for the desktop's system resource monitor application
+utilities-terminal=The icon used for the desktop's terminal emulation application.
+application-x-addon=
+application-x-executable=The icon used for executable file types
+font-x-generic=The icon used for generic font file types
+image-x-generic=The icon used for generic image file types
+package-x-generic=The icon used for generic package file types
+text-html=The icon used for HTML text file types
+text-x-generic-template=The icon used for generic text templates
+text-x-preview=
+text-x-script=The icon used for script file types, such as shell scripts
+x-office-address-book=The icon used for generic address book file types
+x-office-document=The icon used for generic document and letter file types
+x-office-document-template=
+x-office-presentation=The icon used for generic presentation file types
+x-office-presentation-template=
+x-office-spreadsheet=The icon used for generic spreadsheet file types
+x-office-spreadsheet-template=
+x-package-repository=
+applications-accessories=The icon for the “Accessories” sub-menu of the Programs menu
+applications-development=The icon for the “Programming” sub-menu of the Programs menu
+applications-engineering=The icon for the “Engineering” sub-menu of the Programs menu
+applications-games=The icon for the “Games” sub-menu of the Programs menu
+applications-graphics=The icon for the “Graphics” sub-menu of the Programs menu
+applications-internet=The icon for the “Internet” sub-menu of the Programs menu
+applications-multimedia=The icon for the “Multimedia” sub-menu of the Programs menu
+applications-office=The icon for the “Office” sub-menu of the Programs menu
+applications-other=The icon for the “Other” sub-menu of the Programs menu
+applications-science=The icon for the “Science” sub-menu of the Programs menu
+applications-system=The icon for the “System Tools” sub-menu of the Programs menu
+applications-utilities=The icon for the “Utilities” sub-menu of the Programs menu
+preferences-desktop=The icon for the “Desktop Preferences” category
+preferences-desktop-peripherals=The icon for the “Peripherals” sub-category of the “Desktop Preferences” category
+preferences-desktop-personal=The icon for the “Personal” sub-category of the “Desktop Preferences” category
+preferences-other=The icon for the “Other” preferences category
+preferences-system=The icon for the “System Preferences” category
+preferences-system-network=The icon for the “Network” sub-category of the “System Preferences” category
+system-help=The icon for the “Help” system category
+battery=The icon used for the system battery device
+computer-apple-ipad=
+colorimeter-colorhug=
+drive-harddisk=The icon used for hard disk drives
+drive-harddisk-ieee1394=
+drive-harddisk-system=
+drive-multidisk=
+media-optical-bd=
+media-optical-cd-audio=
+media-optical-dvd=
+media-tape=The icon used for generic physical tape media
+media-zip=
+modem=The icon used for modem devices
+multimedia-player-apple-ipod-touch=
+network-vpn=
+pda=This is the fallback icon for Personal Digital Assistant devices. Primary use of this icon is for PDA devices connected to the PC. Connection medium is not an important aspect of the icon. The metaphor for this fallback icon should be a generic PDA device icon
+phone-apple-iphone=
+uninterruptible-power-supply=
+emblem-default=The icon used as an emblem to specify the default selection of a printer for example
+emblem-documents=The icon used as an emblem for the directory where a user's documents are stored
+emblem-downloads=The icon used as an emblem for the directory where a user's downloads from the internet are stored
+emblem-favorite=The icon used as an emblem for files and directories that the user marks as favorites
+emblem-generic=
+emblem-important=The icon used as an emblem for files and directories that are marked as important by the user
+emblem-mail=The icon used as an emblem to specify the directory where the user's electronic mail is stored
+emblem-new=
+emblem-ok=
+emblem-package=
+emblem-photos=The icon used as an emblem to specify the directory where the user stores photographs
+emblem-readonly=The icon used as an emblem for files and directories which can not be written to by the user
+emblem-symbolic-link=The icon used as an emblem for files and direcotires that are links to other files or directories on the filesystem
+emblem-synchronized=The icon used as an emblem for files or directories that are configured to be synchronized to another device
+emblem-unreadable=The icon used as an emblem for files and directories that are inaccessible.
+emblem-urgent=
+emblem-videos=
+emblem-web=
+folder-documents=
+folder-download=The icon representing the location in the file system where downloaded files are stored
+folder-music=
+folder-pictures=
+folder-publicshare=
+folder-remote=The icon used for normal directories on a remote filesystem
+folder-saved-search=
+folder-templates=
+folder-videos=
+network-server=The icon used for individual host machines under the “Network Servers” place in the file manager
+network-workgroup=The icon for the “Network Servers” place in the desktop's file manager, and workgroups within the network
+start-here=The icon used by the desktop's main menu for accessing places, applications, and other features
+user-bookmarks=The icon for the user's special “Bookmarks” place
+user-desktop=The icon for the special “Desktop” directory of the user
+user-home=The icon for the special “Home” directory of the user
+airplane-mode=
+battery-caution-charging=
+battery-caution=The icon used when the battery is below 40%
+battery-empty-charging=
+battery-empty=
+battery-full-charged=
+battery-full-charging=
+battery-full=
+battery-good-charging=
+battery-good=
+battery-low-charging=
+battery-low=The icon used when the battery is below 20%
+battery-missing=
+bluetooth-active=
+bluetooth-disabled=
+channel-insecure=
+channel-secure=
+computer-fail=
+display-brightness=
+keyboard-brightness=
+folder-drag-accept=The icon used for a folder while an object is being dragged onto it, that is of a type that the directory can contain
+folder-open=The icon used for folders, while their contents are being displayed within the same window. This icon would normally be shown in a tree or list view, next to the main view of a folder's contents
+folder-visiting=The icon used for folders, while their contents are being displayed in another window. This icon would typically be used when using multiple windows to navigate the hierarchy, such as in Nautilus's spatial mode
+image-loading=The icon used when another image is being loaded, such as thumnails for larger images in the file manager
+image-missing=The icon used when another image could not be loaded
+mail-signed=The icon used for an electronic mail that contains a signature
+mail-signed-verified=The icon used for an electronic mail that contains a signature which has also been verified by the security system
+network-cellular-3g=
+network-cellular-4g=
+network-cellular-edge=
+network-cellular-gprs=
+network-cellular-umts=
+network-cellular-acquiring=
+network-cellular-connected=
+network-cellular-no-route=
+network-cellular-offline=
+network-cellular-signal-excellent=
+network-cellular-signal-good=
+network-cellular-signal-ok=
+network-cellular-signal-weak=
+network-cellular-signal-none=
+network-vpn-acquiring=
+network-vpn=
+network-wired-acquiring=
+network-wired-disconnected=
+network-wired-no-route=
+network-wired-offline=
+network-wireless-acquiring=
+network-wireless-connected=
+network-wireless-encrypted=
+network-wireless-hotspot=
+network-wireless-no-route=
+network-wireless-offline=
+network-wireless-signal-excellent=
+network-wireless-signal-good=
+network-wireless-signal-ok=
+network-wireless-signal-weak=
+network-wireless-signal-none=
+rotation-allowed=
+rotation-locked=
+software-update-available=The icon used when an update is available for software installed on the computing device, through the system software update program
+software-update-urgent=The icon used when an urgent update is available through the system software update program
+sync-error=The icon used when an error occurs while attempting to synchronize data from the computing device, to another device
+sync-synchronizing=The icon used while data is successfully synchronizing to another device
+touchpad-disabled=
+trophy-bronze=
+trophy-silver=
+trophy-gold=
+night-light=
+daytime-sunrise=
+daytime-sunset=
+on=
+off=
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gtk/iconbrowser/gtk">
+    <file preprocess="xml-stripblanks">window.ui</file>
+    <file>icon.list</file>
+  </gresource>
+</gresources>
@@ -0,0 +1,160 @@
+#include "config.h"
+#include <gtk/gtk.h>
+
+#include "iconbrowserapp.h"
+#include "iconbrowserwin.h"
+
+#include "profile_conf.h"
+
+struct _IconBrowserApp
+{
+  GtkApplication parent;
+};
+
+struct _IconBrowserAppClass
+{
+  GtkApplicationClass parent_class;
+};
+
+G_DEFINE_TYPE(IconBrowserApp, icon_browser_app, GTK_TYPE_APPLICATION);
+
+static void
+icon_browser_app_init (IconBrowserApp *app)
+{
+}
+
+static void
+quit_activated (GSimpleAction *action,
+                GVariant      *parameter,
+                gpointer       app)
+{
+  g_application_quit (G_APPLICATION (app));
+}
+
+static void
+inspector_activated (GSimpleAction *action,
+                     GVariant      *parameter,
+                     gpointer       app)
+{
+  gtk_window_set_interactive_debugging (TRUE);
+}
+
+static void
+about_activated (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GtkApplication *app = user_data;
+  const char *authors[] = {
+    "The GTK Team",
+    NULL
+  };
+  char *icon_theme;
+  char *version;
+  GString *s;
+  char *os_name;
+  char *os_version;
+
+  g_object_get (gtk_settings_get_default (),
+                "gtk-icon-theme-name", &icon_theme,
+                NULL);
+
+  s = g_string_new ("");
+
+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  if (os_name && os_version)
+    g_string_append_printf (s, "OS\t%s %s\n\n", os_name, os_version);
+  g_string_append (s, "System libraries\n");
+  g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
+                          glib_major_version,
+                          glib_minor_version,
+                          glib_micro_version);
+  g_string_append_printf (s, "\tPango\t%s\n",
+                          pango_version_string ());
+  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+                          gtk_get_major_version (),
+                          gtk_get_minor_version (),
+                          gtk_get_micro_version ());
+  g_string_append_printf (s, "\nIcon theme\n\t%s", icon_theme);
+  version = g_strdup_printf ("%s%s%s\nRunning against GTK %d.%d.%d",
+                             PACKAGE_VERSION,
+                             g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
+                             g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "",
+                             gtk_get_major_version (),
+                             gtk_get_minor_version (),
+                             gtk_get_micro_version ());
+
+  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
+                         "program-name", g_strcmp0 (PROFILE, "devel") == 0
+                                         ? "GTK Icon Browser (Development)"
+                                         : "GTK Icon Browser",
+                         "version", version,
+                         "copyright", "© 1997—2021 The GTK Team",
+                         "license-type", GTK_LICENSE_LGPL_2_1,
+                         "website", "http://www.gtk.org",
+                         "comments", "Program to browse themed icons",
+                         "authors", authors,
+                         "logo-icon-name", "org.gtk.IconBrowser4",
+                         "title", "About GTK Icon Browser",
+                         "system-information", s->str,
+                         NULL);
+
+  g_string_free (s, TRUE);
+  g_free (version);
+  g_free (icon_theme);
+  g_free (os_name);
+  g_free (os_version);
+}
+
+static GActionEntry app_entries[] =
+{
+  { "quit", quit_activated, NULL, NULL, NULL },
+  { "inspector", inspector_activated, NULL, NULL, NULL },
+  { "about", about_activated, NULL, NULL, NULL }
+};
+
+static void
+icon_browser_app_startup (GApplication *app)
+{
+  const char *quit_accels[2] = { "<Ctrl>Q", NULL };
+
+  G_APPLICATION_CLASS (icon_browser_app_parent_class)->startup (app);
+
+  g_action_map_add_action_entries (G_ACTION_MAP (app),
+                                   app_entries, G_N_ELEMENTS (app_entries),
+                                   app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
+}
+
+static void
+icon_browser_app_activate (GApplication *app)
+{
+  IconBrowserWindow *win;
+
+  win = icon_browser_window_new (ICON_BROWSER_APP (app));
+
+  if (g_strcmp0 (PROFILE, "devel") == 0)
+    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");
+
+  gtk_window_set_icon_name (GTK_WINDOW (win), "org.gtk.IconBrowser4");
+
+  gtk_window_present (GTK_WINDOW (win));
+}
+
+static void
+icon_browser_app_class_init (IconBrowserAppClass *class)
+{
+  G_APPLICATION_CLASS (class)->startup = icon_browser_app_startup;
+  G_APPLICATION_CLASS (class)->activate = icon_browser_app_activate;
+}
+
+IconBrowserApp *
+icon_browser_app_new (void)
+{
+  return g_object_new (ICON_BROWSER_APP_TYPE,
+                       "application-id", "org.gtk.IconBrowser4",
+                       NULL);
+}
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <gtk/gtk.h>
+
+
+#define ICON_BROWSER_APP_TYPE (icon_browser_app_get_type ())
+#define ICON_BROWSER_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_BROWSER_APP_TYPE, IconBrowserApp))
+
+
+typedef struct _IconBrowserApp       IconBrowserApp;
+typedef struct _IconBrowserAppClass  IconBrowserAppClass;
+
+
+GType           icon_browser_app_get_type    (void);
+IconBrowserApp *icon_browser_app_new         (void);
@@ -0,0 +1,156 @@
+#include "iconbrowsercontext.h"
+
+struct _IbContext
+{
+  GObject parent_instance;
+
+  char *id;
+  char *name;
+  char *description;
+};
+
+struct _IbContextClass
+{
+  GObjectClass parent_class;
+};
+
+enum {
+  PROP_ID = 1,
+  PROP_NAME,
+  PROP_DESCRIPTION,
+  PROP_NUM_PROPERTIES
+};
+
+G_DEFINE_TYPE (IbContext, ib_context, G_TYPE_OBJECT)
+
+static void
+ib_context_init (IbContext *context)
+{
+}
+
+static void
+ib_context_finalize (GObject *object)
+{
+  IbContext *context = IB_CONTEXT (object);
+
+  g_free (context->id);
+  g_free (context->name);
+  g_free (context->description);
+
+  G_OBJECT_CLASS (ib_context_parent_class)->finalize (object);
+}
+
+static void
+ib_context_set_property (GObject      *object,
+                         guint         property_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  IbContext *context = IB_CONTEXT (object);
+
+  switch (property_id)
+    {
+    case PROP_ID:
+      g_free (context->id);
+      context->id = g_value_dup_string (value);
+      break;
+
+    case PROP_NAME:
+      g_free (context->name);
+      context->name = g_value_dup_string (value);
+      break;
+
+    case PROP_DESCRIPTION:
+      g_free (context->description);
+      context->description = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+ib_context_get_property (GObject    *object,
+                      guint       property_id,
+                      GValue     *value,
+                      GParamSpec *pspec)
+{
+  IbContext *context = IB_CONTEXT (object);
+
+  switch (property_id)
+    {
+    case PROP_ID:
+      g_value_set_string (value, context->id);
+      break;
+
+    case PROP_NAME:
+      g_value_set_string (value, context->name);
+      break;
+
+    case PROP_DESCRIPTION:
+      g_value_set_string (value, context->description);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+ib_context_class_init (IbContextClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GParamSpec *pspec;
+
+  object_class->finalize = ib_context_finalize;
+  object_class->set_property = ib_context_set_property;
+  object_class->get_property = ib_context_get_property;
+
+  pspec = g_param_spec_string ("id", "Id", "Id",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_ID, pspec);
+
+  pspec = g_param_spec_string ("name", "Name", "Name",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_NAME, pspec);
+
+  pspec = g_param_spec_string ("description", "Description", "Description",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_DESCRIPTION, pspec);
+}
+
+IbContext *
+ib_context_new (const char *id,
+                const char *name,
+                const char *description)
+{
+  return g_object_new (IB_TYPE_CONTEXT,
+                       "id", id,
+                       "name", name,
+                       "description", description,
+                       NULL);
+}
+
+const char *
+ib_context_get_id (IbContext *context)
+{
+  return context->id;
+}
+
+const char *
+ib_context_get_name (IbContext *context)
+{
+  return context->name;
+}
+
+const char *
+ib_context_get_description (IbContext *context)
+{
+  return context->description;
+}
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <gtk.h>
+
+#define IB_TYPE_CONTEXT (ib_context_get_type ())
+G_DECLARE_FINAL_TYPE (IbContext, ib_context, IB, CONTEXT, GObject)
+
+IbContext   *ib_context_new             (const char     *id,
+                                         const char     *name,
+                                         const char     *description);
+
+const char *ib_context_get_id           (IbContext      *context);
+const char *ib_context_get_name         (IbContext      *context);
+const char *ib_context_get_description  (IbContext      *context);
@@ -0,0 +1,228 @@
+#include "iconbrowsericon.h"
+
+struct _IbIcon
+{
+  GObject parent_instance;
+
+  gboolean use_symbolic;
+
+  char *regular_name;
+  char *symbolic_name;
+  char *description;
+  char *context;
+};
+
+struct _IbIconClass
+{
+  GObjectClass parent_class;
+};
+
+enum {
+  PROP_NAME = 1,
+  PROP_REGULAR_NAME,
+  PROP_SYMBOLIC_NAME,
+  PROP_USE_SYMBOLIC,
+  PROP_DESCRIPTION,
+  PROP_CONTEXT,
+  PROP_NUM_PROPERTIES
+};
+
+G_DEFINE_TYPE (IbIcon, ib_icon, G_TYPE_OBJECT)
+
+static void
+ib_icon_init (IbIcon *icon)
+{
+}
+
+static void
+ib_icon_finalize (GObject *object)
+{
+  IbIcon *icon = IB_ICON (object);
+
+  g_free (icon->regular_name);
+  g_free (icon->symbolic_name);
+  g_free (icon->description);
+  g_free (icon->context);
+
+  G_OBJECT_CLASS (ib_icon_parent_class)->finalize (object);
+}
+
+static void
+ib_icon_set_property (GObject      *object,
+                      guint         property_id,
+                      const GValue *value,
+                      GParamSpec   *pspec)
+{
+  IbIcon *icon = IB_ICON (object);
+
+  switch (property_id)
+    {
+    case PROP_REGULAR_NAME:
+      g_free (icon->regular_name);
+      icon->regular_name = g_value_dup_string (value);
+      if (!icon->use_symbolic)
+        g_object_notify (object, "name");
+      break;
+
+    case PROP_SYMBOLIC_NAME:
+      g_free (icon->symbolic_name);
+      icon->symbolic_name = g_value_dup_string (value);
+      if (icon->use_symbolic)
+        g_object_notify (object, "name");
+      break;
+
+    case PROP_USE_SYMBOLIC:
+      icon->use_symbolic = g_value_get_boolean (value);
+      g_object_notify (object, "name");
+      break;
+
+    case PROP_DESCRIPTION:
+      g_free (icon->description);
+      icon->description = g_value_dup_string (value);
+      break;
+
+    case PROP_CONTEXT:
+      g_free (icon->context);
+      icon->context = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+ib_icon_get_property (GObject    *object,
+                      guint       property_id,
+                      GValue     *value,
+                      GParamSpec *pspec)
+{
+  IbIcon *icon = IB_ICON (object);
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      g_value_set_string (value, ib_icon_get_name (icon));
+      break;
+
+    case PROP_REGULAR_NAME:
+      g_value_set_string (value, icon->regular_name);
+      break;
+
+    case PROP_SYMBOLIC_NAME:
+      g_value_set_string (value, icon->symbolic_name);
+      break;
+
+    case PROP_USE_SYMBOLIC:
+      g_value_set_boolean (value, icon->use_symbolic);
+      break;
+
+    case PROP_DESCRIPTION:
+      g_value_set_string (value, icon->description);
+      break;
+
+    case PROP_CONTEXT:
+      g_value_set_string (value, icon->context);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+ib_icon_class_init (IbIconClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GParamSpec *pspec;
+
+  object_class->finalize = ib_icon_finalize;
+  object_class->set_property = ib_icon_set_property;
+  object_class->get_property = ib_icon_get_property;
+
+  pspec = g_param_spec_string ("name", "Name", "Name",
+                               NULL,
+                               G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_NAME, pspec);
+
+  pspec = g_param_spec_string ("regular-name", "Regular Name", "Regular Name",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_REGULAR_NAME, pspec);
+
+  pspec = g_param_spec_string ("symbolic-name", "Symbolic Name", "Symbolic Name",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_SYMBOLIC_NAME, pspec);
+
+  pspec = g_param_spec_boolean ("use-symbolic", "Use Symbolic", "Use Symbolic",
+                                FALSE,
+                                G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_USE_SYMBOLIC, pspec);
+
+  pspec = g_param_spec_string ("description", "Description", "Description",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_DESCRIPTION, pspec);
+
+  pspec = g_param_spec_string ("context", "Context", "Context",
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_CONTEXT, pspec);
+}
+
+IbIcon *
+ib_icon_new (const char *regular_name,
+             const char *symbolic_name,
+             const char *description,
+             const char *context)
+{
+  return g_object_new (IB_TYPE_ICON,
+                       "regular-name", regular_name,
+                       "symbolic-name", symbolic_name,
+                       "description", description,
+                       "context", context,
+                       NULL);
+}
+
+const char *
+ib_icon_get_name (IbIcon *icon)
+{
+  if (icon->use_symbolic)
+    return icon->symbolic_name;
+  else
+    return icon->regular_name;
+}
+
+const char *
+ib_icon_get_regular_name (IbIcon *icon)
+{
+  return icon->regular_name;
+}
+
+const char *
+ib_icon_get_symbolic_name (IbIcon *icon)
+{
+  return icon->symbolic_name;
+}
+
+gboolean
+ib_icon_get_use_symbolic (IbIcon *icon)
+{
+  return icon->use_symbolic;
+}
+
+const char *
+ib_icon_get_description (IbIcon *icon)
+{
+  return icon->description;
+}
+
+const char *
+ib_icon_get_context (IbIcon *icon)
+{
+  return icon->context;
+}
+
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <gtk.h>
+
+#define IB_TYPE_ICON (ib_icon_get_type ())
+G_DECLARE_FINAL_TYPE (IbIcon, ib_icon, IB, ICON, GObject)
+
+IbIcon *ib_icon_new                     (const char     *regular_name,
+                                         const char     *symbolic_name,
+                                         const char     *description,
+                                         const char     *context);
+
+const char *ib_icon_get_name            (IbIcon         *icon);
+const char *ib_icon_get_regular_name    (IbIcon         *icon);
+const char *ib_icon_get_symbolic_name   (IbIcon         *icon);
+gboolean    ib_icon_get_use_symbolic    (IbIcon         *icon);
+const char *ib_icon_get_description     (IbIcon         *icon);
+const char *ib_icon_get_context         (IbIcon         *icon);
@@ -0,0 +1,460 @@
+#include <string.h>
+#include "iconbrowserapp.h"
+#include "iconbrowserwin.h"
+#include "iconbrowsericon.h"
+#include "iconbrowsercontext.h"
+#include <gtk/gtk.h>
+
+
+struct _IconBrowserWindow
+{
+  GtkApplicationWindow parent;
+
+  GtkWidget *symbolic_radio;
+  GtkWidget *searchbar;
+  GListModel *icon_filter_model;
+  GListStore *icon_store;
+  GListModel *context_model;
+  GListStore *context_store;
+  GtkFilter *name_filter;
+  GtkFilter *search_mode_filter;
+  GtkWidget *details;
+  GtkWidget *image1;
+  GtkWidget *image2;
+  GtkWidget *image3;
+  GtkWidget *image4;
+  GtkWidget *image5;
+  GtkWidget *image6;
+  GtkWidget *image7;
+  GtkWidget *image8;
+  GtkWidget *label8;
+  GtkWidget *description;
+};
+
+struct _IconBrowserWindowClass
+{
+  GtkApplicationWindowClass parent_class;
+};
+
+G_DEFINE_TYPE(IconBrowserWindow, icon_browser_window, GTK_TYPE_APPLICATION_WINDOW);
+
+static GtkIconTheme *
+icon_browser_window_get_icon_theme (IconBrowserWindow *win)
+{
+  return gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (win)));
+}
+
+static void
+add_icon (IconBrowserWindow *win,
+          const char        *name,
+          const char        *description,
+          const char        *context)
+{
+  GtkIconTheme *icon_theme = icon_browser_window_get_icon_theme (win);
+  char *regular_name;
+  char *symbolic_name;
+  IbIcon *icon;
+
+  regular_name = g_strdup (name);
+  if (!gtk_icon_theme_has_icon (icon_theme, regular_name))
+    {
+      g_free (regular_name);
+      regular_name = NULL;
+    }
+
+  symbolic_name = g_strconcat (name, "-symbolic", NULL);
+  if (!gtk_icon_theme_has_icon (icon_theme, symbolic_name))
+    {
+      g_free (symbolic_name);
+      symbolic_name = NULL;
+    }
+
+  icon = ib_icon_new (regular_name, symbolic_name, description, context);
+  g_object_bind_property (win->symbolic_radio, "active",
+                          icon, "use-symbolic",
+                          G_BINDING_DEFAULT);
+  g_list_store_append (win->icon_store, icon);
+  g_object_unref (icon);
+}
+
+static void
+add_context (IconBrowserWindow *win,
+             const char        *id,
+             const char        *name,
+             const char        *description)
+{
+  IbContext *context;
+
+  context = ib_context_new (id, name, description);
+  g_list_store_append (win->context_store, context);
+  g_object_unref (context);
+}
+
+static void
+populate (IconBrowserWindow *win)
+{
+  GFile *file;
+  GKeyFile *kf;
+  char *data;
+  gsize length;
+  char **groups;
+  int i;
+
+  file = g_file_new_for_uri ("resource:/org/gtk/iconbrowser/gtk/icon.list");
+  g_file_load_contents (file, NULL, &data, &length, NULL, NULL);
+
+  kf = g_key_file_new ();
+  g_key_file_load_from_data (kf, data, length, G_KEY_FILE_NONE, NULL);
+
+  groups = g_key_file_get_groups (kf, &length);
+  for (i = 0; i < length; i++)
+    {
+      const char *context;
+      const char *name;
+      const char *description;
+      char **keys;
+      gsize len;
+      int j;
+
+      context = groups[i];
+      name = g_key_file_get_string (kf, context, "Name", NULL);
+      description = g_key_file_get_string (kf, context, "Description", NULL);
+      add_context (win, context, name, description);
+
+      keys = g_key_file_get_keys (kf, context, &len, NULL);
+      for (j = 0; j < len; j++)
+        {
+          const char *key = keys[j];
+          const char *value;
+
+          if (strcmp (key, "Name") == 0 || strcmp (key, "Description") == 0)
+            continue;
+
+          value = g_key_file_get_string (kf, context, key, NULL);
+
+          add_icon (win, key, value, context);
+        }
+      g_strfreev (keys);
+    }
+  g_strfreev (groups);
+}
+
+static gboolean
+filter_by_icon_name (gpointer item,
+                     gpointer data)
+{
+  return ib_icon_get_name (IB_ICON (item)) != NULL;
+}
+
+static void
+symbolic_toggled (IconBrowserWindow *win)
+{
+  gtk_filter_changed (win->name_filter, GTK_FILTER_CHANGE_DIFFERENT);
+}
+
+static void
+copy_to_clipboard (GtkButton         *button,
+                   IconBrowserWindow *win)
+{
+  GdkClipboard *clipboard;
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (win));
+  gdk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)));
+}
+
+static void
+set_image (GtkWidget *image, const char *name, int size)
+{
+  gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), size);
+}
+
+static void
+item_activated (GtkGridView       *view,
+                guint              position,
+                IconBrowserWindow *win)
+{
+  GListModel *model = G_LIST_MODEL (gtk_grid_view_get_model (view));
+  IbIcon *icon = g_list_model_get_item (model, position);
+  const char *name;
+  const char *description;
+  gboolean symbolic;
+
+  name = ib_icon_get_name (icon);
+  description = ib_icon_get_description (icon);
+  symbolic = ib_icon_get_use_symbolic (icon);
+
+  gtk_window_set_title (GTK_WINDOW (win->details), name);
+  set_image (win->image1, name, 8);
+  set_image (win->image2, name, 16);
+  set_image (win->image3, name, 18);
+  set_image (win->image4, name, 24);
+  set_image (win->image5, name, 32);
+  set_image (win->image6, name, 48);
+  set_image (win->image7, name, 64);
+  gtk_widget_set_visible (win->image8, symbolic);
+  gtk_widget_set_visible (win->label8, symbolic);
+  if (symbolic)
+    set_image (win->image8, name, 64);
+  gtk_widget_set_visible (win->description, description && description[0]);
+  if (description && description[0])
+    gtk_label_set_text (GTK_LABEL (win->description), description);
+
+  gtk_window_present (GTK_WINDOW (win->details));
+
+  g_object_unref (icon);
+}
+
+static GdkPaintable *
+get_image_paintable (GtkImage *image)
+{
+  const char *icon_name;
+  GtkIconTheme *icon_theme;
+  GtkIconPaintable *icon;
+  int size;
+
+  switch (gtk_image_get_storage_type (image))
+    {
+    case GTK_IMAGE_PAINTABLE:
+      return g_object_ref (gtk_image_get_paintable (image));
+    case GTK_IMAGE_ICON_NAME:
+      icon_name = gtk_image_get_icon_name (image);
+      size = gtk_image_get_pixel_size (image);
+      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
+      icon = gtk_icon_theme_lookup_icon (icon_theme,
+                                         icon_name,
+                                         NULL,
+                                         size, 1,
+                                         gtk_widget_get_direction (GTK_WIDGET (image)),
+                                         0);
+      if (icon == NULL)
+        {
+g_print ("no icon for %s\n", icon_name);
+          return NULL;
+        }
+      return GDK_PAINTABLE (icon);
+    case GTK_IMAGE_GICON:
+    case GTK_IMAGE_EMPTY:
+    default:
+      g_warning ("Image storage type %d not handled",
+                 gtk_image_get_storage_type (image));
+      return NULL;
+    }
+}
+
+static void
+drag_begin (GtkDragSource *source,
+            GdkDrag       *drag,
+            GtkWidget     *widget)
+{
+  GdkPaintable *paintable;
+
+  paintable = get_image_paintable (GTK_IMAGE (widget));
+  if (paintable)
+    {
+      int w, h;
+
+      w = gdk_paintable_get_intrinsic_width (paintable);
+      h = gdk_paintable_get_intrinsic_height (paintable);
+      gtk_drag_source_set_icon (source, paintable, w, h);
+      g_object_unref (paintable);
+    }
+}
+
+static GdkContentProvider *
+drag_prepare_texture (GtkDragSource *source,
+                      double         x,
+                      double         y,
+                      GtkWidget     *widget)
+{
+  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (widget));
+  GtkSnapshot *snapshot;
+  double width, height;
+  GskRenderNode *node;
+  GskRenderer *renderer;
+  GdkTexture *texture;
+  GdkContentProvider *ret;
+
+  if (!GDK_IS_PAINTABLE (paintable))
+    return NULL;
+
+  snapshot = gtk_snapshot_new ();
+  width = gdk_paintable_get_intrinsic_width (paintable);
+  height = gdk_paintable_get_intrinsic_height (paintable);
+  gdk_paintable_snapshot (paintable, snapshot, width, height);
+  node = gtk_snapshot_free_to_node (snapshot);
+
+  renderer = gtk_native_get_renderer (gtk_widget_get_native (widget));
+  texture = gsk_renderer_render_texture (renderer, node, &GRAPHENE_RECT_INIT (0, 0, width, height));
+
+  ret = gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, texture);
+
+  g_object_unref (texture);
+  gsk_render_node_unref (node);
+
+  return ret;
+}
+
+static GdkContentProvider *
+drag_prepare_file (GtkDragSource *source,
+                   double         x,
+                   double         y,
+                   GtkWidget     *widget)
+{
+  GdkContentProvider *content;
+  GtkIconTheme *icon_theme;
+  const char *name;
+  GtkIconPaintable *info;
+
+  name = gtk_image_get_icon_name (GTK_IMAGE (widget));
+  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
+
+  info = gtk_icon_theme_lookup_icon (icon_theme,
+                                     name,
+                                     NULL,
+                                     32, 1,
+                                     gtk_widget_get_direction (widget),
+                                     0);
+  content = gdk_content_provider_new_typed (G_TYPE_FILE,  gtk_icon_paintable_get_file (info));
+  g_object_unref (info);
+
+  return content;
+}
+
+static void
+setup_image_dnd (GtkWidget *image)
+{
+  GtkDragSource *source;
+
+  source = gtk_drag_source_new ();
+  g_signal_connect (source, "prepare", G_CALLBACK (drag_prepare_texture), image);
+  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
+  gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+}
+
+static void
+setup_scalable_image_dnd (GtkWidget *image)
+{
+  GtkDragSource *source;
+
+  source = gtk_drag_source_new ();
+  g_signal_connect (source, "prepare", G_CALLBACK (drag_prepare_file), image);
+  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
+  gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+}
+
+static void
+search_mode_toggled (GtkSearchBar      *searchbar,
+                     GParamSpec        *pspec,
+                     IconBrowserWindow *win)
+{
+  if (gtk_search_bar_get_search_mode (searchbar))
+    gtk_single_selection_set_selected (GTK_SINGLE_SELECTION (win->context_model), GTK_INVALID_LIST_POSITION);
+  else if (gtk_single_selection_get_selected (GTK_SINGLE_SELECTION (win->context_model)) == GTK_INVALID_LIST_POSITION)
+    gtk_single_selection_set_selected (GTK_SINGLE_SELECTION (win->context_model), 0);
+
+  gtk_filter_changed (win->search_mode_filter, GTK_FILTER_CHANGE_DIFFERENT);
+}
+
+static void
+selected_name_changed (GtkSingleSelection *selection,
+                       GParamSpec         *pspec,
+                       IconBrowserWindow  *win)
+{
+  if (gtk_single_selection_get_selected (selection) != GTK_INVALID_LIST_POSITION)
+    gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
+}
+
+static void
+icon_browser_window_init (IconBrowserWindow *win)
+{
+  GtkFilter *filter;
+
+  gtk_widget_init_template (GTK_WIDGET (win));
+
+  setup_image_dnd (win->image1);
+  setup_image_dnd (win->image2);
+  setup_image_dnd (win->image3);
+  setup_image_dnd (win->image4);
+  setup_image_dnd (win->image5);
+  setup_image_dnd (win->image6);
+  setup_image_dnd (win->image7);
+  setup_scalable_image_dnd (win->image8);
+
+  gtk_window_set_transient_for (GTK_WINDOW (win->details), GTK_WINDOW (win));
+  gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (win->searchbar), GTK_WIDGET (win));
+
+  populate (win);
+
+  filter = gtk_filter_list_model_get_filter (GTK_FILTER_LIST_MODEL (win->icon_filter_model));
+
+  win->name_filter = GTK_FILTER (gtk_custom_filter_new (filter_by_icon_name, NULL, NULL));
+
+  gtk_multi_filter_append (GTK_MULTI_FILTER (filter), g_object_ref (win->name_filter));
+
+  g_signal_connect (win->searchbar, "notify::search-mode-enabled",  G_CALLBACK (search_mode_toggled), win);
+  g_signal_connect (win->context_model, "notify::selected",  G_CALLBACK (selected_name_changed), win);
+}
+
+static void
+icon_browser_window_dispose (GObject *object)
+{
+  gtk_widget_dispose_template (GTK_WIDGET (object), ICON_BROWSER_WINDOW_TYPE);
+
+  G_OBJECT_CLASS (icon_browser_window_parent_class)->dispose (object);
+}
+
+static void
+icon_browser_window_finalize (GObject *object)
+{
+  IconBrowserWindow *win = ICON_BROWSER_WINDOW (object);
+
+  g_clear_object (&win->name_filter);
+
+  G_OBJECT_CLASS (icon_browser_window_parent_class)->finalize (object);
+}
+
+static void
+icon_browser_window_class_init (IconBrowserWindowClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->dispose = icon_browser_window_dispose;
+  object_class->finalize = icon_browser_window_finalize;
+
+  g_type_ensure (IB_TYPE_ICON);
+  g_type_ensure (IB_TYPE_CONTEXT);
+
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
+                                               "/org/gtk/iconbrowser/gtk/window.ui");
+
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, symbolic_radio);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, searchbar);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, icon_store);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, icon_filter_model);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, context_model);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, context_store);
+
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, details);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image1);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image2);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image3);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image4);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image5);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image6);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image7);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image8);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, label8);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, description);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, search_mode_filter);
+
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), item_activated);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), copy_to_clipboard);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), symbolic_toggled);
+}
+
+IconBrowserWindow *
+icon_browser_window_new (IconBrowserApp *app)
+{
+  return g_object_new (ICON_BROWSER_WINDOW_TYPE, "application", app, NULL);
+}
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <gtk/gtk.h>
+#include "iconbrowserapp.h"
+
+
+#define ICON_BROWSER_WINDOW_TYPE (icon_browser_window_get_type ())
+#define ICON_BROWSER_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_BROWSER_WINDOW_TYPE, IconBrowserWindow))
+
+
+typedef struct _IconBrowserWindow         IconBrowserWindow;
+typedef struct _IconBrowserWindowClass    IconBrowserWindowClass;
+
+
+GType              icon_browser_window_get_type     (void);
+IconBrowserWindow *icon_browser_window_new          (IconBrowserApp    *app);
@@ -0,0 +1,8 @@
+#include <gtk/gtk.h>
+#include <iconbrowserapp.h>
+
+int
+main (int argc, char *argv[])
+{
+  return g_application_run (G_APPLICATION (icon_browser_app_new ()), argc, argv);
+}
@@ -0,0 +1,41 @@
+iconbrowser_sources = [
+  'main.c',
+  'iconbrowserapp.c',
+  'iconbrowserwin.c',
+  'iconbrowsericon.c',
+  'iconbrowsercontext.c'
+]
+
+iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
+  'iconbrowser.gresource.xml',
+  source_dir: meson.current_source_dir(),
+)
+
+executable('gtk4-icon-browser',
+  sources: [iconbrowser_sources, iconbrowser_resources],
+  c_args: common_cflags,
+  dependencies: [ libgtk_dep, profile_conf_h ],
+  include_directories: confinc,
+  win_subsystem: 'windows',
+  link_args: extra_demo_ldflags,
+  install: true,
+)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size, install_dir: icontheme_dir)
+endforeach
+
+# desktop file
+install_data('org.gtk.IconBrowser4.desktop', install_dir: gtk_applicationsdir)
+
+# appdata
+configure_file(
+  input: 'org.gtk.IconBrowser4.appdata.xml.in',
+  output: 'org.gtk.IconBrowser4.appdata.xml',
+  configuration: appdata_config,
+  install_dir: gtk_appdatadir
+)
+
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.gtk.IconBrowser4</id>
+  <launchable type="desktop-id">org.gtk.IconBrowser4.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>LGPL-2.1-or-later</project_license>
+  <name>GTK Icon Browser</name>
+  <summary>Program to browse themed icons</summary>
+  <description>
+    <p>
+      GTK Icon Browser is a simple application to show themed icons that
+      are available on the system.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-icon-browser/gtk-icon-browser1.png</image>
+      <caption>Icon Browser</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-icon-browser/gtk-icon-browser2.png</image>
+      <caption>Search</caption>
+    </screenshot>
+  </screenshots>
+  <kudos>
+    <kudo>HiDpiIcon</kudo>
+    <kudo>ModernToolkit</kudo>
+  </kudos>
+  <url type="homepage">https://www.gtk.org</url>
+  <translation type="gettext">gtk-4.0</translation>
+  <update_contact>matthias.clasen_at_gmail.com</update_contact>
+  <developer_name>Matthias Clasen and others</developer_name>
+  <content_rating type="oars-1.1"/>
+  <releases>
+    <release version="@BUILD_VERSION@">
+      <description>
+        <p>A new build of GTK.</p>
+      </description>
+    </release>
+  </releases>
+</component>
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Icon Browser
+Comment=An application that shows themed icons
+Exec=gtk4-icon-browser
+Icon=org.gtk.IconBrowser4
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Development;GTK;
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <menu id="gear_menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Inspector</attribute>
+        <attribute name="action">app.inspector</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About GTK Icon Browser</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
+  <template class="IconBrowserWindow" parent="GtkApplicationWindow">
+    <property name="title" translatable="yes">Icon Browser</property>
+    <property name="default-width">1024</property>
+    <property name="default-height">768</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header">
+        <child type="title">
+          <object class="GtkBox">
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkToggleButton" id="normal_radio">
+                <property name="focus-on-click">0</property>
+                <property name="label" translatable="yes">Normal</property>
+                <property name="active">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="symbolic_radio">
+                <property name="focus-on-click">0</property>
+                <property name="label" translatable="yes">Symbolic</property>
+                <property name="group">normal_radio</property>
+                <signal name="notify::active" handler="symbolic_toggled" swapped="yes" after="yes"/>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkMenuButton" id="gear_menu_button">
+            <property name="focus-on-click">0</property>
+            <property name="valign">center</property>
+            <property name="menu-model">gear_menu</property>
+            <property name="icon-name">open-menu-symbolic</property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkToggleButton" id="search">
+            <property name="focus-on-click">0</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="search-icon">
+                <property name="icon-name">edit-find-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <child>
+          <object class="GtkScrolledWindow">
+            <style>
+              <class name="sidebar"/>
+            </style>
+            <property name="hscrollbar-policy">never</property>
+            <child>
+              <object class="GtkListView">
+                <style>
+                  <class name="navigation-sidebar"/>
+                </style>
+                <property name="model">
+                  <object class="GtkSingleSelection" id="context_model">
+                    <property name="model">
+                      <object class="GListStore" id="context_store">
+                        <property name="item-type">IbContext</property>
+                      </object>
+                    </property>
+                  </object>
+                </property>
+                <property name="factory">
+                  <object class="GtkBuilderListItemFactory">
+                    <property name="bytes">
+<![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <property name="xalign">0</property>
+        <binding name="label">
+          <lookup name="name" type="IbContext">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>
+]]>
+                    </property>
+                  </object>
+                </property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="content_box">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkSearchBar" id="searchbar">
+                <property name="search-mode-enabled" bind-source="search" bind-property="active" bind-flags="bidirectional"/>
+                <child>
+                  <object class="GtkSearchEntry" id="searchentry">
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="sw">
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="hscrollbar-policy">never</property>
+                <child>
+                  <object class="GtkGridView" id="list">
+                    <style>
+                      <class name="content-view"/>
+                    </style>
+                    <signal name="activate" handler="item_activated"/>
+                    <property name="single-click-activate">1</property>
+                    <property name="model">
+                      <object class="GtkNoSelection">
+                        <property name="model">
+                          <object class="GtkFilterListModel" id="icon_filter_model">
+                            <property name="filter">
+                              <object class="GtkEveryFilter">
+                                <child>
+                                  <object class="GtkStringFilter">
+                                    <property name="expression">
+                                      <lookup name="name" type="IbIcon"/>
+                                    </property>
+                                    <binding name="search">
+                                      <lookup name="text" type="GtkSearchEntry">
+                                        searchentry
+                                      </lookup>
+                                    </binding>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkAnyFilter">
+                                    <child>
+                                      <object class="GtkBoolFilter" id="search_mode_filter">
+                                        <property name="expression">
+                                          <lookup name="search-mode-enabled">
+                                             searchbar
+                                          </lookup>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkStringFilter">
+                                        <property name="ignore-case">0</property>
+                                        <property name="match-mode">exact</property>
+                                        <property name="expression">
+                                          <lookup name="context" type="IbIcon"/>
+                                        </property>
+                                        <binding name="search">
+                                          <lookup name="id" type="IbContext">
+                                            <lookup name="selected-item" type="GtkSingleSelection">
+                                              context_model
+                                            </lookup>
+                                          </lookup>
+                                        </binding>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </property>
+                            <property name="model">
+                              <object class="GListStore" id="icon_store">
+                                <property name="item-type">IbIcon</property>
+                              </object>
+                            </property>
+                          </object>
+                        </property>
+                      </object>
+                    </property>
+                    <property name="factory">
+                      <object class="GtkBuilderListItemFactory">
+                        <property name="bytes">
+<![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkImage">
+            <property name="pixel-size">48</property>
+            <binding name="icon-name">
+              <lookup name="name" type="IbIcon">
+                <lookup name="item">GtkListItem</lookup>
+              </lookup>
+            </binding>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <binding name="label">
+              <lookup name="name" type="IbIcon">
+                <lookup name="item">GtkListItem</lookup>
+              </lookup>
+            </binding>
+          </object>
+        </child>
+      </object>
+    </property>
+  </template>
+</interface>
+]]>
+                        </property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+
+  <object class="GtkDialog" id="details">
+    <property name="modal">1</property>
+    <property name="use-header-bar">1</property>
+    <property name="resizable">0</property>
+    <property name="hide-on-close">1</property>
+    <child internal-child="content_area">
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkGrid">
+            <property name="margin-start">10</property>
+            <property name="margin-end">10</property>
+            <property name="margin-top">10</property>
+            <property name="margin-bottom">10</property>
+            <property name="row-spacing">18</property>
+            <property name="column-spacing">18</property>
+            <property name="halign">center</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+             <object class="GtkImage" id="image2">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="image3">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="image4">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="image5">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">4</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="image6">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">5</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="image7">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">6</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="image8">
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+                <layout>
+                  <property name="column">7</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">8×8</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">16×16</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">18×18</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">24×24</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label5">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">32×32</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">4</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label6">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">48×48</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">5</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label7">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">64×64</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">6</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+           <child>
+              <object class="GtkLabel" id="label8">
+                <property name="halign">center</property>
+                <property name="valign">baseline</property>
+                <property name="label">scalable</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">7</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">Copy to Clipboard</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">20</property>
+            <property name="margin-top">20</property>
+            <property name="margin-bottom">20</property>
+            <signal name="clicked" handler="copy_to_clipboard"/>
+          </object>
+        </child>
+       <child>
+          <object class="GtkLabel" id="description">
+            <property name="margin-start">10</property>
+            <property name="margin-end">10</property>
+            <property name="margin-top">10</property>
+            <property name="margin-bottom">10</property>
+            <property name="wrap">1</property>
+            <property name="max-width-chars">60</property>
+            <property name="valign">start</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
+
@@ -3,7 +3,9 @@
 appdata_config = configuration_data()
 appdata_config.set('BUILD_VERSION', meson.project_version())

+subdir('constraint-editor')
 subdir('gtk-demo')
+subdir('icon-browser')
 subdir('node-editor')
 subdir('widget-factory')
 subdir('print-editor')
@@ -112,7 +112,7 @@ activate_about (GSimpleAction *action,
                                         ? "GTK Node Editor (Development)"
                                         : "GTK Node Editor",
                         "version", version,
-                         "copyright", "© 2019—2024 The GTK Team",
+                         "copyright", "© 2019—2021 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to test GTK rendering",
@@ -121,12 +121,8 @@ activate_about (GSimpleAction *action,
                         "title", "About GTK Node Editor",
                         "system-information", s->str,
                         NULL);
-
-  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
-                                       "Artwork by", (const char *[]) { "Jakub Steiner", NULL });
-  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
-                                       "Maintained by", (const char *[]) { "The GTK Team", NULL });
-
+    gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
+                                         "Artwork by", (const char *[]) { "Jakub Steiner", NULL });

  gtk_window_present (GTK_WINDOW (dialog));

@@ -223,6 +219,8 @@ node_editor_application_activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");

+  gtk_window_set_icon_name (GTK_WINDOW (win), "org.gtk.gtk4.NodeEditor");
+
  gtk_window_present (GTK_WINDOW (win));
 }

@@ -925,7 +925,7 @@ export_image_response_cb (GObject      *source,
      GdkTexture *texture;
      GskRenderer *renderer;

-      renderer = gsk_ngl_renderer_new ();
+      renderer = gsk_gl_renderer_new ();
      if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
        {
          g_object_unref (renderer);
@@ -1234,9 +1234,6 @@ node_editor_window_realize (GtkWidget *widget)
  node_editor_window_add_renderer (self,
                                   gsk_gl_renderer_new (),
                                   "OpenGL");
-  node_editor_window_add_renderer (self,
-                                   gsk_ngl_renderer_new (),
-                                   "NGL");
 #ifdef GDK_RENDERING_VULKAN
  node_editor_window_add_renderer (self,
                                   gsk_vulkan_renderer_new (),
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="https://specifications.freedesktop.org/metainfo/1.0" type="desktop">
+<component type="desktop">
  <id>org.gtk.gtk4.NodeEditor</id>
  <launchable type="desktop-id">org.gtk.gtk4.NodeEditor.desktop</launchable>
  <metadata_license>CC0-1.0</metadata_license>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="https://specifications.freedesktop.org/metainfo/1.0" type="desktop">
+<component type="desktop">
  <id>org.gtk.PrintEditor4</id>
  <launchable type="desktop-id">org.gtk.PrintEditor4.desktop</launchable>
  <metadata_license>CC0-1.0</metadata_license>
@@ -576,6 +576,18 @@ activate_about (GSimpleAction *action,
  int i;
  char *os_name;
  char *os_version;
+  const char *authors[] = {
+    "Alexander Larsson",
+    NULL
+  };
+  const char *artists[] = {
+    "Jakub Steiner",
+    NULL
+  };
+  const char *maintainers[] = {
+    "The GTK Team",
+    NULL
+  };
  GtkWidget *dialog;

  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
@@ -619,21 +631,19 @@ activate_about (GSimpleAction *action,
                                         ? "GTK Print Editor (Development)"
                                         : "GTK Print Editor",
                         "version", version,
-                         "copyright", "© 2006-2024 Red Hat, Inc",
+                         "copyright", "© 2006-2021 Red Hat, Inc",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK printing",
-                         "authors", (const char *[]) { "Alexander Larsson", NULL },
+                         "authors", authors,
                         "logo-icon-name", "org.gtk.PrintEditor4",
                         "title", "About GTK Print Editor",
                         "system-information", sysinfo->str,
                         NULL);
-
  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
-                                       _("Artwork by"), (const char *[]) { "Jakub Steiner", NULL });
-
+                                       _("Artwork by"), artists);
  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
-                                       _("Maintained by"), (const char *[]) { "The GTK Team", NULL });
+                                       _("Maintained by"), maintainers);

  gtk_window_present (GTK_WINDOW (dialog));

@@ -788,6 +798,7 @@ activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (main_window), "devel");

+  gtk_window_set_icon_name (GTK_WINDOW (main_window), "org.gtk.PrintEditor4");
  gtk_window_set_default_size (GTK_WINDOW (main_window), 400, 600);
  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (main_window), TRUE);
  update_title (GTK_WINDOW (main_window));
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="https://specifications.freedesktop.org/metainfo/1.0" type="desktop">
+<component type="desktop">
  <id>org.gtk.WidgetFactory4</id>
  <launchable type="desktop-id">org.gtk.WidgetFactory4.desktop</launchable>
  <metadata_license>CC0-1.0</metadata_license>
@@ -294,6 +294,15 @@ activate_about (GSimpleAction *action,
  GtkApplication *app = user_data;
  GtkWindow *window;
  GtkWidget *button;
+  const char *authors[] = {
+    "Andrea Cimitan",
+    "Cosimo Cecchi",
+    NULL
+  };
+  const char *maintainers[] = {
+    "The GTK Team",
+    NULL
+  };
  char *version;
  char *os_name;
  char *os_version;
@@ -338,18 +347,18 @@ activate_about (GSimpleAction *action,
                                         ? "GTK Widget Factory (Development)"
                                         : "GTK Widget Factory",
                         "version", version,
-                         "copyright", "© 1997—2024 The GTK Team",
+                         "copyright", "© 1997—2021 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK themes and widgets",
-                         "authors", (const char *[]) { "Andrea Cimitan", "Cosimo Cecchi", NULL },
+                         "authors", authors,
                         "logo-icon-name", "org.gtk.WidgetFactory4",
                         "title", "About GTK Widget Factory",
                         "system-information", s->str,
                         NULL);

  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
-                                       _("Maintained by"), (const char *[]) { "The GTK Team", NULL });
+                                       _("Maintained by"), maintainers);

  gtk_window_present (GTK_WINDOW (dialog));

@@ -2232,6 +2241,7 @@ activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (window), "devel");

+  gtk_window_set_icon_name (window, "org.gtk.WidgetFactory4");
  gtk_application_add_window (GTK_APPLICATION (app), window);
  g_action_map_add_action_entries (G_ACTION_MAP (window),
                                   win_entries, G_N_ELEMENTS (win_entries),
@@ -38,7 +38,7 @@ if get_option('documentation')
      gdk_gir[0],
    ],
    depends: gdk_gir[0],
-    suite: ['docs'],
+    suite: ['docs', 'failing'],
  )

  if x11_enabled
@@ -69,18 +69,6 @@ if get_option('documentation')
      install: true,
      install_dir: docs_dir,
    )
-
-    test('doc-check-gdk-x11',
-      gidocgen,
-      args: [
-        'check',
-        '--config', gdk4x11_toml,
-        '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-        gdk_x11_gir[0],
-      ],
-      depends: gdk_x11_gir[0],
-      suite: ['docs', 'failing'],
-    )
  endif

  if wayland_enabled
@@ -0,0 +1,32 @@
+.. _gtk4-icon-browser(1):
+
+=================
+gtk4-icon-browser
+=================
+
+-----------------
+List themed icons
+-----------------
+
+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
+SYNOPSIS
+--------
+
+|   **gtk4-icon-browser** [OPTIONS...]
+
+DESCRIPTION
+-----------
+
+``gtk4-icon-browser`` is a utility to explore the icons in the current icon
+theme. It shows icons in various sizes, their symbolic variants where available,
+as well as a description of the icon and its context.
+
+OPTIONS
+-------
+
+``-h, --help``
+
+  Show the application help.
@@ -98,6 +98,7 @@ if get_option('build-demos')
    [ 'gtk4-demo', '1', ],
    [ 'gtk4-demo-application', '1', ],
    [ 'gtk4-widget-factory', '1', ],
+    [ 'gtk4-icon-browser', '1', ],
    [ 'gtk4-node-editor', '1', ],
  ]
 endif
@@ -205,8 +205,7 @@ Other libraries, such as libadwaita, may provide replacements as well.

 ## gtk_show_uri is being replaced

-Instead of `gtk_show_uri()`, you should use [class@Gtk.UriLauncher]
-or [class@Gtk.FileLauncher].
+Instead of `gtk_show_uri()`, you should use [class@Gtk.UriLauncher]or [class@Gtk.FileLauncher].

 ## GtkStatusbar is going away

@@ -181,21 +181,15 @@ matrix3d() production to specify all 16 values individually.

 ### conic-gradient

-| property          | syntax          | default        | printed     |
-| ----------------- | --------------- | -------------- | ----------- |
-| bounds            | `<rect>`        | 50             | always      |
-| center            | `<point>`       | 25, 25         | always      |
-| rotation          | `<number>`      | 0              | always      |
-| stops             | `<color-stop>`  | 0 #AF0, 1 #F0C | always      |
-| interpolation     | `<color-state>` | srgb           | non-default |
-| hue-interpolation | `<hue-interp>`  | shorter        | non-default |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| bounds   | `<rect>`         | 50                     | always      |
+| center   | `<point>`        | 25, 25                 | always      |
+| rotation | `<number>`       | 0                      | always      |
+| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |

 Creates a node like `gsk_conic_gradient_node_new()` with the given properties.

-Possible values for the hue-interpolation property are:
-
-    hue-interpolation: shorter | longer | increasing | decreasing
-
 ### cross-fade

 | property | syntax           | default                | printed     |
@@ -264,14 +258,12 @@ Creates a node like `gsk_inset_shadow_node_new()` with the given properties.

 ### linear-gradient

-| property          | syntax          | default        | printed     |
-| ----------------- | --------------- | -------------- | ----------- |
-| bounds            | `<rect>`        | 50             | always      |
-| start             | `<point>`       | 0 0            | always      |
-| end               | `<point>`       | 0 50           | always      |
-| stops             | `<color-stop>`  | 0 #AF0, 1 #F0C | always      |
-| interpolation     | `<color-state>` | srgb           | non-default |
-| hue-interpolation | `<hue-interp>`  | shorter        | non-default |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| bounds   | `<rect>`         | 50                     | always      |
+| start    | `<point>`        | 0 0                    | always      |
+| end      | `<point>`        | 0 50                   | always      |
+| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |

 Creates a node like `gsk_linear_gradient_node_new()` with the given properties.

@@ -313,17 +305,15 @@ Creates a node like `gsk_outset_shadow_node_new()` with the given properties.

 ### radial-gradient

-| property          | syntax          | default        | printed     |
-| ----------------- | --------------- | -------------- | ----------- |
-| bounds            | `<rect>`        | 50             | always      |
-| center            | `<point>`       | 25 25          | always      |
-| hradius           | `<number>`      | 25             | always      |
-| vradius           | `<number>`      | 25             | always      |
-| start             | `<number>`      | 0              | always      |
-| end               | `<number>`      | 1              | always      |
-| stops             | `<color-stop>`  | 0 #AF0, 1 #F0C | always      |
-| interpolation     | `<color-state>` | srgb           | non-default |
-| hue-interpolation | `<hue-interp>`  | shorter        | non-default |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| bounds   | `<rect>`         | 50                     | always      |
+| center   | `<point>`        | 25 25                  | always      |
+| hradius  | `<number>`       | 25                     | always      |
+| vradius  | `<number>`       | 25                     | always      |
+| start    | `<number>`       | 0                      | always      |
+| end      | `<number>`       | 1                      | always      |
+| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |

 Creates a node like `gsk_radial_gradient_node_new()` with the given properties.

@@ -358,9 +358,6 @@ disable certain features.
 `color-mgmt`
 : Disable color management

-`aerosnap`
-: Disable Aerosnap support on Windows
-
 ### `GDK_GL_DISABLE`

 This variable can be set to a list of values, which cause GDK to
@@ -477,8 +474,6 @@ disable certain optimizations of the "ngl" and "vulkan" renderer.
 `occlusion`
 : Disable occlusion culling via opacity tracking

-`repeat`
-: Repeat drawing operations instead of using offscreen and GL_REPEAT

 The special value `all` can be used to turn on all values. The special
 value `help` can be used to obtain a list of all supported values.
@@ -717,8 +717,6 @@ main (int argc, char **argv)
  int status;
  const char *accels[] = { "F11", NULL };

-  gtk_init ();
-
  bloat_pad = bloat_pad_new ();

  gtk_application_set_accels_for_action (GTK_APPLICATION (bloat_pad),
@@ -257,6 +257,12 @@ gdk_broadway_display_flush (GdkDisplay *display)
  _gdk_broadway_server_flush (broadway_display->server);
 }

+static gboolean
+gdk_broadway_display_has_pending (GdkDisplay *display)
+{
+  return FALSE;
+}
+
 static void
 gdk_broadway_display_dispose (GObject *object)
 {
@@ -479,6 +485,7 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
  display_class->beep = gdk_broadway_display_beep;
  display_class->sync = gdk_broadway_display_sync;
  display_class->flush = gdk_broadway_display_flush;
+  display_class->has_pending = gdk_broadway_display_has_pending;
  display_class->queue_events = _gdk_broadway_display_queue_events;

  display_class->get_next_serial = gdk_broadway_display_get_next_serial;
@@ -113,12 +113,6 @@ static int gdk_initialized = 0;                     /* 1 if the library is initi
                                                     * 0 otherwise.
                                                     */

-gboolean
-gdk_is_initialized (void)
-{
-  return gdk_initialized != 0;
-}
-
 static const GdkDebugKey gdk_debug_keys[] = {
  { "misc",            GDK_DEBUG_MISC, "Miscellaneous information" },
  { "events",          GDK_DEBUG_EVENTS, "Information about events" },
@@ -158,7 +152,6 @@ static const GdkDebugKey gdk_feature_keys[] = {
  { "dmabuf",     GDK_FEATURE_DMABUF,           "Disable dmabuf support" },
  { "offload",    GDK_FEATURE_OFFLOAD,          "Disable graphics offload" },
  { "color-mgmt", GDK_FEATURE_COLOR_MANAGEMENT, "Disable color management" },
-  { "aerosnap",   GDK_FEATURE_AEROSNAP,         "Disable Aerosnap support on Windows" },
 };


@@ -367,12 +360,13 @@ gdk_display_open_default (void)
 {
  GdkDisplay *display;

-  gdk_ensure_initialized ();
+  g_return_val_if_fail (gdk_initialized, NULL);

  display = gdk_display_get_default ();
+  if (display)
+    return display;

-  if (!display)
-    display = gdk_display_open (NULL);
+  display = gdk_display_open (NULL);

  return display;
 }
@@ -122,18 +122,6 @@ gdk_cairo_pattern_add_color_stop_rgba_ccs (cairo_pattern_t *pattern,
  cairo_pattern_add_color_stop_rgba (pattern, offset, color[0], color[1], color[2], color[3]);
 }

-static inline void
-gdk_cairo_pattern_add_color_stop_color (cairo_pattern_t *pattern,
-                                        GdkColorState   *ccs,
-                                        double           offset,
-                                        const GdkColor  *color)
-{
-  float values[4];
-
-  gdk_color_to_float (color, ccs, values);
-  cairo_pattern_add_color_stop_rgba (pattern, offset, values[0], values[1], values[2], values[3]);
-}
-
 static inline void
 gdk_cairo_rect (cairo_t               *cr,
                const graphene_rect_t *rect)
@@ -478,4 +478,4 @@ gdk_cicp_params_get_cicp (GdkCicpParams *self)

 /* }}} */

-/* vim:set foldmethod=marker: */
+/* vim:set foldmethod=marker expandtab: */
@@ -2,8 +2,6 @@

 #include "gdkcicpparams.h"

-G_BEGIN_DECLS
-
 typedef struct _GdkCicp GdkCicp;

 struct _GdkCicp
@@ -84,5 +82,3 @@ gdk_cicp_equivalent (const GdkCicp *p1,
 const GdkCicp * gdk_cicp_params_get_cicp (GdkCicpParams *self);

 GdkCicpParams * gdk_cicp_params_new_for_cicp (const GdkCicp  *cicp);
-
-G_END_DECLS
@@ -233,53 +233,3 @@ static const float srgb_to_rec2020[9] = {
  0.069108, 0.919519, 0.011360,
  0.016394, 0.088011, 0.895380,
 };
-
-/* oklab conversion */
-
-static float
-from_oklab_nl (float v)
-{
-  return v * v * v;
-}
-
-static float
-to_oklab_nl (float v)
-{
-  return cbrtf (v);
-}
-
-static const float oklab_to_lms[9] = {
-  1,  0.3963377774,  0.2158037573,
-  1, -0.1055613458, -0.0638541728,
-  1, -0.0894841775, -1.2914855480
-};
-
-static const float lms_to_srgb[9] = {
-  4.0767416621, -3.3077115913,  0.2309699292,
- -1.2684380046,  2.6097574011, -0.3413193965,
- -0.0041960863, -0.7034186147,  1.7076147010,
-};
-
-static const float srgb_to_lms[9] = {
-  0.4122214708, 0.5363325363, 0.0514459929,
-  0.2119034982, 0.6806995451, 0.1073969566,
-  0.0883024619, 0.2817188376, 0.6299787005,
-};
-
-static const float lms_to_oklab[9] = {
-  0.2104542553,  0.7936177850, -0.0040720468,
-  1.9779984951, -2.4285922050,  0.4505937099,
-  0.0259040371,  0.7827717662, -0.8086757660,
-};
-
-static const float rec2020_to_lms[9] = {
-  0.616645, 0.360250, 0.023064,
-  0.265075, 0.635874, 0.099059,
-  0.100076, 0.203907, 0.696161,
-};
-
-static const float lms_to_rec2020[9] = {
-  2.140325, -1.246734, 0.106491,
-  -0.884665, 2.163141, -0.278489,
-  -0.048559, -0.454366, 1.502711,
-};
@@ -172,41 +172,6 @@ gdk_color_state_get_rec2100_linear (void)
  return GDK_COLOR_STATE_REC2100_LINEAR;
 }

-/**
- * gdk_color_state_get_oklab:
- *
- * Returns the color state object representing the oklab color space.
- *
- * This is a perceptually uniform color state.
- *
- * Returns: the color state object for oklab
- *
- * Since: 4.18
- */
-GdkColorState *
-gdk_color_state_get_oklab (void)
-{
-  return GDK_COLOR_STATE_OKLAB;
-}
-
-/**
- * gdk_color_state_get_oklch:
- *
- * Returns the color state object representing the oklch color space.
- *
- * This is the polar variant of oklab, in which the hue is encoded as
- * a polar coordinate.
- *
- * Returns: the color state object for oklch
- *
- * Since: 4.18
- */
-GdkColorState *
-gdk_color_state_get_oklch (void)
-{
-  return GDK_COLOR_STATE_OKLCH;
-}
-
 /**
 * gdk_color_state_equal:
 * @self: a `GdkColorState`
@@ -258,171 +223,56 @@ gdk_color_state_create_cicp_params (GdkColorState *self)
 /* {{{ Conversion functions */

 typedef float (* GdkTransferFunc) (float v);
-typedef void  (* GdkConvertFunc)  (GdkColorState *self,
-                                   float          values[4]);
 typedef const float GdkColorMatrix[9];

 #define IDENTITY ((float*)0)
 #define NONE ((GdkTransferFunc)0)

-#define CONVERT_FUNC(name) \
+#define TRANSFORM(name, eotf, matrix, oetf) \
 static void \
-gdk_convert_ ## name (GdkColorState  *self, \
-                      float         (*values)[4], \
-                      gsize           n_values) \
+name (GdkColorState  *self, \
+      float         (*values)[4], \
+      gsize           n_values) \
 { \
  for (gsize i = 0; i < n_values; i++) \
    { \
-      name (self, values[i]); \
+      if (eotf != NONE) \
+        { \
+          values[i][0] = eotf (values[i][0]); \
+          values[i][1] = eotf (values[i][1]); \
+          values[i][2] = eotf (values[i][2]); \
+        } \
+      if (matrix != IDENTITY) \
+        { \
+          float res[3]; \
+          res[0] = matrix[0] * values[i][0] + matrix[1] * values[i][1] + matrix[2] * values[i][2]; \
+          res[1] = matrix[3] * values[i][0] + matrix[4] * values[i][1] + matrix[5] * values[i][2]; \
+          res[2] = matrix[6] * values[i][0] + matrix[7] * values[i][1] + matrix[8] * values[i][2]; \
+          values[i][0] = res[0]; \
+          values[i][1] = res[1]; \
+          values[i][2] = res[2]; \
+        } \
+      if (oetf != NONE) \
+        { \
+          values[i][0] = oetf (values[i][0]); \
+          values[i][1] = oetf (values[i][1]); \
+          values[i][2] = oetf (values[i][2]); \
+        } \
    } \
 }

-#define TRANSFORM(name, eotf, matrix, nonlinear, matrix2, oetf) \
-static inline void \
-name (GdkColorState  *self, \
-      float           values[4]) \
-{ \
-  if (eotf != NONE) \
-    { \
-      values[0] = eotf (values[0]); \
-      values[1] = eotf (values[1]); \
-      values[2] = eotf (values[2]); \
-    } \
-  if (matrix != IDENTITY) \
-    { \
-      float res[3]; \
-      res[0] = matrix[0] * values[0] + matrix[1] * values[1] + matrix[2] * values[2]; \
-      res[1] = matrix[3] * values[0] + matrix[4] * values[1] + matrix[5] * values[2]; \
-      res[2] = matrix[6] * values[0] + matrix[7] * values[1] + matrix[8] * values[2]; \
-      values[0] = res[0]; \
-      values[1] = res[1]; \
-      values[2] = res[2]; \
-    } \
-  if (nonlinear != NONE) \
-    { \
-      values[0] = nonlinear (values[0]); \
-      values[1] = nonlinear (values[1]); \
-      values[2] = nonlinear (values[2]); \
-    } \
-  if (matrix2 != IDENTITY) \
-    { \
-      float res[3]; \
-      res[0] = matrix2[0] * values[0] + matrix2[1] * values[1] + matrix2[2] * values[2]; \
-      res[1] = matrix2[3] * values[0] + matrix2[4] * values[1] + matrix2[5] * values[2]; \
-      res[2] = matrix2[6] * values[0] + matrix2[7] * values[1] + matrix2[8] * values[2]; \
-      values[0] = res[0]; \
-      values[1] = res[1]; \
-      values[2] = res[2]; \
-    } \
-  if (oetf != NONE) \
-    { \
-      values[0] = oetf (values[0]); \
-      values[1] = oetf (values[1]); \
-      values[2] = oetf (values[2]); \
-    } \
-} \
-CONVERT_FUNC (name)
-
-#define TRANSFORM_PAIR(name, func1, func2) \
-static inline void \
-name (GdkColorState *self, \
-      float          values[4]) \
-{ \
-  func1 (self, values); \
-  func2 (self, values); \
-} \
-CONVERT_FUNC (name)
-
-TRANSFORM(srgb_to_srgb_linear,           srgb_eotf, IDENTITY,        NONE, IDENTITY, NONE)
-TRANSFORM(srgb_linear_to_srgb,           NONE,      IDENTITY,        NONE, IDENTITY, srgb_oetf)
-TRANSFORM(rec2100_pq_to_rec2100_linear,  pq_eotf,   IDENTITY,        NONE, IDENTITY, NONE)
-TRANSFORM(rec2100_linear_to_rec2100_pq,  NONE,      IDENTITY,        NONE, IDENTITY, pq_oetf)
-TRANSFORM(srgb_linear_to_rec2100_linear, NONE,      srgb_to_rec2020, NONE, IDENTITY, NONE)
-TRANSFORM(rec2100_linear_to_srgb_linear, NONE,      rec2020_to_srgb, NONE, IDENTITY, NONE)
-TRANSFORM(srgb_to_rec2100_linear,        srgb_eotf, srgb_to_rec2020, NONE, IDENTITY, NONE)
-TRANSFORM(rec2100_pq_to_srgb_linear,     pq_eotf,   rec2020_to_srgb, NONE, IDENTITY, NONE)
-TRANSFORM(srgb_linear_to_rec2100_pq,     NONE,      srgb_to_rec2020, NONE, IDENTITY, pq_oetf)
-TRANSFORM(rec2100_linear_to_srgb,        NONE,      rec2020_to_srgb, NONE, IDENTITY, srgb_oetf)
-TRANSFORM(srgb_to_rec2100_pq,            srgb_eotf, srgb_to_rec2020, NONE, IDENTITY, pq_oetf)
-TRANSFORM(rec2100_pq_to_srgb,            pq_eotf,   rec2020_to_srgb, NONE, IDENTITY, srgb_oetf)
-
-TRANSFORM(oklab_to_srgb_linear,          NONE,      oklab_to_lms,    from_oklab_nl, lms_to_srgb,    NONE)
-TRANSFORM(oklab_to_srgb,                 NONE,      oklab_to_lms,    from_oklab_nl, lms_to_srgb,    srgb_oetf)
-TRANSFORM(oklab_to_rec2100_linear,       NONE,      oklab_to_lms,    from_oklab_nl, lms_to_rec2020, NONE)
-TRANSFORM(oklab_to_rec2100_pq,           NONE,      oklab_to_lms,    from_oklab_nl, lms_to_rec2020, pq_oetf)
-TRANSFORM(srgb_linear_to_oklab,          NONE,      srgb_to_lms,     to_oklab_nl,   lms_to_oklab,   NONE)
-TRANSFORM(srgb_to_oklab,                 srgb_eotf, srgb_to_lms,     to_oklab_nl,   lms_to_oklab,   NONE)
-TRANSFORM(rec2100_linear_to_oklab,       NONE,      rec2020_to_lms,  to_oklab_nl,   lms_to_oklab,   NONE)
-TRANSFORM(rec2100_pq_to_oklab,           pq_eotf,   rec2020_to_lms,  to_oklab_nl,   lms_to_oklab,   NONE)
-
-#define DEG_TO_RAD(x) ((x) * G_PI / 180)
-#define RAD_TO_DEG(x) ((x) * 180 / G_PI)
-
-static inline void
-_sincosf (float  angle,
-          float *out_s,
-          float *out_c)
-{
-#ifdef HAVE_SINCOSF
-  sincosf (angle, out_s, out_c);
-#else
-  *out_s = sinf (angle);
-  *out_c = cosf (angle);
-#endif
-}
-
-static void
-oklch_to_oklab (GdkColorState *self,
-                float          values[4])
-{
-  float L, C, H, a, b;
-
-  L = values[0];
-  C = values[1];
-  H = values[2];
-
-  _sincosf (DEG_TO_RAD (H), &b, &a);
-  a *= C;
-  b *= C;
-
-  values[0] = L;
-  values[1] = a;
-  values[2] = b;
-}
-
-static void
-oklab_to_oklch (GdkColorState *self,
-                float          values[4])
-{
-  float L, a, b, C, H;
-
-  L = values[0];
-  a = values[1];
-  b = values[2];
-
-  C = hypotf (a, b);
-  H = RAD_TO_DEG (atan2 (b, a));
-
-  H = fmod (H, 360);
-  if (H < 0)
-    H += 360;
-
-  values[0] = L;
-  values[1] = C;
-  values[2] = H;
-}
-
-CONVERT_FUNC (oklch_to_oklab)
-CONVERT_FUNC (oklab_to_oklch)
-
-TRANSFORM_PAIR (srgb_to_oklch,           srgb_to_oklab,           oklab_to_oklch)
-TRANSFORM_PAIR (srgb_linear_to_oklch,    srgb_linear_to_oklab,    oklab_to_oklch)
-TRANSFORM_PAIR (rec2100_pq_to_oklch,     rec2100_pq_to_oklab,     oklab_to_oklch)
-TRANSFORM_PAIR (rec2100_linear_to_oklch, rec2100_linear_to_oklab, oklab_to_oklch)
-TRANSFORM_PAIR (oklch_to_srgb,           oklch_to_oklab,          oklab_to_srgb)
-TRANSFORM_PAIR (oklch_to_srgb_linear,    oklch_to_oklab,          oklab_to_srgb_linear)
-TRANSFORM_PAIR (oklch_to_rec2100_pq,     oklch_to_oklab,          oklab_to_rec2100_pq)
-TRANSFORM_PAIR (oklch_to_rec2100_linear, oklch_to_oklab,          oklab_to_rec2100_pq)
+TRANSFORM(gdk_default_srgb_to_srgb_linear,           srgb_eotf, IDENTITY,        NONE);
+TRANSFORM(gdk_default_srgb_linear_to_srgb,           NONE,      IDENTITY,        srgb_oetf)
+TRANSFORM(gdk_default_rec2100_pq_to_rec2100_linear,  pq_eotf,   IDENTITY,        NONE)
+TRANSFORM(gdk_default_rec2100_linear_to_rec2100_pq,  NONE,      IDENTITY,        pq_oetf)
+TRANSFORM(gdk_default_srgb_linear_to_rec2100_linear, NONE,      srgb_to_rec2020, NONE)
+TRANSFORM(gdk_default_rec2100_linear_to_srgb_linear, NONE,      rec2020_to_srgb, NONE)
+TRANSFORM(gdk_default_srgb_to_rec2100_linear,        srgb_eotf, srgb_to_rec2020, NONE)
+TRANSFORM(gdk_default_rec2100_pq_to_srgb_linear,     pq_eotf,   rec2020_to_srgb, NONE)
+TRANSFORM(gdk_default_srgb_linear_to_rec2100_pq,     NONE,      srgb_to_rec2020, pq_oetf)
+TRANSFORM(gdk_default_rec2100_linear_to_srgb,        NONE,      rec2020_to_srgb, srgb_oetf)
+TRANSFORM(gdk_default_srgb_to_rec2100_pq,            srgb_eotf, srgb_to_rec2020, pq_oetf)
+TRANSFORM(gdk_default_rec2100_pq_to_srgb,            pq_eotf,   rec2020_to_srgb, srgb_oetf)

 /* }}} */
 /* {{{ Default implementation */
@@ -478,9 +328,6 @@ gdk_default_color_state_get_cicp (GdkColorState *color_state)
 {
  GdkDefaultColorState *self = (GdkDefaultColorState *) color_state;

-  if (self->cicp.color_primaries == 0)
-    return NULL;
-
  return &self->cicp;
 }

@@ -572,11 +419,9 @@ GdkDefaultColorState gdk_default_color_states[] = {
    .name = "srgb",
    .no_srgb = GDK_COLOR_STATE_SRGB_LINEAR,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_srgb_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_srgb_to_rec2100_pq,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_srgb_to_rec2100_linear,
-      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_srgb_to_oklab,
-      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_srgb_to_oklch,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_default_srgb_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_default_srgb_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_default_srgb_to_rec2100_linear,
    },
    .clamp = gdk_color_state_clamp_0_1,
    .cicp = { 1, 13, 0, 1 },
@@ -592,11 +437,9 @@ GdkDefaultColorState gdk_default_color_states[] = {
    .name = "srgb-linear",
    .no_srgb = NULL,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_srgb_linear_to_srgb,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_srgb_linear_to_rec2100_pq,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_srgb_linear_to_rec2100_linear,
-      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_srgb_linear_to_oklab,
-      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_srgb_linear_to_oklch,
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_default_srgb_linear_to_srgb,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_default_srgb_linear_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_default_srgb_linear_to_rec2100_linear,
    },
    .clamp = gdk_color_state_clamp_0_1,
    .cicp = { 1, 8, 0, 1 },
@@ -612,11 +455,9 @@ GdkDefaultColorState gdk_default_color_states[] = {
    .name = "rec2100-pq",
    .no_srgb = NULL,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_rec2100_pq_to_srgb,
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_rec2100_pq_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_rec2100_pq_to_rec2100_linear,
-      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_rec2100_pq_to_oklab,
-      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_rec2100_pq_to_oklch,
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_default_rec2100_pq_to_srgb,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_default_rec2100_pq_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_default_rec2100_pq_to_rec2100_linear,
    },
    .clamp = gdk_color_state_clamp_0_1,
    .cicp = { 9, 16, 0, 1 },
@@ -632,54 +473,16 @@ GdkDefaultColorState gdk_default_color_states[] = {
    .name = "rec2100-linear",
    .no_srgb = NULL,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_rec2100_linear_to_srgb,
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_rec2100_linear_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_rec2100_linear_to_rec2100_pq,
-      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_rec2100_linear_to_oklab,
-      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_rec2100_linear_to_oklch,
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_default_rec2100_linear_to_srgb,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_default_rec2100_linear_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_default_rec2100_linear_to_rec2100_pq,
    },
    .clamp = gdk_color_state_clamp_unbounded,
    .cicp = { 9, 8, 0, 1 },
  },
-  [GDK_COLOR_STATE_ID_OKLAB] = {
-    .parent = {
-      .klass = &GDK_DEFAULT_COLOR_STATE_CLASS,
-      .ref_count = 0,
-      .depth = GDK_MEMORY_FLOAT16,
-      .rendering_color_state = GDK_COLOR_STATE_SRGB,
-    },
-    .name = "oklab",
-    .no_srgb = NULL,
-    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_oklab_to_srgb,
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_oklab_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_oklab_to_rec2100_pq,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_oklab_to_rec2100_linear,
-      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_oklab_to_oklch,
-    },
-    .cicp = { 0, 0, 0, 0 },
-  },
-  [GDK_COLOR_STATE_ID_OKLCH] = {
-    .parent = {
-      .klass = &GDK_DEFAULT_COLOR_STATE_CLASS,
-      .ref_count = 0,
-      .depth = GDK_MEMORY_FLOAT16,
-      .rendering_color_state = GDK_COLOR_STATE_SRGB,
-    },
-    .name = "oklch",
-    .no_srgb = NULL,
-    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_oklch_to_srgb,
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_oklch_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_oklch_to_rec2100_pq,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_oklch_to_rec2100_linear,
-      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_oklch_to_oklab,
-    },
-    .cicp = { 0, 0, 0, 0 },
-  },
 };

-/* }}} */
+ /* }}} */
 /* {{{ Cicp implementation */

 typedef struct _GdkCicpColorState GdkCicpColorState;
@@ -706,22 +509,17 @@ struct _GdkCicpColorState

 #define cicp ((GdkCicpColorState *)self)

-TRANSFORM(cicp_to_srgb,             cicp->eotf,  cicp->to_srgb,      NONE, IDENTITY, srgb_oetf)
-TRANSFORM(cicp_to_srgb_linear,      cicp->eotf,  cicp->to_srgb,      NONE, IDENTITY, NONE)
-TRANSFORM(cicp_to_rec2100_pq,       cicp->eotf,  cicp->to_rec2020,   NONE, IDENTITY, pq_oetf)
-TRANSFORM(cicp_to_rec2100_linear,   cicp->eotf,  cicp->to_rec2020,   NONE, IDENTITY, NONE)
-TRANSFORM(cicp_from_srgb,           srgb_eotf,   cicp->from_srgb,    NONE, IDENTITY, cicp->oetf)
-TRANSFORM(cicp_from_srgb_linear,    NONE,        cicp->from_srgb,    NONE, IDENTITY, cicp->oetf)
-TRANSFORM(cicp_from_rec2100_pq,     pq_eotf,     cicp->from_rec2020, NONE, IDENTITY, cicp->oetf)
-TRANSFORM(cicp_from_rec2100_linear, NONE,        cicp->from_rec2020, NONE, IDENTITY, cicp->oetf)
+TRANSFORM(gdk_cicp_to_srgb,             cicp->eotf,  cicp->to_srgb,      srgb_oetf)
+TRANSFORM(gdk_cicp_to_srgb_linear,      cicp->eotf,  cicp->to_srgb,      NONE)
+TRANSFORM(gdk_cicp_to_rec2100_pq,       cicp->eotf,  cicp->to_rec2020,   pq_oetf)
+TRANSFORM(gdk_cicp_to_rec2100_linear,   cicp->eotf,  cicp->to_rec2020,   NONE)
+TRANSFORM(gdk_cicp_from_srgb,           srgb_eotf,   cicp->from_srgb,    cicp->oetf)
+TRANSFORM(gdk_cicp_from_srgb_linear,    NONE,        cicp->from_srgb,    cicp->oetf)
+TRANSFORM(gdk_cicp_from_rec2100_pq,     pq_eotf,     cicp->from_rec2020, cicp->oetf)
+TRANSFORM(gdk_cicp_from_rec2100_linear, NONE,        cicp->from_rec2020, cicp->oetf)

 #undef cicp

-TRANSFORM_PAIR (cicp_to_oklab,   cicp_to_srgb_linear,  srgb_linear_to_oklab)
-TRANSFORM_PAIR (cicp_from_oklab, oklab_to_srgb_linear, cicp_from_srgb_linear)
-TRANSFORM_PAIR (cicp_to_oklch,   cicp_to_srgb_linear,  srgb_linear_to_oklch)
-TRANSFORM_PAIR (cicp_from_oklch, oklch_to_srgb_linear, cicp_from_srgb_linear)
-
 /* }}} */
 /* {{{ Vfuncs */

@@ -774,17 +572,13 @@ gdk_cicp_color_state_get_convert_to (GdkColorState *self,
  switch (GDK_DEFAULT_COLOR_STATE_ID (target))
    {
    case GDK_COLOR_STATE_ID_SRGB:
-      return gdk_convert_cicp_to_srgb;
+      return gdk_cicp_to_srgb;
    case GDK_COLOR_STATE_ID_SRGB_LINEAR:
-      return gdk_convert_cicp_to_srgb_linear;
+      return gdk_cicp_to_srgb_linear;
    case GDK_COLOR_STATE_ID_REC2100_PQ:
-      return gdk_convert_cicp_to_rec2100_pq;
+      return gdk_cicp_to_rec2100_pq;
    case GDK_COLOR_STATE_ID_REC2100_LINEAR:
-      return gdk_convert_cicp_to_rec2100_linear;
-    case GDK_COLOR_STATE_ID_OKLAB:
-      return gdk_convert_cicp_to_oklab;
-    case GDK_COLOR_STATE_ID_OKLCH:
-      return gdk_convert_cicp_to_oklch;
+      return gdk_cicp_to_rec2100_linear;

    case GDK_COLOR_STATE_N_IDS:
    default:
@@ -804,17 +598,13 @@ gdk_cicp_color_state_get_convert_from (GdkColorState *self,
  switch (GDK_DEFAULT_COLOR_STATE_ID (source))
    {
    case GDK_COLOR_STATE_ID_SRGB:
-      return gdk_convert_cicp_from_srgb;
+      return gdk_cicp_from_srgb;
    case GDK_COLOR_STATE_ID_SRGB_LINEAR:
-      return gdk_convert_cicp_from_srgb_linear;
+      return gdk_cicp_from_srgb_linear;
    case GDK_COLOR_STATE_ID_REC2100_PQ:
-      return gdk_convert_cicp_from_rec2100_pq;
+      return gdk_cicp_from_rec2100_pq;
    case GDK_COLOR_STATE_ID_REC2100_LINEAR:
-      return gdk_convert_cicp_from_rec2100_linear;
-    case GDK_COLOR_STATE_ID_OKLAB:
-      return gdk_convert_cicp_from_oklab;
-    case GDK_COLOR_STATE_ID_OKLCH:
-      return gdk_convert_cicp_from_oklch;
+      return gdk_cicp_from_rec2100_linear;

    case GDK_COLOR_STATE_N_IDS:
    default:
@@ -1068,4 +858,4 @@ gdk_color_state_clamp (GdkColorState *self,

 /* }}} */

-/* vim:set foldmethod=marker: */
+/* vim:set foldmethod=marker expandtab: */
@@ -49,12 +49,6 @@ GdkColorState * gdk_color_state_get_rec2100_pq          (void);
 GDK_AVAILABLE_IN_4_16
 GdkColorState * gdk_color_state_get_rec2100_linear      (void);

-GDK_AVAILABLE_IN_4_16
-GdkColorState * gdk_color_state_get_oklab               (void);
-
-GDK_AVAILABLE_IN_4_16
-GdkColorState * gdk_color_state_get_oklch               (void);
-
 GDK_AVAILABLE_IN_4_16
 gboolean        gdk_color_state_equal                   (GdkColorState  *self,
                                                         GdkColorState  *other);
@@ -63,6 +57,6 @@ GDK_AVAILABLE_IN_4_16
 GdkCicpParams  *gdk_color_state_create_cicp_params      (GdkColorState  *self);


-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkColorState, gdk_color_state_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkColorState, gdk_color_state_unref);

 G_END_DECLS
@@ -13,8 +13,6 @@ typedef enum
  GDK_COLOR_STATE_ID_SRGB_LINEAR,
  GDK_COLOR_STATE_ID_REC2100_PQ,
  GDK_COLOR_STATE_ID_REC2100_LINEAR,
-  GDK_COLOR_STATE_ID_OKLAB,
-  GDK_COLOR_STATE_ID_OKLCH,

  GDK_COLOR_STATE_N_IDS
 } GdkColorStateId;
@@ -75,8 +73,6 @@ extern GdkDefaultColorState gdk_default_color_states[GDK_COLOR_STATE_N_IDS];
 #define GDK_COLOR_STATE_SRGB_LINEAR    ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_SRGB_LINEAR])
 #define GDK_COLOR_STATE_REC2100_PQ     ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_REC2100_PQ])
 #define GDK_COLOR_STATE_REC2100_LINEAR ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_REC2100_LINEAR])
-#define GDK_COLOR_STATE_OKLAB          ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_OKLAB])
-#define GDK_COLOR_STATE_OKLCH          ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_OKLCH])

 #define GDK_IS_DEFAULT_COLOR_STATE(c) ((GdkDefaultColorState *) (c) >= &gdk_default_color_states[0] && \
                                       (GdkDefaultColorState *) (c) < &gdk_default_color_states[GDK_COLOR_STATE_N_IDS])
@@ -0,0 +1,22 @@
+/* gdkconfig.h
+ *
+ * This is a generated file.  Please modify `configure.ac'
+ */
+
+#ifndef __GDKCONFIG_H__
+#define __GDKCONFIG_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+
+#define GDK_WINDOWING_WIN32
+
+G_END_DECLS
+
+#endif  /* __GDKCONFIG_H__ */
@@ -0,0 +1,23 @@
+/* gdkconfig.h
+ *
+ * This is a generated file.  Please modify `configure.ac'
+ */
+
+#ifndef __GDKCONFIG_H__
+#define __GDKCONFIG_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+
+#define GDK_WINDOWING_WIN32
+#define GDK_RENDERING_VULKAN
+
+G_END_DECLS
+
+#endif  /* __GDKCONFIG_H__ */
@@ -124,7 +124,7 @@ gdk_content_provider_new_for_value (const GValue *value)
  content = g_object_new (GDK_TYPE_CONTENT_PROVIDER_VALUE, NULL);
  g_value_init (&content->value, G_VALUE_TYPE (value));
  g_value_copy (value, &content->value);
-
+  
  return GDK_CONTENT_PROVIDER (content);
 }

@@ -409,7 +409,7 @@ gdk_content_provider_union_init (GdkContentProviderUnion *self)
 * ```c
 * gdk_content_provider_new_union ((GdkContentProvider *[2]) {
 *                                   gdk_content_provider_new_typed (G_TYPE_FILE, file),
- *                                   gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, texture)
+ *                                   gdk_content_provider_new_typed (G_TYPE_TEXTURE, texture)
 *                                 }, 2);
 * ```
 *
@@ -594,7 +594,7 @@ gdk_content_provider_new_for_bytes (const char *mime_type,
  content = g_object_new (GDK_TYPE_CONTENT_PROVIDER_BYTES, NULL);
  content->mime_type = g_intern_string (mime_type);
  content->bytes = g_bytes_ref (bytes);
-
+  
  return GDK_CONTENT_PROVIDER (content);
 }

@@ -1,922 +0,0 @@
-#include "config.h"
-
-#include "gdkdataformatprivate.h"
-
-#include "gdk/gdkdmabuffourccprivate.h"
-
-typedef struct _GdkDataFormatDescription GdkDataFormatDescription;
-
-struct _GdkDataFormatDescription
-{
-  const char *name;
-  GdkMemoryFormat conversion;
-  gboolean is_yuv;
-  gsize n_planes;
-  gsize alignment;
-  gsize block_size[2];
-  guint32 dmabuf_fourcc;
-#ifdef GDK_RENDERING_VULKAN
-  struct {
-    VkFormat format;
-    VkComponentMapping swizzle;
-  } vk;
-#endif
-  void                  (* convert)                         (const GdkDataBuffer        *self,
-                                                             guchar                     *dst_data,
-                                                             gsize                       dst_stride);
-};
-
-typedef struct _YUVCoefficients YUVCoefficients;
-
-struct _YUVCoefficients
-{
-  int v_to_r;
-  int u_to_g;
-  int v_to_g;
-  int u_to_b;
-};
-
-/* multiplied by 65536 */
-static const YUVCoefficients itu601_narrow = { 104597, -25675, -53279, 132201 };
-//static const YUVCoefficients itu601_wide = { 74711, -25864, -38050, 133176 };
-
-static inline void
-get_uv_values (const YUVCoefficients *coeffs,
-               guint8                 u,
-               guint8                 v,
-               int                   *out_r,
-               int                   *out_g,
-               int                   *out_b)
-{
-  int u2 = (int) u - 127;
-  int v2 = (int) v - 127;
-  *out_r = coeffs->v_to_r * v2;
-  *out_g = coeffs->u_to_g * u2 + coeffs->v_to_g * v2;
-  *out_b = coeffs->u_to_b * u2;
-}
-
-static inline void
-set_rgb_values (guint8 rgb[3],
-                guint8 y,
-                int    r,
-                int    g,
-                int    b)
-{
-  int y2 = y * 65536;
-
-  rgb[0] = CLAMP ((y2 + r) >> 16, 0, 255);
-  rgb[1] = CLAMP ((y2 + g) >> 16, 0, 255);
-  rgb[2] = CLAMP ((y2 + b) >> 16, 0, 255);
-}
-
-static inline void
-gdk_convert_nv12_like (guchar       *dst_data,
-                       gsize         dst_stride,
-                       gsize         width,
-                       gsize         height,
-                       const guchar *y_data,
-                       gsize         y_stride,
-                       const guchar *uv_data,
-                       gsize         uv_stride,
-                       gboolean      uv_swapped,
-                       gsize         x_subsample,
-                       gsize         y_subsample)
-{
-  gsize x, y;
-
-  for (y = 0; y < height; y += y_subsample)
-    {
-      for (x = 0; x < width; x += x_subsample)
-        {
-          int r, g, b;
-          gsize xs, ys;
-
-          get_uv_values (&itu601_narrow,
-                         uv_data[x / x_subsample * 2 + (uv_swapped ? 1 : 0)], 
-                         uv_data[x / x_subsample * 2 + (uv_swapped ? 0 : 1)],
-                         &r, &g, &b);
-
-          for (ys = 0; ys < y_subsample && y + ys < height; ys++)
-            for (xs = 0; xs < x_subsample && x + xs < width; xs++)
-              set_rgb_values (&dst_data[3 * (x + xs) + dst_stride * ys], y_data[x + xs + y_stride * ys], r, g, b);
-        }
-      dst_data += y_subsample * dst_stride;
-      y_data += y_subsample * y_stride;
-      uv_data += uv_stride;
-    }
-}
-
-#define CONVERT_NV12_FUNC(name, uv_swapped, x_subsample, y_subsample) \
-static void \
-gdk_convert_ ## name (const GdkDataBuffer *self, \
-                      guchar              *dst_data, \
-                      gsize                dst_stride) \
-{ \
-  gdk_convert_nv12_like (dst_data, \
-                         dst_stride, \
-                         self->width, \
-                         self->height, \
-                         self->planes[0].data, \
-                         self->planes[0].stride, \
-                         self->planes[1].data, \
-                         self->planes[1].stride, \
-                         uv_swapped, x_subsample, y_subsample); \
-}
-
-CONVERT_NV12_FUNC (nv12, FALSE, 2, 2)
-CONVERT_NV12_FUNC (nv21, TRUE, 2, 2)
-CONVERT_NV12_FUNC (nv16, FALSE, 2, 1)
-CONVERT_NV12_FUNC (nv61, TRUE, 2, 1)
-CONVERT_NV12_FUNC (nv24, FALSE, 1, 1)
-CONVERT_NV12_FUNC (nv42, TRUE, 1, 1)
-
-static inline void
-get_uv_values16 (const YUVCoefficients *coeffs,
-                 guint16                u,
-                 guint16                v,
-                 gint64                *out_r,
-                 gint64                *out_g,
-                 gint64                *out_b)
-{
-  gint64 u2 = (gint64) u - 32767;
-  gint64 v2 = (gint64) v - 32767;
-  *out_r = coeffs->v_to_r * v2;
-  *out_g = coeffs->u_to_g * u2 + coeffs->v_to_g * v2;
-  *out_b = coeffs->u_to_b * u2;
-}
-
-static inline void
-set_rgb_values16 (guint16 rgb[3],
-                  guint16 y,
-                  gint64  r,
-                  gint64  g,
-                  gint64  b)
-{
-  gint64 y2 = (gint64) y * 65536;
-
-  rgb[0] = CLAMP ((y2 + r) >> 16, 0, 65535);
-  rgb[1] = CLAMP ((y2 + g) >> 16, 0, 65535);
-  rgb[2] = CLAMP ((y2 + b) >> 16, 0, 65535);
-}
-
-static inline void
-gdk_convert_p010_like (guint16       *dst_data,
-                       gsize          dst_stride,
-                       gsize          width,
-                       gsize          height,
-                       const guint16 *y_data,
-                       gsize          y_stride,
-                       const guint16 *uv_data,
-                       gsize          uv_stride,
-                       gsize          bits_used,
-                       gboolean       uv_swapped,
-                       gsize          x_subsample,
-                       gsize          y_subsample)
-{
-  gsize x, y;
-  guint16 mask;
-
-  mask = 0xFFFF << (16 - bits_used);
-
-  for (y = 0; y < height; y += y_subsample)
-    {
-      for (x = 0; x < width; x += x_subsample)
-        {
-          gint64 r, g, b;
-          gsize xs, ys;
-          guint16 u, v;
-
-          u = uv_data[x / x_subsample * 2 + (uv_swapped ? 1 : 0)];
-          u = (u & mask) | (u >> bits_used);
-          v = uv_data[x / x_subsample * 2 + (uv_swapped ? 0 : 1)];
-          v = (v & mask) | (v >> bits_used);
-          get_uv_values16 (&itu601_narrow, u, v, &r, &g, &b);
-
-          for (ys = 0; ys < y_subsample && y + ys < height; ys++)
-            for (xs = 0; xs < x_subsample && x + xs < width; xs++)
-              {
-                guint16 y_ = y_data[x + xs + y_stride * ys];
-                y_ = (y_ & mask) | (y_ >> bits_used);
-                set_rgb_values16 (&dst_data[3 * (x + xs) + dst_stride * ys], y_, r, g, b);
-              }
-        }
-      dst_data += y_subsample * dst_stride;
-      y_data += y_subsample * y_stride;
-      uv_data += uv_stride;
-    }
-}
-
-#define CONVERT_P010_FUNC(name, bits_used, uv_swapped, x_subsample, y_subsample) \
-static void \
-gdk_convert_ ## name (const GdkDataBuffer *self, \
-                      guchar              *dst_data, \
-                      gsize                dst_stride) \
-{ \
-  gdk_convert_p010_like ((guint16 *) dst_data, \
-                         dst_stride, \
-                         self->width, \
-                         self->height, \
-                         (guint16 *) self->planes[0].data, \
-                         self->planes[0].stride, \
-                         (guint16 *) self->planes[1].data, \
-                         self->planes[1].stride, \
-                         bits_used, uv_swapped, x_subsample, y_subsample); \
-}
-
-CONVERT_P010_FUNC (p010, 10, FALSE, 2, 2)
-CONVERT_P010_FUNC (p012, 12, FALSE, 2, 2)
-CONVERT_P010_FUNC (p016, 16, FALSE, 2, 2)
-
-static inline void
-gdk_convert_3_plane (guchar       *dst_data,
-                     gsize         dst_stride,
-                     gsize         width,
-                     gsize         height,
-                     const guchar *y_data,
-                     gsize         y_stride,
-                     const guchar *u_data,
-                     gsize         u_stride,
-                     const guchar *v_data,
-                     gsize         v_stride,
-                     gsize         x_subsample,
-                     gsize         y_subsample)
-{
-  gsize x, y;
-
-  for (y = 0; y < height; y += y_subsample)
-    {
-      for (x = 0; x < width; x += x_subsample)
-        {
-          int r, g, b;
-          gsize xs, ys;
-
-          get_uv_values (&itu601_narrow, u_data[x / x_subsample], v_data[x / x_subsample], &r, &g, &b);
-
-          for (ys = 0; ys < y_subsample && y + ys < height; ys++)
-            for (xs = 0; xs < x_subsample && x + xs < width; xs++)
-              set_rgb_values (&dst_data[3 * (x + xs) + dst_stride * ys], y_data[x + xs + y_stride * ys], r, g, b);
-        }
-      dst_data += y_subsample * dst_stride;
-      y_data += y_subsample * y_stride;
-      u_data += u_stride;
-      v_data += v_stride;
-    }
-}
-
-#define CONVERT_3_PLANE_FUNC(name, uv_swapped, x_subsample, y_subsample) \
-static void \
-gdk_convert_ ## name (const GdkDataBuffer *self, \
-                      guchar              *dst_data, \
-                      gsize                dst_stride) \
-{ \
-  gdk_convert_3_plane (dst_data, \
-                       dst_stride, \
-                       self->width, \
-                       self->height, \
-                       self->planes[0].data, \
-                       self->planes[0].stride, \
-                       self->planes[uv_swapped ? 2 : 1].data, \
-                       self->planes[uv_swapped ? 2 : 1].stride, \
-                       self->planes[uv_swapped ? 1 : 2].data, \
-                       self->planes[uv_swapped ? 1 : 2].stride, \
-                       x_subsample, y_subsample); \
-}
-
-CONVERT_3_PLANE_FUNC (yuv410, FALSE, 4, 4)
-CONVERT_3_PLANE_FUNC (yvu410, TRUE, 4, 4)
-CONVERT_3_PLANE_FUNC (yuv411, FALSE, 4, 1)
-CONVERT_3_PLANE_FUNC (yvu411, TRUE, 4, 1)
-CONVERT_3_PLANE_FUNC (yuv420, FALSE, 2, 2)
-CONVERT_3_PLANE_FUNC (yvu420, TRUE, 2, 2)
-CONVERT_3_PLANE_FUNC (yuv422, FALSE, 2, 1)
-CONVERT_3_PLANE_FUNC (yvu422, TRUE, 2, 1)
-CONVERT_3_PLANE_FUNC (yuv444, FALSE, 1, 1)
-CONVERT_3_PLANE_FUNC (yvu444, TRUE, 1, 1)
-
-static inline void
-gdk_convert_yuyv_like (guchar       *dst_data,
-                       gsize         dst_stride,
-                       gsize         width,
-                       gsize         height,
-                       const guchar *src_data,
-                       gsize         src_stride,
-                       gsize         y_index,
-                       gsize         u_index,
-                       gsize         v_index)
-{
-  gsize x, y;
-
-  for (y = 0; y < height; y ++)
-    {
-      for (x = 0; x < width; x += 2)
-        {
-          int r, g, b;
-
-          get_uv_values (&itu601_narrow, src_data[2 * x + u_index], src_data[2 * x + v_index], &r, &g, &b);
-          set_rgb_values (&dst_data[3 * x], src_data[2 * x + y_index], r, g, b);
-          if (x + 1 < width)
-            set_rgb_values (&dst_data[3 * (x + 1)], src_data[2 * x + y_index + 2], r, g, b);
-        }
-      dst_data += dst_stride;
-      src_data += src_stride;
-    }
-}
-
-#define CONVERT_YUYV_FUNC(name, y_index, u_index, v_index) \
-static void \
-gdk_convert_ ## name (const GdkDataBuffer *self, \
-                      guchar              *dst_data, \
-                      gsize                dst_stride) \
-{ \
-  gdk_convert_yuyv_like (dst_data, \
-                         dst_stride, \
-                         self->width, \
-                         self->height, \
-                         self->planes[0].data, \
-                         self->planes[0].stride, \
-                         y_index, u_index, v_index); \
-}
-
-CONVERT_YUYV_FUNC (yuyv, 0, 1, 3)
-CONVERT_YUYV_FUNC (yvyu, 0, 3, 1)
-CONVERT_YUYV_FUNC (uyvy, 1, 0, 2)
-CONVERT_YUYV_FUNC (vyuy, 1, 2, 0)
-
-static inline void
-gdk_convert_3_1 (guchar       *dst_data,
-                 gsize         dst_stride,
-                 gsize         width,
-                 gsize         height,
-                 const guchar *xrgb_data,
-                 gsize         xrgb_stride,
-                 const guchar *a_data,
-                 gsize         a_stride,
-                 gsize         a_index)
-{
-  gsize x, y;
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          dst_data[4 * x + 0] = xrgb_data[4 * x + 0];
-          dst_data[4 * x + 1] = xrgb_data[4 * x + 1];
-          dst_data[4 * x + 2] = xrgb_data[4 * x + 2];
-          dst_data[4 * x + 3] = xrgb_data[4 * x + 3];
-          dst_data[4 * x + a_index] = a_data[x];
-        }
-      dst_data += dst_stride;
-      xrgb_data += xrgb_stride;
-      a_data += a_stride;
-    }
-}
-
-#define CONVERT_3_1_FUNC(name, a_index) \
-static void \
-gdk_convert_ ## name (const GdkDataBuffer *self, \
-                      guchar              *dst_data, \
-                      gsize                dst_stride) \
-{ \
-  gdk_convert_3_1 (dst_data, \
-                   dst_stride, \
-                   self->width, \
-                   self->height, \
-                   self->planes[0].data, \
-                   self->planes[0].stride, \
-                   self->planes[1].data, \
-                   self->planes[1].stride, \
-                   a_index); \
-}
-
-CONVERT_3_1_FUNC (xrgb8_a8, 0)
-CONVERT_3_1_FUNC (xbgr8_a8, 0)
-CONVERT_3_1_FUNC (rgbx8_a8, 3)
-CONVERT_3_1_FUNC (bgrx8_a8, 3)
-
-#define VULKAN_SWIZZLE(_R, _G, _B, _A) { VK_COMPONENT_SWIZZLE_ ## _R, VK_COMPONENT_SWIZZLE_ ## _G, VK_COMPONENT_SWIZZLE_ ## _B, VK_COMPONENT_SWIZZLE_ ## _A }
-#define VULKAN_DEFAULT_SWIZZLE VULKAN_SWIZZLE (R, G, B, A)
-
-GdkDataFormatDescription data_formats[] = {
-  [GDK_DATA_NV12] = {
-    .name = "NV12",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 2, 2 },
-    .dmabuf_fourcc = DRM_FORMAT_NV12,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8R8_2PLANE_420_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_nv12,
-  },
-  [GDK_DATA_NV21] = {
-    .name = "NV21",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 2, 2 },
-    .dmabuf_fourcc = DRM_FORMAT_NV21,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8R8_2PLANE_420_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_nv21,
-  },
-  [GDK_DATA_NV16] = {
-    .name = "NV16",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_NV16,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8R8_2PLANE_422_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_nv16,
-  },
-  [GDK_DATA_NV61] = {
-    .name = "NV61",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_NV61,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8R8_2PLANE_422_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_nv61,
-  },
-  [GDK_DATA_NV24] = {
-    .name = "NV24",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_NV24,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8R8_2PLANE_444_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_nv24,
-  },
-  [GDK_DATA_NV42] = {
-    .name = "NV42",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_NV42,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8R8_2PLANE_444_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_nv42,
-  },
-  [GDK_DATA_P010] = {
-    .name = "P010",
-    .conversion = GDK_MEMORY_R16G16B16,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 2, 2 },
-    .dmabuf_fourcc = DRM_FORMAT_P010,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_p010,
-  },
-  [GDK_DATA_P012] = {
-    .name = "P012",
-    .conversion = GDK_MEMORY_R16G16B16,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 2, 2 },
-    .dmabuf_fourcc = DRM_FORMAT_P012,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_p012,
-  },
-  [GDK_DATA_P016] = {
-    .name = "P016",
-    .conversion = GDK_MEMORY_R16G16B16,
-    .is_yuv = TRUE,
-    .n_planes = 2,
-    .alignment = 4,
-    .block_size = { 2, 2 },
-    .dmabuf_fourcc = DRM_FORMAT_P016,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G16_B16R16_2PLANE_420_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_p016,
-  },
-  [GDK_DATA_YUV410] = {
-    .name = "YUV410",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 4, 4 },
-    .dmabuf_fourcc = DRM_FORMAT_YUV410,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yuv410,
-  },
-  [GDK_DATA_YVU410] = {
-    .name = "YVU410",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 4, 4 },
-    .dmabuf_fourcc = DRM_FORMAT_YVU410,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yvu410,
-  },
-  [GDK_DATA_YUV411] = {
-    .name = "YUV411",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 4, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YUV411,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yuv411,
-  },
-  [GDK_DATA_YVU411] = {
-    .name = "YVU411",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 4, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YVU411,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yvu411,
-  },
-  [GDK_DATA_YUV420] = {
-    .name = "YUV420",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 2, 2 },
-    .dmabuf_fourcc = DRM_FORMAT_YUV420,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yuv420,
-  },
-  [GDK_DATA_YVU420] = {
-    .name = "YVU420",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 2, 2 },
-    .dmabuf_fourcc = DRM_FORMAT_YVU420,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_yvu420,
-  },
-  [GDK_DATA_YUV422] = {
-    .name = "YUV422",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YUV422,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yuv422,
-  },
-  [GDK_DATA_YVU422] = {
-    .name = "YVU422",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YVU422,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_yvu422,
-  },
-  [GDK_DATA_YUV444] = {
-    .name = "YUV444",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YUV444,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yuv444,
-  },
-  [GDK_DATA_YVU444] = {
-    .name = "YVU444",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 3,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YVU444,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_yvu444,
-  },
-  [GDK_DATA_YUYV] = {
-    .name = "YUYV",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YUYV,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8B8G8R8_422_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_yuyv,
-  },
-  [GDK_DATA_YVYU] = {
-    .name = "YVYU",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_YVYU,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_G8B8G8R8_422_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_yvyu,
-  },
-  [GDK_DATA_UYVY] = {
-    .name = "UYVY",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_UYVY,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_B8G8R8G8_422_UNORM,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_uyvy,
-  },
-  [GDK_DATA_VYUY] = {
-    .name = "VYUY",
-    .conversion = GDK_MEMORY_R8G8B8,
-    .is_yuv = TRUE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 2, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_VYUY,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_B8G8R8G8_422_UNORM,
-        .swizzle = VULKAN_SWIZZLE (B, G, R, A),
-    },
-#endif
-    .convert = gdk_convert_vyuy,
-  },
-  [GDK_DATA_RGBX8_A8] = {
-    .name = "GDK_DATA_RGBX8_A8",
-    .conversion = GDK_MEMORY_R8G8B8A8,
-    .is_yuv = FALSE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_RGBX8888_A8,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_rgbx8_a8,
-  },
-  [GDK_DATA_BGRX8_A8] = {
-    .name = "GDK_DATA_BGRX8_A8",
-    .conversion = GDK_MEMORY_B8G8R8A8,
-    .is_yuv = FALSE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_BGRX8888_A8,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_bgrx8_a8,
-  },
-  [GDK_DATA_XRGB8_A8] = {
-    .name = "GDK_DATA_XRGB8_A8",
-    .conversion = GDK_MEMORY_A8R8G8B8,
-    .is_yuv = FALSE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_XRGB8888_A8,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_xrgb8_a8,
-  },
-  [GDK_DATA_XBGR8_A8] = {
-    .name = "GDK_DATA_XBGR8_A8",
-    .conversion = GDK_MEMORY_A8B8G8R8,
-    .is_yuv = FALSE,
-    .n_planes = 1,
-    .alignment = 4,
-    .block_size = { 1, 1 },
-    .dmabuf_fourcc = DRM_FORMAT_XBGR8888_A8,
-#ifdef GDK_RENDERING_VULKAN
-    .vk = {
-        .format = VK_FORMAT_UNDEFINED,
-        .swizzle = VULKAN_DEFAULT_SWIZZLE,
-    },
-#endif
-    .convert = gdk_convert_xbgr8_a8,
-  },
-};
-
-const char *
-gdk_data_format_get_name (GdkDataFormat format)
-{
-  return data_formats[format].name;
-}
-
-GdkMemoryFormat
-gdk_data_format_get_conversion (GdkDataFormat format)
-{
-  return data_formats[format].conversion;
-}
-
-gsize
-gdk_data_format_n_planes (GdkDataFormat format)
-{
-  return data_formats[format].n_planes;
-}
-
-gsize
-gdk_data_format_alignment (GdkDataFormat format)
-{
-  return data_formats[format].alignment;
-}
-
-gsize
-gdk_data_format_block_width (GdkDataFormat format)
-{
-  return data_formats[format].block_size[0];
-}
-
-gsize
-gdk_data_format_block_height (GdkDataFormat format)
-{
-  return data_formats[format].block_size[1];
-}
-
-gboolean
-gdk_data_format_is_yuv (GdkDataFormat format)
-{
-  return data_formats[format].is_yuv;
-}
-
-guint32
-gdk_data_format_get_dmabuf_fourcc (GdkDataFormat format)
-{
-  return data_formats[format].dmabuf_fourcc;
-}
-
-gboolean
-gdk_data_format_find_by_dmabuf_fourcc (guint32        fourcc,
-                                       GdkDataFormat *out_format)
-{
-  gsize i;
-
-  for (i = 0; i < G_N_ELEMENTS (data_formats); i++)
-    {
-      if (data_formats[i].dmabuf_fourcc == fourcc)
-        {
-          *out_format = i;
-          return TRUE;
-        }
-    }
-
-  *out_format = GDK_DATA_N_FORMATS;
-  return FALSE;
-}
-
-#ifdef GDK_RENDERING_VULKAN
-VkFormat
-gdk_data_format_vk_format (GdkDataFormat       format,
-                           VkComponentMapping *out_swizzle)
-{
-  if (out_swizzle)
-    *out_swizzle = data_formats[format].vk.swizzle;
-
-  return data_formats[format].vk.format;
-}
-#endif
-
-void
-gdk_data_convert (const GdkDataBuffer *self,
-                  guchar              *dest_data,
-                  gsize                dest_stride)
-{
-  data_formats[self->format].convert (self,
-                                      dest_data,
-                                      dest_stride);
-}
-
@@ -1,90 +0,0 @@
-#pragma once
-
-#include "gdkenums.h"
-#include "gdktypes.h"
-
-#include "gdkmemoryformatprivate.h"
-
-/* epoxy needs this, see https://github.com/anholt/libepoxy/issues/299 */
-#ifdef GDK_WINDOWING_WIN32
-#include <windows.h>
-#endif
-
-#include <epoxy/gl.h>
-
-#ifdef GDK_RENDERING_VULKAN
-#include <vulkan/vulkan.h>
-#endif
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GDK_DATA_NV12,
-  GDK_DATA_NV21,
-  GDK_DATA_NV16,
-  GDK_DATA_NV61,
-  GDK_DATA_NV24,
-  GDK_DATA_NV42,
-  GDK_DATA_P010,
-  GDK_DATA_P012,
-  GDK_DATA_P016,
-  GDK_DATA_YUV410,
-  GDK_DATA_YVU410,
-  GDK_DATA_YUV411,
-  GDK_DATA_YVU411,
-  GDK_DATA_YUV420,
-  GDK_DATA_YVU420,
-  GDK_DATA_YUV422,
-  GDK_DATA_YVU422,
-  GDK_DATA_YUV444,
-  GDK_DATA_YVU444,
-  GDK_DATA_YUYV,
-  GDK_DATA_YVYU,
-  GDK_DATA_UYVY,
-  GDK_DATA_VYUY,
-  GDK_DATA_BGRX8_A8,
-  GDK_DATA_RGBX8_A8,
-  GDK_DATA_XRGB8_A8,
-  GDK_DATA_XBGR8_A8,
-
-  GDK_DATA_N_FORMATS
-} GdkDataFormat;
-
-#define GDK_DATA_FORMAT_MAX_PLANES 4
-
-typedef struct _GdkDataBuffer GdkDataBuffer;
-
-struct _GdkDataBuffer
-{
-  GdkDataFormat format;
-  gsize width;
-  gsize height;
-  struct {
-    const guchar *data;
-    gsize stride;
-  } planes[GDK_DATA_FORMAT_MAX_PLANES];
-};
-
-const char *            gdk_data_format_get_name                        (GdkDataFormat               format) G_GNUC_CONST;
-GdkMemoryFormat         gdk_data_format_get_conversion                  (GdkDataFormat               format) G_GNUC_CONST;
-gsize                   gdk_data_format_n_planes                        (GdkDataFormat               format) G_GNUC_CONST;
-gsize                   gdk_data_format_alignment                       (GdkDataFormat               format) G_GNUC_CONST;
-gsize                   gdk_data_format_block_width                     (GdkDataFormat               format) G_GNUC_CONST;
-gsize                   gdk_data_format_block_height                    (GdkDataFormat               format) G_GNUC_CONST;
-gboolean                gdk_data_format_is_yuv                          (GdkDataFormat               format) G_GNUC_CONST;
-
-gboolean                gdk_data_format_find_by_dmabuf_fourcc           (guint32                     fourcc,
-                                                                         GdkDataFormat              *out_format);
-guint32                 gdk_data_format_get_dmabuf_fourcc               (GdkDataFormat               format) G_GNUC_CONST;
-
-#ifdef GDK_RENDERING_VULKAN
-VkFormat                gdk_data_format_vk_format                       (GdkDataFormat               format,
-                                                                         VkComponentMapping         *out_swizzle);
-#endif
-
-void                    gdk_data_convert                                (const GdkDataBuffer        *self,
-                                                                         guchar                     *dest_data,
-                                                                         gsize                       dest_stride);
-
-G_END_DECLS
-
@@ -64,7 +64,6 @@ typedef enum {
  GDK_FEATURE_DMABUF           = 1 << 7,
  GDK_FEATURE_OFFLOAD          = 1 << 8,
  GDK_FEATURE_COLOR_MANAGEMENT = 1 << 9,
-  GDK_FEATURE_AEROSNAP         = 1 << 10,
 } GdkFeatures;

 #define GDK_ALL_FEATURES ((1 << 10) - 1)
@@ -120,4 +119,3 @@ guint gdk_parse_debug_var (const char        *variable,
                           const GdkDebugKey *keys,
                           guint              nkeys);

-G_END_DECLS
@@ -1198,9 +1198,8 @@ gdk_display_get_app_launch_context (GdkDisplay *display)
 GdkDisplay *
 gdk_display_open (const char *display_name)
 {
-  gdk_ensure_initialized ();
-
-  return gdk_display_manager_open_display (gdk_display_manager_get (), display_name);
+  return gdk_display_manager_open_display (gdk_display_manager_get (),
+                                           display_name);
 }

 gulong
@@ -28,7 +28,6 @@
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkkeysprivate.h"
-#include "gdkprivate.h"
 #include <glib/gi18n-lib.h>

 #ifdef GDK_WINDOWING_X11
@@ -295,8 +294,6 @@ gdk_display_manager_get (void)
 {
  static GdkDisplayManager *manager = NULL;

-  gdk_ensure_initialized ();
-
  if (manager == NULL)
    manager = g_object_new (GDK_TYPE_DISPLAY_MANAGER, NULL);

@@ -332,9 +329,6 @@ gdk_display_manager_get_default_display (GdkDisplayManager *manager)
 GdkDisplay *
 gdk_display_get_default (void)
 {
-  if (!gdk_is_initialized ())
-    return NULL;
-
  return gdk_display_manager_get_default_display (gdk_display_manager_get ());
 }

@@ -51,12 +51,6 @@ typedef enum {
  GDK_VULKAN_FEATURE_SWAPCHAIN_MAINTENANCE      = 1 << 5,
 } GdkVulkanFeatures;

-#define GDK_VULKAN_N_FEATURES 6
-
-#ifdef GDK_RENDERING_VULKAN
-extern const GdkDebugKey gdk_vulkan_feature_keys[];
-#endif
-
 /* Tracks information about the device grab on this display */
 typedef struct
 {
@@ -160,6 +154,7 @@ struct _GdkDisplayClass
  void                       (*beep)               (GdkDisplay *display);
  void                       (*sync)               (GdkDisplay *display);
  void                       (*flush)              (GdkDisplay *display);
+  gboolean                   (*has_pending)        (GdkDisplay *display);
  void                       (*queue_events)       (GdkDisplay *display);
  void                       (*make_default)       (GdkDisplay *display);

@@ -231,7 +231,6 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
 typedef struct _GskRenderer GskRenderer;

 extern GskRenderer *   gsk_gl_renderer_new                      (void);
-extern GskRenderer *   gsk_ngl_renderer_new                     (void);
 extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
                                                                 GdkDisplay   *display,
                                                                 GError      **error);
@@ -275,7 +274,7 @@ gdk_dmabuf_egl_init (GdkDisplay *display)
      return;
    }

-  renderer = gsk_ngl_renderer_new ();
+  renderer = gsk_gl_renderer_new ();

  if (!gsk_renderer_realize_for_display (renderer, display, &error))
    {
@@ -55,6 +55,6 @@ GDK_AVAILABLE_IN_4_14
 gboolean           gdk_dmabuf_formats_equal           (const GdkDmabufFormats *formats1,
                                                       const GdkDmabufFormats *formats2);

-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GdkDmabufFormats, gdk_dmabuf_formats_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GdkDmabufFormats, gdk_dmabuf_formats_unref);

 G_END_DECLS
@@ -50,4 +50,17 @@ gboolean                    gdk_dmabuf_sanitize                 (GdkDmabuf

 gboolean                    gdk_dmabuf_is_disjoint              (const GdkDmabuf                *dmabuf);

+gboolean                    gdk_dmabuf_fourcc_is_yuv            (guint32                         fourcc,
+                                                                 gboolean                       *is_yuv);
+gboolean                    gdk_dmabuf_get_memory_format        (guint32                         fourcc,
+                                                                 gboolean                        premultiplied,
+                                                                 GdkMemoryFormat                *out_format);
+#ifdef GDK_RENDERING_VULKAN
+gboolean                    gdk_dmabuf_vk_get_nth               (gsize                           n,
+                                                                 guint32                        *fourcc,
+                                                                 VkFormat                       *vk_format);
+VkFormat                    gdk_dmabuf_get_vk_format            (guint32                         fourcc,
+                                                                 VkComponentMapping             *out_components);
+#endif
+
 #endif
@@ -21,7 +21,6 @@
 #include "gdkdmabuftextureprivate.h"

 #include "gdkcolorstateprivate.h"
-#include "gdkdataformatprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdmabufdownloaderprivate.h"
 #include "gdkdmabufformatsbuilderprivate.h"
@@ -106,9 +105,8 @@ static gboolean
 gdk_dmabuf_texture_invoke_callback (gpointer data)
 {
  Download *download = data;
-  //GdkDisplay *display = download->texture->display;
+  GdkDisplay *display = download->texture->display;

-#if 0
  if (display->egl_downloader &&
      gdk_dmabuf_downloader_download (display->egl_downloader,
                                      download->texture,
@@ -129,9 +127,8 @@ gdk_dmabuf_texture_invoke_callback (gpointer data)
    {
      /* Successfully downloaded using Vulkan */
    }
-#endif
 #ifdef HAVE_DMABUF
-  if (gdk_dmabuf_download_mmap (GDK_TEXTURE (download->texture),
+  else if (gdk_dmabuf_download_mmap (GDK_TEXTURE (download->texture),
                                     download->format,
                                     download->color_state,
                                     download->data,
@@ -211,9 +208,6 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
  GdkColorState *color_state;
  int width, height;
  gboolean premultiplied;
-  GdkMemoryFormat format;
-  GdkDataFormat data_format;
-  gboolean is_yuv;

  display = gdk_dmabuf_texture_builder_get_display (builder);
  width = gdk_dmabuf_texture_builder_get_width (builder);
@@ -227,39 +221,14 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
                            error))
    return NULL;

-  if (gdk_memory_format_find_by_dmabuf_fourcc (dmabuf.fourcc, premultiplied, &format))
-    {
-      is_yuv = FALSE;
-    }
-  else if (gdk_data_format_find_by_dmabuf_fourcc (dmabuf.fourcc, &data_format))
-    {
-      format = gdk_data_format_get_conversion (data_format);
-      is_yuv = gdk_data_format_is_yuv (data_format);
-    }
-  else
-    {
-      g_set_error (error,
-                   GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT,
-                   "Unsupported dmabuf format %.4s",
-                   (char *) &dmabuf.fourcc);
-      return NULL;
-    }
-
  gdk_display_init_dmabuf (display);

-  if (!gdk_dmabuf_formats_contains (display->dmabuf_formats, dmabuf.fourcc, dmabuf.modifier))
-    {
-      g_set_error (error,
-                   GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT,
-                   "Unsupported dmabuf format: %.4s:%#" G_GINT64_MODIFIER "x",
-                   (char *) &dmabuf.fourcc, dmabuf.modifier);
-      return NULL;
-    }
-
  color_state = gdk_dmabuf_texture_builder_get_color_state (builder);
  if (color_state == NULL)
    {
-      if (is_yuv)
+      gboolean is_yuv;
+
+      if (gdk_dmabuf_fourcc_is_yuv (dmabuf.fourcc, &is_yuv) && is_yuv)
        {
          g_warning_once ("FIXME: Implement the proper colorstate for YUV dmabufs");
          color_state = gdk_color_state_get_srgb ();
@@ -275,9 +244,27 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
                       NULL);

  g_set_object (&self->display, display);
-  GDK_TEXTURE (self)->format = format;
  self->dmabuf = dmabuf;

+  if (!gdk_dmabuf_get_memory_format (dmabuf.fourcc, premultiplied, &(GDK_TEXTURE (self)->format)))
+    {
+      GDK_DISPLAY_DEBUG (display, DMABUF,
+                         "Falling back to generic RGBA for dmabuf format %.4s",
+                         (char *) &dmabuf.fourcc);
+      GDK_TEXTURE (self)->format = premultiplied ? GDK_MEMORY_R8G8B8A8_PREMULTIPLIED
+                                                 : GDK_MEMORY_R8G8B8A8;
+    }
+
+  if (!gdk_dmabuf_formats_contains (display->dmabuf_formats, dmabuf.fourcc, dmabuf.modifier))
+    {
+      g_set_error (error,
+                   GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT,
+                   "Unsupported dmabuf format: %.4s:%#" G_GINT64_MODIFIER "x",
+                   (char *) &dmabuf.fourcc, dmabuf.modifier);
+      g_object_unref (self);
+      return NULL;
+    }
+
  GDK_DISPLAY_DEBUG (display, DMABUF,
                     "Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u",
                     (char *) &dmabuf.fourcc, dmabuf.modifier,
@@ -375,7 +375,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
  /**
   * GdkDmabufTextureBuilder:update-region:
   *
-   * The update region for [property@Gdk.DmabufTextureBuilder:update-texture].
+   * The update region for [property@Gdk.GLTextureBuilder:update-texture].
   *
   * Since: 4.14
   */
@@ -496,7 +496,7 @@ gdk_dmabuf_texture_builder_get_width (GdkDmabufTextureBuilder *self)
 *
 * Sets the width of the texture.
 *
- * The width must be set before calling [method@Gdk.DmabufTextureBuilder.build].
+ * The width must be set before calling [method@Gdk.GLTextureBuilder.build].
 *
 * Since: 4.14
 */
@@ -540,7 +540,7 @@ gdk_dmabuf_texture_builder_get_height (GdkDmabufTextureBuilder *self)
 *
 * Sets the height of the texture.
 *
- * The height must be set before calling [method@Gdk.DmabufTextureBuilder.build].
+ * The height must be set before calling [method@Gdk.GLTextureBuilder.build].
 *
 * Since: 4.14
 */
@@ -588,7 +588,7 @@ gdk_dmabuf_texture_builder_get_fourcc (GdkDmabufTextureBuilder *self)
 *
 * The format is specified as a fourcc code.
 *
- * The format must be set before calling [method@Gdk.DmabufTextureBuilder.build].
+ * The format must be set before calling [method@Gdk.GLTextureBuilder.build].
 *
 * Since: 4.14
 */
@@ -807,7 +807,7 @@ gdk_dmabuf_texture_builder_get_stride (GdkDmabufTextureBuilder *self,
 *
 * Sets the stride for a plane.
 *
- * The stride must be set for all planes before calling [method@Gdk.DmabufTextureBuilder.build].
+ * The stride must be set for all planes before calling [method@Gdk.GLTextureBuilder.build].
 *
 * Since: 4.14
 */
@@ -876,7 +876,7 @@ gdk_dmabuf_texture_builder_set_offset (GdkDmabufTextureBuilder *self,
 *
 * Gets the color state previously set via gdk_dmabuf_texture_builder_set_color_state().
 *
- * Returns: (nullable) (transfer none): the color state
+ * Returns: (nullable): the color state
 *
 * Since: 4.16
 */
@@ -87,12 +87,12 @@ typedef enum
 /**
 * GdkModifierType:
 * @GDK_SHIFT_MASK: the Shift key.
- * @GDK_LOCK_MASK: a Lock key (depending on the Windowing System configuration,
- *    this may either be <kbd>CapsLock</kbd> or <kbd>ShiftLock</kbd>).
+ * @GDK_LOCK_MASK: a Lock key (depending on the modifier mapping of the
+ *  X server this may either be CapsLock or ShiftLock).
 * @GDK_CONTROL_MASK: the Control key.
- * @GDK_ALT_MASK: the fourth modifier key (it depends on the Windowing System
- *    configuration which key is interpreted as this modifier, but normally it
- *    is the <kbd>Alt</kbd> key).
+ * @GDK_ALT_MASK: the fourth modifier key (it depends on the modifier
+ *  mapping of the X server which key is interpreted as this modifier, but
+ *  normally it is the Alt key).
 * @GDK_BUTTON1_MASK: the first mouse button.
 * @GDK_BUTTON2_MASK: the second mouse button.
 * @GDK_BUTTON3_MASK: the third mouse button.
@@ -109,7 +109,7 @@ typedef enum
 * Apple, CapsLock or ShiftLock.
 *
 * Note that GDK may add internal values to events which include values outside
- * of this enumeration. Your code should preserve and ignore them. You can use
+ * of this enumeration. Your code should preserve and ignore them.  You can use
 * %GDK_MODIFIER_MASK to remove all private values.
 */
 typedef enum
@@ -3444,4 +3444,4 @@ gdk_grab_broken_event_get_implicit (GdkEvent *event)

 /* }}} */

-/* vim:set foldmethod=marker: */
+/* vim:set foldmethod=marker expandtab: */
@@ -103,7 +103,7 @@

 #define DEFAULT_ALLOWED_APIS GDK_GL_API_GL | GDK_GL_API_GLES

-const GdkDebugKey gdk_gl_feature_keys[] = {
+static const GdkDebugKey gdk_gl_feature_keys[] = {
  { "debug", GDK_GL_FEATURE_DEBUG, "GL_KHR_debug" },
  { "base-instance", GDK_GL_FEATURE_BASE_INSTANCE, "GL_ARB_base_instance" },
  { "buffer-storage", GDK_GL_FEATURE_BUFFER_STORAGE, "GL_EXT_buffer_storage" },
@@ -382,6 +382,8 @@ gdk_gl_context_create_egl_context (GdkGLContext *context,
  if (ctx == EGL_NO_CONTEXT)
    return 0;

+  GDK_DISPLAY_DEBUG (display, OPENGL, "Created EGL context[%p]", ctx);
+
  priv->egl_context = ctx;
  gdk_gl_context_set_version (context, &supported_versions[j]);
  gdk_gl_context_set_is_legacy (context, legacy);
@@ -1750,20 +1752,22 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
    {
      int i, max_texture_size;
      glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_texture_size);
-      gdk_debug_message ("%s version: %d.%d (%s)",
+      gdk_debug_message ("%s version: %d.%d (%s)\n"
+                         "* GLSL version: %s\n"
+                         "* Max texture size: %d\n",
                         gdk_gl_context_get_use_es (context) ? "OpenGL ES" : "OpenGL",
                         gdk_gl_version_get_major (&priv->gl_version), gdk_gl_version_get_minor (&priv->gl_version),
-                         priv->is_legacy ? "legacy" : "core");
-      gdk_debug_message ("GLSL version: %s", glGetString (GL_SHADING_LANGUAGE_VERSION));
-      gdk_debug_message ("Max texture size: %d", max_texture_size);
+                         priv->is_legacy ? "legacy" : "core",
+                         glGetString (GL_SHADING_LANGUAGE_VERSION),
+                         max_texture_size);
      gdk_debug_message ("Enabled features (use GDK_GL_DISABLE env var to disable):");
      for (i = 0; i < G_N_ELEMENTS (gdk_gl_feature_keys); i++)
        {
          gdk_debug_message ("    %s: %s",
                             gdk_gl_feature_keys[i].key,
-                             (priv->features & gdk_gl_feature_keys[i].value) ? "✓" :
+                             (priv->features & gdk_gl_feature_keys[i].value) ? "YES" :
                             ((disabled_features & gdk_gl_feature_keys[i].value) ? "disabled via env var" :
-                             (((supported_features & gdk_gl_feature_keys[i].value) == 0) ? "✗" :
+                             (((supported_features & gdk_gl_feature_keys[i].value) == 0) ? "not supported" :
                             "Hum, what? This should not happen.")));
        }
    }
@@ -24,7 +24,6 @@
 #include "gdkdrawcontextprivate.h"
 #include "gdkglversionprivate.h"
 #include "gdkdmabufprivate.h"
-#include "gdkdebugprivate.h"

 G_BEGIN_DECLS

@@ -34,10 +33,6 @@ typedef enum {
  GDK_GL_FEATURE_BUFFER_STORAGE             = 1 << 2,
 } GdkGLFeatures;

-#define GDK_GL_N_FEATURES 3
-
-extern const GdkDebugKey gdk_gl_feature_keys[];
-
 typedef enum {
  GDK_GL_NONE = 0,
  GDK_GL_EGL,
@@ -647,7 +647,7 @@ gdk_gl_texture_builder_set_sync (GdkGLTextureBuilder *self,
 *
 * Gets the color state previously set via gdk_gl_texture_builder_set_color_state().
 *
- * Returns: (transfer none): the color state
+ * Returns: the color state
 *
 * Since: 4.16
 */
@@ -1971,31 +1971,6 @@ gdk_memory_format_vk_rgba_format (GdkMemoryFormat     format,
 }
 #endif

-gboolean
-gdk_memory_format_find_by_dmabuf_fourcc (guint32          fourcc,
-                                         gboolean         premultiplied,
-                                         GdkMemoryFormat *out_format)
-{
-#ifdef HAVE_DMABUF
-  gsize i;
-
-  for (i = 0; i < G_N_ELEMENTS (memory_formats); i++)
-    {
-      if (memory_formats[i].dmabuf_fourcc == fourcc)
-        {
-          if (premultiplied)
-            *out_format = memory_formats[i].premultiplied;
-          else
-            *out_format = memory_formats[i].straight;
-          return TRUE;
-        }
-    }
-#endif
-
-  *out_format = GDK_MEMORY_N_FORMATS;
-  return FALSE;
-}
-
 /*
 * gdk_memory_format_get_dmabuf_fourcc:
 * @format: The memory format
@@ -22,11 +22,6 @@
 #include "gdkenums.h"
 #include "gdktypes.h"

-/* epoxy needs this, see https://github.com/anholt/libepoxy/issues/299 */
-#ifdef GDK_WINDOWING_WIN32
-#include <windows.h>
-#endif
-
 #include <epoxy/gl.h>

 #ifdef GDK_RENDERING_VULKAN
@@ -95,10 +90,6 @@ VkFormat                gdk_memory_format_vk_rgba_format    (GdkMemoryFormat
                                                             GdkMemoryFormat            *out_rgba_format,
                                                             VkComponentMapping         *out_swizzle);
 #endif
-gboolean                gdk_memory_format_find_by_dmabuf_fourcc
-                                                            (guint32                     fourcc,
-                                                             gboolean                    premultiplied,
-                                                             GdkMemoryFormat            *out_format);
 guint32                 gdk_memory_format_get_dmabuf_fourcc (GdkMemoryFormat             format);
 const char *            gdk_memory_format_get_name          (GdkMemoryFormat             format);

@@ -5,13 +5,6 @@
 /* Private API for use in GTK+ */

 void            gdk_pre_parse                   (void);
-gboolean        gdk_is_initialized              (void);
-
-#define gdk_ensure_initialized() \
-G_STMT_START { \
-  if (!gdk_is_initialized ()) \
-    g_error ("%s() was called before gtk_init()", G_STRFUNC); \
-} G_STMT_END

 gboolean gdk_running_in_sandbox (void);
 gboolean gdk_should_use_portal (void);
@@ -2940,7 +2940,6 @@ check_autohide (GdkEvent *event)
        {
          event_surface = gdk_event_get_surface (event);
          if (event_surface->autohide &&
-              evtype != GDK_TOUCH_BEGIN &&
              !event_surface->has_pointer)
            event_surface = NULL;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	6c5e8515b7	gsk: Rename ngl to gl For now, this is just doing the code reshuffling. The environment variable still expects you to set GSK_RENDERER=ngl gsk_ngl_renderer_new is still around, deprecated, and returns a renderer that fails to realize. The gsk/gl/gskglrenderer.h is still installed, but including it triggers a deprecation warning.	2024-10-03 21:53:58 -04:00
Matthias Clasen	37c24ba186	Use the gl renderer again everywhere We're renaming ngl back to gl.	2024-10-03 21:53:58 -04:00
Matthias Clasen	0dcb35047e	Drop the gl renderer This requires cleanups in quite a few places.	2024-10-03 21:53:58 -04:00
Matthias Clasen	971ee42321	tools: Drop support for the gl renderer The GL renderer is going away in 4.18.	2024-10-03 21:53:58 -04:00