constraint layout: Measure min/nat size separately

Only constraint the opposite direction if we
actually have a for_size, and measure natural
size after removing the edit constraints. With
these changes, the test that compares constraint
layout to grid layout passes.

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 stages:
   - build
   - flatpak
-#  - deploy
+  - deploy
 
 .cache-paths: &cache-paths
   paths:
@@ -12,8 +12,8 @@ stages:
     - subprojects/libepoxy/
     - subprojects/pango/
 
-fedora-x86_64: &fedora-x86_64-defaults
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v9
+fedora-x86_64:
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -29,16 +29,10 @@ fedora-x86_64: &fedora-x86_64-defaults
       - "${CI_PROJECT_DIR}/_build/report.html"
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
       - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
   cache:
     key: "$CI_JOB_NAME"
     <<: *cache-paths
 
-fedora-x86_64-staticlibs:
-  variables:
-    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
-  <<: *fedora-x86_64-defaults
-
 .mingw-defaults: &mingw-defaults
   stage: build
   tags:
@@ -107,19 +101,20 @@ flatpak-master:icon-browser:
     APPID: org.gtk.IconBrowser4
   <<: *flatpak-master
 
-#pages:
-#  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
-#  stage: deploy 
-#  script:
-#    - meson -Dgtk_doc=true _build .
-#    - ninja -C _build
-#    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-#    - mkdir -p public/
-#    - mv _build/docs/reference/gtk/html/ public/gtk/
-#    - mv _build/docs/reference/gdk/html/ public/gdk/
-#    - mv _build/docs/reference/gsk/html/ public/gsk/
-#  artifacts:
-#    paths:
-#      - public
-#  only:
-#    - master
+pages:
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
+  stage: deploy 
+  script:
+    - meson -Ddocumentation=true _build .
+    - ninja -C _build
+    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
+
+    - mkdir -p public/
+    - mv _build/docs/reference/gtk/html/ public/gtk/
+    - mv _build/docs/reference/gdk/html/ public/gdk/
+    - mv _build/docs/reference/gsk/html/ public/gsk/
+  artifacts:
+    paths:
+      - public
+  only:
+    - master

.gitlab-ci/Dockerfile

@@ -1,6 +1,7 @@
-FROM fedora:31
+FROM fedora:30
 
 RUN dnf -y install \
+    hicolor-icon-theme \
     adwaita-icon-theme \
     atk-devel \
     at-spi2-atk-devel \
@@ -13,7 +14,6 @@ RUN dnf -y install \
     dbus-daemon \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
-    diffutils \
     elfutils-libelf-devel \
     fribidi-devel \
     gcc \
@@ -32,7 +32,6 @@ RUN dnf -y install \
     gstreamer1-plugins-bad-free-devel \
     gstreamer1-plugins-base-devel \
     gtk-doc \
-    hicolor-icon-theme \
     iso-codes \
     itstool \
     json-glib-devel \
@@ -53,7 +52,6 @@ RUN dnf -y install \
     libxkbcommon-devel \
     libXrandr-devel \
     libXrender-devel \
-    libXtst-devel \
     libxslt \
     mesa-dri-drivers \
     mesa-libEGL-devel \
@@ -67,7 +65,6 @@ RUN dnf -y install \
     python3-wheel \
     redhat-rpm-config \
     sassc \
-    sysprof-devel \
     systemtap-sdt-devel \
     vulkan-devel \
     wayland-devel \

.gitlab-ci/meson-html-report.py

@@ -149,11 +149,11 @@ ul.images li {
   <article>
     <section>
       <div class="summary">
-        <h3><a name="summary">Summary</a></h3>
+        <h3>Summary</h3>
         <ul>
           <li><strong>Total units:</strong> {{ report.total_units }}</li>
-          <li><strong>Passed:</strong> <a href="#passed">{{ report.total_successes }}</a></li>
-          <li><strong>Failed:</strong> <a href="#failures">{{ report.total_failures }}</a></li>
+          <li><strong>Passed:</strong> {{ report.total_successes }}</li>
+          <li><strong>Failed:</strong> {{ report.total_failures }}</li>
         </ul>
       </div>
     </section>
@@ -161,7 +161,7 @@ ul.images li {
     {% for suite_result in report.results_list %}
     <section>
       <div class="result">
-        <h3><a name="results">Suite: {{ suite_result.suite_name }}</a></h3>
+        <h3>Suite: {{ suite_result.suite_name }}</h3>
         <ul>
           <li><strong>Units:</strong> {{ suite_result.n_units }}</li>
           <li><strong>Passed:</strong> {{ suite_result.n_successes }}</li>
@@ -169,7 +169,7 @@ ul.images li {
         </ul>
 
         <div class="successes">
-          <h4><a name="passed">Passed</a></h4>
+          <h4>Passed</h4>
           <ul class="passed">
             {% for success in suite_result.successes if success.result == 'OK' %}
             <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
@@ -178,7 +178,7 @@ ul.images li {
             {% endfor %}
           </ul>
 
-          <h4><a name="skipped">Skipped</a></h4>
+          <h4>Skipped</h4>
           <ul>
             {% for success in suite_result.successes if success.result == 'SKIP' %}
             <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
@@ -187,10 +187,10 @@ ul.images li {
             {% endfor %}
           </ul>
 
-          <h4><a name="expected-fail">Expected failures</a></h4>
+          <h4>Expected failures</h4>
           <ul>
           {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
-            <li><a name="{{ success.name }}">{{ success.name }}</a> - result: <span class="result xfail">{{ success.result }}</span><br/>
+            <li>{{ success.name }} - result: <span class="result xfail">{{ success.result }}</span><br/>
             {% if success.stdout %}
               Output: <pre>{{ success.stdout }}</pre>
             {% endif %}
@@ -209,10 +209,10 @@ ul.images li {
         </div>
 
         <div class="failures">
-          <h4><a name="failed">Failed</a></h4>
+          <h4>Failed</h4>
           <ul class="failed">
             {% for failure in suite_result.failures if failure.result == 'FAIL' %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
+            <li>{{ failure.name }} - result: <span class="result fail">{{ failure.result }}</span><br/>
               {% if failure.stdout %}
               Output: <pre>{{ failure.stdout }}</pre>
               {% endif %}
@@ -229,10 +229,10 @@ ul.images li {
             {% endfor %}
           </ul>
 
-          <h4><a name="timed-out">Timed out</a></h4>
+          <h4>Timed out</h4>
           <ul class="failed">
             {% for failure in suite_result.failures if failure.result == 'TIMEOUT' %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
+            <li>{{ failure.name }} - result: <span class="result fail">{{ failure.result }}</span><br/>
               {% if failure.stdout %}
               Output: <pre>{{ failure.stdout }}</pre>
               {% endif %}

.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v7"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v6"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

.gitlab-ci/test-docker.sh

@@ -16,9 +16,7 @@ meson \
         -Dwayland-backend=true \
         -Dbroadway-backend=true \
         -Dvulkan=yes \
-        -Dprofiler=true \
         --werror \
-        ${EXTRA_MESON_FLAGS:-} \
         _build $srcdir
 unset CCACHE_DISABLE
 

.gitlab-ci/test-msys2.sh

@@ -33,10 +33,6 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
     mingw-w64-$MSYS2_ARCH-shared-mime-info
 
-# https://gitlab.gnome.org/GNOME/gtk/issues/2243
-wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
-pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
-
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"

CONTRIBUTING.md

@@ -174,7 +174,7 @@ maintainers review your contribution.
 
 Each contribution is reviewed by the core developers of the GTK project.
 
-The [CODEOWNERS](./docs/CODEOWNERS) document contains the list of core
+The [CODE-OWNERS](./docs/CODE-OWNERS) document contains the list of core
 contributors to GTK and the areas for which they are responsible; you
 should ensure to receive their review and signoff on your changes.
 

config.h.meson

@@ -56,6 +56,12 @@
 /* Define if GStreamer support is available */
 #mesondefine HAVE_GSTREAMER
 
+/* Define to 1 if you have the `httpGetAuthString' function. */
+#mesondefine HAVE_HTTPGETAUTHSTRING
+
+/* Define if cups http_t authstring field is accessible */
+#mesondefine HAVE_HTTP_AUTHSTRING
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #mesondefine HAVE_INTTYPES_H
 
@@ -185,6 +191,9 @@
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #mesondefine LT_OBJDIR
 
+/* Define if <X11/extensions/XIproto.h> needed for xReply */
+#mesondefine NEED_XIPROTO_H_FOR_XREPLY
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #mesondefine NO_MINUS_C_MINUS_O
 

demos/constraint-editor/constraint-editor-application.c

@@ -1,115 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "constraint-editor-application.h"
-#include "constraint-editor-window.h"
-
-struct _ConstraintEditorApplication
-{
-  GtkApplication parent_instance;
-};
-
-G_DEFINE_TYPE(ConstraintEditorApplication, constraint_editor_application, GTK_TYPE_APPLICATION);
-
-static void
-constraint_editor_application_init (ConstraintEditorApplication *app)
-{
-}
-
-static void
-quit_activated (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       data)
-{
-  g_application_quit (G_APPLICATION (data));
-}
-
-static GActionEntry app_entries[] =
-{
-  { "quit", quit_activated, NULL, NULL, NULL }
-};
-
-static void
-constraint_editor_application_startup (GApplication *app)
-{
-  const char *quit_accels[2] = { "<Ctrl>Q", NULL };
-  const char *open_accels[2] = { "<Ctrl>O", NULL };
-  GtkCssProvider *provider;
-
-  G_APPLICATION_CLASS (constraint_editor_application_parent_class)->startup (app);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (app),
-                                   app_entries, G_N_ELEMENTS (app_entries),
-                                   app);
-  gtk_application_set_accels_for_action (GTK_APPLICATION (app), "app.quit", quit_accels);
-  gtk_application_set_accels_for_action (GTK_APPLICATION (app), "win.open", open_accels);
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gtk/gtk4/constraint-editor/constraint-editor.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-}
-
-static void
-constraint_editor_application_activate (GApplication *app)
-{
-  ConstraintEditorWindow *win;
-
-  win = constraint_editor_window_new (CONSTRAINT_EDITOR_APPLICATION (app));
-  gtk_window_present (GTK_WINDOW (win));
-}
-
-static void
-constraint_editor_application_open (GApplication  *app,
-                                    GFile        **files,
-                                    gint           n_files,
-                                    const gchar   *hint)
-{
-  ConstraintEditorWindow *win;
-  gint i;
-
-  for (i = 0; i < n_files; i++)
-    {
-      win = constraint_editor_window_new (CONSTRAINT_EDITOR_APPLICATION (app));
-      constraint_editor_window_load (win, files[i]);
-      gtk_window_present (GTK_WINDOW (win));
-    }
-}
-
-static void
-constraint_editor_application_class_init (ConstraintEditorApplicationClass *class)
-{
-  GApplicationClass *application_class = G_APPLICATION_CLASS (class);
-
-  application_class->startup = constraint_editor_application_startup;
-  application_class->activate = constraint_editor_application_activate;
-  application_class->open = constraint_editor_application_open;
-}
-
-ConstraintEditorApplication *
-constraint_editor_application_new (void)
-{
-  return g_object_new (CONSTRAINT_EDITOR_APPLICATION_TYPE,
-                       "application-id", "org.gtk.gtk4.ConstraintEditor",
-                       "flags", G_APPLICATION_HANDLES_OPEN,
-                       NULL);
-}

demos/constraint-editor/constraint-editor-application.h

@@ -1,28 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_EDITOR_APPLICATION_TYPE (constraint_editor_application_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintEditorApplication, constraint_editor_application, CONSTRAINT, EDITOR_APPLICATION, GtkApplication)
-
-ConstraintEditorApplication *constraint_editor_application_new (void);

demos/constraint-editor/constraint-editor-window.c

@@ -1,639 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "constraint-editor-window.h"
-#include "constraint-view.h"
-#include "constraint-editor.h"
-#include "guide-editor.h"
-
-struct _ConstraintEditorWindow
-{
-  GtkApplicationWindow parent_instance;
-
-  GtkWidget *paned;
-  GtkWidget *view;
-  GtkWidget *list;
-};
-
-G_DEFINE_TYPE(ConstraintEditorWindow, constraint_editor_window, GTK_TYPE_APPLICATION_WINDOW);
-
-static GtkConstraintTarget *
-find_target (GListModel *model,
-             GtkConstraintTarget *orig)
-{
-  const char *name;
-  const char *model_name;
-  gpointer item;
-  int i;
-
-  if (orig == NULL)
-    return NULL;
-
-  if (GTK_IS_LABEL (orig))
-    name = gtk_label_get_label (GTK_LABEL (orig));
-  else if (GTK_IS_CONSTRAINT_GUIDE (orig))
-    name = gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (orig));
-  else
-    {
-      g_warning ("Don't know how to handle %s targets", G_OBJECT_TYPE_NAME (orig));
-      return NULL;
-    }
-  for (i = 0; i < g_list_model_get_n_items (model); i++)
-    {
-      item = g_list_model_get_item (model, i);
-      g_object_unref (item);
-      if (GTK_IS_WIDGET (item))
-        model_name = gtk_widget_get_name (GTK_WIDGET (item));
-      else
-        model_name = gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (item));
-
-      if (strcmp (name, model_name) == 0)
-        return GTK_CONSTRAINT_TARGET (item);
-    }
-  g_warning ("Failed to find target '%s'", name);
-
-  return NULL;
-}
-
-gboolean
-constraint_editor_window_load (ConstraintEditorWindow *self,
-                               GFile            *file)
-{
-  char *path;
-  GtkBuilder *builder;
-  GError *error = NULL;
-  GtkWidget *view;
-  GtkLayoutManager *layout;
-  GtkWidget *child;
-  const char *name;
-  gpointer item;
-  int i;
-  GListModel *list;
-
-  path = g_file_get_path (file);
-
-  builder = gtk_builder_new ();
-  if (!gtk_builder_add_from_file (builder, path, &error))
-    {
-      g_print ("Could not load %s: %s", path, error->message);
-      g_error_free (error);
-      g_free (path);
-      g_object_unref (builder);
-      return FALSE;
-    }
-
-  view = GTK_WIDGET (gtk_builder_get_object (builder, "view"));
-  if (!GTK_IS_BOX (view))
-    {
-      g_print ("Could not load %s: No GtkBox named 'view'", path);
-      g_free (path);
-      g_object_unref (builder);
-      return FALSE;
-    }
-  layout = gtk_widget_get_layout_manager (view);
-  if (!GTK_IS_CONSTRAINT_LAYOUT (layout))
-    {
-      g_print ("Could not load %s: Widget 'view' does not use GtkConstraintLayout", path);
-      g_free (path);
-      g_object_unref (builder);
-      return FALSE;
-    }
-
-  for (child = gtk_widget_get_first_child (view);
-       child;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      if (!GTK_IS_LABEL (child))
-        {
-          g_print ("Skipping non-GtkLabel child\n");
-          continue;
-        }
-
-      name = gtk_label_get_label (GTK_LABEL (child));
-      constraint_view_add_child (CONSTRAINT_VIEW (self->view), name);
-    }
-
-  list = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (layout));
-  for (i = 0; i < g_list_model_get_n_items (list); i++)
-    {
-      GtkConstraintGuide *guide, *clone;
-      int w, h;
-
-      item = g_list_model_get_item (list, i);
-      guide = GTK_CONSTRAINT_GUIDE (item);
-
-      /* need to clone here, to attach to the right targets */
-      clone = gtk_constraint_guide_new ();
-      gtk_constraint_guide_set_name (clone, gtk_constraint_guide_get_name (guide));
-      gtk_constraint_guide_set_strength (clone, gtk_constraint_guide_get_strength (guide));
-      gtk_constraint_guide_get_min_size (guide, &w, &h);
-      gtk_constraint_guide_set_min_size (clone, w, h);
-      gtk_constraint_guide_get_nat_size (guide, &w, &h);
-      gtk_constraint_guide_set_nat_size (clone, w, h);
-      gtk_constraint_guide_get_max_size (guide, &w, &h);
-      gtk_constraint_guide_set_max_size (clone, w, h);
-      constraint_view_add_guide (CONSTRAINT_VIEW (self->view), clone);
-      g_object_unref (guide);
-      g_object_unref (clone);
-    }
-  g_object_unref (list);
-
-  list = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (layout));
-  for (i = 0; i < g_list_model_get_n_items (list); i++)
-    {
-      GtkConstraint *constraint;
-      GtkConstraint *clone;
-      GtkConstraintTarget *target;
-      GtkConstraintTarget *source;
-
-      item = g_list_model_get_item (list, i);
-      constraint = GTK_CONSTRAINT (item);
-
-      target = gtk_constraint_get_target (constraint);
-      source = gtk_constraint_get_source (constraint);
-      clone = gtk_constraint_new (find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), target),
-                                  gtk_constraint_get_target_attribute (constraint),
-                                  gtk_constraint_get_relation (constraint),
-                                  find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), source),
-                                  gtk_constraint_get_target_attribute (constraint),
-                                  gtk_constraint_get_multiplier (constraint),
-                                  gtk_constraint_get_constant (constraint),
-                                  gtk_constraint_get_strength (constraint));
-
-      constraint_view_add_constraint (CONSTRAINT_VIEW (self->view), clone);
-
-      g_object_unref (constraint);
-      g_object_unref (clone);
-    }
-  g_object_unref (list);
-
-  g_free (path);
-  g_object_unref (builder);
-
-  return TRUE;
-}
-
-static void
-open_response_cb (GtkNativeDialog        *dialog,
-                  gint                    response,
-                  ConstraintEditorWindow *self)
-{
-  gtk_native_dialog_hide (dialog);
-
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GFile *file;
-
-      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-      constraint_editor_window_load (self, file);
-      g_object_unref (file);
-    }
-
-  gtk_native_dialog_destroy (dialog);
-}
-
-static void
-open_cb (GtkWidget              *button,
-         ConstraintEditorWindow *self)
-{
-  GtkFileChooserNative *dialog;
-
-  dialog = gtk_file_chooser_native_new ("Open file",
-                                        GTK_WINDOW (self),
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Load",
-                                        "_Cancel");
-
-  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), ".");
-  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), self);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
-}
-
-static void
-serialize_child (GString   *str,
-                 int        indent,
-                 GtkWidget *child)
-{
-  const char *name;
-
-  name = gtk_widget_get_name (child);
-  g_string_append_printf (str, "%*s<child>\n", indent, "");
-  g_string_append_printf (str, "%*s  <object class=\"GtkLabel\" id=\"%s\">\n", indent, "", name);
-  g_string_append_printf (str, "%*s    <property name=\"label\">%s</property>\n", indent, "", name);
-  g_string_append_printf (str, "%*s  </object>\n", indent, "");
-  g_string_append_printf (str, "%*s</child>\n", indent, "");
-}
-
-static char *
-serialize_model (GListModel *list)
-{
-  GString *str = g_string_new ("");
-  int i;
-
-  g_string_append (str, "<interface>\n");
-  g_string_append (str, "  <object class=\"GtkBox\" id=\"view\">\n");
-  g_string_append (str, "    <property name=\"layout-manager\">\n");
-  g_string_append (str, "      <object class=\"GtkConstraintLayout\">\n");
-  g_string_append (str, "        <constraints>\n");
-  for (i = 0; i < g_list_model_get_n_items (list); i++)
-    {
-      gpointer item = g_list_model_get_item (list, i);
-      g_object_unref (item);
-      if (GTK_IS_CONSTRAINT (item))
-        constraint_editor_serialize_constraint (str, 10, GTK_CONSTRAINT (item));
-      else if (GTK_IS_CONSTRAINT_GUIDE (item))
-        guide_editor_serialize_guide (str, 10, GTK_CONSTRAINT_GUIDE (item));
-    }
-  g_string_append (str, "        </constraints>\n");
-  g_string_append (str, "      </object>\n");
-  g_string_append (str, "    </property>\n");
-  for (i = 0; i < g_list_model_get_n_items (list); i++)
-    {
-      gpointer item = g_list_model_get_item (list, i);
-      g_object_unref (item);
-      if (GTK_IS_WIDGET (item))
-        serialize_child (str, 4, GTK_WIDGET (item));
-    }
-  g_string_append (str, "  </object>\n");
-  g_string_append (str, "</interface>\n");
-
-  return g_string_free (str, FALSE);
-}
-
-
-static void
-save_response_cb (GtkNativeDialog        *dialog,
-                  gint                    response,
-                  ConstraintEditorWindow *self)
-{
-  gtk_native_dialog_hide (dialog);
-
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GListModel *model;
-      char *text, *filename;
-      GError *error = NULL;
-
-      model = constraint_view_get_model (CONSTRAINT_VIEW (self->view));
-      text = serialize_model (model);
-
-      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-      if (!g_file_set_contents (filename, text, -1, &error))
-        {
-          GtkWidget *dialog;
-
-          dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
-                                           GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_INFO,
-                                           GTK_BUTTONS_OK,
-                                           "Saving failed");
-          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                    "%s", error->message);
-          g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
-          gtk_widget_show (dialog);
-          g_error_free (error);
-        }
-      g_free (filename);
-    }
-
-  gtk_native_dialog_destroy (dialog);
-}
-
-static void
-save_cb (GtkWidget              *button,
-         ConstraintEditorWindow *self)
-{
-  GtkFileChooserNative *dialog;
-
-  dialog = gtk_file_chooser_native_new ("Save constraints",
-                                        GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
-                                        GTK_FILE_CHOOSER_ACTION_SAVE,
-                                        "_Save",
-                                        "_Cancel");
-
-  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), ".");
-  g_signal_connect (dialog, "response", G_CALLBACK (save_response_cb), self);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
-}
-
-static void
-constraint_editor_window_finalize (GObject *object)
-{
-  //ConstraintEditorWindow *self = (ConstraintEditorWindow *)object;
-
-  G_OBJECT_CLASS (constraint_editor_window_parent_class)->finalize (object);
-}
-
-static int child_counter;
-static int guide_counter;
-
-static void
-add_child (ConstraintEditorWindow *win)
-{
-  char *name;
-
-  child_counter++;
-  name = g_strdup_printf ("Child %d", child_counter);
-  constraint_view_add_child (CONSTRAINT_VIEW (win->view), name);
-  g_free (name);
-}
-
-static void
-add_guide (ConstraintEditorWindow *win)
-{
-  char *name;
-  GtkConstraintGuide *guide;
-
-  guide_counter++;
-  name = g_strdup_printf ("Guide %d", guide_counter);
-  guide = gtk_constraint_guide_new ();
-  gtk_constraint_guide_set_name (guide, name);
-  g_free (name);
-
-  constraint_view_add_guide (CONSTRAINT_VIEW (win->view), guide);
-}
-
-static void
-constraint_editor_done (ConstraintEditor *editor,
-                        GtkConstraint    *constraint,
-                        ConstraintEditorWindow *win)
-{
-  GtkConstraint *old_constraint;
-
-  g_object_get (editor, "constraint", &old_constraint, NULL);
-
-  if (old_constraint)
-    constraint_view_remove_constraint (CONSTRAINT_VIEW (win->view), old_constraint);
-
-  constraint_view_add_constraint (CONSTRAINT_VIEW (win->view), constraint);
-
-  g_clear_object (&old_constraint);
-
-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
-}
-
-static void
-edit_constraint (ConstraintEditorWindow *win,
-                 GtkConstraint          *constraint)
-{
-  GtkWidget *window;
-  ConstraintEditor *editor;
-  GListModel *model;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
-  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-  if (constraint)
-    gtk_window_set_title (GTK_WINDOW (window), "Edit Constraint");
-  else
-    gtk_window_set_title (GTK_WINDOW (window), "Create Constraint");
-
-  model = constraint_view_get_model (CONSTRAINT_VIEW (win->view));
-
-  editor = constraint_editor_new (model, constraint);
-
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
-
-  g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);
-
-  gtk_widget_show (window);
-}
-
-static void
-add_constraint (ConstraintEditorWindow *win)
-{
-  edit_constraint (win, NULL);
-}
-
-static void
-guide_editor_done (GuideEditor            *editor,
-                   GtkConstraintGuide     *guide,
-                   ConstraintEditorWindow *win)
-{
-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
-}
-
-static void
-edit_guide (ConstraintEditorWindow *win,
-            GtkConstraintGuide     *guide)
-{
-  GtkWidget *window;
-  GuideEditor *editor;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-  gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
-  gtk_window_set_title (GTK_WINDOW (window), "Edit Guide");
-
-  editor = guide_editor_new (guide);
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
-
-  g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
-  gtk_widget_show (window);
-}
-
-static void
-row_activated (GtkListBox *list,
-               GtkListBoxRow *row,
-               ConstraintEditorWindow *win)
-{
-  GObject *item;
-
-  item = G_OBJECT (g_object_get_data (G_OBJECT (row), "item"));
-
-  if (GTK_IS_CONSTRAINT (item))
-    edit_constraint (win, GTK_CONSTRAINT (item));
-  else if (GTK_IS_CONSTRAINT_GUIDE (item))
-    edit_guide (win, GTK_CONSTRAINT_GUIDE (item));
-}
-
-static void
-constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  g_type_ensure (CONSTRAINT_VIEW_TYPE);
-
-  object_class->finalize = constraint_editor_window_finalize;
-
-  gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/gtk4/constraint-editor/constraint-editor-window.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, paned);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, view);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, list);
-
-  gtk_widget_class_bind_template_callback (widget_class, open_cb);
-  gtk_widget_class_bind_template_callback (widget_class, save_cb);
-  gtk_widget_class_bind_template_callback (widget_class, add_child);
-  gtk_widget_class_bind_template_callback (widget_class, add_guide);
-  gtk_widget_class_bind_template_callback (widget_class, add_constraint);
-  gtk_widget_class_bind_template_callback (widget_class, row_activated);
-}
-
-static void
-row_edit (GtkButton *button,
-          ConstraintEditorWindow *win)
-{
-  GtkWidget *row;
-  GObject *item;
-
-  row = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_LIST_BOX_ROW);
-  item = (GObject *)g_object_get_data (G_OBJECT (row), "item");
-  if (GTK_IS_CONSTRAINT (item))
-    edit_constraint (win, GTK_CONSTRAINT (item));
-  else if (GTK_IS_CONSTRAINT_GUIDE (item))
-    edit_guide (win, GTK_CONSTRAINT_GUIDE (item));
-}
-
-static void
-mark_constraints_invalid (ConstraintEditorWindow *win,
-                          gpointer                removed)
-{
-  GtkWidget *child;
-  GObject *item;
-
-  for (child = gtk_widget_get_first_child (win->list);
-       child;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      item = (GObject *)g_object_get_data (G_OBJECT (child), "item");
-      if (GTK_IS_CONSTRAINT (item))
-        {
-          GtkConstraint *constraint = GTK_CONSTRAINT (item);
-
-          if (gtk_constraint_get_target (constraint) == (GtkConstraintTarget *)removed ||
-              gtk_constraint_get_source (constraint) == (GtkConstraintTarget *)removed)
-            {
-              GtkWidget *button;
-              button = (GtkWidget *)g_object_get_data (G_OBJECT (child), "edit");
-              gtk_button_set_icon_name (GTK_BUTTON (button), "dialog-warning-symbolic");
-              gtk_widget_set_tooltip_text (button, "Constraint is invalid");
-            }
-        }
-    }
-}
-
-static void
-row_delete (GtkButton *button,
-            ConstraintEditorWindow *win)
-{
-  GtkWidget *row;
-  GObject *item;
-
-  row = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_LIST_BOX_ROW);
-  item = (GObject *)g_object_get_data (G_OBJECT (row), "item");
-  if (GTK_IS_CONSTRAINT (item))
-    constraint_view_remove_constraint (CONSTRAINT_VIEW (win->view),
-                                       GTK_CONSTRAINT (item));
-  else if (GTK_IS_CONSTRAINT_GUIDE (item))
-    {
-      mark_constraints_invalid (win, item);
-      constraint_view_remove_guide (CONSTRAINT_VIEW (win->view),
-                                    GTK_CONSTRAINT_GUIDE (item));
-    }
-  else if (GTK_IS_WIDGET (item))
-    {
-      mark_constraints_invalid (win, item);
-      constraint_view_remove_child (CONSTRAINT_VIEW (win->view),
-                                    GTK_WIDGET (item));
-    }
-}
-
-static GtkWidget *
-create_widget_func (gpointer item,
-                    gpointer user_data)
-{
-  ConstraintEditorWindow *win = user_data;
-  const char *name;
-  char *freeme = NULL;
-  GtkWidget *row, *box, *label, *button;
-
-  if (GTK_IS_WIDGET (item))
-    name = gtk_widget_get_name (GTK_WIDGET (item));
-  else if (GTK_IS_CONSTRAINT_GUIDE (item))
-    name = gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (item));
-  else if (GTK_IS_CONSTRAINT (item))
-    name = freeme = constraint_editor_constraint_to_string (GTK_CONSTRAINT (item));
-  else
-    name = "";
-
-  row = gtk_list_box_row_new ();
-  g_object_set_data_full (G_OBJECT (row), "item", g_object_ref (item), g_object_unref);
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  label = gtk_label_new (name);
-  if (GTK_IS_WIDGET (item) || GTK_IS_CONSTRAINT_GUIDE (item))
-    g_object_bind_property (item, "name",
-                            label, "label",
-                            G_BINDING_DEFAULT);
-  g_object_set (label, "margin", 10, NULL);
-  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-  gtk_widget_set_hexpand (label, TRUE);
-  gtk_container_add (GTK_CONTAINER (row), box);
-  gtk_container_add (GTK_CONTAINER (box), label);
-
-  if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
-    {
-      button = gtk_button_new_from_icon_name ("document-edit-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-      g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
-      g_object_set_data (G_OBJECT (row), "edit", button);
-      gtk_container_add (GTK_CONTAINER (box), button);
-      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
-    }
-  else if (GTK_IS_WIDGET (item))
-    {
-      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
-    }
-
-  g_free (freeme);
-
-  return row;
-}
-
-static void
-constraint_editor_window_init (ConstraintEditorWindow *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-
-  gtk_list_box_bind_model (GTK_LIST_BOX (self->list),
-                           constraint_view_get_model (CONSTRAINT_VIEW (self->view)),
-                           create_widget_func,
-                           self,
-                           NULL);
-}
-
-ConstraintEditorWindow *
-constraint_editor_window_new (ConstraintEditorApplication *application)
-{
-  return g_object_new (CONSTRAINT_EDITOR_WINDOW_TYPE,
-                       "application", application,
-                       NULL);
-}

demos/constraint-editor/constraint-editor-window.h

@@ -1,34 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#include "constraint-editor-application.h"
-
-
-#define CONSTRAINT_EDITOR_WINDOW_TYPE (constraint_editor_window_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintEditorWindow, constraint_editor_window, CONSTRAINT, EDITOR_WINDOW, GtkApplicationWindow)
-
-ConstraintEditorWindow * constraint_editor_window_new  (ConstraintEditorApplication  *application);
-
-gboolean                 constraint_editor_window_load (ConstraintEditorWindow       *self,
-                                                        GFile                        *file);

demos/constraint-editor/constraint-editor-window.ui

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="ConstraintEditorWindow" parent="GtkApplicationWindow">
-    <style>
-      <class name="devel"/>
-    </style>
-    <property name="title" translatable="yes">GTK Constraint Editor</property>
-    <property name="default-width">1024</property>
-    <property name="default-height">768</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
-        <property name="title" translatable="yes">GTK Constraint Editor</property>
-        <property name="show-title-buttons">1</property>
-        <child type="start">
-          <object class="GtkButton">
-            <property name="icon-name">document-open-symbolic</property>
-            <property name="tooltip-text">Open ui file</property>
-            <signal name="clicked" handler="open_cb"/>
-          </object>
-        </child>
-        <child type="start">
-          <object class="GtkButton">
-            <property name="icon-name">document-save-symbolic</property>
-            <property name="tooltip-text">Save to ui file</property>
-            <signal name="clicked" handler="save_cb"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkPaned" id="paned">
-        <property name="orientation">horizontal</property>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">horizontal</property>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label">Add Child</property>
-                    <signal name="clicked" handler="add_child" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label">Add Guide</property>
-                    <signal name="clicked" handler="add_guide" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label">Add Constraint</property>
-                    <signal name="clicked" handler="add_constraint" swapped="yes"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="hscrollbar-policy">never</property>
-                <property name="vscrollbar-policy">automatic</property>
-                <property name="vexpand">1</property>
-                <child>
-                  <object class="GtkListBox" id="list">
-                    <property name="show-separators">1</property>
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="row_activated"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="ConstraintView" id="view">
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

demos/constraint-editor/constraint-editor.c

