testsuite: Add a broken test

This also adds some build magic so all tests that contain "-3d" in them won't be added to the Cairo renderer. Of course, this new test is such a test.
transform: Add gsk_transform_from_string()
2019-03-21 06:47:36 +01:00 · 2019-03-21 06:46:23 +01:00 · 2019-03-19 09:59:04 +01:00 · 2019-03-19 09:55:47 +01:00 · 2019-03-19 09:55:47 +01:00 · 2019-03-19 09:55:47 +01:00
825 changed files with 54334 additions and 29908 deletions
@@ -13,19 +13,15 @@ stages:
    - subprojects/pango/

 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v3
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
  stage: build
  script:
    - bash -x ./.gitlab-ci/test-docker.sh
  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml" 
+    when: on_failure
    name: "gtk-${CI_COMMIT_REF_NAME}"
    paths:
      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report.xml"
  cache:
    key: "$CI_JOB_NAME"
    <<: *cache-paths
@@ -57,49 +53,18 @@ msys2-mingw32:
  script:
    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"

-# Manual jobs, for branches and MRs
-.flatpak-manual: &flatpak-manual
+flatpak:demo:
+  variables:
+    APPID: org.gtk.Demo
  <<: *flatpak-defaults
-  when: manual

-# Only build Flatpak bundles automatically on master
-.flatpak-master: &flatpak-master
+flatpak:widget-factory:
+  variables:
+    APPID: org.gtk.WidgetFactory
  <<: *flatpak-defaults
-  only:
-    - master
-
-flatpak-manual:demo:
-  variables:
-    APPID: org.gtk.Demo4
-  <<: *flatpak-manual
-
-flatpak-master:demo:
-  variables:
-    APPID: org.gtk.Demo4
-  <<: *flatpak-master
-
-flatpak-manual:widget-factory:
-  variables:
-    APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-manual
-
-flatpak-master:widget-factory:
-  variables:
-    APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-master
-
-flatpak-manual:icon-browser:
-  variables:
-    APPID: org.gtk.IconBrowser4
-  <<: *flatpak-manual
-
-flatpak-master:icon-browser:
-  variables:
-    APPID: org.gtk.IconBrowser4
-  <<: *flatpak-master

 pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v3
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
  stage: deploy 
  script:
    - meson -Ddocumentation=true _build .
@@ -70,7 +70,7 @@ RUN dnf -y install \
    xorg-x11-server-Xvfb \
 && dnf clean all

-RUN pip3 install meson==0.50.0
+RUN pip3 install meson==0.49.0

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
@@ -1,101 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import datetime
-import json
-import os
-import sys
-import xml.etree.ElementTree as ET
-
-aparser = argparse.ArgumentParser(description='Turns a Meson test log into a JUnit report')
-aparser.add_argument('--project-name', metavar='NAME',
-                     help='The project name',
-                     default='unknown')
-aparser.add_argument('--job-id', metavar='ID',
-                     help='The job ID for the report',
-                     default='Unknown')
-aparser.add_argument('--branch', metavar='NAME',
-                     help='Branch of the project being tested',
-                     default='master')
-aparser.add_argument('--output', metavar='FILE',
-                     help='The output file, stdout by default',
-                     type=argparse.FileType('w'),
-                     default=sys.stdout)
-aparser.add_argument('infile', metavar='FILE',
-                     help='The input testlog.json, stdin by default',
-                     type=argparse.FileType('r'),
-                     default=sys.stdin)
-
-args = aparser.parse_args()
-
-outfile = args.output
-
-testsuites = ET.Element('testsuites')
-testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
-testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
-
-suites = {}
-for line in args.infile:
-    data = json.loads(line)
-    (full_suite, unit_name) = data['name'].split(' / ')
-    (project_name, suite_name) = full_suite.split(':')
-
-    duration = data['duration']
-    return_code = data['returncode']
-    log = data['stdout']
-
-    unit = {
-        'suite': suite_name,
-        'name': unit_name,
-        'duration': duration,
-        'returncode': return_code,
-        'stdout': log,
-    }
-
-    units = suites.setdefault(suite_name, [])
-    units.append(unit)
-
-for name, units in suites.items():
-    print('Processing suite {} (units: {})'.format(name, len(units)))
-
-    def if_failed(unit):
-        if unit['returncode'] != 0:
-            return True
-        return False
-
-    def if_succeded(unit):
-        if unit['returncode'] == 0:
-            return True
-        return False
-
-    successes = list(filter(if_succeded, units))
-    failures = list(filter(if_failed, units))
-    print(' - {}: {} pass, {} fail'.format(name, len(successes), len(failures)))
-
-    testsuite = ET.SubElement(testsuites, 'testsuite')
-    testsuite.set('name', '{}/{}'.format(args.project_name, name))
-    testsuite.set('tests', str(len(units)))
-    testsuite.set('errors', str(len(failures)))
-    testsuite.set('failures', str(len(failures)))
-
-    for unit in successes:
-        testcase = ET.SubElement(testsuite, 'testcase')
-        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
-        testcase.set('time', str(unit['duration']))
-
-    for unit in failures:
-        testcase = ET.SubElement(testsuite, 'testcase')
-        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
-        testcase.set('time', str(unit['duration']))
-
-        failure = ET.SubElement(testcase, 'failure')
-        failure.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        failure.set('name', unit['name'])
-        failure.set('type', 'error')
-        failure.text = unit['stdout']
-
-output = ET.tostring(testsuites, encoding='unicode')
-outfile.write(output)
@@ -2,7 +2,7 @@

 set -e

-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v3"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2"

 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
    --file "Dockerfile" .
@@ -24,25 +24,9 @@ cd _build
 ninja
 ccache --show-stats

-set +e
-
 xvfb-run -a -s "-screen 0 1024x768x24" \
    meson test \
-        --timeout-multiplier 2 \
        --print-errorlogs \
        --suite=gtk \
        --no-suite=gtk:gsk \
-        --no-suite=gtk:reftest \
        --no-suite=gtk:a11y
-
-# Save the exit code
-exit_code=$?
-
-# We always want to run the report generator
-$srcdir/.gitlab-ci/meson-junit-report.py \
-        --project-name=gtk \
-        --job-id="${CI_JOB_NAME}" \
-        --output=report.xml \
-        meson-logs/testlog.json
-
-exit $exit_code
@@ -1,98 +1,3 @@
-Overview of Changes in GTK+ 3.96.0
-==================================
-
-* DND has been refactored. There are now separate GdkDrag and GdkDrop
-  objects. This work is still incomplete
-
-* The GDK_SURFACE_SUBSURFACE surface type has been removed.
-
-* Use of child surfaces has been greatly reduced. This work is still
-  incomplete
-
-* The use of global coordinates in GDK apis has been reduced. This
-  work is still incomplete
-
-* Events have been simplified and are just used for input
- - expose events have been replaced by a GdkSurface::render signal
- - configure events have been replaced by a GdkSurface::size-changed signal
- - map events have been replaced by a GdkSurface::mapped property
- - gdk_event_handler_set has been replaced by a GdkSurface::event signal
- - key events no longer contain a string
- - events on unmapped widgets are ignored
-
-* Warping the pointer is no longer supported
-
-* The Wayland backend now uses the Settings portal for GtkSettings
-
-* The Wayland input module uses the text-input-unstable-v3 protocol
-
-* The Broadway backend has been rewritten to work well with GSK
-
-* The color chooser has a color picker
-
-* GtkApplication tracks screensaver state and has a ::query-end signal
-
-* The file chooser portal backend supports file filters
-
-* A number of list models have been introduced, for internal use
-  and as public api:
- - GtkMapListModel
- - GtkSliceListModel
- - GtkSortListModel
- - GtkSelectionModel
- - GtkSingleSelection
-
-* Support for tabular menus and combo boxes has been dropped
-
-* Key themes are no longer supported
-
-* GtkInvisible has been dropped
-
-* A GtkRoot interface has been added that is currently implemented
-  just by GtkWindow. This work is incomplete
-
-* GtkWidgets can transform their children using projective linear
-  transformations. This functionality is available in CSS and
-  as GskTransform argument to gtk_widget_allocate. GtkFixed is
-  a container that exposes this functionality. For examples of this,
-  see the swing transition of GtkRevealer, the rotate transitions
-  of GtkStack or the Fixed Layout example in gtk-demo.
-
-* GtkEntry functionality has been moved into a new GtkText widget,
-  the GtkEditable interface has been expanded, and new a new
-  GtkPasswordEntry widget has been introduced.
-
-* Focus handling has been rewritten, and focus-change event
-  generation has been unified with crossing events.
-
-* All demos and settings schemas have been renamed to avoid collisions
-  with GTK3.
-
-* GtkWidget can now use a GtkLayoutManager for size allocation.
-  Layout managers can optionally use layout children holding layout
-  properties. GtkBinLayout, GtkBoxLayout, GtkGridLayout, GtkFixedLayout
-  and GtkCustomLayout are currently available, more layout manager
-  implementations will appear in the future.
-
-* GtkAssistant, GtkStack and GtkNotebook now have publicly
-  accessible page objects for their children. The page objects
-  are also exposed via a list model.
-
-* GtkContainer no longer supports child properties. All existing
-  child properties have been removed, converted to regular properties,
-  moved to layout properties or moved to child meta objects.
-
-* A number of X11-specific GtkWindow and GdkSurface apis have been
-  removed
-
-* GtkBuilder can specify object-valued properties inline.
-
-* The gtk4-builder-tool simplify command has gained a --3to4 option
-  to convert GTK3 ui files to GTK4.
-
-* The inspector can show child meta objects and layout properties.
-
-
 Overview of Changes in GTK+ 3.94.0
 ==================================

