Improve window size for long text tooltips

When a tooltip reaches the hardcoded limit of 50
chars it will wrap to a new line, but keeps the
window's width same as if it were just one line.

From GtkLabel docs:
"For wrapping labels, width-chars is used as the
minimum width, if specified, and max-width-chars
is used as the natural width."

So we detect for this case and set label's width-chars
property, so we set the minimum size to a lesser value.

Fixes #5521

.gitlab-ci.yml

@@ -26,31 +26,25 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v42"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v40"
+  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
 
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-default:
-  retry:
-    max: 2
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-  interruptible: true
+.only-default:
+  only:
+    - branches
+  except:
+    - tags
 
 style-check-diff:
+  extends: .only-default
   image: $FEDORA_IMAGE
   stage: check
-  when: manual
+  allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
+  extends: .only-default
   image: $FEDORA_IMAGE
   artifacts:
     when: always
@@ -60,10 +54,6 @@ style-check-diff:
         - "${CI_PROJECT_DIR}/_build/report-x11_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland_unstable.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles_unstable.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_smalltexture.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_smalltexture_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway_unstable.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
@@ -108,8 +98,7 @@ fedora-x86_64:
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
     - .gitlab-ci/run-tests.sh _build x11
     - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
-    - .gitlab-ci/run-tests.sh _build wayland_smalltexture
+    - .gitlab-ci/run-tests.sh _build waylandgles
     - .gitlab-ci/run-tests.sh _build broadway
 
 release-build:
@@ -171,6 +160,7 @@ fedora-mingw64:
     - ninja -C _build
 
 .mingw-defaults:
+  extends: .only-default
   stage: build
   tags:
     - win32-ps
@@ -202,8 +192,9 @@ msys2-mingw64:
 macos:
   # Sadly, this fails regularly, and its failure is never enlightening
   allow_failure: true
-  rules:
-    - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  extends: .only-default
+  only:
+    - branches@GNOME/gtk
   stage: build
   tags:
     - macos
@@ -236,9 +227,10 @@ macos:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 vs2017-x64:
+  extends: .only-default
   # TODO: Uncomment this when ready to merge.
-  # rules:
-  #   - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  #only:
+  #  - branches@GNOME/gtk
   stage: build
   tags:
     - win32-ps
@@ -251,7 +243,7 @@ vs2017-x64:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 .flatpak-defaults:
-  image: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
   tags:
@@ -261,67 +253,65 @@ vs2017-x64:
       - "${APPID}-dev.flatpak"
       - 'repo.tar'
     expire_in: 1 day
-  rules:
-    # Only build Flatpak bundles automatically on main
-    - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH != "main"
-      when: "manual"
   script:
     - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
 
-flatpak:demo:
-  extends: '.flatpak-defaults'
+# Manual jobs, for branches and MRs
+.flatpak-manual:
+  extends: .flatpak-defaults
+  when: manual
+
+# Only build Flatpak bundles automatically on main
+.flatpak-main:
+  extends: .flatpak-defaults
+  only:
+    - main
+
+flatpak-manual:demo:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:demo:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:demo:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:widget-factory:
-  extends: '.flatpak-defaults'
+flatpak-manual:widget-factory:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:widget-factory:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:widget-factory:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:icon-browser:
-  extends: '.flatpak-defaults'
+flatpak-manual:icon-browser:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:icon-browser:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:icon-browser:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:node-editor:
-  extends: '.flatpak-defaults'
+flatpak-manual:node-editor:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
-flatpak:node-editor:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:node-editor:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
@@ -330,35 +320,23 @@ flatpak:node-editor:aarch64:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
     extends: '.publish_nightly'
-    needs: ['flatpak:demo']
-
-nightly demo aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:demo:aarch64']
+    dependencies: ['flatpak-main:demo']
+    needs: ['flatpak-main:demo']
 
 nightly factory:
     extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory']
-
-nightly factory aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory:aarch64']
+    dependencies: ['flatpak-main:widget-factory']
+    needs: ['flatpak-main:widget-factory']
 
 nightly icon-browser:
     extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser']
-
-nightly icon-browser aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser:aarch64']
+    dependencies: ['flatpak-main:icon-browser']
+    needs: ['flatpak-main:icon-browser']
 
 nightly node-editor:
     extends: '.publish_nightly'
-    needs: ['flatpak:node-editor']
-
-nightly node-editor aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:node-editor:aarch64']
+    dependencies: ['flatpak-main:node-editor']
+    needs: ['flatpak-main:node-editor']
 
 static-scan:
   image: $FEDORA_IMAGE
@@ -386,7 +364,6 @@ asan-build:
   tags: [ asan ]
   stage: analysis
   needs: []
-  when: manual
   variables:
   script:
     - export PATH="$HOME/.local/bin:$PATH"
@@ -441,9 +418,9 @@ reference:
 publish-docs:
   image: fedora:latest
   stage: publish
-  interruptible: false
   needs: ['reference']
   script:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "main"
+  only:
+    refs:
+      - main

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:37
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -82,7 +82,6 @@ RUN dnf -y install \
     python3-gobject \
     python3-jinja2 \
     python3-markdown \
-    python3-packaging \
     python3-pip \
     python3-pygments \
     python3-typogrify \

.gitlab-ci/flatpak-build.sh

@@ -20,7 +20,6 @@ flatpak build ${builddir} meson \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
                 -Dbuild-tests=false \
-                -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
                 -Ddemos=true \

.gitlab-ci/run-docker.sh

@@ -23,7 +23,6 @@ push=0
 list=0
 print_help=0
 no_login=0
-no_cache=0
 
 while (($# > 0)); do
         case "${1%%=*}" in
@@ -35,7 +34,6 @@ while (($# > 0)); do
                 --base|-b) read_arg base "$@" || shift;;
                 --version|-v) read_arg base_version "$@" || shift;;
                 --no-login) no_login=1;;
-                --no-cache) no_cache=1;;
                 *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
         esac
         shift
@@ -105,21 +103,11 @@ TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
 
 if [ $build == 1 ]; then
         echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        if [ $no_cache == 0 ]; then
-                ${CMD} build \
-                        ${format} \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        else
-                ${CMD} build \
-                        ${format} \
-                        --no-cache \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        fi
-
+        ${CMD} build \
+                ${format} \
+                --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
         exit $?
 fi
 

.gitlab-ci/run-tests.sh

@@ -36,7 +36,7 @@ case "${backend}" in
                 --suite=failing || true
     ;;
 
-  wayland*)
+  wayland)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
@@ -63,6 +63,33 @@ case "${backend}" in
     kill ${compositor}
     ;;
 
+  waylandgles)
+    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+    weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
+    compositor=$!
+    export WAYLAND_DISPLAY=wayland-6
+
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend} \
+                --suite=gtk \
+                --no-suite=failing \
+                --no-suite=flaky \
+                --no-suite=gsk-compare-broadway
+    exit_code=$?
+
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend}_unstable \
+                --suite=flaky \
+                --suite=failing || true
+
+    kill ${compositor}
+    ;;
+
   broadway)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 

CONTRIBUTING.md

@@ -21,7 +21,7 @@ many things that we value:
 Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:
 
- - the `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org)
+ - the `#gtk` IRC channel on irc.gnome.org
  - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
 
 You can also look at the GTK tag on [Stack
@@ -44,7 +44,6 @@ If you're reporting a bug make sure to list:
 
  0. which version of GTK are you using?
  0. which operating system are you using?
- 0. what display and graphics driver are you using?
  0. the necessary steps to reproduce the issue
  0. the expected outcome
  0. a description of the behavior; screenshots are also welcome

NEWS

@@ -1,219 +1,6 @@
-Overview of Changes in 4.11.1, xx-xx-xxxx
-=========================================
-
-Overview of Changes in 4.10.1, 14-03-2023
-=========================================
-
-* GtkFileChooser
- - Improve search performance
- - Be safe against pathless files
- - Fix memory leaks
- - Only show local files in recent files
- - Show most recent files first
- - Make files non-selectable in selet_folder mode
-
-* GtkListView / GtkColumnView / GtkGridView
- - Fix scrolling problems
- - Support CSS border-spacing
-
-* GtkComboBox
- - Fix a size allocation problem
-
-* gtk
- - Size allocation fixes
-
-* Accessibility
- - Miscellaneous property fixes and improvements
-
-* Wayland
- - Fix an ordering problem in surface disposal
-
-* Windows
- - Fix Visual Studio build with older GLib
-
-* Translation updates
- Basque
- Bulgarian
- Catalan
- Czech
- Danish
- Finnish
- Friulian
- Galician
- Georgian
- Hungarian
- Lithuanian
- Polish
- Portuguese
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.10.0, 04-03-2023
-=========================================
-
-* GtkTextView
- - Document hanging indentation
-
-* GtkListView
- - Fix a size allocation problem
-
-* GtkFileChooser
- - Fix paned behavior
- - Fix a crash
-
-* GtkText
- - Fix various problems with undo
-
-* Accessibility
- - Make some getters transfer-full
- - Allow setting accessible parents and siblings
- - Add a role for toggle buttons
- - Miscellaneous property fixes and improvements
-
-* gtk
- - Improve the handling resize-during-size-allocate
-
-* gdk
- - Introduce GdkTextureDownloader and use it
- - Make gdk_texture_get_format public
-
-* gsk
- - Make mask nodes more versatile
- - Improve the GL implementation for texture scale nodes
-
-* X11
- - Fix key handling during DND
-
-* Tools
- - gtk-builder-tool: Try harder to handle templates
- - gtk-builder-tool: Prefer properties over <child>
-
-* Translation updates
- Basque
- Belarusian
- Bulgarian
- Indonesian
- Galician
- Georgian
- German
- Hebrew
- Lithuanian
- Portuguese
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.4, 12-02-2023
+Overview of Changes in 4.9.3, xx-xx-xxxx
 ========================================
 
-* Printing:
- - Add a CPDB backend
- - Drop the lpr backend
-
-* GtkFileDialog:
- - Robustness fixes
-
-* GtkScaleButton:
- - Add an 'active' property
-
-* GtkSearchEntry:
- - Add placeholder text
-
-* Fix conflicting type names between gtk and gio
-
-* Gsk:
- - Settable filtering for scaled textures
- - Add mask nodes
- - Some robustness and crash fixes
-
-* Wayland:
- - Handle dispatch failing in more places
-
-* Deprecations:
- - GtkVolumeButton
-
-* Translation updates:
- Belarusian
- Chinese (Taiwan)
- Georgian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.3, 04-02-2023
-========================================
-
-* Add GtkUriLauncher, as replacement for gtk_show_uri
-
-* Add GdkMonitor::description
-
-* Fix problems with tooltip sizing
-
-* Deprecations:
- - GtkStatusbar
- - GtkAssistant
- - GtkLockButton
- - gtk_gesture_set_sequence_state
-
-* GtkColumnView:
- - Only create widgets for visible columns
-
-* GtkFileDialog:
- - Drop shortcut folders API
-
-* GtkCalendar:
- - Make marked days work again
-
-* GtkSwitch:
- - Make state and active independently settable
-
-* GtkFileChooser:
- - Fix a crash with DND
- - Fix excessively wide sidebar
- - Make context menus work again
-
-* Accessibility:
- - Make GtkAccessible public, so it can be implemented outside GTK
- - Support accessible implementation for editables
-
-* CSS:
- - Fix randomly stopping CSS animations
-
-* GL:
- - Fix synchronization with GStreamer
- - Fix problems with 3rd party GL in the same thread
-
-* Wayland:
- - Fix startup notification with xdg_activation
-
-* Broadway:
- - Implement modal windows
-
-* macOS:
- - Make DND work
-
-* Build:
- - Require graphene 1.10
- - Require gobject-introspection 1.72
-
-* Translation updates
- Catalan
- Galician
- German
- Hebrew
- Indonesian
- Portuguese
- Russian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
 Overview of Changes in 4.9.2, 26-12-2022
 ========================================
 

demos/constraint-editor/meson.build

@@ -9,7 +9,7 @@ constraint_editor_sources = [
 
 constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
   'constraint-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-constraint-editor',

demos/gtk-demo/application.c

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 

demos/gtk-demo/assistant.c

@@ -7,8 +7,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *progress_bar = NULL;
 
 static gboolean

demos/gtk-demo/builder.c

@@ -37,8 +37,6 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static gboolean
 pop_status (gpointer data)
 {
@@ -59,8 +57,6 @@ status_message (GtkStatusbar *status,
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
-G_GNUC_END_IGNORE_DEPRECATIONS
-
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,

demos/gtk-demo/demo.gresource.xml

@@ -215,12 +215,6 @@
     <file>demo3widget.h</file>
     <file>demo3widget.ui</file>
   </gresource>
-  <gresource prefix="/mask">
-    <file>demo4widget.c</file>
-    <file>demo4widget.h</file>
-    <file>hsla.h</file>
-    <file>hsla.c</file>
-  </gresource>
   <gresource prefix="/paintable_svg">
     <file>svgpaintable.h</file>
     <file>svgpaintable.c</file>
@@ -317,7 +311,6 @@
     <file>list_store.c</file>
     <file>main.c</file>
     <file>markup.c</file>
-    <file>mask.c</file>
     <file>menu.c</file>
     <file>overlay.c</file>
     <file>overlay_decorative.c</file>

demos/gtk-demo/demo3widget.c

@@ -3,20 +3,16 @@
 
 enum
 {
-  PROP_TEXTURE = 1,
-  PROP_FILTER,
-  PROP_SCALE,
-  PROP_ANGLE,
+  PROP_PAINTABLE = 1,
+  PROP_SCALE
 };
 
 struct _Demo3Widget
 {
   GtkWidget parent_instance;
 
-  GdkTexture *texture;
+  GdkPaintable *paintable;
   float scale;
-  float angle;
-  GskScalingFilter filter;
 
   GtkWidget *menu;
 };
@@ -28,86 +24,10 @@ struct _Demo3WidgetClass
 
 G_DEFINE_TYPE (Demo3Widget, demo3_widget, GTK_TYPE_WIDGET)
 
-static gboolean
-query_tooltip (GtkWidget  *widget,
-               int         x,
-               int         y,
-               gboolean    keyboard_mode,
-               GtkTooltip *tooltip,
-               gpointer    data)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  GtkWidget *grid;
-  GtkWidget *label;
-  char *s, *s2;
-  const char *filter[] = { "Linear", "Nearest", "Trilinear" };
-  int precision, l;
-
-  grid = gtk_grid_new ();
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-  label = gtk_label_new ("Texture");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
-  s = g_strdup_printf ("%d\342\200\206\303\227\342\200\206%d",
-                       gdk_texture_get_width (self->texture),
-                       gdk_texture_get_height (self->texture));
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
-
-  label = gtk_label_new ("Rotation");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
-  s = g_strdup_printf ("%.1f", self->angle);
-  if (g_str_has_suffix (s, ".0"))
-    s[strlen (s) - 2] = '\0';
-  s2 = g_strconcat (s, "\302\260", NULL);
-  label = gtk_label_new (s2);
-  g_free (s2);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
-
-  label = gtk_label_new ("Scale");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
-
-  precision = 1;
-  do {
-    s = g_strdup_printf ("%.*f", precision, self->scale);
-    l = strlen (s) - 1;
-    while (s[l] == '0')
-      l--;
-    if (s[l] == '.')
-      s[l] = '\0';
-    precision++;
-  } while (strcmp (s, "0") == 0);
-
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
-
-  label = gtk_label_new ("Filter");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
-  label = gtk_label_new (filter[self->filter]);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 3, 1, 1);
-
-  gtk_tooltip_set_custom (tooltip, grid);
-
-  return TRUE;
-}
-
 static void
 demo3_widget_init (Demo3Widget *self)
 {
   self->scale = 1.f;
-  self->angle = 0.f;
-  self->filter = GSK_SCALING_FILTER_LINEAR;
   gtk_widget_init_template (GTK_WIDGET (self));
 }
 
@@ -116,7 +36,7 @@ demo3_widget_dispose (GObject *object)
 {
   Demo3Widget *self = DEMO3_WIDGET (object);
 
-  g_clear_object (&self->texture);
+  g_clear_object (&self->paintable);
 
   gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);
 
@@ -129,35 +49,21 @@ demo3_widget_snapshot (GtkWidget   *widget,
 {
   Demo3Widget *self = DEMO3_WIDGET (widget);
   int x, y, width, height;
-  double w, h, w2, h2;
+  double w, h;
 
   width = gtk_widget_get_width (widget);
   height = gtk_widget_get_height (widget);
 
-  w2 = w = self->scale * gdk_texture_get_width (self->texture);
-  h2 = h = self->scale * gdk_texture_get_height (self->texture);
+  w = self->scale * gdk_paintable_get_intrinsic_width (self->paintable);
+  h = self->scale * gdk_paintable_get_intrinsic_height (self->paintable);
 
-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      double s = w2;
-      w2 = h2;
-      h2 = s;
-    }
-
-  x = (width - ceil (w2)) / 2;
-  y = (height - ceil (h2)) / 2;
+  x = MAX (0, (width - ceil (w)) / 2);
+  y = MAX (0, (height - ceil (h)) / 2);
 
   gtk_snapshot_push_clip (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
   gtk_snapshot_save (snapshot);
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (w2 / 2, h2 / 2));
-  gtk_snapshot_rotate (snapshot, self->angle);
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- w / 2, - h / 2));
-  gtk_snapshot_append_scaled_texture (snapshot,
-                                      self->texture,
-                                      self->filter,
-                                      &GRAPHENE_RECT_INIT (0, 0, w, h));
+  gdk_paintable_snapshot (self->paintable, snapshot, w, h);
   gtk_snapshot_restore (snapshot);
   gtk_snapshot_pop (snapshot);
 }
@@ -172,26 +78,14 @@ demo3_widget_measure (GtkWidget      *widget,
                       int            *natural_baseline)
 {
   Demo3Widget *self = DEMO3_WIDGET (widget);
-  int width, height;
   int size;
 
-  width = gdk_texture_get_width (self->texture);
-  height = gdk_texture_get_height (self->texture);
-
-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      int s = width;
-      width = height;
-      height = s;
-    }
-
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size = width;
+    size = gdk_paintable_get_intrinsic_width (self->paintable);
   else
-    size = height;
+    size = gdk_paintable_get_intrinsic_height (self->paintable);
 
-  *minimum = *natural = (int) ceil (self->scale * size);
+  *minimum = *natural = self->scale * size;
 }
 
 static void
@@ -209,8 +103,6 @@ demo3_widget_size_allocate (GtkWidget *widget,
   gtk_popover_present (GTK_POPOVER (self->menu));
 }
 