@@ -1,656 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "constraint-editor.h"
-
-struct _ConstraintEditor
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *grid;
-  GtkWidget *target;
-  GtkWidget *target_attr;
-  GtkWidget *relation;
-  GtkWidget *source;
-  GtkWidget *source_attr;
-  GtkWidget *multiplier;
-  GtkWidget *constant;
-  GtkWidget *strength;
-  GtkWidget *preview;
-  GtkWidget *button;
-
-  GtkConstraint *constraint;
-  GListModel *model;
-
-  gboolean constructed;
-};
-
-enum {
-  PROP_MODEL = 1,
-  PROP_CONSTRAINT,
-  LAST_PROP
-};
-
-static GParamSpec *pspecs[LAST_PROP];
-
-enum {
-  DONE,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE(ConstraintEditor, constraint_editor, GTK_TYPE_WIDGET);
-
-static const char *
-get_target_name (GtkConstraintTarget *target)
-{
-  if (target == NULL)
-    return "super";
-  else if (GTK_IS_WIDGET (target))
-    return gtk_widget_get_name (GTK_WIDGET (target));
-  else if (GTK_IS_CONSTRAINT_GUIDE (target))
-    return gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (target));
-  else
-    return "";
-}
-
-static void
-constraint_target_combo (GListModel *model,
-                         GtkWidget  *combo,
-                         gboolean    is_source)
-{
-  int i;
-
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "super", "Super");
-
-  if (model)
-    {
-      for (i = 0; i < g_list_model_get_n_items (model); i++)
-        {
-          GObject *item = g_list_model_get_object (model, i);
-          const char *name;
-
-          if (GTK_IS_CONSTRAINT (item))
-            continue;
-
-          name = get_target_name (GTK_CONSTRAINT_TARGET (item));
-
-          gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), name, name);
-          g_object_unref (item);
-        }
-    }
-}
-
-static void
-constraint_attribute_combo (GtkWidget *combo,
-                            gboolean is_source)
-{
-  if (is_source)
-    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "none", "None");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "left", "Left");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "right", "Right");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "top", "Top");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "bottom", "Bottom");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "width", "Width");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "height", "Height");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-x", "Center X");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-y", "Center Y");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "baseline", "Baseline");
-}
-
-static void
-constraint_relation_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "le", "≤");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "eq", "=");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "ge", "≥");
-}
-
-static void
-constraint_strength_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
-}
-
-static gpointer
-get_target (GListModel *model,
-            const char *id)
-{
-  int i;
-
-  if (strcmp ("super", id) == 0)
-    return NULL;
-
-  for (i = 0; i < g_list_model_get_n_items (model); i++)
-    {
-      GObject *item = g_list_model_get_object (model, i);
-      g_object_unref (item);
-      if (GTK_IS_CONSTRAINT (item))
-        continue;
-      else if (GTK_IS_WIDGET (item))
-        {
-          if (strcmp (id, gtk_widget_get_name (GTK_WIDGET (item))) == 0)
-            return item;
-        }
-      else if (GTK_IS_CONSTRAINT_GUIDE (item))
-        {
-          if (strcmp (id, gtk_constraint_guide_get_name (GTK_CONSTRAINT_GUIDE (item))) == 0)
-            return item;
-        }
-    }
-
-  return NULL;
-}
-
-static GtkConstraintAttribute
-get_target_attr (const char *id)
-{
-  GtkConstraintAttribute attr;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  attr = value->value;
-  g_type_class_unref (class);
-
-  return attr;
-}
-
-static const char *
-get_attr_nick (GtkConstraintAttribute attr)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
-  GEnumValue *value = g_enum_get_value (class, attr);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-static GtkConstraintRelation
-get_relation (const char *id)
-{
-  GtkConstraintRelation relation;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  relation = value->value;
-  g_type_class_unref (class);
-
-  return relation;
-}
-
-static const char *
-get_relation_nick (GtkConstraintRelation relation)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
-  GEnumValue *value = g_enum_get_value (class, relation);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-static GtkConstraintStrength
-get_strength (const char *id)
-{
-  GtkConstraintStrength strength;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  strength = value->value;
-  g_type_class_unref (class);
-
-  return strength;
-}
-
-static const char *
-get_strength_nick (GtkConstraintStrength strength)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value (class, strength);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-void
-constraint_editor_serialize_constraint (GString       *str,
-                                        int            indent,
-                                        GtkConstraint *constraint)
-{
-  const char *target;
-  const char *target_attr;
-  const char *relation;
-  const char *source;
-  const char *source_attr;
-  double multiplier;
-  double constant;
-  const char *strength;
-
-  target = get_target_name (gtk_constraint_get_target (constraint));
-  target_attr = get_attr_nick (gtk_constraint_get_target_attribute (constraint));
-  relation = get_relation_nick (gtk_constraint_get_relation (constraint));
-  source = get_target_name (gtk_constraint_get_source (constraint));
-  source_attr = get_attr_nick (gtk_constraint_get_source_attribute (constraint));
-  multiplier = gtk_constraint_get_multiplier (constraint);
-  constant = gtk_constraint_get_constant (constraint);
-  strength = get_strength_nick (gtk_constraint_get_strength (constraint));
-
-  g_string_append_printf (str, "%*s<constraint target=\"%s\" target-attribute=\"%s\"\n", indent, "", target, target_attr);
-  g_string_append_printf (str, "%*s            relation=\"%s\"\n", indent, "", relation);
-  if (strcmp (source_attr, "none") != 0)
-    {
-      g_string_append_printf (str, "%*s            source=\"%s\" source-attribute=\"%s\"\n", indent, "", source, source_attr);
-      g_string_append_printf (str, "%*s            multiplier=\"%g\"\n", indent, "", multiplier);
-    }
-  g_string_append_printf (str, "%*s            constant=\"%g\"\n", indent, "", constant);
-  g_string_append_printf (str, "%*s            strength=\"%s\" />\n", indent, "", strength);
-}
-
-static void
-create_constraint (GtkButton        *button,
-                   ConstraintEditor *editor)
-{
-  const char *id;
-  gpointer target;
-  GtkConstraintAttribute target_attr;
-  gpointer source;
-  GtkConstraintAttribute source_attr;
-  GtkConstraintRelation relation;
-  double multiplier;
-  double constant;
-  int strength;
-  GtkConstraint *constraint;
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  target = get_target (editor->model, id);
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  target_attr = get_target_attr (id);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-  source = get_target (editor->model, id);
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  source_attr = get_target_attr (id);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->relation));
-  relation = get_relation (id);
-
-  multiplier = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->multiplier)), NULL);
-
-  constant = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->constant)), NULL);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
-  strength = get_strength (id);
-
-  constraint = gtk_constraint_new (target, target_attr,
-                                   relation,
-                                   source, source_attr,
-                                   multiplier,
-                                   constant,
-                                   strength);
-  g_signal_emit (editor, signals[DONE], 0, constraint);
-  g_object_unref (constraint);
-}
-
-static void
-source_attr_changed (ConstraintEditor *editor)
-{
-  const char *id;
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  if (strcmp (id, "none") == 0)
-    {
-      gtk_combo_box_set_active (GTK_COMBO_BOX (editor->source), -1);
-      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "");
-      gtk_widget_set_sensitive (editor->source, FALSE);
-      gtk_widget_set_sensitive (editor->multiplier, FALSE);
-    }
-  else
-    {
-      gtk_widget_set_sensitive (editor->source, TRUE);
-      gtk_widget_set_sensitive (editor->multiplier, TRUE);
-    }
-}
-
-char *
-constraint_editor_constraint_to_string (GtkConstraint *constraint)
-{
-  GString *str;
-  const char *name;
-  const char *attr;
-  const char *relation;
-  double c, m;
-
-  str = g_string_new ("");
-
-  name = get_target_name (gtk_constraint_get_target (constraint));
-  attr = get_attr_nick (gtk_constraint_get_target_attribute (constraint));
-  relation = get_relation_nick (gtk_constraint_get_relation (constraint));
-
-  if (name == NULL)
-    name = "[ ]";
-
-  g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
-
-  c = gtk_constraint_get_constant (constraint);
-
-  attr = get_attr_nick (gtk_constraint_get_source_attribute (constraint));
-  if (strcmp (attr, "none") != 0)
-    {
-      name = get_target_name (gtk_constraint_get_source (constraint));
-      m = gtk_constraint_get_multiplier (constraint);
-
-      if (name == NULL)
-        name = "[ ]";
-
-      g_string_append_printf (str, "%s.%s", name, attr);
-
-      if (m != 1.0)
-        g_string_append_printf (str, " × %g", m);
-
-      if (c > 0.0)
-        g_string_append_printf (str, " + %g", c);
-      else if (c < 0.0)
-        g_string_append_printf (str, " - %g", -c);
-    }
-  else
-    g_string_append_printf (str, "%g", c);
-
-  return g_string_free (str, FALSE);
-}
-
-static void
-update_preview (ConstraintEditor *editor)
-{
-  GString *str;
-  const char *name;
-  const char *attr;
-  char *relation;
-  const char *multiplier;
-  const char *constant;
-  double c, m;
-
-  if (!editor->constructed)
-    return;
-
-  str = g_string_new ("");
-
-  name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  relation = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editor->relation));
-
-  if (name == NULL)
-    name = "[ ]";
-
-  g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
-  g_free (relation);
-
-  constant = gtk_editable_get_text (GTK_EDITABLE (editor->constant));
-  c = g_ascii_strtod (constant, NULL);
-
-  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  if (strcmp (attr, "none") != 0)
-    {
-      name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-      multiplier = gtk_editable_get_text (GTK_EDITABLE (editor->multiplier));
-      m = g_ascii_strtod (multiplier, NULL);
-
-      if (name == NULL)
-        name = "[ ]";
-
-      g_string_append_printf (str, "%s.%s", name, attr);
-
-      if (m != 1.0)
-        g_string_append_printf (str, " × %g", m);
-
-      if (c > 0.0)
-        g_string_append_printf (str, " + %g", c);
-      else if (c < 0.0)
-        g_string_append_printf (str, " - %g", -c);
-    }
-  else
-    g_string_append_printf (str, "%g", c);
-
-  gtk_label_set_label (GTK_LABEL (editor->preview), str->str);
-
-  g_string_free (str, TRUE);
-}
-
-static void
-update_button (ConstraintEditor *editor)
-{
-  if (gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target)) != NULL &&
-      gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source)) != NULL)
-    gtk_widget_set_sensitive (editor->button, TRUE);
-  else
-    gtk_widget_set_sensitive (editor->button, FALSE);
-}
-
-static void
-constraint_editor_init (ConstraintEditor *editor)
-{
-  gtk_widget_init_template (GTK_WIDGET (editor));
-}
-
-static void
-constraint_editor_constructed (GObject *object)
-{
-  ConstraintEditor *editor = CONSTRAINT_EDITOR (object);
-
-  constraint_target_combo (editor->model, editor->target, FALSE);
-  constraint_attribute_combo (editor->target_attr, FALSE);
-  constraint_relation_combo (editor->relation);
-  constraint_target_combo (editor->model, editor->source, TRUE);
-  constraint_attribute_combo (editor->source_attr, TRUE);
-
-  constraint_strength_combo (editor->strength);
-
-  if (editor->constraint)
-    {
-      GtkConstraintTarget *target;
-      GtkConstraintAttribute attr;
-      GtkConstraintRelation relation;
-      GtkConstraintStrength strength;
-      const char *nick;
-      char *val;
-      double multiplier;
-      double constant;
-
-      target = gtk_constraint_get_target (editor->constraint);
-      nick = get_target_name (target);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target), nick);
-
-      attr = gtk_constraint_get_target_attribute (editor->constraint);
-      nick = get_attr_nick (attr);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), nick);
-
-      target = gtk_constraint_get_source (editor->constraint);
-      nick = get_target_name (target);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source), nick);
-
-      attr = gtk_constraint_get_source_attribute (editor->constraint);
-      nick = get_attr_nick (attr);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), nick);
-
-      relation = gtk_constraint_get_relation (editor->constraint);
-      nick = get_relation_nick (relation);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), nick);
-
-      multiplier = gtk_constraint_get_multiplier (editor->constraint);
-      val = g_strdup_printf ("%g", multiplier);
-      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), val);
-      g_free (val);
-
-      constant = gtk_constraint_get_constant (editor->constraint);
-      val = g_strdup_printf ("%g", constant);
-      gtk_editable_set_text (GTK_EDITABLE (editor->constant), val);
-      g_free (val);
-
-      strength = gtk_constraint_get_strength (editor->constraint);
-      nick = get_strength_nick (strength);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
-    }
-  else
-    {
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), "left");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), "left");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), "eq");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "required");
-
-      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1.0");
-      gtk_editable_set_text (GTK_EDITABLE (editor->constant), "0.0");
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
-    }
-
-  editor->constructed = TRUE;
-  update_preview (editor);
-  update_button (editor);
-}
-
-static void
-constraint_editor_set_property (GObject      *object,
-                                guint         property_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  ConstraintEditor *self = CONSTRAINT_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_MODEL:
-      self->model = g_value_dup_object (value);
-      break;
-
-    case PROP_CONSTRAINT:
-      self->constraint = g_value_dup_object (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-constraint_editor_get_property (GObject    *object,
-                                guint       property_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  ConstraintEditor *self = CONSTRAINT_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_MODEL:
-      g_value_set_object (value, self->model);
-      break;
-
-    case PROP_CONSTRAINT:
-      g_value_set_object (value, self->constraint);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-constraint_editor_dispose (GObject *object)
-{
-  ConstraintEditor *self = (ConstraintEditor *)object;
-
-  g_clear_pointer (&self->grid, gtk_widget_unparent);
-  g_clear_object (&self->model);
-  g_clear_object (&self->constraint);
-
-  G_OBJECT_CLASS (constraint_editor_parent_class)->dispose (object);
-}
-
-static void
-constraint_editor_class_init (ConstraintEditorClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->constructed = constraint_editor_constructed;
-  object_class->dispose = constraint_editor_dispose;
-  object_class->set_property = constraint_editor_set_property;
-  object_class->get_property = constraint_editor_get_property;
-
-  pspecs[PROP_CONSTRAINT] =
-    g_param_spec_object ("constraint", "constraint", "constraint",
-                         GTK_TYPE_CONSTRAINT,
-                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
-
-  pspecs[PROP_MODEL] =
-    g_param_spec_object ("model", "model", "model",
-                         G_TYPE_LIST_MODEL,
-                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (object_class, LAST_PROP, pspecs);
-
-  signals[DONE] =
-    g_signal_new ("done",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE, 1, GTK_TYPE_CONSTRAINT);
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-
-  gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/gtk4/constraint-editor/constraint-editor.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, grid);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, target);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, target_attr);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, relation);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, source);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, source_attr);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, multiplier);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, constant);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, strength);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, preview);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, button);
-
-  gtk_widget_class_bind_template_callback (widget_class, update_preview);
-  gtk_widget_class_bind_template_callback (widget_class, update_button);
-  gtk_widget_class_bind_template_callback (widget_class, create_constraint);
-  gtk_widget_class_bind_template_callback (widget_class, source_attr_changed);
-}
-
-ConstraintEditor *
-constraint_editor_new (GListModel    *model,
-                       GtkConstraint *constraint)
-{
-  return g_object_new (CONSTRAINT_EDITOR_TYPE,
-                       "model", model,
-                       "constraint", constraint,
-                       NULL);
-}

demos/constraint-editor/constraint-editor.css

@@ -1,12 +0,0 @@
-constraintview {
-  background: black;
-  color: white;
-}
-
-constraintview .child {
-  background: red;
-}
-
-constraintview .guide {
-  background: blue;
-}

demos/constraint-editor/constraint-editor.gresource.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gtk/gtk4/constraint-editor">
-    <file preprocess="xml-stripblanks">constraint-editor-window.ui</file>
-    <file preprocess="xml-stripblanks">constraint-editor.ui</file>
-    <file preprocess="xml-stripblanks">guide-editor.ui</file>
-    <file>constraint-editor.css</file>
-  </gresource>
-</gresources>

demos/constraint-editor/constraint-editor.h

@@ -1,34 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_EDITOR_TYPE (constraint_editor_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintEditor, constraint_editor, CONSTRAINT, EDITOR, GtkWidget)
-
-ConstraintEditor * constraint_editor_new (GListModel    *model,
-                                          GtkConstraint *constraint);
-
-void constraint_editor_serialize_constraint (GString       *str,
-                                             int            indent,
-                                             GtkConstraint *constraint);
-char *constraint_editor_constraint_to_string (GtkConstraint *constraint);

demos/constraint-editor/constraint-editor.ui

@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="ConstraintEditor" parent="GtkWidget">
-    <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Target</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="target">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="target_attr">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Relation</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="relation">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Source</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="source">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="source_attr">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Multiplier</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="multiplier">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Constant</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">5</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="constant">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">5</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Strength</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">6</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="strength">
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">6</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="preview">
-            <property name="xalign">0</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">7</property>
-              <property name="column-span">2</property>
-            </layout>
-            <attributes>
-              <attribute name="scale" value="1.44"/>
-            </attributes>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button">
-            <property name="label">Create</property>
-            <signal name="clicked" handler="create_constraint"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">8</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

demos/constraint-editor/constraint-view-child.c

@@ -1,93 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "constraint-view-child.h"
-
-struct _ConstraintViewChild
-{
-  GObject parent_instance;
-
-  char *name;
-};
-
-enum {
-  PROP_NAME = 1,
-  LAST_PROP
-};
-
-static GParamSpec props[LAST_PROP];
-
-G_DEFINE_TYPE (ConstraintViewChild, constraint_view_child, G_TYPE_OBJECT)
-
-static void
-constraint_view_child_init (ConstraintViewChild *child)
-{
-}
-
-static void
-constraint_view_child_finalize (GObject *object)
-{
-  ConstraintViewChild *child = CONSTRAINT_VIEW_CHILD (object);
-
-  g_free (child->name);
-
-  G_OBJECT_CLASS (constraint_view_child_parent_class)->finalize (object);
-}
-
-static void
-constraint_view_child_set_property (GObject *object,
-                                    
-static void
-constraint_view_child_class_init (ConstraintViewChildClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = constraint_view_child_finalize;
-  object_class->get_property = constraint_view_child_get_property;
-  object_class->set_property = constraint_view_child_set_property;
-
-  props[PROP_NAME] =
-    g_param_spec_string ("name", "name", "name",
-                         NULL,
-                         G_PARAM_READWRITE);
-
-  g_object_class_install_properties (object_class, LAST_PROP, props);
-}
-
-#define CONSTRAINT_VIEW_CHILD_TYPE (constraint_view_get_type ())
-
-G_DECLARE_TYPE (ConstraintViewChild, constraint_view_child, CONSTRAINT, VIEW_CHILD, GObject)
-
-#define CONSTRAINT_VIEW_WIDGET_TYPE (constraint_view_widget_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewWidget, constraint_view_widget, CONSTRAINT, VIEW_WIDGET, ConstraintViewChild)
-
-ConstraintViewWidget * constraint_view_widget_new (void);
-
-#define CONSTRAINT_VIEW_GUIDE_TYPE (constraint_view_guide_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewGuide, constraint_view_guide, CONSTRAINT, VIEW_GUIDE, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_guide_new (void);
-
-#define CONSTRAINT_VIEW_CONSTRAINT_TYPE (constraint_view_constraint_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewConstraint, constraint_view_constraint, CONSTRAINT, VIEW_CONSTRAINT, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_constraint_new (void);

demos/constraint-editor/constraint-view-child.h

@@ -1,44 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_VIEW_CHILD_TYPE (constraint_view_get_type ())
-
-G_DECLARE_TYPE (ConstraintViewChild, constraint_view_child, CONSTRAINT, VIEW_CHILD, GObject)
-
-#define CONSTRAINT_VIEW_WIDGET_TYPE (constraint_view_widget_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewWidget, constraint_view_widget, CONSTRAINT, VIEW_WIDGET, ConstraintViewChild)
-
-ConstraintViewWidget * constraint_view_widget_new (void);
-
-#define CONSTRAINT_VIEW_GUIDE_TYPE (constraint_view_guide_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewGuide, constraint_view_guide, CONSTRAINT, VIEW_GUIDE, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_guide_new (void);
-
-#define CONSTRAINT_VIEW_CONSTRAINT_TYPE (constraint_view_constraint_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewConstraint, constraint_view_constraint, CONSTRAINT, VIEW_CONSTRAINT, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_constraint_new (void);

demos/constraint-editor/constraint-view.c

@@ -1,343 +0,0 @@
-/* Copyright (C) 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <gtk/gtk.h>
-#include "constraint-view.h"
-
-struct _ConstraintView
-{
-  GtkWidget parent;
-
-  GListModel *model;
-
-  GtkWidget *drag_widget;
-};
-
-G_DEFINE_TYPE (ConstraintView, constraint_view, GTK_TYPE_WIDGET);
-
-static void
-constraint_view_dispose (GObject *object)
-{
-  ConstraintView *view = CONSTRAINT_VIEW (object);
-  GtkWidget *child;
-
-  while ((child = gtk_widget_get_first_child (GTK_WIDGET (view))) != NULL)
-    gtk_widget_unparent (child);
-
-  g_clear_object (&view->model);
-
-  G_OBJECT_CLASS (constraint_view_parent_class)->dispose (object);
-}
-
-static void
-constraint_view_class_init (ConstraintViewClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = constraint_view_dispose;
-
-  gtk_widget_class_set_css_name (widget_class, "constraintview");
-}
-
-static void
-update_weak_position (ConstraintView *self,
-                      GtkWidget      *child,
-                      double          x,
-                      double          y)
-{
-  GtkLayoutManager *manager;
-  GtkConstraint *constraint;
-
-  manager = gtk_widget_get_layout_manager (GTK_WIDGET (self));
-  constraint = (GtkConstraint *)g_object_get_data (G_OBJECT (child), "x-constraint");
-  if (constraint)
-    {
-      gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                               constraint);
-      g_object_set_data (G_OBJECT (child), "x-constraint", NULL);
-    }
-  if (x != -100)
-    {
-      constraint = gtk_constraint_new_constant (child,
-                                                GTK_CONSTRAINT_ATTRIBUTE_CENTER_X,
-                                                GTK_CONSTRAINT_RELATION_EQ,
-                                                x,
-                                                GTK_CONSTRAINT_STRENGTH_WEAK);
-      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
-      gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                            constraint);
-      g_object_set_data (G_OBJECT (child), "x-constraint", constraint);
-    }
-
-  constraint = (GtkConstraint *)g_object_get_data (G_OBJECT (child), "y-constraint");
-  if (constraint)
-    {
-      gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                                   constraint);
-      g_object_set_data (G_OBJECT (child), "y-constraint", NULL);
-    }
-  if (y != -100)
-    {
-      constraint = gtk_constraint_new_constant (child,
-                                                GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y,
-                                                GTK_CONSTRAINT_RELATION_EQ,
-                                                y,
-                                                GTK_CONSTRAINT_STRENGTH_WEAK);
-      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
-      gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                            constraint);
-      g_object_set_data (G_OBJECT (child), "y-constraint", constraint);
-    }
-}
-
-static void
-drag_begin (GtkGestureDrag *drag,
-            double          start_x,
-            double          start_y,
-            ConstraintView *self)
-{
-  GtkWidget *widget;
-
-  widget = gtk_widget_pick (GTK_WIDGET (self), start_x, start_y, GTK_PICK_DEFAULT);
-
-  if (GTK_IS_LABEL (widget))
-    {
-      widget = gtk_widget_get_ancestor (widget, GTK_TYPE_FRAME);
-      if (widget &&
-          gtk_widget_get_parent (widget) == (GtkWidget *)self)
-        {
-          self->drag_widget = widget;
-        }
-    }
-}
-
-static void
-drag_update (GtkGestureDrag *drag,
-             double          offset_x,
-             double          offset_y,
-             ConstraintView *self)
-{
-  double x, y;
-
-  if (!self->drag_widget)
-    return;
-
-  gtk_gesture_drag_get_start_point (drag, &x, &y);
-  update_weak_position (self, self->drag_widget, x + offset_x, y + offset_y);
-}
-
-static void
-drag_end (GtkGestureDrag *drag,
-          double          offset_x,
-          double          offset_y,
-          ConstraintView *self)
-{
-  self->drag_widget = NULL;
-}
-
-static gboolean
-omit_internal (gpointer item, gpointer user_data)
-{
-  if (g_object_get_data (G_OBJECT (item), "internal"))
-    return FALSE;
-
-  return TRUE;
-}
-
-static void
-constraint_view_init (ConstraintView *self)
-{
-  GtkLayoutManager *manager;
-  GtkEventController *controller;
-  GListStore *list;
-  GListModel *all_children;
-  GListModel *all_constraints;
-  GListModel *guides;
-  GListModel *children;
-  GListModel *constraints;
-
-  manager = gtk_constraint_layout_new ();
-  gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);
-
-  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
-  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
-  guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
-  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, omit_internal, NULL, NULL);
-  children = (GListModel *)gtk_filter_list_model_new (all_children, omit_internal, NULL, NULL);
-
-  list = g_list_store_new (G_TYPE_LIST_MODEL);
-  g_list_store_append (list, children);
-  g_list_store_append (list, guides);
-  g_list_store_append (list, constraints);
-  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_TYPE_OBJECT, G_LIST_MODEL (list)));
-  g_object_unref (children);
-  g_object_unref (guides);
-  g_object_unref (constraints);
-  g_object_unref (all_children);
-  g_object_unref (all_constraints);
-  g_object_unref (list);
-
-
-  controller = (GtkEventController *)gtk_gesture_drag_new ();
-  g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);
-  g_signal_connect (controller, "drag-update", G_CALLBACK (drag_update), self);
-  g_signal_connect (controller, "drag-end", G_CALLBACK (drag_end), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-}
-
-ConstraintView *
-constraint_view_new (void)
-{
-  return g_object_new (CONSTRAINT_VIEW_TYPE, NULL);
-}
-
-void
-constraint_view_add_child (ConstraintView *view,
-                           const char     *name)
-{
-  GtkWidget *frame;
-  GtkWidget *label;
-
-  label = gtk_label_new (name);
-  frame = gtk_frame_new (NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "child");
-  gtk_widget_set_name (frame, name);
-  gtk_container_add (GTK_CONTAINER (frame), label);
-  gtk_widget_set_parent (frame, GTK_WIDGET (view));
-
-  update_weak_position (view, frame, 100, 100);
-}
-
-void
-constraint_view_remove_child (ConstraintView *view,
-                              GtkWidget      *child)
-{
-  update_weak_position (view, child, -100, -100);
-  gtk_widget_unparent (child);
-}
-
-void
-constraint_view_add_guide (ConstraintView *view,
-                           GtkConstraintGuide *guide)
-{
-  GtkConstraintLayout *layout;
-  GtkWidget *frame;
-  GtkWidget *label;
-  const char *name;
-  GtkConstraint *constraint;
-  struct {
-    const char *name;
-    GtkConstraintAttribute attr;
-  } names[] = {
-    { "left-constraint", GTK_CONSTRAINT_ATTRIBUTE_LEFT },
-    { "top-constraint", GTK_CONSTRAINT_ATTRIBUTE_TOP },
-    { "width-constraint", GTK_CONSTRAINT_ATTRIBUTE_WIDTH },
-    { "height-constraint", GTK_CONSTRAINT_ATTRIBUTE_HEIGHT },
-  };
-  int i;
-
-  name = gtk_constraint_guide_get_name (guide);
-  label = gtk_label_new (name);
-  g_object_bind_property (guide, "name",
-                          label, "label",
-                          G_BINDING_DEFAULT);
-
-  frame = gtk_frame_new (NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "guide");
-  g_object_set_data (G_OBJECT (frame), "internal", "yes");
-  gtk_container_add (GTK_CONTAINER (frame), label);
-  gtk_widget_insert_after (frame, GTK_WIDGET (view), NULL);
-
-  g_object_set_data (G_OBJECT (guide), "frame", frame);
-
-  layout = GTK_CONSTRAINT_LAYOUT (gtk_widget_get_layout_manager (GTK_WIDGET (view)));
-  gtk_constraint_layout_add_guide (layout, g_object_ref (guide));
-
-  for (i = 0; i < G_N_ELEMENTS (names); i++)
-    {
-      constraint = gtk_constraint_new (frame,
-                                       names[i].attr,
-                                       GTK_CONSTRAINT_RELATION_EQ,
-                                       guide,
-                                       names[i].attr,
-                                       1.0, 0.0,
-                                       GTK_CONSTRAINT_STRENGTH_REQUIRED);
-      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
-      gtk_constraint_layout_add_constraint (layout, constraint);
-      g_object_set_data (G_OBJECT (guide), names[i].name, constraint);
-    }
-
-  update_weak_position (view, frame, 150, 150);
-}
-
-void
-constraint_view_remove_guide (ConstraintView     *view,
-                              GtkConstraintGuide *guide)
-{
-  GtkConstraintLayout *layout;
-  GtkWidget *frame;
-  GtkConstraint *constraint;
-  const char *names[] = {
-    "left-constraint",
-    "top-constraint",
-    "width-constraint",
-    "height-constraint"
-  };
-  int i;
-
-  layout = GTK_CONSTRAINT_LAYOUT (gtk_widget_get_layout_manager (GTK_WIDGET (view)));
-
-  for (i = 0; i < G_N_ELEMENTS (names); i++)
-    {
-      constraint = (GtkConstraint*)g_object_get_data (G_OBJECT (guide), names[i]);
-      gtk_constraint_layout_remove_constraint (layout, constraint);
-    }
-
-  frame = (GtkWidget *)g_object_get_data (G_OBJECT (guide), "frame");
-  update_weak_position (view, frame, -100, -100);
-  gtk_widget_unparent (frame);
-
-  gtk_constraint_layout_remove_guide (layout, guide);
-}
-
-void
-constraint_view_add_constraint (ConstraintView *view,
-                                GtkConstraint  *constraint)
-{
-  GtkLayoutManager *manager;
-
-  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
-  gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                        g_object_ref (constraint));
-}
-
-void
-constraint_view_remove_constraint (ConstraintView *view,
-                                   GtkConstraint  *constraint)
-{
-  GtkLayoutManager *manager;
-
-  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
-  gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                           constraint);
-}
-
-GListModel *
-constraint_view_get_model (ConstraintView *view)
-{
-  return view->model;
-}

demos/constraint-editor/constraint-view.h

@@ -1,44 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_VIEW_TYPE (constraint_view_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintView, constraint_view, CONSTRAINT, VIEW, GtkWidget)
-
-ConstraintView * constraint_view_new (void);
-
-void             constraint_view_add_child (ConstraintView *view,
-                                            const char     *name);
-void             constraint_view_remove_child (ConstraintView *view,
-                                               GtkWidget      *child);
-void             constraint_view_add_guide (ConstraintView     *view,
-                                            GtkConstraintGuide *guide);
-void             constraint_view_remove_guide (ConstraintView     *view,
-                                               GtkConstraintGuide *guide);
-void             constraint_view_guide_changed (ConstraintView     *view,
-                                                GtkConstraintGuide *guide);
-void             constraint_view_add_constraint (ConstraintView *view,
-                                                 GtkConstraint  *constraint);
-void             constraint_view_remove_constraint (ConstraintView *view,
-                                                    GtkConstraint  *constraint);
-GListModel *     constraint_view_get_model (ConstraintView *view);

demos/constraint-editor/guide-editor.c

@@ -1,411 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "guide-editor.h"
-
-struct _GuideEditor
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *grid;
-  GtkWidget *name;
-  GtkWidget *min_width;
-  GtkWidget *min_height;
-  GtkWidget *nat_width;
-  GtkWidget *nat_height;
-  GtkWidget *max_width;
-  GtkWidget *max_height;
-  GtkWidget *strength;
-  GtkWidget *button;
-
-  GtkConstraintGuide *guide;
-
-  gboolean constructed;
-};
-
-enum {
-  PROP_GUIDE = 1,
-  LAST_PROP
-};
-
-static GParamSpec *pspecs[LAST_PROP];
-
-enum {
-  DONE,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE(GuideEditor, guide_editor, GTK_TYPE_WIDGET);
-
-static void
-guide_strength_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
-}
-
-static GtkConstraintStrength
-get_strength (const char *id)
-{
-  GtkConstraintStrength strength;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  strength = value->value;
-  g_type_class_unref (class);
-
-  return strength;
-}
-
-const char *
-get_strength_nick (GtkConstraintStrength strength)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value (class, strength);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-void
-guide_editor_serialize_guide (GString *str,
-                              int      indent,
-                              GtkConstraintGuide *guide)
-{
-  int min_width, min_height;
-  int nat_width, nat_height;
-  int max_width, max_height;
-  const char *name;
-  const char *strength;
-
-  gtk_constraint_guide_get_min_size (guide, &min_width, &min_height);
-  gtk_constraint_guide_get_nat_size (guide, &nat_width, &nat_height);
-  gtk_constraint_guide_get_max_size (guide, &max_width, &max_height);
-  name = gtk_constraint_guide_get_name (guide);
-  strength = get_strength_nick (gtk_constraint_guide_get_strength (guide));
-
-  g_string_append_printf (str, "%*s<guide min-width=\"%d\" min-height=\"%d\"\n", indent, "", min_width, min_height);
-  g_string_append_printf (str, "%*s       nat-width=\"%d\" nat-height=\"%d\"\n", indent, "", nat_width, nat_height);
-  g_string_append_printf (str, "%*s       max-width=\"%d\" max-height=\"%d\"\n", indent, "", max_width, max_height);
-  g_string_append_printf (str, "%*s       name=\"%s\" strength=\"%s\" />\n", indent, "", name, strength);
-}
-
-static void
-create_guide (GtkButton   *button,
-              GuideEditor *editor)
-{
-  const char *id;
-  int strength;
-  const char *name;
-  int w, h;
-  GtkConstraintGuide *guide;
-
-  if (editor->guide)
-    guide = g_object_ref (editor->guide);
-  else
-    guide = gtk_constraint_guide_new ();
-
-  name = gtk_editable_get_text (GTK_EDITABLE (editor->name));
-  gtk_constraint_guide_set_name (guide, name);
-
-  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->min_width));
-  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->min_height));
-  gtk_constraint_guide_set_min_size (guide, w, h);
-
-  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->nat_width));
-  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->nat_height));
-  gtk_constraint_guide_set_nat_size (guide, w, h);
-
-  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_width));
-  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_height));
-  gtk_constraint_guide_set_max_size (guide, w, h);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
-  strength = get_strength (id);
-  gtk_constraint_guide_set_strength (guide, strength);
-
-  g_signal_emit (editor, signals[DONE], 0, guide);
-  g_object_unref (guide);
-}
-
-static void
-guide_editor_init (GuideEditor *editor)
-{
-  gtk_widget_init_template (GTK_WIDGET (editor));
-}
-
-static int guide_counter;
-
-static int
-min_input (GtkSpinButton *spin_button,
-           double        *new_val)
-{
-  if (strcmp (gtk_editable_get_text (GTK_EDITABLE (spin_button)), "") == 0)
-    {
-      *new_val = 0.0;
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static int
-max_input (GtkSpinButton *spin_button,
-           double        *new_val)
-{
-  if (strcmp (gtk_editable_get_text (GTK_EDITABLE (spin_button)), "") == 0)
-    {
-      *new_val = G_MAXINT;
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-min_output (GtkSpinButton *spin_button)
-{
-  GtkAdjustment *adjustment;
-  double value;
-  GtkWidget *box, *text;
-
-  adjustment = gtk_spin_button_get_adjustment (spin_button);
-  value = gtk_adjustment_get_value (adjustment);
-
-  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
-  text = gtk_widget_get_first_child (box);
-
-  if (value == 0.0)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
-      return TRUE;
-    }
-  else
-    {
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
-      return FALSE;
-    }
-}
-
-static gboolean
-max_output (GtkSpinButton *spin_button)
-{
-  GtkAdjustment *adjustment;
-  double value;
-  GtkWidget *box, *text;
-
-  adjustment = gtk_spin_button_get_adjustment (spin_button);
-  value = gtk_adjustment_get_value (adjustment);
-
-  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
-  text = gtk_widget_get_first_child (box);
-
-  if (value == (double)G_MAXINT)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
-      return TRUE;
-    }
-  else
-    {
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
-      return FALSE;
-    }
-}
-
-static void
-guide_editor_constructed (GObject *object)
-{
-  GuideEditor *editor = GUIDE_EDITOR (object);
-
-  guide_strength_combo (editor->strength);
-
-  g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
-  g_signal_connect (editor->min_width, "output", G_CALLBACK (min_output), NULL);
-
-  g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
-  g_signal_connect (editor->min_height, "output", G_CALLBACK (min_output), NULL);
-
-  g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
-  g_signal_connect (editor->max_width, "output", G_CALLBACK (max_output), NULL);
-
-  g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
-  g_signal_connect (editor->max_height, "output", G_CALLBACK (max_output), NULL);
-
-  if (editor->guide)
-    {
-      GtkConstraintStrength strength;
-      const char *nick;
-      int w, h;
-
-      nick = gtk_constraint_guide_get_name (editor->guide);
-      if (nick)
-        gtk_editable_set_text (GTK_EDITABLE (editor->name), nick);
-
-      gtk_constraint_guide_get_min_size (editor->guide, &w, &h);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_width), w);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_height), h);
-
-      gtk_constraint_guide_get_nat_size (editor->guide, &w, &h);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_width), w);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_height), h);
-
-      gtk_constraint_guide_get_max_size (editor->guide, &w, &h);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), w);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), h);
-
-      strength = gtk_constraint_guide_get_strength (editor->guide);
-      nick = get_strength_nick (strength);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
-    }
-  else
-    {
-      char *name;
-
-      guide_counter++;
-      name = g_strdup_printf ("Guide %d", guide_counter);
-      gtk_editable_set_text (GTK_EDITABLE (editor->name), name);
-      g_free (name);
-
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_width), 0.0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_height), 0.0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_width), 0.0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_height), 0.0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), G_MAXINT);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), G_MAXINT);
-
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "medium");
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
-    }
-
-  editor->constructed = TRUE;
-}
-
-static void
-guide_editor_set_property (GObject      *object,
-                           guint         property_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  GuideEditor *self = GUIDE_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_GUIDE:
-      self->guide = g_value_dup_object (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-guide_editor_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  GuideEditor *self = GUIDE_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_GUIDE:
-      g_value_set_object (value, self->guide);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-guide_editor_dispose (GObject *object)
-{
-  GuideEditor *self = (GuideEditor *)object;
-
-  g_clear_pointer (&self->grid, gtk_widget_unparent);
-  g_clear_object (&self->guide);
-
-  G_OBJECT_CLASS (guide_editor_parent_class)->dispose (object);
-}
-
-static void
-guide_editor_class_init (GuideEditorClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->constructed = guide_editor_constructed;
-  object_class->dispose = guide_editor_dispose;
-  object_class->set_property = guide_editor_set_property;
-  object_class->get_property = guide_editor_get_property;
-
-  pspecs[PROP_GUIDE] =
-    g_param_spec_object ("guide", "guide", "guide",
-                         GTK_TYPE_CONSTRAINT_GUIDE,
-                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (object_class, LAST_PROP, pspecs);
-
-  signals[DONE] =
-    g_signal_new ("done",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE, 1, GTK_TYPE_CONSTRAINT_GUIDE);
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-
-  gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/gtk4/constraint-editor/guide-editor.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, grid);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, name);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, min_width);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, min_height);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, nat_width);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, nat_height);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, max_width);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, max_height);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, strength);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, button);
-
-  gtk_widget_class_bind_template_callback (widget_class, create_guide);
-}
-
-GuideEditor *
-guide_editor_new (GtkConstraintGuide *guide)
-{
-  return g_object_new (GUIDE_EDITOR_TYPE,
-                       "guide", guide,
-                       NULL);
-}

demos/constraint-editor/guide-editor.ui

@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAdjustment" id="min_width_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="min_height_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="nat_width_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="nat_height_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="max_width_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="max_height_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <template class="GuideEditor" parent="GtkWidget">
-    <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Name</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="name">
-            <property name="max-width-chars">20</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-              <property name="column-span">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Min Size</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="min_width">
-            <property name="adjustment">min_width_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="min_height">
-            <property name="adjustment">min_height_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Nat Size</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="nat_width">
-            <property name="adjustment">nat_width_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="nat_height">
-            <property name="adjustment">nat_height_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Max Size</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="max_width">
-            <property name="adjustment">max_width_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="max_height">
-            <property name="adjustment">max_height_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Strength</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="strength">
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
-              <property name="column-span">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button">
-            <property name="label">Create</property>
-            <signal name="clicked" handler="create_guide"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">5</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

demos/constraint-editor/main.c

@@ -1,28 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen <mclasen@redhat.com>
- */
-
-#include "config.h"
-
-#include <constraint-editor-application.h>
-
-int
-main (int argc, char *argv[])
-{
-  return g_application_run (G_APPLICATION (constraint_editor_application_new ()), argc, argv);
-}

demos/constraint-editor/meson.build

@@ -1,20 +0,0 @@
-constraint_editor_sources = [
-  'main.c',
-  'constraint-editor-application.c',
-  'constraint-editor-window.c',
-  'constraint-view.c',
-  'constraint-editor.c',
-  'guide-editor.c',
-]
-
-constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
-                                                      'constraint-editor.gresource.xml',
-                                                      source_dir: '.')
-
-executable('gtk4-constraint-editor',
-           constraint_editor_sources, constraint_editor_resources,
-           dependencies: libgtk_dep,
-           include_directories: confinc,
-           gui_app: true,
-           link_args: extra_demo_ldflags,
-           install: false)