@@ -1,5 +1,5 @@
 {
-    "app-id": "org.gtk.Demo4",
+    "app-id": "org.gtk.Demo",
    "runtime": "org.gnome.Platform",
    "runtime-version": "master",
    "sdk": "org.gnome.Sdk",
@@ -9,9 +9,10 @@
    "finish-args": [
        "--device=dri",
        "--share=ipc",
-        "--socket=fallback-x11",
+        "--socket=x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
+        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
    ],
    "cleanup": [
        "/include",
@@ -1,72 +0,0 @@
-{
-    "app-id": "org.gtk.IconBrowser4",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-icon-browser",
-    "tags": ["devel", "development", "nightly"],
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}
@@ -1,5 +1,5 @@
 {
-    "app-id": "org.gtk.WidgetFactory4",
+    "app-id": "org.gtk.WidgetFactory",
    "runtime": "org.gnome.Platform",
    "runtime-version": "master",
    "sdk": "org.gnome.Sdk",
@@ -9,9 +9,10 @@
    "finish-args": [
        "--device=dri",
        "--share=ipc",
-        "--socket=fallback-x11",
+        "--socket=x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
+        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
    ],
    "cleanup": [
        "/include",
@@ -19,7 +19,7 @@ if 'DESTDIR' not in os.environ:
                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])

    print('Updating icon cache...')
-    subprocess.call(['gtk4-update-icon-cache', '-q', '-t' ,'-f',
+    subprocess.call(['gtk-update-icon-cache', '-q', '-t' ,'-f',
                    os.path.join(gtk_datadir, 'icons', 'hicolor')])

    print('Updating module cache for print backends...')
@@ -305,3 +305,13 @@
 #mesondefine HAVE_PANGOFT

 #mesondefine ISO_CODES_PREFIX
+
+#mesondefine MALLOC_IS_ALIGNED16
+
+#mesondefine HAVE_POSIX_MEMALIGN
+
+#mesondefine HAVE_MEMALIGN
+
+#mesondefine HAVE_ALIGNED_ALLOC
+
+#mesondefine HAVE__ALIGNED_MALLOC
@@ -212,7 +212,7 @@ activate_about (GSimpleAction *action,
                         "comments", "Program to demonstrate GTK functions.",
                         "authors", authors,
                         "documenters", documentors,
-                         "logo-icon-name", "org.gtk.Demo4",
+                         "logo-icon-name", "org.gtk.Demo",
                         "title", "About GTK Code Demos",
                         NULL);
 }
@@ -370,7 +370,7 @@ demo_application_init (DemoApplication *app)
  GSettings *settings;
  GAction *action;

-  settings = g_settings_new ("org.gtk.Demo4");
+  settings = g_settings_new ("org.gtk.Demo");

  g_action_map_add_action_entries (G_ACTION_MAP (app),
                                   app_entries, G_N_ELEMENTS (app_entries),
@@ -397,7 +397,7 @@ demo_application_window_store_state (DemoApplicationWindow *win)
 {
  GSettings *settings;

-  settings = g_settings_new ("org.gtk.Demo4");
+  settings = g_settings_new ("org.gtk.Demo");
  g_settings_set (settings, "window-size", "(ii)", win->width, win->height);
  g_settings_set_boolean (settings, "maximized", win->maximized);
  g_settings_set_boolean (settings, "fullscreen", win->fullscreen);
@@ -409,7 +409,7 @@ demo_application_window_load_state (DemoApplicationWindow *win)
 {
  GSettings *settings;

-  settings = g_settings_new ("org.gtk.Demo4");
+  settings = g_settings_new ("org.gtk.Demo");
  g_settings_get (settings, "window-size", "(ii)", &win->width, &win->height);
  win->maximized = g_settings_get_boolean (settings, "maximized");
  win->fullscreen = g_settings_get_boolean (settings, "fullscreen");
@@ -541,7 +541,7 @@ main (int argc, char *argv[])
  GtkApplication *app;

  app = GTK_APPLICATION (g_object_new (demo_application_get_type (),
-                                       "application-id", "org.gtk.Demo4.App",
+                                       "application-id", "org.gtk.Demo2",
                                       "flags", G_APPLICATION_HANDLES_OPEN,
                                       NULL));

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">Application Class</property>
@@ -33,11 +32,11 @@
                <property name="action-name">win.logo</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkInfoBar" id="infobar">
@@ -64,11 +63,11 @@
                </child>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow">
@@ -80,20 +79,20 @@
                <property name="buffer">buffer</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkStatusbar" id="status">
            <property name="hexpand">1</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -52,7 +52,7 @@ do_application_demo (GtkWidget *toplevel)

  if (watch == 0)
    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                              "org.gtk.Demo4.App",
+                              "org.gtk.Demo2",
                              0,
                              on_name_appeared,
                              on_name_vanished,
@@ -80,8 +80,8 @@ do_application_demo (GtkWidget *toplevel)
  else
    {
      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
-                                   "org.gtk.Demo4.App",
-                                   "/org/gtk/Demo4/App",
+                                   "org.gtk.Demo2",
+                                   "/org/gtk/Demo2",
                                   "org.gtk.Actions",
                                   "Activate",
                                   g_variant_new ("(sava{sv})", "quit", NULL, NULL),
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <menu id="appmenu">
    <section>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkWindow" id="window">
@@ -17,11 +16,11 @@
            <style>
              <class name="dim-label"/>
            </style>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow">
@@ -29,22 +28,22 @@
            <property name="vexpand">1</property>
            <property name="shadow-type">in</property>
            <property name="min-content-width">150</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkStackSwitcher">
            <property name="halign">center</property>
            <property name="hexpand">1</property>
            <property name="stack">stack</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkStack" id="stack">
@@ -67,53 +66,53 @@
                    <child>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Duck</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Background</property>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
                        <style>
                          <class name="duck"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
                        <style>
                          <class name="gradient"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">
 Blended picture</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
-                          <property name="column-span">2</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                        <property name="width">2</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
@@ -121,12 +120,12 @@ Blended picture</property>
                        <style>
                          <class name="blend0"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
-                          <property name="column-span">2</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
+                        <property name="width">2</property>
+                      </packing>
                    </child>
                  </object>
                </property>
@@ -146,53 +145,53 @@ Blended picture</property>
                    <child>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Red</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Blue</property>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
                        <style>
                          <class name="red"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
                        <style>
                          <class name="blue"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">
 Blended picture</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
-                          <property name="column-span">2</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                        <property name="width">2</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
@@ -200,12 +199,12 @@ Blended picture</property>
                        <style>
                          <class name="blend1"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
-                          <property name="column-span">2</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
+                        <property name="width">2</property>
+                      </packing>
                    </child>
                  </object>
                </property>
@@ -228,33 +227,33 @@ Blended picture</property>
                        <style>
                          <class name="cyan"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
                        <style>
                          <class name="magenta"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
                        <style>
                          <class name="yellow"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkImage">
@@ -262,11 +261,11 @@ Blended picture</property>
                        <style>
                          <class name="blend2"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">3</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">3</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
@@ -275,11 +274,11 @@ Blended picture</property>
                        <style>
                          <class name="dim-label"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
@@ -288,11 +287,11 @@ Blended picture</property>
                        <style>
                          <class name="dim-label"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
@@ -301,11 +300,11 @@ Blended picture</property>
                        <style>
                          <class name="dim-label"/>
                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                      </packing>
                    </child>
                    <child>
                      <object class="GtkLabel">
@@ -314,21 +313,21 @@ Blended picture</property>
                        <attributes>
                          <attribute name="weight" value="bold"></attribute>
                        </attributes>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">2</property>
-                        </layout>
                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">2</property>
+                      </packing>
                    </child>
                  </object>
                </property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GdkCursor" id="default_cursor">
    <property name="name">default</property>
@@ -10,7 +10,7 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="org.gtk.Demo4-symbolic.svg"
+   sodipodi:docname="org.gtk.Demo-symbolic.svg"
   height="16.03125"
   id="svg7384"
   inkscape:version="0.92.4 5da689c313, 2019-01-14"
@@ -163,7 +163,6 @@
    <file>expander.c</file>
    <file>filtermodel.c</file>
    <file>fishbowl.c</file>
-    <file>fixed.c</file>
    <file>flowbox.c</file>
    <file>foreigndrawing.c</file>
    <file>font_features.c</file>
@@ -271,10 +270,7 @@
    <file>demotaggedentry.c</file>
    <file>demotaggedentry.h</file>
  </gresource>
-  <gresource prefix="/fixed">
-    <file>fixed.css</file>
-  </gresource>
-  <gresource prefix="/org/gtk/Demo4">
+  <gresource prefix="/org/gtk/Demo">
    <file>icons/16x16/actions/application-exit.png</file>
    <file>icons/16x16/actions/document-new.png</file>
    <file>icons/16x16/actions/document-open.png</file>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkListStore" id="liststore1">
    <columns>
@@ -196,7 +196,7 @@ edit_label_done (GtkWidget *entry, gpointer data)
  GtkWidget *label;
  int x, y;

-  gtk_fixed_get_child_position (GTK_FIXED (fixed), entry, &x, &y);
+  gtk_container_child_get (GTK_CONTAINER (fixed), entry, "x", &x, "y", &y, NULL);

  label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label"));
  gtk_label_set_text (GTK_LABEL (label), gtk_editable_get_text (GTK_EDITABLE (entry)));
@@ -210,7 +210,7 @@ edit_cb (GtkWidget *child)
  GtkWidget *fixed = gtk_widget_get_parent (child);
  int x, y;

-  gtk_fixed_get_child_position (GTK_FIXED (fixed), child, &x, &y);
+  gtk_container_child_get (GTK_CONTAINER (fixed), child, "x", &x, "y", &y, NULL);

  if (GTK_IS_LABEL (child))
    {
@@ -243,7 +243,7 @@ pressed_cb (GtkGesture *gesture,
  GtkWidget *child;

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y, TRUE);
+  child = gtk_widget_pick (widget, x, y);

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
    {
@@ -320,7 +320,7 @@ released_cb (GtkGesture *gesture,
  GtkWidget *child;

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y, TRUE);
+  child = gtk_widget_pick (widget, x, y);

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
    {
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <requires lib="gtk+" version="3.16"/>
  <object class="GtkListStore" id="liststore1">
@@ -45,11 +44,11 @@
            <accessibility>
              <relation type="label-for" target="treeview1"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview1">
@@ -84,11 +83,11 @@
            <accessibility>
              <relation type="labelled-by" target="label1"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview2">
@@ -135,11 +134,11 @@
            <accessibility>
              <relation type="labelled-by" target="label2"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label2">
@@ -151,11 +150,11 @@
            <accessibility>
              <relation type="label-for" target="treeview2"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label3">
@@ -167,11 +166,11 @@
            <accessibility>
              <relation type="label-for" target="treeview3"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview3">
@@ -200,11 +199,11 @@
            <accessibility>
              <relation type="labelled-by" target="label3"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkWindow" id="window">
    <property name="title" translatable="yes">Fishbowl</property>
@@ -24,40 +23,58 @@
            </child>
          </object>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
            <property name="label">fps</property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
            <property name="label" bind-source="bowl" bind-property="framerate"/>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
            <property name="label">Icons, </property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
            <property name="label" bind-source="bowl" bind-property="count"/>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkToggleButton" id="changes_allow">
            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
            <property name="icon-name">changes-allow</property>
            <property name="relief">none</property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkToggleButton" id="changes_prevent">
-            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean"/>
-            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean"/>
+            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">1</property>
+            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">0</property>
            <property name="icon-name">changes-prevent</property>
            <property name="relief">none</property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -65,7 +82,7 @@
      <object class="GtkFishbowl" id="bowl">
        <property name="visible">True</property>
        <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
+        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">1</property>
      </object>
    </child>
  </object>
@@ -1,167 +0,0 @@
-/* Fixed layout
- *
- * GtkFixed is a container that allows placing and transforming
- * widgets manually.
- */
-
-#include <gtk/gtk.h>
-
-/* This enumeration determines the paint order */
-enum {
-  FACE_BACK,
-  FACE_LEFT,
-  FACE_BOTTOM,
-  FACE_RIGHT,
-  FACE_TOP,
-  FACE_FRONT,
-
-  N_FACES
-};
-
-/* Map face widgets to CSS classes */
-static struct {
-  GtkWidget *face;
-  const char *css_class;
-} faces[N_FACES] = {
-  [FACE_BACK] = { NULL, "back", },
-  [FACE_LEFT] = { NULL, "left", },
-  [FACE_RIGHT] = { NULL, "right", },
-  [FACE_TOP] = { NULL, "top", },
-  [FACE_BOTTOM] = { NULL, "bottom", },
-  [FACE_FRONT] = { NULL, "front", },
-};
-
-static GtkWidget *
-create_faces (void)
-{
-  GtkWidget *fixed = gtk_fixed_new ();
-  int face_size = 200;
-  float w, h, d, p;
-
-  gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);
-
-  w = (float) face_size / 2.f;
-  h = (float) face_size / 2.f;
-  d = (float) face_size / 2.f;
-  p = face_size * 3.f;
-
-  for (int i = 0; i < N_FACES; i++)
-    {
-      GskTransform *transform = NULL;
-
-      /* Add a face */
-      faces[i].face = gtk_frame_new (NULL);
-      gtk_widget_set_size_request (faces[i].face, face_size, face_size);
-      gtk_style_context_add_class (gtk_widget_get_style_context (faces[i].face), faces[i].css_class);
-      gtk_container_add (GTK_CONTAINER (fixed), faces[i].face);
-
-      /* Set up the transformation for each face */
-      transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w, h));
-      transform = gsk_transform_perspective (transform, p);
-      transform = gsk_transform_rotate_3d (transform, -30.f, graphene_vec3_x_axis ());
-      transform = gsk_transform_rotate_3d (transform, 135.f, graphene_vec3_y_axis ());
-      transform = gsk_transform_translate_3d (transform, &GRAPHENE_POINT3D_INIT (0, 0, -face_size / 6.f));
-
-      switch (i)
-        {
-        case FACE_FRONT:
-          transform = gsk_transform_rotate_3d (transform, 0.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_BACK:
-          transform = gsk_transform_rotate_3d (transform, -180.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_RIGHT:
-          transform = gsk_transform_rotate_3d (transform, 90.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_LEFT:
-          transform = gsk_transform_rotate_3d (transform, -90.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_TOP:
-          transform = gsk_transform_rotate_3d (transform, 90.f, graphene_vec3_x_axis ());
-          break;
-
-        case FACE_BOTTOM:
-          transform = gsk_transform_rotate_3d (transform, -90.f, graphene_vec3_x_axis ());
-          break;
-
-        default:
-          break;
-        }
-
-      transform = gsk_transform_translate_3d (transform, &GRAPHENE_POINT3D_INIT (0, 0, d));
-      transform = gsk_transform_translate_3d (transform, &GRAPHENE_POINT3D_INIT (-w, -h, 0));
-
-      gtk_fixed_set_child_transform (GTK_FIXED (fixed), faces[i].face, transform);
-      gsk_transform_unref (transform);
-    }
-
-  return fixed;
-}
-
-static GtkWidget *demo_window = NULL;
-static GtkCssProvider *provider = NULL;
-
-static void
-close_window (GtkWidget *widget)
-{
-  /* Reset the state */
-  for (int i = 0; i < N_FACES; i++)
-    faces[i].face = NULL;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (),
-                                                 GTK_STYLE_PROVIDER (provider));
-  provider = NULL;
-
-  demo_window = NULL;
-}
-
-static GtkWidget *
-create_demo_window (GtkWidget *do_widget)
-{
-  GtkWidget *window, *sw, *fixed, *cube;
-
-  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), "Fixed layout");
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
-
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
-
-  fixed = gtk_fixed_new ();
-  gtk_container_add (GTK_CONTAINER (sw), fixed);
-  gtk_widget_set_halign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
-
-  cube = create_faces ();
-  gtk_container_add (GTK_CONTAINER (fixed), cube);
-  gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/fixed/fixed.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              800);
-  g_object_unref (provider);
-
-  return window;
-}
-
-GtkWidget*
-do_fixed (GtkWidget *do_widget)
-{
-  if (demo_window == NULL)
-    demo_window = create_demo_window (do_widget);
-
-  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_show (demo_window);
-  else
-    gtk_widget_destroy (demo_window);
-
-  return demo_window;
-}
@@ -1,29 +0,0 @@
-frame.front {
-  border: 2px solid white;
-  background-color: rgba(228, 0, 0, 0.8);
-}
-
-frame.back {
-  border: 2px solid white;
-  background-color: rgba(228, 0, 0, 0.8);
-}
-
-frame.right {
-  border: 2px solid white;
-  background-color: rgba(127, 231, 25, 0.8);
-}
-
-frame.left {
-  border: 2px solid white;
-  background-color: rgba(127, 231, 25, 0.8);
-}
-
-frame.top {
-  border: 2px solid white;
-  background-color: rgba(114, 159, 207, 0.8);
-}
-
-frame.bottom {
-  border: 2px solid white;
-  background-color: rgba(114, 159, 207, 0.8);
-}
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <requires lib="gtk+" version="3.12"/>
  <object class="GtkWindow" id="window">
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
  <object class="GtkMenu" id="menu1">
    <child>
@@ -29,12 +28,12 @@
            <property name="margin-start">8</property>
            <property name="margin-end">8</property>
            <property name="icon-name">image-missing</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-              <property name="row-span">5</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+            <property name="height">5</property>
+          </packing>
        </child>
        <child>
          <object class="GtkBox" id="box1">
@@ -75,11 +74,11 @@
                </style>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="content_label">
@@ -92,11 +91,11 @@
            <accessibility>
              <role type="static"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkBox" id="resent_box">
@@ -119,11 +118,11 @@
                <property name="uri">http://www.gtk.org</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkBox" id="box3">
@@ -182,11 +181,11 @@
                </child>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="details_revealer">
@@ -251,11 +250,11 @@ FAVORITES</property>
                </child>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">4</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -58,7 +58,7 @@ activate_about (GSimpleAction *action,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK widgets",
                         "authors", authors,
-                         "logo-icon-name", "org.gtk.Demo4",
+                         "logo-icon-name", "org.gtk.Demo",
                         "title", "About GTK Demo",
                         NULL);
 }
@@ -668,7 +668,7 @@ add_data_tab (const gchar *demoname)
      gtk_widget_show (label);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
      g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget),
-                    "tab-expand", FALSE,
+                    "tab-expand", TRUE,
                    NULL);

      g_free (resource_name);
@@ -1212,7 +1212,7 @@ main (int argc, char **argv)
    }
  /* -- End of hack -- */

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

  g_action_map_add_action_entries (G_ACTION_MAP (app),
                                   app_entries, G_N_ELEMENTS (app_entries),
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkTreeStore" id="treestore">
    <columns>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <menu id="appmenu">
    <section>
@@ -24,7 +24,6 @@ demos = files([
  'expander.c',
  'filtermodel.c',
  'fishbowl.c',
-  'fixed.c',
  'foreigndrawing.c',
  'gestures.c',
  'glarea.c',
@@ -135,11 +134,11 @@ foreach size: ['scalable', 'symbolic']
 endforeach

 # desktop file
-install_data('org.gtk.Demo4.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.Demo.desktop', install_dir: gtk_applicationsdir)

 # GSettings
-install_data('org.gtk.Demo4.gschema.xml', install_dir: gtk_schemasdir)
+install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)
 gnome.compile_schemas()

 # appdata
-install_data('org.gtk.Demo4.appdata.xml', install_dir: gtk_appdatadir)
+install_data('org.gtk.Demo.appdata.xml', install_dir: gtk_appdatadir)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkWindow" id="window1">
    <child type="titlebar">
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.Demo4.desktop</id>
+  <id>org.gtk.Demo.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>LGPL-2.0+</project_license>
  <name>GTK Demo</name>
@@ -30,11 +30,4 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <releases>
-    <release version="3.94.0" date="2018-06-25">
-      <description>
-        <p>A new developers snapshot towards GTK 4.0.</p>
-      </description>
-    </release>
-  </releases>
 </component>
@@ -2,7 +2,7 @@
 Name=GTK Demo
 Comment=GTK code examples and demonstrations
 Exec=gtk4-demo
-Icon=org.gtk.Demo4
+Icon=org.gtk.Demo
 Terminal=false
 Type=Application
 StartupNotify=true
@@ -2,14 +2,14 @@

 <schemalist>

-  <enum id='org.gtk.Demo4.Color'>
+  <enum id='org.gtk.Demo.Color'>
    <value nick='red'   value='0'/>
    <value nick='green' value='1'/>
    <value nick='blue'  value='2'/>
  </enum>

-  <schema id='org.gtk.Demo4' path='/org/gtk/Demo4/'>
-    <key name='color' enum='org.gtk.Demo4.Color'>
+  <schema id='org.gtk.Demo' path='/org/gtk/Demo/'>
+    <key name='color' enum='org.gtk.Demo.Color'>
      <default>'red'</default>
    </key>
    <key name='window-size' type='(ii)'>
@@ -27,16 +27,10 @@ toggle_resize (GtkWidget *widget,

  is_child1 = (child == gtk_paned_get_child1 (paned));

-  if (is_child1)
-    g_object_get (paned,
-                  "resize-child1", &resize,
-                  "shrink-child1", &shrink,
-                  NULL);
-  else
-    g_object_get (paned,
-                  "resize-child2", &resize,
-                  "shrink-child2", &shrink,
-                  NULL);
+  gtk_container_child_get (GTK_CONTAINER (paned), child,
+                           "resize", &resize,
+                           "shrink", &shrink,
+                           NULL);

  g_object_ref (child);
  gtk_container_remove (GTK_CONTAINER (parent), child);
@@ -61,16 +55,10 @@ toggle_shrink (GtkWidget *widget,

  is_child1 = (child == gtk_paned_get_child1 (paned));

-  if (is_child1)
-    g_object_get (paned,
-                  "resize-child1", &resize,
-                  "shrink-child1", &shrink,
-                  NULL);
-  else
-    g_object_get (paned,
-                  "resize-child2", &resize,
-                  "shrink-child2", &shrink,
-                  NULL);
+  gtk_container_child_get (GTK_CONTAINER (paned), child,
+                           "resize", &resize,
+                           "shrink", &shrink,
+                           NULL);

  g_object_ref (child);
  gtk_container_remove (GTK_CONTAINER (parent), child);
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkListStore" id="liststore1">
    <columns>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkWindow" id="window">
    <property name="default-width">300</property>
@@ -18,11 +17,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer1">
@@ -34,11 +33,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer2">
@@ -50,11 +49,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">3</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer3">
@@ -65,11 +64,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer4">
@@ -81,11 +80,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer5">
@@ -97,11 +96,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer6">
@@ -113,11 +112,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">4</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer7">
@@ -128,11 +127,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">4</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">4</property>
+          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="revealer8">
@@ -144,11 +143,11 @@
                <property name="icon-size">large</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkAdjustment" id="adjustment1">
    <property name="upper">4</property>
@@ -32,11 +31,11 @@
            <accessibility>
              <relation type="label-for" target="scale_plain"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScale" id="scale_plain">
@@ -48,11 +47,11 @@
            <accessibility>
              <relation type="labelled-by" target="label_plain"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label_marks">
@@ -61,11 +60,11 @@
            <accessibility>
              <relation type="label-for" target="scale_marks"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScale" id="scale_marks">
@@ -84,11 +83,11 @@
            <accessibility>
              <relation type="labelled-by" target="label_marks"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label_discrete">
@@ -97,11 +96,11 @@
            <accessibility>
              <relation type="label-for" target="scale_discrete"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScale" id="scale_discrete">
@@ -121,11 +120,11 @@
              <mark value="3" position="bottom"/>
              <mark value="4" position="bottom"/>
            </marks>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkShortcutsWindow" id="shortcuts-boxes">
    <property name="modal">1</property>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkShortcutsWindow" id="shortcuts-builder">
    <property name="modal">1</property>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkShortcutsWindow" id="shortcuts-clocks">
    <property name="modal">1</property>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkShortcutsWindow" id="shortcuts-gedit">
    <property name="modal">1</property>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkWindow" id="window1">
    <property name="title" translatable="yes">Shortcuts</property>
@@ -65,7 +65,7 @@ do_sidebar (GtkWidget *do_widget)
        {
          if (i == 0)
            {
-              widget = gtk_image_new_from_icon_name ("org.gtk.Demo4");
+              widget = gtk_image_new_from_icon_name ("org.gtk.Demo");
              gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
            }
          else
@@ -228,7 +228,7 @@ puzzle_button_pressed (GtkGestureMultiPress *gesture,
  int l, t, i;
  int pos;

-  child = gtk_widget_pick (grid, x, y, TRUE);
+  child = gtk_widget_pick (grid, x, y);

  if (!child)
    {
@@ -236,7 +236,10 @@ puzzle_button_pressed (GtkGestureMultiPress *gesture,
      return;
    }

-  gtk_grid_query_child (GTK_GRID (grid), child, &l, &t, NULL, NULL);
+  gtk_container_child_get (GTK_CONTAINER (grid), child,
+                           "left-attach", &l,
+                           "top-attach", &t,
+                           NULL);

  if (l == pos_x && t == pos_y)
    {
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkAdjustment" id="basic_adjustment">
    <property name="lower">-10000</property>
@@ -36,11 +35,11 @@
            <property name="use-underline">1</property>
            <property name="mnemonic-widget">basic_spin</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="basic_spin">
@@ -50,21 +49,21 @@
            <property name="climb-rate">1</property>
            <property name="digits">2</property>
            <property name="numeric">1</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="basic_label">
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel">
@@ -72,11 +71,11 @@
            <property name="use-underline">1</property>
            <property name="mnemonic-widget">hex_spin</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="hex_spin">
@@ -86,21 +85,21 @@
            <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>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="hex_label">
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel">
@@ -108,11 +107,11 @@
            <property name="use-underline">1</property>
            <property name="mnemonic-widget">time_spin</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="time_spin">
@@ -122,21 +121,21 @@
            <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>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="time_label">
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel">
@@ -144,11 +143,11 @@
            <property name="use-underline">1</property>
            <property name="mnemonic-widget">month_spin</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="month_spin">
@@ -159,21 +158,21 @@
            <property name="adjustment">month_adjustment</property>
            <property name="wrap">1</property>
            <property name="update-policy">if-valid</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="month_label">
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkWindow" id="window1">
    <property name="title" translatable="yes">Stack</property>
@@ -8,11 +7,11 @@
          <object class="GtkStackSwitcher">
            <property name="stack">stack</property>
            <property name="halign">center</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkStack" id="stack">
@@ -26,7 +25,7 @@
                  <object class="GtkImage">
                    <property name="margin-top">20</property>
                    <property name="margin-bottom">20</property>
-                    <property name="icon-name">org.gtk.Demo4</property>
+                    <property name="icon-name">org.gtk.Demo</property>
                  </object>
                </property>
              </object>
@@ -58,11 +57,11 @@
                </property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkGrid" id="grid">
    <property name="row-spacing">10</property>
@@ -12,36 +11,41 @@
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
@@ -50,10 +54,12 @@
              <class name="raised"/>
            </style>
          </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
@@ -63,10 +69,12 @@
              <class name="raised"/>
            </style>
          </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
@@ -74,6 +82,9 @@
            <property name="is-important">1</property>
            <property name="active">1</property>
          </object>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkToolItem">
@@ -138,56 +149,68 @@
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </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>
+          <packing>
+            <property name="homogeneous">1</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -10,7 +10,7 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="org.gtk.IconBrowser4-symbolic.svg"
+   sodipodi:docname="org.gtk.IconBrowser-symbolic.svg"
   height="16.03125"
   id="svg7384"
   inkscape:version="0.92.4 5da689c313, 2019-01-14"
@@ -68,6 +68,6 @@ IconBrowserApp *
 icon_browser_app_new (void)
 {
  return g_object_new (ICON_BROWSER_APP_TYPE,
-                       "application-id", "org.gtk.IconBrowser4",
+                       "application-id", "org.gtk.IconBrowser",
                       NULL);
 }
@@ -285,6 +285,19 @@ populate (IconBrowserWindow *win)
  g_strfreev (groups);
 }

+static gboolean
+key_event_cb (GtkEventController *controller,
+              guint               keyval,
+              guint               keycode,
+              GdkModifierType     state,
+              gpointer            data)
+{
+  IconBrowserWindow *win = data;
+
+  return gtk_search_bar_handle_event (GTK_SEARCH_BAR (win->searchbar),
+                                      gtk_get_current_event ());
+}
+
 static void
 copy_to_clipboard (GtkButton         *button,
                   IconBrowserWindow *win)
@@ -439,6 +452,7 @@ static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
  GdkContentFormats *list;
+  GtkEventController *controller;

  gtk_widget_init_template (GTK_WIDGET (win));

@@ -465,11 +479,13 @@ icon_browser_window_init (IconBrowserWindow *win)

  g_signal_connect (win->searchbar, "notify::search-mode-enabled",
                    G_CALLBACK (search_mode_toggled), win);
-  gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (win->searchbar),
-                                         GTK_WIDGET (win));

  symbolic_toggled (GTK_TOGGLE_BUTTON (win->symbolic_radio), win);

+  controller = gtk_event_controller_key_new ();
+  g_signal_connect (controller, "key-pressed", G_CALLBACK (key_event_cb), win);
+  gtk_widget_add_controller (GTK_WIDGET (win), controller);
+
  populate (win);
 }

@@ -17,7 +17,7 @@ executable('gtk4-icon-browser',
           link_args: extra_demo_ldflags,
           install: true)

-install_data('org.gtk.IconBrowser4.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.IconBrowser.desktop', install_dir: gtk_applicationsdir)

 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
@@ -2,7 +2,7 @@
 Name=Icon Browser
 Comment=An application that shows themed icons
 Exec=gtk4-icon-browser
-Icon=org.gtk.IconBrowser4
+Icon=org.gtk.IconBrowser
 Terminal=false
 Type=Application
 StartupNotify=true
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="IconStore" id="store"/>
  <object class="GtkTreeModelFilter" id="filter_model">
@@ -36,7 +35,7 @@
            </child>
          </object>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkToggleButton" id="search">
            <style>
              <class name="image-button"/>
@@ -47,6 +46,9 @@
              </object>
            </child>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -134,11 +136,11 @@
                <accessibility>
                  <relation type="labelled-by" target="label1"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkImage" id="image2">
@@ -147,11 +149,11 @@
                <accessibility>
                  <relation type="labelled-by" target="label2"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkImage" id="image3">
@@ -160,11 +162,11 @@
                <accessibility>
                  <relation type="labelled-by" target="label3"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkImage" id="image4">
@@ -173,11 +175,11 @@
                <accessibility>
                  <relation type="labelled-by" target="label4"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">3</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkImage" id="image5">
@@ -186,11 +188,11 @@
                <accessibility>
                  <relation type="labelled-by" target="label5"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">4</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkImage" id="image6">
@@ -199,11 +201,11 @@
                <accessibility>
                  <relation type="labelled-by" target="label6"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">5</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="label1">
@@ -216,11 +218,11 @@
                <accessibility>
                  <relation type="label-for" target="image1"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="label2">
@@ -233,11 +235,11 @@
                <accessibility>
                  <relation type="label-for" target="image2"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="label3">
@@ -250,11 +252,11 @@
                <accessibility>
                  <relation type="label-for" target="image3"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="label4">
@@ -267,11 +269,11 @@
                <accessibility>
                  <relation type="label-for" target="image4"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">3</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="label5">
@@ -284,11 +286,11 @@
                <accessibility>
                  <relation type="label-for" target="image5"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">4</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="label6">
@@ -301,11 +303,11 @@
                <accessibility>
                  <relation type="label-for" target="image6"/>
                </accessibility>
-                <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">5</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,3 +1,4 @@
 subdir('gtk-demo')
 subdir('icon-browser')
+subdir('node-editor')
 subdir('widget-factory')
@@ -1,5 +1,5 @@
-/* gtkbinlayout.h: Layout manager for bin-like widgets
- * Copyright 2019  GNOME Foundation
+/*
+ * Copyright © 2019 Benjamin Otte
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -13,19 +13,16 @@
 *
 * 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: Benjamin Otte <otte@gnome.org>
 */
-#pragma once

-#include <gtk/gtklayoutmanager.h>
+#include "config.h"

-G_BEGIN_DECLS
+#include <node-editor-application.h>

-#define GTK_TYPE_BIN_LAYOUT (gtk_bin_layout_get_type ())
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GtkBinLayout, gtk_bin_layout, GTK, BIN_LAYOUT, GtkLayoutManager)
-
-GDK_AVAILABLE_IN_ALL
-GtkLayoutManager *      gtk_bin_layout_new      (void);
-
-G_END_DECLS
+int
+main (int argc, char *argv[])
+{
+  return g_application_run (G_APPLICATION (node_editor_application_new ()), argc, argv);
+}
@@ -0,0 +1,17 @@
+node_editor_sources = [
+  'main.c',
+  'node-editor-application.c',
+  'node-editor-window.c',
+]
+
+node_editor_resources = gnome.compile_resources('node_editor_resources',
+                                                'node-editor.gresource.xml',
+                                                source_dir: '.')
+
+executable('gtk4-node-editor',
+           node_editor_sources, node_editor_resources,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: false)
@@ -0,0 +1,114 @@
+/*
+ * Copyright © 2019 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#include "config.h"
+
+#include "node-editor-application.h"
+
+#include "node-editor-window.h"
+
+struct _NodeEditorApplication
+{
+  GtkApplication parent;
+};
+
+struct _NodeEditorApplicationClass
+{
+  GtkApplicationClass parent_class;
+};
+
+G_DEFINE_TYPE(NodeEditorApplication, node_editor_application, GTK_TYPE_APPLICATION);
+
+static void
+node_editor_application_init (NodeEditorApplication *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
+node_editor_application_startup (GApplication *app)
+{
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
+
+  G_APPLICATION_CLASS (node_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);
+}
+
+static void
+node_editor_application_activate (GApplication *app)
+{
+  NodeEditorWindow *win;
+
+  win = node_editor_window_new (NODE_EDITOR_APPLICATION (app));
+  gtk_window_present (GTK_WINDOW (win));
+}
+
+static void
+node_editor_application_open (GApplication  *app,
+                              GFile        **files,
+                              gint           n_files,
+                              const gchar   *hint)
+{
+  NodeEditorWindow *win;
+  gint i;
+
+  for (i = 0; i < n_files; i++)
+    {
+      win = node_editor_window_new (NODE_EDITOR_APPLICATION (app));
+      node_editor_window_load (win, files[i]);
+      gtk_window_present (GTK_WINDOW (win));
+    }
+}
+
+static void
+node_editor_application_class_init (NodeEditorApplicationClass *class)
+{
+  GApplicationClass *application_class = G_APPLICATION_CLASS (class);
+
+  application_class->startup = node_editor_application_startup;
+  application_class->activate = node_editor_application_activate;
+  application_class->open = node_editor_application_open;
+}
+
+NodeEditorApplication *
+node_editor_application_new (void)
+{
+  return g_object_new (NODE_EDITOR_APPLICATION_TYPE,
+                       "application-id", "org.gtk.gtk4.NodeEditor",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
+}
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2019 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#ifndef __NODE_EDITOR_APPLICATION_H__
+#define __NODE_EDITOR_APPLICATION_H__
+
+#include <gtk/gtk.h>
+
+
+#define NODE_EDITOR_APPLICATION_TYPE (node_editor_application_get_type ())
+#define NODE_EDITOR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NODE_EDITOR_APPLICATION_TYPE, NodeEditorApplication))
+
+
+typedef struct _NodeEditorApplication       NodeEditorApplication;
+typedef struct _NodeEditorApplicationClass  NodeEditorApplicationClass;
+
+
+GType           node_editor_application_get_type    (void);
+NodeEditorApplication *node_editor_application_new         (void);
+
+
+#endif /* __NODE_EDITOR_APPLICATION_H__ */
@@ -0,0 +1,408 @@
+/*
+ * Copyright © 2019 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#include "config.h"
+
+#include "node-editor-window.h"
+
+#include "gsk/gskrendernodeparserprivate.h"
+
+struct _NodeEditorWindow
+{
+  GtkApplicationWindow parent;
+
+  guint text_timeout;
+
+  GtkWidget *picture;
+  GtkWidget *text_view;
+  GtkTextBuffer *text_buffer;
+};
+
+struct _NodeEditorWindowClass
+{
+  GtkApplicationWindowClass parent_class;
+};
+
+G_DEFINE_TYPE(NodeEditorWindow, node_editor_window, GTK_TYPE_APPLICATION_WINDOW);
+
+static gchar *
+get_current_text (GtkTextBuffer *buffer)
+{
+  GtkTextIter start, end;
+
+  gtk_text_buffer_get_start_iter (buffer, &start);
+  gtk_text_buffer_get_end_iter (buffer, &end);
+  gtk_text_buffer_remove_all_tags (buffer, &start, &end);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static void
+update_node (NodeEditorWindow *self)
+{
+  GskRenderNode *node;
+  GError *error = NULL;
+  char *text;
+  GBytes *bytes;
+
+  text = get_current_text (self->text_buffer);
+  bytes = g_bytes_new_take (text, strlen (text));
+
+  node = gsk_render_node_deserialize (bytes, &error);
+  g_bytes_unref (bytes);
+  if (node)
+    {
+      /* XXX: Is this code necessary or can we have API to turn nodes into paintables? */
+      GtkSnapshot *snapshot;
+      GdkPaintable *paintable;
+      graphene_rect_t bounds;
+
+      snapshot = gtk_snapshot_new ();
+      gsk_render_node_get_bounds (node, &bounds);
+      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
+      gtk_snapshot_append_node (snapshot, node);
+      gsk_render_node_unref (node);
+      paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
+      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
+      g_clear_object (&paintable);
+    }
+  else
+    {
+      gtk_picture_set_paintable (GTK_PICTURE (self->picture), NULL);
+      g_clear_error (&error);
+    }
+}
+
+static gboolean
+update_timeout (gpointer data)
+{
+  NodeEditorWindow *self = data;
+
+  self->text_timeout = 0;
+
+  update_node (self);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+text_changed (GtkTextBuffer    *buffer,
+              NodeEditorWindow *self)
+{
+  if (self->text_timeout != 0)
+    g_source_remove (self->text_timeout);
+
+  self->text_timeout = g_timeout_add (100, update_timeout, self); 
+}
+
+static gboolean
+query_tooltip_cb (GtkWidget        *widget,
+                  gint              x,
+                  gint              y,
+                  gboolean          keyboard_tip,
+                  GtkTooltip       *tooltip,
+                  NodeEditorWindow *self)
+{
+  GtkTextIter iter;
+  //GList *l;
+
+  if (keyboard_tip)
+    {
+      gint offset;
+
+      g_object_get (self->text_buffer, "cursor-position", &offset, NULL);
+      gtk_text_buffer_get_iter_at_offset (self->text_buffer, &iter, offset);
+    }
+  else
+    {
+      gint bx, by, trailing;
+
+      gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (self->text_view), GTK_TEXT_WINDOW_TEXT,
+                                             x, y, &bx, &by);
+      gtk_text_view_get_iter_at_position (GTK_TEXT_VIEW (self->text_view), &iter, &trailing, bx, by);
+    }
+
+#if 0
+  for (l = ce->priv->errors; l; l = l->next)
+    {
+      CssError *css_error = l->data;
+
+      if (gtk_text_iter_in_range (&iter, &css_error->start, &css_error->end))
+        {
+          gtk_tooltip_set_text (tooltip, css_error->error->message);
+          return TRUE;
+        }
+    }
+#endif
+
+  return FALSE;
+}
+
+gboolean
+node_editor_window_load (NodeEditorWindow *self,
+                         GFile            *file)
+{
+  GtkTextIter start, end;
+  GBytes *bytes;
+
+  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
+  if (bytes == NULL)
+    return FALSE;
+
+  if (!g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
+    {
+      g_bytes_unref (bytes);
+      return FALSE;
+    }
+
+  gtk_text_buffer_get_start_iter (self->text_buffer, &start);
+  gtk_text_buffer_get_end_iter (self->text_buffer, &end);
+  gtk_text_buffer_insert (self->text_buffer,
+                          &end,
+                          g_bytes_get_data (bytes, NULL),
+                          g_bytes_get_size (bytes));
+
+  return TRUE;
+}
+
+static void
+open_response_cb (GtkWidget        *dialog,
+                  gint              response,
+                  NodeEditorWindow *self)
+{
+  gtk_widget_hide (dialog);
+
+  if (response == GTK_RESPONSE_ACCEPT)
+    {
+      GFile *file;
+
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      node_editor_window_load (self, file);
+      g_object_unref (file);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+open_cb (GtkWidget        *button,
+         NodeEditorWindow *self)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_file_chooser_dialog_new ("",
+                                        GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))),
+                                        GTK_FILE_CHOOSER_ACTION_OPEN,
+                                        "_Cancel", GTK_RESPONSE_CANCEL,
+                                        "_Load", GTK_RESPONSE_ACCEPT,
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), self);
+  gtk_widget_show (dialog);
+}
+
+static void
+save_response_cb (GtkWidget        *dialog,
+                  gint              response,
+                  NodeEditorWindow *self)
+{
+  gtk_widget_hide (dialog);
+
+  if (response == GTK_RESPONSE_ACCEPT)
+    {
+      char *text, *filename;
+      GError *error = NULL;
+
+      text = get_current_text (self->text_buffer);
+
+      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_toplevel (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_widget_destroy (dialog);
+}
+
+static void
+save_cb (GtkWidget        *button,
+         NodeEditorWindow *self)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_file_chooser_dialog_new ("",
+                                        GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))),
+                                        GTK_FILE_CHOOSER_ACTION_SAVE,
+                                        "_Cancel", GTK_RESPONSE_CANCEL,
+                                        "_Save", GTK_RESPONSE_ACCEPT,
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+  g_signal_connect (dialog, "response", G_CALLBACK (save_response_cb), self);
+  gtk_widget_show (dialog);
+}
+
+static GdkTexture *
+create_texture (NodeEditorWindow *self)
+{
+  GdkPaintable *paintable;
+  GtkSnapshot *snapshot;
+  GskRenderer *renderer;
+  GskRenderNode *node;
+  GdkTexture *texture;
+
+  paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture));
+  if (paintable == NULL ||
+      gdk_paintable_get_intrinsic_width (paintable) <= 0 ||
+      gdk_paintable_get_intrinsic_height (paintable) <= 0)
+    return NULL;
+  snapshot = gtk_snapshot_new ();
+  gdk_paintable_snapshot (paintable, snapshot, gdk_paintable_get_intrinsic_width (paintable), gdk_paintable_get_intrinsic_height (paintable));
+  node = gtk_snapshot_free_to_node (snapshot);
+  if (node == NULL)
+    return NULL;
+
+  /* ahem */
+  renderer = GTK_ROOT_GET_IFACE (gtk_widget_get_root (GTK_WIDGET (self)))->get_renderer (gtk_widget_get_root (GTK_WIDGET (self)));
+  texture = gsk_renderer_render_texture (renderer, node, NULL);
+  gsk_render_node_unref (node);
+
+  return texture;
+}
+
+static void
+export_image_response_cb (GtkWidget  *dialog,
+                          gint        response,
+                          GdkTexture *texture)
+{
+  gtk_widget_hide (dialog);
+
+  if (response == GTK_RESPONSE_ACCEPT)
+    {
+      char *filename;
+
+      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+      if (!gdk_texture_save_to_png (texture, filename))
+        {
+          GtkWidget *message_dialog;
+
+          message_dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))),
+                                                   GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_INFO,
+                                                   GTK_BUTTONS_OK,
+                                                   "Exporting to image failed");
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
+          gtk_widget_show (message_dialog);
+        }
+      g_free (filename);
+    }
+
+  gtk_widget_destroy (dialog);
+  g_object_unref (texture);
+}
+
+static void
+export_image_cb (GtkWidget        *button,
+                 NodeEditorWindow *self)
+{
+  GdkTexture *texture;
+  GtkWidget *dialog;
+
+  texture = create_texture (self);
+  if (texture == NULL)
+    return;
+
+  dialog = gtk_file_chooser_dialog_new ("",
+                                        GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))),
+                                        GTK_FILE_CHOOSER_ACTION_SAVE,
+                                        "_Cancel", GTK_RESPONSE_CANCEL,
+                                        "_Save", GTK_RESPONSE_ACCEPT,
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+  g_signal_connect (dialog, "response", G_CALLBACK (export_image_response_cb), texture);
+  gtk_widget_show (dialog);
+}
+
+static void
+node_editor_window_finalize (GObject *object)
+{
+  NodeEditorWindow *self = NODE_EDITOR_WINDOW (object);
+
+  if (self->text_timeout != 0)
+    g_source_remove (self->text_timeout);
+
+  G_OBJECT_CLASS (node_editor_window_parent_class)->finalize (object);
+}
+
+static void
+node_editor_window_class_init (NodeEditorWindowClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->finalize = node_editor_window_finalize;
+
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
+                                               "/org/gtk/gtk4/node-editor/node-editor-window.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, text_buffer);
+  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, text_view);
+  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, picture);
+
+  gtk_widget_class_bind_template_callback (widget_class, text_changed);
+  gtk_widget_class_bind_template_callback (widget_class, query_tooltip_cb);
+  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, export_image_cb);
+}
+
+static void
+node_editor_window_init (NodeEditorWindow *self)
+{
+  gtk_widget_init_template (GTK_WIDGET (self));
+}
+
+NodeEditorWindow *
+node_editor_window_new (NodeEditorApplication *application)
+{
+  return g_object_new (NODE_EDITOR_WINDOW_TYPE,
+                       "application", application,
+                       NULL);
+}
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2019 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#ifndef __NODE_EDITOR_WINDOW_H__
+#define __NODE_EDITOR_WINDOW_H__
+
+#include <gtk/gtk.h>
+
+#include "node-editor-application.h"
+
+#define NODE_EDITOR_WINDOW_TYPE (node_editor_window_get_type ())
+#define NODE_EDITOR_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NODE_EDITOR_WINDOW_TYPE, NodeEditorWindow))
+
+
+typedef struct _NodeEditorWindow         NodeEditorWindow;
+typedef struct _NodeEditorWindowClass    NodeEditorWindowClass;
+
+
+GType                   node_editor_window_get_type     (void);
+
+NodeEditorWindow *      node_editor_window_new          (NodeEditorApplication  *application);
+
+gboolean                node_editor_window_load         (NodeEditorWindow       *self,
+                                                         GFile                  *file);
+
+#endif /* __NODE_EDITOR_WINDOW_H__ */
@@ -0,0 +1,118 @@
+<interface>
+  <object class="GtkTextTagTable" id="tags">
+    <child type="tag">
+      <object class="GtkTextTag">
+        <property name="name">warning</property>
+        <property name="underline">single</property>
+        <property name="underline-rgba">darkorange</property>
+      </object>
+    </child>
+    <child type="tag">
+      <object class="GtkTextTag">
+        <property name="name">error</property>
+        <property name="underline">error</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkTextBuffer" id="text_buffer">
+    <property name="tag-table">tags</property>
+    <signal name="changed" handler="text_changed"/>
+  </object>
+
+  <template class="NodeEditorWindow" parent="GtkApplicationWindow">
+    <style>
+      <class name="devel"/>
+    </style>
+    <property name="title" translatable="yes">GTK Node 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 Node Editor</property>
+        <property name="show-title-buttons">1</property>
+        <child>
+          <object class="GtkBox">
+            <child>
+              <object class="GtkButton">
+                <property name="icon-name">document-open-symbolic</property>
+                <signal name="clicked" handler="open_cb"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="icon-name">document-save-symbolic</property>
+                <signal name="clicked" handler="save_cb"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="icon-name">insert-image-symbolic</property>
+                <signal name="clicked" handler="export_image_cb"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack-type">start</property>
+          </packing>
+        </child>
+        <child type="title">
+          <object class="GtkLabel">
+            <property name="label" translatable="yes">GTK Node Editor</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleButton">
+            <property name="icon-name">view-more-symbolic</property>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkPaned">
+        <property name="position">99999</property>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="hscrollbar-policy">never</property>
+            <property name="expand">1</property>
+            <child>
+              <object class="GtkTextView" id="text_view">
+                <property name="buffer">text_buffer</property>
+                <property name="wrap-mode">word</property>
+                <property name="monospace">1</property>
+                <property name="has-focus">1</property>
+                <property name="left-margin">6</property>
+                <property name="right-margin">6</property>
+                <property name="has-tooltip">1</property>
+                <signal name="query-tooltip" handler="query_tooltip_cb"/>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="expand">1</property>
+            <property name="min-content-height">100</property>
+            <property name="min-content-width">100</property>
+            <child>
+              <object class="GtkViewport">
+                <child>
+                  <object class="GtkPicture" id="picture">
+                    <property name="can-shrink">false</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="shrink">false</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gtk/gtk4/node-editor">
+    <file preprocess="xml-stripblanks">node-editor-window.ui</file>
+  </gresource>
+</gresources>
@@ -13,7 +13,7 @@ executable('gtk4-widget-factory',
           install: true)

 # desktop file