-static void update_actions (Demo3Widget *self);
-
 static void
 demo3_widget_set_property (GObject      *object,
                            guint         prop_id,
@@ -221,32 +113,14 @@ demo3_widget_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
-      g_clear_object (&self->texture);
-      self->texture = g_value_dup_object (value);
-      self->scale = 1.f;
-      self->angle = 0.f;
-      self->filter = GSK_SCALING_FILTER_LINEAR;
-      update_actions (self);
+    case PROP_PAINTABLE:
+      g_clear_object (&self->paintable);
+      self->paintable = g_value_dup_object (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
-      g_object_notify (object, "scale");
-      g_object_notify (object, "angle");
-      g_object_notify (object, "filter");
       break;
 
     case PROP_SCALE:
       self->scale = g_value_get_float (value);
-      update_actions (self);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
-    case PROP_ANGLE:
-      self->angle = fmodf (g_value_get_float (value), 360.f);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
-    case PROP_FILTER:
-      self->filter = g_value_get_enum (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
       break;
 
@@ -266,22 +140,14 @@ demo3_widget_get_property (GObject     *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
-      g_value_set_object (value, self->texture);
+    case PROP_PAINTABLE:
+      g_value_set_object (value, self->paintable);
       break;
 
     case PROP_SCALE:
       g_value_set_float (value, self->scale);
       break;
 
-    case PROP_ANGLE:
-      g_value_set_float (value, self->angle);
-      break;
-
-    case PROP_FILTER:
-      g_value_set_enum (value, self->filter);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -303,14 +169,6 @@ pressed_cb (GtkGestureClick *gesture,
   gtk_popover_popup (GTK_POPOVER (self->menu));
 }
 
-static void
-update_actions (Demo3Widget *self)
-{
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.in", self->scale < 1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.out", self->scale > 1./1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.reset", self->scale != 1.);
-}
-
 static void
 zoom_cb (GtkWidget  *widget,
          const char *action_name,
@@ -320,30 +178,19 @@ zoom_cb (GtkWidget  *widget,
   float scale;
 
   if (g_str_equal (action_name, "zoom.in"))
-    scale = MIN (1024., self->scale * M_SQRT2);
+    scale = MIN (10, self->scale * M_SQRT2);
   else if (g_str_equal (action_name, "zoom.out"))
-    scale = MAX (1./1024., self->scale / M_SQRT2);
-  else if (g_str_equal (action_name, "zoom.reset"))
-    scale = 1.0;
+    scale = MAX (0.01, self->scale / M_SQRT2);
   else
-    g_assert_not_reached ();
+    scale = 1.0;
+
+  gtk_widget_action_set_enabled (widget, "zoom.in", scale < 10);
+  gtk_widget_action_set_enabled (widget, "zoom.out", scale > 0.01);
+  gtk_widget_action_set_enabled (widget, "zoom.reset", scale != 1);
 
   g_object_set (widget, "scale", scale, NULL);
 }
 
-static void
-rotate_cb (GtkWidget  *widget,
-           const char *action_name,
-           GVariant   *parameter)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  int angle;
-
-  g_variant_get (parameter, "i", &angle);
-
-  g_object_set (widget, "angle", fmodf (self->angle + angle, 360.f), NULL);
-}
-
 static void
 demo3_widget_class_init (Demo3WidgetClass *class)
 {
@@ -358,31 +205,20 @@ demo3_widget_class_init (Demo3WidgetClass *class)
   widget_class->measure = demo3_widget_measure;
   widget_class->size_allocate = demo3_widget_size_allocate;
 
-  g_object_class_install_property (object_class, PROP_TEXTURE,
-      g_param_spec_object ("texture", NULL, NULL,
-                           GDK_TYPE_TEXTURE,
+  g_object_class_install_property (object_class, PROP_PAINTABLE,
+      g_param_spec_object ("paintable", "Paintable", "Paintable",
+                           GDK_TYPE_PAINTABLE,
                            G_PARAM_READWRITE));
 
   g_object_class_install_property (object_class, PROP_SCALE,
-      g_param_spec_float ("scale", NULL, NULL,
-                          1./1024., 1024., 1.0,
+      g_param_spec_float ("scale", "Scale", "Scale",
+                          0.0, 10.0, 1.0,
                           G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, PROP_ANGLE,
-      g_param_spec_float ("angle", NULL, NULL,
-                          0.0, 360.0, 0.0,
-                          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_FILTER,
-      g_param_spec_enum ("filter", NULL, NULL,
-                         GSK_TYPE_SCALING_FILTER, GSK_SCALING_FILTER_LINEAR,
-                         G_PARAM_READWRITE));
-
   /* These are the actions that we are using in the menu */
   gtk_widget_class_install_action (widget_class, "zoom.in", NULL, zoom_cb);
   gtk_widget_class_install_action (widget_class, "zoom.out", NULL, zoom_cb);
   gtk_widget_class_install_action (widget_class, "zoom.reset", NULL, zoom_cb);
-  gtk_widget_class_install_action (widget_class, "rotate", "i", rotate_cb);
 
   gtk_widget_class_set_template_from_resource (widget_class, "/menu/demo3widget.ui");
   gtk_widget_class_bind_template_child (widget_class, Demo3Widget, menu);
@@ -393,18 +229,16 @@ GtkWidget *
 demo3_widget_new (const char *resource)
 {
   Demo3Widget *self;
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
+  GdkPaintable *paintable;
 
-  texture = gdk_texture_new_from_resource (resource);
+  pixbuf = gdk_pixbuf_new_from_resource (resource, NULL);
+  paintable = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (pixbuf));
 
-  self = g_object_new (DEMO3_TYPE_WIDGET,
-                       "texture", texture,
-                       "has-tooltip", TRUE,
-                       NULL);
+  self = g_object_new (DEMO3_TYPE_WIDGET, "paintable", paintable, NULL);
 
-  g_signal_connect (self, "query-tooltip", G_CALLBACK (query_tooltip), NULL);
-
-  g_object_unref (texture);
+  g_object_unref (pixbuf);
+  g_object_unref (paintable);
 
   return GTK_WIDGET (self);
 }

demos/gtk-demo/demo3widget.ui

@@ -12,11 +12,6 @@
       <attribute name="label">1∶1</attribute>
       <attribute name="action">zoom.reset</attribute>
     </item>
-    <item>
-      <attribute name="label">Rotate</attribute>
-      <attribute name="action">rotate</attribute>
-      <attribute name="target" type="i">90</attribute>
-    </item>
   </menu>
   <template class="Demo3Widget">
     <child>

demos/gtk-demo/demo4widget.c

@@ -1,226 +0,0 @@
-#include <math.h>
-#include "demo4widget.h"
-#include "hsla.h"
-
-enum
-{
-  PROP_0,
-  PROP_PROGRESS,
-};
-
-struct _Demo4Widget
-{
-  GtkWidget parent_instance;
-  PangoLayout *layout;
-  GskColorStop stops[8];
-  gsize n_stops;
-  double progress;
-
-  guint tick;
-};
-
-struct _Demo4WidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (Demo4Widget, demo4_widget, GTK_TYPE_WIDGET)
-
-static void
-rotate_color (GdkRGBA *rgba)
-{
-  GdkHSLA hsla;
-
-  _gdk_hsla_init_from_rgba (&hsla, rgba);
-  hsla.hue -= 1;
-  _gdk_rgba_init_from_hsla (rgba, &hsla);
-}
-
-static gboolean
-rotate_colors (GtkWidget     *widget,
-               GdkFrameClock *clock,
-               gpointer       user_data)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-
-  for (unsigned int i = 0; i < self->n_stops; i++)
-    rotate_color (&self->stops[i].color);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-demo4_widget_init (Demo4Widget *self)
-{
-  PangoFontDescription *desc;
-
-  self->progress = 0.5;
-
-  self->n_stops = 8;
-  self->stops[0].offset = 0;
-  self->stops[0].color = (GdkRGBA) { 1, 0, 0, 1 };
-
-  for (unsigned int i = 1; i < self->n_stops; i++)
-    {
-      GdkHSLA hsla;
-
-      self->stops[i].offset = i / (double)(self->n_stops - 1);
-      _gdk_hsla_init_from_rgba (&hsla, &self->stops[i - 1].color);
-      hsla.hue += 360.0 / (double)(self->n_stops - 1);
-      _gdk_rgba_init_from_hsla (&self->stops[i].color, &hsla);
-    }
-
-  self->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "123");
-  desc = pango_font_description_from_string ("Cantarell Bold 210");
-  pango_layout_set_font_description (self->layout, desc);
-  pango_font_description_free (desc);
-
-  self->tick = gtk_widget_add_tick_callback (GTK_WIDGET (self), rotate_colors, NULL, NULL);
-}
-
-static void
-demo4_widget_dispose (GObject *object)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  g_clear_object (&self->layout);
-  gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick);
-
-  G_OBJECT_CLASS (demo4_widget_parent_class)->dispose (object);
-}
-
-static void
-demo4_widget_snapshot_content (GtkWidget   *widget,
-                               GtkSnapshot *snapshot,
-                               GskMaskMode  mode)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height, layout_width, layout_height;
-  double scale;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, mode);
-  pango_layout_get_pixel_size (self->layout, &layout_width, &layout_height);
-  scale = MIN ((double) width / layout_width, (double) height / layout_height);
-  gtk_snapshot_translate (snapshot,
-                          &GRAPHENE_POINT_INIT ((width - scale * layout_width) / 2,
-                                                (height - scale * layout_height) / 2));
-  gtk_snapshot_scale (snapshot, scale, scale);
-  gtk_snapshot_append_layout (snapshot, self->layout, &(GdkRGBA) { 0, 0, 0, 1 });
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, height),
-                                       self->stops,
-                                       self->n_stops);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_INVERTED_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_INVERTED_ALPHA);
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_ALPHA);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      self->progress = g_value_get_double (value);
-      gtk_widget_queue_draw (GTK_WIDGET (object));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_get_property (GObject     *object,
-                           guint        prop_id,
-                           GValue      *value,
-                           GParamSpec  *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      g_value_set_double (value, self->progress);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_class_init (Demo4WidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo4_widget_dispose;
-  object_class->get_property = demo4_widget_get_property;
-  object_class->set_property = demo4_widget_set_property;
-
-  widget_class->snapshot = demo4_widget_snapshot;
-
-  g_object_class_install_property (object_class, PROP_PROGRESS,
-      g_param_spec_double ("progress", NULL, NULL,
-                           0.0, 1.0, 0.5,
-                           G_PARAM_READWRITE));
-}
-
-GtkWidget *
-demo4_widget_new (void)
-{
-  return g_object_new (DEMO4_TYPE_WIDGET, NULL);
-}
-

demos/gtk-demo/demo4widget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO4_TYPE_WIDGET (demo4_widget_get_type ())
-G_DECLARE_FINAL_TYPE (Demo4Widget, demo4_widget, DEMO4, WIDGET, GtkWidget)
-
-GtkWidget * demo4_widget_new (void);

demos/gtk-demo/dnd.c

@@ -356,10 +356,6 @@ canvas_item_start_editing (CanvasItem *item)
 
 }
 
-typedef struct {
-  double x, y;
-} Hotspot;
-
 static GdkContentProvider *
 prepare (GtkDragSource *source,
          double         x,
@@ -367,7 +363,6 @@ prepare (GtkDragSource *source,
 {
   GtkWidget *canvas;
   GtkWidget *item;
-  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
@@ -378,10 +373,6 @@ prepare (GtkDragSource *source,
 
   g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
 
-  hotspot = g_new (Hotspot, 1);
-  gtk_widget_translate_coordinates (canvas, item, x, y, &hotspot->x, &hotspot->y);
-  g_object_set_data_full (G_OBJECT (canvas), "hotspot", hotspot, g_free);
-
   return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
 }
 
@@ -392,14 +383,12 @@ drag_begin (GtkDragSource *source,
   GtkWidget *canvas;
   CanvasItem *item;
   GdkPaintable *paintable;
-  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
-  hotspot = (Hotspot *) g_object_get_data (G_OBJECT (canvas), "hotspot");
 
   paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, hotspot->x, hotspot->y);
+  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
   g_object_unref (paintable);
 
   gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);

demos/gtk-demo/drawingarea.c

@@ -362,7 +362,7 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (scribble_resize), NULL);
 
       drag = gtk_gesture_drag_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), 0);
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
       gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
 
       g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);

demos/gtk-demo/gtkgears.c

@@ -48,16 +48,14 @@
 #define VERTICES_PER_TOOTH 34
 #define GEAR_VERTEX_STRIDE 6
 
-static inline void
-_sincos (double x, double *_sin, double *_cos)
+#ifndef HAVE_SINCOS
+static void
+sincos (double x, double *_sin, double *_cos)
 {
-#ifdef HAVE_SINCOS
-  sincos (x, _sin, _cos);
-#else
   *_sin = sin (x);
   *_cos = cos (x);
-#endif
 }
+#endif
 
 /**
  * Struct describing the vertices in triangle strip
@@ -309,11 +307,11 @@ create_gear (GLfloat inner_radius,
     struct point p[7];
 
     /* Calculate needed sin/cos for various angles */
-    _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
 
     GEAR_POINT(p[0], r2, 1);
     GEAR_POINT(p[1], r2, 2);
@@ -522,7 +520,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa
    identity(tmp);
 
    deltaZ = zFar - zNear;
-   _sincos(radians, &sine, &cosine);
+   sincos(radians, &sine, &cosine);
 
    if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
       return;

demos/gtk-demo/hsla.c

@@ -1,146 +0,0 @@
-#include <gdk/gdk.h>
-#include "hsla.h"
-
-void
-_gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
-                          const GdkRGBA *rgba)
-{
-  float min;
-  float max;
-  float red;
-  float green;
-  float blue;
-  float delta;
-
-  g_return_if_fail (hsla != NULL);
-  g_return_if_fail (rgba != NULL);
-
-  red = rgba->red;
-  green = rgba->green;
-  blue = rgba->blue;
-
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-
-  hsla->lightness = (max + min) / 2;
-  hsla->saturation = 0;
-  hsla->hue = 0;
-  hsla->alpha = rgba->alpha;
-
-  if (max != min)
-    {
-      if (hsla->lightness <= 0.5)
-        hsla->saturation = (max - min) / (max + min);
-      else
-        hsla->saturation = (max - min) / (2 - max - min);
-
-      delta = max -min;
-      if (red == max)
-        hsla->hue = (green - blue) / delta;
-      else if (green == max)
-        hsla->hue = 2 + (blue - red) / delta;
-      else if (blue == max)
-        hsla->hue = 4 + (red - green) / delta;
-
-      hsla->hue *= 60;
-      if (hsla->hue < 0.0)
-        hsla->hue += 360;
-    }
-}
-
-void
-_gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
-                          const GdkHSLA *hsla)
-{
-  float hue;
-  float lightness;
-  float saturation;
-  float m1, m2;
-
-  lightness = hsla->lightness;
-  saturation = hsla->saturation;
-
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-
-  rgba->alpha = hsla->alpha;
-
-  if (saturation == 0)
-    {
-      rgba->red = lightness;
-      rgba->green = lightness;
-      rgba->blue = lightness;
-    }
-  else
-    {
-      hue = hsla->hue + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->red = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->red = m2;
-      else if (hue < 240)
-        rgba->red = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->red = m1;
-
-      hue = hsla->hue;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->green = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->green = m2;
-      else if (hue < 240)
-        rgba->green = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->green = m1;
-
-      hue = hsla->hue - 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->blue = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->blue = m2;
-      else if (hue < 240)
-        rgba->blue = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->blue = m1;
-    }
-}

demos/gtk-demo/hsla.h

@@ -1,15 +0,0 @@
-#pragma once
-
-typedef struct _GdkHSLA GdkHSLA;
-
-struct _GdkHSLA {
-  float hue;
-  float saturation;
-  float lightness;
-  float alpha;
-};
-
-void            _gdk_hsla_init_from_rgba    (GdkHSLA          *hsla,
-                                             const GdkRGBA    *rgba);
-void            _gdk_rgba_init_from_hsla    (GdkRGBA          *rgba,
-                                             const GdkHSLA    *hsla);

demos/gtk-demo/listbox_controls.ui

@@ -30,86 +30,90 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="row_activated"/>
-                    <style>
-                      <class name="rich-list"/>
-                      <class name="boxed-list"/>
-                    </style>
-
+                  <object class="GtkFrame">
                     <child>
-                      <object class="GtkListBoxRow">
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <signal name="row-activated" handler="row_activated"/>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>
+
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="switch_label">
-                                <property name="label" translatable="yes">Switch</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="switch">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="switch_label">
+                                    <property name="label" translatable="yes">Switch</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSwitch" id="switch">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="check_label">
-                                <property name="label" translatable="yes">Check</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="check">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="active">1</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="check_label">
+                                    <property name="label" translatable="yes">Check</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="check">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="image_label">
-                                <property name="label" translatable="yes">Click here!</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="image">
-                                <property name="icon-name">object-select-symbolic</property>
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="opacity">0</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="image_label">
+                                    <property name="label" translatable="yes">Click here!</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkImage" id="image">
+                                    <property name="icon-name">object-select-symbolic</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="opacity">0</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -130,142 +134,146 @@
                     </style>
                   </object>
                 </child>
-                  <child>
-                    <object class="GtkListBox">
-                      <property name="selection-mode">none</property>
-                      <style>
-                        <class name="rich-list"/>
-                        <class name="boxed-list"/>
-                      </style>
+                <child>
+                  <object class="GtkFrame">
+                    <child>
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="scale_label">
-                                  <property name="label" translatable="yes">Scale</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkScale">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="draw-value">0</property>
-                                  <property name="width-request">150</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="scale_label">
+                                    <property name="label" translatable="yes">Scale</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScale">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="draw-value">0</property>
+                                    <property name="width-request">150</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="spin_label">
-                                  <property name="label" translatable="yes">Spinbutton</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkSpinButton">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="dropdown_label">
-                                  <property name="label" translatable="yes">Dropdown</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkDropDown">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="model">
-                                    <object class="GtkStringList">
-                                      <items>
-                                        <item>Choice 1</item>
-                                        <item>Choice 2</item>
-                                        <item>Choice 3</item>
-                                        <item>Choice 4</item>
-                                      </items>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="spin_label">
+                                    <property name="label" translatable="yes">Spinbutton</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="dropdown_label">
+                                    <property name="label" translatable="yes">Dropdown</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkDropDown">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="model">
+                                      <object class="GtkStringList">
+                                        <items>
+                                          <item>Choice 1</item>
+                                          <item>Choice 2</item>
+                                          <item>Choice 3</item>
+                                          <item>Choice 4</item>
+                                        </items>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="entry_label">
-                                  <property name="label" translatable="yes">Entry</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkEntry">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="placeholder-text">Type here…</property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="entry_label">
+                                    <property name="label" translatable="yes">Entry</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="placeholder-text">Type here…</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>

demos/gtk-demo/mask.c

@@ -1,53 +0,0 @@
-/* Masking
- *
- * Demonstrates mask nodes.
- *
- * This demo uses a text node as mask for
- * an animated linear gradient.
- */
-
-#include <gtk/gtk.h>
-#include "demo4widget.h"
-
-
-GtkWidget *
-do_mask (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *demo;
-      GtkWidget *scale;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Mask Nodes");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      demo = demo4_widget_new ();
-      gtk_widget_set_hexpand (demo, TRUE);
-      gtk_widget_set_vexpand (demo, TRUE);
-
-      gtk_box_append (GTK_BOX (box), demo);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 1, 0.1);
-      gtk_range_set_value (GTK_RANGE (scale), 0.5);
-      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value", demo, "progress", 0);
-
-      gtk_box_append (GTK_BOX (box), scale);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/menu.c