demos/gtk-demo/application.c

@@ -419,7 +419,7 @@ demo_application_window_load_state (DemoApplicationWindow *win)
 static void
 demo_application_window_init (DemoApplicationWindow *window)
 {
-  GtkWidget *popover;
+  GtkWidget *menu;
 
   window->width = -1;
   window->height = -1;
@@ -428,8 +428,8 @@ demo_application_window_init (DemoApplicationWindow *window)
 
   gtk_widget_init_template (GTK_WIDGET (window));
 
-  popover = gtk_popover_menu_new_from_model (window->menutool, window->toolmenu);
-  gtk_menu_tool_button_set_popover (GTK_MENU_TOOL_BUTTON (window->menutool), popover);
+  menu = gtk_menu_new_from_model (window->toolmenu);
+  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (window->menutool), menu);
 
   g_action_map_add_action_entries (G_ACTION_MAP (window),
                                    win_entries, G_N_ELEMENTS (win_entries),

demos/gtk-demo/application.ui

@@ -43,17 +43,25 @@
           <object class="GtkInfoBar" id="infobar">
             <property name="visible">0</property>
             <property name="hexpand">1</property>
-            <child>
-              <object class="GtkLabel" id="message">
-                <property name="hexpand">1</property>
+            <child internal-child="content_area">
+              <object class="GtkBox" id="content_area">
+                <child>
+                  <object class="GtkLabel" id="message">
+                    <property name="hexpand">1</property>
+                  </object>
+                </child>
               </object>
             </child>
-            <child type="action">
-              <object class="GtkButton">
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_OK</property>
-                <property name="use-underline">1</property>
-                <signal name="clicked" handler="clicked_cb"/>
+            <child internal-child="action_area">
+              <object class="GtkBox">
+                <child>
+                  <object class="GtkButton">
+                    <property name="valign">center</property>
+                    <property name="label" translatable="yes">_OK</property>
+                    <property name="use-underline">1</property>
+                    <signal name="clicked" handler="clicked_cb"/>
+                  </object>
+                </child>
               </object>
             </child>
             <layout>

demos/gtk-demo/assistant.c

@@ -94,7 +94,6 @@ create_page1 (GtkWidget *assistant)
   GtkWidget *box, *label, *entry;
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
   gtk_container_add (GTK_CONTAINER (box), label);
@@ -116,12 +115,10 @@ create_page2 (GtkWidget *assistant)
 {
   GtkWidget *box, *checkbutton;
 
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                  "even if you do not check this");
-  gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
   gtk_container_add (GTK_CONTAINER (box), checkbutton);
 
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);

demos/gtk-demo/builder.c

@@ -38,22 +38,7 @@ help_activate (GSimpleAction *action,
   g_print ("Help not available\n");
 }
 
-static void
-not_implemented (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  g_print ("Action “%s” not implemented\n", g_action_get_name (G_ACTION (action)));
-}
-
 static GActionEntry win_entries[] = {
-  { "new", not_implemented, NULL, NULL, NULL },
-  { "open", not_implemented, NULL, NULL, NULL },
-  { "save", not_implemented, NULL, NULL, NULL },
-  { "save-as", not_implemented, NULL, NULL, NULL },
-  { "copy", not_implemented, NULL, NULL, NULL },
-  { "cut", not_implemented, NULL, NULL, NULL },
-  { "paste", not_implemented, NULL, NULL, NULL },
   { "quit", quit_activate, NULL, NULL, NULL },
   { "about", about_activate, NULL, NULL, NULL },
   { "help", help_activate, NULL, NULL, NULL }
@@ -65,6 +50,8 @@ do_builder (GtkWidget *do_widget)
   static GtkWidget *window = NULL;
   GtkWidget *toolbar;
   GActionGroup *actions;
+  GtkAccelGroup *accel_group;
+  GtkWidget *item;
 
   if (!window)
     {
@@ -72,6 +59,7 @@ do_builder (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/builder/demo.ui");
 
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -85,6 +73,44 @@ do_builder (GtkWidget *do_widget)
                                        win_entries, G_N_ELEMENTS (win_entries),
                                        window);
       gtk_widget_insert_action_group (window, "win", actions);
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "new_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_n, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "open_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_o, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "save_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "quit_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "copy_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_c, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "cut_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_x, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "paste_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_v, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "help_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_F1, 0, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "about_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_F7, 0, GTK_ACCEL_VISIBLE);
 
       g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
     }

demos/gtk-demo/changedisplay.c

@@ -0,0 +1,551 @@
+/* Change Display
+ *
+ * Demonstrates migrating a window between different displays.
+ * A display is a mouse and keyboard with some number of
+ * associated monitors. The neat thing about having multiple
+ * displays is that they can be on a completely separate
+ * computers, as long as there is a network connection to the
+ * computer where the application is running.
+ *
+ * Only some of the windowing systems where GTK runs have the
+ * concept of multiple displays. (The X Window System is the
+ * main example.) Other windowing systems can only handle one
+ * keyboard and mouse, and combine all monitors into
+ * a single display.
+ *
+ * This is a moderately complex example, and demonstrates:
+ *
+ *  - Tracking the currently open displays
+ *
+ *  - Changing the display for a window
+ *
+ *  - Letting the user choose a window by clicking on it
+ *
+ *  - Using GtkListStore and GtkTreeView
+ *
+ *  - Using GtkDialog
+ */
+#include <string.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+/* The ChangeDisplayInfo structure corresponds to a toplevel window and
+ * holds pointers to widgets inside the toplevel window along with other
+ * information about the contents of the window.
+ * This is a common organizational structure in real applications.
+ */
+typedef struct _ChangeDisplayInfo ChangeDisplayInfo;
+
+struct _ChangeDisplayInfo
+{
+  GtkWidget *window;
+  GtkSizeGroup *size_group;
+
+  GtkTreeModel *display_model;
+
+  GdkDisplay *current_display;
+};
+
+/* These enumerations provide symbolic names for the columns
+ * in the two GtkListStore models.
+ */
+enum
+{
+  DISPLAY_COLUMN_NAME,
+  DISPLAY_COLUMN_DISPLAY,
+  DISPLAY_NUM_COLUMNS
+};
+
+enum
+{
+  SCREEN_COLUMN_NUMBER,
+  SCREEN_COLUMN_SCREEN,
+  SCREEN_NUM_COLUMNS
+};
+
+/* Finds the toplevel window under the mouse pointer, if any.
+ */
+static GtkWidget *
+find_toplevel_at_pointer (GdkDisplay *display)
+{
+  GdkSurface *pointer_window;
+  GtkWidget *widget = NULL;
+
+  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (), NULL, NULL);
+
+  if (pointer_window)
+    widget = GTK_WIDGET (gtk_native_get_for_surface (pointer_window));
+
+  return widget;
+}
+
+static void
+released_cb (GtkGestureClick *gesture,
+             guint            n_press,
+             gdouble          x,
+             gdouble          y,
+             gboolean        *clicked)
+{
+  *clicked = TRUE;
+}
+
+/* Asks the user to click on a window, then waits for them click
+ * the mouse. When the mouse is released, returns the toplevel
+ * window under the pointer, or NULL, if there is none.
+ */
+static GtkWidget *
+query_for_toplevel (GdkDisplay *display,
+                    const char *prompt)
+{
+  GtkWidget *popup, *label, *frame;
+  GdkCursor *cursor;
+  GtkWidget *toplevel = NULL;
+  GdkDevice *device;
+
+  popup = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_window_set_display (GTK_WINDOW (popup), display);
+  gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (popup), frame);
+
+  label = gtk_label_new (prompt);
+  g_object_set (label, "margin", 10, NULL);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+
+  gtk_widget_show (popup);
+  cursor = gdk_cursor_new_from_name ("crosshair", NULL);
+  device = gtk_get_current_event_device ();
+
+  if (gdk_seat_grab (gdk_device_get_seat (device),
+                     gtk_native_get_surface (GTK_NATIVE (popup)),
+                     GDK_SEAT_CAPABILITY_ALL_POINTING,
+                     FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
+    {
+      GtkGesture *gesture = gtk_gesture_click_new ();
+      gboolean clicked = FALSE;
+
+      g_signal_connect (gesture, "released",
+                        G_CALLBACK (released_cb), &clicked);
+      gtk_widget_add_controller (popup, GTK_EVENT_CONTROLLER (gesture));
+
+      /* Process events until clicked is set by our button release event handler.
+       * We pass in may_block=TRUE since we want to wait if there
+       * are no events currently.
+       */
+      while (!clicked)
+        g_main_context_iteration (NULL, TRUE);
+
+      gdk_seat_ungrab (gdk_device_get_seat (device));
+
+      toplevel = find_toplevel_at_pointer (display);
+      if (toplevel == popup)
+        toplevel = NULL;
+    }
+
+  g_object_unref (cursor);
+  gtk_widget_destroy (popup);
+
+  return toplevel;
+}
+
+/* Prompts the user for a toplevel window to move, and then moves
+ * that window to the currently selected display
+ */
+static void
+query_change_display (ChangeDisplayInfo *info)
+{
+  GdkDisplay *display = gtk_widget_get_display (info->window);
+  GtkWidget *toplevel;
+
+  toplevel = query_for_toplevel (display,
+                                 "Please select the toplevel\n"
+                                 "to move to the new display");
+
+  if (toplevel)
+    gtk_window_set_display (GTK_WINDOW (toplevel), info->current_display);
+  else
+    gdk_display_beep (display);
+}
+
+/* Called when the user clicks on a button in our dialog or
+ * closes the dialog through the window manager. Unless the
+ * "Change" button was clicked, we destroy the dialog.
+ */
+static void
+response_cb (GtkDialog         *dialog,
+             gint               response_id,
+             ChangeDisplayInfo *info)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    query_change_display (info);
+  else
+    gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+/* Called when the user clicks on "Open..." in the display
+ * frame. Prompts for a new display, and then opens a connection
+ * to that display.
+ */
+static void
+open_display_cb (GtkWidget         *button,
+                 ChangeDisplayInfo *info)
+{
+  GtkWidget *content_area;
+  GtkWidget *dialog;
+  GtkWidget *display_entry;
+  GtkWidget *dialog_label;
+  gchar *new_screen_name = NULL;
+  GdkDisplay *result = NULL;
+
+  dialog = gtk_dialog_new_with_buttons ("Open Display",
+                                        GTK_WINDOW (info->window),
+                                        GTK_DIALOG_MODAL,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_OK"), GTK_RESPONSE_OK,
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  display_entry = gtk_entry_new ();
+  gtk_entry_set_activates_default (GTK_ENTRY (display_entry), TRUE);
+  dialog_label =
+    gtk_label_new ("Please enter the name of\nthe new display\n");
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
+  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
+
+  gtk_widget_grab_focus (display_entry);
+
+  while (!result)
+    {
+      gint response_id = gtk_dialog_run (GTK_DIALOG (dialog));
+      if (response_id != GTK_RESPONSE_OK)
+        break;
+
+      new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
+                                                0, -1);
+
+      if (strcmp (new_screen_name, "") != 0)
+        {
+          result = gdk_display_open (new_screen_name);
+          if (!result)
+            {
+              gchar *error_msg =
+                g_strdup_printf  ("Can't open display:\n\t%s\nplease try another one\n",
+                                  new_screen_name);
+              gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
+              g_free (error_msg);
+            }
+
+          g_free (new_screen_name);
+        }
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+/* Called when the user clicks on the "Close" button in the
+ * "Display" frame. Closes the selected display.
+ */
+static void
+close_display_cb (GtkWidget         *button,
+                  ChangeDisplayInfo *info)
+{
+  if (info->current_display)
+    gdk_display_close (info->current_display);
+}
+
+/* Called when the selected row in the display list changes.
+ * Updates info->current_display, then refills the list of
+ * screens.
+ */
+static void
+display_changed_cb (GtkTreeSelection  *selection,
+                    ChangeDisplayInfo *info)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  if (info->current_display)
+    g_object_unref (info->current_display);
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    gtk_tree_model_get (model, &iter,
+                        DISPLAY_COLUMN_DISPLAY, &info->current_display,
+                        -1);
+  else
+    info->current_display = NULL;
+}
+
+/* This function is used both for creating the "Display" and
+ * "Screen" frames, since they have a similar structure. The
+ * caller hooks up the right context for the value returned
+ * in tree_view, and packs any relevant buttons into button_vbox.
+ */
+static void
+create_frame (ChangeDisplayInfo *info,
+              const char        *title,
+              GtkWidget        **frame,
+              GtkWidget        **tree_view,
+              GtkWidget        **button_vbox)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *scrollwin;
+  GtkWidget *hbox;
+
+  *frame = gtk_frame_new (title);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+  g_object_set (hbox, "margin", 8, NULL);
+  gtk_container_add (GTK_CONTAINER (*frame), hbox);
+
+  scrollwin = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
+                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
+                                       GTK_SHADOW_IN);
+  gtk_container_add (GTK_CONTAINER (hbox), scrollwin);
+
+  *tree_view = gtk_tree_view_new ();
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
+  gtk_container_add (GTK_CONTAINER (scrollwin), *tree_view);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
+  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+
+  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+  gtk_container_add (GTK_CONTAINER (hbox), *button_vbox);
+
+  if (!info->size_group)
+    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  gtk_size_group_add_widget (GTK_SIZE_GROUP (info->size_group), *button_vbox);
+}
+
+/* If we have a stack of buttons, it often looks better if their contents
+ * are left-aligned, rather than centered. This function creates a button
+ * and left-aligns it contents.
+ */
+GtkWidget *
+left_align_button_new (const char *label)
+{
+  GtkWidget *button = gtk_button_new_with_mnemonic (label);
+  GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
+
+  gtk_widget_set_halign (child, GTK_ALIGN_START);
+  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
+
+  return button;
+}
+
+/* Creates the "Display" frame in the main window.
+ */
+GtkWidget *
+create_display_frame (ChangeDisplayInfo *info)
+{
+  GtkWidget *frame;
+  GtkWidget *tree_view;
+  GtkWidget *button_vbox;
+  GtkTreeViewColumn *column;
+  GtkTreeSelection *selection;
+  GtkWidget *button;
+
+  create_frame (info, "Display", &frame, &tree_view, &button_vbox);
+
+  button = left_align_button_new ("_Open...");
+  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
+  gtk_container_add (GTK_CONTAINER (button_vbox), button);
+
+  button = left_align_button_new ("_Close");
+  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
+  gtk_container_add (GTK_CONTAINER (button_vbox), button);
+
+  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
+                                                            G_TYPE_STRING,
+                                                            GDK_TYPE_DISPLAY);
+
+  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->display_model);
+
+  column = gtk_tree_view_column_new_with_attributes ("Name",
+                                                     gtk_cell_renderer_text_new (),
+                                                     "text", DISPLAY_COLUMN_NAME,
+                                                     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+  g_signal_connect (selection, "changed",
+                    G_CALLBACK (display_changed_cb), info);
+
+  return frame;
+}
+
+/* Called when one of the currently open displays is closed.
+ * Remove it from our list of displays.
+ */
+static void
+display_closed_cb (GdkDisplay        *display,
+                   gboolean           is_error,
+                   ChangeDisplayInfo *info)
+{
+  GtkTreeIter iter;
+  gboolean valid;
+
+  for (valid = gtk_tree_model_get_iter_first (info->display_model, &iter);
+       valid;
+       valid = gtk_tree_model_iter_next (info->display_model, &iter))
+    {
+      GdkDisplay *tmp_display;
+
+      gtk_tree_model_get (info->display_model, &iter,
+                          DISPLAY_COLUMN_DISPLAY, &tmp_display,
+                          -1);
+      if (tmp_display == display)
+        {
+          gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
+          break;
+        }
+    }
+}
+
+/* Adds a new display to our list of displays, and connects
+ * to the "closed" signal so that we can remove it from the
+ * list of displays again.
+ */
+static void
+add_display (ChangeDisplayInfo *info,
+             GdkDisplay        *display)
+{
+  const gchar *name = gdk_display_get_name (display);
+  GtkTreeIter iter;
+
+  gtk_list_store_append (GTK_LIST_STORE (info->display_model), &iter);
+  gtk_list_store_set (GTK_LIST_STORE (info->display_model), &iter,
+                      DISPLAY_COLUMN_NAME, name,
+                      DISPLAY_COLUMN_DISPLAY, display,
+                      -1);
+
+  g_signal_connect (display, "closed",
+                    G_CALLBACK (display_closed_cb), info);
+}
+
+/* Called when a new display is opened
+ */
+static void
+display_opened_cb (GdkDisplayManager *manager,
+                   GdkDisplay        *display,
+                   ChangeDisplayInfo *info)
+{
+  add_display (info, display);
+}
+
+/* Adds all currently open displays to our list of displays,
+ * and set up a signal connection so that we'll be notified
+ * when displays are opened in the future as well.
+ */
+static void
+initialize_displays (ChangeDisplayInfo *info)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+  GSList *displays = gdk_display_manager_list_displays (manager);
+  GSList *tmp_list;
+
+  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
+    add_display (info, tmp_list->data);
+
+  g_slist_free (tmp_list);
+
+  g_signal_connect (manager, "display-opened",
+                    G_CALLBACK (display_opened_cb), info);
+}
+
+/* Cleans up when the toplevel is destroyed; we remove the
+ * connections we use to track currently open displays, then
+ * free the ChangeDisplayInfo structure.
+ */
+static void
+destroy_info (ChangeDisplayInfo *info)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+  GSList *displays = gdk_display_manager_list_displays (manager);
+  GSList *tmp_list;
+
+  g_signal_handlers_disconnect_by_func (manager,
+                                        display_opened_cb,
+                                        info);
+
+  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
+    g_signal_handlers_disconnect_by_func (tmp_list->data,
+                                          display_closed_cb,
+                                          info);
+
+  g_slist_free (tmp_list);
+
+  g_object_unref (info->size_group);
+  g_object_unref (info->display_model);
+
+  if (info->current_display)
+    g_object_unref (info->current_display);
+
+  g_free (info);
+}
+
+static void
+destroy_cb (GObject            *object,
+            ChangeDisplayInfo **info)
+{
+  destroy_info (*info);
+  *info = NULL;
+}
+
+/* Main entry point. If the dialog for this demo doesn't yet exist, creates
+ * it. Otherwise, destroys it.
+ */
+GtkWidget *
+do_changedisplay (GtkWidget *do_widget)
+{
+  static ChangeDisplayInfo *info = NULL;
+
+  if (!info)
+    {
+      GtkWidget *content_area;
+      GtkWidget *vbox;
+      GtkWidget *frame;
+
+      info = g_new0 (ChangeDisplayInfo, 1);
+
+      info->window = gtk_dialog_new_with_buttons ("Change Display",
+                                                  GTK_WINDOW (do_widget),
+                                                  0,
+                                                  "Close", GTK_RESPONSE_CLOSE,
+                                                  "Change", GTK_RESPONSE_OK,
+                                                  NULL);
+
+      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);
+
+      g_signal_connect (info->window, "response",
+                        G_CALLBACK (response_cb), info);
+      g_signal_connect (info->window, "destroy",
+                        G_CALLBACK (destroy_cb), &info);
+
+      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
+
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      g_object_set (vbox, "margin", 8, NULL);
+      gtk_container_add (GTK_CONTAINER (content_area), vbox);
+
+      frame = create_display_frame (info);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+      initialize_displays (info);
+
+      gtk_widget_show (info->window);
+      return info->window;
+    }
+  else
+    {
+      gtk_widget_destroy (info->window);
+      return NULL;
+    }
+}

demos/gtk-demo/clipboard.c

@@ -110,7 +110,7 @@ get_image_paintable (GtkImage *image)
       icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
       if (icon_info == NULL)
         return NULL;
-      return gtk_icon_info_load_icon (icon_info, NULL);
+      return GDK_PAINTABLE (gtk_icon_info_load_texture (icon_info));
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
@@ -119,85 +119,59 @@ get_image_paintable (GtkImage *image)
 }
 
 static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag,
-            GtkWidget     *widget)
+drag_begin (GtkWidget      *widget,
+            GdkDrag        *drag,
+            gpointer        data)
 {
   GdkPaintable *paintable;
 
   paintable = get_image_paintable (GTK_IMAGE (widget));
   if (paintable)
     {
-      gtk_drag_source_set_icon (source, paintable, -2, -2);
+      gtk_drag_set_icon_paintable (drag, paintable, -2, -2);
       g_object_unref (paintable);
     }
 }
 
-static void
-get_texture (GValue   *value,
-             gpointer  data)
+void
+drag_data_get (GtkWidget        *widget,
+               GdkDrag          *drag,
+               GtkSelectionData *selection_data,
+               guint             info,
+               gpointer          data)
 {
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
+  GdkPaintable *paintable;
 
+  paintable = get_image_paintable (GTK_IMAGE (widget));
   if (GDK_IS_TEXTURE (paintable))
-    g_value_set_object (value, paintable);
-}
-
-static GdkContentProvider *
-prepare_drag (GtkDragSource *source,
-              double         x,
-              double         y,
-              GtkWidget     *image)
-{
-  return gdk_content_provider_new_with_callback (GDK_TYPE_TEXTURE, get_texture, image);
+    gtk_selection_data_set_texture (selection_data, GDK_TEXTURE (paintable));
 }
 
 static void
-got_texture (GObject *source,
-             GAsyncResult *result,
-             gpointer data)
+drag_data_received (GtkWidget        *widget,
+                    GdkDrop          *drop,
+                    GtkSelectionData *selection_data,
+                    gpointer          data)
 {
-  GdkDrop *drop = GDK_DROP (source);
-  GtkWidget *image = data;
-  const GValue *value;
-  GError *error = NULL;
-
-  value = gdk_drop_read_value_finish (drop, result, &error);
-  if (value)
+  if (gtk_selection_data_get_length (selection_data) > 0)
     {
-      GdkTexture *texture = g_value_get_object (value);
-      gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (texture));
-    }
-  else
-    {
-      g_print ("Failed to get data: %s\n", error->message);
-      g_error_free (error);
-    }
-}
+      GdkTexture *texture;
 
-static gboolean
-drag_drop (GtkDropTarget *dest,
-           GdkDrop       *drop,
-           int            x,
-           int            y,
-           GtkWidget     *widget)
-{
-  if (gdk_drop_has_value (drop, GDK_TYPE_TEXTURE))
-    {
-      gdk_drop_read_value_async (drop, GDK_TYPE_TEXTURE, G_PRIORITY_DEFAULT, NULL, got_texture, widget);
-      return TRUE;
+      texture = gtk_selection_data_get_texture (selection_data);
+      gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
+      g_object_unref (texture);
     }
-
-  return FALSE;
 }
 
 static void
-copy_image (GSimpleAction *action,
-            GVariant      *value,
-            gpointer       data)
+copy_image (GtkMenuItem *item,
+            gpointer     data)
 {
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
+  GdkClipboard *clipboard;
+  GdkPaintable *paintable;
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
+  paintable = get_image_paintable (GTK_IMAGE (data));
 
   if (GDK_IS_TEXTURE (paintable))
     gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
@@ -222,12 +196,16 @@ paste_image_received (GObject      *source,
 }
 
 static void
-paste_image (GSimpleAction *action,
-             GVariant      *value,
-             gpointer       data)
+paste_image (GtkMenuItem *item,
+             gpointer     data)
 {
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  gdk_clipboard_read_texture_async (clipboard, NULL, paste_image_received, data);
+  GdkClipboard *clipboard;
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
+  gdk_clipboard_read_texture_async (clipboard,
+                                    NULL,
+                                    paste_image_received,
+                                    data);
 }
 
 static void
@@ -237,23 +215,22 @@ pressed_cb (GtkGesture *gesture,
             double      y,
             GtkWidget  *image)
 {
-  GtkWidget *popover;
-  GMenu *menu;
-  GMenuItem *item;
+  GtkWidget *menu;
+  GtkWidget *item;
 
-  menu = g_menu_new (); 
-  item = g_menu_item_new (_("_Copy"), "clipboard.copy");
-  g_menu_append_item (menu, item);
+  menu = gtk_menu_new ();
 
-  item = g_menu_item_new (_("_Paste"), "clipboard.paste");
-  g_menu_append_item (menu, item);
+  item = gtk_menu_item_new_with_mnemonic (_("_Copy"));
+  g_signal_connect (item, "activate", G_CALLBACK (copy_image), image);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  popover = gtk_popover_menu_new_from_model (image, G_MENU_MODEL (menu));
+  item = gtk_menu_item_new_with_mnemonic (_("_Paste"));
+  g_signal_connect (item, "activate", G_CALLBACK (paste_image), image);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &(GdkRectangle) { x, y, 1, 1});
-  gtk_popover_popup (GTK_POPOVER (popover));
-
-  g_object_unref (menu);
+  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
 }
 
 GtkWidget *
@@ -266,14 +243,6 @@ do_clipboard (GtkWidget *do_widget)
       GtkWidget *entry, *button;
       GtkWidget *image;
       GtkGesture *gesture;