-install_data('org.gtk.WidgetFactory4.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)

 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
@@ -25,4 +25,4 @@ foreach size: ['scalable', 'symbolic']
 endforeach

 # appdata
-install_data('org.gtk.WidgetFactory4.appdata.xml', install_dir: gtk_appdatadir)
+install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.WidgetFactory4.desktop</id>
+  <id>org.gtk.WidgetFactory.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>LGPL-2.0+</project_license>
  <name>GTK Widget Factory</name>
@@ -31,11 +31,4 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <releases>
-    <release version="3.94.0" date="2018-06-25">
-      <description>
-        <p>A new developers snapshot towards GTK 4.0.</p>
-      </description>
-    </release>
-  </releases>
 </component>
@@ -2,7 +2,7 @@
 Name=Widget Factory
 Comment=A showcase for GTK widgets, designed for testing themes.
 Exec=gtk4-widget-factory
-Icon=org.gtk.WidgetFactory4
+Icon=org.gtk.WidgetFactory
 Terminal=false
 Type=Application
 StartupNotify=true
@@ -48,7 +48,7 @@ change_transition_state (GSimpleAction *action,
  GtkStackTransitionType transition;

  if (g_variant_get_boolean (state))
-    transition = GTK_STACK_TRANSITION_TYPE_ROTATE_LEFT_RIGHT;
+    transition = GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT;
  else
    transition = GTK_STACK_TRANSITION_TYPE_NONE;

@@ -232,7 +232,7 @@ activate_about (GSimpleAction *action,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK themes and widgets",
                         "authors", authors,
-                         "logo-icon-name", "org.gtk.WidgetFactory4",
+                         "logo-icon-name", "org.gtk.WidgetFactory",
                         "title", "About GTK Widget Factory",
                         "system-information", s->str,
                         NULL);
@@ -1657,13 +1657,13 @@ activate (GApplication *app)
  g_type_ensure (my_text_view_get_type ());

  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory4/widget-factory.css");
+  gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css");
  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_USER);
  g_object_unref (provider);

-  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory4/widget-factory.ui");
+  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/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);
@@ -1944,7 +1944,7 @@ main (int argc, char *argv[])
  };
  gint status;