@@ -1,120 +1,18 @@
-/* Image Scaling
- * #Keywords: zoom, scale, filter, action, menu
+/* Menu
+ * #Keywords: action, zoom
+ *
+ * Demonstrates how to add a context menu to a custom widget
+ * and connect it with widget actions.
  *
  * The custom widget we create here is similar to a GtkPicture,
- * but allows setting a zoom level and filtering mode for the
- * displayed paintable.
+ * but allows setting a zoom level for the displayed paintable.
  *
- * It also demonstrates how to add a context menu to a custom
- * widget and connect it with widget actions.
- *
- * The context menu has items to change the zoom level.
+ * Our context menu has items to change the zoom level.
  */
 
 #include <gtk/gtk.h>
 #include "demo3widget.h"
 
-static void
-file_opened (GObject      *source,
-             GAsyncResult *result,
-             void         *data)
-{
-  GFile *file;
-  GError *error = NULL;
-  GdkTexture *texture;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  texture = gdk_texture_new_from_file (file, &error);
-  g_object_unref (file);
-  if (!texture)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  g_object_set (G_OBJECT (data), "texture", texture, NULL);
-  g_object_unref (texture);
-}
-
-static void
-open_file (GtkWidget *picker,
-           GtkWidget *demo)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (picker));
-  GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;
-
-  dialog = gtk_file_dialog_new ();
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, "Images");
-  gtk_file_filter_add_pixbuf_formats (filter);
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
-  g_object_unref (filters);
-
-  gtk_file_dialog_open (dialog, parent, NULL, file_opened, demo);
-
-  g_object_unref (dialog);
-}
-
-static void
-rotate (GtkWidget *button,
-        GtkWidget *demo)
-{
-  float angle;
-
-  g_object_get (demo, "angle", &angle, NULL);
-
-  angle = fmodf (angle + 90.f, 360.f);
-
-  g_object_set (demo, "angle", angle, NULL);
-}
-
-static gboolean
-transform_to (GBinding     *binding,
-              const GValue *src,
-              GValue       *dest,
-              gpointer      user_data)
-{
-  double from;
-  float to;
-
-  from = g_value_get_double (src);
-  to = (float) pow (2., from);
-  g_value_set_float (dest, to);
-
-  return TRUE;
-}
-
-static gboolean
-transform_from (GBinding     *binding,
-                const GValue *src,
-                GValue       *dest,
-                gpointer      user_data)
-{
-  float to;
-  double from;
-
-  to = g_value_get_float (src);
-  from = log2 (to);
-  g_value_set_double (dest, from);
-
-  return TRUE;
-}
 
 GtkWidget *
 do_menu (GtkWidget *do_widget)