-      GActionEntry entries[] = {
-        { "copy", copy_image, NULL, NULL, NULL },
-        { "paste", paste_image, NULL, NULL, NULL },
-      };
-      GActionGroup *actions;
-      GtkDragSource *source;
-      GtkDropTarget *dest;
-      GdkContentFormats *formats;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_display (GTK_WINDOW (window),
@@ -332,21 +301,22 @@ do_clipboard (GtkWidget *do_widget)
 
       /* Create the first image */
       image = gtk_image_new_from_icon_name ("dialog-warning");
-      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
       gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* make image a drag source */
-      source = gtk_drag_source_new ();
-      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
-      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (image);
+      g_signal_connect (image, "drag-begin",
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (image, "drag-data-get",
+                        G_CALLBACK (drag_data_get), image);
 
       /* accept drops on image */
-      formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE);
-      dest = gtk_drop_target_new (formats, GDK_ACTION_COPY);
-      gdk_content_formats_unref (formats);
-      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
+      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
+                         NULL, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (image);
+      g_signal_connect (image, "drag-data-received",
+                        G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
       gesture = gtk_gesture_click_new ();
@@ -354,43 +324,30 @@ do_clipboard (GtkWidget *do_widget)
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
 
-      actions = G_ACTION_GROUP (g_simple_action_group_new ());
-      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
-
-      gtk_widget_insert_action_group (image, "clipboard", actions);
-
-      g_object_unref (actions);
-
       /* Create the second image */
       image = gtk_image_new_from_icon_name ("process-stop");
-      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
       gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* make image a drag source */
-      source = gtk_drag_source_new ();
-      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
-      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (image);
+      g_signal_connect (image, "drag-begin",
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (image, "drag-data-get",
+                        G_CALLBACK (drag_data_get), image);
 
       /* accept drops on image */
-      formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE);
-      dest = gtk_drop_target_new (formats, GDK_ACTION_COPY);
-      gdk_content_formats_unref (formats);
-      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
+      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
+                         NULL, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (image);
+      g_signal_connect (image, "drag-data-received",
+                        G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
       gesture = gtk_gesture_click_new ();
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
-
-      actions = G_ACTION_GROUP (g_simple_action_group_new ());
-      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
-
-      gtk_widget_insert_action_group (image, "clipboard", actions);
-
-      g_object_unref (actions);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/constraints.c

@@ -44,21 +44,20 @@ simple_grid_class_init (SimpleGridClass *klass)
 
 /* Layout:
  *
- *   +-------------------------------------+
- *   | +-----------++-------++-----------+ |
- *   | |  Child 1  || Space ||  Child 2  | |
- *   | +-----------++-------++-----------+ |
- *   | +---------------------------------+ |
- *   | |             Child 3             | |
- *   | +---------------------------------+ |
- *   +-------------------------------------+
+ *   +-----------------------------+
+ *   | +-----------+ +-----------+ |
+ *   | |  Child 1  | |  Child 2  | |
+ *   | +-----------+ +-----------+ |
+ *   | +-------------------------+ |
+ *   | |         Child 3         | |
+ *   | +-------------------------+ |
+ *   +-----------------------------+
  *
  * Constraints:
  *
  *   super.start = child1.start - 8
  *   child1.width = child2.width
- *   child1.end = space.start
- *   space.end = child2.start
+ *   child1.end = child2.start - 12
  *   child2.end = super.end - 8
  *   super.start = child3.start - 8
  *   child3.end = super.end - 8
@@ -70,12 +69,6 @@ simple_grid_class_init (SimpleGridClass *klass)
  *   child3.height = child2.height
  *   child3.bottom = super.bottom - 8
  *
- * To add some flexibility, we make the space
- * stretchable:
- *
- *   space.width >= 10
- *   space.width = 100
- *   space.width <= 200
  */
 static void
 build_constraints (SimpleGrid          *self,
@@ -88,7 +81,6 @@ build_constraints (SimpleGrid          *self,
   gtk_constraint_guide_set_min_size (guide, 10, 10);
   gtk_constraint_guide_set_nat_size (guide, 100, 10);
   gtk_constraint_guide_set_max_size (guide, 200, 20);
-  gtk_constraint_guide_set_strength (guide, GTK_CONSTRAINT_STRENGTH_STRONG);
   gtk_constraint_layout_add_guide (manager, guide);
 
   gtk_constraint_layout_add_constraint (manager,

demos/gtk-demo/constraints3.c

@@ -1,165 +0,0 @@
-/* Constraints/VFL
- *
- * GtkConstraintLayout allows defining constraints using a
- * compact syntax called Visual Format Language, or VFL.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE (VflGrid, vfl_grid, VFL, GRID, GtkWidget)
-
-struct _VflGrid
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *button1, *button2;
-  GtkWidget *button3;
-};
-
-G_DEFINE_TYPE (VflGrid, vfl_grid, GTK_TYPE_WIDGET)
-
-static void
-vfl_grid_destroy (GtkWidget *widget)
-{
-  VflGrid *self = VFL_GRID (widget);
-
-  g_clear_pointer (&self->button1, gtk_widget_destroy);
-  g_clear_pointer (&self->button2, gtk_widget_destroy);
-  g_clear_pointer (&self->button3, gtk_widget_destroy);
-
-  GTK_WIDGET_CLASS (vfl_grid_parent_class)->destroy (widget);
-}
-
-static void
-vfl_grid_class_init (VflGridClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->destroy = vfl_grid_destroy;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
-}
-
-/* Layout:
- *
- *   +-----------------------------+
- *   | +-----------+ +-----------+ |
- *   | |  Child 1  | |  Child 2  | |
- *   | +-----------+ +-----------+ |
- *   | +-------------------------+ |
- *   | |         Child 3         | |
- *   | +-------------------------+ |
- *   +-----------------------------+
- *
- * Constraints:
- *
- *   super.start = child1.start - 8
- *   child1.width = child2.width
- *   child1.end = child2.start - 12
- *   child2.end = super.end - 8
- *   super.start = child3.start - 8
- *   child3.end = super.end - 8
- *   super.top = child1.top - 8
- *   super.top = child2.top - 8
- *   child1.bottom = child3.top - 12
- *   child2.bottom = child3.top - 12
- *   child3.height = child1.height
- *   child3.height = child2.height
- *   child3.bottom = super.bottom - 8
- *
- * Visual format:
- *
- *   H:|-8-[view1(==view2)-12-[view2]-8-|
- *   H:|-8-[view3]-8-|
- *   V:|-8-[view1]-12-[view3(==view1)]-8-|
- *   V:|-8-[view2]-12-[view3(==view2)]-8-|
- */
-static void
-build_constraints (VflGrid          *self,
-                   GtkConstraintLayout *manager)
-{
-  const char * const vfl[] = {
-    "H:|-[button1(==button2)]-12-[button2]-|",
-    "H:|-[button3]-|",
-    "V:|-[button1]-12-[button3(==button1)]-|",
-    "V:|-[button2]-12-[button3(==button2)]-|",
-  };
-  GError *error = NULL;
-
-  gtk_constraint_layout_add_constraints_from_description (manager, vfl, G_N_ELEMENTS (vfl),
-                                                          8, 8,
-                                                          &error,
-                                                          "button1", self->button1,
-                                                          "button2", self->button2,
-                                                          "button3", self->button3,
-                                                          NULL);
-  if (error != NULL)
-    {
-      g_printerr ("VFL parsing error:\n%s", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-vfl_grid_init (VflGrid *self)
-{
-  GtkWidget *widget = GTK_WIDGET (self);
-
-  self->button1 = gtk_button_new_with_label ("Child 1");
-  gtk_widget_set_parent (self->button1, widget);
-  gtk_widget_set_name (self->button1, "button1");
-
-  self->button2 = gtk_button_new_with_label ("Child 2");
-  gtk_widget_set_parent (self->button2, widget);
-  gtk_widget_set_name (self->button2, "button2");
-
-  self->button3 = gtk_button_new_with_label ("Child 3");
-  gtk_widget_set_parent (self->button3, widget);
-  gtk_widget_set_name (self->button3, "button3");
-
-  GtkLayoutManager *manager = gtk_widget_get_layout_manager (GTK_WIDGET (self));
-  build_constraints (self, GTK_CONSTRAINT_LAYOUT (manager));
-}
-
-GtkWidget *
-do_constraints3 (GtkWidget *do_widget)
-{
- static GtkWidget *window;
-
- if (!window)
-   {
-     GtkWidget *header, *box, *grid, *button;
-
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-     gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-
-     header = gtk_header_bar_new ();
-     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
-     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
-
-     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
-
-     grid = g_object_new (vfl_grid_get_type (), NULL);
-     gtk_widget_set_hexpand (grid, TRUE);
-     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
-
-     button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
-     gtk_widget_set_hexpand (grid, TRUE);
-     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
-   }
-
- if (!gtk_widget_get_visible (window))
-   gtk_widget_show (window);
- else
-   gtk_widget_destroy (window);
-
- return window;
-}

demos/gtk-demo/cursors.c

@@ -24,6 +24,7 @@ do_cursors (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/demo.gresource.xml

@@ -104,9 +104,6 @@
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
   </gresource>
-  <gresource prefix="/iconscroll">
-    <file>iconscroll.ui</file>
-  </gresource>
   <gresource prefix="/iconview">
     <file>gnome-fs-directory.png</file>
     <file>gnome-fs-regular.png</file>
@@ -149,12 +146,12 @@
     <file>application_demo.c</file>
     <file>assistant.c</file>
     <file>builder.c</file>
+    <file>changedisplay.c</file>
     <file>clipboard.c</file>
     <file>colorsel.c</file>
     <file>combobox.c</file>
     <file>constraints.c</file>
     <file>constraints2.c</file>
-    <file>constraints3.c</file>
     <file>css_accordion.c</file>
     <file>css_basics.c</file>
     <file>css_blendmodes.c</file>
@@ -166,8 +163,8 @@
     <file>drawingarea.c</file>
     <file>dnd.c</file>
     <file>editable_cells.c</file>
+    <file>entry_buffer.c</file>
     <file>entry_completion.c</file>
-    <file>entry_undo.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>fishbowl.c</file>
@@ -176,12 +173,10 @@
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>
     <file>fontplane.c</file>
-    <file>fontrendering.c</file>
     <file>gestures.c</file>
     <file>glarea.c</file>
     <file>headerbar.c</file>
     <file>hypertext.c</file>
-    <file>iconscroll.c</file>
     <file>iconview.c</file>
     <file>iconview_edit.c</file>
     <file>images.c</file>
@@ -190,6 +185,7 @@
     <file>listbox.c</file>
     <file>list_store.c</file>
     <file>markup.c</file>
+    <file>menus.c</file>
     <file>modelbutton.c</file>
     <file>overlay.c</file>
     <file>overlay2.c</file>
@@ -218,7 +214,6 @@
     <file>spinner.c</file>
     <file>tabs.c</file>
     <file>tagged_entry.c</file>
-    <file>textundo.c</file>
     <file>textview.c</file>
     <file>textscroll.c</file>
     <file>theming_style_classes.c</file>
@@ -285,9 +280,6 @@
   <gresource prefix="/fixed">
     <file>fixed.css</file>
   </gresource>
-  <gresource prefix="/fontrendering">
-    <file>fontrendering.ui</file>
-  </gresource>
   <gresource prefix="/org/gtk/Demo4">
     <file>icons/16x16/actions/application-exit.png</file>
     <file>icons/16x16/actions/document-new.png</file>

demos/gtk-demo/demo.ui

@@ -22,75 +22,6 @@
       </row>
     </data>
   </object>
-  <menu id="menubar">
-    <submenu>
-      <attribute name="label" translatable="yes">_File</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_New</attribute>
-          <attribute name="action">win.new</attribute>
-          <attribute name="accel">&lt;Primary&gt;n</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Open</attribute>
-          <attribute name="action">win.open</attribute>
-          <attribute name="accel">&lt;Primary&gt;o</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Save</attribute>
-          <attribute name="action">win.save</attribute>
-          <attribute name="accel">&lt;Primary&gt;s</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save _As</attribute>
-          <attribute name="action">win.save-as</attribute>
-          <attribute name="accel">&lt;Primary&gt;q</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Quit</attribute>
-          <attribute name="action">win.quit</attribute>
-          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Edit</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Copy</attribute>
-          <attribute name="action">win.copy</attribute>
-          <attribute name="accel">&lt;Primary&gt;c</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Cut</attribute>
-          <attribute name="action">win.cut</attribute>
-          <attribute name="accel">&lt;Primary&gt;x</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Paste</attribute>
-          <attribute name="action">win.paste</attribute>
-          <attribute name="accel">&lt;Primary&gt;v</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Help</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Help</attribute>
-          <attribute name="action">win.help</attribute>
-          <attribute name="accel">F1</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">win.about</attribute>
-          <attribute name="accel">F7</attribute>
-        </item>
-      </section>
-    </submenu>
-  </menu>
   <object class="GtkAboutDialog" id="aboutdialog1">
     <property name="program-name" translatable="yes">Builder demo</property>
     <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
@@ -106,8 +37,109 @@
       <object class="GtkBox" id="vbox1">
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkPopoverMenuBar" id="menubar1">
-            <property name="menu-model">menubar</property>
+          <object class="GtkMenuBar" id="menubar1">
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-menubar">
+                <property name="AtkObject::accessible-name">The menubar</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="label" translatable="yes">_File</property>
+                <property name="use-underline">1</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="new_item">
+                        <property name="label" translatable="yes">_New</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="open_item">
+                        <property name="label" translatable="yes">_Open</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="save_item">
+                        <property name="label" translatable="yes">_Save</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="save_as_item">
+                        <property name="label" translatable="yes">Save _As</property>
+                        <property name="use-underline">1</property>
+                        <accelerator key="s" modifiers="primary | shift-mask" signal="activate"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem"/>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="quit_item">
+                        <property name="label" translatable="yes">_Quit</property>
+                        <property name="use-underline">1</property>
+                        <property name="action-name">win.quit</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use-underline">1</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="copy_item">
+                        <property name="label" translatable="yes">_Copy</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="cut_item">
+                        <property name="label" translatable="yes">_Cut</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="paste_item">
+                        <property name="label" translatable="yes">_Paste</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use-underline">1</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="help_item">
+                        <property name="label" translatable="yes">_Help</property>
+                        <property name="use-underline">1</property>
+                        <property name="action-name">win.help</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="about_item">
+                        <property name="label" translatable="yes">_About</property>
+                        <property name="use-underline">1</property>
+                        <property name="action-name">win.about</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
         <child>

demos/gtk-demo/demotaggedentry.c

@@ -129,13 +129,13 @@ demo_tagged_entry_size_allocate (GtkWidget *widget,
                             baseline);
 }
 
-static gboolean
+static void
 demo_tagged_entry_grab_focus (GtkWidget *widget)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
   DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
 
-  return gtk_widget_grab_focus (priv->entry);
+  gtk_widget_grab_focus (priv->entry);
 }
 
 static void

demos/gtk-demo/dnd.c

@@ -1,8 +1,6 @@
 /* Drag-and-Drop
  *
  * I can't believe its not glade!
- *
- * Try right-clicking in the window.
  */
 
 #include <glib/gi18n.h>
@@ -94,7 +92,7 @@ deserialize_widget (GtkDemoWidget *demo)
 static double pos_x, pos_y;
 
 static void
-new_label_cb (GtkWidget *button,
+new_label_cb (GtkMenuItem *item,
               gpointer     data)
 {
   GtkFixed *fixed = data;
@@ -102,12 +100,10 @@ new_label_cb (GtkWidget *button,
 
   widget = gtk_label_new ("Label");
   gtk_fixed_put (fixed, widget, pos_x, pos_y);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-new_spinner_cb (GtkWidget *button,
+new_spinner_cb (GtkMenuItem *item,
                 gpointer     data)
 {
   GtkFixed *fixed = data;
@@ -117,39 +113,33 @@ new_spinner_cb (GtkWidget *button,
   gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
   gtk_spinner_start (GTK_SPINNER (widget));
   gtk_fixed_put (fixed, widget, pos_x, pos_y);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-copy_cb (GtkWidget *button, GtkWidget *child)
+copy_cb (GtkWidget *child)
 {
   GdkClipboard *clipboard;
   GtkDemoWidget *demo;
 
+  g_print ("Copy %s\n", G_OBJECT_TYPE_NAME (child));
+
   demo = serialize_widget (child);
 
   clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
   gdk_clipboard_set (clipboard, GTK_TYPE_DEMO_WIDGET, demo);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-delete_cb (GtkWidget *button, GtkWidget *child)
+delete_cb (GtkWidget *child)
 {
   gtk_widget_destroy (child);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-cut_cb (GtkWidget *button, GtkWidget *child)
+cut_cb (GtkWidget *child)
 {
-  copy_cb (button, child);
-  delete_cb (button, child);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+  copy_cb (child);
+  delete_cb (child);
 }
 
 static void
@@ -185,7 +175,7 @@ value_read (GObject      *source,
 }
 
 static void
-paste_cb (GtkWidget *button, GtkWidget *fixed)
+paste_cb (GtkWidget *fixed)
 {
   GdkClipboard *clipboard;
 
@@ -197,8 +187,6 @@ paste_cb (GtkWidget *button, GtkWidget *fixed)
     }
   else
     g_print ("Don't know how to handle clipboard contents\n");
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
@@ -217,7 +205,7 @@ edit_label_done (GtkWidget *entry, gpointer data)
 }
 
 static void
-edit_cb (GtkWidget *button, GtkWidget *child)
+edit_cb (GtkWidget *child)
 {
   GtkWidget *fixed = gtk_widget_get_parent (child);
   int x, y;
@@ -231,7 +219,6 @@ edit_cb (GtkWidget *button, GtkWidget *child)
       g_object_set_data (G_OBJECT (entry), "label", child);
 
       gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child)));
-      gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
       g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
       gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
       gtk_widget_grab_focus (entry);
@@ -243,9 +230,6 @@ edit_cb (GtkWidget *button, GtkWidget *child)
       g_object_get (child, "active", &active, NULL);
       g_object_set (child, "active", !active, NULL);
     }
-
-  if (button)
-    gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
@@ -263,65 +247,65 @@ pressed_cb (GtkGesture *gesture,
 
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
     {
+      GdkRectangle rect;
       GtkWidget *menu;
-      GtkWidget *box;
       GtkWidget *item;
       GdkClipboard *clipboard;
 
       pos_x = x;
       pos_y = y;
 
-      menu = gtk_popover_new (widget);
-      gtk_popover_set_has_arrow (GTK_POPOVER (menu), FALSE);
-      gtk_popover_set_pointing_to (GTK_POPOVER (menu), &(GdkRectangle){ x, y, 1, 1});
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (menu), box);
+      menu = gtk_menu_new ();
+      item = gtk_menu_item_new_with_label ("New Label");
+      g_signal_connect (item, "activate", G_CALLBACK (new_label_cb), widget);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("New Spinner");
+      g_signal_connect (item, "activate", G_CALLBACK (new_spinner_cb), widget);
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_button_new_with_label ("New Label");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      g_signal_connect (item, "clicked", G_CALLBACK (new_label_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("New Spinner");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      g_signal_connect (item, "clicked", G_CALLBACK (new_spinner_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_separator_menu_item_new ();
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
-
-      item = gtk_button_new_with_label ("Edit");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      item = gtk_menu_item_new_with_label ("Edit");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (edit_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_separator_menu_item_new ();
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_button_new_with_label ("Cut");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      item = gtk_menu_item_new_with_label ("Cut");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (cut_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Copy");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (cut_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("Copy");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (copy_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Paste");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (copy_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("Paste");
       clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
       gtk_widget_set_sensitive (item,
                                 gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
-      g_signal_connect (item, "clicked", G_CALLBACK (paste_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Delete");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (paste_cb), widget);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("Delete");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (delete_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      gtk_popover_popup (GTK_POPOVER (menu));
+      rect.x = x;
+      rect.y = y;
+      rect.width = 0;
+      rect.height = 0;
+
+      gtk_menu_popup_at_rect (GTK_MENU (menu),
+                              gtk_native_get_surface (gtk_widget_get_native (widget)),
+                              &rect,
+                              GDK_GRAVITY_NORTH_WEST,
+                              GDK_GRAVITY_NORTH_WEST,
+                              NULL);
+
+      return;
     }
 }
 
@@ -341,7 +325,7 @@ released_cb (GtkGesture *gesture,
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
     {
       if (child != NULL && child != widget)
-        edit_cb (NULL, child);
+        edit_cb (child);
     }
 }
 

demos/gtk-demo/entry_buffer.c

@@ -1,29 +1,28 @@
-/* Entry/Entry Undo
+/* Entry/Entry Buffer
  *
- * GtkEntry can provide basic Undo/Redo support using standard keyboard
- * accelerators such as Primary+z to undo and Primary+Shift+z to redo.
- * Additionally, Primary+y can be used to redo.
- *
- * Use gtk_entry_set_enable_undo() to enable undo/redo support.
+ * GtkEntryBuffer provides the text content in a GtkEntry.
+ * Applications can provide their own buffer implementation,
+ * e.g. to provide secure handling for passwords in memory.
  */
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 GtkWidget *
-do_entry_undo (GtkWidget *do_widget)
+do_entry_buffer (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
+  GtkEntryBuffer *buffer;
 
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Buffer");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -34,13 +33,22 @@ do_entry_undo (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "Use Primary+z or Primary+Shift+z to undo or redo changes");
+                            "Entries share a buffer. Typing in one is reflected in the other.");
       gtk_container_add (GTK_CONTAINER (vbox), label);
 
-      /* Create our entry */
-      entry = gtk_entry_new ();
-      gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
+      /* Create a buffer */
+      buffer = gtk_entry_buffer_new (NULL, 0);
+
+      /* Create our first entry */
+      entry = gtk_entry_new_with_buffer (buffer);
       gtk_container_add (GTK_CONTAINER (vbox), entry);
+
+      /* Create the second entry */
+      entry = gtk_entry_new_with_buffer (buffer);
+      gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);
+
+      g_object_unref (buffer);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/expander.c

@@ -52,7 +52,7 @@ do_expander (GtkWidget *do_widget)
       area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
 
       label = gtk_widget_get_last_child (area);
-      gtk_label_set_wrap (GTK_LABEL (label), FALSE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), FALSE);
       gtk_widget_set_vexpand (label, FALSE);
 
       expander = gtk_expander_new ("Details:");

demos/gtk-demo/filtermodel.c

@@ -122,6 +122,7 @@ do_filtermodel (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/filtermodel/filtermodel.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/fishbowl.c

@@ -124,7 +124,7 @@ create_label (void)
 {
   GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
 
-  gtk_label_set_wrap (GTK_LABEL (w), TRUE);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
   gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
 
   return w;
@@ -226,8 +226,8 @@ set_widget_type (GtkFishbowl *fishbowl,
 }
 
 void
-fishbowl_next_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+next_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -241,8 +241,8 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
 }
 
 void
-fishbowl_prev_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+prev_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -256,8 +256,8 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
 }
 
 void
-fishbowl_changes_toggled_cb (GtkToggleButton *button,
-                             gpointer         user_data)
+changes_toggled_cb (GtkToggleButton *button,
+                    gpointer         user_data)
 {
   if (gtk_toggle_button_get_active (button))
     gtk_button_set_icon_name (GTK_BUTTON (button), "changes-prevent");
@@ -288,6 +288,12 @@ do_fishbowl (GtkWidget *do_widget)
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
       builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
+                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
+                                        "changes_toggled_cb", G_CALLBACK (changes_toggled_cb),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -300,7 +306,6 @@ do_fishbowl (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_widget_realize (window);
-      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/fishbowl.ui

@@ -15,13 +15,13 @@
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="fishbowl_prev_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="fishbowl_next_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
           </object>
@@ -50,7 +50,7 @@
           <object class="GtkToggleButton" id="changes_allow">
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
-            <signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
+            <signal name="notify::active" handler="changes_toggled_cb"/>
           </object>
         </child>
       </object>

demos/gtk-demo/font-features.ui

@@ -13,7 +13,7 @@
             <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="tooltip-text">Reset</property>
-            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
+            <signal name="clicked" handler="reset" swapped="no"/>
             <child>
               <object class="GtkImage">
                 <property name="icon-name">view-refresh-symbolic</property>
@@ -42,7 +42,7 @@
                         <property name="receives-default">1</property>
                         <property name="font">Sans 12</property>
                         <property name="level">family|style|size|variations|features</property>
-                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
+                        <signal name="font-set" handler="font_changed" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -63,7 +63,7 @@
                               <object class="GtkComboBox" id="script_lang">
                                 <property name="can-focus">1</property>
                                 <property name="margin-top">10</property>
-                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
+                                <signal name="changed" handler="script_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -137,7 +137,7 @@
 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
 
 Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
-                        <signal name="activate" handler="font_features_stop_edit"/>
+                        <signal name="activate" handler="stop_edit"/>
                         <property name="valign">start</property>
                         <property name="width-chars">50</property>
                       </object>
@@ -181,7 +181,7 @@
                     <property name="icon-name">document-edit-symbolic</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
-                    <signal name="toggled" handler="font_features_toggle_edit"/>
+                    <signal name="toggled" handler="toggle_edit"/>
                   </object>
                 </child>
               </object>

demos/gtk-demo/font_features.c

@@ -15,6 +15,10 @@
 #include <pango/pangofc-font.h>
 #include <hb.h>
 #include <hb-ot.h>
+#include <hb-ft.h>
+#include <freetype/ftmm.h>
+#include <freetype/ftsnames.h>
+#include <freetype/ttnameid.h>
 #include <glib/gi18n.h>
 
 #include "open-type-layout.h"
@@ -480,6 +484,7 @@ update_script_combo (void)
   GtkListStore *store;
   hb_font_t *hb_font;
   gint i, j, k;
+  FT_Face ft_face;
   PangoFont *pango_font;
   GHashTable *tags;
   GHashTableIter iter;
@@ -500,7 +505,8 @@ update_script_combo (void)
   store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
 
   pango_font = get_pango_font ();
-  hb_font = pango_font_get_hb_font (pango_font);
+  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
+  hb_font = hb_ft_font_create (ft_face, NULL);
 
   tags = g_hash_table_new_full (tag_pair_hash, tag_pair_equal, g_free, NULL);
 
@@ -539,8 +545,11 @@ update_script_combo (void)
                 }
             }
         }
+
+      hb_face_destroy (hb_face);
     }
 
+  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
   g_object_unref (pango_font);
 
   g_hash_table_iter_init (&iter, tags);
@@ -598,6 +607,7 @@ update_features (void)
   GtkTreeIter iter;
   guint script_index, lang_index;
   PangoFont *pango_font;
+  FT_Face ft_face;
   hb_font_t *hb_font;
   GList *l;
 
@@ -622,7 +632,8 @@ update_features (void)
                       -1);
 
   pango_font = get_pango_font ();
-  hb_font = pango_font_get_hb_font (pango_font);
+  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
+  hb_font = hb_ft_font_create (ft_face, NULL);
 
   if (hb_font)
     {
@@ -704,8 +715,11 @@ update_features (void)
 
           g_free (feat);
         }
+
+      hb_face_destroy (hb_face);
     }
 
+  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
   g_object_unref (pango_font);
 }
 
@@ -786,29 +800,24 @@ axes_equal (gconstpointer v1, gconstpointer v2)
 }
 
 static void
-add_axis (hb_face_t             *hb_face,
-          hb_ot_var_axis_info_t *ax,
-          float                  value,
-          int                    i)
+add_axis (FT_Var_Axis *ax, FT_Fixed value, int i)
 {
   GtkWidget *axis_label;
   GtkWidget *axis_entry;
   GtkWidget *axis_scale;
   GtkAdjustment *adjustment;
   Axis *axis;
-  char name[20];
-  unsigned int name_len = 20;
 
-  hb_ot_name_get_utf8 (hb_face, ax->name_id, HB_LANGUAGE_INVALID, &name_len, name);
-
-  axis_label = gtk_label_new (name);
+  axis_label = gtk_label_new (ax->name);
   gtk_widget_set_halign (axis_label, GTK_ALIGN_START);
   gtk_widget_set_valign (axis_label, GTK_ALIGN_BASELINE);
   gtk_grid_attach (GTK_GRID (variations_grid), axis_label, 0, i, 1, 1);
-  adjustment = gtk_adjustment_new (value, ax->min_value, ax->max_value,
+  adjustment = gtk_adjustment_new ((double)FixedToFloat(value),
+                                   (double)FixedToFloat(ax->minimum),
+                                   (double)FixedToFloat(ax->maximum),
                                    1.0, 10.0, 0.0);
   axis_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
-  gtk_scale_add_mark (GTK_SCALE (axis_scale), ax->default_value, GTK_POS_TOP, NULL);
+  gtk_scale_add_mark (GTK_SCALE (axis_scale), (double)FixedToFloat(ax->def), GTK_POS_TOP, NULL);
   gtk_widget_set_valign (axis_scale, GTK_ALIGN_BASELINE);
   gtk_widget_set_hexpand (axis_scale, TRUE);
   gtk_widget_set_size_request (axis_scale, 100, -1);
@@ -833,7 +842,9 @@ add_axis (hb_face_t             *hb_face,
 
 typedef struct {
   char *name;
-  unsigned int index;
+  int n_axes;
+  guint32 *axes;
+  float   *coords;
 } Instance;
 
 static guint
@@ -859,32 +870,559 @@ free_instance (gpointer data)
   Instance *instance = data;
 
   g_free (instance->name);
+  g_free (instance->axes);
+  g_free (instance->coords);
   g_free (instance);
 }
 
 static GHashTable *instances;
 
+typedef struct {
+    const FT_UShort     platform_id;
+    const FT_UShort     encoding_id;
+    const char  fromcode[12];
+} FtEncoding;
+
+#define TT_ENCODING_DONT_CARE   0xffff
+
+static const FtEncoding   ftEncoding[] = {
+ {  TT_PLATFORM_APPLE_UNICODE,  TT_ENCODING_DONT_CARE,  "UTF-16BE" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_ID_ROMAN,        "MACINTOSH" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_ID_JAPANESE,     "SJIS" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_SYMBOL_CS,     "UTF-16BE" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_UNICODE_CS,    "UTF-16BE" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_SJIS,          "SJIS-WIN" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_GB2312,        "GB2312" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_BIG_5,         "BIG-5" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_WANSUNG,       "Wansung" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_JOHAB,         "Johab" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_UCS_4,         "UTF-16BE" },
+ {  TT_PLATFORM_ISO,            TT_ISO_ID_7BIT_ASCII,   "ASCII" },
+ {  TT_PLATFORM_ISO,            TT_ISO_ID_10646,        "UTF-16BE" },
+ {  TT_PLATFORM_ISO,            TT_ISO_ID_8859_1,       "ISO-8859-1" },
+};
+
+typedef struct {
+    const FT_UShort     platform_id;
+    const FT_UShort     language_id;
+    const char  lang[8];
+} FtLanguage;
+
+#define TT_LANGUAGE_DONT_CARE   0xffff
+
+static const FtLanguage   ftLanguage[] = {
+ {  TT_PLATFORM_APPLE_UNICODE,  TT_LANGUAGE_DONT_CARE,              "" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ENGLISH,              "en" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FRENCH,               "fr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GERMAN,               "de" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ITALIAN,              "it" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_DUTCH,                "nl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SWEDISH,              "sv" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SPANISH,              "es" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_DANISH,               "da" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_PORTUGUESE,           "pt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_NORWEGIAN,            "no" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_HEBREW,               "he" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_JAPANESE,             "ja" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ARABIC,               "ar" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FINNISH,              "fi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GREEK,                "el" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ICELANDIC,            "is" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALTESE,              "mt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TURKISH,              "tr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CROATIAN,             "hr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CHINESE_TRADITIONAL,  "zh-tw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_URDU,                 "ur" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_HINDI,                "hi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_THAI,                 "th" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KOREAN,               "ko" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LITHUANIAN,           "lt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_POLISH,               "pl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_HUNGARIAN,            "hu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ESTONIAN,             "et" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LETTISH,              "lv" },
+/* {  TT_PLATFORM_MACINTOSH,    TT_MAC_LANGID_SAAMISK, ??? */
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FAEROESE,             "fo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FARSI,                "fa" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_RUSSIAN,              "ru" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CHINESE_SIMPLIFIED,   "zh-cn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FLEMISH,              "nl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_IRISH,                "ga" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ALBANIAN,             "sq" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ROMANIAN,             "ro" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CZECH,                "cs" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SLOVAK,               "sk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SLOVENIAN,            "sl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_YIDDISH,              "yi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SERBIAN,              "sr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MACEDONIAN,           "mk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BULGARIAN,            "bg" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_UKRAINIAN,            "uk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BYELORUSSIAN,         "be" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_UZBEK,                "uz" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KAZAKH,               "kk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI,          "az" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI_CYRILLIC_SCRIPT, "az" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI_ARABIC_SCRIPT,    "ar" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ARMENIAN,             "hy" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GEORGIAN,             "ka" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MOLDAVIAN,            "mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KIRGHIZ,              "ky" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TAJIKI,               "tg" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TURKMEN,              "tk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MONGOLIAN,            "mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MONGOLIAN_MONGOLIAN_SCRIPT,"mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MONGOLIAN_CYRILLIC_SCRIPT, "mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_PASHTO,               "ps" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KURDISH,              "ku" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KASHMIRI,             "ks" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SINDHI,               "sd" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TIBETAN,              "bo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_NEPALI,               "ne" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SANSKRIT,             "sa" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MARATHI,              "mr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BENGALI,              "bn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ASSAMESE,             "as" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GUJARATI,             "gu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_PUNJABI,              "pa" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ORIYA,                "or" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAYALAM,            "ml" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KANNADA,              "kn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TAMIL,                "ta" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TELUGU,               "te" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SINHALESE,            "si" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BURMESE,              "my" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KHMER,                "km" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LAO,                  "lo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_VIETNAMESE,           "vi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_INDONESIAN,           "id" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TAGALOG,              "tl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAY_ROMAN_SCRIPT,   "ms" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAY_ARABIC_SCRIPT,  "ms" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AMHARIC,              "am" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TIGRINYA,             "ti" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GALLA,                "om" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SOMALI,               "so" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SWAHILI,              "sw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_RUANDA,               "rw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_RUNDI,                "rn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CHEWA,                "ny" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAGASY,             "mg" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ESPERANTO,            "eo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_WELSH,                "cy" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BASQUE,               "eu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CATALAN,              "ca" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LATIN,                "la" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_QUECHUA,              "qu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GUARANI,              "gn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AYMARA,               "ay" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TATAR,                "tt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_UIGHUR,               "ug" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_DZONGKHA,             "dz" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_JAVANESE,             "jw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SUNDANESE,            "su" },
+
+#if 0  /* these seem to be errors that have been dropped */
+
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SCOTTISH_GAELIC },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_IRISH_GAELIC },
+
+#endif
+
+  /* The following codes are new as of 2000-03-10 */
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GALICIAN,             "gl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AFRIKAANS,            "af" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BRETON,               "br" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_INUKTITUT,            "iu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SCOTTISH_GAELIC,      "gd" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MANX_GAELIC,          "gv" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_IRISH_GAELIC,         "ga" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TONGAN,               "to" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GREEK_POLYTONIC,      "el" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GREELANDIC,           "ik" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT,"az" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_SAUDI_ARABIA,       "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_IRAQ,               "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_EGYPT,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_LIBYA,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_ALGERIA,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_MOROCCO,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_TUNISIA,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_OMAN,               "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_YEMEN,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_SYRIA,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_JORDAN,             "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_LEBANON,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_KUWAIT,             "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_UAE,                "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_BAHRAIN,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_QATAR,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BULGARIAN_BULGARIA,        "bg" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CATALAN_SPAIN,             "ca" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_TAIWAN,            "zh-tw" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_PRC,               "zh-cn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_HONG_KONG,         "zh-hk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_SINGAPORE,         "zh-sg" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_MACAU,             "zh-mo" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CZECH_CZECH_REPUBLIC,      "cs" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DANISH_DENMARK,            "da" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_GERMANY,            "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_SWITZERLAND,        "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_AUSTRIA,            "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_LUXEMBOURG,         "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_LIECHTENSTEI,       "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GREEK_GREECE,              "el" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_UNITED_STATES,     "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_UNITED_KINGDOM,    "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_AUSTRALIA,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_CANADA,            "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_NEW_ZEALAND,       "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_IRELAND,           "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_SOUTH_AFRICA,      "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_JAMAICA,           "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_CARIBBEAN,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_BELIZE,            "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_TRINIDAD,          "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_ZIMBABWE,          "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_PHILIPPINES,       "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT,"es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_MEXICO,            "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT,"es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_GUATEMALA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_COSTA_RICA,        "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PANAMA,            "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC,"es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_VENEZUELA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_COLOMBIA,          "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PERU,              "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_ARGENTINA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_ECUADOR,           "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_CHILE,             "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_URUGUAY,           "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PARAGUAY,          "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_BOLIVIA,           "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_EL_SALVADOR,       "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_HONDURAS,          "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_NICARAGUA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PUERTO_RICO,       "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FINNISH_FINLAND,           "fi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_FRANCE,             "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_BELGIUM,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_CANADA,             "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_SWITZERLAND,        "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_LUXEMBOURG,         "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_MONACO,             "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HEBREW_ISRAEL,             "he" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HUNGARIAN_HUNGARY,         "hu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ICELANDIC_ICELAND,         "is" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ITALIAN_ITALY,             "it" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ITALIAN_SWITZERLAND,       "it" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_JAPANESE_JAPAN,            "ja" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA,"ko" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KOREAN_JOHAB_KOREA,        "ko" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DUTCH_NETHERLANDS,         "nl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DUTCH_BELGIUM,             "nl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL,   "no" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK,  "nn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_POLISH_POLAND,             "pl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PORTUGUESE_BRAZIL,         "pt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PORTUGUESE_PORTUGAL,       "pt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND,"rm" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ROMANIAN_ROMANIA,          "ro" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MOLDAVIAN_MOLDAVIA,        "mo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_RUSSIAN_RUSSIA,            "ru" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_RUSSIAN_MOLDAVIA,          "ru" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CROATIAN_CROATIA,          "hr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SERBIAN_SERBIA_LATIN,      "sr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC,   "sr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SLOVAK_SLOVAKIA,           "sk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ALBANIAN_ALBANIA,          "sq" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SWEDISH_SWEDEN,            "sv" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SWEDISH_FINLAND,           "sv" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_THAI_THAILAND,             "th" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TURKISH_TURKEY,            "tr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_URDU_PAKISTAN,             "ur" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_INDONESIAN_INDONESIA,      "id" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_UKRAINIAN_UKRAINE,         "uk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BELARUSIAN_BELARUS,        "be" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SLOVENE_SLOVENIA,          "sl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ESTONIAN_ESTONIA,          "et" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LATVIAN_LATVIA,            "lv" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LITHUANIAN_LITHUANIA,      "lt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA,"lt" },
+
+#ifdef TT_MS_LANGID_MAORI_NEW_ZELAND
+    /* this seems to be an error that have been dropped */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MAORI_NEW_ZEALAND,         "mi" },
+#endif
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FARSI_IRAN,                "fa" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_VIETNAMESE_VIET_NAM,       "vi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARMENIAN_ARMENIA,          "hy" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN,    "az" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC, "az" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BASQUE_SPAIN,              "eu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SORBIAN_GERMANY,           "wen" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MACEDONIAN_MACEDONIA,      "mk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SUTU_SOUTH_AFRICA,         "st" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TSONGA_SOUTH_AFRICA,       "ts" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TSWANA_SOUTH_AFRICA,       "tn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_VENDA_SOUTH_AFRICA,        "ven" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_XHOSA_SOUTH_AFRICA,        "xh" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ZULU_SOUTH_AFRICA,         "zu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA,    "af" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GEORGIAN_GEORGIA,          "ka" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS,   "fo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HINDI_INDIA,               "hi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALTESE_MALTA,             "mt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SAAMI_LAPONIA,             "se" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM,"gd" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_IRISH_GAELIC_IRELAND,      "ga" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALAY_MALAYSIA,            "ms" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM,   "ms" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KAZAK_KAZAKSTAN,           "kk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SWAHILI_KENYA,             "sw" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN,    "uz" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC, "uz" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TATAR_TATARSTAN,           "tt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BENGALI_INDIA,             "bn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PUNJABI_INDIA,             "pa" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GUJARATI_INDIA,            "gu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ORIYA_INDIA,               "or" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAMIL_INDIA,               "ta" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TELUGU_INDIA,              "te" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KANNADA_INDIA,             "kn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALAYALAM_INDIA,           "ml" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ASSAMESE_INDIA,            "as" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MARATHI_INDIA,             "mr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SANSKRIT_INDIA,            "sa" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KONKANI_INDIA,             "kok" },
+
+  /* new as of 2001-01-01 */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_GENERAL,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_GENERAL,           "zh" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_GENERAL,           "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_WEST_INDIES,        "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_REUNION,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_CONGO,              "fr" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_SENEGAL,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_CAMEROON,           "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_COTE_D_IVOIRE,      "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_MALI,               "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA,"bs" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_URDU_INDIA,                "ur" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAJIK_TAJIKISTAN,          "tg" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_YIDDISH_GERMANY,           "yi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN,       "ky" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TURKMEN_TURKMENISTAN,      "tk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MONGOLIAN_MONGOLIA,        "mn" },
+
+  /* the following seems to be inconsistent;
+     here is the current "official" way: */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIBETAN_BHUTAN,            "bo" },
+  /* and here is what is used by Passport SDK */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIBETAN_CHINA,             "bo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DZONGHKA_BHUTAN,           "dz" },
+  /* end of inconsistency */
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_WELSH_WALES,               "cy" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KHMER_CAMBODIA,            "km" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LAO_LAOS,                  "lo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BURMESE_MYANMAR,           "my" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GALICIAN_SPAIN,            "gl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MANIPURI_INDIA,            "mni" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SINDHI_INDIA,              "sd" },
+  /* the following one is only encountered in Microsoft RTF specification */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KASHMIRI_PAKISTAN,         "ks" },
+  /* the following one is not in the Passport list, looks like an omission */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KASHMIRI_INDIA,            "ks" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NEPALI_NEPAL,              "ne" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NEPALI_INDIA,              "ne" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRISIAN_NETHERLANDS,       "fy" },
+
+  /* new as of 2001-03-01 (from Office Xp) */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_HONG_KONG,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_INDIA,             "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_MALAYSIA,          "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_SINGAPORE,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SYRIAC_SYRIA,              "syr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SINHALESE_SRI_LANKA,       "si" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHEROKEE_UNITED_STATES,    "chr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_INUKTITUT_CANADA,          "iu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AMHARIC_ETHIOPIA,          "am" },
+#if 0
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAMAZIGHT_MOROCCO },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN },
+#endif
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PASHTO_AFGHANISTAN,        "ps" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FILIPINO_PHILIPPINES,      "phi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DHIVEHI_MALDIVES,          "div" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_OROMO_ETHIOPIA,            "om" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIGRIGNA_ETHIOPIA,         "ti" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIGRIGNA_ERYTHREA,         "ti" },
+
+  /* New additions from Windows Xp/Passport SDK 2001-11-10. */
+
+  /* don't ask what this one means... It is commented out currently. */
+#if 0
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GREEK_GREECE2 },
+#endif
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_UNITED_STATES,     "es" },
+  /* The following two IDs blatantly violate MS specs by using a */
+  /* sublanguage >,.                                         */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_LATIN_AMERICA,     "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_NORTH_AFRICA,       "fr" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_MOROCCO,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_HAITI,              "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BENGALI_BANGLADESH,        "bn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN,   "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN,"mn" },
+#if 0
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_EDO_NIGERIA },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FULFULDE_NIGERIA },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_IBIBIO_NIGERIA },
+#endif
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HAUSA_NIGERIA,             "ha" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_YORUBA_NIGERIA,            "yo" },
+  /* language codes from, to, are (still) unknown. */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_IGBO_NIGERIA,              "ibo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KANURI_NIGERIA,            "kau" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GUARANI_PARAGUAY,          "gn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HAWAIIAN_UNITED_STATES,    "haw" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LATIN,                     "la" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SOMALI_SOMALIA,            "so" },
+#if 0
+  /* Note: Yi does not have a (proper) ISO 639-2 code, since it is mostly */
+  /*       not written (but OTOH the peculiar writing system is worth     */
+  /*       studying).                                                     */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_YI_CHINA },
+#endif
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES,"pap" },
+};
+
+static const char *
+FcSfntNameLanguage (FT_SfntName *sname)
+{
+    int i;
+    FT_UShort platform_id = sname->platform_id;
+    FT_UShort language_id = sname->language_id;
+
+    for (i = 0; i < G_N_ELEMENTS (ftLanguage); i++)
+        if (ftLanguage[i].platform_id == platform_id &&
+            (ftLanguage[i].language_id == TT_LANGUAGE_DONT_CARE ||
+             ftLanguage[i].language_id == language_id))
+        {
+            if (ftLanguage[i].lang[0] == '\0')
+              return NULL;
+            else
+              return ftLanguage[i].lang;
+        }
+    return NULL;
+}
+
+static char *
+FcSfntNameTranscode (FT_SfntName *name)
+{
+    int        i;
+    const char *fromcode;
+
+    for (i = 0; i < G_N_ELEMENTS (ftEncoding); i++)
+        if (ftEncoding[i].platform_id == name->platform_id &&
+            (ftEncoding[i].encoding_id == TT_ENCODING_DONT_CARE ||
+             ftEncoding[i].encoding_id == name->encoding_id))
+            break;
+    if (i == G_N_ELEMENTS (ftEncoding))
+        return  NULL;
+    fromcode = ftEncoding[i].fromcode;
+
+    return g_convert ((const char *)name->string, name->string_len, "UTF-8", fromcode, NULL, NULL, NULL);
+}
+
+static char *
+get_sfnt_name (FT_Face ft_face,
+               guint   nameid)
+{
+  guint count;
+  guint i, j;
+  const char * const *langs = g_get_language_names ();
+  char *res = NULL;
+  guint pos = G_MAXUINT;
+
+  count = FT_Get_Sfnt_Name_Count (ft_face);
+  for (i = 0; i < count; i++)
+    {
+      FT_SfntName name;
+      const char *lang;
+
+      if (FT_Get_Sfnt_Name (ft_face, i, &name) != 0)
+        continue;
+
+      if (name.name_id != nameid)
+        continue;
+
+      lang = FcSfntNameLanguage (&name);
+      for (j = 0; j < pos && langs[j]; j++)
+        {
+          if (strcmp (lang, langs[j]) == 0)
+            {
+              pos = j;
+              g_free (res);
+              res = FcSfntNameTranscode (&name);
+            }
+        }
+
+      if (pos == 0)
+        break;
+    }
+
+  return res;
+}
+
+static gboolean
+is_valid_subfamily_id (guint id)
+{
+  return id == 2 || id == 17 || (255 < id && id < 32768);
+}
+
 static void