-  app = gtk_application_new ("org.gtk.WidgetFactory4", G_APPLICATION_NON_UNIQUE);
+  app = gtk_application_new ("org.gtk.WidgetFactory", G_APPLICATION_NON_UNIQUE);

  g_action_map_add_action_entries (G_ACTION_MAP (app),
                                   app_entries, G_N_ELEMENTS (app_entries),
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gtk/WidgetFactory4">
+  <gresource prefix="/org/gtk/WidgetFactory">
    <file preprocess="xml-stripblanks">widget-factory.ui</file>
  </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory4">
+  <gresource prefix="/org/gtk/WidgetFactory">
    <file>widget-factory.css</file>
  </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory4/gtk">
+  <gresource prefix="/org/gtk/WidgetFactory/gtk">
    <file preprocess="xml-stripblanks">help-overlay.ui</file>
  </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory4">
+  <gresource prefix="/org/gtk/WidgetFactory">
    <file>icons/16x16/actions/document-new.png</file>
    <file>icons/16x16/actions/document-save.png</file>
    <file>icons/16x16/actions/edit-find.png</file>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <menu id="gear_menu">
    <section>
@@ -412,12 +411,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
            <property name="stack">toplevel_stack</property>
          </object>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkMenuButton" id="gear_menu_button">
            <property name="valign">center</property>
            <property name="menu-model">gear_menu</property>
            <property name="icon-name">open-menu-symbolic</property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -427,7 +429,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
        <property name="margin">10</property>
        <child>
          <object class="GtkStack" id="toplevel_stack">
-            <property name="transition-duration">1000</property>
+            <property name="transition-duration">30000</property>
            <child>
              <object class="GtkStackPage">
                <property name="name">page1</property>
@@ -594,32 +596,32 @@ 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>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkCheckButton" id="checkbutton2">
                                    <property name="label" translatable="yes">checkbutton</property>
                                    <property name="can-focus">1</property>
-                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkCheckButton" id="checkbutton3">
                                    <property name="label" translatable="yes">checkbutton</property>
                                    <property name="inconsistent">1</property>
                                    <property name="can-focus">1</property>
-                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">2</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkCheckButton" id="checkbutton4">
@@ -627,22 +629,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="sensitive">0</property>
                                    <property name="can-focus">1</property>
                                    <property name="active">1</property>
-                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">3</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkCheckButton" id="checkbutton5">
                                    <property name="label" translatable="yes">checkbutton</property>
                                    <property name="sensitive">0</property>
                                    <property name="can-focus">1</property>
-                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">4</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkCheckButton" id="checkbutton6">
@@ -650,22 +652,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="sensitive">0</property>
                                    <property name="inconsistent">1</property>
                                    <property name="can-focus">1</property>
-                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">5</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkRadioButton" id="radiobutton1">
                                    <property name="label" translatable="yes">radiobutton</property>
                                    <property name="can-focus">1</property>
                                    <property name="active">1</property>
-                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">0</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkRadioButton" id="radiobutton2">
@@ -673,11 +675,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="can-focus">1</property>
                                    <property name="active">1</property>
                                    <property name="group">radiobutton1</property>
-                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkRadioButton" id="radiobutton3">
@@ -686,11 +688,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="can-focus">1</property>
                                    <property name="active">1</property>
                                    <property name="group">radiobutton1</property>
-                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">2</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkRadioButton" id="radiobutton4">
@@ -698,11 +700,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="sensitive">0</property>
                                    <property name="can-focus">1</property>
                                    <property name="active">1</property>
-                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">3</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkRadioButton" id="radiobutton5">
@@ -711,11 +713,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="can-focus">1</property>
                                    <property name="active">1</property>
                                    <property name="group">radiobutton3</property>
-                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">4</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkRadioButton" id="radiobutton6">
@@ -725,47 +727,46 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="can-focus">1</property>
                                    <property name="active">1</property>
                                    <property name="group">radiobutton3</property>
-                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">5</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkSpinner" id="spinner1">
                                    <property name="active">1</property>
-                                    <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">0</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
                                </child>
                                <child>
-                                  <object class="GtkSpinner" id="spinner2">
-                                    <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
-                                    </layout>
-                                  </object>
+                                  <object class="GtkSpinner" id="spinner2"/>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkSpinner" id="spinner3">
                                    <property name="active">1</property>
                                    <property name="sensitive">0</property>
-                                    <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">3</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkSpinner" id="spinner4">
                                    <property name="sensitive">0</property>
-                                    <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
-                                    </layout>
                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">4</property>
+                                  </packing>
                                </child>
                              </object>
                            </child>
@@ -1504,11 +1505,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                        <property name="valign">center</property>
                                        <property name="value">.5</property>
                                        <property name="halign">center</property>
-                                        <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
-                                        </layout>
                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">0</property>
+                                      </packing>
                                    </child>
                                    <child>
                                      <object class="GtkScaleButton" id="mic-button">
@@ -1522,11 +1523,11 @@ microphone-sensitivity-medium-symbolic</property>
                                        <property name="halign">center</property>
                                        <signal name="query-tooltip" handler="on_scale_button_query_tooltip" swapped="no"/>
                                        <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
-                                        <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
-                                        </layout>
                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">1</property>
+                                      </packing>
                                    </child>
                                  </object>
                                </child>
@@ -1571,7 +1572,7 @@ microphone-sensitivity-medium-symbolic</property>
                                            <property name="title">Logo</property>
                                            <property name="child">
                                              <object class="GtkImage" id="imageo">
-                                                <property name="icon-name">org.gtk.WidgetFactory4</property>
+                                                <property name="icon-name">gtk3-widget-factory</property>
                                                <property name="pixel-size">256</property>
                                              </object>
                                            </property>
@@ -1587,13 +1588,16 @@ microphone-sensitivity-medium-symbolic</property>
                                            <property name="halign">center</property>
                                          </object>
                                        </child>
-                                        <child type="end">
+                                        <child>
                                          <object class="GtkMenuButton">
                                            <property name="menu-model">dinner_menu</property>
                                            <property name="halign">center</property>
                                            <property name="valign">center</property>
                                            <property name="icon-name">emblem-system-symbolic</property>
                                          </object>
+                                          <packing>
+                                            <property name="pack-type">end</property>
+                                          </packing>
                                        </child>
                                      </object>
                                    </child>
@@ -2844,7 +2848,6 @@ microphone-sensitivity-medium-symbolic</property>
                                </child>
                                <child>
                                  <object class="GtkToolItem">
-                                    <property name="expand-item">1</property>
                                    <child>
                                      <object class="GtkScale">
                                        <property name="draw-value">0</property>
@@ -2852,6 +2855,9 @@ microphone-sensitivity-medium-symbolic</property>
                                      </object>
                                    </child>
                                  </object>
+                                  <packing>
+                                    <property name="expand">1</property>
+                                  </packing>
                                </child>
                                <child>
                                  <object class="GtkToolItem">
@@ -3195,20 +3201,20 @@ bad things might happen.</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
              <object class="GtkEntry" id="details_entry">
                <property name="valign">baseline</property>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel">
@@ -3220,20 +3226,20 @@ bad things might happen.</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkEntry" id="more_details_entry">
                <property name="valign">baseline</property>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel">
@@ -3245,22 +3251,22 @@ bad things might happen.</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
            <child>
              <object class="GtkScale" id="level_scale">
                <property name="valign">baseline</property>
                <property name="draw-value">0</property>
                <property name="adjustment">adjustment1</property>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel">
@@ -3272,21 +3278,21 @@ bad things might happen.</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
+              </packing>
            </child>
            <child>
              <object class="GtkSwitch" id="mode_switch">
                <property name="halign">start</property>
                <property name="valign">baseline</property>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -3344,11 +3350,11 @@ 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>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="description_label">
@@ -3358,11 +3364,11 @@ bad things might happen.</property>
            <accessibility>
              <relation type="label-for" target="open_popover_textview"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow">
@@ -3379,11 +3385,11 @@ bad things might happen.</property>
                </accessibility>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkEntry" id="open_popover_entry">
@@ -3391,11 +3397,11 @@ bad things might happen.</property>
            <accessibility>
              <relation type="labelled-by" target="title_label"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkButton" id="open_popover_button">
@@ -3407,11 +3413,11 @@ bad things might happen.</property>
            <style>
              <class name="suggested-action"/>
            </style>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -271,6 +271,7 @@ gdk_surface_get_frame_extents
 gdk_surface_get_origin
 gdk_surface_get_root_coords
 gdk_surface_get_device_position
+gdk_surface_get_device_position_double
 GdkModifierType
 GdkModifierIntent
 gdk_surface_get_parent
@@ -279,6 +280,7 @@ gdk_surface_get_children
 gdk_surface_peek_children
 gdk_surface_set_icon_name
 gdk_surface_set_transient_for
+gdk_surface_set_role
 gdk_surface_set_startup_id
 gdk_surface_set_group
 gdk_surface_get_group
@@ -500,12 +502,19 @@ gdk_device_get_has_cursor
 gdk_device_get_n_axes
 gdk_device_get_n_keys
 gdk_device_get_axes
+gdk_device_warp
 gdk_device_get_seat

+<SUBSECTION>
+gdk_device_grab
+gdk_device_ungrab
+
 <SUBSECTION>
 gdk_device_get_state
 gdk_device_get_position
+gdk_device_get_position_double
 gdk_device_get_surface_at_position
+gdk_device_get_surface_at_position_double
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
@@ -997,6 +1006,7 @@ gdk_wayland_display_get_wl_display
 gdk_wayland_display_query_registry
 gdk_wayland_surface_new_subsurface
 gdk_wayland_surface_get_wl_surface
+gdk_wayland_surface_set_use_custom_surface
 GdkWaylandSurfaceExported
 gdk_wayland_surface_export_handle
 gdk_wayland_surface_unexport_handle
@@ -18,7 +18,6 @@
    <title>API Reference</title>
    <xi:include href="xml/GskRenderer.xml" />
    <xi:include href="xml/GskRenderNode.xml" />
-    <xi:include href="xml/GskRoundedRect.xml" />
    <xi:include href="xml/GskTransform.xml" />
  </reference>

@@ -67,7 +67,11 @@ gsk_container_node_get_n_children
 gsk_container_node_get_child
 gsk_transform_node_new
 gsk_transform_node_get_child
-gsk_transform_node_get_transform
+gsk_transform_node_peek_transform
+gsk_offset_node_new
+gsk_offset_node_get_child
+gsk_offset_node_get_x_offset
+gsk_offset_node_get_y_offset
 gsk_opacity_node_new
 gsk_opacity_node_get_child
 gsk_opacity_node_get_opacity
@@ -143,6 +147,7 @@ gsk_rounded_rect_intersects_rect

 <SECTION>
 <FILE>GskTransform</FILE>
+<TITLE>3D transformations</TITLE>
 GskTransform
 gsk_transform_ref
 gsk_transform_unref
@@ -152,6 +157,8 @@ gsk_transform_get_category
 <SUBSECTION>
 gsk_transform_print
 gsk_transform_to_string
+gsk_transform_from_string
+<SUBSECTION>
 gsk_transform_to_matrix
 gsk_transform_to_2d
 gsk_transform_to_affine
@@ -546,7 +546,7 @@ checkbutton:indeterminate {
      GTK adds several additional ways to specify colors.
    </para>

-<literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉</code>
+<literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉 | 〈win32 color〉</code>
 </literallayout>

    <para>
@@ -592,6 +592,13 @@ checkbutton:indeterminate {

 <literallayout><code>〈color expression〉 = lighter( 〈color〉 ) | darker( 〈color〉 ) | shade( 〈color〉, 〈number〉 ) |</code>
 <code>                     alpha( 〈color〉, 〈number〉 ) | mix( 〈color〉, 〈color〉, 〈number〉 )</code>
+</literallayout>
+
+    <para>
+      On Windows, GTK allows to refer to system colors, as follows:
+    </para>
+
+<literallayout><code>〈win32 color〉 = -gtk-win32-color( 〈name〉, 〈integer〉 )</code>
 </literallayout>

  </refsect2>
@@ -730,7 +737,7 @@ label {
      GTK extends the CSS syntax for images and also uses it for specifying icons.
    </para>

-<literallayout><code>〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉</code>
+<literallayout><code>〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉 | 〈win32 theme part〉</code>
 </literallayout>

    <para>
@@ -808,6 +815,13 @@ arrow {
 }
 ]]></programlisting>
    </example>
+    <para>
+      On Windows, GTK allows to refer to system theme parts as images, as follows:
+    </para>
+
+<literallayout><code>〈win32 theme part〉 = -gtk-win32-theme-part( 〈name〉, 〈integer〉 〈integer〉</code>
+<code>                                              [ , [ over( 〈integer〉 〈integer〉 [ , 〈alpha value〉 ]? ) | margins( 〈integer〉{1,4} ) ] ]* )</code>
+</literallayout>

  </refsect2>

@@ -65,6 +65,20 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
      not quite the same as the CSS definition of rem.
    </para>

+    <para>
+      Whereever a number is allowed, GTK also accepts a Windows-specific
+      theme size:
+    </para>
+
+<literallayout>
+<code>〈win32 theme size〉 = 〈win32 size〉 | 〈win32 part size〉</code>
+<code>〈win32 size〉 = -gtk-win32-size ( 〈theme name〉, 〈metric id〉 )</code>
+<code>〈win32 part size〉 = [ -gtk-win32-part-width | -gtk-win32-part-height |</code>
+<code>                      -gtk-win32-part-border-top | -gtk-win32-part-border-right |</code>
+<code>                      -gtk-win32-part-border-bottom | -gtk-win32-part-border-left ]</code>
+<code>                    ( 〈theme name〉 , 〈integer〉 , 〈integer〉 )</code>
+</literallayout>
+
 <literallayout><code>〈calc expression〉 = calc( 〈calc sum〉 )</code>
 <code>〈calc sum〉 = 〈calc product〉 [ [ + | - ] 〈calc product〉 ]*</code>
 <code>〈calc product〉 = 〈calc value〉 [ * 〈calc value〉 | / 〈number〉 ]*</code>
@@ -54,6 +54,16 @@ Start your applications like this:
 <programlisting>
 GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
 </programlisting>
+
+You can add password protection for your session by creating a file in
+<filename>$XDG_CONFIG_HOME/broadway.passwd</filename> or <filename>$HOME/.config/broadway.passwd</filename>
+with a crypt(3) style password hash.
+
+A simple way to generate it is with openssl:
+<programlisting>
+openssl passwd -1  > ~/.config/broadway.passwd
+</programlisting>
+
 </para>
 </refsect1>

@@ -92,6 +92,7 @@
      <xi:include href="xml/gtkheaderbar.xml" />
      <xi:include href="xml/gtkoverlay.xml" />
      <xi:include href="xml/gtkpaned.xml" />
+      <xi:include href="xml/gtklayout.xml" />
      <xi:include href="xml/gtknotebook.xml" />
      <xi:include href="xml/gtkexpander.xml" />
      <xi:include href="xml/gtkorientable.xml" />
@@ -99,17 +100,6 @@
      <xi:include href="xml/gtkfixed.xml" />
    </chapter>

-    <chapter id="LayoutManagers">
-      <title>Layout Managers</title>
-      <xi:include href="xml/gtklayoutmanager.xml" />
-      <xi:include href="xml/gtklayoutchild.xml" />
-      <xi:include href="xml/gtkbinlayout.xml" />
-      <xi:include href="xml/gtkboxlayout.xml" />
-      <xi:include href="xml/gtkcustomlayout.xml" />
-      <xi:include href="xml/gtkfixedlayout.xml" />
-      <xi:include href="xml/gtkgridlayout.xml" />
-    </chapter>
-
    <chapter id="DisplayWidgets">
      <title>Display Widgets</title>
      <xi:include href="xml/gtklabel.xml" />
@@ -424,7 +424,6 @@ gtk_selection_model_select_range
 gtk_selection_model_unselect_range
 gtk_selection_model_select_all
 gtk_selection_model_unselect_all
-gtk_selection_model_query_range
 <SUBSECTION>
 gtk_selection_model_selection_changed
 <SUBSECTION Standard>
@@ -744,8 +743,10 @@ gtk_combo_box_text_get_type
 <TITLE>GtkContainer</TITLE>
 GtkContainer
 GtkContainerClass
+GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID
 gtk_container_add
 gtk_container_remove
+gtk_container_add_with_properties
 gtk_container_foreach
 gtk_container_get_children
 gtk_container_get_path_for_child
@@ -754,7 +755,19 @@ gtk_container_set_focus_vadjustment
 gtk_container_get_focus_hadjustment
 gtk_container_set_focus_hadjustment
 gtk_container_child_type
+gtk_container_child_get
+gtk_container_child_set
+gtk_container_child_get_property
+gtk_container_child_set_property
+gtk_container_child_get_valist
+gtk_container_child_set_valist
+gtk_container_child_notify
+gtk_container_child_notify_by_pspec
 gtk_container_forall
+gtk_container_class_find_child_property
+gtk_container_class_install_child_property
+gtk_container_class_install_child_properties
+gtk_container_class_list_child_properties

 <SUBSECTION Standard>
 GTK_CONTAINER
@@ -1284,8 +1297,6 @@ gtk_file_filter_get_type
 <TITLE>GtkFilterListModel</TITLE>
 GtkFilterListModel
 gtk_filter_list_model_new
-gtk_filter_list_model_new_for_type
-gtk_filter_list_model_set_model
 gtk_filter_list_model_get_model
 gtk_filter_list_model_set_filter_func
 gtk_filter_list_model_has_filter
@@ -1375,7 +1386,6 @@ gtk_font_chooser_set_font
 gtk_font_chooser_get_font_desc
 gtk_font_chooser_set_font_desc
 gtk_font_chooser_get_font_features
-gtk_font_chooser_get_language
 gtk_font_chooser_set_language
 gtk_font_chooser_get_preview_text
 gtk_font_chooser_set_preview_text
@@ -1725,6 +1735,27 @@ GtkLabelPrivate
 GtkLabelSelectionInfo
 </SECTION>

+<SECTION>
+<FILE>gtklayout</FILE>
+<TITLE>GtkLayout</TITLE>
+GtkLayout
+gtk_layout_new
+gtk_layout_put
+gtk_layout_move
+gtk_layout_set_size
+gtk_layout_get_size
+<SUBSECTION Standard>
+GTK_LAYOUT
+GTK_IS_LAYOUT
+GTK_TYPE_LAYOUT
+GTK_LAYOUT_CLASS
+GTK_IS_LAYOUT_CLASS
+GTK_LAYOUT_GET_CLASS
+<SUBSECTION Private>
+GtkLayoutPrivate
+gtk_layout_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtklinkbutton</FILE>
 <TITLE>GtkLinkButton</TITLE>
@@ -2479,6 +2510,7 @@ gtk_search_bar_get_search_mode
 gtk_search_bar_set_search_mode
 gtk_search_bar_get_show_close_button
 gtk_search_bar_set_show_close_button
+gtk_search_bar_handle_event
 gtk_search_bar_set_key_capture_widget
 gtk_search_bar_get_key_capture_widget
 <SUBSECTION Standard>
@@ -2497,6 +2529,7 @@ gtk_search_bar_get_type
 <TITLE>GtkSearchEntry</TITLE>
 GtkSearchEntry
 gtk_search_entry_new
+gtk_search_entry_handle_event
 gtk_search_entry_set_key_capture_widget
 gtk_search_entry_get_key_capture_widget
 <SUBSECTION Standard>
@@ -4345,8 +4378,6 @@ gtk_snapshot_push_clip
 gtk_snapshot_push_rounded_clip
 gtk_snapshot_push_cross_fade
 gtk_snapshot_push_blend
-gtk_snapshot_push_blur
-gtk_snapshot_push_shadow
 gtk_snapshot_push_debug
 gtk_snapshot_pop
 gtk_snapshot_save
@@ -4375,8 +4406,6 @@ gtk_snapshot_render_frame
 gtk_snapshot_render_focus
 gtk_snapshot_render_layout
 gtk_snapshot_render_insertion_cursor
-<SUBSECTION Private>
-gtk_snapshot_get_type
 </SECTION>

 <SECTION>
@@ -4467,10 +4496,13 @@ gtk_widget_get_cursor
 gtk_widget_set_cursor
 gtk_widget_set_cursor_from_name
 gtk_widget_mnemonic_activate
+gtk_widget_send_focus_change
 gtk_widget_class_set_accessible_type
 gtk_widget_class_set_accessible_role
 gtk_widget_get_accessible
 gtk_widget_child_focus
+gtk_widget_child_notify
+gtk_widget_freeze_child_notify
 gtk_widget_get_child_visible
 gtk_widget_get_parent
 gtk_widget_get_settings
@@ -4480,6 +4512,7 @@ gtk_widget_get_display
 gtk_widget_get_size_request
 gtk_widget_set_child_visible
 gtk_widget_set_size_request
+gtk_widget_thaw_child_notify
 gtk_widget_list_mnemonic_labels
 gtk_widget_add_mnemonic_label
 gtk_widget_remove_mnemonic_label
@@ -4557,8 +4590,6 @@ gtk_widget_get_first_child
 gtk_widget_get_last_child
 gtk_widget_insert_before
 gtk_widget_insert_after
-gtk_widget_set_layout_manager
-gtk_widget_get_layout_manager

 <SUBSECTION>
 gtk_widget_get_path
@@ -4655,6 +4686,8 @@ gtk_window_activate_focus
 gtk_window_activate_default
 gtk_window_set_modal
 gtk_window_set_default_size
+gtk_window_set_gravity
+gtk_window_get_gravity
 gtk_window_set_hide_on_close
 gtk_window_get_hide_on_close
 GtkWindowPosition
@@ -4702,6 +4735,7 @@ gtk_window_set_urgency_hint
 gtk_window_set_accept_focus
 gtk_window_set_focus_on_map
 gtk_window_set_startup_id
+gtk_window_set_role
 gtk_window_get_decorated
 gtk_window_get_deletable
 gtk_window_get_default_icon_name
@@ -4710,6 +4744,8 @@ gtk_window_get_destroy_with_parent
 gtk_window_get_icon_name
 gtk_window_get_mnemonic_modifier
 gtk_window_get_modal
+gtk_window_get_position
+gtk_window_get_role
 gtk_window_get_size
 gtk_window_get_title
 gtk_window_get_transient_for
@@ -4723,6 +4759,7 @@ gtk_window_get_focus_on_map
 gtk_window_get_group
 gtk_window_has_group
 gtk_window_get_window_type
+gtk_window_move
 gtk_window_resize
 gtk_window_set_default_icon_name
 gtk_window_set_icon_name
@@ -5015,6 +5052,8 @@ gtk_style_context_get_state
 gtk_style_context_get_valist
 gtk_style_context_get_section
 gtk_style_context_get_color
+gtk_style_context_get_background_color
+gtk_style_context_get_border_color
 gtk_style_context_get_border
 gtk_style_context_get_padding
 gtk_style_context_get_margin
@@ -6177,10 +6216,6 @@ gtk_color_chooser_get_use_alpha
 gtk_color_chooser_set_use_alpha
 gtk_color_chooser_add_palette

-<SUBSECTION>
-gtk_hsv_to_rgb
-gtk_rgb_to_hsv
-
 <SUBSECTION Standard>
 GTK_TYPE_COLOR_CHOOSER
 GTK_COLOR_CHOOSER
@@ -6298,7 +6333,6 @@ gtk_stack_add_named
 gtk_stack_add_titled
 gtk_stack_get_child_by_name
 gtk_stack_get_page
-gtk_stack_get_pages
 gtk_stack_page_get_child
 gtk_stack_set_visible_child
 gtk_stack_get_visible_child
@@ -6329,7 +6363,6 @@ GTK_STACK_GET_CLASS

 <SUBSECTION Private>
 gtk_stack_get_type
-gtk_stack_page_get_type
 </SECTION>

 <SECTION>
@@ -6491,7 +6524,6 @@ gtk_popover_get_type
 <TITLE>GtkPopoverMenu</TITLE>
 GtkPopoverMenu
 gtk_popover_menu_new
-gtk_popover_menu_add_submenu
 gtk_popover_menu_open_submenu

 <SUBSECTION Standard>
@@ -7117,141 +7149,6 @@ gtk_media_stream_get_type
 <TITLE>GtkRoot</TITLE>
 GtkRoot
 gtk_root_get_for_surface
-gtk_root_get_focus
-gtk_root_set_focus
-
-<SUBSECTION>
-gtk_root_install_properties
-
 <SUBSECTION Private>
 gtk_root_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtklayoutmanager</FILE>
-GtkLayoutManager
-GtkLayoutManagerClass
-
-gtk_layout_manager_measure
-gtk_layout_manager_allocate
-gtk_layout_manager_get_request_mode
-gtk_layout_manager_get_widget
-gtk_layout_manager_get_layout_child
-gtk_layout_manager_layout_changed
-
-<SUBSECTION Standard>
-GTK_TYPE_LAYOUT_MANAGER
-gtk_layout_manager_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtklayoutchild</FILE>
-GtkLayoutChild
-GtkLayoutChildClass
-
-gtk_layout_child_get_layout_manager
-gtk_layout_child_get_child_widget
-
-<SUBSECTION Standard>
-GTK_TYPE_LAYOUT_CHILD
-gtk_layout_child_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkboxlayout</FILE>
-GtkBoxLayout
-
-gtk_box_layout_new
-gtk_box_layout_set_homogeneous
-gtk_box_layout_get_homogeneous
-gtk_box_layout_set_spacing
-gtk_box_layout_get_spacing
-gtk_box_layout_set_baseline_position
-gtk_box_layout_get_baseline_position
-
-<SUBSECTION Standard>
-GTK_TYPE_BOX_LAYOUT
-gtk_box_layout_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkcustomlayout</FILE>
-GtkCustomLayout
-
-GtkCustomRequestModeFunc
-GtkCustomMeasureFunc
-GtkCustomAllocateFunc
-
-gtk_custom_layout_new
-
-<SUBSECTION Standard>
-GTK_TYPE_CUSTOM_LAYOUT
-gtk_custom_layout_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkbinlayout</FILE>
-GtkBinLayout
-
-gtk_bin_layout_new
-
-<SUBSECTION Standard>
-GTK_TYPE_BIN_LAYOUT
-gtk_bin_layout_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkfixedlayout</FILE>
-GtkFixedLayout
-
-gtk_fixed_layout_new
-
-<SUBSECTION>
-GtkFixedLayoutChild
-
-gtk_fixed_layout_child_set_position
-gtk_fixed_layout_child_get_position
-
-<SUBSECTION Standard>
-GTK_TYPE_FIXED_LAYOUT
-gtk_fixed_layout_get_type
-GTK_TYPE_FIXED_LAYOUT_CHILD
-gtk_fixed_layout_child_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgridlayout</FILE>
-GtkGridLayout
-
-gtk_grid_layout_new
-gtk_grid_layout_set_row_homogeneous
-gtk_grid_layout_get_row_homogeneous
-gtk_grid_layout_set_row_spacing
-gtk_grid_layout_get_row_spacing
-gtk_grid_layout_set_column_homogeneous
-gtk_grid_layout_get_column_homogeneous
-gtk_grid_layout_set_column_spacing
-gtk_grid_layout_get_column_spacing
-gtk_grid_layout_set_row_baseline_position
-gtk_grid_layout_get_row_baseline_position
-gtk_grid_layout_set_baseline_row
-gtk_grid_layout_get_baseline_row
-
-<SUBSECTION>
-GtkGridLayoutChild
-
-gtk_grid_layout_child_set_top_attach
-gtk_grid_layout_child_get_top_attach
-gtk_grid_layout_child_set_left_attach
-gtk_grid_layout_child_get_left_attach
-gtk_grid_layout_child_set_column_span
-gtk_grid_layout_child_get_column_span
-gtk_grid_layout_child_set_row_span
-gtk_grid_layout_child_get_row_span
-
-<SUBSECTION Standard>
-GTK_TYPE_GRID_LAYOUT
-gtk_grid_layout_get_type
-GTK_TYPE_GRID_LAYOUT_CHILD
-gtk_grid_layout_child_get_type
-</SECTION>
@@ -16,9 +16,7 @@ gtk_aspect_frame_get_type
 gtk_assistant_get_type
 gtk_assistant_page_get_type
 gtk_bin_get_type
-gtk_bin_layout_get_type
 gtk_box_get_type
-gtk_box_layout_get_type
 gtk_builder_get_type
 gtk_buildable_get_type
 gtk_button_get_type
@@ -66,7 +64,6 @@ gtk_file_chooser_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
 gtk_fixed_get_type
-gtk_fixed_layout_get_type
 gtk_flow_box_get_type
 gtk_flow_box_child_get_type
 gtk_font_button_get_type
@@ -86,8 +83,6 @@ gtk_gesture_swipe_get_type
 gtk_gesture_zoom_get_type
 gtk_gl_area_get_type
 gtk_grid_get_type
-gtk_grid_layout_child_get_type
-gtk_grid_layout_get_type
 gtk_header_bar_get_type
 gtk_icon_theme_get_type
 gtk_icon_view_get_type
@@ -97,8 +92,7 @@ gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
 gtk_info_bar_get_type
 gtk_label_get_type
-gtk_layout_child_get_type
-gtk_layout_manager_get_type
+gtk_layout_get_type
 gtk_link_button_get_type
 gtk_list_store_get_type
 gtk_list_box_get_type
@@ -289,28 +289,6 @@
      </para>
    </section>

-    <section>
-      <title>Stop using gdk_pointer_warp()</title>
-      <para>
-        Warping the pointer is disorienting and unfriendly to users.
-        GTK 4 does not support it. In special circumstances (such as when
-        implementing remote connection UIs) it can be necessary to
-        warp the pointer; in this case, use platform APIs such as XWarpPointer
-        directly.
-      </para>
-    </section>
-
-    <section>
-      <title>Adapt to coordinate api changes</title>
-      <para>
-        A number of coordinate apis in GTK 3 had _double variants: 
-        gdk_device_get_position(), gdk_device_get_surface_at_position(),
-        gdk_surface_get_device_position(). These have been changed to use
-        doubles, and the _double variants have been removed. Update your
-        code accordingly.
-      </para>
-    </section>
-
    <section>
      <title>Adapt to GdkKeymap API changes</title>
      <para>
@@ -343,22 +321,12 @@
    </section>

    <section>
-      <title>Adapt to GtkHeaderBar and GtkActionBar API changes</title>
+      <title>Adapt to GtkHeaderBar API changes</title>
      <para>
        The gtk_header_bar_set_show_close_button() function has been renamed to
        the more accurate name gtk_header_bar_set_show_title_buttons(). The corresponding
        getter and the property itself have also been renamed.
      </para>
-      <para>
-        The ::pack-type child properties of GtkHeaderBar and GtkActionBar have
-        been removed. If you need to programmatically place children, use the
-        pack_start() and pack_end() APIs. In ui files, use the type attribute
-        on the child element.
-      </para>
-      <para>
-        gtk4-builder-tool can help with this conversion, with the --3to4 option
-        of the simplify command.
-      </para>
    </section>

    <section>
@@ -665,16 +633,6 @@
        pass-through == !can-pick.
      </para>
    </section>
-
-    <section>
-      <title>Use GtkFixed instead of GtkLayout</title>
-      <para>
-        Since GtkScrolledWindow can deal with widgets that do not implement
-        the GtkScrollable interface by automatically wrapping them into a
-        GtkViewport, GtkLayout is redundant, and has been removed in favor
-        of the existing GtkFixed container widget.
-      </para>
-    </section>
  </section>

 </chapter>
@@ -150,8 +150,11 @@ see for example <link
 linkend="gtk-window-iconify">gtk_window_iconify()</link> or <link
 linkend="gtk-window-maximize">gtk_window_maximize()</link> or <link
 linkend="gtk-window-set-decorated">gtk_window_set_decorated()</link>.
-Keep in mind that most window managers <emphasis>will</emphasis> ignore
-certain requests from time to time, in the interests of good user interface.
+Keep in mind that <link
+linkend="gtk-window-move">gtk_window_move()</link> and window sizing
+are ultimately controlled by the window manager as well and most
+window managers <emphasis>will</emphasis> ignore certain requests from
+time to time, in the interests of good user interface.
 </para>

 <!--
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppPrefs" parent="GtkDialog">
    <property name="title" translatable="yes">Preferences</property>
@@ -17,19 +16,18 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">font</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
-              <object class="GtkFontButton" id="font">
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
-                </layout>
-              </object>
+              <object class="GtkFontButton" id="font"/>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="transitionlabel">
@@ -37,11 +35,11 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">transition</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkComboBoxText" id="transition">
@@ -50,11 +48,11 @@
                  <item translatable="yes" id="crossfade">Fade</item>
                  <item translatable="yes" id="slide-left-right">Slide</item>
                </items>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">Example Application</property>
@@ -23,19 +22,25 @@
            <property name="stack">stack</property>
          </object>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkToggleButton" id="search">
            <property name="sensitive">0</property>
            <property name="icon-name">edit-find-symbolic</property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkMenuButton" id="gears">
            <property name="direction">none</property>
            <style>
              <class name="image-button"/>
            </style>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppPrefs" parent="GtkDialog">
    <property name="title" translatable="yes">Preferences</property>
@@ -17,19 +16,18 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">font</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
-              <object class="GtkFontButton" id="font">
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
-                </layout>
-              </object>
+              <object class="GtkFontButton" id="font"/>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="transitionlabel">
@@ -37,11 +35,11 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">transition</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkComboBoxText" id="transition">
@@ -50,11 +48,11 @@
                  <item translatable="yes" id="crossfade">Fade</item>
                  <item translatable="yes" id="slide-left-right">Slide</item>
                </items>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppPrefs" parent="GtkDialog">
    <property name="title" translatable="yes">Preferences</property>
@@ -17,19 +16,18 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">font</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
-              <object class="GtkFontButton" id="font">
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
-                </layout>
-              </object>
+              <object class="GtkFontButton" id="font"/>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="transitionlabel">
@@ -37,11 +35,11 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">transition</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkComboBoxText" id="transition">
@@ -50,11 +48,11 @@
                  <item translatable="yes" id="crossfade">Fade</item>
                  <item translatable="yes" id="slide-left-right">Slide</item>
                </items>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">Example Application</property>
@@ -14,11 +13,14 @@
                <property name="stack">stack</property>
              </object>
            </child>
-            <child type="end">
+            <child>
              <object class="GtkToggleButton" id="search">
                <property name="sensitive">0</property>
                <property name="icon-name">edit-find-symbolic</property>
              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppPrefs" parent="GtkDialog">
    <property name="title" translatable="yes">Preferences</property>
@@ -17,19 +16,18 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">font</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
-              <object class="GtkFontButton" id="font">
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
-                </layout>
-              </object>
+              <object class="GtkFontButton" id="font"/>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="transitionlabel">
@@ -37,11 +35,11 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">transition</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkComboBoxText" id="transition">
@@ -50,11 +48,11 @@
                  <item translatable="yes" id="crossfade">Fade</item>
                  <item translatable="yes" id="slide-left-right">Slide</item>
                </items>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">Example Application</property>
@@ -14,19 +13,25 @@
                <property name="stack">stack</property>
              </object>
            </child>
-            <child type="end">
+            <child>
              <object class="GtkToggleButton" id="search">
                <property name="sensitive">0</property>
                <property name="icon-name">edit-find-symbolic</property>
              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
            </child>
-            <child type="end">
+            <child>
              <object class="GtkMenuButton" id="gears">
                <property name="direction">none</property>
                <style>
                  <class name="image-button"/>
                </style>
              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppPrefs" parent="GtkDialog">
    <property name="title" translatable="yes">Preferences</property>
@@ -17,19 +16,18 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">font</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
-              <object class="GtkFontButton" id="font">
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
-                </layout>
-              </object>
+              <object class="GtkFontButton" id="font"/>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="transitionlabel">
@@ -37,11 +35,11 @@
                <property name="use-underline">1</property>
                <property name="mnemonic-widget">transition</property>
                <property name="xalign">1</property>
-                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
            <child>
              <object class="GtkComboBoxText" id="transition">
@@ -50,11 +48,11 @@
                  <item translatable="yes" id="crossfade">Fade</item>
                  <item translatable="yes" id="slide-left-right">Slide</item>
                </items>
-                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
-                </layout>
              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ExampleAppWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">Example Application</property>
@@ -25,19 +24,25 @@
                <property name="stack">stack</property>
              </object>
            </child>
-            <child type="end">
+            <child>
              <object class="GtkToggleButton" id="search">
                <property name="sensitive">0</property>
                <property name="icon-name">edit-find-symbolic</property>
              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
            </child>
-            <child type="end">
+            <child>
              <object class="GtkMenuButton" id="gears">
                <property name="direction">none</property>
                <style>
                  <class name="image-button"/>
                </style>
              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
            </child>
          </object>
        </child>
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object id="window" class="GtkWindow">
    <property name="title">Grid</property>
@@ -7,30 +6,30 @@
        <child>
          <object id="button1" class="GtkButton">
            <property name="label">Button 1</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object id="button2" class="GtkButton">
            <property name="label">Button 2</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object id="quit" class="GtkButton">
            <property name="label">Quit</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-              <property name="column-span">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+            <property name="width">2</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -8,7 +8,6 @@
 #include "broadway-output.h"

 //#define DEBUG_NODE_SENDING
-//#define DEBUG_NODE_SENDING_REMOVE

 /************************************************************************
 *                Basic I/O primitives                                  *
@@ -114,7 +113,7 @@ broadway_output_set_next_serial (BroadwayOutput *output,
 ************************************************************************/

 static void
-append_uint8 (BroadwayOutput *output, guint8 c)
+append_char (BroadwayOutput *output, char c)
 {
  g_string_append_c (output->buf, c);
 }
@@ -173,7 +172,7 @@ patch_uint32 (BroadwayOutput *output, guint32 v, gsize offset)
 static void
 write_header(BroadwayOutput *output, char op)
 {
-  append_uint8 (output, op);
+  append_char (output, op);
  append_uint32 (output, output->serial++);
 }

@@ -318,25 +317,15 @@ static void
 append_type (BroadwayOutput *output, guint32 type, BroadwayNode *node)
 {
 #ifdef DEBUG_NODE_SENDING
-  g_print ("%*s%s(%d/%d)", append_node_depth*2, "", broadway_node_type_names[type], node->id, node->output_id);
+  g_print ("%*s%s", append_node_depth*2, "", broadway_node_type_names[type]);
  if (type == BROADWAY_NODE_TEXTURE)
-    g_print (" tx=%u", node->data[4]);
+    g_print (" %u", node->data[4]);
  g_print ("\n");
 #endif

  append_uint32 (output, type);
 }

-static BroadwayNode *
-lookup_old_node (GHashTable *old_node_lookup,
-                 guint32 id)
-{
-  if (old_node_lookup)
-    return g_hash_table_lookup (old_node_lookup, GINT_TO_POINTER (id));
-
-  return NULL;
-}
-

 /***********************************
 * This outputs the tree to the client, while at the same time diffing
@@ -358,230 +347,59 @@ lookup_old_node (GHashTable *old_node_lookup,
 static void
 append_node (BroadwayOutput *output,
             BroadwayNode   *node,
-             GHashTable     *old_node_lookup)
+             BroadwayNode   *old_node,
+             gboolean        all_parents_are_kept)
 {
  guint32 i;
-  BroadwayNode *reused_node;

  append_node_depth++;

-  reused_node = lookup_old_node (old_node_lookup, node->id);
-  if (reused_node)
+  if (old_node != NULL && broadway_node_equal (node, old_node))
    {
-      broadway_node_mark_deep_consumed (reused_node, TRUE);
-      append_type (output, BROADWAY_NODE_REUSE, node);
-      append_uint32 (output, node->output_id);
-    }
-  else
-    {
-      append_type (output, node->type, node);
-      append_uint32 (output, node->output_id);
-      for (i = 0; i < node->n_data; i++)
-        append_uint32 (output, node->data[i]);
-      for (i = 0; i < node->n_children; i++)
-        append_node (output,
-                     node->children[i],
-                     old_node_lookup);
+      if (broadway_node_deep_equal (node, old_node))
+        {
+          append_type (output, BROADWAY_NODE_KEEP_ALL, node);
+          goto out;
+        }
+
+      if (all_parents_are_kept)
+        {
+          append_type (output, BROADWAY_NODE_KEEP_THIS, node);
+          append_uint32 (output, node->n_children);
+          for (i = 0; i < node->n_children; i++)
+            append_node (output, node->children[i],
+                         i < old_node->n_children ? old_node->children[i] : NULL,
+                         TRUE);
+
+          goto out;
+        }
    }

+  append_type (output, node->type, node);
+  for (i = 0; i < node->n_data; i++)
+    append_uint32 (output, node->data[i]);
+  for (i = 0; i < node->n_children; i++)
+    append_node (output,
+                 node->children[i],
+                 (old_node != NULL && i < old_node->n_children) ? old_node->children[i] : NULL,
+                 FALSE);
+
+ out:
  append_node_depth--;
 }

-static gboolean
-should_reuse_node (BroadwayOutput *output,
-                   BroadwayNode   *node,
-                   BroadwayNode   *old_node)
-{
-  int i;
-  guint32 new_texture;
-
-  if (old_node->reused)
-    return FALSE;
-
-  if (node->type != old_node->type)
-    return FALSE;
-
-  if (broadway_node_equal (node, old_node))
-    return TRUE;
-
-  switch (node->type) {
-  case BROADWAY_NODE_TRANSFORM:
-#ifdef DEBUG_NODE_SENDING
-   g_print ("Patching transform node %d/%d\n",
-            old_node->id, old_node->output_id);
-#endif
-    append_uint32 (output, BROADWAY_NODE_OP_PATCH_TRANSFORM);
-    append_uint32 (output, old_node->output_id);
-    for (i = 0; i < node->n_data; i++)
-      append_uint32 (output, node->data[i]);
-    return TRUE;
-
-  case BROADWAY_NODE_TEXTURE:
-    /* Check that the size, etc is the same */
-    for (i = 0; i < 4; i++)
-      if (node->data[i] != old_node->data[i])
-        return FALSE;
-
-    new_texture = node->data[4];
-
-#ifdef DEBUG_NODE_SENDING
-   g_print ("Patching texture node %d/%d to tx=%d\n",
-            old_node->id, old_node->output_id,
-            new_texture);
-#endif
-    append_uint32 (output, BROADWAY_NODE_OP_PATCH_TEXTURE);
-    append_uint32 (output, old_node->output_id);
-    append_uint32 (output, new_texture);
-    return TRUE;
-    break;
-  default:
-    return FALSE;
-  }
-}
-
-
-static BroadwayNode *
-append_node_ops (BroadwayOutput *output,
-                 BroadwayNode   *node,
-                 BroadwayNode   *parent,
-                 BroadwayNode   *previous_sibling,
-                 BroadwayNode   *old_node,
-                 GHashTable     *old_node_lookup)
-{
-  BroadwayNode *reused_node;
-  guint32 i;
-
-  /* Maybe can be reused from the last tree. */
-  reused_node = lookup_old_node (old_node_lookup, node->id);
-  if (reused_node)
-    {
-      g_assert (node == reused_node);
-      g_assert (reused_node->reused);
-      g_assert (!reused_node->consumed); /* Should only be once in the tree, and not consumed otherwise */
-
-      broadway_node_mark_deep_consumed (reused_node, TRUE);
-
-      if (node == old_node)
-        {
-          /* The node in the old tree at the current position is the same, so
-             we need to do nothing, just don't delete it (which we won't since
-             its marked used) */
-        }
-      else
-        {
-          /* We can reuse it, bu it comes from a different place or
-             order, if so we need to move it in place */
-#ifdef DEBUG_NODE_SENDING
-          g_print ("Move old node %d/%d to parent %d/%d after %d/%d\n",
-                   reused_node->id, reused_node->output_id,
-                   parent ? parent->id : 0,
-                   parent ? parent->output_id : 0,
-                   previous_sibling ? previous_sibling->id : 0,
-                   previous_sibling ? previous_sibling->output_id : 0);
-#endif
-          append_uint32 (output, BROADWAY_NODE_OP_MOVE_AFTER_CHILD);
-          append_uint32 (output, parent ? parent->output_id : 0);
-          append_uint32 (output, previous_sibling ? previous_sibling->output_id : 0);
-          append_uint32 (output, reused_node->output_id);
-        }
-
-      return reused_node;
-    }
-
-  /* If the next node in place is shallowly equal (but not necessarily
-   * deep equal) we reuse it and tweak its children as needed.
-   * Except we avoid this for reused node as those make more sense to reuse deeply.
-   */
-
-  if (old_node && should_reuse_node (output, node, old_node))
-    {
-      int old_i = 0;
-      BroadwayNode *last_child = NULL;
-
-      old_node->consumed = TRUE; // Don't reuse again
-
-      // We rewrite this new node as it now represents the old node in the browser
-      node->output_id = old_node->output_id;
-
-      /* However, we might need to rewrite then children of old_node */
-      for (i = 0; i < node->n_children; i++)
-        {
-          BroadwayNode *child = node->children[i];
-
-          /* Find the next (or first) non-consumed old child, if any */
-          while (old_i < old_node->n_children &&
-                 old_node->children[old_i]->consumed)
-            old_i++;
-
-          last_child =
-            append_node_ops (output,
-                             child,
-                             node, /* parent */
-                             last_child,
-                             (old_i < old_node->n_children) ? old_node->children[old_i] : NULL,
-                             old_node_lookup);
-        }
-
-      /* Remaining old nodes are either reused elsewhere, or end up marked not consumed so are deleted at the end */
-      return old_node;
-    }
-
-  /* Fallback to create a new tree */
-#ifdef DEBUG_NODE_SENDING
-   g_print ("Insert nodes in parent %d/%d, after sibling %d/%d\n",
-            parent ? parent->id : 0,
-            parent ? parent->output_id : 0,
-            previous_sibling ? previous_sibling->id : 0,
-            previous_sibling ? previous_sibling->output_id : 0);
-#endif
-   append_uint32 (output, BROADWAY_NODE_OP_INSERT_NODE);
-   append_uint32 (output, parent ? parent->output_id : 0);
-   append_uint32 (output, previous_sibling ? previous_sibling->output_id : 0);
-
-   append_node(output, node, old_node_lookup);
-
-   return node;
-}
-
-/* Remove non-consumed nodes */
-static void
-append_node_removes (BroadwayOutput *output,
-                     BroadwayNode   *node)
-{
-  // TODO: Use an array of nodes instead
-  if (!node->consumed)
-    {
-#ifdef DEBUG_NODE_SENDING_REMOVE
-          g_print ("Remove old node non-consumed node %d/%d\n",
-                   node->id, node->output_id);
-#endif
-      append_uint32 (output, BROADWAY_NODE_OP_REMOVE_NODE);
-      append_uint32 (output, node->output_id);
-    }
-
-  for (int i = 0; i < node->n_children; i++)
-    append_node_removes (output, node->children[i]);
-}
-
-
-
 void
 broadway_output_surface_set_nodes (BroadwayOutput *output,
                                   int             id,
                                   BroadwayNode   *root,
-                                   BroadwayNode   *old_root,
-                                   GHashTable     *old_node_lookup)
+                                   BroadwayNode   *old_root)
 {
  gsize size_pos, start, end;

-
-  if (old_root)
-    {
-      broadway_node_mark_deep_consumed (old_root, FALSE);
-      broadway_node_mark_deep_reused (old_root, FALSE);
-      /* This will modify children of old_root if any are shared */
-      broadway_node_mark_deep_reused (root, TRUE);
-    }
+  /* Early return if nothing changed */
+  if (old_root != NULL &&
+      broadway_node_deep_equal (root, old_root))
+    return;

  write_header (output, BROADWAY_OP_SET_NODES);

@@ -592,11 +410,9 @@ broadway_output_surface_set_nodes (BroadwayOutput *output,

  start = output->buf->len;
 #ifdef DEBUG_NODE_SENDING
-  g_print ("====== node ops for surface %d =======\n", id);
+  g_print ("====== node tree for %d =======\n", id);
 #endif
-  append_node_ops (output, root, NULL, NULL, old_root, old_node_lookup);
-  if (old_root)
-    append_node_removes (output, old_root);
+  append_node (output, root, old_root, TRUE);
  end = output->buf->len;
  patch_uint32 (output, (end - start) / 4, size_pos);
 }
@@ -60,8 +60,7 @@ void            broadway_output_set_transient_for   (BroadwayOutput *output,
 void            broadway_output_surface_set_nodes   (BroadwayOutput *output,
                                                     int             id,
                                                     BroadwayNode   *root,
-                                                     BroadwayNode   *old_root,
-                                                     GHashTable     *old_node_lookup);
+                                                     BroadwayNode   *old_root);
 void            broadway_output_upload_texture      (BroadwayOutput *output,
                                                     guint32         id,
                                                     GBytes         *texture);
@@ -20,19 +20,10 @@ typedef enum { /* Sync changes with broadway.js */
  BROADWAY_NODE_SHADOW = 8,
  BROADWAY_NODE_OPACITY = 9,
  BROADWAY_NODE_CLIP = 10,
-  BROADWAY_NODE_TRANSFORM = 11,
-  BROADWAY_NODE_DEBUG = 12,
-  BROADWAY_NODE_REUSE = 13,
+  BROADWAY_NODE_KEEP_ALL = 11,
+  BROADWAY_NODE_KEEP_THIS = 12,
 } BroadwayNodeType;

-typedef enum { /* Sync changes with broadway.js */
-  BROADWAY_NODE_OP_INSERT_NODE = 0,
-  BROADWAY_NODE_OP_REMOVE_NODE = 1,
-  BROADWAY_NODE_OP_MOVE_AFTER_CHILD = 2,
-  BROADWAY_NODE_OP_PATCH_TEXTURE = 3,
-  BROADWAY_NODE_OP_PATCH_TRANSFORM = 4,
-} BroadwayNodeOpType;
-
 static const char *broadway_node_type_names[] G_GNUC_UNUSED =  {
  "TEXTURE",
  "CONTAINER",
@@ -45,47 +36,49 @@ static const char *broadway_node_type_names[] G_GNUC_UNUSED =  {
  "SHADOW",
  "OPACITY",
  "CLIP",
-  "TRANSFORM",
-  "DEBUG",
-  "REUSE",
+  "KEEP_ALL",
+  "KEEP_THIS",
 };

 typedef enum {
-  BROADWAY_EVENT_ENTER = 0,
-  BROADWAY_EVENT_LEAVE = 1,
-  BROADWAY_EVENT_POINTER_MOVE = 2,
-  BROADWAY_EVENT_BUTTON_PRESS = 3,
-  BROADWAY_EVENT_BUTTON_RELEASE = 4,
-  BROADWAY_EVENT_TOUCH = 5,
-  BROADWAY_EVENT_SCROLL = 6,
-  BROADWAY_EVENT_KEY_PRESS = 7,
-  BROADWAY_EVENT_KEY_RELEASE = 8,
-  BROADWAY_EVENT_GRAB_NOTIFY = 9,
-  BROADWAY_EVENT_UNGRAB_NOTIFY = 10,
-  BROADWAY_EVENT_CONFIGURE_NOTIFY = 11,
-  BROADWAY_EVENT_SCREEN_SIZE_CHANGED = 12,
-  BROADWAY_EVENT_FOCUS = 13,
-  BROADWAY_EVENT_ROUNDTRIP_NOTIFY = 14,
+  BROADWAY_EVENT_ENTER = 'e',
+  BROADWAY_EVENT_LEAVE = 'l',
+  BROADWAY_EVENT_POINTER_MOVE = 'm',
+  BROADWAY_EVENT_BUTTON_PRESS = 'b',
+  BROADWAY_EVENT_BUTTON_RELEASE = 'B',
+  BROADWAY_EVENT_TOUCH = 't',
+  BROADWAY_EVENT_SCROLL = 's',
+  BROADWAY_EVENT_KEY_PRESS = 'k',
+  BROADWAY_EVENT_KEY_RELEASE = 'K',
+  BROADWAY_EVENT_GRAB_NOTIFY = 'g',
+  BROADWAY_EVENT_UNGRAB_NOTIFY = 'u',
+  BROADWAY_EVENT_CONFIGURE_NOTIFY = 'w',
+  BROADWAY_EVENT_SCREEN_SIZE_CHANGED = 'd',
+  BROADWAY_EVENT_FOCUS = 'f',
+  BROADWAY_EVENT_ROUNDTRIP_NOTIFY = 'F',
 } BroadwayEventType;

 typedef enum {
-  BROADWAY_OP_GRAB_POINTER = 0,
-  BROADWAY_OP_UNGRAB_POINTER = 1,
-  BROADWAY_OP_NEW_SURFACE = 2,
-  BROADWAY_OP_SHOW_SURFACE = 3,
-  BROADWAY_OP_HIDE_SURFACE = 4,
-  BROADWAY_OP_RAISE_SURFACE = 5,
-  BROADWAY_OP_LOWER_SURFACE = 6,
-  BROADWAY_OP_DESTROY_SURFACE = 7,
-  BROADWAY_OP_MOVE_RESIZE = 8,
-  BROADWAY_OP_SET_TRANSIENT_FOR = 9,
-  BROADWAY_OP_DISCONNECTED = 10,
-  BROADWAY_OP_SURFACE_UPDATE = 11,
-  BROADWAY_OP_SET_SHOW_KEYBOARD = 12,
-  BROADWAY_OP_UPLOAD_TEXTURE = 13,
-  BROADWAY_OP_RELEASE_TEXTURE = 14,
-  BROADWAY_OP_SET_NODES = 15,
-  BROADWAY_OP_ROUNDTRIP = 16,
+  BROADWAY_OP_GRAB_POINTER = 'g',
+  BROADWAY_OP_UNGRAB_POINTER = 'u',
+  BROADWAY_OP_NEW_SURFACE = 's',
+  BROADWAY_OP_SHOW_SURFACE = 'S',
+  BROADWAY_OP_HIDE_SURFACE = 'H',
+  BROADWAY_OP_RAISE_SURFACE = 'r',
+  BROADWAY_OP_LOWER_SURFACE = 'R',
+  BROADWAY_OP_DESTROY_SURFACE = 'd',
+  BROADWAY_OP_MOVE_RESIZE = 'm',
+  BROADWAY_OP_SET_TRANSIENT_FOR = 'p',
+  BROADWAY_OP_PUT_RGB = 'i',
+  BROADWAY_OP_REQUEST_AUTH = 'l',
+  BROADWAY_OP_AUTH_OK = 'L',
+  BROADWAY_OP_DISCONNECTED = 'D',
+  BROADWAY_OP_SURFACE_UPDATE = 'b',
+  BROADWAY_OP_SET_SHOW_KEYBOARD = 'k',
+  BROADWAY_OP_UPLOAD_TEXTURE = 't',
+  BROADWAY_OP_RELEASE_TEXTURE = 'T',
+  BROADWAY_OP_SET_NODES = 'n',
+  BROADWAY_OP_ROUNDTRIP = 'F',
 } BroadwayOpType;

 typedef struct {
@@ -35,6 +35,7 @@
 #include <string.h>
 #endif

+
 typedef struct {
  int id;
  guint32 tag;
@@ -115,7 +116,6 @@ struct BroadwayInput {
 };

 struct BroadwaySurface {
-  guint32 owner;
  gint32 id;
  gint32 x;
  gint32 y;
@@ -126,56 +126,23 @@ struct BroadwaySurface {
  gint32 transient_for;
  guint32 texture;
  BroadwayNode *nodes;
-  GHashTable *node_lookup;
-};
-
-struct _BroadwayTexture {
-  grefcount refcount;
-  guint32 id;
-  GBytes *bytes;
 };

 static void broadway_server_resync_surfaces (BroadwayServer *server);
 static void send_outstanding_roundtrips (BroadwayServer *server);

-static void broadway_server_ref_texture (BroadwayServer   *server,
-                                         guint32           id);
-
 static GType broadway_server_get_type (void);

 G_DEFINE_TYPE (BroadwayServer, broadway_server, G_TYPE_OBJECT)

 static void
-broadway_texture_free (BroadwayTexture *texture)
-{
-  g_bytes_unref (texture->bytes);
-  g_free (texture);
-}
-
-static void
-broadway_node_unref (BroadwayServer *server,
-                     BroadwayNode *node)
+broadway_node_free (BroadwayNode *node)
 {
  int i;
+  for (i = 0; i < node->n_children; i++)
+    broadway_node_free (node->children[i]);

-  if (g_ref_count_dec (&node->refcount))
-    {
-      for (i = 0; i < node->n_children; i++)
-        broadway_node_unref (server, node->children[i]);
-
-      if (node->texture_id)
-        broadway_server_release_texture (server, node->texture_id);
-
-      g_free (node);
-    }
-}
-
-static BroadwayNode *
-broadway_node_ref (BroadwayNode *node)
-{
-  g_ref_count_inc (&node->refcount);
-
-  return node;
+  g_free (node);
 }

 gboolean
@@ -225,33 +192,6 @@ broadway_node_deep_equal (BroadwayNode     *a,
 }


-void
-broadway_node_mark_deep_reused (BroadwayNode    *node,
-                                gboolean         reused)
-{
-  node->reused = reused;
-  for (int i = 0; i < node->n_children; i++)
-    broadway_node_mark_deep_reused (node->children[i], reused);
-}
-
-void
-broadway_node_mark_deep_consumed (BroadwayNode    *node,
-                                  gboolean         consumed)
-{
-  node->consumed = consumed;
-  for (int i = 0; i < node->n_children; i++)
-    broadway_node_mark_deep_consumed (node->children[i], consumed);
-}
-
-void
-broadway_node_add_to_lookup (BroadwayNode    *node,
-                             GHashTable      *node_lookup)
-{
-  g_hash_table_insert (node_lookup, GINT_TO_POINTER(node->id), node);
-  for (int i = 0; i < node->n_children; i++)
-    broadway_node_add_to_lookup (node->children[i], node_lookup);
-}
-
 static void
 broadway_server_init (BroadwayServer *server)
 {
@@ -264,7 +204,7 @@ broadway_server_init (BroadwayServer *server)
  server->surface_id_hash = g_hash_table_new (NULL, NULL);
  server->id_counter = 0;
  server->textures = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL,
-                                            (GDestroyNotify)broadway_texture_free);
+                                            (GDestroyNotify)g_bytes_unref);

  root = g_new0 (BroadwaySurface, 1);
  root->id = server->id_counter++;
@@ -301,12 +241,10 @@ broadway_server_class_init (BroadwayServerClass * class)
 }

 static void
-broadway_surface_free (BroadwayServer *server,
-                       BroadwaySurface *surface)
+broadway_surface_free (BroadwaySurface *surface)
 {
  if (surface->nodes)
-    broadway_node_unref (server, surface->nodes);
-  g_hash_table_unref (surface->node_lookup);
+    broadway_node_free (surface->nodes);
  g_free (surface);
 }

@@ -472,46 +410,9 @@ process_input_message (BroadwayServer *server,
                       BroadwayInputMsg *message)
 {
  gint32 client;
-  BroadwaySurface *surface;

  update_event_state (server, message);
-
-
-  switch (message->base.type) {
-  case BROADWAY_EVENT_ENTER:
-  case BROADWAY_EVENT_LEAVE:
-  case BROADWAY_EVENT_POINTER_MOVE:
-  case BROADWAY_EVENT_BUTTON_PRESS:
-  case BROADWAY_EVENT_BUTTON_RELEASE:
-  case BROADWAY_EVENT_SCROLL:
-  case BROADWAY_EVENT_GRAB_NOTIFY:
-  case BROADWAY_EVENT_UNGRAB_NOTIFY:
-    surface = broadway_server_lookup_surface (server, message->pointer.event_surface_id);
-    break;
-  case BROADWAY_EVENT_TOUCH:
-    surface = broadway_server_lookup_surface (server, message->touch.event_surface_id);
-    break;
-  case BROADWAY_EVENT_CONFIGURE_NOTIFY:
-    surface = broadway_server_lookup_surface (server, message->configure_notify.id);
-    break;
-  case BROADWAY_EVENT_ROUNDTRIP_NOTIFY:
-    surface = broadway_server_lookup_surface (server, message->roundtrip_notify.id);
-    break;
-  case BROADWAY_EVENT_KEY_PRESS:
-  case BROADWAY_EVENT_KEY_RELEASE:
-    /* TODO: Send to keys focused clients only... */
-  case BROADWAY_EVENT_FOCUS:
-  case BROADWAY_EVENT_SCREEN_SIZE_CHANGED:
-  default:
-    surface = NULL;
-    break;
-  }
-
-  if (surface)
-    client = surface->owner;
-  else
-    client = -1;
-
+  client = -1;
  if (is_pointer_event (message) &&
      server->pointer_grab_surface_id != -1)
    client = server->pointer_grab_client_id;
@@ -622,7 +523,6 @@ parse_input_message (BroadwayInput *input, const unsigned char *message)

  msg.base.type = ntohl (*p++);
  msg.base.serial = ntohl (*p++);
-
  time_ = ntohl (*p++);

  if (time_ == 0) {
@@ -704,19 +604,12 @@ parse_input_message (BroadwayInput *input, const unsigned char *message)

        if (rt->id == msg.roundtrip_notify.id &&
            rt->tag == msg.roundtrip_notify.tag)
-          break;
+          {
+            server->outstanding_roundtrips = g_list_delete_link (server->outstanding_roundtrips, l);
+            g_free (rt);
+            break;
+          }
      }
-
-    if (l == NULL)
-      g_warning ("Got unexpected rountrip reply for id %d, tag %d\n", msg.roundtrip_notify.id, msg.roundtrip_notify.tag);
-    else
-      {
-        BroadwayOutstandingRoundtrip *rt = l->data;
-
-        server->outstanding_roundtrips = g_list_delete_link (server->outstanding_roundtrips, l);
-        g_free (rt);
-      }
-
    break;

  case BROADWAY_EVENT_SCREEN_SIZE_CHANGED:
@@ -1584,7 +1477,7 @@ broadway_server_destroy_surface (BroadwayServer *server,
      server->surfaces = g_list_remove (server->surfaces, surface);
      g_hash_table_remove (server->surface_id_hash,
                           GINT_TO_POINTER (id));
-      broadway_surface_free (server, surface);
+      broadway_surface_free (surface);
    }
 }

@@ -1712,232 +1605,53 @@ broadway_server_has_client (BroadwayServer *server)
  return server->output != NULL;
 }

-#define NODE_SIZE_COLOR 1
-#define NODE_SIZE_FLOAT 1
-#define NODE_SIZE_POINT 2
-#define NODE_SIZE_MATRIX 16
-#define NODE_SIZE_SIZE 2
-#define NODE_SIZE_RECT (NODE_SIZE_POINT + NODE_SIZE_SIZE)
-#define NODE_SIZE_RRECT (NODE_SIZE_RECT + 4 * NODE_SIZE_SIZE)
-#define NODE_SIZE_COLOR_STOP (NODE_SIZE_FLOAT + NODE_SIZE_COLOR)
-#define NODE_SIZE_SHADOW (NODE_SIZE_COLOR + 3 * NODE_SIZE_FLOAT)
-
-static guint32
-rotl (guint32 value, int shift)
-{
-  if ((shift &= 32 - 1) == 0)
-    return value;
-  return (value << shift) | (value >> (32 - shift));
-}
-
-static BroadwayNode *
-decode_nodes (BroadwayServer *server,
-              BroadwaySurface *surface,
-              int len,
-              guint32 data[],
-              GHashTable  *client_texture_map,
-              int *pos)
-{
-  BroadwayNode *node;
-  guint32 type, id;
-  guint32 i, n_stops, n_shadows, n_chars;
-  guint32 size, n_children;
-  gint32 texture_offset;
-  guint32 hash;
-  guint32 transform_type;
-
-  g_assert (*pos < len);
-
-  size = 0;
-  n_children = 0;
-  texture_offset = -1;
-
-  type = data[(*pos)++];
-  id = data[(*pos)++];
-  switch (type) {
-  case BROADWAY_NODE_REUSE:
-    node = g_hash_table_lookup (surface->node_lookup, GINT_TO_POINTER(id));
-    g_assert (node != NULL);
-    return broadway_node_ref (node);
-    break;
-  case BROADWAY_NODE_COLOR:
-    size = NODE_SIZE_RECT + NODE_SIZE_COLOR;
-    break;
-  case BROADWAY_NODE_BORDER:
-    size = NODE_SIZE_RRECT + 4 * NODE_SIZE_FLOAT + 4 * NODE_SIZE_COLOR;
-    break;
-  case BROADWAY_NODE_INSET_SHADOW:
-  case BROADWAY_NODE_OUTSET_SHADOW:
-    size = NODE_SIZE_RRECT + NODE_SIZE_COLOR + 4 * NODE_SIZE_FLOAT;
-    break;
-  case BROADWAY_NODE_TEXTURE:
-    texture_offset = 4;
-    size = 5;
-    break;
-  case BROADWAY_NODE_CONTAINER:
-    size = 1;
-    n_children = data[*pos];
-    break;
-  case BROADWAY_NODE_ROUNDED_CLIP:
-    size = NODE_SIZE_RRECT;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_CLIP:
-    size = NODE_SIZE_RECT;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_TRANSFORM:
-    transform_type = data[(*pos)];
-    size = 1;
-    if (transform_type == 0) {
-      size += NODE_SIZE_POINT;
-    } else if (transform_type == 1) {
-      size += NODE_SIZE_MATRIX;
-    } else {
-      g_assert_not_reached();
-    }
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_LINEAR_GRADIENT:
-    size = NODE_SIZE_RECT + 2 * NODE_SIZE_POINT;
-    n_stops = data[*pos + size++];
-    size += n_stops * NODE_SIZE_COLOR_STOP;
-    break;
-  case BROADWAY_NODE_SHADOW:
-    size = 1;
-    n_shadows = data[*pos];
-    size += n_shadows * NODE_SIZE_SHADOW;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_OPACITY:
-    size = NODE_SIZE_FLOAT;
-    n_children = 1;
-    break;
-  case BROADWAY_NODE_DEBUG:
-    n_chars = data[*pos];
-    size = 1 + (n_chars + 3) / 4;
-    n_children = 1;
-    break;
-  default:
-    g_assert_not_reached ();
-  }
-
-  node = g_malloc (sizeof(BroadwayNode) + (size - 1) * sizeof(guint32) + n_children * sizeof (BroadwayNode *));
-  g_ref_count_init (&node->refcount);
-  node->type = type;
-  node->id = id;
-  node->output_id = id;
-  node->texture_id = 0;
-  node->n_children = n_children;
-  node->children = (BroadwayNode **)((char *)node + sizeof(BroadwayNode) + (size - 1) * sizeof(guint32));
-  node->n_data = size;
-  for (i = 0; i < size; i++)
-    {
-      node->data[i] = data[(*pos)++];
-      if (i == texture_offset)
-        {
-          node->texture_id = GPOINTER_TO_INT (g_hash_table_lookup (client_texture_map, GINT_TO_POINTER (node->data[i])));
-          broadway_server_ref_texture (server, node->texture_id);
-          node->data[i] = node->texture_id;
-        }
-    }
-
-  for (i = 0; i < n_children; i++)
-    node->children[i] = decode_nodes (server, surface, len, data, client_texture_map, pos);
-
-  hash = node->type << 16;
-
-  for (i = 0; i < size; i++)
-    hash ^= rotl (node->data[i], i);
-
-  for (i = 0; i < n_children; i++)
-    hash ^= rotl (node->children[i]->hash, i);
-
-  node->hash = hash;
-
-  return node;
-}
-
 /* passes ownership of nodes */
 void
-broadway_server_surface_update_nodes (BroadwayServer   *server,
-                                      gint              id,
-                                      guint32          data[],
-                                      int              len,
-                                      GHashTable      *client_texture_map)
+broadway_server_surface_set_nodes (BroadwayServer   *server,
+                                   gint              id,
+                                   BroadwayNode     *root)
 {
  BroadwaySurface *surface;
-  int pos = 0;
-  BroadwayNode *root;

  surface = broadway_server_lookup_surface (server, id);
  if (surface == NULL)
    return;

-  root = decode_nodes (server, surface, len, data, client_texture_map, &pos);
-
  if (server->output != NULL)
    broadway_output_surface_set_nodes (server->output, surface->id,
                                       root,
-                                       surface->nodes,
-                                       surface->node_lookup);
+                                       surface->nodes);

  if (surface->nodes)
-    broadway_node_unref (server, surface->nodes);
-
+    broadway_node_free (surface->nodes);
  surface->nodes = root;
-
-  g_hash_table_remove_all (surface->node_lookup);
-  broadway_node_add_to_lookup (root, surface->node_lookup);
 }

 guint32
 broadway_server_upload_texture (BroadwayServer   *server,
-                                GBytes           *bytes)
+                                GBytes           *texture)
 {
-  BroadwayTexture *texture;
-
-  texture = g_new0 (BroadwayTexture, 1);
-  g_ref_count_init (&texture->refcount);
-  texture->id = ++server->next_texture_id;
-  texture->bytes = g_bytes_ref (bytes);
+  guint32 id;

+  id = ++server->next_texture_id;
  g_hash_table_replace (server->textures,
-                        GINT_TO_POINTER (texture->id),
-                        texture);
+                        GINT_TO_POINTER (id),
+                        g_bytes_ref (texture));

  if (server->output)