@@ -124,15 +22,12 @@ do_menu (GtkWidget *do_widget)
   if (!window)
     {
       GtkWidget *box;
-      GtkWidget *box2;
       GtkWidget *sw;
       GtkWidget *widget;
       GtkWidget *scale;
-      GtkWidget *dropdown;
-      GtkWidget *button;
 
       window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Image Scaling");
+      gtk_window_set_title (GTK_WINDOW (window), "Menu");
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -148,38 +43,13 @@ do_menu (GtkWidget *do_widget)
       widget = demo3_widget_new ("/transparent/portland-rose.jpg");
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
 
-      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
+      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
+      gtk_range_set_value (GTK_RANGE (scale), 1.0);
+      gtk_box_append (GTK_BOX (box), scale);
 
-      button = gtk_button_new_from_icon_name ("document-open-symbolic");
-      gtk_widget_set_tooltip_text (button, "Open File");
-      g_signal_connect (button, "clicked", G_CALLBACK (open_file), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      button = gtk_button_new_from_icon_name ("object-rotate-right-symbolic");
-      gtk_widget_set_tooltip_text (button, "Rotate");
-      g_signal_connect (button, "clicked", G_CALLBACK (rotate), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, -10., 10., 0.1);
-      gtk_scale_add_mark (GTK_SCALE (scale), 0., GTK_POS_TOP, NULL);
-      gtk_widget_set_tooltip_text (scale, "Zoom");
-      gtk_range_set_value (GTK_RANGE (scale), 0.);
-      gtk_widget_set_hexpand (scale, TRUE);
-      gtk_box_append (GTK_BOX (box2), scale);
-
-      dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
-      gtk_widget_set_tooltip_text (dropdown, "Filter");
-      gtk_box_append (GTK_BOX (box2), dropdown);
-
-      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
-
-      g_object_bind_property_full (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
-                                   widget, "scale",
-                                   G_BINDING_BIDIRECTIONAL,
-                                   transform_to,
-                                   transform_from,
-                                   NULL, NULL);
+      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
+                              widget, "scale",
+                              G_BINDING_BIDIRECTIONAL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/meson.build

@@ -46,7 +46,6 @@ demos = files([
   'links.c',
   'listbox.c',
   'listbox_controls.c',
-  'mask.c',
   'menu.c',
   'flowbox.c',
   'list_store.c',
@@ -115,7 +114,6 @@ extra_demo_sources = files([
   'gtkshadertoy.c',
   'gtkshaderstack.c',
   'gskshaderpaintable.c',
-  'hsla.c',
   'puzzlepiece.c',
   'bluroverlay.c',
   'demoimage.c',
@@ -128,7 +126,6 @@ extra_demo_sources = files([
   'four_point_transform.c',
   'demo2widget.c',
   'demo3widget.c',
-  'demo4widget.c',
   'pixbufpaintable.c',
   'script-names.c',
   'unicode-names.c',
@@ -225,7 +222,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
   gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
     'demo.gresource.xml',
-    source_dir: meson.current_source_dir()
+    source_dir: '.',
   )
 endif
 

demos/gtk-demo/pickers.c

@@ -13,13 +13,20 @@
 static GtkWidget *app_picker;
 
 static void
-set_file (GFile    *file,
-          gpointer  data)
+file_opened (GObject *source,
+             GAsyncResult *result,
+             void *data)
 {
+  GFile *file;
+  GError *error = NULL;
   char *name;
 
+  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
+
   if (!file)
     {
+      g_print ("%s\n", error->message);
+      g_error_free (error);
       gtk_widget_set_sensitive (app_picker, FALSE);
       g_object_set_data (G_OBJECT (app_picker), "file", NULL);
       return;
@@ -33,25 +40,6 @@ set_file (GFile    *file,
   g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
 }
 
-static void
-file_opened (GObject *source,
-             GAsyncResult *result,
-             void *data)
-{
-  GFile *file;
-  GError *error = NULL;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-
-  set_file (file, data);
-}
-
 static gboolean
 abort_mission (gpointer data)
 {
@@ -142,28 +130,11 @@ launch_uri (GtkButton *picker)
   g_object_unref (launcher);
 }
 
-static gboolean
-on_drop (GtkDropTarget *target,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      set_file (g_value_get_object (value), data);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *table, *label, *picker, *button;
-  GtkDropTarget *drop_target;
 
   if (!window)
   {
@@ -208,13 +179,7 @@ do_pickers (GtkWidget *do_widget)
 
     picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     button = gtk_button_new_from_icon_name ("document-open-symbolic");
-
     label = gtk_label_new ("None");
-
-    drop_target = gtk_drop_target_new (G_TYPE_FILE, GDK_ACTION_COPY);
-    g_signal_connect (drop_target, "drop", G_CALLBACK (on_drop), label);
-    gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (drop_target));
-
     gtk_label_set_xalign (GTK_LABEL (label), 0.);
     gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
     gtk_widget_set_hexpand (label, TRUE);

demos/gtk-demo/shortcuts.c

@@ -22,7 +22,6 @@ show_shortcuts (GtkWidget   *window,
   gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
   g_object_set (overlay, "view-name", view, NULL);
   g_object_unref (builder);
-  gtk_window_present (GTK_WINDOW (overlay));
 }
 
 G_MODULE_EXPORT void

demos/icon-browser/meson.build

@@ -8,7 +8,7 @@ iconbrowser_sources = [
 
 iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
   'iconbrowser.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-icon-browser',

demos/node-editor/meson.build

@@ -7,7 +7,7 @@ node_editor_sources = [
 
 node_editor_resources = gnome.compile_resources('node_editor_resources',
   'node-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-node-editor',

demos/node-editor/node-editor-window.c

@@ -32,11 +32,6 @@
 #include "gsk/vulkan/gskvulkanrenderer.h"
 #endif
 
-#include <cairo.h>
-#ifdef CAIRO_HAS_SVG_SURFACE
-#include <cairo-svg.h>
-#endif
-
 typedef struct
 {
   gsize  start_chars;
@@ -648,34 +643,23 @@ save_cb (GtkWidget        *button,
   g_object_unref (dialog);
 }
 
-static GskRenderNode *
-create_node (NodeEditorWindow *self)
+static GdkTexture *
+create_texture (NodeEditorWindow *self)
 {
   GdkPaintable *paintable;
   GtkSnapshot *snapshot;
+  GskRenderer *renderer;
   GskRenderNode *node;
+  GdkTexture *texture;
 
   paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture));
   if (paintable == NULL ||
       gdk_paintable_get_intrinsic_width (paintable) <= 0 ||
       gdk_paintable_get_intrinsic_height (paintable) <= 0)
     return NULL;
-
   snapshot = gtk_snapshot_new ();
   gdk_paintable_snapshot (paintable, snapshot, gdk_paintable_get_intrinsic_width (paintable), gdk_paintable_get_intrinsic_height (paintable));
   node = gtk_snapshot_free_to_node (snapshot);
-
-  return node;
-}
-
-static GdkTexture *
-create_texture (NodeEditorWindow *self)
-{
-  GskRenderer *renderer;
-  GskRenderNode *node;
-  GdkTexture *texture;
-
-  node = create_node (self);
   if (node == NULL)
     return NULL;
 
@@ -686,58 +670,6 @@ create_texture (NodeEditorWindow *self)
   return texture;
 }
 
-#ifdef CAIRO_HAS_SVG_SURFACE
-static cairo_status_t
-cairo_serializer_write (gpointer             user_data,
-                        const unsigned char *data,
-                        unsigned int         length)
-{
-  g_byte_array_append (user_data, data, length);
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static GBytes *
-create_svg (GskRenderNode  *node,
-            GError        **error)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  graphene_rect_t bounds;
-  GByteArray *array;
-
-  gsk_render_node_get_bounds (node, &bounds);
-  array = g_byte_array_new ();
-
-  surface = cairo_svg_surface_create_for_stream (cairo_serializer_write,
-                                                 array,
-                                                 bounds.size.width,
-                                                 bounds.size.height);
-  cairo_svg_surface_set_document_unit (surface, CAIRO_SVG_UNIT_PX);
-  cairo_surface_set_device_offset (surface, -bounds.origin.x, -bounds.origin.y);
-
-  cr = cairo_create (surface);
-  gsk_render_node_draw (node, cr);
-  cairo_destroy (cr);
-
-  cairo_surface_finish (surface);
-  if (cairo_surface_status (surface) == CAIRO_STATUS_SUCCESS)
-    {
-      cairo_surface_destroy (surface);
-      return g_byte_array_free_to_bytes (array);
-    }
-  else
-    {
-      g_set_error (error,
-                   G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "%s", cairo_status_to_string (cairo_surface_status (surface)));
-      cairo_surface_destroy (surface);
-      g_byte_array_unref (array);
-      return NULL;
-    }
-}
-#endif
-
 static GdkTexture *
 create_cairo_texture (NodeEditorWindow *self)
 {
@@ -770,140 +702,50 @@ create_cairo_texture (NodeEditorWindow *self)
 }
 
 static void
-export_image_saved_cb (GObject      *source,
-                       GAsyncResult *result,
-                       void         *user_data)
-{
-  GError *error = NULL;
-
-  if (!g_file_replace_contents_finish (G_FILE (source), result, NULL, &error))
-    {
-      GtkAlertDialog *alert;
-
-      alert = gtk_alert_dialog_new ("Exporting to image failed");
-      gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, NULL);
-      g_object_unref (alert);
-      g_clear_error (&error);
-    }
-}
-
-static void
-export_image_response_cb (GObject      *source,
+export_image_response_cb (GObject *source,
                           GAsyncResult *result,
-                          void         *user_data)
+                          void *user_data)
 {
   GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GskRenderNode *node = user_data;
+  GdkTexture *texture = user_data;
   GFile *file;
-  char *uri;
-  GBytes *bytes;
 
   file = gtk_file_dialog_save_finish (dialog, result, NULL);
-  if (file == NULL)
+  if (file)
     {
-      gsk_render_node_unref (node);
-      return;
-    }
-
-  uri = g_file_get_uri (file);
-#ifdef CAIRO_HAS_SVG_SURFACE
-  if (g_str_has_suffix (uri, "svg"))
-    {
-      GError *error = NULL;
-
-      bytes = create_svg (node, &error);
-      if (bytes == NULL)
+      if (!gdk_texture_save_to_png (texture, g_file_peek_path (file)))
         {
           GtkAlertDialog *alert;
 
           alert = gtk_alert_dialog_new ("Exporting to image failed");
-          gtk_alert_dialog_set_detail (alert, error->message);
-          gtk_alert_dialog_show (alert, NULL);
+          gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))));
           g_object_unref (alert);
-          g_clear_error (&error);
         }
-    }
-  else
-#endif
-    {
-      GdkTexture *texture;
-      GskRenderer *renderer;
 
-      renderer = gsk_gl_renderer_new ();
-      if (!gsk_renderer_realize (renderer, NULL, NULL))
-        {
-          g_object_unref (renderer);
-          renderer = gsk_cairo_renderer_new ();
-          if (!gsk_renderer_realize (renderer, NULL, NULL))
-            {
-              g_assert_not_reached ();
-            }
-        }
-      texture = gsk_renderer_render_texture (renderer, node, NULL);
-      gsk_renderer_unrealize (renderer);
-      g_object_unref (renderer);
-
-      if (g_str_has_suffix (uri, "tiff"))
-        bytes = gdk_texture_save_to_tiff_bytes (texture);
-      else
-        bytes = gdk_texture_save_to_png_bytes (texture);
-      g_object_unref (texture);
+      g_object_unref (file);
     }
-  g_free (uri);
 
-  if (bytes)
-    {
-      g_file_replace_contents_bytes_async (file,
-                                           bytes,
-                                           NULL,
-                                           FALSE,
-                                           0,
-                                           NULL,
-                                           export_image_saved_cb,
-                                           NULL);
-      g_bytes_unref (bytes);
-    }
-  gsk_render_node_unref (node);
-  g_object_unref (file);
+  g_object_unref (texture);
 }
 
 static void
 export_image_cb (GtkWidget        *button,
                  NodeEditorWindow *self)
 {
-  GskRenderNode *node;
+  GdkTexture *texture;
   GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;
 
-  node = create_node (self);
-  if (node == NULL)
+  texture = create_texture (self);
+  if (texture == NULL)
     return;
 
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/png");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/tiff");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "");
   gtk_file_dialog_set_initial_name (dialog, "example.png");
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
                         NULL,
-                        export_image_response_cb, node);
-  g_object_unref (filters);
+                        export_image_response_cb, texture);
   g_object_unref (dialog);
 }
 
@@ -1017,19 +859,6 @@ testcase_save_clicked_cb (GtkWidget        *button,
     }
 
   text = get_current_text (self->text_buffer);
-  {
-    GBytes *bytes;
-    GskRenderNode *node;
-    gsize size;
-
-    bytes = g_bytes_new_take (text, strlen (text) + 1);
-    node = gsk_render_node_deserialize (bytes, NULL, NULL);
-    g_bytes_unref (bytes);
-    bytes = gsk_render_node_serialize (node);
-    gsk_render_node_unref (node);
-    text = g_bytes_unref_to_data (bytes, &size);
-  }
-
   if (!g_file_set_contents (node_file, text, -1, &error))
     {
       gtk_label_set_label (GTK_LABEL (self->testcase_error_label), error->message);

demos/node-editor/node-format.md

@@ -178,16 +178,6 @@ Creates a node like `gsk_inset_shadow_node_new()` with the given properties.
 
 Creates a node like `gsk_linear_gradient_node_new()` with the given properties.
 
-### mask
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| source   | `<node>`         | color { }              | always      |
-| mode     | `<blend-mode>`   | alpha                  | non-default |
-| mask     | `<node>`         | color { }              | always      |
-
-Creates a node like `gsk_mask_node_new()` with the given properties.
-
 ### opacity
 
 | property | syntax           | default                | printed     |
@@ -307,21 +297,6 @@ The default texture is a 10x10 checkerboard with the top left and bottom right
 representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
 `.
 
-### texture-scale
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| texture  | `<url>`          | *see below*            | always      |
-| filter   | `filter`         | *see below*            | non-default |
-
-Creates a node like `gsk_texture_scale_node_new()` with the given properties.
-
-The default texture is a 10x10 checkerboard, just like for texture.
-
-The possible filter values are `linear`, `nearest` and `trilinear`, with
-`linear` being the default.
-
 ### transform
 
 | property | syntax           | default                | printed     |

demos/print-editor/print-editor.c

@@ -6,8 +6,6 @@
 
 #include "demo_conf.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;

demos/widget-factory/meson.build

@@ -69,7 +69,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
   widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
     'widget-factory.gresource.xml',
-    source_dir: meson.current_source_dir(),
+    source_dir: '.',
   )
 endif
 

demos/widget-factory/widget-factory.c

@@ -2252,13 +2252,11 @@ activate (GApplication *app)
   for (i = 0; i < G_N_ELEMENTS (accels); i++)
     gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
   action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
   g_action_map_add_action (G_ACTION_MAP (window), action);
   g_object_unref (G_OBJECT (action));
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
   action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
@@ -2432,7 +2430,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "record_button");
   g_object_set_data (G_OBJECT (window), "record_button", widget);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "lockbox");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "lockbutton");
   g_object_set_data (G_OBJECT (window), "lockbutton", widget2);
@@ -2450,7 +2447,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                           G_BINDING_SYNC_CREATE);
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission);
   g_object_unref (permission);
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "iconview1");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "increase_button");

docs/CODING-STYLE.md

@@ -678,10 +678,11 @@ Interfaces must have the following macros:
 
 ### Memory allocation
 
-When dynamically allocating data on the heap use `g_new()`.
+When dynamically allocating data on the heap either use `g_new()` or,
+if allocating multiple small data structures, `g_slice_new()`.
 
 Public structure types should always be returned after being zero-ed,
-either explicitly for each member, or by using `g_new0()`.
+either explicitly for each member, or by using `g_new0()` or `g_slice_new0()`.
 
 ### Macros
 

docs/reference/gtk/broadway.md

@@ -6,15 +6,22 @@ Slug: broadway
 The GDK Broadway backend provides support for displaying GTK applications in
 a web browser, using HTML5 and web sockets.
 
-To run your application in this way, first run the broadway server,
-`gtk-broadwayd`, that ships with GTK:
+To run your application in this way, select the Broadway backend by setting
+`GDK_BACKEND=broadway`. Then you can make your application appear in a web
+browser by pointing it at `http://127.0.0.1:8080`. Note that you need to
+enable web sockets in your web browser.
+
+You can choose a different port from the default 8080 by setting the
+`BROADWAY_DISPLAY` environment variable to the port that you want to use.
+
+It is also possible to use multiple GTK applications in the same web browser
+window, by using the Broadway server, `gtk4-broadwayd`, that ships with GTK.
+To start the Broadway server use:
 
 ```
 gtk4-broadwayd :5
 ```
 
-The server expects the colon-prefixed display number as a commandline argument.
-
 Then point your web browser at `http://127.0.0.1:8085`.
 
 Once the Broadway server is running, you can start your applications like
@@ -24,8 +31,6 @@ this:
 GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
 ```
 
-Multiple applications can be presented in the same web browser window.
-
 ## Broadway-specific environment variables
 
 ### `BROADWAY_DISPLAY`

docs/reference/gtk/building.md

@@ -239,14 +239,14 @@ control whether Vulkan should be used.
 ### `media-gstreamer` and `media-ffmpeg`
 
 By default, GTK will try to build the gstreamer backend for
-media playback support. These options can be used to explicitly
+media playback support. These option can be used to explicitly
 control which media backends should be built.
 
-### `print-cups` and `print-cpdb`
+### `print-cups`
 
-By default, GTK will try to build the cups and file print backends
-if their dependencies are found. These options can be used to
-explicitly control which print backends should be built.
+By default, GTK will try to build various print backends
+if their dependencies are found. This option can be used
+to explicitly control whether the cups print backend should be built.
 
 ### `cloudproviders`
 

docs/reference/gtk/getting_started.md

@@ -66,10 +66,6 @@ You can compile the program above with GCC using:
 gcc $( pkg-config --cflags gtk4 ) -o example-0 example-0.c $( pkg-config --libs gtk4 )
 ```
 
-**Note**: If the above compilation does not work due to an error regarding `G_APPLICATION_DEFAULT_FLAGS`
-this could be due to your OS providing an older version of GLib. For GLib versions older than 2.74 you
-will need to replace `G_APPLICATION_DEFAULT_FLAGS` with `G_APPLICATION_FLAGS_NONE` in this example, and
-others in this documentation.
 For more information on how to compile a GTK application, please
 refer to the [Compiling GTK Applications](compiling.html)
 section in this reference.

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

@@ -33,11 +33,6 @@ Validation
 The ``validate`` command validates the given UI definition file and reports
 errors to ``stderr``.
 
-Note that there are limitations to the validation that can be done for templates,
-since they are closely tied to the class_init function they are used in.
-If your UI file uses types from third-party libraries, it may help to add those
-libraries to the `LD_PRELOAD` environment variable.
-
 ``--deprecations``
 
   Warn about uses of deprecated types in the UI definition file.

docs/reference/gtk/migrating-4to5.md

@@ -109,13 +109,3 @@ Other libraries, such as libadwaita, may provide replacements as well.
 ## gtk_show_uri is being replaced
 
 Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
-
-## GtkStatusbar is going away
-
-This is an oldfashioned widget that does not do all that much anymore, since
-it no longer has a resize handle for the window.
-
-## GtkLockButton and GtkVolumeButton are going away
-
-These are very specialized widgets that should better live with the application
-where they are used.

docs/reference/gtk/question_index.md

@@ -7,50 +7,37 @@ the question you have, this list is a good place to start.
 
 ## General Questions
 
-*  How do I get started with GTK?
+1.  How do I get started with GTK?
 
     The GTK [website](https://www.gtk.org) offers some
     [tutorials](https://www.gtk.org/documentation.php) and other documentation
-    This reference manual also contains a introductory
+    (most of it about GTK 2.x and 3.x, but still somewhat applicable). This
+    reference manual also contains a introductory
     [Getting Started](#gtk-getting-started) part.
 
     More documentation ranging from whitepapers to online books can be found at
     the [GNOME developer's site](https://developer.gnome.org). After studying these
     materials you should be well prepared to come back to this reference manual for details.
 
-*  Where can I get help with GTK, submit a bug report, or make a feature request?
+2.  Where can I get help with GTK, submit a bug report, or make a feature request?
 
     See the [documentation](#gtk-resources) on this topic.
 
-*  How do I port from one GTK version to another?
+3.  How do I port from one GTK version to another?
 
-    Every major version of GTK comes with a [migration guide](#migrating). You may also
-    find useful information in the documentation for specific widgets and functions. If
-    you have a question not covered in the manual, feel free to ask, and please
+    See the [migration guide](#migrating). You may also find useful information in
+    the documentation for specific widgets and functions. If you have a question not
+    covered in the manual, feel free to ask, and please
     [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/new) against the
     documentation.
 
-*  Should I maintain parallel versions of my UI in GTK x and GTK y?
-
-    At the end of the day, that is up to you.
-
-    Our experience is that it is a lot of work, and usually not a good idea.
-
-    If you are not ready to make the jump to the next major version of GTK,
-    it is perfectly fine to stick with the stable release. We maintain them
-    for that reason.
-
-*  How does memory management work in GTK? Should I free data returned from functions?
+4.  How does memory management work in GTK? Should I free data returned from functions?
 
     See the documentation for `GObject` and `GInitiallyUnowned`. For `GObject` note
     specifically `g_object_ref()` and `g_object_unref()`. `GInitiallyUnowned` is a
     subclass of `GObject` so the same points apply, except that it has a "floating"
     state (explained in its documentation).
 
-    In a widget tree, each container owns a reference to its children. The root
-    object (typically a `GtkWindow`) is owned by GTK. GTK will drop its reference
-    when you call [method@Gtk.Window.destroy].
-
     For strings returned from functions, they will be declared "const" if they should
     not be freed. Non-const strings should be freed with `g_free()`. Arrays follow the
     same rule. If you find an undocumented exception to the rules, please
@@ -59,7 +46,7 @@ the question you have, this list is a good place to start.
     The transfer annotations for gobject-introspection that are part of the
     documentation can provide useful hints for memory handling semantics as well.
 
-*  Why does my program leak memory, if I destroy a widget immediately
+5.  Why does my program leak memory, if I destroy a widget immediately
     after creating it?
 
     If `GtkFoo` isn't a toplevel window, then
@@ -82,7 +69,7 @@ the question you have, this list is a good place to start.
     the initial floating reference and you don't have to worry about reference
     counting at all ... just remove the widget from the container to get rid of it.
 
-*  How do I use GTK with threads?
+6.  How do I use GTK with threads?
 
     GTK requires that all GTK API calls are made from the same thread in which
     the `GtkApplication` was created, or `gtk_init()` was called (the _main thread_).
@@ -92,7 +79,7 @@ the question you have, this list is a good place to start.
     the results back to the main thread using `g_idle_add()` or `GAsyncQueue`. GIO
     offers useful tools for such an approach such as `GTask`.
 
-*  How do I internationalize a GTK program?
+7.  How do I internationalize a GTK program?
 
     Most people use [GNU gettext](https://www.gnu.org/software/gettext/),
     already required in order to install GLib. On a UNIX or Linux system with
@@ -147,7 +134,7 @@ the question you have, this list is a good place to start.
 
         #define _(x) dgettext (GETTEXT_PACKAGE, x)
 
-*  How do I use non-ASCII characters in GTK programs ?
+8.  How do I use non-ASCII characters in GTK programs ?
 
     GTK uses [Unicode](http://www.unicode.org) (more exactly UTF-8) for all text.
     UTF-8 encodes each Unicode codepoint as a sequence of one to six bytes and
@@ -230,7 +217,7 @@ the question you have, this list is a good place to start.
     to call bind_textdomain_codeset() to ensure that translated strings
     are returned in UTF-8 encoding.
 
-*  How do I use GTK with C++?
+9.  How do I use GTK with C++?
 
     There are two ways to approach this. The GTK header files use the subset
     of C that's also valid C++, so you can simply use the normal GTK API
@@ -255,23 +242,19 @@ the question you have, this list is a good place to start.
 
     There are very few functions that require this cast, however.
 
-*  How do I use GTK with other non-C languages?
+10. How do I use GTK with other non-C languages?
 
     See the list of [language bindings](https://www.gtk.org/language-bindings.php)
     on the GTK [website](https://www.gtk.org).
 
-*  How do I load an image or animation from a file?
+11. How do I load an image or animation from a file?
 
     To load an image file straight into a display widget, use
-    [ctor@Gtk.Picture.new_for_file] or [ctor@GTk.Picture.new_for_filename].
-    To load an image for another purpose, use [ctor@Gdk.Texture.new_from_file].
-    To load a video from a file, use [ctor@Gtk.MediaFile.new_for_file].
+    [ctor@Gtk.Image.new_from_file]. To load an image for another purpose, use
+    [ctor@Gdk.Texture.new_from_file]. To load a video from a file, use
+    [ctor@Gtk.MediaFile.new_for_file].
 
-*  How do I draw text?
-
-    If you just want to put text into your user interface somewhere, it is
-    usually easiest to just use one of ready-made widgets for this purpose,
-    such as [class@Gtk.Label].
+12. How do I draw text?
 
     To draw a piece of text onto a cairo surface, use a Pango layout and
     [func@PangoCairo.show_layout].
@@ -289,7 +272,7 @@ the question you have, this list is a good place to start.
     To draw a piece of text in a widget [vfunc@Gtk.Widget.snapshot] implementation,
     use [method@Gtk.Snapshot.append_layout].
 
-*  How do I measure the size of a piece of text?
+13. How do I measure the size of a piece of text?
 
     To obtain the size of a piece of text, use a Pango layout and
     [method@Pango.Layout.get_pixel_size], using code like the following:
@@ -304,7 +287,7 @@ the question you have, this list is a good place to start.
     See also the [Layout Objects](https://developer.gnome.org/pango/stable/pango-Layout-Objects.html)
     section of the [Pango documentation](https://developer.gnome.org/pango/stable/).
 
-*  Why are types not registered if I use their `GTK_TYPE_BLAH` macro?
+14. Why are types not registered if I use their `GTK_TYPE_BLAH` macro?
 
     The %GTK_TYPE_BLAH macros are defined as calls to gtk_blah_get_type(), and
     the `_get_type()` functions are declared as %G_GNUC_CONST which allows the
@@ -315,14 +298,14 @@ the question you have, this list is a good place to start.
 
         g_type_ensure (GTK_TYPE_BLAH);
 
-*  How do I create a transparent toplevel window?
+15. How do I create a transparent toplevel window?
 
     Any toplevel window can be transparent. It is just a matter of setting a
     transparent background in the CSS style for it.
 
 ## Which widget should I use...
 
-*  ...for lists and trees?
+16. ...for lists and trees?
 
     This question has different answers, depending on the size of the dataset
     and the required formatting flexibility.
@@ -338,7 +321,7 @@ the question you have, this list is a good place to start.
     and widgetry inside the list, then you probably want to use a [class@Gtk.ListBox],
     which uses regular widgets for display.
 
-*  ...for multi-line text display or editing?
+17. ...for multi-line text display or editing?
 
     See the [text widget overview](#TextWidget) -- you should use the
     [class@Gtk.TextView] widget.
@@ -347,7 +330,7 @@ the question you have, this list is a good place to start.
     of course. It can be made selectable with [method@Gtk.Label.set_selectable]. For a
     single-line text entry, see [class@Gtk.Entry].
 
-*  ...to display an image or animation?
+18. ...to display an image or animation?
 
     GTK has two widgets that are dedicated to displaying images. [class@Gtk.Image], for
     small, fixed-size icons and [class@Gtk.Picture] for content images.
@@ -363,14 +346,17 @@ the question you have, this list is a good place to start.
         mediafile = gtk_media_file_new_for_filename ("example.webm");
         picture = gtk_picture_new_for_paintable (GDK_PAINTABLE (mediafile));
 
-*  ...for presenting a set of mutually-exclusive choices, where Windows
+19. ...for presenting a set of mutually-exclusive choices, where Windows
     would use a combo box?
 
-    With GTK, a [class@Gtk.DropDown] is the recommended widget to use for this use case.
+    With GTK, a [class@Gtk.ComboBox] is the recommended widget to use for this use case.
+    If you need an editable text entry, use the [property@Gtk.ComboBox:has-entry] property.
+
+    A newer alternative is [class@Gtk.DropDown].
 
 ## Questions about GtkWidget
 
-*  How do I change the color of a widget?
+20. How do I change the color of a widget?
 
     The background color of a widget is determined by the CSS style that applies
     to it. To change that, you can set style classes on the widget, and provide
@@ -378,7 +364,7 @@ the question you have, this list is a good place to start.
     [method@Gtk.CssProvider.load_from_file] and its variants.
     See [method@Gtk.StyleContext.add_provider].
 
-*  How do I change the font of a widget?
+21. How do I change the font of a widget?
 
     If you want to make the text of a label larger, you can use
     gtk_label_set_markup():
@@ -402,14 +388,14 @@ the question you have, this list is a good place to start.
     of this approach is that users can then override the font you have chosen.
     See the `GtkStyleContext` documentation for more discussion.
 
-*  How do I disable/ghost/desensitize a widget?
+22. How do I disable/ghost/desensitize a widget?
 
     In GTK a disabled widget is termed _insensitive_.
     See [method@Gtk.Widget.set_sensitive].
 
 ## GtkTextView questions
 
-*  How do I get the contents of the entire text widget as a string?
+23. How do I get the contents of the entire text widget as a string?
 
     See [method@Gtk.TextBuffer.get_bounds] and [method@Gtk.TextBuffer.get_text]
     or [method@Gtk.TextIter.get_text].
@@ -424,14 +410,14 @@ the question you have, this list is a good place to start.
         /* use text */
         g_free (text);
 
-*  How do I make a text widget display its complete contents in a specific font?
+24. How do I make a text widget display its complete contents in a specific font?
 
     If you use [method@Gtk.TextBuffer.insert_with_tags] with appropriate tags to
     select the font, the inserted text will have the desired appearance, but
     text typed in by the user before or after the tagged block will appear in
     the default style.
 
-*  How do I make a text view scroll to the end of the buffer automatically ?
+25. How do I make a text view scroll to the end of the buffer automatically ?
 
     A good way to keep a text buffer scrolled to the end is to place a
     [mark](#GtkTextMark) at the end of the buffer, and give it right gravity.
@@ -446,21 +432,21 @@ the question you have, this list is a good place to start.
 
 ## GtkTreeView questions
 
-*  How do I associate some data with a row in the tree?
+26. How do I associate some data with a row in the tree?
 
     Remember that the [iface@Gtk.TreeModel] columns don't necessarily have to be
     displayed. So you can put non-user-visible data in your model just
     like any other data, and retrieve it with [method@Gtk.TreeModel.get].
     See the [tree widget overview](#TreeWidget).
 
-*  How do I put an image and some text in the same column?
+27. How do I put an image and some text in the same column?
 
     You can pack more than one [class@Gtk.CellRenderer] into a single [class@Gtk.TreeViewColumn]
     using [method@Gtk.TreeViewColumn.pack_start] or [method@Gtk.TreeViewColumn.pack_end].
     So pack both a [class@Gtk.CellRendererPixbuf] and a [class@Gtk.CellRendererText] into the
     column.
 
-*  I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
+28. I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
     [method@Gtk.ListStore.set] and [method@Gtk.TreeStore.set], but can't read it back?
 
     Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [iface@Gtk.TreeModel]
@@ -468,7 +454,7 @@ the question you have, this list is a good place to start.
     implements. The easiest way to read a set of data back is to use
     [method@Gtk.TreeModel.get].
 
-*  How do I change the way that numbers are formatted by `GtkTreeView`?
+29. How do I change the way that numbers are formatted by `GtkTreeView`?
 
     Use [method@Gtk.TreeView.insert_column_with_data_func] or
     [method@Gtk.TreeViewColumn.set_cell_data_func] and do the conversion
@@ -542,21 +528,19 @@ the question you have, this list is a good place to start.
                                                    (gpointer)DOUBLE_COLUMN, NULL);
         }
 
-*  How do I hide the expander arrows in my tree view?
+30. How do I hide the expander arrows in my tree view?
 
     Set the expander-column property of the tree view to a hidden column.
     See [method@Gtk.TreeView.set_expander_column] and [method@Gtk.TreeViewColumn.set_visible].
 
 ## Using cairo with GTK
 
-*  How do I use cairo to draw in GTK applications?
+31. How do I use cairo to draw in GTK applications?
 
-    [class@Gtk.DrawingArea] is a ready-made widget for drawing with cairo.
+    Use [method@Gtk.Snapshot.append_cairo] in your [vfunc@Gtk.Widget.snapshot] vfunc
+    to obtain a cairo context and draw with that.
 
-    If you implement a custom widget, use [method@Gtk.Snapshot.append_cairo]
-    in your [vfunc@Gtk.Widget.snapshot] vfunc to obtain a cairo context and draw with that.
-
-*  Can I improve the performance of my application by using another backend
+32. Can I improve the performance of my application by using another backend
     of cairo (such as GL)?
 
     No. Most drawing in GTK is not done via cairo anymore (but instead
@@ -567,7 +551,7 @@ the question you have, this list is a good place to start.
 
     If you are interested in using GL for your own drawing, see [class@Gtk.GLArea].
 
-*  Can I use cairo to draw on a `GdkPixbuf`?
+33. Can I use cairo to draw on a `GdkPixbuf`?
 
     No. The cairo image surface does not support the pixel format used by `GdkPixbuf`.
 

docs/reference/gtk/section-accessibility.md

@@ -128,7 +128,6 @@ Each state name is part of the `GtkAccessibleState` enumeration.
 | %GTK_ACCESSIBLE_STATE_INVALID | “aria-invalid” | `GtkAccessibleInvalidState` | Set when a widget is showing an error |
 | %GTK_ACCESSIBLE_STATE_PRESSED | “aria-pressed” | `GtkAccessibleTristate` | Indicates the current state of a [class@Gtk.ToggleButton] |
 | %GTK_ACCESSIBLE_STATE_SELECTED | “aria-selected” | boolean or undefined | Set when a widget is selected |
-| %GTK_ACCESSIBLE_STATE_VISITED | N/A | boolean or undefined | Set when a link-like widget is visited |
 
 #### List of accessible properties
 

docs/reference/gtk/section-list-widget.md

@@ -9,9 +9,9 @@ Lists are intended to be used whenever developers want to display many objects
 in roughly the same way.
 
 Lists are perfectly fine to be used for very short list of only 2 or 3 elements,
-but generally scale to millions of items. Of course, the larger the list grows,
-the more care needs to be taken to choose the right data structures to keep things
-running well.
+but generally scale fine to millions of items. Of course, the larger the list
+grows, the more care needs to be taken to choose the right data structures to
+keep things running well.
 
 Lists are meant to be used with changing data, both with the items itself changing
 as well as the list adding and removing items. Of course, they work just as well
@@ -26,14 +26,12 @@ have a specific meaning in this context.
 **_Views_** or **_list widgets_** are the widgets that hold and manage the lists.
 Examples of these widgets would be [`class@Gtk.ListView`] or [`class@Gtk.GridView`].
 
-Views display data from a **_model_**. Models implement the [`iface@Gio.ListModel`]
-interface and can be provided in a variety of ways:
+Views display data from a **_model_**. A model is a [`iface@Gio.ListModel`] and
+models can be provided in 3 ways or combinations thereof:
 
- * List model implementations for many specific types of data already exist, for
-   example `GtkDirectoryList` or `GtkStringList`.
-
- * There are generic list model implementations like`GListStore` that allow building
-   lists of arbitrary objects.
+ * Many list models implementations already exist. There are models that provide
+   specific data, like `GtkDirectoryList`. And there are models like `GListStore`
+   that allow building lists manually.
 
  * Wrapping list models like `GtkFilterListModel` or `GtkSortListModel`
    modify, adapt or combine other models.
@@ -49,8 +47,8 @@ The elements in a model are called **_items_**. All items are
 
 Every item in a model has a **_position_** which is the unsigned integer that
 describes where in the model the item is located. The first item in a model is
-at position 0. The position of an item can change as other items are added or
-removed from the model.
+at position 0. The position of an item can of course change as other items are
+added or removed from the model.
 
 It is important to be aware of the difference between items and positions
 because the mapping from position to item is not permanent, so developers
@@ -73,10 +71,10 @@ with the item managed by the listitem. Finding a suitable factory implementation
 for the data displayed, the programming language and development environment
 is an important task that can simplify setting up the view tremendously.
 
-Views support selections via a **_selection model_**. A selection model is
-an implementation of the [`iface@Gtk.SelectionModel`] interface on top of the
-[`iface@Gio.ListModel`] interface that allows marking each item in a model as
-either selected or not selected. Just like regular models, this can be implemented
+Views support selections via a **_selection model_**. A selection model is an
+implementation of the [`iface@Gtk.SelectionModel`] interface on top of the
+[`iface@Gio.ListModel`] interface that allows marking each item in a model as either
+selected or not selected. Just like regular models, this can be implemented
 either by implementing `GtkSelectionModel` directly or by wrapping a model with
 one of the GTK models provided for this purposes, such as [`class@Gtk.NoSelection`]
 or [`class@Gtk.SingleSelection`].
@@ -89,18 +87,19 @@ item is exposed in the listitem via the [`property@Gtk.ListItem:selected`] prope
 
 Views and listitems also support activation. Activation means that double
 clicking or pressing enter while inside a focused row will cause the view
-to emit a signal such as [`signal@Gtk.ListView::activate`]. This provides an
-easy way to set up lists, but can also be turned off on listitems if undesired.
+to emit and activation signal such as [`signal@Gtk.ListView::activate`]. This
+provides an easy way to set up lists, but can also be turned off on listitems
+if undesired.
 
 Both selections and activation are supported among other things via widget
 [actions](#actions-overview). This allows developers to add widgets to their
-lists that cause selections to change or to trigger activation via the
-[`iface@Gtk.Actionable`] interface. For a list of all supported actions
-see the relevant documentation.
+lists that cause selections to change or to trigger activation via
+the [`iface@Gtk.Actionable`] interface. For a list of all supported actions see
+the relevant documentation.
 
 ## Behind the scenes
 
-While it is not a problem for short lists to instantiate widgets for every
+While for short lists it is not a problem to instantiate widgets for every
 item in the model, once lists grow to thousands or millions of elements, this
 gets less feasible. Because of this, the views only create a limited amount of
 listitems and recycle them by binding them to new items. In general, views try
@@ -108,7 +107,7 @@ to keep listitems available only for the items that can actually be seen on
 screen.
 
 While this behavior allows views to scale effortlessly to huge lists, it has a
-few implications for what can be done with views. For example, it is not possible
+few implication on what can be done with views. For example, it is not possible
 to query a view for a listitem used for a certain position - there might not be
 one and even if there is, that listitem might soon be recycled for a new
 position.
@@ -162,9 +161,9 @@ in particular `GListModel` do not. This was a design choice because the common
 use case is displaying lists and not trees and it greatly simplifies the API
 interface provided.
 
-However, GTK provides functionality to make lists look and behave like trees
-for use cases that require trees. This is achieved by using the
-[`class@Gtk.TreeListModel`] model to flatten a tree into a list. The
+However, GTK provides functionality to make trees look and behave like lists
+for the people who still want to display lists. This is achieved by using
+the [`class@Gtk.TreeListModel`] model to flatten a tree into a list. The
 [`class@Gtk.TreeExpander`] widget can then be used inside a listitem to allow
 users to expand and collapse rows and provide a similar experience to
 `GtkTreeView`.
@@ -175,26 +174,26 @@ on the topic.
 ## List styles
 
 One of the advantages of the new list widgets over `GtkTreeView` and cell
-renderers is that they are styleable using GTK CSS. This provides a lot of
-flexibility. The themes that ship with GTK provide a few predefined list
-styles that can be used in many situations:
+renderers is that they are fully themable using GTK CSS. This provides a
+lot of flexibility. The themes that ship with GTK provide a few predefined
+list styles that can be used in many situations:
 
 ![Rich list](rich-list.png)
 
-This _rich list_ style is low density, spacious and uses an outline focus
-ring. It is suitable for lists of controls, e.g. in preference dialogs or
+This style of list is low density, spacious and uses an outline focus ring.
+It is suitable for lists of controls, e.g. in preference dialogs or
 settings panels. Use the `.rich-list` style class.
 
 ![Navigation sidebar](navigation-sidebar.png)
 
-The _sidebar_ style of list is medium density, using a full background to
-indicate focus and selection. Use the `.navigation-sidebar` style class.
+This style of list is medium density, using a full background to indicate
+focus and selection. Use the `.navigation-sidebar` style class.
 
 ![Data table](data-table.png)
 
-The _data table_ style of list is a high density table, similar in style to a
-traditional treeview. Individual cells can be selectable and editable. Use
-the `.data-table` style class.
+This style of list is a high density table, similar in style to a traditional
+treeview. Individual cells can be selectable and editable. Use the `.data-table`
+style class.
 
 ## Comparison to GtkTreeView
 
@@ -203,19 +202,20 @@ compares to the way they know. This section will try to outline the similarities
 and differences between the two.
 
 This new approach tries to provide roughly the same functionality as the old
-approach but often uses a very different way to achieve these goals.
+approach but often uses a very different approach to achieve these goals.
 
 The main difference and one of the primary reasons for this new development is
-that items can be displayed using regular widgets and the separate cell renderer
-machinery is no longer necessary. This allows all benefits that widgets provide,
-such as complex layout, animations and CSS styling.
+that items can be displayed using regular widgets and `GtkCellRenderer` is no
+longer necessary. This allows all benefits that widgets provide, such as complex
+layout and animating widgets and not only makes cell renderers obsolete, but
+also `GtkCellArea`.
 
 The other big difference is the massive change to the data model. `GtkTreeModel`
-was a rather complex interface for a tree data structure. `GListModel` is
-deliberately designed to be a very simple data structure for lists only. (See
+was a rather complex interface for a tree data structure and `GListModel` was
+deliberately designed to be a simple data structure for lists only. (See
 [above](#displaying-trees)) for how to still do trees with this new model.)
-Another big change is that the new model allows for bulk changes via the
-`GListModel::items-changed` signal while `GtkTreeModel` only allows a single
+Another big change is that the new model allows for bulk changes via
+the `GListModel::items-changed` signal while `GtkTreeModel` only allows a single
 item to change at once. The goal here is of course to encourage implementation
 of custom list models.
 
@@ -231,8 +231,8 @@ via custom code in each widget, selection state is now meant to be managed by
 the selection models. In particular this allows for complex use cases with
 specialized requirements.
 
-Finally here's a quick comparison chart of equivalent functionality to look for
-when transitioning code:
+Finally here's a quick list of equivalent functionality to look for when
+transitioning code for easy lookup:
 
 | Old                  | New                                                     |
 | -------------------- | ------------------------------------------------------- |

examples/application2/meson.build

@@ -1,6 +1,6 @@
 app2_resources = gnome.compile_resources('exampleapp2_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 executable('exampleapp2',
   'exampleapp.c', 'exampleappwin.c', 'main.c', app2_resources,

examples/application3/meson.build

@@ -1,6 +1,6 @@
 app3_resources = gnome.compile_resources('exampleapp3_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 executable('exampleapp3',
   'exampleapp.c', 'exampleappwin.c', 'main.c', app3_resources,

examples/application4/meson.build

@@ -1,6 +1,6 @@
 app4_resources = gnome.compile_resources('exampleapp4_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 executable('exampleapp4',
   'exampleapp.c', 'exampleappwin.c', 'main.c', app4_resources,

examples/application5/meson.build

@@ -1,6 +1,6 @@
 app5_resources = gnome.compile_resources('exampleapp5_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app5_schemas = gnome.compile_schemas()
 

examples/application6/meson.build

@@ -1,6 +1,6 @@
 app6_resources = gnome.compile_resources('exampleapp6_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app6_schemas = gnome.compile_schemas()
 

examples/application7/meson.build

@@ -1,6 +1,6 @@
 app7_resources = gnome.compile_resources('exampleapp7_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app7_schemas = gnome.compile_schemas()
 

examples/application8/meson.build

@@ -1,6 +1,6 @@
 app8_resources = gnome.compile_resources('exampleapp8 resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app8_schemas = gnome.compile_schemas()
 

examples/application9/meson.build

@@ -1,6 +1,6 @@
 app9_resources = gnome.compile_resources('exampleapp9_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app9_schemas = gnome.compile_schemas()
 

examples/bp/meson.build

@@ -1,5 +1,5 @@
 bp_resources = gnome.compile_resources('bloatpad_resources',
                                        'bloatpad.gresources.xml',
-                                       source_dir: meson.current_source_dir())
+                                       source_dir: '.')
 
 executable('bloatpad', 'bloatpad.c', bp_resources, dependencies: libgtk_dep, c_args: common_cflags)

examples/hello/hello-world.c

@@ -37,7 +37,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);

gdk/broadway/broadway-protocol.h

@@ -213,7 +213,6 @@ typedef enum {
   BROADWAY_REQUEST_RELEASE_TEXTURE,
   BROADWAY_REQUEST_SET_NODES,
   BROADWAY_REQUEST_ROUNDTRIP,
-  BROADWAY_REQUEST_SET_MODAL_HINT,
 } BroadwayRequestType;
 
 typedef struct {
@@ -294,12 +293,6 @@ typedef struct {
   guint32 show_keyboard;
 } BroadwayRequestSetShowKeyboard;
 
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  gboolean modal_hint;
-} BroadwayRequestSetModalHint;
-
 typedef union {
   BroadwayRequestBase base;
   BroadwayRequestNewSurface new_surface;
@@ -319,7 +312,6 @@ typedef union {
   BroadwayRequestUploadTexture upload_texture;
   BroadwayRequestReleaseTexture release_texture;
   BroadwayRequestSetNodes set_nodes;
-  BroadwayRequestSetModalHint set_modal_hint;
 } BroadwayRequest;
 
 typedef enum {

gdk/broadway/broadway-server.c

@@ -124,7 +124,6 @@ struct BroadwaySurface {
   gboolean visible;
   gint32 transient_for;
   guint32 texture;
-  gboolean modal_hint;
   BroadwayNode *nodes;
   GHashTable *node_lookup;
 };
@@ -422,14 +421,6 @@ update_event_state (BroadwayServer *server,
       {
         surface->x = message->configure_notify.x;
         surface->y = message->configure_notify.y;
-
-	if (server->focused_surface_id != message->configure_notify.id &&
-	    server->pointer_grab_surface_id == -1 && surface->modal_hint)
-	{
-	  broadway_server_surface_raise (server, message->configure_notify.id);
-	  broadway_server_focus_surface (server, message->configure_notify.id);
-	  broadway_server_flush (server);
-	}
       }
     break;
   case BROADWAY_EVENT_ROUNDTRIP_NOTIFY:
@@ -1574,11 +1565,9 @@ broadway_server_query_mouse (BroadwayServer *server,
 
 void
 broadway_server_destroy_surface (BroadwayServer *server,
-                                 int id,
-                                 gboolean disconnected)
+                                 int id)
 {
   BroadwaySurface *surface;
-  gint32 transient_for = -1;
 
   if (server->mouse_in_surface_id == id)
     {
@@ -1590,29 +1579,17 @@ broadway_server_destroy_surface (BroadwayServer *server,
     server->pointer_grab_surface_id = -1;
 
   if (server->output)
-    broadway_output_destroy_surface (server->output, id);
+    broadway_output_destroy_surface (server->output,
+                                     id);
 
   surface = broadway_server_lookup_surface (server, id);
   if (surface != NULL)
     {
-      if (server->focused_surface_id == id)
-	transient_for = surface->transient_for;
-
       server->surfaces = g_list_remove (server->surfaces, surface);
       g_hash_table_remove (server->surface_id_hash,
                            GINT_TO_POINTER (id));
       broadway_surface_free (server, surface);
     }
-
-  if (transient_for != -1 && !disconnected)
-    {
-      surface = broadway_server_lookup_surface (server, transient_for);
-      if (surface != NULL)
-        {
-	  broadway_server_focus_surface (server, transient_for);
-	  broadway_server_flush (server);
-	}
-    }
 }
 
 gboolean
@@ -1733,19 +1710,6 @@ broadway_server_surface_set_transient_for (BroadwayServer *server,
     }
 }
 
-void
-broadway_server_surface_set_modal_hint (BroadwayServer *server,
-                                        int id, gboolean modal_hint)
-{
-  BroadwaySurface *surface;
-
-  surface = broadway_server_lookup_surface (server, id);
-  if (surface == NULL)
-    return;
-
-  surface->modal_hint = modal_hint;
-}
-
 gboolean
 broadway_server_has_client (BroadwayServer *server)
 {

gdk/broadway/broadway-server.h

@@ -93,8 +93,7 @@ guint32             broadway_server_new_surface               (BroadwayServer  *
                                                                int              width,
                                                                int              height);
 void                broadway_server_destroy_surface           (BroadwayServer  *server,
-                                                               int              id,
-                                                               gboolean         disconnected);
+                                                               int              id);
 gboolean            broadway_server_surface_show              (BroadwayServer  *server,
                                                                int              id);
 gboolean            broadway_server_surface_hide              (BroadwayServer  *server,
@@ -131,9 +130,6 @@ gboolean            broadway_server_surface_move_resize       (BroadwayServer  *
                                                                int              height);
 void                broadway_server_focus_surface             (BroadwayServer  *server,
                                                                int              new_focused_surface);
-void                broadway_server_surface_set_modal_hint    (BroadwayServer *server,
-                                                               int             id,
-                                                               gboolean        modal_hint);
 
 
 #endif /* __BROADWAY_SERVER__ */

gdk/broadway/broadwayd.c

@@ -101,7 +101,8 @@ client_disconnected (BroadwayClient *client)
     }
 
   for (l = client->surfaces; l != NULL; l = l->next)
-    broadway_server_destroy_surface (server, GPOINTER_TO_UINT (l->data), TRUE);
+    broadway_server_destroy_surface (server,
+                                     GPOINTER_TO_UINT (l->data));
   g_list_free (client->surfaces);
   client->surfaces = NULL;
 
@@ -267,7 +268,7 @@ client_handle_request (BroadwayClient *client,
       client->surfaces =
         g_list_remove (client->surfaces,
                        GUINT_TO_POINTER (request->destroy_surface.id));
-      broadway_server_destroy_surface (server, request->destroy_surface.id, FALSE);
+      broadway_server_destroy_surface (server, request->destroy_surface.id);
       break;
     case BROADWAY_REQUEST_SHOW_SURFACE:
       broadway_server_surface_show (server, request->show_surface.id);
@@ -379,11 +380,6 @@ client_handle_request (BroadwayClient *client,
     case BROADWAY_REQUEST_SET_SHOW_KEYBOARD:
       broadway_server_set_show_keyboard (server, request->set_show_keyboard.show_keyboard);
       break;
-    case BROADWAY_REQUEST_SET_MODAL_HINT:
-      broadway_server_surface_set_modal_hint (server,
-                                              request->set_modal_hint.id,
-                                              request->set_modal_hint.modal_hint);
-      break;
     default:
       g_warning ("Unknown request of type %d", request->base.type);
     }

gdk/broadway/gdkbroadway-server.c

@@ -561,18 +561,6 @@ _gdk_broadway_server_surface_set_transient_for (GdkBroadwayServer *server,
                                     BROADWAY_REQUEST_SET_TRANSIENT_FOR);
 }
 
-void
-_gdk_broadway_server_surface_set_modal_hint (GdkBroadwayServer *server,
-                                             int id, gboolean modal_hint)
-{
-  BroadwayRequestSetModalHint msg;
-
-  msg.id = id;
-  msg.modal_hint = modal_hint;
-  gdk_broadway_server_send_message (server, msg,
-				    BROADWAY_REQUEST_SET_MODAL_HINT);
-}
-
 static int
 open_shared_memory (void)
 {

gdk/broadway/gdkbroadway-server.h

@@ -78,8 +78,5 @@ gboolean           _gdk_broadway_server_surface_move_resize       (GdkBroadwaySe
 								  int                 y,
 								  int                 width,
 								  int                 height);
-void               _gdk_broadway_server_surface_set_modal_hint   (GdkBroadwayServer *server,
-                                                                  int                id,
-                                                                  gboolean           modal_hint);
 
 #endif /* __GDK_BROADWAY_SERVER__ */

gdk/broadway/gdkeventsource.c

@@ -82,27 +82,6 @@ gdk_event_source_check (GSource *source)
   return retval;
 }
 
-static void
-handle_focus_change (GdkEvent *event)
-{
-  GdkEvent *focus_event;
-  gboolean focus_in = (gdk_event_get_event_type (event) == GDK_ENTER_NOTIFY);
-
-  if (gdk_crossing_event_get_detail (event) == GDK_NOTIFY_INFERIOR)
-    return;
-
-  if (!gdk_crossing_event_get_focus (event) )
-    return;
-
-  focus_event = gdk_focus_event_new (gdk_event_get_surface (event),
-				     gdk_event_get_device (event),
-				     focus_in);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gdk_display_put_event (gdk_event_get_display (event), focus_event);
-G_GNUC_END_IGNORE_DEPRECATIONS
-  gdk_event_unref (focus_event);
-}
-
 void
 _gdk_broadway_events_got_input (GdkDisplay *display,
                                 BroadwayInputMsg *message)
@@ -131,8 +110,6 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
 
         node = _gdk_event_queue_append (display, event);
         _gdk_windowing_got_event (display, node, event, message->base.serial);
-
-	handle_focus_change (event);
       }
     break;
   case BROADWAY_EVENT_LEAVE:
@@ -149,8 +126,6 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
                                         message->crossing.mode,
                                         GDK_NOTIFY_ANCESTOR);
 
-	handle_focus_change (event);
-
         node = _gdk_event_queue_append (display, event);
         _gdk_windowing_got_event (display, node, event, message->base.serial);
       }

gdk/broadway/gdksurface-broadway.c

@@ -709,21 +709,6 @@ gdk_broadway_surface_set_transient_for (GdkSurface *surface,
   _gdk_broadway_server_surface_set_transient_for (display->server, impl->id, impl->transient_for);
 }
 
-static void
-gdk_broadway_surface_set_modal_hint (GdkSurface *surface,
-                                     gboolean   modal)
- {
-  GdkBroadwayDisplay *display;
-  GdkBroadwaySurface *impl;
-
-  impl = GDK_BROADWAY_SURFACE (surface);
-
-  impl->modal_hint = modal;
-
-  display = GDK_BROADWAY_DISPLAY (gdk_surface_get_display (surface));
-  _gdk_broadway_server_surface_set_modal_hint (display->server, impl->id, impl->modal_hint);
- }
-
 static void
 gdk_broadway_surface_get_geometry (GdkSurface *surface,
                                    int        *x,
@@ -1448,8 +1433,6 @@ gdk_broadway_toplevel_set_property (GObject      *object,
       break;
 
     case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
-      gdk_broadway_surface_set_modal_hint (surface, g_value_get_boolean (value));
-      g_object_notify_by_pspec (G_OBJECT (surface), pspec);
       break;
 
     case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
@@ -1496,10 +1479,6 @@ gdk_broadway_toplevel_get_property (GObject    *object,
       g_value_set_object (value, surface->transient_for);
       break;
 
-    case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
-      g_value_set_boolean (value, surface->modal_hint);
-      break;
-
     case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
       g_value_set_pointer (value, NULL);
       break;

gdk/broadway/gdksurface-broadway.h

@@ -54,7 +54,6 @@ struct _GdkBroadwaySurface
 
   gboolean dirty;
   gboolean last_synced;
-  gboolean modal_hint;
 
   GdkGeometry geometry_hints;
   GdkSurfaceHints geometry_hints_mask;

gdk/filetransferportal.c

@@ -26,7 +26,6 @@
 #include "gdkcontentformats.h"
 #include "gdkcontentserializer.h"
 #include "gdkcontentdeserializer.h"
-#include "gdkdebugprivate.h"
 
 #include <gio/gio.h>
 
@@ -214,8 +213,6 @@ file_transfer_portal_register_files (const char          **files,
   afd->len = g_strv_length ((char **)files);
   afd->start = 0;
 
-  GDK_DEBUG (DND, "file transfer portal: registering %d files", afd->len);
-
   g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
   g_variant_builder_add (&options, "{sv}", "writable", g_variant_new_boolean (writable));
   g_variant_builder_add (&options, "{sv}", "autostop", g_variant_new_boolean (TRUE));
@@ -351,8 +348,9 @@ portal_ready (GObject *object,
 static void
 portal_file_serializer (GdkContentSerializer *serializer)
 {
-  GPtrArray *files;
+  GFile *file;
   const GValue *value;
+  GPtrArray *files;
 
   files = g_ptr_array_new_with_free_func (g_free);
 
@@ -360,24 +358,9 @@ portal_file_serializer (GdkContentSerializer *serializer)
 
   if (G_VALUE_HOLDS (value, G_TYPE_FILE))
     {
-      GFile *file;
-
       file = g_value_get_object (gdk_content_serializer_get_value (serializer));
-
-      if (file && g_file_peek_path (file))
-        {
-          GDK_DEBUG (DND, "file transfer portal: Adding %s", g_file_peek_path (file));
-          g_ptr_array_add (files, g_file_get_path (file));
-        }
-#ifdef G_ENABLE_DEBUG
-      else if (GDK_DEBUG_CHECK (DND))
-        {
-          char *uri = g_file_get_uri (file);
-          gdk_debug_message ("file transfer portal: %s has no path, dropping\n", uri);
-          g_free (uri);
-        }
-#endif
-
+      if (file)
+        g_ptr_array_add (files, g_file_get_path (file));
       g_ptr_array_add (files, NULL);
     }
   else if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
@@ -385,21 +368,7 @@ portal_file_serializer (GdkContentSerializer *serializer)
       GSList *l;
 
       for (l = g_value_get_boxed (value); l; l = l->next)
-        {
-          GFile *file = l->data;
-
-          if (file && g_file_peek_path (file))
-            {
-              GDK_DEBUG (DND, "file transfer portal: Adding %s", g_file_peek_path (file));
-              g_ptr_array_add (files, g_file_get_path (file));
-            }
-          else
-            {
-              char *uri = g_file_get_uri (file);
-              gdk_debug_message ("file transfer portal: %s has no path, dropping", uri);
-              g_free (uri);
-            }
-        }
+        g_ptr_array_add (files, g_file_get_path (l->data));
 
       g_ptr_array_add (files, NULL);
     }
@@ -426,15 +395,6 @@ portal_finish (GObject *object,
       return;
     }
 
-#ifdef G_ENABLE_DEBUG
-  if (GDK_DEBUG_CHECK (DND))
-    {
-      char *s = g_strjoinv (", ", files);
-      gdk_debug_message ("file transfer portal: Receiving files: %s", s);
-      g_free (s);
-    }
-#endif
-
   value = gdk_content_deserializer_get_value (deserializer);
   if (G_VALUE_HOLDS (value, G_TYPE_FILE))
     {

gdk/gdk.h

@@ -45,7 +45,6 @@
 #include <gdk/gdkdisplaymanager.h>
 #include <gdk/gdkdrag.h>
 #include <gdk/gdkdragsurface.h>
-#include <gdk/gdkdragsurfacesize.h>
 #include <gdk/gdkdrawcontext.h>
 #include <gdk/gdkdrop.h>
 #include <gdk/gdkenums.h>
@@ -70,7 +69,6 @@
 #include <gdk/gdksnapshot.h>
 #include <gdk/gdksurface.h>
 #include <gdk/gdktexture.h>
-#include <gdk/gdktexturedownloader.h>
 #include <gdk/gdktoplevel.h>
 #include <gdk/gdktoplevellayout.h>
 #include <gdk/gdktoplevelsize.h>

gdk/gdkclipboard.c

@@ -750,7 +750,7 @@ static void
 free_value (gpointer value)
 {
   g_value_unset (value);
-  g_free (value);
+  g_slice_free (GValue, value);
 }
 
 static void
@@ -771,7 +771,7 @@ gdk_clipboard_read_value_internal (GdkClipboard        *clipboard,
   task = g_task_new (clipboard, cancellable, callback, user_data);
   g_task_set_priority (task, io_priority);
   g_task_set_source_tag (task, source_tag);
-  value = g_new0 (GValue, 1);
+  value = g_slice_new0 (GValue);
   g_value_init (value, type);
   g_task_set_task_data (task, value, free_value);
 

gdk/gdkcontentdeserializer.c

@@ -410,7 +410,7 @@ gdk_content_register_deserializer (const char                *mime_type,
   g_return_if_fail (mime_type != NULL);
   g_return_if_fail (deserialize != NULL);
 
-  deserializer = g_new0 (Deserializer, 1);
+  deserializer = g_slice_new0 (Deserializer);
 
   deserializer->mime_type = g_intern_string (mime_type);
   deserializer->type = type;

gdk/gdkcontentformats.c

@@ -112,7 +112,7 @@ gdk_content_formats_new_take (GType *      gtypes,
                               const char **mime_types,
                               gsize        n_mime_types)
 {
-  GdkContentFormats *result = g_new0 (GdkContentFormats, 1);
+  GdkContentFormats *result = g_slice_new0 (GdkContentFormats);
   result->ref_count = 1;
 
   result->gtypes = gtypes;
@@ -287,7 +287,7 @@ gdk_content_formats_unref (GdkContentFormats *formats)
 
   g_free (formats->gtypes);
   g_free (formats->mime_types);
-  g_free (formats);
+  g_slice_free (GdkContentFormats, formats);
 }
 
 /**
@@ -611,7 +611,7 @@ gdk_content_formats_builder_new (void)
 {
   GdkContentFormatsBuilder *builder;
 
-  builder = g_new0 (GdkContentFormatsBuilder, 1);
+  builder = g_slice_new0 (GdkContentFormatsBuilder);
   builder->ref_count = 1;
 
   return builder;
@@ -665,7 +665,7 @@ gdk_content_formats_builder_unref (GdkContentFormatsBuilder *builder)
     return;
 
   gdk_content_formats_builder_clear (builder);
-  g_free (builder);
+  g_slice_free (GdkContentFormatsBuilder, builder);
 }
 
 /**

gdk/gdkcontentserializer.c

@@ -416,7 +416,7 @@ gdk_content_register_serializer (GType                    type,
   g_return_if_fail (mime_type != NULL);
   g_return_if_fail (serialize != NULL);
 
-  serializer = g_new0 (Serializer, 1);
+  serializer = g_slice_new0 (Serializer);
 
   serializer->mime_type = g_intern_string (mime_type);
   serializer->type = type;

gdk/gdkdisplay.c

@@ -322,7 +322,7 @@ static void
 free_pointer_info (GdkPointerSurfaceInfo *info)
 {
   g_clear_object (&info->surface_under_pointer);
-  g_free (info);
+  g_slice_free (GdkPointerSurfaceInfo, info);
 }
 
 static void
@@ -834,7 +834,7 @@ _gdk_display_get_pointer_info (GdkDisplay *display,
 
   if (G_UNLIKELY (!info))
     {
-      info = g_new0 (GdkPointerSurfaceInfo, 1);
+      info = g_slice_new0 (GdkPointerSurfaceInfo);
       g_hash_table_insert (display->pointers_info, device, info);
     }
 
@@ -1149,7 +1149,7 @@ _gdk_display_get_next_serial (GdkDisplay *display)
  * [method@Gtk.Window.set_auto_startup_notification]
  * is called to disable that feature.
  *
- * Deprecated: 4.10: Using [method@Gdk.Toplevel.set_startup_id] is sufficient
+ * Deprecated: 4.10. Using gdk_toplevel_set_startup_id() is sufficient.
  */
 void
 gdk_display_notify_startup_complete (GdkDisplay  *display,
@@ -1168,8 +1168,6 @@ gdk_display_notify_startup_complete (GdkDisplay  *display,
  * if no ID has been defined.
  *
  * Returns: (nullable): the startup notification ID for @display
- *
- * Deprecated: 4.10
  */
 const char *
 gdk_display_get_startup_notification_id (GdkDisplay *display)

gdk/gdkdisplay.h

@@ -86,7 +86,7 @@ GdkClipboard *          gdk_display_get_primary_clipboard       (GdkDisplay
 GDK_DEPRECATED_IN_4_10_FOR(gdk_toplevel_set_startup_id)
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const char    *startup_id);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 const char * gdk_display_get_startup_notification_id (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL

gdk/gdkdragsurface.c

@@ -37,22 +37,6 @@
 
 G_DEFINE_INTERFACE (GdkDragSurface, gdk_drag_surface, GDK_TYPE_SURFACE)
 
-enum
-{
-  COMPUTE_SIZE,
-
-  N_SIGNALS
-};
-
-static guint signals[N_SIGNALS] = { 0 };
-
-void
-gdk_drag_surface_notify_compute_size (GdkDragSurface     *surface,
-                                      GdkDragSurfaceSize *size)
-{
-  g_signal_emit (surface, signals[COMPUTE_SIZE], 0, size);
-}
-
 static gboolean
 gdk_drag_surface_default_present (GdkDragSurface *drag_surface,
                                   int          width,
@@ -65,35 +49,6 @@ static void
 gdk_drag_surface_default_init (GdkDragSurfaceInterface *iface)
 {
   iface->present = gdk_drag_surface_default_present;
-
-  /**
-   * GdkDragSurface::compute-size:
-   * @surface: a `GdkDragSurface`
-   * @size: (type Gdk.DragSurfaceSize) (out caller-allocates): a
-   * `GdkDragSurfaceSize`
-   *
-   * Emitted when the size for the surface needs to be computed, when it is
-   * present.
-   *
-   * It will normally be emitted during the native surface layout cycle when the
-   * surface size needs to be recomputed.
-   *
-   * It is the responsibility of the drag surface user to handle this signal and
-   * compute the desired size of the surface, storing the computed size in the
-   * [struct@Gdk.DragSurfaceSize] object. Failing to do so will result in an
-   * arbitrary size being used as a result.
-   *
-   * Since: 4.12
-   */
-  signals[COMPUTE_SIZE] =
-    g_signal_new (I_("compute-size"),
-                  GDK_TYPE_DRAG_SURFACE,
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE, 1,
-                  GDK_TYPE_DRAG_SURFACE_SIZE);
 }
 
 /**

gdk/gdkdragsurfaceprivate.h

@@ -2,7 +2,6 @@
 #define __GDK_DRAG_SURFACE_PRIVATE_H__
 
 #include "gdkdragsurface.h"
-#include "gdkdragsurfacesize.h"
 
 G_BEGIN_DECLS
 
@@ -16,9 +15,6 @@ struct _GdkDragSurfaceInterface
                         int             height);
 };
 
-void gdk_drag_surface_notify_compute_size (GdkDragSurface     *surface,
-                                           GdkDragSurfaceSize *size);
-
 G_END_DECLS
 
 #endif /* __GDK_DRAG_SURFACE_PRIVATE_H__ */

gdk/gdkdragsurfacesize.c

@@ -1,57 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2023 Red Hat
- *
- * 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 "config.h"
-
-#include "gdkdragsurfacesizeprivate.h"
-
-/**
- * GdkDragSurfaceSize:
- *
- * The `GdkDragSurfaceSize` struct contains information that is useful
- * to compute the size of a drag surface.
- *
- * Since: 4.12
- */
-
-G_DEFINE_POINTER_TYPE (GdkDragSurfaceSize, gdk_drag_surface_size)
-
-void
-gdk_drag_surface_size_init (GdkDragSurfaceSize *size)
-{
-  *size = (GdkDragSurfaceSize) { 0 };
-}
-
-/**
- * gdk_drag_surface_size_set_size:
- * @size: a `GdkDragSurfaceSize`
- * @width: the width
- * @height: the height
- *
- * Sets the size the drag surface prefers to be resized to.
- *
- * Since: 4.12
- */
-void
-gdk_drag_surface_size_set_size (GdkDragSurfaceSize *size,
-                                int                 width,
-                                int                 height)
-{
-  size->width = width;
-  size->height = height;
-}

gdk/gdkdragsurfacesize.h

@@ -1,42 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2023 Red Hat
- *
- * 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/>.
- *
- */
-
-#pragma once
-
-#if !defined(__GDK_H_INSIDE__) && !defined(GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDragSurfaceSize GdkDragSurfaceSize;
-
-#define GDK_TYPE_DRAG_SURFACE_SIZE (gdk_drag_surface_size_get_type ())
-
-GDK_AVAILABLE_IN_4_12
-GType                   gdk_drag_surface_size_get_type  (void);
-
-GDK_AVAILABLE_IN_4_12
-void                    gdk_drag_surface_size_set_size  (GdkDragSurfaceSize *size,
-                                                         int                 width,
-                                                         int                 height);
-
-G_END_DECLS

gdk/gdkdragsurfacesizeprivate.h

@@ -1,29 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2023 Red Hat
- *
- * 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/>.
- *
- */
-
-#pragma once
-
-#include "gdkdragsurfacesize.h"
-
-struct _GdkDragSurfaceSize
-{
-  int width;
-  int height;
-};
-
-void gdk_drag_surface_size_init (GdkDragSurfaceSize *size);

gdk/gdkdrop.c

@@ -767,7 +767,7 @@ static void
 free_value (gpointer value)
 {
   g_value_unset (value);
-  g_free (value);
+  g_slice_free (GValue, value);
 }
 
 static void
@@ -790,7 +790,7 @@ gdk_drop_read_value_internal (GdkDrop             *self,
   task = g_task_new (self, cancellable, callback, user_data);
   g_task_set_priority (task, io_priority);
   g_task_set_source_tag (task, source_tag);
-  value = g_new0 (GValue, 1);
+  value = g_slice_new0 (GValue);
   g_value_init (value, type);
   g_task_set_task_data (task, value, free_value);
 

gdk/gdkevents.c

@@ -1511,6 +1511,7 @@ gdk_button_event_get_button (GdkEvent *event)
 }
 
 /* }}} */
+
 /* {{{ GdkKeyEvent */
 
 /**
@@ -1971,6 +1972,7 @@ gdk_key_event_get_match (GdkEvent        *event,
 }
 
 /* }}} */
+
 /* {{{ GdkTouchEvent */
 
 /**
@@ -2107,6 +2109,7 @@ gdk_touch_event_get_emulating_pointer (GdkEvent *event)
 }
 
 /* }}} */
+
 /* {{{ GdkCrossingEvent */
 
 /**
@@ -2250,6 +2253,7 @@ gdk_crossing_event_get_detail (GdkEvent *event)
 }
 
 /* }}} */
+
 /* {{{ GdkDeleteEvent */
 
 /**
@@ -2280,6 +2284,7 @@ gdk_delete_event_new (GdkSurface *surface)
 }
 
 /* }}} */
+
 /* {{{ GdkFocusEvent */
 
 /**
@@ -2336,6 +2341,7 @@ gdk_focus_event_get_in (GdkEvent *event)
 }
 
 /* }}} */
+
 /* {{{ GdkScrollEvent */
 
 /**
@@ -2594,6 +2600,7 @@ gdk_scroll_event_get_unit (GdkEvent *event)
 }
 
 /* }}} */
+
 /* {{{ GdkTouchpadEvent */
 
 /**
@@ -2852,6 +2859,7 @@ gdk_touchpad_event_get_pinch_scale (GdkEvent *event)
 }
 
 /* }}} */
+
 /* {{{ GdkPadEvent */
 
 /**
@@ -3025,6 +3033,7 @@ gdk_pad_event_get_group_mode (GdkEvent *event,
 }
 
 /* }}} */
+
 /* {{{ GdkMotionEvent */
 
 /**
@@ -3186,6 +3195,7 @@ gdk_event_get_history (GdkEvent *event,
 }
 
 /* }}} */
+
 /* {{{ GdkProximityEvent */
 
 /**
@@ -3248,6 +3258,7 @@ gdk_proximity_event_new (GdkEventType   type,
 }
 
 /* }}} */
+
 /* {{{ GdkDNDEvent */
 
 /**
@@ -3353,6 +3364,7 @@ gdk_dnd_event_get_drop (GdkEvent *event)
 }
 
 /* }}} */
+
 /* {{{ GdkGrabBrokenEvent */
 
 /**
@@ -3430,5 +3442,3 @@ gdk_grab_broken_event_get_implicit (GdkEvent *event)
 }
 
 /* }}} */
-
-/* vim:set foldmethod=marker expandtab: */

gdk/gdkframetimings.c

@@ -43,7 +43,7 @@ _gdk_frame_timings_new (gint64 frame_counter)
 {
   GdkFrameTimings *timings;
 
-  timings = g_new0 (GdkFrameTimings, 1);
+  timings = g_slice_new0 (GdkFrameTimings);
   timings->ref_count = 1;
   timings->frame_counter = frame_counter;
 
@@ -99,7 +99,9 @@ gdk_frame_timings_unref (GdkFrameTimings *timings)
 
   timings->ref_count--;
   if (timings->ref_count == 0)
-    g_free (timings);
+    {
+      g_slice_free (GdkFrameTimings, timings);
+    }
 }
 
 /**

gdk/gdkglcontext.c

@@ -501,18 +501,6 @@ gdk_gl_context_real_is_shared (GdkGLContext *self,
   return TRUE;
 }
 
-static gboolean
-gdk_gl_context_real_is_current (GdkGLContext *self)
-{
-#ifdef HAVE_EGL
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
-
-  return priv->egl_context == eglGetCurrentContext ();
-#else
-  return TRUE;
-#endif
-}
-
 static gboolean
 gdk_gl_context_real_clear_current (GdkGLContext *context)
 {
@@ -682,7 +670,6 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
   klass->is_shared = gdk_gl_context_real_is_shared;
   klass->make_current = gdk_gl_context_real_make_current;
   klass->clear_current = gdk_gl_context_real_clear_current;
-  klass->is_current = gdk_gl_context_real_is_current;
   klass->get_default_framebuffer = gdk_gl_context_real_get_default_framebuffer;
 
   draw_context_class->begin_frame = gdk_gl_context_real_begin_frame;
@@ -1546,38 +1533,24 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
   priv->has_half_float = gdk_gl_context_check_version (context, 3, 0, 3, 0) ||
                          epoxy_has_gl_extension ("OES_vertex_half_float");
 
-#ifdef G_ENABLE_DEBUG
-  {
-    int max_texture_size;
-    glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_texture_size);
-    GDK_DISPLAY_DEBUG (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), OPENGL,
-                       "%s version: %d.%d (%s)\n"
-                       "* GLSL version: %s\n"
-                       "* Max texture size: %d\n"
-                       "* Extensions checked:\n"
-                       " - GL_KHR_debug: %s\n"
-                       " - GL_EXT_unpack_subimage: %s\n"
-                       " - OES_vertex_half_float: %s",
-                       gdk_gl_context_get_use_es (context) ? "OpenGL ES" : "OpenGL",
-                       priv->gl_version / 10, priv->gl_version % 10,
-                       priv->is_legacy ? "legacy" : "core",
-                       glGetString (GL_SHADING_LANGUAGE_VERSION),
-                       max_texture_size,
-                       priv->has_khr_debug ? "yes" : "no",
-                       priv->has_unpack_subimage ? "yes" : "no",
-                       priv->has_half_float ? "yes" : "no");
-  }
-#endif
+  GDK_DISPLAY_DEBUG (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), OPENGL,
+                     "%s version: %d.%d (%s)\n"
+                     "* GLSL version: %s\n"
+                     "* Extensions checked:\n"
+                     " - GL_KHR_debug: %s\n"
+                     " - GL_EXT_unpack_subimage: %s\n"
+                     " - OES_vertex_half_float: %s",
+                     gdk_gl_context_get_use_es (context) ? "OpenGL ES" : "OpenGL",
+                     priv->gl_version / 10, priv->gl_version % 10,
+                     priv->is_legacy ? "legacy" : "core",
+                     glGetString (GL_SHADING_LANGUAGE_VERSION),
+                     priv->has_khr_debug ? "yes" : "no",
+                     priv->has_unpack_subimage ? "yes" : "no",
+                     priv->has_half_float ? "yes" : "no");
 
   priv->extensions_checked = TRUE;
 }
 
-static gboolean
-gdk_gl_context_check_is_current (GdkGLContext *context)
-{
-  return GDK_GL_CONTEXT_GET_CLASS (context)->is_current (context);
-}
-
 /**
  * gdk_gl_context_make_current:
  * @context: a `GdkGLContext`
@@ -1596,7 +1569,7 @@ gdk_gl_context_make_current (GdkGLContext *context)
   masked_context = mask_context (context, surfaceless);
 
   current = g_private_get (&thread_current_context);
-  if (current == masked_context && gdk_gl_context_check_is_current (context))
+  if (current == masked_context)
     return;
 
   /* we need to realize the GdkGLContext if it wasn't explicitly realized */
@@ -1767,18 +1740,10 @@ GdkGLContext *
 gdk_gl_context_get_current (void)
 {
   MaskedContext *current;
-  GdkGLContext *context;
 
   current = g_private_get (&thread_current_context);
-  context = unmask_context (current);
 
-  if (context && !gdk_gl_context_check_is_current (context))
-    {
-      g_private_replace (&thread_current_context, NULL);
-      context = NULL;
-    }
-
-  return context;
+  return unmask_context (current);
 }
 
 gboolean

gdk/gdkglcontextprivate.h

@@ -83,7 +83,6 @@ struct _GdkGLContextClass
   gboolean              (* make_current)                        (GdkGLContext          *context,
                                                                  gboolean               surfaceless);
   gboolean              (* clear_current)                       (GdkGLContext          *context);
-  gboolean              (* is_current)                          (GdkGLContext          *context);
   cairo_region_t *      (* get_damage)                          (GdkGLContext          *context);
 
   gboolean              (* is_shared)                           (GdkGLContext          *self,

gdk/gdkgltexture.c

@@ -24,6 +24,7 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
+#include "gdktextureprivate.h"
 
 #include <epoxy/gl.h>
 
@@ -52,8 +53,10 @@ struct _GdkGLTextureClass {
 G_DEFINE_TYPE (GdkGLTexture, gdk_gl_texture, GDK_TYPE_TEXTURE)
 
 static void
-drop_gl_resources (GdkGLTexture *self)
+gdk_gl_texture_dispose (GObject *object)
 {
+  GdkGLTexture *self = GDK_GL_TEXTURE (object);
+
   if (self->destroy)
     {
       self->destroy (self->data);
@@ -63,29 +66,17 @@ drop_gl_resources (GdkGLTexture *self)
 
   g_clear_object (&self->context);
   self->id = 0;
-}
-
-static void
-gdk_gl_texture_dispose (GObject *object)
-{
-  GdkGLTexture *self = GDK_GL_TEXTURE (object);
-
-  drop_gl_resources (self);
 
   g_clear_object (&self->saved);
 
   G_OBJECT_CLASS (gdk_gl_texture_parent_class)->dispose (object);
 }
 
-typedef void (* GLFunc) (GdkGLTexture *self,
-                         GdkGLContext *context,
-                         gpointer      data);
-
 typedef struct _InvokeData
 {
   GdkGLTexture *self;
   volatile int spinlock;
-  GLFunc func;
+  GFunc func;
   gpointer data;
 } InvokeData;
 
@@ -100,7 +91,7 @@ gdk_gl_texture_invoke_callback (gpointer data)
   gdk_gl_context_make_current (context);
   glBindTexture (GL_TEXTURE_2D, invoke->self->id);
 
-  invoke->func (invoke->self, context, invoke->data);
+  invoke->func (invoke->self, invoke->data);
 
   g_atomic_int_set (&invoke->spinlock, 1);
 
@@ -109,7 +100,7 @@ gdk_gl_texture_invoke_callback (gpointer data)
 
 static void
 gdk_gl_texture_run (GdkGLTexture *self,
-                    GLFunc        func,
+                    GFunc         func,
                     gpointer      data)
 {
   InvokeData invoke = { self, 0, func, data };
@@ -154,19 +145,19 @@ gdk_gl_texture_find_format (gboolean         use_es,
 }
 
 static inline void
-gdk_gl_texture_do_download (GdkGLTexture *self,
-                            GdkGLContext *context,
-                            gpointer      download_)
+gdk_gl_texture_do_download (gpointer texture_,
+                            gpointer download_)
 {
-  GdkTexture *texture = GDK_TEXTURE (self);
   gsize expected_stride;
+  GdkGLTexture *self = texture_;
+  GdkTexture *texture = texture_;
   Download *download = download_;
   GLenum gl_internal_format, gl_format, gl_type;
 
   expected_stride = texture->width * gdk_memory_format_bytes_per_pixel (download->format);
 
   if (download->stride == expected_stride &&
-      !gdk_gl_context_get_use_es (context) &&
+      !gdk_gl_context_get_use_es (self->context) && 
       gdk_memory_format_gl_format (download->format, TRUE, &gl_internal_format, &gl_format, &gl_type))
     {
       glGetTexImage (GL_TEXTURE_2D,
@@ -184,11 +175,11 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
       glGenFramebuffers (1, &fbo);
       glBindFramebuffer (GL_FRAMEBUFFER, fbo);
       glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->id, 0);
-      if (gdk_gl_context_check_version (context, 4, 3, 3, 1))
+      if (gdk_gl_context_check_version (self->context, 4, 3, 3, 1))
         {
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_read_format);
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_read_type);
-          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (context), gl_read_format, gl_read_type, &actual_format))
+          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (self->context), gl_read_format, gl_read_type, &actual_format))
             actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
         }
       else
@@ -202,7 +193,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
           (download->stride == expected_stride))
         {
           glReadPixels (0, 0,
-                        texture->width, texture->height,
+                        texture->width, texture->height, 
                         gl_read_format,
                         gl_read_type,
                         download->data);
@@ -213,7 +204,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
           guchar *pixels = g_malloc_n (texture->width * actual_bpp, texture->height);
 
           glReadPixels (0, 0,
-                        texture->width, texture->height,
+                        texture->width, texture->height, 
                         gl_read_format,
                         gl_read_type,
                         pixels);
@@ -306,7 +297,15 @@ gdk_gl_texture_release (GdkGLTexture *self)
   self->saved = GDK_TEXTURE (gdk_memory_texture_from_texture (texture,
                                                               gdk_texture_get_format (texture)));
 
-  drop_gl_resources (self);
+  if (self->destroy)
+    {
+      self->destroy (self->data);
+      self->destroy = NULL;
+      self->data = NULL;
+    }
+
+  g_clear_object (&self->context);
+  self->id = 0;
 }
 
 static void
@@ -335,7 +334,6 @@ gdk_gl_texture_determine_format (GdkGLTexture *self)
   switch (internal_format)
   {
     case GL_RGB8:
-    case GL_RGB:
       texture->format = GDK_MEMORY_R8G8B8;
       break;
 

gdk/gdkmemorytexture.c

@@ -178,10 +178,10 @@ gdk_memory_texture_new_subtexture (GdkMemoryTexture  *source,
   GBytes *bytes;
 
   g_return_val_if_fail (GDK_IS_MEMORY_TEXTURE (source), NULL);
-  g_return_val_if_fail (x >= 0 && x < GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (y >= 0 && y < GDK_TEXTURE (source)->height, NULL);
-  g_return_val_if_fail (width > 0 && x + width <= GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (height > 0 && y + height <= GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (x >= 0 || x < GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (y >= 0 || y < GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (width > 0 || x + width <= GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (height > 0 || y + height <= GDK_TEXTURE (source)->height, NULL);
 
   texture = GDK_TEXTURE (source);
   bpp = gdk_memory_format_bytes_per_pixel (texture->format);
@@ -222,7 +222,7 @@ gdk_memory_texture_from_texture (GdkTexture      *texture,
   data = g_malloc_n (stride, texture->height);
 
   gdk_texture_do_download (texture, format, data, stride);
-  bytes = g_bytes_new_take (data, stride * texture->height);
+  bytes = g_bytes_new_take (data, stride);
   result = gdk_memory_texture_new (texture->width,
                                    texture->height,
                                    format,
@@ -233,11 +233,15 @@ gdk_memory_texture_from_texture (GdkTexture      *texture,
   return GDK_MEMORY_TEXTURE (result);
 }
 
-GBytes *
-gdk_memory_texture_get_bytes (GdkMemoryTexture *self,
-                              gsize            *out_stride)
+const guchar *
+gdk_memory_texture_get_data (GdkMemoryTexture *self)
 {
-  *out_stride = self->stride;
-  return self->bytes;
+  return g_bytes_get_data (self->bytes, NULL);
+}
+
+gsize
+gdk_memory_texture_get_stride (GdkMemoryTexture *self)
+{
+  return self->stride;
 }
 

gdk/gdkmemorytextureprivate.h

@@ -37,8 +37,8 @@ GdkTexture *            gdk_memory_texture_new_subtexture   (GdkMemoryTexture  *
                                                              int                width,
                                                              int                height);
 
-GBytes *                gdk_memory_texture_get_bytes        (GdkMemoryTexture  *self,
-                                                             gsize             *out_stride);
+const guchar *          gdk_memory_texture_get_data         (GdkMemoryTexture  *self);
+gsize                   gdk_memory_texture_get_stride       (GdkMemoryTexture  *self);
 
 
 G_END_DECLS

gdk/gdkmonitor.c

@@ -39,7 +39,6 @@
 
 enum {
   PROP_0,
-  PROP_DESCRIPTION,
   PROP_DISPLAY,
   PROP_MANUFACTURER,
   PROP_MODEL,
@@ -82,10 +81,6 @@ gdk_monitor_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, monitor->description);
-      break;
-
     case PROP_DISPLAY:
       g_value_set_object (value, monitor->display);
       break;
@@ -159,7 +154,6 @@ gdk_monitor_finalize (GObject *object)
 {
   GdkMonitor *monitor = GDK_MONITOR (object);
 
-  g_free (monitor->description);
   g_free (monitor->connector);
   g_free (monitor->manufacturer);
   g_free (monitor->model);
@@ -176,18 +170,6 @@ gdk_monitor_class_init (GdkMonitorClass *class)
   object_class->get_property = gdk_monitor_get_property;
   object_class->set_property = gdk_monitor_set_property;
 
-  /**
-   * GdkMonitor:description: (attributes org.gtk.Property.get=gdk_monitor_get_description)
-   *
-   * A short description of the monitor, meant for display to the user.
-   *
-   * Since: 4.10
-   */
-  props[PROP_DESCRIPTION] =
-    g_param_spec_string ("description", NULL, NULL,
-                         NULL,
-                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
   /**
    * GdkMonitor:display: (attributes org.gtk.Property.get=gdk_monitor_get_display)
    *
@@ -395,10 +377,6 @@ gdk_monitor_get_height_mm (GdkMonitor *monitor)
  *
  * Gets the name of the monitor's connector, if available.
  *
- * These are strings such as "eDP-1", or "HDMI-2". They depend
- * on software and hardware configuration, and should not be
- * relied on as stable identifiers of a specific monitor.
- *
  * Returns: (transfer none) (nullable): the name of the connector
  */
 const char *
@@ -641,33 +619,3 @@ gdk_monitor_is_valid (GdkMonitor *monitor)
 
   return monitor->valid;
 }
-
-/**
- * gdk_monitor_get_description: (attributes org.gtk.Method.get_property=description)
- * @monitor: a `GdkMonitor`
- *
- * Gets a string describing the monitor, if available.
- *
- * This can be used to identify a monitor in the UI.
- *
- * Returns: (transfer none) (nullable): the monitor description
- *
- * Since: 4.10
- */
-const char *
-gdk_monitor_get_description (GdkMonitor *monitor)
-{
-  g_return_val_if_fail (GDK_IS_MONITOR (monitor), NULL);
-
-  return monitor->description;
-}
-
-void
-gdk_monitor_set_description (GdkMonitor *monitor,
-                             const char *description)
-{
-  g_free (monitor->description);
-  monitor->description = g_strdup (description);
-  g_object_notify_by_pspec (G_OBJECT (monitor), props[PROP_DESCRIPTION]);
-}
-

gdk/gdkmonitor.h

@@ -86,8 +86,6 @@ GDK_AVAILABLE_IN_ALL
 GdkSubpixelLayout gdk_monitor_get_subpixel_layout (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_ALL
 gboolean          gdk_monitor_is_valid            (GdkMonitor   *monitor);
-GDK_AVAILABLE_IN_4_10
-const char *      gdk_monitor_get_description     (GdkMonitor   *monitor);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
 

gdk/gdkmonitorprivate.h

@@ -37,7 +37,6 @@ struct _GdkMonitor {
   char *manufacturer;
   char *model;
   char *connector;
-  char *description;
   GdkRectangle geometry;
   int width_mm;
   int height_mm;
@@ -71,8 +70,6 @@ void            gdk_monitor_set_refresh_rate    (GdkMonitor *monitor,
 void            gdk_monitor_set_subpixel_layout (GdkMonitor        *monitor,
                                                  GdkSubpixelLayout  subpixel);
 void            gdk_monitor_invalidate          (GdkMonitor *monitor);
-void            gdk_monitor_set_description     (GdkMonitor *monitor,
-                                                 const char *description);
 
 G_END_DECLS
 

gdk/gdkpipeiostream.c

@@ -50,7 +50,7 @@ gdk_io_pipe_new (void)
 {
   GdkIOPipe *pipe;
 
-  pipe = g_new0 (GdkIOPipe, 1);
+  pipe = g_slice_new0 (GdkIOPipe);
   pipe->ref_count = 1;
 
   g_mutex_init (&pipe->mutex);
@@ -76,7 +76,7 @@ gdk_io_pipe_unref (GdkIOPipe *pipe)
   g_cond_clear (&pipe->cond);
   g_mutex_clear (&pipe->mutex);
 
-  g_free (pipe);
+  g_slice_free (GdkIOPipe, pipe);
 }
 
 static void

gdk/gdkpixbuf.c

@@ -27,7 +27,7 @@
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdksurface.h"
-#include "gdktexturedownloaderprivate.h"
+#include "gdktextureprivate.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -218,9 +218,9 @@ gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
 
 static void
 pixbuf_texture_unref_cb (guchar   *pixels,
-                         gpointer  bytes)
+                         gpointer  texture)
 {
-  g_bytes_unref (bytes);
+  g_object_unref (texture);
 }
 
 /**
@@ -238,27 +238,22 @@ pixbuf_texture_unref_cb (guchar   *pixels,
 GdkPixbuf *
 gdk_pixbuf_get_from_texture (GdkTexture *texture)
 {
-  GdkTextureDownloader downloader;
-  GBytes *bytes;
-  gsize stride;
+  GdkMemoryTexture *memtex;
   gboolean alpha;
 
   alpha = gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_OPAQUE;
 
-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, 
-                                     alpha ? GDK_MEMORY_GDK_PIXBUF_ALPHA
-                                           : GDK_MEMORY_GDK_PIXBUF_OPAQUE);
-  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
-  gdk_texture_downloader_finish (&downloader);
+  memtex = gdk_memory_texture_from_texture (texture,
+                                            alpha ? GDK_MEMORY_GDK_PIXBUF_ALPHA
+                                                  : GDK_MEMORY_GDK_PIXBUF_OPAQUE);
 
-  return gdk_pixbuf_new_from_data (g_bytes_get_data (bytes, NULL),
+  return gdk_pixbuf_new_from_data (gdk_memory_texture_get_data (memtex),
                                    GDK_COLORSPACE_RGB,
                                    alpha,
                                    8,
-                                   gdk_texture_get_width (texture),
-                                   gdk_texture_get_height (texture),
-                                   stride,
+                                   gdk_texture_get_width (GDK_TEXTURE (memtex)),
+                                   gdk_texture_get_height (GDK_TEXTURE (memtex)),
+                                   gdk_memory_texture_get_stride (memtex),
                                    pixbuf_texture_unref_cb,
-                                   bytes);
+                                   memtex);
 }

gdk/gdkrgba.c

@@ -67,12 +67,7 @@ G_DEFINE_BOXED_TYPE (GdkRGBA, gdk_rgba,
 GdkRGBA *
 gdk_rgba_copy (const GdkRGBA *rgba)
 {
-  GdkRGBA *copy;
-
-  copy = g_new (GdkRGBA, 1);
-  memcpy (copy, rgba, sizeof (GdkRGBA));
-
-  return copy;
+  return g_slice_dup (GdkRGBA, rgba);
 }
 
 /**
@@ -84,7 +79,7 @@ gdk_rgba_copy (const GdkRGBA *rgba)
 void
 gdk_rgba_free (GdkRGBA *rgba)
 {
-  g_free (rgba);
+  g_slice_free (GdkRGBA, rgba);
 }
 
 /**

gdk/gdktexture.c

@@ -395,7 +395,7 @@ gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf)
 
   bytes = g_bytes_new_with_free_func (gdk_pixbuf_get_pixels (pixbuf),
                                       gdk_pixbuf_get_height (pixbuf)
-                                      * (gsize) gdk_pixbuf_get_rowstride (pixbuf),
+                                      * gdk_pixbuf_get_rowstride (pixbuf),
                                       g_object_unref,
                                       g_object_ref (pixbuf));
   texture = gdk_memory_texture_new (gdk_pixbuf_get_width (pixbuf),
@@ -722,9 +722,6 @@ gdk_texture_download_surface (GdkTexture *texture)
  *                       cairo_image_surface_get_stride (surface));
  * cairo_surface_mark_dirty (surface);
  * ```
- *
- * For more flexible download capabilites, see
- * [struct@Gdk.TextureDownloader].
  */
 void
 gdk_texture_download (GdkTexture *texture,
@@ -741,29 +738,9 @@ gdk_texture_download (GdkTexture *texture,
                            stride);
 }
 
-/**
- * gdk_texture_get_format:
- * @self: a GdkTexture
- *
- * Gets the memory format most closely associated with the data of
- * the texture.
- *
- * Note that it may not be an exact match for texture data
- * stored on the GPU or with compression.
- *
- * The format can give an indication about the bit depth and opacity
- * of the texture and is useful to determine the best format for
- * downloading the texture.
- *
- * Returns: the preferred format for the texture's data
- *
- * Since: 4.10
- **/
 GdkMemoryFormat
 gdk_texture_get_format (GdkTexture *self)
 {
-  g_return_val_if_fail (GDK_IS_TEXTURE (self), GDK_MEMORY_DEFAULT);
-
   return self->format;
 }
 

gdk/gdktexture.h

@@ -24,7 +24,6 @@
 #endif
 
 #include <gdk/gdkversionmacros.h>
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -83,8 +82,6 @@ GDK_AVAILABLE_IN_ALL
 int                     gdk_texture_get_width                  (GdkTexture      *texture) G_GNUC_PURE;
 GDK_AVAILABLE_IN_ALL
 int                     gdk_texture_get_height                 (GdkTexture      *texture) G_GNUC_PURE;
-GDK_AVAILABLE_IN_4_10
-GdkMemoryFormat         gdk_texture_get_format                 (GdkTexture      *self) G_GNUC_PURE;
 
 GDK_AVAILABLE_IN_ALL
 void                    gdk_texture_download                   (GdkTexture      *texture,

gdk/gdktexturedownloader.c

@@ -1,268 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2023 Benjamin Otte
- *
- * 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/>.
- */
-
-/**
- * GdkTextureDownloader:
- *
- * The `GdkTextureDownloader` is used to download the contents of a
- * [class@Gdk.Texture].
- *
- * It is intended to be created as a short-term object for a single download,
- * but can be used for multipe downloads of different textures or with different
- * settings.
- *
- * `GdkTextureDownloader` can be used to convert data between different formats.
- * Create a `GdkTexture` for the existing format and then download it in a
- * different format.
- *
- * Since: 4.10
- */
-
-#include "config.h"
-
-#include "gdktexturedownloaderprivate.h"
-
-#include "gdkmemoryformatprivate.h"
-#include "gdkmemorytextureprivate.h"
-#include "gdktextureprivate.h"
-
-G_DEFINE_BOXED_TYPE (GdkTextureDownloader, gdk_texture_downloader,
-                     gdk_texture_downloader_copy,
-                     gdk_texture_downloader_free)
-
-
-void
-gdk_texture_downloader_init (GdkTextureDownloader *self,
-                             GdkTexture           *texture)
-{
-  self->texture = g_object_ref (texture);
-  self->format = GDK_MEMORY_DEFAULT;
-}
-
-void
-gdk_texture_downloader_finish (GdkTextureDownloader *self)
-{
-  g_object_unref (self->texture);
-}
-
-/**
- * gdk_texture_downloader_new:
- * @texture: texture to download
- *
- * Creates a new texture downloader for @texture.
- *
- * Returns: A new texture downloader
- *
- * Since: 4.10
- **/
-GdkTextureDownloader *
-gdk_texture_downloader_new (GdkTexture *texture)
-{
-  GdkTextureDownloader *self;
-
-  g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
-
-  self = g_new (GdkTextureDownloader, 1);
-  gdk_texture_downloader_init (self, texture);
-
-  return self;
-}
-
-/**
- * gdk_texture_downloader_copy:
- * @self: the downloader to copy
- *
- * Creates a copy of the downloader.
- *
- * This function is meant for language bindings.
- *
- * Returns: A copy of the downloader
- *
- * Since: 4.10
- **/
-GdkTextureDownloader *
-gdk_texture_downloader_copy (const GdkTextureDownloader *self)
-{
-  GdkTextureDownloader *copy;
-
-  g_return_val_if_fail (self != NULL, NULL);
-
-  copy = gdk_texture_downloader_new (self->texture);
-  gdk_texture_downloader_set_format (copy, self->format);
-
-  return copy;
-}
-
-/**
- * gdk_texture_downloader_free:
- * @self: texture downloader to free
- *
- * Frees the given downloader and all its associated resources.
- *
- * Since: 4.10
- **/
-void
-gdk_texture_downloader_free (GdkTextureDownloader *self)
-{
-  g_return_if_fail (self != NULL);
-
-  gdk_texture_downloader_finish (self);
-  g_free (self);
-}
-
-/**
- * gdk_texture_downloader_set_texture:
- * @self: a texture downloader
- * @texture: the new texture to download
- *
- * Changes the texture the downloader will download.
- *
- * Since: 4.10
- **/
-void
-gdk_texture_downloader_set_texture (GdkTextureDownloader *self,
-                                    GdkTexture           *texture)
-{
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (GDK_IS_TEXTURE (texture));
-
-  g_set_object (&self->texture, texture);
-}
-
-/**
- * gdk_texture_downloader_get_texture:
- * @self: a texture downloader
- *
- * Gets the texture that the downloader will download.
- *
- * Returns: (transfer none): The texture to download
- *
- * Since: 4.10
- **/
-GdkTexture *
-gdk_texture_downloader_get_texture (const GdkTextureDownloader *self)
-{
-  g_return_val_if_fail (self != NULL, NULL);
-
-  return self->texture;
-}
-
-/**
- * gdk_texture_downloader_set_format:
- * @self: a texture downloader
- * @format: the format to use
- *
- * Sets the format the downloader will download.
- *
- * By default, GDK_MEMORY_DEFAULT is set.
- *
- * Since: 4.10
- */
-void
-gdk_texture_downloader_set_format (GdkTextureDownloader *self,
-                                   GdkMemoryFormat       format)
-{
-  g_return_if_fail (self != NULL);
-
-  self->format = format;
-}
-
-/**
- * gdk_texture_downloader_get_format:
- * @self: a texture downloader
- *
- * Gets the format that the data will be downloaded in.
- *
- * Returns: The format of the download
- *
- * Since: 4.10
- **/
-GdkMemoryFormat
-gdk_texture_downloader_get_format (const GdkTextureDownloader *self)
-{
-  g_return_val_if_fail (self != NULL, GDK_MEMORY_DEFAULT);
-
-  return self->format;
-}
-
-/**
- * gdk_texture_downloader_download_into:
- * @self: a texture downloader
- * @data: (array): pointer to enough memory to be filled with the
- *   downloaded data of the texture
- * @stride: rowstride in bytes
- *
- * Downloads the @texture into local memory.
- *
- * Since: 4.10
- **/
-void
-gdk_texture_downloader_download_into (const GdkTextureDownloader *self,
-                                      guchar                     *data,
-                                      gsize                       stride)
-{
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (data != NULL);
-  g_return_if_fail (stride >= gdk_texture_get_width (self->texture) * gdk_memory_format_bytes_per_pixel (self->format));
-
-  gdk_texture_do_download (self->texture, self->format, data, stride);
-}
-
-/**
- * gdk_texture_downloader_download_bytes:
- * @self: the downloader
- * @out_stride: (out): The stride of the resulting data in bytes.
- *
- * Downloads the given texture pixels into a `GBytes`. The rowstride will
- * be stored in the stride value.
- *
- * This function will abort if it tries to download a large texture and
- * fails to allocate memory. If you think that may happen, you should
- * handle memory allocation yourself and use
- * gdk_texture_downloader_download_into() once allocation succeeded.
- *
- * Returns: The downloaded pixels.
- *
- * Since: 4.10
- **/
-GBytes *
-gdk_texture_downloader_download_bytes (const GdkTextureDownloader *self,
-                                       gsize                      *out_stride)
-{
-  guchar *data;
-  gsize stride;
-
-  g_return_val_if_fail (self != NULL, NULL);
-  g_return_val_if_fail (out_stride != NULL, NULL);
-
-  if (GDK_IS_MEMORY_TEXTURE (self->texture) &&
-      gdk_texture_get_format (self->texture) == self->format)
-    {
-      GdkMemoryTexture *memtex = GDK_MEMORY_TEXTURE (self->texture);
-
-      return g_bytes_ref (gdk_memory_texture_get_bytes (memtex, out_stride));
-    }
-
-  stride = self->texture->width * gdk_memory_format_bytes_per_pixel (self->format);
-  data = g_malloc_n (stride, self->texture->height);
-
-  gdk_texture_do_download (self->texture, self->format, data, stride);
-
-  *out_stride = stride;
-  return g_bytes_new_take (data, stride * self->texture->height);
-}
-

gdk/gdktexturedownloader.h

@@ -1,69 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2023 Benjamin Otte
- *
- * 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/>.
- */
-
-#ifndef __GTK_TEXTURE_DOWNLOADER_H__
-#define __GTK_TEXTURE_DOWNLOADER_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-
-#include <gdk/gdkversionmacros.h>
-#include <gdk/gdkenums.h>
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_TEXTURE_DOWNLOADER    (gdk_texture_downloader_get_type ())
-
-GDK_AVAILABLE_IN_4_10
-GType                   gdk_texture_downloader_get_type         (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_4_10
-GdkTextureDownloader *  gdk_texture_downloader_new              (GdkTexture             *texture);
-
-GDK_AVAILABLE_IN_4_10
-GdkTextureDownloader *  gdk_texture_downloader_copy             (const GdkTextureDownloader     *self);
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_free             (GdkTextureDownloader           *self);
-
-
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_set_texture      (GdkTextureDownloader           *self,
-                                                                 GdkTexture                     *texture);
-GDK_AVAILABLE_IN_4_10
-GdkTexture *            gdk_texture_downloader_get_texture      (const GdkTextureDownloader     *self);
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_set_format       (GdkTextureDownloader           *self,
-                                                                 GdkMemoryFormat                 format);
-GDK_AVAILABLE_IN_4_10
-GdkMemoryFormat         gdk_texture_downloader_get_format       (const GdkTextureDownloader     *self);
-
-
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_download_into    (const GdkTextureDownloader     *self,
-                                                                 guchar                         *data,
-                                                                 gsize                           stride);
-GDK_AVAILABLE_IN_4_10
-GBytes *                gdk_texture_downloader_download_bytes   (const GdkTextureDownloader     *self,
-                                                                 gsize                          *out_stride);
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTextureDownloader, gdk_texture_downloader_free)
-
-G_END_DECLS
-
-#endif /* __GTK_TEXTURE_DOWNLOADER_H__ */

gdk/gdktexturedownloaderprivate.h

@@ -1,41 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2023 Benjamin Otte
- *
- * 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/>.
- */
-
-
-#ifndef __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
-#define __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
-
-#include "gdktexturedownloader.h"
-
-G_BEGIN_DECLS
-
-struct _GdkTextureDownloader
-{
-  /*< private >*/
-  GdkTexture *texture;
-  GdkMemoryFormat format;
-};
-
-void                    gdk_texture_downloader_init              (GdkTextureDownloader           *self,
-                                                                  GdkTexture                     *texture);
-void                    gdk_texture_downloader_finish            (GdkTextureDownloader           *self);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__ */

gdk/gdktextureprivate.h

@@ -43,6 +43,7 @@ void                    gdk_texture_do_download         (GdkTexture
                                                          GdkMemoryFormat         format,
                                                          guchar                 *data,
                                                          gsize                   stride);
+GdkMemoryFormat         gdk_texture_get_format          (GdkTexture             *self);
 gboolean                gdk_texture_set_render_data     (GdkTexture             *self,
                                                          gpointer                key,
                                                          gpointer                data,

gdk/gdktypes.h

@@ -77,7 +77,6 @@ typedef struct _GdkContentFormats     GdkContentFormats;
 typedef struct _GdkContentProvider    GdkContentProvider;
 typedef struct _GdkCursor             GdkCursor;
 typedef struct _GdkTexture            GdkTexture;
-typedef struct _GdkTextureDownloader  GdkTextureDownloader;
 typedef struct _GdkDevice             GdkDevice;
 typedef struct _GdkDrag               GdkDrag;
 typedef struct _GdkDrop               GdkDrop;

gdk/gdkversionmacros.h.in

@@ -128,16 +128,6 @@
  */
 #define GDK_VERSION_4_10        (G_ENCODE_VERSION (4, 10))
 
-/**
- * GDK_VERSION_4_12:
- *
- * A macro that evaluates to the 4.12 version of GDK, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 4.12
- */
-#define GDK_VERSION_4_12        (G_ENCODE_VERSION (4, 12))
-
 
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target, with a hard backstop to the
@@ -307,18 +297,4 @@
 # define GDK_DEPRECATED_IN_4_10_FOR(f)          _GDK_EXTERN
 #endif
 
-#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_12
-# define GDK_AVAILABLE_IN_4_12                  GDK_UNAVAILABLE(4, 12)
-#else
-# define GDK_AVAILABLE_IN_4_12                  _GDK_EXTERN
-#endif
-
-#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_12
-# define GDK_DEPRECATED_IN_4_12                 GDK_DEPRECATED
-# define GDK_DEPRECATED_IN_4_12_FOR(f)          GDK_DEPRECATED_FOR(f)
-#else
-# define GDK_DEPRECATED_IN_4_12                 _GDK_EXTERN
-# define GDK_DEPRECATED_IN_4_12_FOR(f)          _GDK_EXTERN
-#endif
-
 #endif  /* __GDK_VERSION_MACROS_H__ */

gdk/gdkvulkancontext.c

@@ -221,20 +221,6 @@ gdk_vulkan_strerror (VkResult result)
 #endif
 #if VK_HEADER_VERSION < 140
     case VK_RESULT_RANGE_SIZE:
-#endif
-#if VK_HEADER_VERSION >= 218
-    case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR:
-      return "The requested VkImageUsageFlags are not supported. (VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR)";
-    case VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR:
-      return "The requested video picture layout is not supported. (VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR)";
-    case VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR:
-      return "A video profile operation specified via VkVideoProfileInfoKHR::videoCodecOperation is not supported. (VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR)";
-    case VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR:
-      return "Format parameters in a requested VkVideoProfileInfoKHR chain are not supported. (VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR)";
-    case VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR:
-      return "Codec-specific parameters in a requested (VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR)";
-    case VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR:
-      return "The specified video Std header version is not supported. (VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR)";
 #endif
     case VK_RESULT_MAX_ENUM:
     default:

gdk/loaders/gdkjpeg.c

@@ -23,7 +23,7 @@
 
 #include <glib/gi18n-lib.h>
 #include "gdktexture.h"
-#include "gdktexturedownloaderprivate.h"
+#include "gdkmemorytextureprivate.h"
 
 #include "gdkprofilerprivate.h"
 
@@ -251,8 +251,7 @@ gdk_save_jpeg (GdkTexture *texture)
   guchar *data = NULL;
   gulong size = 0;
   guchar *input = NULL;
-  GdkTextureDownloader downloader;
-  GBytes *texbytes;
+  GdkMemoryTexture *memtex = NULL;
   const guchar *texdata;
   gsize texstride;
   guchar *row;
@@ -271,7 +270,7 @@ gdk_save_jpeg (GdkTexture *texture)
       free (data);
       g_free (input);
       jpeg_destroy_compress (&info);
-      g_clear_pointer (&texbytes, g_bytes_unref);
+      g_clear_object (&memtex);
       return NULL;
     }
 
@@ -290,11 +289,10 @@ gdk_save_jpeg (GdkTexture *texture)
 
   jpeg_mem_dest (&info, &data, &size);
 
-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, GDK_MEMORY_R8G8B8);
-  texbytes = gdk_texture_downloader_download_bytes (&downloader, &texstride);
-  gdk_texture_downloader_finish (&downloader);
-  texdata = g_bytes_get_data (texbytes, NULL);
+  memtex = gdk_memory_texture_from_texture (texture,
+                                            GDK_MEMORY_R8G8B8);
+  texdata = gdk_memory_texture_get_data (memtex);
+  texstride = gdk_memory_texture_get_stride (memtex);
 
   jpeg_start_compress (&info, TRUE);
 
@@ -306,7 +304,7 @@ gdk_save_jpeg (GdkTexture *texture)
 
   jpeg_finish_compress (&info);
 
-  g_bytes_unref (texbytes);
+  g_object_unref (memtex);
   g_free (input);
   jpeg_destroy_compress (&info);
 

gdk/loaders/gdkpng.c

@@ -21,9 +21,10 @@
 
 #include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
-#include "gdkmemorytexture.h"
+#include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"
-#include "gdktexturedownloaderprivate.h"
+#include "gdktexture.h"
+#include "gdktextureprivate.h"
 #include "gsk/gl/fp16private.h"
 #include <png.h>
 #include <stdio.h>
@@ -296,12 +297,11 @@ gdk_save_png (GdkTexture *texture)
   png_info *info;
   png_io io = { NULL, 0, 0 };
   int width, height;
-  int y;
-  GdkMemoryFormat format;
-  GdkTextureDownloader downloader;
-  GBytes *bytes;
   gsize stride;
   const guchar *data;
+  int y;
+  GdkMemoryTexture *memtex;
+  GdkMemoryFormat format;
   int png_format;
   int depth;
 
@@ -370,15 +370,11 @@ gdk_save_png (GdkTexture *texture)
       return NULL;
     }
 
-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, format);
-  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
-  gdk_texture_downloader_finish (&downloader);
-  data = g_bytes_get_data (bytes, NULL);
+  memtex = gdk_memory_texture_from_texture (texture, format);
 
   if (sigsetjmp (png_jmpbuf (png), 1))
     {
-      g_bytes_unref (bytes);
+      g_object_unref (memtex);
       g_free (io.data);
       png_destroy_read_struct (&png, &info, NULL);
       return NULL;
@@ -398,6 +394,8 @@ gdk_save_png (GdkTexture *texture)
   png_set_swap (png);
 #endif
 
+  data = gdk_memory_texture_get_data (memtex);
+  stride = gdk_memory_texture_get_stride (memtex);
   for (y = 0; y < height; y++)
     png_write_row (png, data + y * stride);
 
@@ -405,7 +403,7 @@ gdk_save_png (GdkTexture *texture)
 
   png_destroy_write_struct (&png, &info);
 
-  g_bytes_unref (bytes);
+  g_object_unref (memtex);
 
   return g_bytes_new_take (io.data, io.size);
 }