-add_instance (hb_face_t    *face,
-              unsigned int  index,
-              GtkWidget    *combo,
-              int           pos)
+add_instance (FT_Face             ft_face,
+              FT_MM_Var          *ft_mm_var,
+              FT_Var_Named_Style *ns,
+              GtkWidget          *combo,
+              int                 pos)
 {
   Instance *instance;
-  hb_ot_name_id_t name_id;
-  char name[20];
-  unsigned int name_len = 20;
+  int i;
 
   instance = g_new0 (Instance, 1);
 
-  name_id = hb_ot_var_named_instance_get_subfamily_name_id (face, index);
-  hb_ot_name_get_utf8 (face, name_id, HB_LANGUAGE_INVALID, &name_len, name);
-
-  instance->name = g_strdup (name);
-  instance->index = index;
+  if (is_valid_subfamily_id (ns->strid))
+    instance->name = get_sfnt_name (ft_face, ns->strid);
+  if (!instance->name)
+    instance->name = g_strdup_printf ("Instance %d", pos);
 
   g_hash_table_add (instances, instance);
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), instance->name);
+
+  instance->n_axes = ft_mm_var->num_axis;
+  instance->axes = g_new (guint32, ft_mm_var->num_axis);
+  instance->coords = g_new (float, ft_mm_var->num_axis);
+
+  for (i = 0; i < ft_mm_var->num_axis; i++)
+    {
+      instance->axes[i] = ft_mm_var->axis[i].tag;
+      instance->coords[i] = FixedToFloat(ns->coords[i]);
+    }
 }
 
 static void
@@ -901,13 +1439,6 @@ instance_changed (GtkComboBox *combo)
   Instance *instance;
   Instance ikey;
   int i;
-  unsigned int coords_length;
-  float *coords = NULL;
-  hb_ot_var_axis_info_t *ai = NULL;
-  unsigned int n_axes;
-  PangoFont *pango_font = NULL;
-  hb_font_t *hb_font;
-  hb_face_t *hb_face;
 
   text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo));
   if (text[0] == '\0')
@@ -921,29 +1452,17 @@ instance_changed (GtkComboBox *combo)
       goto out;
     }
 
-  pango_font = get_pango_font ();
-  hb_font = pango_font_get_hb_font (pango_font);
-  hb_face = hb_font_get_face (hb_font);
-
-  n_axes = hb_ot_var_get_axis_infos (hb_face, 0, NULL, NULL);
-  ai = g_new (hb_ot_var_axis_info_t, n_axes);
-  hb_ot_var_get_axis_infos (hb_face, 0, &n_axes, ai);
-
-  coords = g_new (float, n_axes);
-  hb_ot_var_named_instance_get_design_coords (hb_face,
-                                              instance->index,
-                                              &coords_length,
-                                              coords);
-
-  for (i = 0; i < n_axes; i++)
+  for (i = 0; i < instance->n_axes; i++)
     {
       Axis *axis;
       Axis akey;
+      guint32 tag;
       gdouble value;
 
-      value = coords[ai[i].axis_index];
+      tag = instance->axes[i];
+      value = instance->coords[i];
 
-      akey.tag = ai[i].tag;
+      akey.tag = tag;
       axis = g_hash_table_lookup (axes, &akey);
       if (axis)
         {
@@ -955,31 +1474,17 @@ instance_changed (GtkComboBox *combo)
 
 out:
   g_free (text);
-  g_clear_object (&pango_font);
-  g_free (ai);
-  g_free (coords);
 }
 
 static gboolean
-matches_instance (hb_face_t             *hb_face,
-                  unsigned int           index,
-                  unsigned int           n_axes,
-                  float                 *coords)
+matches_instance (FT_Var_Named_Style *instance,
+                  FT_Fixed           *coords,
+                  FT_UInt             num_coords)
 {
-  float *instance_coords;
-  unsigned int coords_length;
-  int i;
+  FT_UInt i;
 
-  instance_coords = g_new (float, n_axes);
-  coords_length = n_axes;
-
-  hb_ot_var_named_instance_get_design_coords (hb_face,
-                                              index,
-                                              &coords_length,
-                                              instance_coords);
-
-  for (i = 0; i < n_axes; i++)
-    if (instance_coords[i] != coords[i])
+  for (i = 0; i < num_coords; i++)
+    if (coords[i] != instance->coords[i])
       return FALSE;
 
   return TRUE;
@@ -1010,31 +1515,14 @@ add_font_plane (int i)
     }
 }
 
-/* FIXME: This doesn't work if the font has an avar table */
-static float
-denorm_coord (hb_ot_var_axis_info_t *axis, int coord)
-{
-  float r = coord / 16384.0;
-
-  if (coord < 0)
-    return axis->default_value + r * (axis->default_value - axis->min_value);
-  else
-    return axis->default_value + r * (axis->max_value - axis->default_value);
-}
-
 static void
 update_font_variations (void)
 {
   GtkWidget *child, *next;
-  PangoFont *pango_font = NULL;
-  hb_font_t *hb_font;
-  hb_face_t *hb_face;
-  unsigned int n_axes;
-  hb_ot_var_axis_info_t *ai = NULL;
-  float *design_coords = NULL;
-  const int *coords;
-  unsigned int length;
-  int i;
+  PangoFont *pango_font;
+  FT_Face ft_face;
+  FT_MM_Var *ft_mm_var;
+  FT_Error ret;
 
   child = gtk_widget_get_first_child (variations_grid);
   while (child != NULL)
@@ -1050,82 +1538,81 @@ update_font_variations (void)
   g_hash_table_remove_all (instances);
 
   pango_font = get_pango_font ();
-  hb_font = pango_font_get_hb_font (pango_font);
-  hb_face = hb_font_get_face (hb_font);
+  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
 
-  n_axes = hb_ot_var_get_axis_infos (hb_face, 0, NULL, NULL);
-  if (n_axes == 0)
-    goto done;
-
-  ai = g_new0 (hb_ot_var_axis_info_t, n_axes);
-  design_coords = g_new (float, n_axes);
-
-  hb_ot_var_get_axis_infos (hb_face, 0, &n_axes, ai);
-  coords = hb_font_get_var_coords_normalized (hb_font, &length);
-  for (i = 0; i < length; i++)
-    design_coords[i] = denorm_coord (&ai[i], coords[i]);
-
-  if (hb_ot_var_get_named_instance_count (hb_face) > 0)
+  ret = FT_Get_MM_Var (ft_face, &ft_mm_var);
+  if (ret == 0)
     {
-      GtkWidget *label;
-      GtkWidget *combo;
+      unsigned int i;
+      FT_Fixed *coords;
 
-      label = gtk_label_new ("Instance");
-      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-      gtk_grid_attach (GTK_GRID (variations_grid), label, 0, -1, 2, 1);
+      coords = g_new (FT_Fixed, ft_mm_var->num_axis);
+      ret = FT_Get_Var_Design_Coordinates (ft_face, ft_mm_var->num_axis, coords);
 
-      combo = gtk_combo_box_text_new ();
-      gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);
-
-      gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "");
-
-      for (i = 0; i < hb_ot_var_get_named_instance_count (hb_face); i++)
-        add_instance (hb_face, i, combo, i);
-
-      for (i = 0; i < hb_ot_var_get_named_instance_count (hb_face); i++)
+      if (ft_mm_var->num_namedstyles > 0)
         {
-          if (matches_instance (hb_face, i, n_axes, design_coords))
-            {
-              gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i + 1);
-              break;
-            }
+           GtkWidget *label;
+           GtkWidget *combo;
+
+           label = gtk_label_new ("Instance");
+           gtk_label_set_xalign (GTK_LABEL (label), 0);
+           gtk_widget_set_halign (label, GTK_ALIGN_START);
+           gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
+           gtk_grid_attach (GTK_GRID (variations_grid), label, 0, -1, 2, 1);
+
+           combo = gtk_combo_box_text_new ();
+           gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);
+           g_signal_connect (combo, "changed", G_CALLBACK (instance_changed), NULL);
+           gtk_grid_attach (GTK_GRID (variations_grid), combo, 1, -1, 2, 1);
+
+           gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "");
+
+           for (i = 0; i < ft_mm_var->num_namedstyles; i++)
+             add_instance (ft_face, ft_mm_var, &ft_mm_var->namedstyle[i], combo, i);
+           for (i = 0; i < ft_mm_var->num_namedstyles; i++)
+             {
+               if (matches_instance (&ft_mm_var->namedstyle[i], coords, ft_mm_var->num_axis))
+                 {
+                   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i + 1);
+                   break;
+                 }
+             }
+
+           instance_combo = combo;
         }
 
-      gtk_grid_attach (GTK_GRID (variations_grid), combo, 1, -1, 2, 1);
-      g_signal_connect (combo, "changed", G_CALLBACK (instance_changed), NULL);
-      instance_combo = combo;
-   }
+      if (ret == 0)
+        {
+          for (i = 0; i < ft_mm_var->num_axis; i++)
+            add_axis (&ft_mm_var->axis[i], coords[i], i);
 
-  for (i = 0; i < n_axes; i++)
-    add_axis (hb_face, &ai[i], design_coords[i], i);
+          add_font_plane (ft_mm_var->num_axis);
+        }
+      g_free (coords);
+      free (ft_mm_var);
+    }
 
-  add_font_plane (n_axes);
-
-done:
-  g_clear_object (&pango_font);
-  g_free (ai);
-  g_free (design_coords);
+  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
+  g_object_unref (pango_font);
 }
 
-void
-font_features_font_changed (void)
+static void
+font_changed (void)
 {
   update_script_combo ();
   update_features ();
   update_font_variations ();
 }
 
-void
-font_features_script_changed (void)
+static void
+script_changed (void)
 {
   update_features ();
   update_display ();
 }
 
-void
-font_features_reset_features (void)
+static void
+reset_features (void)
 {
   GList *l;
 
@@ -1170,8 +1657,8 @@ switch_to_label (void)
   update_display ();
 }
 
-void
-font_features_toggle_edit (void)
+static void
+toggle_edit (void)
 {
   if (strcmp (gtk_stack_get_visible_child_name (GTK_STACK (stack)), "label") == 0)
     switch_to_entry ();
@@ -1179,8 +1666,8 @@ font_features_toggle_edit (void)
     switch_to_label ();
 }
 
-void
-font_features_stop_edit (void)
+static void
+stop_edit (void)
 {
   g_signal_emit_by_name (edit_toggle, "clicked");
 }
@@ -1195,7 +1682,7 @@ entry_key_press (GtkEventController *controller,
   if (keyval == GDK_KEY_Escape)
     {
       gtk_editable_set_text (GTK_EDITABLE (entry), text);
-      font_features_stop_edit ();
+      stop_edit ();
       return GDK_EVENT_STOP;
     }
 
@@ -1215,6 +1702,14 @@ do_font_features (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/font_features/font-features.ui");
 
+      gtk_builder_add_callback_symbol (builder, "update_display", update_display);
+      gtk_builder_add_callback_symbol (builder, "font_changed", font_changed);
+      gtk_builder_add_callback_symbol (builder, "script_changed", script_changed);
+      gtk_builder_add_callback_symbol (builder, "reset", reset_features);
+      gtk_builder_add_callback_symbol (builder, "stop_edit", G_CALLBACK (stop_edit));
+      gtk_builder_add_callback_symbol (builder, "toggle_edit", G_CALLBACK (toggle_edit));
+      gtk_builder_connect_signals (builder, NULL);
+
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));
       label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
@@ -1228,7 +1723,7 @@ do_font_features (GtkWidget *do_widget)
       edit_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "edit_toggle"));
 
       controller = gtk_event_controller_key_new ();
-      g_object_set_data_full (G_OBJECT (entry), "controller", g_object_ref (controller), g_object_unref);
+      g_object_set_data_full (G_OBJECT (entry), "controller", controller, g_object_unref);
       g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), entry);
       gtk_widget_add_controller (entry, controller);
 
@@ -1331,14 +1826,12 @@ do_font_features (GtkWidget *do_widget)
       else
         g_hash_table_remove_all (axes);
 
-      font_features_font_changed ();
+      font_changed ();
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       g_object_unref (builder);
-
-      update_display ();
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/fontplane.c

@@ -19,6 +19,8 @@
 
 #include "fontplane.h"
 