-    broadway_output_upload_texture (server->output, texture->id, texture->bytes);
+    broadway_output_upload_texture (server->output, id, texture);

-  return texture->id;
-}
-
-static void
-broadway_server_ref_texture (BroadwayServer   *server,
-                             guint32           id)
-{
-  BroadwayTexture *texture;
-
-  texture = g_hash_table_lookup (server->textures, GINT_TO_POINTER (id));
-  if (texture)
-    g_ref_count_inc (&texture->refcount);
+  return id;
 }

 void
 broadway_server_release_texture (BroadwayServer   *server,
                                 guint32           id)
 {
-  BroadwayTexture *texture;
+  g_hash_table_remove (server->textures, GINT_TO_POINTER (id));

-  texture = g_hash_table_lookup (server->textures, GINT_TO_POINTER (id));
-
-  if (texture && g_ref_count_dec (&texture->refcount))
-    {
-      g_hash_table_remove (server->textures, GINT_TO_POINTER (id));
-
-      if (server->output)
-        broadway_output_release_texture (server->output, id);
-    }
+  if (server->output)
+    broadway_output_release_texture (server->output, id);
 }

 gboolean
@@ -2066,7 +1780,6 @@ broadway_server_ungrab_pointer (BroadwayServer *server,

 guint32
 broadway_server_new_surface (BroadwayServer *server,
-                             guint32 client,
                             int x,
                             int y,
                             int width,
@@ -2076,7 +1789,6 @@ broadway_server_new_surface (BroadwayServer *server,
  BroadwaySurface *surface;

  surface = g_new0 (BroadwaySurface, 1);
-  surface->owner = client;
  surface->id = server->id_counter++;
  surface->x = x;
  surface->y = y;
@@ -2089,7 +1801,6 @@ broadway_server_new_surface (BroadwayServer *server,
  surface->width = width;
  surface->height = height;
  surface->is_temp = is_temp;
-  surface->node_lookup = g_hash_table_new (g_direct_hash, g_direct_equal);

  g_hash_table_insert (server->surface_id_hash,
                       GINT_TO_POINTER (surface->id),
@@ -2124,12 +1835,9 @@ broadway_server_resync_surfaces (BroadwayServer *server)
  /* First upload all textures */
  g_hash_table_iter_init (&iter, server->textures);
  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      BroadwayTexture *texture = value;
-      broadway_output_upload_texture (server->output,
-                                      GPOINTER_TO_INT (key),
-                                      texture->bytes);
-    }
+    broadway_output_upload_texture (server->output,
+                                    GPOINTER_TO_INT (key),
+                                    (GBytes *)value);

  /* Then create all surfaces */
  for (l = server->surfaces; l != NULL; l = l->next)
@@ -2162,8 +1870,7 @@ broadway_server_resync_surfaces (BroadwayServer *server)

      if (surface->nodes)
        broadway_output_surface_set_nodes (server->output, surface->id,
-                                           surface->nodes,
-                                           NULL, NULL);
+                                           surface->nodes, NULL);

      if (surface->visible)
        broadway_output_show_surface (server->output, surface->id);
@@ -19,22 +19,12 @@ typedef struct _BroadwayServerClass BroadwayServerClass;
 #define BROADWAY_SERVER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), BROADWAY_TYPE_SERVER, BroadwayServerClass))

 typedef struct _BroadwayNode BroadwayNode;
-typedef struct _BroadwayTexture BroadwayTexture;

 struct _BroadwayNode {
-  grefcount refcount;
  guint32 type;
-  guint32 id;
-  guint32 output_id;
  guint32 hash; /* deep hash */
  guint32 n_children;
  BroadwayNode **children;
-  guint32 texture_id;
-
-  /* Scratch stuff used during diff */
-  gboolean reused;
-  gboolean consumed;
-
  guint32 n_data;
  guint32 data[1];
 };
@@ -43,12 +33,6 @@ gboolean            broadway_node_equal                       (BroadwayNode    *
                                                               BroadwayNode    *b);
 gboolean            broadway_node_deep_equal                  (BroadwayNode    *a,
                                                               BroadwayNode    *b);
-void                broadway_node_mark_deep_reused            (BroadwayNode    *node,
-                                                               gboolean         reused);
-void                broadway_node_mark_deep_consumed          (BroadwayNode    *node,
-                                                               gboolean         consumed);
-void                broadway_node_add_to_lookup               (BroadwayNode    *node,
-                                                               GHashTable      *node_lookup);
 BroadwayServer     *broadway_server_new                       (char            *address,
                                                               int              port,
                                                               const char      *ssl_cert,
@@ -86,7 +70,6 @@ gint32              broadway_server_get_mouse_surface         (BroadwayServer  *
 void                broadway_server_set_show_keyboard         (BroadwayServer  *server,
                                                               gboolean         show);
 guint32             broadway_server_new_surface               (BroadwayServer  *server,
-                                                               guint32          client,
                                                               int              x,
                                                               int              y,
                                                               int              width,
@@ -116,11 +99,9 @@ void                broadway_server_release_texture           (BroadwayServer  *
                                                               guint32          id);
 cairo_surface_t   * broadway_server_create_surface            (int              width,
                                                               int              height);
-void                broadway_server_surface_update_nodes      (BroadwayServer  *server,
+void                broadway_server_surface_set_nodes         (BroadwayServer  *server,
                                                               gint             id,
-                                                               guint32          data[],
-                                                               int              len,
-                                                               GHashTable      *client_texture_map);
+                                                               BroadwayNode    *root);
 gboolean            broadway_server_surface_move_resize       (BroadwayServer  *server,
                                                               gint             id,
                                                               gboolean         with_move,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benjamin Otte	4757dad35b	testsuite: Add a broken test This also adds some build magic so all tests that contain "-3d" in them won't be added to the Cairo renderer. Of course, this new test is such a test.	2019-03-21 06:47:36 +01:00
Benjamin Otte	4a0b73ce58	transform: Add gsk_transform_from_string() It uses the CSS parser, so we can also use it for parsing transform nodes.	2019-03-21 06:46:23 +01:00
Benjamin Otte	e25621d46a	Move working tests to new directory These are tests that are working on both GL and Cairo now. Some tests got black boxes over the areas that aren't easy to compare.	2019-03-19 09:59:04 +01:00
Benjamin Otte	2054facb21	testsuite: Port GL tests to new syntax Now that the syntax tries to follow the CSS specs more, we need to update our tests for the changes.	2019-03-19 09:55:47 +01:00
Benjamin Otte	dae0dabb51	testsuite: Add tests for the new node parser These are just a few crashes I encountered while developing it.	2019-03-19 09:55:47 +01:00
Benjamin Otte	0fa5efa628	rendernode: Redo the rendernode parser Resurrect the CSS parser from the tokenizer branch and make it handle a render node syntax. The syntax is different from the old syntax. This is done so that it follows CSS specification conventions as close as possible and can tehrefor be parsed by a CSS parser.	2019-03-19 09:55:47 +01:00
Benjamin Otte	9a875a7515	testsuite: Don't pretend we're a GTest This is a meson test, not a GTest thing. So: - Use g_print(), not g_test_message That makes meson test --verbose print the actual log messsages. - Don't g_assert() all the time Instead, run tests through to the end and just return a non-0 exit status.	2019-03-19 08:59:31 +01:00
Benjamin Otte	e95d171163	csstokenizer: Add gsk_css_token_is_preserved()	2019-03-19 08:59:31 +01:00
Benjamin Otte	aba832559f	tokenizer: Pass error arg to read_token() Instead of an error vfunc, have the tokenizer vfunc take a GError argument. Note that even when an error is returned, there is still a token to be read.	2019-03-19 08:59:31 +01:00
Benjamin Otte	7ef0e00659	rendernodeparser: Rebase on top of the CSS tokenizer	2019-03-19 08:59:31 +01:00
Benjamin Otte	8497327b7c	css: Add GtkCssTokenizer This is copied from an old branch of mine.	2019-03-19 08:59:31 +01:00
Benjamin Otte	f4a76d5bcb	Add gtk4-node-editor It's meant to be a little editor for render nodes so we can do testing with it.	2019-03-19 08:59:31 +01:00
Benjamin Otte	74eadf4181	Add GtkDiffPaintable and use it in the magnifier This is supposed to show diffs, but works only semi-well because we fallback on GL for blend nodes, so the diffs are actually with cairo renderings. Oops.	2019-03-19 08:59:31 +01:00
Benjamin Otte	e0dc257bd3	magnifier: Add renderings with alternative renderers That's pretty rough around the edges, but it mostly works. Apart from sizing, screw listbox sizing.	2019-03-19 08:59:31 +01:00
Timm Bäder	2f58d65abd	Parse render nodes from text files	2019-03-19 08:58:14 +01:00
Timm Bäder	b76344bfac	testsuite: Port gl tests to text-based format	2019-03-19 08:58:14 +01:00