+#include "gtk.h"
+
 enum {
   PROP_0,
   PROP_WEIGHT_ADJUSTMENT,

demos/gtk-demo/fontrendering.c

@@ -1,287 +0,0 @@
-/* Pango/Font rendering
- *
- * Demonstrates various aspects of font rendering.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *font_button = NULL;
-static GtkWidget *entry = NULL;
-static GtkWidget *image = NULL;
-static GtkWidget *hinting = NULL;
-static GtkWidget *hint_metrics = NULL;
-static GtkWidget *up_button = NULL;
-static GtkWidget *down_button = NULL;
-static GtkWidget *text_radio = NULL;
-static GtkWidget *show_grid = NULL;
-static GtkWidget *show_extents = NULL;
-
-static PangoContext *context;
-
-static int scale = 10;
-
-static void
-on_destroy (gpointer data)
-{
-  window = NULL;
-}
-
-static void
-update_image (void)
-{
-  const char *text;
-  PangoFontDescription *desc;
-  PangoLayout *layout;
-  PangoRectangle ink, pink, logical;
-  int baseline;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *pixbuf2;
-  const char *hint;
-  cairo_font_options_t *fopt;
-  cairo_hint_style_t hintstyle;
-  cairo_hint_metrics_t hintmetrics;
-  int i;
-
-  if (!context)
-    context = gtk_widget_create_pango_context (image);
-
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
-  desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (font_button));
-
-  fopt = cairo_font_options_copy (pango_cairo_context_get_font_options (context));
-
-  hint = gtk_combo_box_get_active_id (GTK_COMBO_BOX (hinting));
-  if (strcmp (hint, "none") == 0)
-    hintstyle = CAIRO_HINT_STYLE_NONE;
-  else if (strcmp (hint, "slight") == 0)
-    hintstyle = CAIRO_HINT_STYLE_SLIGHT;
-  else if (strcmp (hint, "medium") == 0)
-    hintstyle = CAIRO_HINT_STYLE_MEDIUM;
-  else if (strcmp (hint, "full") == 0)
-    hintstyle = CAIRO_HINT_STYLE_FULL;
-  else
-    hintstyle = CAIRO_HINT_STYLE_DEFAULT;
-  cairo_font_options_set_hint_style (fopt, hintstyle);
-
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (hint_metrics)))
-    hintmetrics = CAIRO_HINT_METRICS_ON;
-  else
-    hintmetrics = CAIRO_HINT_METRICS_OFF;
-  cairo_font_options_set_hint_metrics (fopt, hintmetrics);
-
-  pango_cairo_context_set_font_options (context, fopt);
-  cairo_font_options_destroy (fopt);
-  pango_context_changed (context);
-
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (text_radio)))
-    {
-      layout = pango_layout_new (context);
-      pango_layout_set_font_description (layout, desc);
-      pango_layout_set_text (layout, text, -1);
-      pango_layout_get_extents (layout, &ink, &logical);
-      pink = ink;
-      baseline = pango_layout_get_baseline (layout);
-
-      pango_extents_to_pixels (&ink, NULL);
-
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, ink.width + 20, ink.height + 20);
-      cr = cairo_create (surface);
-      cairo_set_source_rgb (cr, 1, 1, 1);
-      cairo_paint (cr);
-
-      cairo_set_source_rgb (cr, 0, 0, 0);
-      cairo_move_to (cr, 10, 10);
-      pango_cairo_show_layout (cr, layout);
-
-      cairo_destroy (cr);
-      g_object_unref (layout);
-
-      pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, cairo_image_surface_get_width (surface), cairo_image_surface_get_height (surface));
-      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf, gdk_pixbuf_get_width (pixbuf) * scale, gdk_pixbuf_get_height (pixbuf) * scale, GDK_INTERP_NEAREST);
-
-      g_object_unref (pixbuf);
-      cairo_surface_destroy (surface);
-
-      surface = cairo_image_surface_create_for_data (gdk_pixbuf_get_pixels (pixbuf2),
-                                                     CAIRO_FORMAT_ARGB32,
-                                                     gdk_pixbuf_get_width (pixbuf2),
-                                                     gdk_pixbuf_get_height (pixbuf2),
-                                                     gdk_pixbuf_get_rowstride (pixbuf2));
-
-      cr = cairo_create (surface);
-      cairo_set_line_width (cr, 1);
-
-      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (show_grid)))
-        {
-          cairo_set_source_rgba (cr, 0.2, 0, 0, 0.2);
-          for (i = 1; i < ink.height + 20; i++)
-            {
-              cairo_move_to (cr, 0, scale * i - 0.5);
-              cairo_line_to (cr, scale * (ink.width + 20), scale * i - 0.5);
-              cairo_stroke (cr);
-            }
-          for (i = 1; i < ink.width + 20; i++)
-            {
-              cairo_move_to (cr, scale * i - 0.5, 0);
-              cairo_line_to (cr, scale * i - 0.5, scale * (ink.height + 20));
-              cairo_stroke (cr);
-            }
-        }
-
-      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (show_extents)))
-        {
-          cairo_set_source_rgba (cr, 0, 0, 1, 1);
-
-          cairo_rectangle (cr,
-                           scale * (10 + pango_units_to_double (logical.x)) - 0.5,
-                           scale * (10 + pango_units_to_double (logical.y)) - 0.5,
-                           scale * pango_units_to_double (logical.width) + 1,
-                           scale * pango_units_to_double (logical.height) + 1);
-          cairo_stroke (cr);
-          cairo_move_to (cr, scale * (10 + pango_units_to_double (logical.x)) - 0.5,
-                             scale * (10 + pango_units_to_double (baseline)) - 0.5);
-          cairo_line_to (cr, scale * (10 + pango_units_to_double (logical.x + logical.width)) + 1,
-                             scale * (10 + pango_units_to_double (baseline)) - 0.5);
-          cairo_stroke (cr);
-          cairo_set_source_rgba (cr, 1, 0, 0, 1);
-          cairo_rectangle (cr,
-                           scale * (10 + pango_units_to_double (pink.x)) + 0.5,
-                           scale * (10 + pango_units_to_double (pink.y)) + 0.5,
-                           scale * pango_units_to_double (pink.width) - 1,
-                           scale * pango_units_to_double (pink.height) - 1);
-          cairo_stroke (cr);
-        }
-
-      cairo_surface_destroy (surface);
-      cairo_destroy (cr);
-    }
-  else
-    {
-      PangoLayoutIter *iter;
-      PangoLayoutRun *run;
-      PangoGlyphInfo *g;
-      int i, j;
-
-      layout = pango_layout_new (context);
-      pango_layout_set_font_description (layout, desc);
-      pango_layout_set_text (layout, "aaaa", -1);
-      pango_layout_get_extents (layout, &ink, &logical);
-      pango_extents_to_pixels (&logical, NULL);
-
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, logical.width * 3 / 2, 4*logical.height);
-      cr = cairo_create (surface);
-      cairo_set_source_rgb (cr, 1, 1, 1);
-      cairo_paint (cr);
-
-      iter = pango_layout_get_iter (layout);
-      run = pango_layout_iter_get_run (iter);
-
-      cairo_set_source_rgb (cr, 0, 0, 0);
-      for (i = 0; i < 4; i++)
-        {
-          g = &(run->glyphs->glyphs[i]);
-          g->geometry.width = PANGO_UNITS_ROUND (g->geometry.width * 3 / 2);
-        }
-
-      for (j = 0; j < 4; j++)
-        {
-          for (i = 0; i < 4; i++)
-            {
-              g = &(run->glyphs->glyphs[i]);
-              g->geometry.x_offset = i * (PANGO_SCALE / 4);
-              g->geometry.y_offset = j * (PANGO_SCALE / 4);
-            }
-
-          cairo_move_to (cr, 0, j * logical.height);
-          pango_cairo_show_layout (cr, layout);
-        }
-
-      cairo_destroy (cr);
-      pango_layout_iter_free (iter);
-      g_object_unref (layout);
-
-      pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, cairo_image_surface_get_width (surface), cairo_image_surface_get_height (surface));
-      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf, gdk_pixbuf_get_width (pixbuf) * scale, gdk_pixbuf_get_height (pixbuf) * scale, GDK_INTERP_NEAREST);
-      g_object_unref (pixbuf);
-      cairo_surface_destroy (surface);
-    }
-
-
-  gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2);
-
-  g_object_unref (pixbuf2);
-
-  pango_font_description_free (desc);
-}
-
-static void
-update_buttons (void)
-{
-  gtk_widget_set_sensitive (up_button, scale < 32);
-  gtk_widget_set_sensitive (down_button, scale > 1);
-}
-
-static void
-scale_up (void)
-{
-  scale += 1;
-  update_buttons ();
-  update_image ();
-}
-
-static void
-scale_down (void)
-{
-  scale -= 1;
-  update_buttons ();
-  update_image ();
-}
-
-GtkWidget *
-do_fontrendering (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkBuilder *builder;
-
-      builder = gtk_builder_new_from_resource ("/fontrendering/fontrendering.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
-      font_button = GTK_WIDGET (gtk_builder_get_object (builder, "font_button"));
-      up_button = GTK_WIDGET (gtk_builder_get_object (builder, "up_button"));
-      down_button = GTK_WIDGET (gtk_builder_get_object (builder, "down_button"));
-      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
-      image = GTK_WIDGET (gtk_builder_get_object (builder, "image"));
-      hinting = GTK_WIDGET (gtk_builder_get_object (builder, "hinting"));
-      hint_metrics = GTK_WIDGET (gtk_builder_get_object (builder, "hint_metrics"));
-      text_radio = GTK_WIDGET (gtk_builder_get_object (builder, "text_radio"));
-      show_grid = GTK_WIDGET (gtk_builder_get_object (builder, "show_grid"));
-      show_extents = GTK_WIDGET (gtk_builder_get_object (builder, "show_extents"));
-
-      g_signal_connect (up_button, "clicked", G_CALLBACK (scale_up), NULL);
-      g_signal_connect (down_button, "clicked", G_CALLBACK (scale_down), NULL);
-      g_signal_connect (entry, "notify::text", G_CALLBACK (update_image), NULL);
-      g_signal_connect (font_button, "notify::font-desc", G_CALLBACK (update_image), NULL);
-      g_signal_connect (hinting, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (hint_metrics, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (text_radio, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (show_grid, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (show_extents, "notify::active", G_CALLBACK (update_image), NULL);
-
-      update_image ();
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/fontrendering.ui

@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAdjustment" id="scale_adj">
-    <property name="upper">24</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">4</property>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="default-width">600</property>
-    <property name="default-height">300</property>
-    <property name="title">Font rendering</property>
-    <child>
-      <object class="GtkGrid">
-        <property name="margin-top">10</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="margin-start">10</property>
-            <property name="label">Text</property>
-            <property name="xalign">1</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry">
-            <property name="text">Fonts render</property>
-            <layout>
-              <property name="left-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="margin-start">10</property>
-            <property name="label">Font</property>
-            <property name="xalign">1</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkFontButton" id="font_button">
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Hinting</property>
-            <property name="xalign">1</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-            <layout>
-              <property name="left-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="hinting">
-            <property name="active">0</property>
-            <property name="valign">center</property>
-            <items>
-              <item translatable="yes" id="none">None</item>
-              <item translatable="yes" id="slight">Slight</item>
-              <item translatable="yes" id="medium">Medium</item>
-              <item translatable="yes" id="full">Full</item>
-            </items>
-            <layout>
-              <property name="left-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="hint_metrics">
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Hint Metrics</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="show_extents">
-            <property name="active">1</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Show Extents</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="show_grid">
-            <property name="active">1</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Show Grid</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="up_button">
-            <property name="icon-name">list-add-symbolic</property>
-            <style>
-              <class name="circular"/>
-            </style>
-            <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="down_button">
-            <property name="icon-name">list-remove-symbolic</property>
-            <style>
-              <class name="circular"/>
-            </style>
-            <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="hexpand">1</property>
-            <layout>
-              <property name="left-attach">6</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkRadioButton" id="text_radio">
-                <property name="draw-indicator">0</property>
-                <property name="label">Text</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="grid_radio">
-                <property name="draw-indicator">0</property>
-                <property name="label">Grid</property>
-                <property name="group">text_radio</property>
-              </object>
-            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-              <property name="column-span">7</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow">
-            <property name="propagate-natural-height">1</property>
-            <property name="shadow-type">in</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <child>
-              <object class="GtkPicture" id="image">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="can-shrink">0</property>
-              </object>
-            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
-              <property name="column-span">7</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/foreigndrawing.c

@@ -262,7 +262,7 @@ draw_menu (GtkWidget *widget,
   gint toggle_x, toggle_y, toggle_width, toggle_height;
 
   /* This information is taken from the GtkMenu docs, see "CSS nodes" */
-  menu_context = get_style (NULL, "menu");
+  menu_context = get_style (gtk_widget_get_style_context(widget), "menu");
   hovermenuitem_context = get_style (menu_context, "menuitem:hover");
   hoveredarrowmenuitem_context = get_style (hovermenuitem_context, "arrow.right:dir(ltr)");
   menuitem_context = get_style (menu_context, "menuitem");
@@ -414,7 +414,7 @@ draw_menubar (GtkWidget     *widget,
   frame_context = get_style (NULL, "frame");
   border_context = get_style (frame_context, "border");
 
-  /* This information is taken from the GtkPopoverMenuBar docs, see "CSS nodes" */
+  /* This information is taken from the GtkMenuBar docs, see "CSS nodes" */
   menubar_context = get_style (NULL, "menubar");
   hovered_menuitem_context = get_style (menubar_context, "menuitem:hover");
   menuitem_context = get_style (menubar_context, "menuitem");
@@ -829,6 +829,7 @@ draw_spinbutton (GtkWidget *widget,
   GtkStyleContext *down_context;
   GtkIconTheme *icon_theme;
   GtkIconInfo *icon_info;
+  GdkPixbuf *pixbuf;
   GdkTexture *texture;
   gint icon_width, icon_height, icon_size;
   gint button_width;
@@ -856,22 +857,26 @@ draw_spinbutton (GtkWidget *widget,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL));
+  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (up_context, cr, x + width - button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
   gtk_render_icon (up_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 
   gtk_style_context_get (down_context,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL));
+  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (down_context, cr, x + width - 2 * button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
   gtk_render_icon (down_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 
   g_object_unref (down_context);

demos/gtk-demo/gestures.c

@@ -94,12 +94,9 @@ drawing_area_draw (GtkDrawingArea *area,
       cairo_pattern_t *pat;
       cairo_matrix_t matrix;
       gdouble angle, scale;
-      gdouble x_center, y_center;
-
-      gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center);
 
       cairo_get_matrix (cr, &matrix);
-      cairo_matrix_translate (&matrix, x_center, y_center);
+      cairo_matrix_translate (&matrix, width / 2, height / 2);
 
       cairo_save (cr);
 

demos/gtk-demo/glarea.c

@@ -241,7 +241,7 @@ realize (GtkWidget *widget)
       fragment_path = "/glarea/glarea-gl.fs.glsl";
     }
 
-  init_buffers (NULL, &position_buffer);
+  init_buffers (&position_buffer, NULL);
   init_shaders (vertex_path, fragment_path, &program, &mvp_location);
 }
 

demos/gtk-demo/hypertext.c

@@ -41,7 +41,6 @@ show_page (GtkTextBuffer *buffer,
 
   gtk_text_buffer_set_text (buffer, "", 0);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
-  gtk_text_buffer_begin_irreversible_action (buffer);
   if (page == 1)
     {
       gtk_text_buffer_insert (buffer, &iter, "Some text to show that simple ", -1);
@@ -74,7 +73,6 @@ show_page (GtkTextBuffer *buffer,
                               "so that related items of information are connected.\n", -1);
       insert_link (buffer, &iter, "Go back", 1);
     }
-  gtk_text_buffer_end_irreversible_action (buffer);
 }
 
 /* Looks at all tags covering the position of iter in the text view,
@@ -260,7 +258,6 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_add_controller (view, controller);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_enable_undo (buffer, TRUE);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),

demos/gtk-demo/iconscroll.c

@@ -1,229 +0,0 @@
-/* Benchmark/Scrolling
- *
- * This demo scrolls a view with various content.
- */
-
-#include <gtk/gtk.h>
-
-static guint tick_cb;
-static GtkAdjustment *hadjustment;
-static GtkAdjustment *vadjustment;
-static GtkWidget *window = NULL;
-static GtkWidget *scrolledwindow;
-static int selected;
-
-#define N_WIDGET_TYPES 4
-
-
-static int hincrement = 5;
-static int vincrement = 5;
-
-static gboolean
-scroll_cb (GtkWidget *widget,
-           GdkFrameClock *frame_clock,
-           gpointer data)
-{
-  double value;
-
-  value = gtk_adjustment_get_value (vadjustment);
-  if (value + vincrement <= gtk_adjustment_get_lower (vadjustment) ||
-     (value + vincrement >= gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment)))
-    vincrement = - vincrement;
-
-  gtk_adjustment_set_value (vadjustment, value + vincrement);
-
-  value = gtk_adjustment_get_value (hadjustment);
-  if (value + hincrement <= gtk_adjustment_get_lower (hadjustment) ||
-     (value + hincrement >= gtk_adjustment_get_upper (hadjustment) - gtk_adjustment_get_page_size (hadjustment)))
-    hincrement = - hincrement;
-
-  gtk_adjustment_set_value (hadjustment, value + hincrement);
-
-  return G_SOURCE_CONTINUE;
-}
-
-extern GtkWidget *create_icon (void);
-
-static void
-populate_icons (void)
-{
-  GtkWidget *grid;
-  int top, left;
-
-  grid = gtk_grid_new ();
-  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-  g_object_set (grid, "margin", 10, NULL);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
-
-  for (top = 0; top < 100; top++)
-    for (left = 0; left < 15; left++)
-      gtk_grid_attach (GTK_GRID (grid), create_icon (), left, top, 1, 1);
-
-  hincrement = 0;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), grid);
-}
-
-static char *content;
-static gsize content_len;
-
-extern void fontify (GtkTextBuffer *buffer);
-
-static void
-populate_text (gboolean hilight)
-{
-  GtkWidget *textview;
-  GtkTextBuffer *buffer;
-
-  if (!content)
-    {
-      GBytes *bytes;
-
-      bytes = g_resources_lookup_data ("/sources/font_features.c", 0, NULL);
-      content = g_bytes_unref_to_data (bytes, &content_len);
-    }
-
-  buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_set_text (buffer, content, (int)content_len);
-
-  if (hilight)
-    fontify (buffer);
-
-  textview = gtk_text_view_new ();
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-
-  hincrement = 0;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
-}
-
-static void
-populate_image (void)
-{
-  GtkWidget *image;
-
-  if (!content)
-    {
-      GBytes *bytes;
-
-      bytes = g_resources_lookup_data ("/sources/font_features.c", 0, NULL);
-      content = g_bytes_unref_to_data (bytes, &content_len);
-    }
-
-  image = gtk_picture_new_for_resource ("/sliding_puzzle/portland-rose.jpg");
-  gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE);
-
-  hincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_AUTOMATIC,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), image);
-}
-
-static void
-set_widget_type (int type)
-{
-  if (tick_cb)
-    gtk_widget_remove_tick_callback (window, tick_cb);
-
-  if (gtk_bin_get_child (GTK_BIN (scrolledwindow)))
-    gtk_container_remove (GTK_CONTAINER (scrolledwindow),
-                          gtk_bin_get_child (GTK_BIN (scrolledwindow)));
-
-  selected = type;
-
-  switch (selected)
-    {
-    case 0:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling icons");
-      populate_icons ();
-      break;
-
-    case 1:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling plain text");
-      populate_text (FALSE);
-      break;
-
-    case 2:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling complex text");
-      populate_text (TRUE);
-      break;
-
-    case 3:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a big image");
-      populate_image ();
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-
-  tick_cb = gtk_widget_add_tick_callback (window, scroll_cb, NULL, NULL);
-}
-
-void
-iconscroll_next_clicked_cb (GtkButton *source,
-                            gpointer   user_data)
-{
-  int new_index;
-
-  if (selected + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
-  else
-    new_index = selected + 1;
- 
-
-  set_widget_type (new_index);
-}
-
-void
-iconscroll_prev_clicked_cb (GtkButton *source,
-                            gpointer   user_data)
-{
-  int new_index;
-
-  if (selected - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
-  else
-    new_index = selected - 1;
-
-  set_widget_type (new_index);
-}
-
-GtkWidget *
-do_iconscroll (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkBuilder *builder;
-
-      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      scrolledwindow = GTK_WIDGET (gtk_builder_get_object (builder, "scrolledwindow"));
-      gtk_widget_realize (window);
-      hadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hadjustment"));
-      vadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "vadjustment"));
-      set_widget_type (0);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/iconscroll.ui

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="resizable">0</property>
-    <property name="default-width">500</property>
-    <property name="default-height">500</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkBox">
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="iconscroll_prev_clicked_cb"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="iconscroll_next_clicked_cb"/>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow" id="scrolledwindow">
-        <property name="hscrollbar-policy">never</property>
-        <property name="hadjustment">
-          <object class="GtkAdjustment" id="hadjustment"/>
-        </property>
-        <property name="vadjustment">
-          <object class="GtkAdjustment" id="vadjustment"/>
-        </property>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/infobar.c

@@ -68,7 +68,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -80,7 +80,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -94,10 +94,9 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
-      gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);
 
       button = gtk_toggle_button_new_with_label ("Question");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -107,7 +106,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -120,7 +119,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 

demos/gtk-demo/language-names.c

@@ -18,10 +18,6 @@
 
 #include "language-names.h"
 
-#ifndef ISO_CODES_PREFIX
-#define ISO_CODES_PREFIX "/usr"
-#endif
-
 #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
 #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
 
@@ -206,7 +202,7 @@ languages_variant_init (const char *variant)
   else
     g_warning ("Failed to load '%s': %s\n", filename, error->message);
 
-  g_clear_error (&error);
+  g_free (error);
   g_free (filename);
   g_free (buf);
 }

demos/gtk-demo/listbox.ui

@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <menu id="menu1">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Email message</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Embed message</attribute>
-      </item>
-    </section>
-  </menu>
+  <object class="GtkMenu" id="menu1">
+    <child>
+      <object class="GtkMenuItem" id="menuitem1">
+        <property name="label" translatable="yes">Email message</property>
+        <property name="use-underline">1</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="menuitem2">
+        <property name="label" translatable="yes">Embed message</property>
+        <property name="use-underline">1</property>
+      </object>
+    </child>
+  </object>
   <template class="GtkMessageRow" parent="GtkListBoxRow">
     <child>
       <object class="GtkGrid" id="grid1">
@@ -167,7 +171,7 @@
                   <object class="GtkMenuButton" id="more-button">
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="menu-model">menu1</property>
+                    <property name="popup">menu1</property>
                     <property name="relief">none</property>
                     <property name="label" translatable="yes">More...</property>
                   </object>

demos/gtk-demo/main.c

@@ -487,7 +487,7 @@ parse_chars (gchar     *text,
 }
 
 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
-void
+static void
 fontify (GtkTextBuffer *source_buffer)
 {
   GtkTextIter start_iter, next_iter, tmp_iter;
@@ -639,7 +639,7 @@ display_nothing (const char *resource)
 
   str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource);
   widget = gtk_label_new (str);
-  gtk_label_set_wrap (GTK_LABEL (widget), TRUE);
+  gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
 
   g_free (str);
 
@@ -748,9 +748,6 @@ load_file (const gchar *demoname,
 
   source_buffer = gtk_text_buffer_new (NULL);
 
-  gtk_text_buffer_begin_irreversible_action (info_buffer);
-  gtk_text_buffer_begin_irreversible_action (source_buffer);
-
   resource_filename = g_strconcat ("/sources/", filename, NULL);
   bytes = g_resources_lookup_data (resource_filename, 0, &err);
   g_free (resource_filename);
@@ -883,11 +880,9 @@ load_file (const gchar *demoname,
 
   fontify (source_buffer);
 
-  gtk_text_buffer_end_irreversible_action (source_buffer);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
   g_object_unref (source_buffer);
 
-  gtk_text_buffer_end_irreversible_action (info_buffer);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (info_view), info_buffer);
   g_object_unref (info_buffer);
 }
@@ -1003,6 +998,32 @@ row_activated_cb (GtkWidget         *tree_view,
   run_example_for_row (window, model, &iter);
 }
 
+static void
+start_cb (GtkMenuItem *item, GtkWidget *scrollbar)
+{
+  GtkAdjustment *adj;
+
+  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
+}
+
+static void
+end_cb (GtkMenuItem *item, GtkWidget *scrollbar)
+{
+  GtkAdjustment *adj;
+
+  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj));
+}
+
+static gboolean
+scrollbar_popup (GtkWidget *scrollbar, GtkWidget *menu)
+{
+  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+
+  return TRUE;
+}
+
 static void
 activate (GApplication *app)
 {
@@ -1011,12 +1032,23 @@ activate (GApplication *app)
   GtkWidget *widget;
   GtkTreeModel *model;
   GtkTreeIter iter;
+  GError *error = NULL;
+  GtkWidget *sw;
+  GtkWidget *scrollbar;
+  GtkWidget *menu;
+  GtkWidget *item;
 
   static GActionEntry win_entries[] = {
     { "run", activate_run, NULL, NULL, NULL }
   };
 
-  builder = gtk_builder_new_from_resource ("/ui/main.ui");
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/ui/main.ui", &error);
+  if (error != NULL)
+    {
+      g_critical ("%s", error->message);
+      exit (1);
+    }
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);
@@ -1032,6 +1064,21 @@ activate (GApplication *app)
   treeview = (GtkWidget *)gtk_builder_get_object (builder, "treeview");
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
 
+  sw = (GtkWidget *)gtk_builder_get_object (builder, "source-scrolledwindow");
+  scrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (sw));
+
+  menu = gtk_menu_new ();
+
+  item = gtk_menu_item_new_with_label ("Start");
+  g_signal_connect (item, "activate", G_CALLBACK (start_cb), scrollbar);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_menu_item_new_with_label ("End");
+  g_signal_connect (item, "activate", G_CALLBACK (end_cb), scrollbar);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  g_signal_connect (scrollbar, "popup-menu", G_CALLBACK (scrollbar_popup), menu);
+
   load_file (gtk_demos[0].name, gtk_demos[0].filename);
 
   populate_model (model);

demos/gtk-demo/markup.c

@@ -29,10 +29,8 @@ source_toggled (GtkToggleButton *button)
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_get_bounds (buffer, &start, &end);
-      gtk_text_buffer_begin_irreversible_action (buffer);
       gtk_text_buffer_delete (buffer, &start, &end);
       gtk_text_buffer_insert_markup (buffer, &start, markup, -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
       g_free (markup);
 
       gtk_stack_set_visible_child_name (GTK_STACK (stack), "formatted");
@@ -108,15 +106,11 @@ do_markup (GtkWidget *do_widget)
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_get_start_iter (buffer, &iter);
-      gtk_text_buffer_begin_irreversible_action (buffer);
       gtk_text_buffer_insert_markup (buffer, &iter, markup, -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view2));
       gtk_text_buffer_get_start_iter (buffer, &iter);
-      gtk_text_buffer_begin_irreversible_action (buffer);
       gtk_text_buffer_insert (buffer, &iter, markup, -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
 
       g_bytes_unref (bytes);
 

demos/gtk-demo/menus.c

@@ -0,0 +1,147 @@
+/* Menus
+ *
+ * There are several widgets involved in displaying menus. The
+ * GtkMenuBar widget is a menu bar, which normally appears horizontally
+ * at the top of an application, but can also be layed out vertically.
+ * The GtkMenu widget is the actual menu that pops up. Both GtkMenuBar
+ * and GtkMenu are subclasses of GtkMenuShell; a GtkMenuShell contains
+ * menu items (GtkMenuItem). Each menu item contains text and/or images
+ * and can be selected by the user.
+ *
+ * There are several kinds of menu item, including plain GtkMenuItem,
+ * GtkCheckMenuItem which can be checked/unchecked, GtkRadioMenuItem
+ * which is a check menu item that's in a mutually exclusive group,
+ * GtkSeparatorMenuItem which is a separator bar, GtkTearoffMenuItem
+ * which allows a GtkMenu to be torn off, and GtkImageMenuItem which
+ * can place a GtkImage or other widget next to the menu text.
+ *
+ * A GtkMenuItem can have a submenu, which is simply a GtkMenu to pop
+ * up when the menu item is selected. Typically, all menu items in a menu bar
+ * have submenus.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include <stdio.h>
+
+static GtkWidget *
+create_menu (gint depth)
+{
+  GtkWidget *menu;
+  GtkRadioMenuItem *last_item;
+  char buf[32];
+  int i, j;
+
+  if (depth < 1)
+    return NULL;
+
+  menu = gtk_menu_new ();
+  last_item = NULL;
+
+  for (i = 0, j = 1; i < 5; i++, j++)
+    {
+      GtkWidget *menu_item;
+
+      sprintf (buf, "item %2d - %d", depth, j);
+
+      menu_item = gtk_radio_menu_item_new_with_label_from_widget (NULL, buf);
+      gtk_radio_menu_item_join_group (GTK_RADIO_MENU_ITEM (menu_item), last_item);
+      last_item = GTK_RADIO_MENU_ITEM (menu_item);
+
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+      gtk_widget_show (menu_item);
+      if (i == 3)
+        gtk_widget_set_sensitive (menu_item, FALSE);
+
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), create_menu (depth - 1));
+    }
+
+  return menu;
+}
+
+static void
+change_orientation (GtkWidget *button,
+                    GtkWidget *menubar)
+{
+  GtkWidget *parent;
+  GtkOrientation orientation;
+
+  parent = gtk_widget_get_parent (menubar);
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (parent));
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (parent), 1 - orientation);
+}
+
+static GtkWidget *window = NULL;
+
+GtkWidget *
+do_menus (GtkWidget *do_widget)
+{
+  GtkWidget *box;
+  GtkWidget *box1;
+  GtkWidget *box2;
+  GtkWidget *button;
+
+  if (!window)
+    {
+      GtkWidget *menubar;
+      GtkWidget *menu;
+      GtkWidget *menuitem;
+      GtkAccelGroup *accel_group;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Menus");
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK(gtk_widget_destroyed), &window);
+
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_container_add (GTK_CONTAINER (box), box1);
+
+      menubar = gtk_menu_bar_new ();
+      gtk_widget_set_hexpand (menubar, TRUE);
+      gtk_container_add (GTK_CONTAINER (box1), menubar);
+
+      menu = create_menu (2);
+
+      menuitem = gtk_menu_item_new_with_label ("test\nline2");
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+
+      menuitem = gtk_menu_item_new_with_label ("foo");
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3));
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+
+      menuitem = gtk_menu_item_new_with_label ("bar");
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4));
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+      gtk_container_add (GTK_CONTAINER (box1), box2);
+
+      button = gtk_button_new_with_label ("Flip");
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (change_orientation), menubar);
+      gtk_container_add (GTK_CONTAINER (box2), button);
+
+      button = gtk_button_new_with_label ("Close");
+      g_signal_connect_swapped (button, "clicked",
+                                G_CALLBACK(gtk_widget_destroy), window);
+      gtk_container_add (GTK_CONTAINER (box2), button);
+      gtk_window_set_default_widget (GTK_WINDOW (window), button);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/meson.build

@@ -4,12 +4,12 @@ demos = files([
   'application_demo.c',
   'assistant.c',
   'builder.c',
+  'changedisplay.c',
   'clipboard.c',
   'colorsel.c',
   'combobox.c',
   'constraints.c',
   'constraints2.c',
-  'constraints3.c',
   'css_accordion.c',
   'css_basics.c',
   'css_blendmodes.c',
@@ -21,19 +21,17 @@ demos = files([
   'drawingarea.c',
   'dnd.c',
   'editable_cells.c',
+  'entry_buffer.c',
   'entry_completion.c',
-  'entry_undo.c',
   'expander.c',
   'filtermodel.c',
   'fishbowl.c',
   'fixed.c',
-  'fontrendering.c',
   'foreigndrawing.c',
   'gestures.c',
   'glarea.c',
   'headerbar.c',
   'hypertext.c',
-  'iconscroll.c',
   'iconview.c',
   'iconview_edit.c',
   'images.c',
@@ -43,6 +41,7 @@ demos = files([
   'flowbox.c',
   'list_store.c',
   'markup.c',
+  'menus.c',
   'modelbutton.c',
   'overlay.c',
   'overlay2.c',
@@ -71,7 +70,6 @@ demos = files([
   'tabs.c',
   'tagged_entry.c',
   'textmask.c',
-  'textundo.c',
   'textview.c',
   'textscroll.c',
   'themes.c',

demos/gtk-demo/messages.txt

@@ -378,7 +378,7 @@
 378|GTK+ and friends|GTKtoolkit|#GNUStep gets #GTK+ theming http://is.gd/95vHl more at http://is.gd/95wt8|1267029498|0||0|1
 379|GTK+ and friends|GTKtoolkit|GTK+ 2.19.6 released: http://mail.gnome.org/archives/gtk-devel-list/2010-February/msg00050.html #gtk|1266966985|0||0|0
 380|GTK+ and friends|GTKtoolkit|Did you know that #GTK+ is the official toolkit for the #LiMo software stack? http://bit.ly/cuEdHx|1266925406|0||0|0
-381|GTK+ and friends|GTKtoolkit|@lmedinas publishes a #javascript #example on how to put a status icon with #Gtk+ http://bit.ly/9py1uC Thanks a lot Luis!|1266886644|0||1|1
+381|GTK+ and friends|GTKtoolkit|@lmedinas publishes a #javascript #example on how to put an status icon with #Gtk+ http://bit.ly/9py1uC Thanks a lot Luis!|1266886644|0||1|1
 382|GTK+ and friends|GTKtoolkit|♺ @ebassi: I should really finish up the GDom API as well|1266880653|0||0|0
 383|GTK+ and friends|GTKtoolkit|♺ @ebassi: I hope to work on this for the next GIO release, and the GTK+ side for 3.0|1266880641|0||0|0
 384|GTK+ and friends|GTKtoolkit|♺ @ebassi: just updated the ApplicationClass design wiki page with the stuff @Cwiiis did for Mx - http://bit.ly/cfAOJk|1266880559|0||0|0

demos/gtk-demo/modelbutton.c

@@ -14,8 +14,8 @@
 
 #include <gtk/gtk.h>
 
-void
-modelbutton_tool_clicked (GtkButton *button)
+static void
+tool_clicked (GtkButton *button)
 {
   gboolean active;
 
@@ -40,6 +40,8 @@ do_modelbutton (GtkWidget *do_widget)
       GActionGroup *actions;
 
       builder = gtk_builder_new_from_resource ("/modelbutton/modelbutton.ui");
+      gtk_builder_add_callback_symbol (builder, "tool_clicked", G_CALLBACK (tool_clicked));
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/modelbutton.ui

@@ -14,19 +14,34 @@
         <child>
           <object class="GtkMenuButton">
             <property name="popover">thing_a</property>
-            <property name="label">Color</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Color</property>
+                <property name="hexpand">1</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
           <object class="GtkMenuButton">
             <property name="popover">thing_b</property>
-            <property name="label">Flavors</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Flavors</property>
+                <property name="hexpand">1</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
           <object class="GtkMenuButton">
             <property name="popover">thing_c</property>
-            <property name="label">Tools</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Tools</property>
+                <property name="hexpand">1</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
@@ -42,6 +57,7 @@
             <property name="action-name">win.color</property>
             <property name="action-target">&apos;red&apos;</property>
             <property name="text">Red</property>
+            <property name="inverted">1</property>
           </object>
         </child>
         <child>
@@ -49,6 +65,7 @@
             <property name="action-name">win.color</property>
             <property name="action-target">&apos;green&apos;</property>
             <property name="text">Green</property>
+            <property name="inverted">1</property>
           </object>
         </child>
         <child>
@@ -56,6 +73,7 @@
             <property name="action-name">win.color</property>
             <property name="action-target">&apos;blue&apos;</property>
             <property name="text">Blue</property>
+            <property name="inverted">1</property>
           </object>
         </child>
       </object>
@@ -101,21 +119,21 @@
           <object class="GtkModelButton">
             <property name="text">Hammer</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="text">Screwdriver</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="text">Drill</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
       </object>

demos/gtk-demo/paintable_mediastream.c

@@ -6,7 +6,7 @@
  * GTK uses for videos. This allows treating the icon like a
  * regular video, so we can for example attach controls to it.
  *
- * After all, what good is a media_stream if one cannot pause
+ * After all, what good is an media_stream if one cannot pause
  * it.
  */
 

demos/gtk-demo/revealer.c

@@ -69,6 +69,7 @@ do_revealer (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/scale.c

@@ -18,6 +18,7 @@ do_scale (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/scale/scale.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/scale.ui

@@ -75,11 +75,11 @@
             <property name="adjustment">adjustment2</property>
             <property name="hexpand">1</property>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
             <accessibility>
               <relation type="labelled-by" target="label_marks"/>
@@ -115,11 +115,11 @@
               <relation type="labelled-by" target="label_discrete"/>
             </accessibility>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
             <layout>
               <property name="left-attach">1</property>

demos/gtk-demo/shortcuts.c

@@ -25,44 +25,44 @@ show_shortcuts (GtkWidget   *window,
   g_object_unref (builder);
 }
 
-void
-shortcuts_builder_shortcuts (GtkWidget *window)
+static void
+builder_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-builder", NULL);
 }
 
-void
-shortcuts_gedit_shortcuts (GtkWidget *window)
+static void
+gedit_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-gedit", NULL);
 }
 
-void
-shortcuts_clocks_shortcuts (GtkWidget *window)
+static void
+clocks_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-clocks", NULL);
 }
 
-void
-shortcuts_clocks_shortcuts_stopwatch (GtkWidget *window)
+static void
+clocks_shortcuts_stopwatch (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-clocks", "stopwatch");
 }
 
-void
-shortcuts_boxes_shortcuts (GtkWidget *window)
+static void
+boxes_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", NULL);
 }
 
-void
-shortcuts_boxes_shortcuts_wizard (GtkWidget *window)
+static void
+boxes_shortcuts_wizard (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", "wizard");
 }
 
-void
-shortcuts_boxes_shortcuts_display (GtkWidget *window)
+static void
+boxes_shortcuts_display (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", "display");
 }
@@ -86,6 +86,16 @@ do_shortcuts (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/shortcuts/shortcuts.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "builder_shortcuts", G_CALLBACK (builder_shortcuts),
+                                        "gedit_shortcuts", G_CALLBACK (gedit_shortcuts),
+                                        "clocks_shortcuts", G_CALLBACK (clocks_shortcuts),
+                                        "clocks_shortcuts_stopwatch", G_CALLBACK (clocks_shortcuts_stopwatch),
+                                        "boxes_shortcuts", G_CALLBACK (boxes_shortcuts),
+                                        "boxes_shortcuts_wizard", G_CALLBACK (boxes_shortcuts_wizard),
+                                        "boxes_shortcuts_display", G_CALLBACK (boxes_shortcuts_display),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/shortcuts.ui

@@ -10,43 +10,43 @@
         <child>
           <object class="GtkButton">
             <property name="label">Builder</property>
-            <signal name="clicked" handler="shortcuts_builder_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="builder_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">GEdit</property>
-            <signal name="clicked" handler="shortcuts_gedit_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="gedit_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Clocks - All</property>
-            <signal name="clicked" handler="shortcuts_clocks_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Clocks - Stopwatch</property>
-            <signal name="clicked" handler="shortcuts_clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes - Wizard</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts_wizard" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes - Display</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts_display" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
           </object>
         </child>
       </object>

demos/gtk-demo/sidebar.c

@@ -54,7 +54,10 @@ do_sidebar (GtkWidget *do_widget)
       stack = gtk_stack_new ();
       gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
       gtk_stack_sidebar_set_stack (GTK_STACK_SIDEBAR (sidebar), GTK_STACK (stack));
-      gtk_widget_set_hexpand (stack, TRUE);
+
+      /* Separator between sidebar and stack */
+      widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+      gtk_container_add (GTK_CONTAINER(box), widget);
 
       gtk_container_add (GTK_CONTAINER (box), stack);
 
@@ -63,7 +66,6 @@ do_sidebar (GtkWidget *do_widget)
           if (i == 0)
             {
               widget = gtk_image_new_from_icon_name ("org.gtk.Demo4");
-              gtk_style_context_add_class (gtk_widget_get_style_context (widget), "icon-dropshadow");
               gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
             }
           else

demos/gtk-demo/spinbutton.c

@@ -11,9 +11,9 @@
 #include <math.h>
 #include <stdlib.h>
 
-gint
-spinbutton_hex_spin_input (GtkSpinButton *spin_button,
-                           gdouble       *new_val)
+static gint
+hex_spin_input (GtkSpinButton *spin_button,
+                gdouble       *new_val)
 {
   const gchar *buf;
   gchar *err;
@@ -28,8 +28,8 @@ spinbutton_hex_spin_input (GtkSpinButton *spin_button,
     return TRUE;
 }
 
-gint
-spinbutton_hex_spin_output (GtkSpinButton *spin_button)
+static gint
+hex_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gchar *buf;
@@ -48,9 +48,9 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-gint
-spinbutton_time_spin_input (GtkSpinButton *spin_button,
-                            gdouble       *new_val)
+static gint
+time_spin_input (GtkSpinButton *spin_button,
+                 gdouble       *new_val)
 {
   const gchar *text;
   gchar **str;
@@ -87,8 +87,8 @@ spinbutton_time_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
-spinbutton_time_spin_output (GtkSpinButton *spin_button)
+static gint
+time_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gchar *buf;
@@ -121,9 +121,9 @@ static gchar *month[12] = {
   "December"
 };
 
-gint
-spinbutton_month_spin_input (GtkSpinButton *spin_button,
-                             gdouble       *new_val)
+static gint
+month_spin_input (GtkSpinButton *spin_button,
+                  gdouble       *new_val)
 {
   gint i;
   gchar *tmp1, *tmp2;
@@ -150,8 +150,8 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
-spinbutton_month_spin_output (GtkSpinButton *spin_button)
+static gint
+month_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gdouble value;
@@ -191,6 +191,15 @@ do_spinbutton (GtkWidget *do_widget)
     GtkWidget *label;
 
     builder = gtk_builder_new_from_resource ("/spinbutton/spinbutton.ui");
+    gtk_builder_add_callback_symbols (builder,
+                                      "hex_spin_input", G_CALLBACK (hex_spin_input),
+                                      "hex_spin_output", G_CALLBACK (hex_spin_output),
+                                      "time_spin_input", G_CALLBACK (time_spin_input),
+                                      "time_spin_output", G_CALLBACK (time_spin_output),
+                                      "month_spin_input", G_CALLBACK (month_spin_input),
+                                      "month_spin_output", G_CALLBACK (month_spin_output),
+                                      NULL);
+    gtk_builder_connect_signals (builder, NULL);
     window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));

demos/gtk-demo/spinbutton.ui

@@ -83,8 +83,8 @@
             <property name="halign">start</property>
             <property name="width-chars">4</property>
             <property name="adjustment">hex_adjustment</property>
-            <signal name="input" handler="spinbutton_hex_spin_input"/>
-            <signal name="output" handler="spinbutton_hex_spin_output"/>
+            <signal name="input" handler="hex_spin_input"/>
+            <signal name="output" handler="hex_spin_output"/>
             <property name="wrap">1</property>
             <layout>
               <property name="left-attach">1</property>
@@ -119,8 +119,8 @@
             <property name="halign">start</property>
             <property name="width-chars">5</property>
             <property name="adjustment">time_adjustment</property>
-            <signal name="input" handler="spinbutton_time_spin_input"/>
-            <signal name="output" handler="spinbutton_time_spin_output"/>
+            <signal name="input" handler="time_spin_input"/>
+            <signal name="output" handler="time_spin_output"/>
             <property name="wrap">1</property>
             <layout>
               <property name="left-attach">1</property>
@@ -154,8 +154,8 @@
           <object class="GtkSpinButton" id="month_spin">
             <property name="halign">start</property>
             <property name="width-chars">9</property>
-            <signal name="input" handler="spinbutton_month_spin_input"/>
-            <signal name="output" handler="spinbutton_month_spin_output"/>
+            <signal name="input" handler="month_spin_input"/>
+            <signal name="output" handler="month_spin_output"/>
             <property name="adjustment">month_adjustment</property>
             <property name="wrap">1</property>
             <property name="update-policy">if-valid</property>

demos/gtk-demo/stack.c

@@ -18,6 +18,7 @@ do_stack (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/stack/stack.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/textundo.c

@@ -1,71 +0,0 @@
-/* Text View/Undo and Redo
- *
- * The GtkTextView supports undo and redo through the use of a
- * GtkTextBuffer. You can enable or disable undo support using
- * gtk_text_buffer_set_enable_undo().
- *
- * Use Primary+Z to undo and Primary+Shift+Z or Primary+Y to
- * redo previously undone operations.
- */
-
-#include <gtk/gtk.h>
-#include <stdlib.h> /* for exit() */
-
-GtkWidget *
-do_textundo (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkWidget *sw;
-      GtkTextBuffer *buffer;
-      GtkTextIter iter;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   450, 450);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "TextView Undo");
-
-      view = gtk_text_view_new ();
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_enable_undo (buffer, TRUE);
-
-      /* this text cannot be undone */
-      gtk_text_buffer_begin_irreversible_action (buffer);
-      gtk_text_buffer_get_start_iter (buffer, &iter);
-      gtk_text_buffer_insert (buffer, &iter,
-                              "Type to add more text.\n"
-                              "Use Primary+Z to undo and Primary+Shift+Z to redo a previously undone action.\n"
-                              "\n",
-                              -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/textview.c

@@ -128,23 +128,24 @@ insert_text (GtkTextBuffer *buffer)
 {
   GtkTextIter iter;
   GtkTextIter start, end;
+  GdkPixbuf *pixbuf;
   GdkTexture *texture;
   GtkIconTheme *icon_theme;
 
   icon_theme = gtk_icon_theme_get_default ();
-  texture = GDK_TEXTURE (gtk_icon_theme_load_icon (icon_theme,
-                                                   "gtk3-demo",
-                                                   32,
-                                                   GTK_ICON_LOOKUP_GENERIC_FALLBACK,
-                                                   NULL));
-  g_assert (texture);
+  pixbuf = gtk_icon_theme_load_icon (icon_theme,
+                                     "gtk3-demo",
+                                     32,
+                                     GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+                                     NULL);
+  g_assert (pixbuf);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
 
   /* get start of buffer; each insertion will revalidate the
    * iterator to point to just after the inserted text.
    */
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
 
-  gtk_text_buffer_begin_irreversible_action (buffer);
   gtk_text_buffer_insert (buffer, &iter,
       "The text widget can display text with all kinds of nifty attributes. "
       "It also supports multiple views of the same buffer; this demo is "
@@ -378,8 +379,7 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_get_bounds (buffer, &start, &end);
   gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end);
 
-  gtk_text_buffer_end_irreversible_action (buffer);
-
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 }
 

demos/gtk-demo/themes.ui

@@ -6,235 +6,236 @@
       <object class="GtkHeaderBar" id="header">
         <property name="show-title-buttons">1</property>
         <child type="end">
-          <object class="GtkLabel" id="fps"/>
+          <object class="GtkLabel" id="fps">
+          </object>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin">10</property>
-        <property name="row-spacing">10</property>
-        <property name="orientation">vertical</property>
+  <object class="GtkGrid" id="grid">
+    <property name="margin">10</property>
+    <property name="row-spacing">10</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkToolbar">
+        <property name="hexpand">1</property>
+        <property name="show-arrow">0</property>
+        <style>
+          <class name="primary-toolbar"/>
+        </style>
         <child>
-          <object class="GtkToolbar">
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Raised</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <style>
+              <class name="raised"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Raised Active</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="active">1</property>
+            <style>
+              <class name="raised"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="is-important">1</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToolItem">
+            <child>
+              <object class="GtkEntry" id="entry1">
+                <property name="can-focus">1</property>
+                <property name="width-chars">10</property>
+                <property name="invisible-char">•</property>
+                <property name="placeholder-text" translatable="yes">Search...</property>
+                <property name="secondary-icon-name">edit-find-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToolItem">
+            <child>
+              <object class="GtkSwitch" id="switch1">
+                <property name="can-focus">1</property>
+                <property name="valign">center</property>
+                <property name="tooltip_text">Switch it</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="valign">center</property>
+        <property name="halign">center</property>
+        <style>
+          <class name="linked"/>
+        </style>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">Hi, I am a button</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">And I&apos;m another button</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">This is a button party!</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToolbar">
+        <property name="hexpand">1</property>
+        <property name="toolbar-style">icons</property>
+        <style>
+          <class name="inline-toolbar"/>
+        </style>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">go-up-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="spacing">10</property>
+        <child>
+          <object class="GtkButton">
+            <property name="label">Plain</property>
+            <property name="halign">end</property>
             <property name="hexpand">1</property>
-            <property name="show-arrow">0</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Raised</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Raised Active</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="active">1</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="is-important">1</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolItem">
-                <child>
-                  <object class="GtkEntry" id="entry1">
-                    <property name="can-focus">1</property>
-                    <property name="width-chars">10</property>
-                    <property name="invisible-char">•</property>
-                    <property name="placeholder-text" translatable="yes">Search...</property>
-                    <property name="secondary-icon-name">edit-find-symbolic</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolItem">
-                <child>
-                  <object class="GtkSwitch" id="switch1">
-                    <property name="can-focus">1</property>
-                    <property name="valign">center</property>
-                    <property name="tooltip_text">Switch it</property>
-                  </object>
-                </child>
-              </object>
-            </child>
+            <property name="vexpand">1</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="valign">center</property>
-            <property name="halign">center</property>
+          <object class="GtkButton">
+            <property name="label">Destructive</property>
             <style>
-              <class name="linked"/>
+              <class name="destructive-action"/>
             </style>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">Hi, I am a button</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">And I&apos;m another button</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">This is a button party!</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
           </object>
         </child>
         <child>
-          <object class="GtkToolbar">
-            <property name="hexpand">1</property>
-            <property name="toolbar-style">icons</property>
+          <object class="GtkButton">
+            <property name="label">Suggested</property>
             <style>
-              <class name="inline-toolbar"/>
+              <class name="suggested-action"/>
             </style>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-add-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-add-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-remove-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-remove-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">edit-find-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">go-up-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="spacing">10</property>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Plain</property>
-                <property name="halign">end</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Destructive</property>
-                <style>
-                  <class name="destructive-action"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Suggested</property>
-                <style>
-                  <class name="suggested-action"/>
-                </style>
-              </object>
-            </child>
           </object>
         </child>
       </object>
     </child>
   </object>
+    </child>
+  </object>
 </interface>

demos/gtk-demo/theming.ui

@@ -2,7 +2,6 @@
 <interface>
   <object class="GtkGrid" id="grid">
     <property name="row-spacing">10</property>
-    <property name="margin">10</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkToolbar">
@@ -93,7 +92,6 @@
             <child>
               <object class="GtkSwitch" id="switch1">
                 <property name="can-focus">1</property>
-                <property name="valign">center</property>
                 <property name="tooltip_text">Switch it</property>
               </object>
             </child>

demos/icon-browser/icon.list

@@ -285,7 +285,7 @@ user-trash=The icon for the user's “Trash” place in the file system
 user-trash-full=The icon for the user's “Trash” in the file system, when there are items in the “Trash” waiting for disposal or recovery
 emblem-system=The icon used as an emblem for directories that contain system libraries, settings, and data
 avatar-default=The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar
-emblem-synchronizing=The icon used as an emblem to indicate that a synchronizing operation is in process
+emblem-synchronizing=The icon used as an emblem to indicate that a a synchronizing operation is in process
 emblem-shared=The icon used as an emblem for files and directories that are shared to other users
 help-browser=The icon used for the desktop's help browsing application
 

demos/icon-browser/iconbrowserwin.c

@@ -5,6 +5,9 @@
 #include <gtk/gtk.h>
 
 /* Drag 'n Drop */
+static const char *target_table[] = {
+  "text/uri-list"
+};
 
 typedef struct
 {
@@ -73,11 +76,27 @@ search_text_changed (GtkEntry *entry, IconBrowserWindow *win)
   gtk_tree_model_filter_refilter (win->filter_model);
 }
 
+static GdkPixbuf *
+get_icon (GtkWidget *image, const gchar *name, gint size)
+{
+  GtkIconInfo *info;
+  GtkStyleContext *context;
+  GdkPixbuf *pixbuf;
+
+  context = gtk_widget_get_style_context (image);
+  info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, size, 0);
+  pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
+  g_object_unref (info);
+
+  return pixbuf;
+}
+
 static void
 set_image (GtkWidget *image, const gchar *name, gint size)
 {
   gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
   gtk_image_set_pixel_size (GTK_IMAGE (image), size);
+  gtk_drag_source_set_icon_name (image, name);
 }
 
 static void
@@ -343,107 +362,78 @@ search_mode_toggled (GObject *searchbar, GParamSpec *pspec, IconBrowserWindow *w
     gtk_list_box_unselect_all (GTK_LIST_BOX (win->context_list));
 }
 
-static GdkPaintable *
-get_image_paintable (GtkImage *image)
+static void
+get_image_data (GtkWidget        *widget,
+                GdkDrag          *drag,
+                GtkSelectionData *selection,
+                guint             target_info,
+                gpointer          data)
 {
-  const gchar *icon_name;
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  int size;
+  GtkWidget *image;
+  const gchar *name;
+  gint size;
+  GdkPixbuf *pixbuf;
 
-  switch (gtk_image_get_storage_type (image))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
-    case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (image);
-      size = gtk_image_get_pixel_size (image);
-      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
-                                              GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
-      if (icon_info == NULL)
-        return NULL;
-      return gtk_icon_info_load_icon (icon_info, NULL);
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (image));
-      return NULL;
-    }
+  image = gtk_bin_get_child (GTK_BIN (widget));
+
+  name = gtk_image_get_icon_name (GTK_IMAGE (image));
+  size = gtk_image_get_pixel_size (GTK_IMAGE (image));
+
+  pixbuf = get_icon (image, name, size);
+  gtk_selection_data_set_pixbuf (selection, pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag,
-            GtkWidget     *widget)
+get_scalable_image_data (GtkWidget        *widget,
+                         GdkDrag          *drag,
+                         GtkSelectionData *selection,
+                         guint             target_info,
+                         gpointer          data)
 {
-  GdkPaintable *paintable;
-
-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (paintable)
-    {
-      int w, h;
-
-      w = gdk_paintable_get_intrinsic_width (paintable);
-      h = gdk_paintable_get_intrinsic_height (paintable);
-      gtk_drag_source_set_icon (source, paintable, w, h);
-      g_object_unref (paintable);
-    }
-}
-
-static void
-get_texture (GValue   *value,
-             gpointer  data)
-{
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
-
-  if (GDK_IS_TEXTURE (paintable))
-    g_value_set_object (value, paintable);
-}
-
-static void
-get_file (GValue   *value,
-          gpointer  data)
-{
-  const char *name;
+  gchar *uris[2];
   GtkIconInfo *info;
+  GtkWidget *image;
   GFile *file;
+  const gchar *name;
 
-  name = gtk_image_get_icon_name (GTK_IMAGE (data));
+  image = gtk_bin_get_child (GTK_BIN (widget));
+  name = gtk_image_get_icon_name (GTK_IMAGE (image));
 
   info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, -1, 0);
   file = g_file_new_for_path (gtk_icon_info_get_filename (info));
-  g_value_set_object (value, file);
-  g_object_unref (file);
+  uris[0] = g_file_get_uri (file);
+  uris[1] = NULL;
+
+  gtk_selection_data_set_uris (selection, uris);
+
+  g_free (uris[0]);
   g_object_unref (info);
+  g_object_unref (file);
 }
 
 static void
 setup_image_dnd (GtkWidget *image)
 {
-  GdkContentProvider *content;
-  GtkDragSource *source;
-
-  source = gtk_drag_source_new ();
-  content = gdk_content_provider_new_with_callback (GDK_TYPE_TEXTURE, get_texture, image);
-  gtk_drag_source_set_content (source, content);
-  g_object_unref (content);
-  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-  gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+  gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+  gtk_drag_source_add_image_targets (image);
+  g_signal_connect (image, "drag-data-get", G_CALLBACK (get_image_data), NULL);
 }
 
 static void
 setup_scalable_image_dnd (GtkWidget *image)
 {
-  GdkContentProvider *content;
-  GtkDragSource *source;
+  GtkWidget *parent;
+  GdkContentFormats *targets;
 
-  source = gtk_drag_source_new ();
-  content = gdk_content_provider_new_with_callback (G_TYPE_FILE, get_file, image);
-  gtk_drag_source_set_content (source, content);
-  g_object_unref (content);
+  parent = gtk_widget_get_parent (image);
+  targets = gdk_content_formats_new (target_table, G_N_ELEMENTS (target_table));
+  gtk_drag_source_set (parent, GDK_BUTTON1_MASK,
+                       targets,
+                       GDK_ACTION_COPY);
+  gdk_content_formats_unref (targets);
 
-  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-  gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+  g_signal_connect (parent, "drag-data-get", G_CALLBACK (get_scalable_image_data), NULL);
 }
 
 static void
@@ -453,7 +443,8 @@ icon_browser_window_init (IconBrowserWindow *win)
 
   gtk_widget_init_template (GTK_WIDGET (win));
 
-  list = gdk_content_formats_new_for_gtype (G_TYPE_STRING);
+  list = gdk_content_formats_new (NULL, 0);
+  list = gtk_content_formats_add_text_targets (list);
   gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (win->list),
                                           GDK_BUTTON1_MASK,
                                           list,
@@ -465,6 +456,7 @@ icon_browser_window_init (IconBrowserWindow *win)
   setup_image_dnd (win->image3);
   setup_image_dnd (win->image4);
   setup_image_dnd (win->image5);
+  setup_image_dnd (win->image6);
   setup_scalable_image_dnd (win->image6);
 
   win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, context_free);

demos/meson.build

@@ -1,4 +1,3 @@
-subdir('constraint-editor')
 subdir('gtk-demo')
 subdir('icon-browser')
 subdir('node-editor')

demos/node-editor/node-editor-application.c

@@ -26,9 +26,9 @@
 static const char *css =
 "textview.editor {"
 "  color: rgb(192, 197, 206);"
-"  caret-color: currentColor;"
+"  caret-color: white;"
 "}"
-"textview.editor > text {"
+"textview.editor text {"
 "  background-color: rgb(43, 48, 59);"
 "}"
 ;

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

@@ -707,14 +707,6 @@ static void
 node_editor_window_unrealize (GtkWidget *widget)
 {
   NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  guint i;
-
-  for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i ++)
-    {
-      gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
-      gsk_renderer_unrealize (gtk_renderer_paintable_get_renderer (item));
-      g_object_unref (item);
-    }
 
   g_list_store_remove_all (self->renderers);
 

demos/widget-factory/widget-factory.c

@@ -1003,9 +1003,6 @@ populate_flowbox (GtkWidget *flowbox)
 
   while ((name = g_dir_read_name (dir)) != NULL)
     {
-      if (g_str_has_suffix (name, ".xml"))
-        continue;
-
       filename = g_build_filename (location, name, NULL);
       file = g_file_new_for_path (filename);
       stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
@@ -1020,7 +1017,7 @@ populate_flowbox (GtkWidget *flowbox)
           bd = g_new (BackgroundData, 1);
           bd->flowbox = flowbox;
           bd->filename = filename;
-          gdk_pixbuf_new_from_stream_at_scale_async (stream, 110, 110, TRUE, NULL,
+          gdk_pixbuf_new_from_stream_at_scale_async (stream, 110, 110, TRUE, NULL, 
                                                      background_loaded_cb, bd);
         }
 
@@ -1053,6 +1050,27 @@ row_activated (GtkListBox *box, GtkListBoxRow *row)
     }
 }
 
+static void
+set_accel (GtkApplication *app, GtkWidget *widget)
+{
+  GtkWidget *accel_label;
+  const gchar *action;
+  gchar **accels;
+  guint key;
+  GdkModifierType mods;
+
+  accel_label = gtk_bin_get_child (GTK_BIN (widget));
+  g_assert (GTK_IS_ACCEL_LABEL (accel_label));
+
+  action = gtk_actionable_get_action_name (GTK_ACTIONABLE (widget));
+  accels = gtk_application_get_accels_for_action (app, action);
+
+  gtk_accelerator_parse (accels[0], &key, &mods);
+  gtk_accel_label_set_accel (GTK_ACCEL_LABEL (accel_label), key, mods);
+
+  g_strfreev (accels);
+}
+
 typedef struct
 {
   GtkTextView tv;
@@ -1387,10 +1405,8 @@ text_view_add_to_context_menu (GtkTextView *text_view)
   item = g_menu_item_new (_("Underline"), "format.underline");
   g_menu_item_set_attribute (item, "touch-icon", "s", "format-text-underline-symbolic");
   g_menu_append_item (G_MENU (menu), item);
-  g_object_unref (item);
 
   gtk_text_view_set_extra_menu (text_view, G_MENU_MODEL (menu));
-  g_object_unref (menu);
 
   g_signal_connect (gtk_text_view_get_buffer (text_view), "changed", G_CALLBACK (text_changed), NULL);
   g_signal_connect (gtk_text_view_get_buffer (text_view), "mark-set", G_CALLBACK (text_changed), NULL);
@@ -1585,14 +1601,14 @@ reset_icon_size (GtkWidget *iv)
   gtk_widget_queue_resize (iv);
 }
 
-static char *
-scale_format_value_blank (GtkScale *scale, double value, gpointer user_data)
+static gchar *
+scale_format_value_blank (GtkScale *scale, gdouble value)
 {
   return g_strdup (" ");
 }
 
-static char *
-scale_format_value (GtkScale *scale, double value, gpointer user_data)
+static gchar *
+scale_format_value (GtkScale *scale, gdouble value)
 {
   return g_strdup_printf ("%0.*f", 1, value);
 }
@@ -1631,7 +1647,7 @@ set_up_context_popover (GtkWidget *widget,
   GtkWidget *popover = gtk_popover_menu_new_from_model (widget, model);
   GtkGesture *gesture;
 
-  gtk_popover_set_has_arrow (GTK_POPOVER (popover), FALSE);
+  g_object_set (popover, "has-arrow", FALSE, NULL);
   gesture = gtk_gesture_click_new ();
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
   g_signal_connect (gesture, "pressed", G_CALLBACK (clicked_cb), popover);
@@ -1642,7 +1658,6 @@ static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
-  GtkBuilderScope *scope;
   GtkWindow *window;
   GtkWidget *widget;
   GtkWidget *widget2;
@@ -1692,28 +1707,26 @@ activate (GApplication *app)
   gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory4/widget-factory.css");
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+                                              GTK_STYLE_PROVIDER_PRIORITY_USER);
   g_object_unref (provider);
 
-  builder = gtk_builder_new ();
-  scope = gtk_builder_cscope_new ();
-  gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-          "on_entry_icon_release", (GCallback)on_entry_icon_release,
-          "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed,
-          "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip,
-          "on_record_button_toggled", (GCallback)on_record_button_toggled,
-          "on_page_combo_changed", (GCallback)on_page_combo_changed,
-          "on_range_from_changed", (GCallback)on_range_from_changed,
-          "on_range_to_changed", (GCallback)on_range_to_changed,
-          "tab_close_cb", (GCallback)tab_close_cb,
-          "increase_icon_size", (GCallback)increase_icon_size,
-          "decrease_icon_size", (GCallback)decrease_icon_size,
-          "reset_icon_size", (GCallback)reset_icon_size,
-          "osd_frame_pressed", (GCallback)osd_frame_pressed,
-          NULL);
-  gtk_builder_set_scope (builder, scope);
-  g_object_unref (scope);
-  gtk_builder_add_from_resource (builder, "/org/gtk/WidgetFactory4/widget-factory.ui", NULL);
+  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory4/widget-factory.ui");
+  gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
+  gtk_builder_add_callback_symbol (builder, "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed);
+  gtk_builder_add_callback_symbol (builder, "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip);
+  gtk_builder_add_callback_symbol (builder, "on_record_button_toggled", (GCallback)on_record_button_toggled);
+  gtk_builder_add_callback_symbol (builder, "on_page_combo_changed", (GCallback)on_page_combo_changed);
+  gtk_builder_add_callback_symbol (builder, "on_range_from_changed", (GCallback)on_range_from_changed);
+  gtk_builder_add_callback_symbol (builder, "on_range_to_changed", (GCallback)on_range_to_changed);
+  gtk_builder_add_callback_symbol (builder, "tab_close_cb", (GCallback)tab_close_cb);
+  gtk_builder_add_callback_symbol (builder, "increase_icon_size", (GCallback)increase_icon_size);
+  gtk_builder_add_callback_symbol (builder, "decrease_icon_size", (GCallback)decrease_icon_size);
+  gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
+  gtk_builder_add_callback_symbol (builder, "scale_format_value", (GCallback)scale_format_value);
+  gtk_builder_add_callback_symbol (builder, "scale_format_value_blank", (GCallback)scale_format_value_blank);
+  gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);
+
+  gtk_builder_connect_signals (builder, NULL);
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);
@@ -1842,6 +1855,13 @@ activate (GApplication *app)
   g_object_set_data (G_OBJECT (widget2), "range_to_spin", widget3);
   g_object_set_data (G_OBJECT (widget), "print_button", widget4);
 
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "quitmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "deletemenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "searchmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "darkmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "aboutmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "bgmenuitem")));
+
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "tooltextview");
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbutton1");
@@ -1923,12 +1943,6 @@ activate (GApplication *app)
   widget = (GtkWidget *)gtk_builder_get_object (builder, "extra_info_entry");
   g_timeout_add (100, (GSourceFunc)pulse_it, widget);
 
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "scale3");
-  gtk_scale_set_format_value_func (GTK_SCALE (widget), scale_format_value, NULL, NULL);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "scale4");
-  gtk_scale_set_format_value_func (GTK_SCALE (widget), scale_format_value_blank, NULL, NULL);
-
   widget = (GtkWidget *)gtk_builder_get_object (builder, "box_for_context");
   model = (GMenuModel *)gtk_builder_get_object (builder, "new_style_context_menu_model");
   set_up_context_popover (widget, model);
@@ -2000,13 +2014,6 @@ toggle_action (GSimpleAction *action,
                              g_variant_new_boolean (!g_variant_get_boolean (state)));
 }
 
-static gboolean
-quit_timeout (gpointer data)
-{
-  exit (0);
-  return G_SOURCE_REMOVE;
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -2072,9 +2079,6 @@ main (int argc, char *argv[])
 
   g_application_add_main_option (G_APPLICATION (app), "version", 0, 0, G_OPTION_ARG_NONE, "Show program version", NULL);
 
-  if (g_getenv ("GTK_DEBUG_AUTO_QUIT"))
-    g_timeout_add (500, quit_timeout, NULL);
-
   g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);

demos/widget-factory/widget-factory.ui

@@ -598,6 +598,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
                                 </child>
                                 <child>
@@ -662,8 +666,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
                                       <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -736,6 +740,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="active">1</property>
                                     <layout>
                                       <property name="left-attach">2</property>
+                                      <property name="top-attach">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -966,11 +971,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="adjustment">adjustment3</property>
                                 <property name="restrict-to-fill-level">0</property>
                                 <marks>
-                                  <mark value="0" position="bottom"></mark>
-                                  <mark value="1" position="bottom"></mark>
-                                  <mark value="2" position="bottom"></mark>
-                                  <mark value="3" position="bottom"></mark>
-                                  <mark value="4" position="bottom"></mark>
+                                  <mark value="0" position="bottom"/>
+                                  <mark value="1" position="bottom"/>
+                                  <mark value="2" position="bottom"/>
+                                  <mark value="3" position="bottom"/>
+                                  <mark value="4" position="bottom"/>
                                 </marks>
                               </object>
                             </child>
@@ -1014,6 +1019,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="fill-level">75</property>
                                         <property name="digits">-1</property>
                                         <property name="halign">end</property>
+                                        <signal name="format-value" handler="scale_format_value"/>
                                       </object>
                                     </child>
                                     <child>
@@ -1027,6 +1033,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="fill-level">75</property>
                                         <property name="digits">-1</property>
                                         <property name="halign">start</property>
+                                        <signal name="format-value" handler="scale_format_value_blank"/>
                                       </object>
                                     </child>
                                   </object>
@@ -1570,7 +1577,7 @@ microphone-sensitivity-medium-symbolic</property>
                                                 <property name="icon-name">org.gtk.WidgetFactory4</property>
                                                 <property name="pixel-size">256</property>
                                                 <style>
-                                                  <class name="icon-dropshadow"/>
+                                                  <class name="icon-dropshadow" />
                                                 </style>
                                               </object>
                                             </property>
@@ -1721,11 +1728,15 @@ microphone-sensitivity-medium-symbolic</property>
                                               </object>
                                             </child>
                                             <child>
-                                              <object class="GtkSpinButton">
-                                                <property name="adjustment">adjustment1</property>
-                                                <property name="hexpand">1</property>
+                                              <object class="GtkImage">
+                                                <property name="icon-name">object-select-symbolic</property>
                                                 <property name="halign">end</property>
                                                 <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                                <property name="opacity">0</property>
                                               </object>
                                             </child>
                                           </object>
@@ -1814,6 +1825,253 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="menu-model">menu_bar_model</property>
                                       </object>
                                     </child>
+                                    <child>
+                                      <object class="GtkMenuBar">
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem1">
+                                            <property name="label" translatable="yes">File</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu1">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem101">
+                                                    <property name="label" translatable="yes">_New</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem102">
+                                                    <property name="label" translatable="yes">_Open</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem103">
+                                                    <property name="label" translatable="yes">_Save</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem104">
+                                                    <property name="label" translatable="yes">Save _As</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkSeparatorMenuItem" id="separatormenuitem1"/>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="quitmenuitem">
+                                                    <property name="label" translatable="yes">_Quit</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">app.quit</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem2">
+                                            <property name="label" translatable="yes">Edit</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu2">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem106">
+                                                    <property name="label" translatable="yes">Cu_t</property>
+                                                    <property name="can-focus">1</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem107">
+                                                    <property name="label" translatable="yes">_Copy</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem108">
+                                                    <property name="label" translatable="yes">_Paste</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="deletemenuitem">
+                                                    <property name="label" translatable="yes">_Delete</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.delete</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="searchmenuitem">
+                                                    <property name="label" translatable="yes">_Search</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.search</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="togglesmenuitem">
+                                                    <property name="label">Checks &amp; Radios</property>
+                                                    <property name="use-underline">1</property>
+                                                    <child type="submenu">
+                                                      <object class="GtkMenu" id="togglessubmenu">
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem1">
+                                                            <property name="label">_Check</property>
+                                                            <property name="active">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem2">
+                                                            <property name="label">_Check</property>
+                                                            <property name="active">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem3">
+                                                            <property name="label">_Check</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem4">
+                                                            <property name="label">_Check</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem5">
+                                                            <property name="label">_Check</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem6">
+                                                            <property name="label">_Check</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkSeparatorMenuItem" id="separatormenuitem"/>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem1">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="active">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem2">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="active">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem3">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem4">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem5">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem6">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem3">
+                                            <property name="label" translatable="yes">View</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="view-menu">
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="darkmenuitem">
+                                                    <property name="label">_Dark theme</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.dark</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="toolbarmenuitem">
+                                                    <property name="label">_Toolbar</property>
+                                                    <property name="active">1</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.toolbar</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="statusbarmenuitem">
+                                                    <property name="label">_Statusbar</property>
+                                                    <property name="active">1</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.statusbar</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="bgmenuitem">
+                                                    <property name="label">_Select Background</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.background</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem4">
+                                            <property name="label" translatable="yes">Help</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu3">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="aboutmenuitem">
+                                                    <property name="label" translatable="yes">_About</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">app.about</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
                                     <child>
                                       <object class="GtkToolbar" id="toolbar">
                                         <child>
@@ -1862,7 +2120,7 @@ microphone-sensitivity-medium-symbolic</property>
                                       <object class="GtkInfoBar" id="infobar">
                                         <property name="visible">0</property>
                                         <property name="show-close-button">1</property>
-                                        <child>
+                                        <child internal-child="content_area">
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
@@ -1873,11 +2131,9 @@ microphone-sensitivity-medium-symbolic</property>
                                         </child>
                                       </object>
                                     </child>
-                                    <child>
-                                      <object class="GtkSeparator"/>
-                                    </child>
                                     <child>
                                       <object class="GtkScrolledWindow">
+                                        <property name="shadow-type">in</property>
                                         <property name="vexpand">1</property>
                                         <child>
                                           <object class="MyTextView" id="text3">
@@ -1891,9 +2147,6 @@ microphone-sensitivity-medium-symbolic</property>
                                         </child>
                                       </object>
                                     </child>
-                                    <child>
-                                      <object class="GtkSeparator"/>
-                                    </child>
                                     <child>
                                       <object class="GtkStatusbar" id="statusbar"/>
                                     </child>
@@ -2184,9 +2437,11 @@ microphone-sensitivity-medium-symbolic</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox">
+                            <property name="halign">fill</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkBox" id="lockbox">
+                                <property name="halign">fill</property>
                                 <property name="hexpand">1</property>
                                 <property name="spacing">6</property>
                                 <child>
@@ -2263,6 +2518,9 @@ microphone-sensitivity-medium-symbolic</property>
                               <object class="GtkMenuButton">
                                 <property name="icon-name">view-more-symbolic</property>
                                 <property name="popover">new_style_menu</property>
+<!--
+                                <property name="menu-model">new_style_menu_model</property>
+-->
                               </object>
                             </child>
                           </object>
@@ -3097,6 +3355,10 @@ bad things might happen.</property>
             <accessibility>
               <relation type="label-for" target="open_popover_entry"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
         </child>
         <child>
@@ -3108,6 +3370,7 @@ bad things might happen.</property>
               <relation type="label-for" target="open_popover_textview"/>
             </accessibility>
             <layout>
+              <property name="left-attach">0</property>
               <property name="top-attach">1</property>
             </layout>
           </object>
@@ -3142,6 +3405,7 @@ bad things might happen.</property>
             </accessibility>
             <layout>
               <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3171,7 +3435,6 @@ bad things might happen.</property>
             <property name="halign">end</property>
             <property name="icon-name">emblem-system-symbolic</property>
             <property name="menu-model">gear_menu</property>
-            <property name="tooltip-text">This is a menu button</property>
             <layout>
               <property name="left-attach">1</property>
               <property name="top-attach">3</property>
@@ -3180,6 +3443,7 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkButton" id="open_popover_button">
+            <property name="halign">fill</property>
             <property name="label">_Open</property>
             <property name="use-underline">1</property>
             <property name="sensitive">0</property>
@@ -3228,7 +3492,7 @@ bad things might happen.</property>
     <property name="autohide">0</property>
     <child>
       <object class="GtkLabel">
-        <property name="label">You&apos;re in too deep!</property>
+        <property name="label">You're in too deep!</property>
         <accessibility>
           <role type="static"/>
         </accessibility>
@@ -3239,6 +3503,7 @@ bad things might happen.</property>
     <property name="autohide">0</property>
     <child>
       <object class="GtkBox">
+        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkLabel">
             <property name="label">Hidden gems:</property>
@@ -3258,246 +3523,222 @@ bad things might happen.</property>
       </object>
     </child>
   </object>
-  <object class="GtkPopover" id="new_style_menu">
+  <object class="GtkPopoverMenu" id="new_style_menu">
     <child>
-      <object class="GtkStack">
+      <object class="GtkBox">
+        <property name="name">main</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkStackPage">
-            <property name="name">main</property>
-            <property name="child">
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="circular-buttons"/>
-                    </style>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">printer-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                        <property name="action-name">app.print</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="circular"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">emblem-shared-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                        <property name="action-name">app.share</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="circular"/>
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Open in New Window</property>
-                    <property name="action-name">app.open-in</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="inline-buttons"/>
-                    </style>
-                    <child>
-                      <object class="GtkLabel" id="cut_copy_paste_filler"/>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">Edit</property>
-                        <property name="xalign">0</property>
-                        <property name="hexpand">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-cut-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-copy-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-paste-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Pin</property>
-                    <property name="action-name">app.pin</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Select Labels…</property>
-                    <property name="action-name">app.labels</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Share…</property>
-                    <property name="action-name">app.share</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Basement</property>
-                    <property name="menu-name">basement</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Large</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;large&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Medium</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;medium&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Small</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;small&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Move to Trash</property>
-                    <property name="action-name">win.delete</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
+          <object class="GtkBox">
+            <property name="halign">fill</property>
+            <style>
+              <class name="circular-buttons"/>
+            </style>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">printer-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="action-name">app.print</property>
+                <property name="hexpand">1</property>
+                <property name="halign">center</property>
+                <style>
+                  <class name="circular"/>
+                </style>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">emblem-shared-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="action-name">app.share</property>
+                <property name="hexpand">1</property>
+                <property name="halign">center</property>
+                <style>
+                  <class name="circular"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkStackPage">
-            <property name="name">basement</property>
-            <property name="child">
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Basement</property>
-                    <property name="role">title</property>
-                    <property name="menu-name">main</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Berk</property>
-                    <property name="action-name">app.berk</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Broni</property>
-                    <property name="action-name">app.broni</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Drutt</property>
-                    <property name="action-name">app.drutt</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">The Thing Upstairs</property>
-                    <property name="action-name">app.upstairs</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Open in New Window</property>
+            <property name="action-name">app.open-in</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <style>
+              <class name="inline-buttons"/>
+            </style>
+            <child>
+              <object class="GtkLabel" id="cut_copy_paste_filler">
+            </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Edit</property>
+                <property name="xalign">0</property>
+                <property name="hexpand">1</property>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-cut-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="relief">none</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-copy-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="relief">none</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-paste-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="relief">none</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Pin</property>
+            <property name="action-name">app.pin</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Select Labels…</property>
+            <property name="action-name">app.labels</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Share…</property>
+            <property name="action-name">app.share</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Basement</property>
+            <property name="menu-name">basement</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Large</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'large'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Medium</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'medium'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Small</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'small'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Move to Trash</property>
+            <property name="action-name">win.delete</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="name">basement</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Basement</property>
+            <property name="role">title</property>
+            <property name="menu-name">main</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Berk</property>
+            <property name="action-name">app.berk</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Broni</property>
+            <property name="action-name">app.broni</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Drutt</property>
+            <property name="action-name">app.drutt</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">The Thing Upstairs</property>
+            <property name="action-name">app.upstairs</property>
+            <property name="indicator-size-group">basement-indicators</property>
           </object>
         </child>
       </object>
     </child>
   </object>
   <object class="GtkSizeGroup" id="main-indicators">
+    <property name="mode">horizontal</property>
     <widgets>
       <widget name="cut_copy_paste_filler"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="basement-indicators"/>
+  <object class="GtkSizeGroup" id="basement-indicators">
+    <property name="mode">horizontal</property>
+  </object>
   <menu id="new_style_menu_model">
     <section>
       <attribute name="display-hint">circular-buttons</attribute>
@@ -3587,10 +3828,10 @@ bad things might happen.</property>
       </item>
     </section>
     <section>
-      <item>
-        <attribute name="label" translatable="yes">Move to Trash</attribute>
-        <attribute name="action">win.delete</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">Move to Trash</attribute>
+          <attribute name="action">win.delete</attribute>
+        </item>
     </section>
   </menu>
   <menu id="new_style_context_menu_model">
@@ -3704,7 +3945,7 @@ bad things might happen.</property>
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">C_hecks</attribute>
+          <attribute name="label" translatable="yes">Checks &amp; Radios</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">Check</attribute>
@@ -3728,9 +3969,6 @@ bad things might happen.</property>
               <attribute name="hidden-when">action-missing</attribute>
             </item>
           </section>
-        </submenu>
-        <submenu>
-          <attribute name="label" translatable="yes">_Radios</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">Radio</attribute>
@@ -3781,13 +4019,14 @@ bad things might happen.</property>
           <attribute name="action">win.background</attribute>
         </item>
       </section>
+
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Help</attribute>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">About</attribute>
+          <attribute name="action">app.about</attribute>
+        </item>
     </submenu>
   </menu>
 </interface>

docs/reference/gdk/gdk4-sections.txt

@@ -192,8 +192,8 @@ gdk_surface_is_destroyed
 gdk_surface_is_visible
 gdk_surface_is_viewable
 gdk_surface_get_state
-gdk_surface_minimize
-gdk_surface_unminimize
+gdk_surface_iconify
+gdk_surface_deiconify
 gdk_surface_stick
 gdk_surface_unstick
 gdk_surface_maximize
@@ -544,6 +544,8 @@ GdkSeatCapabilities
 GdkGrabStatus
 GdkSeatGrabPrepareFunc
 gdk_seat_get_display
+gdk_seat_grab
+gdk_seat_ungrab
 gdk_seat_get_capabilities
 gdk_seat_get_pointer
 gdk_seat_get_keyboard
@@ -787,6 +789,8 @@ gdk_drop_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk/gdkx.h</INCLUDE>
+<TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_SURFACE_XID
 GDK_DISPLAY_XDISPLAY
@@ -937,6 +941,8 @@ gdk_surface_impl_x11_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk/gdkwayland.h</INCLUDE>
+<TITLE>Wayland Interaction</TITLE>
 <FILE>wayland_interaction</FILE>
 gdk_wayland_seat_get_wl_seat
 gdk_wayland_device_get_wl_keyboard

docs/reference/gdk/meson.build

@@ -99,7 +99,7 @@ if wayland_enabled
   src_dir += [ gdkwayland_inc ]
 endif
 
-if get_option('gtk_doc')
+if get_option('documentation')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
   gnome.gtkdoc('gdk4',

docs/reference/gsk/gsk4-sections.txt

@@ -30,7 +30,6 @@ GskRenderNodeType
 gsk_render_node_get_node_type
 gsk_render_node_draw
 GskSerializationError
-GskParseErrorFunc
 gsk_render_node_serialize
 gsk_render_node_deserialize
 gsk_render_node_write_to_file
@@ -183,7 +182,6 @@ gsk_transform_perspective
 gsk_transform_equal
 <SUBSECTION>
 gsk_transform_transform_bounds
-gsk_transform_transform_point
 <SUBSECTION Private>
 GSK_TYPE_TRANSFORM
 gsk_transform_get_type

docs/reference/gsk/meson.build

@@ -34,7 +34,7 @@ private_headers = [
 images = [
 ]
 
-if get_option('gtk_doc')
+if get_option('documentation')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
   gnome.gtkdoc('gsk4',

docs/reference/gtk/actions.xml

@@ -314,8 +314,8 @@
       be connected to an action just by setting the ::action-name
       property. If the action has a parameter, you will also need
       to set the ::action-target property.
-      Widgets that implement GtkActionable include GtkSwitch, GtkButton,
-      and their respective subclasses.
+      Widgets that implement GtkAction include GtkSwitch, GtkButton,
+      GtkMenuItem and their respective subclasses.
     </para>
 
     <para>

docs/reference/gtk/building.sgml

@@ -76,10 +76,10 @@ How to compile GTK itself
     </para>
     <para>
       Several environment variables are useful to pass to set before
-      running <application>meson</application>. <envar>CPPFLAGS</envar>
-      contains options to pass to the C compiler, and is used to tell
-      the compiler where to look for include files. The <envar>LDFLAGS</envar>
-      variable is used in a similar fashion for the linker. Finally the
+      running configure. <envar>CPPFLAGS</envar> contains options to
+      pass to the C compiler, and is used to tell the compiler where
+      to look for include files. The <envar>LDFLAGS</envar> variable
+      is used in a similar fashion for the linker. Finally the
       <envar>PKG_CONFIG_PATH</envar> environment variable contains
       a search path that <command>pkg-config</command> (see below)
       uses when looking for files describing how to compile
@@ -106,61 +106,6 @@ How to compile GTK itself
       export LD_LIBRARY_PATH PATH
     </programlisting>
   </refsect1>
-
-  <refsect1 id="build-types">
-    <title>Build types</title>
-
-    <para>Meson has different build types, exposed by the <literal>buildtype</literal>
-    configuration option. GTK enables and disables functionality depending on
-    the build type used when calling <application>meson</application> to
-    configure the build.</para>
-
-    <formalpara>
-      <title><systemitem>debug</systemitem> and <systemitem>debugoptimized</systemitem></title>
-
-      <para>
-        GTK will enable debugging code paths in both the
-        <literal>debug</literal> and <literal>debugoptimized</literal>
-        build types. Builds with <literal>buildtype</literal> set
-        to <literal>debug</literal> will additionally enable
-        consistency checks on the internal state of the toolkit.
-      </para>
-
-      <para>
-        It is recommended to use the <literal>debug</literal> or
-        <literal>debugoptimized</literal> build types when developing
-        GTK itself. Additionally, <literal>debug</literal> builds of
-        GTK are recommended for profiling and debugging GTK applications,
-        as they include additional validation of the internal state.
-      </para>
-
-      <para>
-        The <literal>debugoptimized</literal> build type is the
-        default for GTK if no build type is specified when calling
-        <application>meson</application>
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title><systemitem>release</systemitem></title>
-
-      <para>
-        The <literal>release</literal> build type will disable
-        debugging code paths and additional run time safeties, like
-        checked casts for object instances.
-      </para>
-    </formalpara>
-
-    <para>
-      The <literal>plain</literal> build type provided by Meson
-      should only be used when packaging GTK, and it's expected
-      that packagers will provide their own compiler flags when
-      building GTK. See the previous section for the list of
-      environment variables to be used to define compiler and
-      linker flags.
-    </para>
-  </refsect1>
-
   <refsect1 id="dependencies">
     <title>Dependencies</title>
     <para>
@@ -338,181 +283,184 @@ How to compile GTK itself
       See <xref linkend="gtk-resources"/> for more information.
     </para>
   </refsect1>
-
-  <refsect1 id="extra-configuration-options">
-    <title>Extra Configuration Options</title>
-
-    <para>
-      In addition to the normal options provided by Meson, GTK defines
-      various arguments that modify what should be built.
-
-      <cmdsynopsis>
-        <command>meson</command>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dx11-backend=true</arg>
-          <arg choice="plain">-Dx11-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dwayland-backend=true</arg>
-          <arg choice="plain">-Dwayland-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dbroadway-backend=true</arg>
-          <arg choice="plain">-Dbroadway-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dwin32-backend=true</arg>
-          <arg choice="plain">-Dwin32-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dquartz-backend=true</arg>
-          <arg choice="plain">-Dquartz-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dmedia=gstreamer</arg>
-          <arg choice="plain">-Dmedia=ffmpeg</arg>
-          <arg choice="plain">-Dmedia=all</arg>
-          <arg choice="plain">-Dmedia=none</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dvulkan=yes</arg>
-          <arg choice="plain">-Dvulkan=no</arg>
-          <arg choice="plain">-Dvulkan=auto</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dxinerama=yes</arg>
-          <arg choice="plain">-Dxinerama=no</arg>
-          <arg choice="plain">-Dxinerama=auto</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dcloudproviders=true</arg>
-          <arg choice="plain">-Dcloudproviders=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dprint-backends=all</arg>
-          <arg choice="plain">-Dprint-backends=none</arg>
-          <arg choice="plain">-Dprint-backends=cups,lpr,...</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dcolord=yes</arg>
-          <arg choice="plain">-Dcolord=no</arg>
-          <arg choice="plain">-Dcolord=auto</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dgtk_doc=true</arg>
-          <arg choice="plain">-Dgtk_doc=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dman-pages=true</arg>
-          <arg choice="plain">-Dman-pages=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dintrospection=true</arg>
-          <arg choice="plain">-Dintrospection=false</arg>
-        </group>
-      </cmdsynopsis>
-    </para>
-
-    <formalpara>
-      <title><systemitem>xinerama</systemitem></title>
+      <refsect1 id="extra-configuration-options">
+      <title>Extra Configuration Options</title>
 
       <para>
-        By default GTK will try to link against the Xinerama libraries
-        if they are found. This options can be used to explicitly control
-        whether Xinerama should be used.
+        In addition to the normal options provided by Meson, GTK defines
+        various arguments that modify what should be built.
+
+        <cmdsynopsis>
+          <command>meson</command>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dx11-backend=true</arg>
+            <arg choice="plain">-Dx11-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dwayland-backend=true</arg>
+            <arg choice="plain">-Dwayland-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dbroadway-backend=true</arg>
+            <arg choice="plain">-Dbroadway-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dwin32-backend=true</arg>
+            <arg choice="plain">-Dwin32-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dquartz-backend=true</arg>
+            <arg choice="plain">-Dquartz-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dmedia=gstreamer</arg>
+            <arg choice="plain">-Dmedia=ffmpeg</arg>
+            <arg choice="plain">-Dmedia=all</arg>
+            <arg choice="plain">-Dmedia=none</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dvulkan=yes</arg>
+            <arg choice="plain">-Dvulkan=no</arg>
+            <arg choice="plain">-Dvulkan=auto</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dxinerama=yes</arg>
+            <arg choice="plain">-Dxinerama=no</arg>
+            <arg choice="plain">-Dxinerama=auto</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dcloudproviders=true</arg>
+            <arg choice="plain">-Dcloudproviders=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dprint-backends=all</arg>
+            <arg choice="plain">-Dprint-backends=none</arg>
+            <arg choice="plain">-Dprint-backends=cups,lpr,...</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dcolord=yes</arg>
+            <arg choice="plain">-Dcolord=no</arg>
+            <arg choice="plain">-Dcolord=auto</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Ddocumentation=true</arg>
+            <arg choice="plain">-Ddocumentation=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dman-pages=true</arg>
+            <arg choice="plain">-Dman-pages=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dintrospection=true</arg>
+            <arg choice="plain">-Dintrospection=false</arg>
+          </group>
+        </cmdsynopsis>
       </para>
-    </formalpara>
 
-    <formalpara>
-      <title><systemitem>gtk_doc</systemitem> and
-        <systemitem>man-pages</systemitem></title>
+      <formalpara>
+        <title><systemitem>xinerama</systemitem></title>
 
-      <para>
-        The <application>gtk-doc</application> package is
-        used to generate the reference documentation included
-        with GTK. By default support for <application>gtk-doc</application>
-        is disabled because it requires various extra dependencies
-        to be installed. If you have
-        <application>gtk-doc</application> installed and
-        are modifying GTK, you may want to enable
-        <application>gtk-doc</application> support by passing
-        in <systemitem>gtk_doc</systemitem>.
-      </para>
-      <para>
-        Additionally, some tools provided by GTK have their own
-        manual pages generated using a similar set of dependencies;
-        if you have <application>xsltproc</application> then you
-        can generate manual pages by passing <systemitem>man-pages</systemitem>
-        when configuring the build.
-      </para>
-    </formalpara>
+        <para>
+          By default GTK will try to link against the Xinerama libraries
+          if they are found. This options can be used to explicitly control
+          whether Xinerama should be used.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>print-backends</systemitem></title>
+      <formalpara>
+        <title><systemitem>documentation</systemitem> and
+          <systemitem>man-pages</systemitem></title>
 
-      <para>
-        By default, GTK will try to build various print backends if
-        their dependencies are found. This option can be used to
-        explicitly control which print backends should be built.
-      </para>
-    </formalpara>
+        <para>
+          The <application>gtk-doc</application> package is
+          used to generate the reference documentation included
+          with GTK. By default support for <application>gtk-doc</application>
+          is disabled because it requires various extra dependencies
+          to be installed. If you have
+          <application>gtk-doc</application> installed and
+          are modifying GTK, you may want to enable
+          <application>gtk-doc</application> support by passing
+          in <systemitem>documentation</systemitem>.
+        </para>
+        <para>
+          Additionally, some tools provided by GTK have their own
+          manual pages generated using a similar set of dependencies;
+          if you have <application>xsltproc</application> then you
+          can generate manual pages by passing <systemitem>man-pages</systemitem>
+          when configuring the build.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>x11-backend</systemitem>,
-        <systemitem>win32-backend</systemitem>,
-        <systemitem>quartz-backend</systemitem>,
-        <systemitem>broadway-backend</systemitem> and
-        <systemitem>wayland-backend</systemitem></title>
+      <formalpara>
+        <title><systemitem>print-backends</systemitem></title>
 
-      <para>
-        Enable specific backends for GDK.  If none of these options
-        are given, the Wayland backend will be enabled by default,
-        if the platform is Linux; the X11 backend will also be enabled
-        by default, unless the platform is Windows, in which case the
-        default is win32, or the platform is macOS, in which case the
-        default is quartz. If any backend is explicitly enabled or disabled,
-        no other platform will be enabled automatically.
-      </para>
-    </formalpara>
+        <para>
+          By default, GTK will try to build various print backends if
+          their dependencies are found. This option can be used to
+          explicitly control which print backends should be built.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>introspection</systemitem></title>
+      <formalpara>
+        <title><systemitem>x11-backend</systemitem>,
+          <systemitem>win32-backend</systemitem>,
+          <systemitem>quartz-backend</systemitem>,
+          <systemitem>broadway-backend</systemitem> and
+          <systemitem>wayland-backend</systemitem></title>
 
-      <para>
-        Allows to disable building introspection support. This is option
-        is mainly useful for shortening turnaround times on developer
-        systems. Installed builds of GTK should always have introspection
-        support.
-      </para>
-    </formalpara>
+        <para>
+          Enable specific backends for GDK.  If none of these options
+          are given, the Wayland backend will be enabled by default,
+          if the platform is Linux; the X11 backend will also be enabled
+          by default, unless the platform is Windows, in which case the
+          default is win32, or the platform is macOS, in which case the
+          default is quartz. If any backend is explicitly enabled or disabled,
+          no other platform will be enabled automatically.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>build-tests</systemitem>,
-             <systemitem>install-tests</systemitem>,
-             <systemitem>demos</systemitem></title>
+      <formalpara>
+        <title><systemitem>introspection</systemitem></title>
 
-      <para>
-        By default, GTK will build quite a few tests and demos.
-        While these are useful on a developer system, they are not
-        needed when GTK is built e.g. for a flatpak runtime. These
-        options allow to disable building tests and demos.
-      </para>
-    </formalpara>
+        <para>
+          Allows to disable building introspection support. This is option
+          is mainly useful for shortening turnaround times on developer
+          systems. Installed builds of GTK should always have introspection
+          support.
+        </para>
+      </formalpara>
 
-  </refsect1>
+      <formalpara>
+        <title><systemitem>build-tests</systemitem>,
+               <systemitem>install-tests</systemitem>,
+               <systemitem>demos</systemitem></title>
+
+        <para>
+          By default, GTK will build quite a few tests and demos.
+          While these are useful on a developer system, they are not
+          needed when GTK is built e.g. for a flatpak runtime. These
+          options allow to disable building tests and demos.
+        </para>
+      </formalpara>
+
+    </refsect1>
 
 </refentry>
+
+<!-- Local Variables: -->
+<!-- sgml-parent-document: ("gtk-docs.sgml" "chapter" "refentry")  -->
+<!-- End: -->

docs/reference/gtk/drawing-model.xml

@@ -224,3 +224,10 @@
   </refsect1>
 
 </refentry>
+
+<!--
+Local variables:
+mode: xml
+sgml-parent-document: ("gtk-docs.sgml" "book" "part" "refentry")
+End:
+-->

docs/reference/gtk/glossary.xml

@@ -364,3 +364,10 @@
     </glossdef>
   </glossentry>
 </glossary>
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("gtk-docs.sgml" "book" "glossary")
+End:
+-->

docs/reference/gtk/gtk4-docs.xml

@@ -22,8 +22,8 @@
     <title>GTK Overview</title>
     <xi:include href="overview.xml"/>
     <xi:include href="xml/getting_started.xml"/>
-    <xi:include href="resources.xml" />
-    <xi:include href="xml/question_index.xml" />
+    <xi:include href="resources.sgml" />
+    <xi:include href="xml/question_index.sgml" />
     <xi:include href="xml/drawing-model.xml" />
     <xi:include href="xml/input-handling.xml" />
     <xi:include href="xml/actions.xml" />
@@ -49,14 +49,9 @@
       <xi:include href="xml/gtkmaplistmodel.xml" />
       <xi:include href="xml/gtkslicelistmodel.xml" />
       <xi:include href="xml/gtksortlistmodel.xml" />
-      <xi:include href="xml/gtkselectionmodel.xml" />
-      <xi:include href="xml/gtknoselection.xml" />
-      <xi:include href="xml/gtksingleselection.xml" />
-    </chapter>
-
-    <chapter id="Trees">
-      <xi:include href="xml/gtktreelistrow.xml" />
       <xi:include href="xml/gtktreelistmodel.xml" />
+      <xi:include href="xml/gtkselectionmodel.xml" />
+      <xi:include href="xml/gtksingleselection.xml" />
     </chapter>
 
     <chapter id="Application">
@@ -70,13 +65,11 @@
       <title>Interface builder</title>
       <xi:include href="xml/gtkbuilder.xml" />
       <xi:include href="xml/gtkbuildable.xml" />
-      <xi:include href="xml/gtkbuilderscope.xml" />
     </chapter>
 
     <chapter id="WindowWidgets">
       <title>Windows</title>
       <xi:include href="xml/gtkroot.xml" />
-      <xi:include href="xml/gtknative.xml" />
       <xi:include href="xml/gtkwindow.xml" />
       <xi:include href="xml/gtkdialog.xml" />
       <xi:include href="xml/gtkmessagedialog.xml" />
@@ -116,9 +109,6 @@
       <xi:include href="xml/gtkcustomlayout.xml" />
       <xi:include href="xml/gtkfixedlayout.xml" />
       <xi:include href="xml/gtkgridlayout.xml" />
-      <xi:include href="xml/gtkconstraintlayout.xml" />
-      <xi:include href="xml/gtkconstraint.xml" />
-      <xi:include href="xml/gtkconstraintguide.xml" />
     </chapter>
 
     <chapter id="DisplayWidgets">
@@ -155,6 +145,7 @@
       <xi:include href="xml/gtkscalebutton.xml" />
       <xi:include href="xml/gtkvolumebutton.xml" />
       <xi:include href="xml/gtklockbutton.xml" />
+      <xi:include href="xml/gtkmodelbutton.xml" />
     </chapter>
 
     <chapter id="NumericEntry">
@@ -173,7 +164,7 @@
 
     <chapter id="TextWidgetObjects">
       <title>Multiline Text Editor</title>
-      <xi:include href="xml/text_widget.xml" />
+      <xi:include href="xml/text_widget.sgml" />
       <xi:include href="xml/gtktextiter.xml" />
       <xi:include href="xml/gtktextmark.xml" />
       <xi:include href="xml/gtktextbuffer.xml" />
@@ -184,7 +175,7 @@
 
     <chapter id="TreeWidgetObjects">
       <title>Tree, List and Icon Grid Widgets</title>
-      <xi:include href="xml/tree_widget.xml" />
+      <xi:include href="xml/tree_widget.sgml" />
       <xi:include href="xml/gtktreemodel.xml" />
       <xi:include href="xml/gtktreeselection.xml" />
       <xi:include href="xml/gtktreeviewcolumn.xml" />
@@ -217,6 +208,12 @@
       <title>Menus, Combo Box, Toolbar</title>
       <xi:include href="xml/gtkcombobox.xml" />
       <xi:include href="xml/gtkcomboboxtext.xml" />
+      <xi:include href="xml/gtkmenu.xml" />
+      <xi:include href="xml/gtkmenubar.xml" />
+      <xi:include href="xml/gtkmenuitem.xml" />
+      <xi:include href="xml/gtkradiomenuitem.xml" />
+      <xi:include href="xml/gtkcheckmenuitem.xml" />
+      <xi:include href="xml/gtkseparatormenuitem.xml" />
       <xi:include href="xml/gtktoolshell.xml" />
       <xi:include href="xml/gtktoolbar.xml" />
       <xi:include href="xml/gtktoolitem.xml" />
@@ -305,6 +302,7 @@
       <xi:include href="xml/gtkwidget.xml" />
       <xi:include href="xml/gtkcontainer.xml" />
       <xi:include href="xml/gtkbin.xml" />
+      <xi:include href="xml/gtkmenushell.xml" />
       <xi:include href="xml/gtkrange.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
       <xi:include href="xml/gtknativedialog.xml" />
@@ -344,13 +342,6 @@
       <xi:include href="xml/gtkpadcontroller.xml" />
     </chapter>
 
-    <chapter>
-      <title>Data exchange, clipboards and Drag-and-Drop</title>
-      <xi:include href="xml/gtkdragsource.xml"/>
-      <xi:include href="xml/gtkdragicon.xml"/>
-      <xi:include href="xml/gtkdroptarget.xml"/>
-    </chapter>
-
   </part>
 
   <part  id="gtkbase">
@@ -359,6 +350,7 @@
     <xi:include href="xml/gtkfeatures.xml" />
     <xi:include href="xml/gtkaccelgroup.xml" />
     <xi:include href="xml/gtkaccelmap.xml" />
+    <xi:include href="xml/gtkdnd.xml" />
     <xi:include href="xml/gtksettings.xml" />
     <xi:include href="xml/gtkbindings.xml" />
     <xi:include href="xml/gtkenums.xml" />
@@ -411,12 +403,12 @@
 
   <part id="platform-support">
     <title>GTK Platform Support</title>
-    <xi:include href="building.xml" />
-    <xi:include href="xml/compiling.xml" />
-    <xi:include href="running.xml" />
-    <xi:include href="x11.xml" />
-    <xi:include href="windows.xml" />
-    <xi:include href="osx.xml" />
+    <xi:include href="building.sgml" />
+    <xi:include href="xml/compiling.sgml" />
+    <xi:include href="running.sgml" />
+    <xi:include href="x11.sgml" />
+    <xi:include href="windows.sgml" />
+    <xi:include href="osx.sgml" />
     <xi:include href="broadway.xml" />
     <xi:include href="wayland.xml" />
   </part>

docs/reference/gtk/gtk4-update-icon-cache.xml

@@ -49,7 +49,7 @@
   files for icon themes.
 </para>
 <para>
-  It expects to be given the <replaceable>PATH</replaceable> to an icon theme
+  It expects to be given the <replaceable>PATH</replaceable> to a icon theme
   directory containing an <filename>index.theme</filename>, e.g.
   <filename>/usr/share/icons/hicolor</filename>, and writes a
   <filename>icon-theme.cache</filename> containing cached information about

docs/reference/gtk/gtk4.types.in

@@ -22,9 +22,7 @@ gtk_bin_get_type
 gtk_bin_layout_get_type
 gtk_box_get_type
 gtk_box_layout_get_type
-gtk_builder_cscope_get_type
 gtk_builder_get_type
-gtk_builder_scope_get_type
 gtk_buildable_get_type
 gtk_button_get_type
 gtk_calendar_get_type
@@ -44,23 +42,17 @@ gtk_cell_renderer_text_get_type
 gtk_cell_renderer_toggle_get_type
 gtk_cell_view_get_type
 gtk_check_button_get_type
+gtk_check_menu_item_get_type
 gtk_color_button_get_type
 gtk_color_chooser_get_type
 gtk_color_chooser_dialog_get_type
 gtk_color_chooser_widget_get_type
 gtk_combo_box_get_type
 gtk_combo_box_text_get_type
-gtk_constraint_get_type
-gtk_constraint_guide_get_type
-gtk_constraint_layout_get_type
-gtk_constraint_target_get_type
 gtk_container_get_type
 gtk_css_provider_get_type
 gtk_dialog_get_type
-gtk_drag_icon_get_type
-gtk_drag_source_get_type
 gtk_drawing_area_get_type
-gtk_drop_target_get_type
 gtk_editable_get_type
 gtk_entry_buffer_get_type
 gtk_entry_completion_get_type
@@ -76,10 +68,8 @@ gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
-gtk_filter_list_model_get_type
 gtk_fixed_get_type
 gtk_fixed_layout_get_type
-gtk_flatten_list_model_get_type
 gtk_flow_box_get_type
 gtk_flow_box_child_get_type
 gtk_font_button_get_type
@@ -117,16 +107,18 @@ gtk_list_store_get_type
 gtk_list_box_get_type
 gtk_list_box_row_get_type
 gtk_lock_button_get_type
-gtk_map_list_model_get_type
 gtk_media_controls_get_type
 gtk_media_file_get_type
 gtk_media_stream_get_type
+gtk_menu_bar_get_type
 gtk_menu_button_get_type
+gtk_menu_get_type
+gtk_menu_item_get_type
+gtk_menu_shell_get_type
 gtk_menu_tool_button_get_type
 gtk_message_dialog_get_type
+gtk_model_button_get_type
 gtk_mount_operation_get_type
-gtk_native_get_type
-gtk_no_selection_get_type
 gtk_notebook_get_type
 gtk_notebook_page_get_type
 gtk_orientable_get_type
@@ -150,6 +142,7 @@ gtk_print_settings_get_type
 @DISABLE_ON_W32@gtk_print_unix_dialog_get_type
 gtk_progress_bar_get_type
 gtk_radio_button_get_type
+gtk_radio_menu_item_get_type
 gtk_radio_tool_button_get_type
 gtk_range_get_type
 gtk_recent_manager_get_type
@@ -164,6 +157,7 @@ gtk_search_bar_get_type
 gtk_search_entry_get_type
 gtk_selection_model_get_type
 gtk_separator_get_type
+gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_shortcut_label_get_type
@@ -173,9 +167,7 @@ gtk_shortcuts_group_get_type
 gtk_shortcuts_shortcut_get_type
 gtk_single_selection_get_type
 gtk_size_group_get_type
-gtk_slice_list_model_get_type
 gtk_snapshot_get_type
-gtk_sort_list_model_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_stack_get_type
@@ -202,8 +194,6 @@ gtk_tool_button_get_type
 gtk_tool_item_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type
-gtk_tree_list_model_get_type
-gtk_tree_list_row_get_type
 gtk_tree_model_filter_get_type
 gtk_tree_model_get_type
 gtk_tree_model_sort_get_type