Parse render nodes from text files

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 stages:
   - build
   - flatpak
-#  - deploy
+  - deploy
 
 .cache-paths: &cache-paths
   paths:
@@ -12,32 +12,20 @@ stages:
     - subprojects/libepoxy/
     - subprojects/pango/
 
-fedora-x86_64: &fedora-x86_64-defaults
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v7
+fedora-x86_64:
+  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"
-      - "${CI_PROJECT_DIR}/_build/report.html"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
   cache:
     key: "$CI_JOB_NAME"
     <<: *cache-paths
 
-fedora-x86_64-staticlibs:
-  variables:
-    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
-  <<: *fedora-x86_64-defaults
-
 .mingw-defaults: &mingw-defaults
   stage: build
   tags:
@@ -45,7 +33,6 @@ fedora-x86_64-staticlibs:
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
-  allow_failure: true
   cache:
     key: "%CI_JOB_NAME%"
     <<: *cache-paths
@@ -66,60 +53,30 @@ 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
+
+pages:
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
+  stage: deploy 
+  script:
+    - meson -Ddocumentation=true _build .
+    - ninja -C _build
+    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
+
+    - mkdir -p public/
+    - mv _build/docs/reference/gtk/html/ public/gtk/
+    - mv _build/docs/reference/gdk/html/ public/gdk/
+    - mv _build/docs/reference/gsk/html/ public/gsk/
+  artifacts:
+    paths:
+      - public
   only:
     - master
-
-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:v6
-#  stage: deploy 
-#  script:
-#    - meson -Dgtk_doc=true _build .
-#    - ninja -C _build
-#    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-#    - mkdir -p public/
-#    - mv _build/docs/reference/gtk/html/ public/gtk/
-#    - mv _build/docs/reference/gdk/html/ public/gdk/
-#    - mv _build/docs/reference/gsk/html/ public/gsk/
-#  artifacts:
-#    paths:
-#      - public
-#  only:
-#    - master

.gitlab-ci/Dockerfile

@@ -1,6 +1,7 @@
-FROM fedora:31
+FROM fedora:29
 
 RUN dnf -y install \
+    hicolor-icon-theme \
     adwaita-icon-theme \
     atk-devel \
     at-spi2-atk-devel \
@@ -10,10 +11,7 @@ RUN dnf -y install \
     ccache \
     colord-devel \
     cups-devel \
-    dbus-daemon \
-    dejavu-sans-mono-fonts \
     desktop-file-utils \
-    diffutils \
     elfutils-libelf-devel \
     fribidi-devel \
     gcc \
@@ -32,7 +30,6 @@ RUN dnf -y install \
     gstreamer1-plugins-bad-free-devel \
     gstreamer1-plugins-base-devel \
     gtk-doc \
-    hicolor-icon-theme \
     iso-codes \
     itstool \
     json-glib-devel \
@@ -61,7 +58,6 @@ RUN dnf -y install \
     pango-devel \
     pcre-devel \
     python3 \
-    python3-jinja2 \
     python3-pip \
     python3-wheel \
     redhat-rpm-config \
@@ -74,7 +70,7 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.50.1
+RUN pip3 install meson==0.49.0
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

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

@@ -1,363 +0,0 @@
-#!/usr/bin/env python3
-
-# Turns a Mason testlog.json file into an HTML report
-#
-# Copyright 2019  GNOME Foundation
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Emmanuele Bassi
-
-import argparse
-import datetime
-import json
-import os
-import sys
-from jinja2 import Template
-
-REPORT_TEMPLATE = '''
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>{{ report.project_name }} Test Report</title>
-  <meta charset="utf-8" />
-  <style type="text/css">
-body {
-  background: white;
-  color: #333;
-  font-family: 'Cantarell', sans-serif;
-}
-
-h1 {
-  color: #333333;
-  font-size: 1.9em;
-  font-weight: normal;
-  margin-bottom: 1em;
-  border-bottom: 1px solid #333333;
-}
-
-header {
-  position: fixed;
-  padding-bottom: 12px;
-  margin-bottom: 24px;
-  background: rgba(255, 255, 255, 0.85);
-  box-shadow: 0 0 1px rgba(0, 0, 0, 0.15);
-  z-index: 500;
-  left: 0;
-  top: 0;
-  width: 100%;
-  color: rgba(0, 0, 0, 0.3);
-  transform: translateY(0px);
-  transition: .2s background-color, color;
-  box-sizing: border-box;
-  display: block;
-  visibility: visible;
-  text-align: center;
-}
-
-article {
-  padding-top: 200px;
-  margin: 2em;
-}
-
-div.report-meta {
-  width: auto;
-  border: 1px solid #ccc;
-  padding: .5em 2em;
-  color: #3c3c3c;
-}
-
-span.result {
-  font-weight: bold;
-}
-
-span.pass {
-  color: rgb(51, 209, 122);
-}
-
-span.skip {
-  color: rgb(255, 163, 72);
-}
-
-span.fail {
-  color: rgb(224, 27, 36);
-}
-
-span.xfail {
-  color: rgb(163, 71, 186);
-}
-
-div.result {
-  border-top: 1px solid #c0c0c0;
-  padding-top: 1em;
-  padding-bottom: 1em;
-  width: 100%;
-}
-
-div.result h4 {
-  border-bottom: 1px solid #c0c0c0;
-  margin-bottom: 0.7em;
-}
-
-pre {
-  color: #fafafa;
-  background-color: black;
-  border-radius: 6px;
-  box-shadow: 0px 5px 8px 0px rgba(0, 0, 0, 0.25);
-  font-family: monospace;
-  line-height: 1.2em;
-  border: none;
-  padding: 10px 1em;
-  font-size: 0.9em;
-  overflow: auto;
-  white-space: pre;
-  word-break: normal;
-  word-wrap: normal;
-}
-
-ul.passed li {
-  display: inline;
-}
-
-ul.passed li:after {
-  content: ",";
-}
-
-ul.passed li:last-child:after {
-  content: "";
-}
-
-ul.images {
-  padding-bottom: 1em;
-}
-
-ul.images li {
-  display: inline;
-}
-  </style>
-</head>
-<body>
-  <header>
-    <h1>{{ report.project_name }} :: Test Reports</h1>
-    <div class="report-meta">
-      <p><strong>Branch:</strong> {{ report.branch_name }}</p>
-      <p><strong>Date:</strong> <time datetime="{{ report.date.isoformat() }}">{{ report.locale_date }}</time></p>
-      {% if report.job_id %}<p><strong>Job ID:</strong> {{ report.job_id }}</p>{% endif %}
-    </div>
-  </header>
-
-  <article>
-    <section>
-      <div class="summary">
-        <h3><a name="summary">Summary</a></h3>
-        <ul>
-          <li><strong>Total units:</strong> {{ report.total_units }}</li>
-          <li><strong>Passed:</strong> <a href="#passed">{{ report.total_successes }}</a></li>
-          <li><strong>Failed:</strong> <a href="#failures">{{ report.total_failures }}</a></li>
-        </ul>
-      </div>
-    </section>
-
-    {% for suite_result in report.results_list %}
-    <section>
-      <div class="result">
-        <h3><a name="results">Suite: {{ suite_result.suite_name }}</a></h3>
-        <ul>
-          <li><strong>Units:</strong> {{ suite_result.n_units }}</li>
-          <li><strong>Passed:</strong> {{ suite_result.n_successes }}</li>
-          <li><strong>Failed:</strong> {{ suite_result.n_failures }}</li>
-        </ul>
-
-        <div class="successes">
-          <h4><a name="passed">Passed</a></h4>
-          <ul class="passed">
-            {% for success in suite_result.successes if success.result == 'OK' %}
-            <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4><a name="skipped">Skipped</a></h4>
-          <ul>
-            {% for success in suite_result.successes if success.result == 'SKIP' %}
-            <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4><a name="expected-fail">Expected failures</a></h4>
-          <ul>
-          {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
-            <li><a name="{{ success.name }}">{{ success.name }}</a> - result: <span class="result xfail">{{ success.result }}</span><br/>
-            {% if success.stdout %}
-              Output: <pre>{{ success.stdout }}</pre>
-            {% endif %}
-            {% if success.image_data is defined %}
-              <ul class="images">
-                <li><img alt="ref" src="{{ success.image_data.ref }}" /></li>
-                <li><img alt="out" src="{{ success.image_data.out }}" /></li>
-                <li><img alt="diff" src="{{ success.image_data.diff }}" /></li>
-              </ul>
-            {% endif %}
-            </li>
-          {% else %}
-            <li>None</li>
-          {% endfor %}
-          </ul>
-        </div>
-
-        <div class="failures">
-          <h4><a name="failed">Failed</a></h4>
-          <ul class="failed">
-            {% for failure in suite_result.failures if failure.result == 'FAIL' %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
-              {% if failure.stdout %}
-              Output: <pre>{{ failure.stdout }}</pre>
-              {% endif %}
-              {% if failure.image_data is defined %}
-              <ul class="images">
-                <li><img alt="ref" src="{{ failure.image_data.ref }}" /></li>
-                <li><img alt="out" src="{{ failure.image_data.out }}" /></li>
-                <li><img alt="diff" src="{{ failure.image_data.diff }}" /></li>
-              </ul>
-              {% endif %}
-            </li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4><a name="timed-out">Timed out</a></h4>
-          <ul class="failed">
-            {% for failure in suite_result.failures if failure.result == 'TIMEOUT' %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
-              {% if failure.stdout %}
-              Output: <pre>{{ failure.stdout }}</pre>
-              {% endif %}
-            </li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-        </div>
-
-      </div>
-    </section>
-    {% endfor %}
-
-  </article>
-</body>
-</html>
-'''
-
-aparser = argparse.ArgumentParser(description='Turns a Meson test log into an HTML 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=None)
-aparser.add_argument('--branch', metavar='NAME',
-                     help='Branch of the project being tested',
-                     default='master')
-aparser.add_argument('--output', metavar='FILE',
-                     help='The output HTML file, stdout by default',
-                     type=argparse.FileType('w', encoding='UTF-8'),
-                     default=sys.stdout)
-aparser.add_argument('--reftest-suite', metavar='NAME',
-                     help='The name of the reftests suite',
-                     default='reftest')
-aparser.add_argument('--reftest-output-dir', metavar='DIR',
-                     help='The output directory for reftests data',
-                     default=None)
-aparser.add_argument('infile', metavar='FILE',
-                     help='The input testlog.json, stdin by default',
-                     type=argparse.FileType('r', encoding='UTF-8'),
-                     default=sys.stdin)
-
-args = aparser.parse_args()
-
-outfile = args.output
-
-suites = {}
-for line in args.infile:
-    data = json.loads(line)
-    (full_suite, unit_name) = data['name'].split(' / ')
-    (project_name, suite_name) = full_suite.split(':')
-
-    unit = {
-        'project-name': project_name,
-        'suite': suite_name,
-        'name': unit_name,
-        'duration': data['duration'],
-        'returncode': data['returncode'],
-        'result': data['result'],
-        'stdout': data['stdout'],
-    }
-
-    if args.reftest_output_dir is not None and suite_name == args.reftest_suite:
-        filename = unit_name.split(' ')[1]
-        basename = os.path.splitext(filename)[0]
-
-        image_data = {
-            'ref': os.path.join(args.reftest_output_dir, '{}.ref.png'.format(basename)),
-            'out': os.path.join(args.reftest_output_dir, '{}.out.png'.format(basename)),
-            'diff': os.path.join(args.reftest_output_dir, '{}.diff.png'.format(basename)),
-        }
-
-        unit['image_data'] = image_data
-
-    units = suites.setdefault(full_suite, [])
-    units.append(unit)
-
-report = {}
-report['date'] = datetime.datetime.utcnow()
-report['locale_date'] = report['date'].strftime("%c")
-report['project_name'] = args.project_name
-report['job_id'] = args.job_id
-report['branch_name'] = args.branch
-report['total_successes'] = 0
-report['total_failures'] = 0
-report['total_units'] = 0
-report['results_list'] = []
-
-for name, units in suites.items():
-    (project_name, suite_name) = name.split(':')
-    print('Processing {} suite {}:'.format(project_name, suite_name))
-
-    def if_failed(unit):
-        if unit['result'] in ['FAIL', 'TIMEOUT']:
-            return True
-        return False
-
-    def if_succeded(unit):
-        if unit['result'] in ['OK', 'EXPECTEDFAIL', 'SKIP']:
-            return True
-        return False
-
-    successes = list(filter(if_succeded, units))
-    failures = list(filter(if_failed, units))
-
-    n_units = len(units)
-    n_successes = len(successes)
-    n_failures = len(failures)
-
-    report['total_units'] += n_units
-    report['total_successes'] += n_successes
-    report['total_failures'] += n_failures
-    print(' - {}: {} total, {} pass, {} fail'.format(suite_name, n_units, n_successes, n_failures))
-
-    suite_report = {
-        'suite_name': suite_name,
-        'n_units': n_units,
-        'successes': successes,
-        'n_successes': n_successes,
-        'failures': failures,
-        'n_failures': n_failures,
-    }
-    report['results_list'].append(suite_report)
-
-template = Template(REPORT_TEMPLATE)
-outfile.write(template.render({'report': report}))

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

@@ -1,109 +0,0 @@
-#!/usr/bin/env python3
-
-# Turns a Meson testlog.json file into a JUnit XML report
-#
-# Copyright 2019  GNOME Foundation
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Emmanuele Bassi
-
-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', encoding='UTF-8'),
-                     default=sys.stdout)
-aparser.add_argument('infile', metavar='FILE',
-                     help='The input testlog.json, stdin by default',
-                     type=argparse.FileType('r', encoding='UTF-8'),
-                     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)

.gitlab-ci/run-docker.sh

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

.gitlab-ci/test-docker.sh

@@ -16,8 +16,6 @@ meson \
         -Dwayland-backend=true \
         -Dbroadway-backend=true \
         -Dvulkan=yes \
-        --werror \
-        ${EXTRA_MESON_FLAGS:-} \
         _build $srcdir
 unset CCACHE_DISABLE
 
@@ -26,30 +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:a11y
-
-# Save the exit code
-exit_code=$?
-
-# We always want to run the report generators
-$srcdir/.gitlab-ci/meson-junit-report.py \
-        --project-name=gtk \
-        --job-id="${CI_JOB_NAME}" \
-        --output=report.xml \
-        meson-logs/testlog.json
-
-$srcdir/.gitlab-ci/meson-html-report.py \
-        --project-name=GTK \
-        --job-id="${CI_JOB_NAME}" \
-        --reftest-output-dir="testsuite/reftests/output" \
-        --output=report.html \
-        meson-logs/testlog.json
-
-exit $exit_code

.gitlab-ci/test-msys2.sh

@@ -42,11 +42,10 @@ ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
 meson \
-    -Dx11-backend=false \
-    -Dwayland-backend=false \
-    -Dwin32-backend=true \
+    -Denable-x11-backend=false \
+    -Denable-wayland-backend=false \
+    -Denable-win32-backend=true \
     -Dvulkan=no \
-    --werror \
     _build
 unset CCACHE_DISABLE
 

.gitlab/issue_templates/Bug.md

@@ -7,8 +7,8 @@
 <!--
   You should try and reproduce with the demos applications available
   under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example
-  *written in C* that exhibits the issue.
+  Alternatively, please attach a *small and self-contained* example that
+  exhibits the issue.
 -->
 
 ## Current behavior
@@ -26,7 +26,7 @@
  - Which version of GTK you are using
  - What operating system and version
   - For Linux, which distribution
- - If you built GTK yourself, the list of options used to configure the build
+ - If you built GTK+ yourself, the list of options used to configure the build
 -->
 
 ## Additional information

.gitlab/issue_templates/Crash.md

@@ -16,7 +16,7 @@
  - Which version of GTK you are using
  - What operating system and version
   - for Linux, which distribution
- - If you built GTK yourself, the list of options used to configure the build
+ - If you built GTK+ yourself, the list of options used to configure the build
 -->
 
 ## Warnings

NEWS

@@ -1,105 +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 used just 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. A number of layout managers are available:
-  - GtkBinLayout
-  - GtkBoxLayout
-  - GtkGridLayout
-  - GtkFixedLayout
-  - GtkCustomLayout
-  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.
-
-* GtkListBox has gained a ::show-separators property that gets
-  translated into a CSS style class.
-
-* A number of X11-specific GtkWindow and GdkSurface apis have been
-  removed or changed to backend APIs.
-
-* 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
 ==================================
 

build-aux/flatpak/org.gtk.Demo.json

@@ -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",

build-aux/flatpak/org.gtk.IconBrowser4.json

@@ -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"
-                }
-            ]
-        }
-    ]
-}

build-aux/flatpak/org.gtk.WidgetFactory.json

@@ -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",

build-aux/meson/post-install.py

@@ -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...')

config.h.meson

@@ -24,6 +24,9 @@
 /* Define to 1 if you have the <crt_externs.h> header file. */
 #mesondefine HAVE_CRT_EXTERNS_H
 
+/* Define to 1 if CUPS 1.6 API is available */
+#mesondefine HAVE_CUPS_API_1_6
+
 /* Define to 1 if you have the `dcgettext' function. */
 #mesondefine HAVE_DCGETTEXT
 
@@ -56,6 +59,12 @@
 /* Define if GStreamer support is available */
 #mesondefine HAVE_GSTREAMER
 
+/* Define to 1 if you have the `httpGetAuthString' function. */
+#mesondefine HAVE_HTTPGETAUTHSTRING
+
+/* Define if cups http_t authstring field is accessible */
+#mesondefine HAVE_HTTP_AUTHSTRING
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #mesondefine HAVE_INTTYPES_H
 
@@ -125,9 +134,6 @@
 /* Define to 1 if you have the <sys/param.h> header file. */
 #mesondefine HAVE_SYS_PARAM_H
 
-/* Have the sysprof-capture library */
-#mesondefine HAVE_SYSPROF_CAPTURE
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #mesondefine HAVE_SYS_STAT_H
 
@@ -185,6 +191,9 @@
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #mesondefine LT_OBJDIR
 
+/* Define if <X11/extensions/XIproto.h> needed for xReply */
+#mesondefine NEED_XIPROTO_H_FOR_XREPLY
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #mesondefine NO_MINUS_C_MINUS_O
 
@@ -235,6 +244,9 @@
 #endif
 
 
+/* Define to 1 if XInput 2.0 is available */
+#mesondefine XINPUT_2
+
 /* Define to 1 if XInput 2.2 is available */
 #mesondefine XINPUT_2_2
 
@@ -288,10 +300,18 @@
 
 #mesondefine GTK_PRINT_BACKENDS
 
-#mesondefine HAVE_CAIRO_SCRIPT_INTERPRETER
-
 #mesondefine HAVE_HARFBUZZ
 
 #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

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

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

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

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

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

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

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

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

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

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

demos/constraint-editor/constraint-editor.c

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

demos/constraint-editor/constraint-editor.css

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

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

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

demos/constraint-editor/constraint-editor.h

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

demos/constraint-editor/constraint-editor.ui

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

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

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

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

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

demos/constraint-editor/constraint-view.c

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

demos/constraint-editor/constraint-view.h

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

demos/constraint-editor/guide-editor.c

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

demos/constraint-editor/guide-editor.h

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

demos/constraint-editor/guide-editor.ui

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

demos/constraint-editor/main.c

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

demos/constraint-editor/meson.build

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

demos/gtk-demo/application.c

@@ -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");
@@ -477,7 +477,7 @@ surface_state_changed (GtkWidget *widget)
   DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
   GdkSurfaceState new_state;
 
-  new_state = gdk_surface_get_state (gtk_native_get_surface (GTK_NATIVE (widget)));
+  new_state = gdk_surface_get_state (gtk_widget_get_surface (widget));
   window->maximized = (new_state & GDK_SURFACE_STATE_MAXIMIZED) != 0;
   window->fullscreen = (new_state & GDK_SURFACE_STATE_FULLSCREEN) != 0;
 }
@@ -487,14 +487,14 @@ demo_application_window_realize (GtkWidget *widget)
 {
   GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);
 
-  g_signal_connect_swapped (gtk_native_get_surface (GTK_NATIVE (widget)), "notify::state",
+  g_signal_connect_swapped (gtk_widget_get_surface (widget), "notify::state",
                             G_CALLBACK (surface_state_changed), widget);
 }
 
 static void
 demo_application_window_unrealize (GtkWidget *widget)
 {
-  g_signal_handlers_disconnect_by_func (gtk_native_get_surface (GTK_NATIVE (widget)),
+  g_signal_handlers_disconnect_by_func (gtk_widget_get_surface (widget),
                                         surface_state_changed, widget);
 
   GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
@@ -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));
 

demos/gtk-demo/application.ui

@@ -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>

demos/gtk-demo/application_demo.c

@@ -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),

demos/gtk-demo/appmenu.ui

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="appmenu">
     <section>

demos/gtk-demo/award.c

@@ -1,247 +0,0 @@
-/*
- * Copyright © 2018 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 "award.h"
-
-struct _GtkAward
-{
-  GObject parent;
-
-  char *explanation;
-  char *name;
-  char *title;
-  GDateTime *granted; /* or NULL if not granted */
-};
-
-enum {
-  PROP_0,
-  PROP_EXPLANATION,
-  PROP_NAME,
-  PROP_TITLE,
-  PROP_GRANTED,
-
-  N_PROPS,
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-G_DEFINE_TYPE (GtkAward, gtk_award, G_TYPE_OBJECT)
-
-static void
-gtk_award_set_property (GObject      *object,
-                        guint         prop_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  switch (prop_id)
-    {
-    case PROP_EXPLANATION:
-      self->explanation = g_value_dup_string (value);
-      break;
-
-    case PROP_NAME:
-      self->name = g_value_dup_string (value);
-      break;
-
-    case PROP_TITLE:
-      self->title = g_value_dup_string (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_award_get_property (GObject    *object,
-                        guint       prop_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  switch (prop_id)
-    {
-    case PROP_EXPLANATION:
-      g_value_set_string (value, self->explanation);
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_TITLE:
-      g_value_set_string (value, self->title);
-      break;
-
-    case PROP_GRANTED:
-      g_value_set_boxed (value, self->granted);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_award_dispose (GObject *object)
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  g_clear_pointer (&self->name, g_free);
-  g_clear_pointer (&self->title, g_free);
-  g_clear_pointer (&self->granted, g_date_time_unref);
-
-  G_OBJECT_CLASS (gtk_award_parent_class)->dispose (object);
-}
-
-static void
-gtk_award_class_init (GtkAwardClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->set_property = gtk_award_set_property;
-  gobject_class->get_property = gtk_award_get_property;
-  gobject_class->dispose = gtk_award_dispose;
-
-  properties[PROP_EXPLANATION] =
-    g_param_spec_string ("explanation",
-                         "Explanation",
-                         "How to get the title",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_NAME] =
-    g_param_spec_string ("name",
-                         "Name",
-                         "internal name of the award",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_TITLE] =
-    g_param_spec_string ("title",
-                         "Title",
-                         "user-visible title",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_GRANTED] =
-    g_param_spec_boxed ("granted",
-                        "Granted",
-                        "Timestamp the award was granted or NULL if not granted yet",
-                        G_TYPE_DATE_TIME,
-                        G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_award_init (GtkAward *self)
-{
-}
-
-GListModel *
-gtk_award_get_list (void)
-{
-  static GListModel *list = NULL;
-
-  if (list == NULL)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (GTK_TYPE_AWARD);
-      builder = gtk_builder_new_from_resource ("/awards.ui");
-      list = G_LIST_MODEL (gtk_builder_get_object (builder, "list"));
-      g_object_ref (list);
-      g_object_unref (builder);
-    }
-
-  return g_object_ref (list);
-}
-
-const char *
-gtk_award_get_name (GtkAward *award)
-{
-  return award->name;
-}
-
-const char *
-gtk_award_get_title (GtkAward *award)
-{
-  return award->title;
-}
-
-GDateTime *
-gtk_award_get_granted (GtkAward *award)
-{
-  return award->granted;
-}
-
-GtkAward *
-award_find (const char *name)
-{
-  GListModel *list;
-  GtkAward *self;
-  guint i;
-
-  list = gtk_award_get_list ();
-  g_object_unref (list);
-
-  for (i = 0; i < g_list_model_get_n_items (list); i++)
-    {
-      self = g_list_model_get_item (list, i);
-      g_object_unref (self);
-
-      if (g_ascii_strcasecmp (name, self->name) == 0)
-        return self;
-    }
-
-  return NULL;
-}
-
-void
-award (const char *name)
-{
-  GtkAward *self;
-  GNotification *notification;
-
-  self = award_find (name);
-  if (self == NULL)
-    {
-      g_warning ("Did not find award \"%s\"", name);
-      return;
-    }
-
-  if (self->granted)
-    return;
-
-  self->granted = g_date_time_new_now_utc ();
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_GRANTED]);
-
-  notification = g_notification_new ("You won an award!");
-  g_notification_set_body (notification, self->title);
-  g_application_send_notification (g_application_get_default (), NULL, notification);
-  g_object_unref (notification);
-}
-

demos/gtk-demo/award.h

@@ -1,18 +0,0 @@
-#ifndef __AWARD_H__
-#define __AWARD_H__
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_AWARD (gtk_award_get_type ())
-
-G_DECLARE_FINAL_TYPE (GtkAward, gtk_award, GTK, AWARD, GObject)
-
-GListModel *    gtk_award_get_list                      (void);
-
-const char *    gtk_award_get_name                      (GtkAward               *award);
-const char *    gtk_award_get_title                     (GtkAward               *award);
-GDateTime *     gtk_award_get_granted                   (GtkAward               *award);
-
-void            award                                   (const char             *name);
-
-#endif /* __AWARD_H__ */

demos/gtk-demo/awardlistitem.ui

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk40">
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="label" bind-source="GtkListItem" bind-property="position"></property>
-        <property name="margin">6</property>
-      </object>
-    </property>
-  </template>
-</interface>

demos/gtk-demo/awards.ui

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GListStore" id="list">
-    <property name="item-type">GtkAward</property>
-    <child>
-      <object class="GtkAward">
-        <property name="name">demo-inspector</property>
-        <!-- Transformers -->
-        <property name="title" translatable="yes">You got a high-rise double-pump carburetor.</property>
-        <property name="explanation" translatable="yes">Launch the inspector</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">demo-start</property>
-        <!-- The Matrix -->
-        <property name="title" translatable="yes">After this, there is no turning back.</property>
-        <property name="explanation" translatable="yes">Start gtk-demo</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">listbox-reshare</property>
-        <!-- Mean Girls -->
-        <property name="title" translatable="yes">Trying to make fetch happen</property>
-        <property name="explanation" translatable="yes">Reshare a tweet</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">listbox-100th-row</property>
-        <!-- Aladdin -->
-        <property name="title" translatable="yes">The ever impressive, long contained, often imitated, but never duplicated Genie of the lamp.</property>
-        <property name="explanation" translatable="yes">Select a 100th row in a list</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">password-best</property>
-        <!-- Spaceballs -->
-        <property name="title" translatable="yes">I've got the same combination on my luggage!</property>
-        <property name="explanation" translatable="yes">Use "12345" as the password</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">password-correct</property>
-        <!-- Stanley Parable -->
-        <property name="title" translatable="yes">Night Shark 1-1-5</property>
-        <property name="explanation" translatable="yes">Correctly enter a password</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-give-up</property>
-        <!-- Pretty Woman -->
-        <property name="title" translatable="yes">Big Mistake. Big. Huge!</property>
-        <property name="explanation" translatable="yes">Close the puzzle without finishing it</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve</property>
-        <!-- The Incredibles -->
-        <property name="title" translatable="yes">That was totally wicked!</property>
-        <property name="explanation" translatable="yes">Solve a puzzle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve-animated</property>
-        <!-- The Phantom Menace -->
-        <property name="title" translatable="yes">A surprise to be sure but a welcome one.</property>
-        <property name="explanation" translatable="yes">Solve an animated puzzle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve-large</property>
-        <!-- Portal -->
-        <property name="title" translatable="yes">Science isn't about WHY. It's about WHY NOT?!</property>
-        <property name="explanation" translatable="yes">Solve a puzzle with at least 20 pieces</property>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/awardview.c

@@ -1,49 +0,0 @@
-/* Awards
- *
- * This demo demonstrates how to use lists to show the awards you have collected
- * while exploring this demo.
- *
- */
-
-#include <gtk/gtk.h>
-
-/* Include the header for accessing the awards */
-#include "award.h"
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_awardview (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *sw, *listview;
-      GListModel *list;
-
-      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), "Awards");
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-
-      listview = gtk_list_view_new_with_factory (
-          gtk_builder_list_item_factory_new_from_resource (NULL, "/awardview/awardlistitem.ui"));
-      list = gtk_award_get_list ();
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), list);
-      g_object_unref (list);
-      gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
-      gtk_container_add (GTK_CONTAINER (sw), listview);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/blendmodes.ui

@@ -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>

demos/gtk-demo/bluroverlay.c

@@ -458,6 +458,7 @@ blur_overlay_class_init (BlurOverlayClass *klass)
 static void
 blur_overlay_init (BlurOverlay *overlay)
 {
+  gtk_widget_set_has_surface (GTK_WIDGET (overlay), FALSE);
 }
 
 GtkWidget *

demos/gtk-demo/builder.c

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

demos/gtk-demo/changedisplay.c

@@ -74,17 +74,17 @@ find_toplevel_at_pointer (GdkDisplay *display)
   pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (), NULL, NULL);
 
   if (pointer_window)
-    widget = GTK_WIDGET (gtk_native_get_for_surface (pointer_window));
+    widget = GTK_WIDGET (gtk_root_get_for_surface (pointer_window));
 
   return widget;
 }
 
 static void
-released_cb (GtkGestureClick *gesture,
-             guint            n_press,
-             gdouble          x,
-             gdouble          y,
-             gboolean        *clicked)
+released_cb (GtkGestureMultiPress *gesture,
+             guint                 n_press,
+             gdouble               x,
+             gdouble               y,
+             gboolean             *clicked)
 {
   *clicked = TRUE;
 }
@@ -105,6 +105,7 @@ query_for_toplevel (GdkDisplay *display,
   popup = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_window_set_display (GTK_WINDOW (popup), display);
   gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
+  gtk_window_set_position (GTK_WINDOW (popup), GTK_WIN_POS_CENTER);
 
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
@@ -119,11 +120,11 @@ query_for_toplevel (GdkDisplay *display,
   device = gtk_get_current_event_device ();
 
   if (gdk_seat_grab (gdk_device_get_seat (device),
-                     gtk_native_get_surface (GTK_NATIVE (popup)),
+                     gtk_widget_get_surface (popup),
                      GDK_SEAT_CAPABILITY_ALL_POINTING,
                      FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
     {
-      GtkGesture *gesture = gtk_gesture_click_new ();
+      GtkGesture *gesture = gtk_gesture_multi_press_new ();
       gboolean clicked = FALSE;
 
       g_signal_connect (gesture, "released",

demos/gtk-demo/clipboard.c

@@ -110,7 +110,7 @@ get_image_paintable (GtkImage *image)
       icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
       if (icon_info == NULL)
         return NULL;
-      return gtk_icon_info_load_icon (icon_info, NULL);
+      return GDK_PAINTABLE (gtk_icon_info_load_texture (icon_info));
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
@@ -319,7 +319,7 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
-      gesture = gtk_gesture_click_new ();
+      gesture = gtk_gesture_multi_press_new ();
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
@@ -344,7 +344,7 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
-      gesture = gtk_gesture_click_new ();
+      gesture = gtk_gesture_multi_press_new ();
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));

demos/gtk-demo/constraints.c

@@ -1,289 +0,0 @@
-/* Constraints/Simple
- *
- * GtkConstraintLayout provides a layout manager that uses relations
- * between widgets (also known as "constraints") to compute the position
- * and size of each child.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE (SimpleGrid, simple_grid, SIMPLE, GRID, GtkWidget)
-
-struct _SimpleGrid
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *button1, *button2;
-  GtkWidget *button3;
-};
-
-G_DEFINE_TYPE (SimpleGrid, simple_grid, GTK_TYPE_WIDGET)
-
-static void
-simple_grid_destroy (GtkWidget *widget)
-{
-  SimpleGrid *self = SIMPLE_GRID (widget);
-
-  g_clear_pointer (&self->button1, gtk_widget_destroy);
-  g_clear_pointer (&self->button2, gtk_widget_destroy);
-  g_clear_pointer (&self->button3, gtk_widget_destroy);
-
-  GTK_WIDGET_CLASS (simple_grid_parent_class)->destroy (widget);
-}
-
-static void
-simple_grid_class_init (SimpleGridClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->destroy = simple_grid_destroy;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
-}
-
-/* Layout:
- *
- *   +-------------------------------------+
- *   | +-----------++-------++-----------+ |
- *   | |  Child 1  || Space ||  Child 2  | |
- *   | +-----------++-------++-----------+ |
- *   | +---------------------------------+ |
- *   | |             Child 3             | |
- *   | +---------------------------------+ |
- *   +-------------------------------------+
- *
- * Constraints:
- *
- *   super.start = child1.start - 8
- *   child1.width = child2.width
- *   child1.end = space.start
- *   space.end = child2.start
- *   child2.end = super.end - 8
- *   super.start = child3.start - 8
- *   child3.end = super.end - 8
- *   super.top = child1.top - 8
- *   super.top = child2.top - 8
- *   child1.bottom = child3.top - 12
- *   child2.bottom = child3.top - 12
- *   child3.height = child1.height
- *   child3.height = child2.height
- *   child3.bottom = super.bottom - 8
- *
- * To add some flexibility, we make the space
- * stretchable:
- *
- *   space.width >= 10
- *   space.width = 100
- *   space.width <= 200
- */
-static void
-build_constraints (SimpleGrid          *self,
-                   GtkConstraintLayout *manager)
-{
-  GtkConstraintGuide *guide;
-
-  guide = gtk_constraint_guide_new ();
-  gtk_constraint_guide_set_name (guide, "space");
-  gtk_constraint_guide_set_min_size (guide, 10, 10);
-  gtk_constraint_guide_set_nat_size (guide, 100, 10);
-  gtk_constraint_guide_set_max_size (guide, 200, 20);
-  gtk_constraint_guide_set_strength (guide, GTK_CONSTRAINT_STRENGTH_STRONG);
-  gtk_constraint_layout_add_guide (manager, guide);
-
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new_constant (GTK_CONSTRAINT_TARGET (self->button1),
-                        GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
-                        GTK_CONSTRAINT_RELATION_LE,
-                        200.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button1,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button1,
-                        GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
-                        GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button1,
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        guide,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (guide,
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button2,
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button3,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button1,
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button1,
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button3,
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        1.0,
-                        -12.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button2,
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button3,
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        1.0,
-                        -12.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
-                        GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button1,
-                        GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
-                        GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
-                        GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-}
-
-static void
-simple_grid_init (SimpleGrid *self)
-{
-  GtkWidget *widget = GTK_WIDGET (self);
-
-  self->button1 = gtk_button_new_with_label ("Child 1");
-  gtk_widget_set_parent (self->button1, widget);
-  gtk_widget_set_name (self->button1, "button1");
-
-  self->button2 = gtk_button_new_with_label ("Child 2");
-  gtk_widget_set_parent (self->button2, widget);
-  gtk_widget_set_name (self->button2, "button2");
-
-  self->button3 = gtk_button_new_with_label ("Child 3");
-  gtk_widget_set_parent (self->button3, widget);
-  gtk_widget_set_name (self->button3, "button3");
-
-  GtkLayoutManager *manager = gtk_widget_get_layout_manager (GTK_WIDGET (self));
-  build_constraints (self, GTK_CONSTRAINT_LAYOUT (manager));
-}
-
-GtkWidget *
-do_constraints (GtkWidget *do_widget)
-{
- static GtkWidget *window;
-
- if (!window)
-   {
-     GtkWidget *header, *box, *grid, *button;
-
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-     gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-
-     header = gtk_header_bar_new ();
-     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
-     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
-
-     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
-
-     grid = g_object_new (simple_grid_get_type (), NULL);
-     gtk_widget_set_hexpand (grid, TRUE);
-     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
-
-     button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
-     gtk_widget_set_hexpand (grid, TRUE);
-     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
-   }
-
- if (!gtk_widget_get_visible (window))
-   gtk_widget_show (window);
- else
-   gtk_widget_destroy (window);
-
- return window;
-}

demos/gtk-demo/constraints2.c

@@ -1,245 +0,0 @@
-/* Constraints/Interactive
- *
- * Demonstrate how constraints can be updates during
- * user interaction.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE (InteractiveGrid, interactive_grid, INTERACTIVE, GRID, GtkWidget)
-
-struct _InteractiveGrid
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *button1, *button2;
-  GtkWidget *button3;
-  GtkConstraintGuide *guide;
-  GtkConstraint *constraint;
-};
-
-G_DEFINE_TYPE (InteractiveGrid, interactive_grid, GTK_TYPE_WIDGET)
-
-static void
-interactive_grid_destroy (GtkWidget *widget)
-{
-  InteractiveGrid *self = INTERACTIVE_GRID (widget);
-
-  g_clear_pointer (&self->button1, gtk_widget_destroy);
-  g_clear_pointer (&self->button2, gtk_widget_destroy);
-  g_clear_pointer (&self->button3, gtk_widget_destroy);
-
-  GTK_WIDGET_CLASS (interactive_grid_parent_class)->destroy (widget);
-}
-
-static void
-interactive_grid_class_init (InteractiveGridClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->destroy = interactive_grid_destroy;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
-}
-
-static void
-build_constraints (InteractiveGrid          *self,
-                   GtkConstraintLayout *manager)
-{
-  self->guide = g_object_new (GTK_TYPE_CONSTRAINT_GUIDE, NULL);
-  gtk_constraint_layout_add_guide (manager, self->guide);
-
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new_constant (GTK_CONSTRAINT_TARGET (self->guide),
-                        GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->button1),
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button1),
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->guide),
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button2),
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->guide),
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button2),
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->button3),
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button3),
-                        GTK_CONSTRAINT_ATTRIBUTE_END,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->guide),
-                        GTK_CONSTRAINT_ATTRIBUTE_START,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->button1),
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button2),
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->button1),
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button3),
-                        GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        GTK_CONSTRAINT_TARGET (self->button2),
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        1.0,
-                        0.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-  gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button3),
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        GTK_CONSTRAINT_RELATION_EQ,
-                        NULL,
-                        GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
-                        1.0,
-                        -8.0,
-                        GTK_CONSTRAINT_STRENGTH_REQUIRED));
-}
-
-static void
-drag_cb (GtkGestureDrag  *drag,
-         double           offset_x,
-         double           offset_y,
-         InteractiveGrid *self)
-{
-  GtkConstraintLayout *layout = GTK_CONSTRAINT_LAYOUT (gtk_widget_get_layout_manager (GTK_WIDGET (self)));
-  double x, y;
-
-  if (self->constraint)
-    {
-      gtk_constraint_layout_remove_constraint (layout, self->constraint);
-      g_clear_object (&self->constraint);
-    }
-
-  gtk_gesture_drag_get_start_point (drag, &x, &y);
-  self->constraint = gtk_constraint_new_constant (GTK_CONSTRAINT_TARGET (self->guide),
-                                                  GTK_CONSTRAINT_ATTRIBUTE_LEFT,
-                                                  GTK_CONSTRAINT_RELATION_EQ,
-                                                  x + offset_x,
-                                                  GTK_CONSTRAINT_STRENGTH_REQUIRED);
-  gtk_constraint_layout_add_constraint (layout, g_object_ref (self->constraint));
-  gtk_widget_queue_allocate (GTK_WIDGET (self));
-}
-
-static void
-interactive_grid_init (InteractiveGrid *self)
-{
-  GtkWidget *widget = GTK_WIDGET (self);
-  GtkGesture *drag;
-
-  self->button1 = gtk_button_new_with_label ("Child 1");
-  gtk_widget_set_parent (self->button1, widget);
-  gtk_widget_set_name (self->button1, "button1");
-
-  self->button2 = gtk_button_new_with_label ("Child 2");
-  gtk_widget_set_parent (self->button2, widget);
-  gtk_widget_set_name (self->button2, "button2");
-
-  self->button3 = gtk_button_new_with_label ("Child 3");
-  gtk_widget_set_parent (self->button3, widget);
-  gtk_widget_set_name (self->button3, "button3");
-
-  GtkLayoutManager *manager = gtk_widget_get_layout_manager (GTK_WIDGET (self));
-  build_constraints (self, GTK_CONSTRAINT_LAYOUT (manager));
-
-  drag = gtk_gesture_drag_new ();
-  g_signal_connect (drag, "drag-update", G_CALLBACK (drag_cb), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (drag));
-}
-
-GtkWidget *
-do_constraints2 (GtkWidget *do_widget)
-{
- static GtkWidget *window;
-
- if (!window)
-   {
-     GtkWidget *header, *box, *grid, *button;
-
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-     gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-
-     header = gtk_header_bar_new ();
-     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
-     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
-
-     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
-
-     grid = g_object_new (interactive_grid_get_type (), NULL);
-     gtk_widget_set_hexpand (grid, TRUE);
-     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
-
-     button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
-     gtk_widget_set_hexpand (grid, TRUE);
-     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
-   }
-
- if (!gtk_widget_get_visible (window))
-   gtk_widget_show (window);
- else
-   gtk_widget_destroy (window);
-
- return window;
-}

demos/gtk-demo/constraints3.c

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

demos/gtk-demo/css_basics.c

@@ -13,22 +13,19 @@ show_parsing_error (GtkCssProvider *provider,
                     const GError   *error,
                     GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
   GtkTextIter start, end;
   const char *tag_name;
 
-  start_location = gtk_css_section_get_start_location (section);
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));
 
-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
     tag_name = "warning";
   else
     tag_name = "error";

demos/gtk-demo/css_multiplebgs.c

@@ -13,23 +13,19 @@ show_parsing_error (GtkCssProvider *provider,
                     const GError   *error,
                     GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
   GtkTextIter start, end;
   const char *tag_name;
 
-  start_location = gtk_css_section_get_start_location (section);
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));
 
-
-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
     tag_name = "warning";
   else
     tag_name = "error";

demos/gtk-demo/css_pixbufs.c

@@ -12,23 +12,19 @@ show_parsing_error (GtkCssProvider *provider,
                     const GError   *error,
                     GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
   GtkTextIter start, end;
   const char *tag_name;
 
-  start_location = gtk_css_section_get_start_location (section);
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));
 
-
-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
     tag_name = "warning";
   else
     tag_name = "error";

demos/gtk-demo/css_shadows.c

@@ -11,22 +11,19 @@ show_parsing_error (GtkCssProvider *provider,
                     const GError   *error,
                     GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
   GtkTextIter start, end;
   const char *tag_name;
 
-  start_location = gtk_css_section_get_start_location (section);
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
   gtk_text_buffer_get_iter_at_line_index (buffer,
                                           &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));
 
-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
     tag_name = "warning";
   else
     tag_name = "error";

demos/gtk-demo/cursors.c

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

demos/gtk-demo/cursors.ui

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GdkCursor" id="default_cursor">
     <property name="name">default</property>

demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg

@@ -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"

demos/gtk-demo/demo.gresource.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/">
-    <file>awards.ui</file>
-  </gresource>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">main.ui</file>
-    <file preprocess="xml-stripblanks">main-listitem.ui</file>
     <file preprocess="xml-stripblanks">appmenu.ui</file>
   </gresource>
   <gresource prefix="/application_demo">
@@ -13,9 +9,6 @@
     <file>application.ui</file>
     <file>menus.ui</file>
   </gresource>
-  <gresource prefix="/awardview">
-    <file>awardlistitem.ui</file>
-  </gresource>
   <gresource prefix="/builder">
     <file>demo.ui</file>
   </gresource>
@@ -44,9 +37,6 @@
   <gresource prefix="/theming_style_classes">
     <file>theming.ui</file>
   </gresource>
-  <gresource prefix="/themes">
-    <file>themes.ui</file>
-  </gresource>
   <gresource prefix="/css_pixbufs">
     <file alias="gtk.css">css_pixbufs.css</file>
     <file>cssview.css</file>
@@ -111,29 +101,10 @@
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
   </gresource>
-  <gresource prefix="/iconscroll">
-    <file>iconscroll.ui</file>
-  </gresource>
   <gresource prefix="/iconview">
     <file>gnome-fs-directory.png</file>
     <file>gnome-fs-regular.png</file>
   </gresource>
-  <gresource prefix="/listview_filebrowser">
-    <file>listview_filebrowser.ui</file>
-  </gresource>
-  <gresource prefix="/listview_minesweeper">
-    <file>listview_minesweeper.ui</file>
-    <file>listview_minesweeper_cell.ui</file>
-  </gresource>
-  <gresource prefix="/listview_settings">
-    <file>listview_settings.ui</file>
-  </gresource>
-  <gresource prefix="/listview_weather">
-    <file compressed="true">listview_weather.txt</file>
-  </gresource>
-  <gresource prefix="/listview_colors">
-    <file compressed="true">color.names.txt</file>
-  </gresource>
   <gresource prefix="/shortcuts">
     <file>shortcuts.ui</file>
     <file>shortcuts-builder.ui</file>
@@ -170,16 +141,12 @@
   </gresource>
   <gresource prefix="/sources">
     <file>application_demo.c</file>
-    <file>awardview.c</file>
     <file>assistant.c</file>
     <file>builder.c</file>
     <file>changedisplay.c</file>
     <file>clipboard.c</file>
     <file>colorsel.c</file>
     <file>combobox.c</file>
-    <file>constraints.c</file>
-    <file>constraints2.c</file>
-    <file>constraints3.c</file>
     <file>css_accordion.c</file>
     <file>css_basics.c</file>
     <file>css_blendmodes.c</file>
@@ -191,35 +158,25 @@
     <file>drawingarea.c</file>
     <file>dnd.c</file>
     <file>editable_cells.c</file>
+    <file>entry_buffer.c</file>
     <file>entry_completion.c</file>
-    <file>entry_undo.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>fishbowl.c</file>
-    <file>fixed.c</file>
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>
     <file>fontplane.c</file>
-    <file>fontrendering.c</file>
     <file>gestures.c</file>
     <file>glarea.c</file>
     <file>headerbar.c</file>
     <file>hypertext.c</file>
-    <file>iconscroll.c</file>
     <file>iconview.c</file>
     <file>iconview_edit.c</file>
     <file>images.c</file>
     <file>infobar.c</file>
     <file>links.c</file>
     <file>listbox.c</file>
-    <file>listview_applauncher.c</file>
-    <file>listview_colors.c</file>
-    <file>listview_clocks.c</file>
-    <file>listview_filebrowser.c</file>
-    <file>listview_minesweeper.c</file>
-    <file>listview_settings.c</file>
-    <file>listview_weather.c</file>
     <file>list_store.c</file>
     <file>markup.c</file>
     <file>menus.c</file>
@@ -232,7 +189,6 @@
     <file>paintable_animated.c</file>
     <file>paintable_mediastream.c</file>
     <file>panes.c</file>
-    <file>password_entry.c</file>
     <file>pickers.c</file>
     <file>pixbufs.c</file>
     <file>popover.c</file>
@@ -250,12 +206,9 @@
     <file>spinbutton.c</file>
     <file>spinner.c</file>
     <file>tabs.c</file>
-    <file>tagged_entry.c</file>
-    <file>textundo.c</file>
     <file>textview.c</file>
     <file>textscroll.c</file>
     <file>theming_style_classes.c</file>
-    <file>themes.c</file>
     <file>transparent.c</file>
     <file>tree_store.c</file>
     <file>textmask.c</file>
@@ -264,9 +217,6 @@
   <gresource prefix="/textview">
     <file>floppybuddy.gif</file>
   </gresource>
-  <gresource prefix="/tagged_entry">
-    <file>tagstyle.css</file>
-  </gresource>
   <gresource prefix="/listbox">
     <file>listbox.ui</file>
     <file>messages.txt</file>
@@ -311,17 +261,7 @@
   <gresource prefix="/dnd">
     <file>dnd.css</file>
   </gresource>
-  <gresource prefix="/tagged_entry">
-    <file>demotaggedentry.c</file>
-    <file>demotaggedentry.h</file>
-  </gresource>
-  <gresource prefix="/fixed">
-    <file>fixed.css</file>
-  </gresource>
-  <gresource prefix="/fontrendering">
-    <file>fontrendering.ui</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>

demos/gtk-demo/demo.ui

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkListStore" id="liststore1">
     <columns>

demos/gtk-demo/demotaggedentry.c

@@ -1,489 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2019 Red Hat, Inc.
- *
- * Authors:
- * - Matthias Clasen <mclasen@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "demotaggedentry.h"
-
-#include <gtk/gtk.h>
-#include <gtk/gtk-a11y.h>
-
-typedef struct {
-  GtkWidget *box;
-  GtkWidget *entry;
-} DemoTaggedEntryPrivate;
-
-static void demo_tagged_entry_editable_init (GtkEditableInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
-                         G_ADD_PRIVATE (DemoTaggedEntry)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, demo_tagged_entry_editable_init))
-
-static void
-demo_tagged_entry_init (DemoTaggedEntry *entry)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
-
-  priv->entry = gtk_text_new ();
-  gtk_widget_set_hexpand (priv->entry, TRUE);
-  gtk_widget_set_vexpand (priv->entry, TRUE);
-  gtk_widget_set_hexpand (priv->box, FALSE);
-  gtk_widget_set_vexpand (priv->box, FALSE);
-  gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);
-  gtk_editable_init_delegate (GTK_EDITABLE (entry));
-}
-
-static void
-demo_tagged_entry_dispose (GObject *object)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  if (priv->entry)
-    gtk_editable_finish_delegate (GTK_EDITABLE (entry));
-
-  g_clear_pointer (&priv->entry, gtk_widget_unparent);
-  g_clear_pointer (&priv->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
-}
-
-static void
-demo_tagged_entry_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->finalize (object);
-}
-
-static void
-demo_tagged_entry_set_property (GObject      *object,
-                                guint         prop_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  if (gtk_editable_delegate_set_property (object, prop_id, value, pspec))
-    return;
-
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-}
-
-static void
-demo_tagged_entry_get_property (GObject    *object,
-                                guint       prop_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  if (gtk_editable_delegate_get_property (object, prop_id, value, pspec))
-    return;
-
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-}
-
-static void
-demo_tagged_entry_measure (GtkWidget      *widget,
-                           GtkOrientation  orientation,
-                           int             for_size,
-                           int            *minimum,
-                           int            *natural,
-                           int            *minimum_baseline,
-                           int            *natural_baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_measure (priv->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-demo_tagged_entry_size_allocate (GtkWidget *widget,
-                                 int        width,
-                                 int        height,
-                                 int        baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_size_allocate (priv->box,
-                            &(GtkAllocation) { 0, 0, width, height },
-                            baseline);
-}
-
-static gboolean
-demo_tagged_entry_grab_focus (GtkWidget *widget)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  return gtk_widget_grab_focus (priv->entry);
-}
-
-static void
-demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = demo_tagged_entry_dispose;
-  object_class->finalize = demo_tagged_entry_finalize;
-  object_class->get_property = demo_tagged_entry_get_property;
-  object_class->set_property = demo_tagged_entry_set_property;
-
-  widget_class->measure = demo_tagged_entry_measure;
-  widget_class->size_allocate = demo_tagged_entry_size_allocate;
-  widget_class->grab_focus = demo_tagged_entry_grab_focus;
- 
-  gtk_editable_install_properties (object_class, 1);
-
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "entry");
-}
-
-static GtkEditable *
-demo_tagged_entry_get_delegate (GtkEditable *editable)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (editable);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  return GTK_EDITABLE (priv->entry);
-}
-
-static void
-demo_tagged_entry_editable_init (GtkEditableInterface *iface)
-{
-  iface->get_delegate = demo_tagged_entry_get_delegate;
-}
-
-GtkWidget *
-demo_tagged_entry_new (void)
-{
-  return GTK_WIDGET (g_object_new (DEMO_TYPE_TAGGED_ENTRY, NULL));
-}
-
-void
-demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
-                           GtkWidget       *tag)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  gtk_container_add (GTK_CONTAINER (priv->box), tag);
-}
-
-void
-demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
-                                    GtkWidget       *tag,
-                                    GtkWidget       *sibling)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  if (sibling == NULL)
-    gtk_container_add (GTK_CONTAINER (priv->box), tag);
-  else
-    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
-}
-
-void
-demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
-                              GtkWidget       *tag)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  gtk_container_remove (GTK_CONTAINER (priv->box), tag);
-}
-
-struct _DemoTaggedEntryTag
-{
-  GtkWidget parent;
-  GtkWidget *box;
-  GtkWidget *label;
-  GtkWidget *button;
-
-  gboolean has_close_button;
-  char *style;
-};
-
-struct _DemoTaggedEntryTagClass
-{
-  GtkWidgetClass parent_class;
-};
-
-enum {
-  PROP_0,
-  PROP_LABEL,
-  PROP_HAS_CLOSE_BUTTON,
-};
-
-enum {
-  SIGNAL_CLICKED,
-  SIGNAL_BUTTON_CLICKED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, GTK_TYPE_WIDGET)
-
-static void
-on_released (GtkGestureClick      *gesture,
-             int                   n_press,
-             double                x,
-             double                y,
-             DemoTaggedEntryTag   *tag)
-{
-  g_signal_emit (tag, signals[SIGNAL_CLICKED], 0);
-}
-
-static void
-demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
-{
-  GtkGesture *gesture;
-  GtkCssProvider *provider;
-
-  tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
-  tag->label = gtk_label_new ("");
-  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);
-
-  gesture = gtk_gesture_click_new ();
-  g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
-  gtk_widget_add_controller (GTK_WIDGET (tag), GTK_EVENT_CONTROLLER (gesture));
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/tagged_entry/tagstyle.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              800);
-  g_object_unref (provider);
-}
-
-static void
-demo_tagged_entry_tag_dispose (GObject *object)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  g_clear_pointer (&tag->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (demo_tagged_entry_tag_parent_class)->dispose (object);
-}
-
-static void
-demo_tagged_entry_tag_finalize (GObject *object)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  g_clear_pointer (&tag->box, gtk_widget_unparent);
-  g_clear_pointer (&tag->style, g_free);
-
-  G_OBJECT_CLASS (demo_tagged_entry_tag_parent_class)->finalize (object);
-}
-
-static void
-demo_tagged_entry_tag_set_property (GObject      *object,
-                                    guint         prop_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  switch (prop_id)
-    {
-    case PROP_LABEL:
-      demo_tagged_entry_tag_set_label (tag, g_value_get_string (value));
-      break;
-
-    case PROP_HAS_CLOSE_BUTTON:
-      demo_tagged_entry_tag_set_has_close_button (tag, g_value_get_boolean (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_tagged_entry_tag_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  switch (prop_id)
-    {
-    case PROP_LABEL:
-      g_value_set_string (value, demo_tagged_entry_tag_get_label (tag));
-      break;
-
-    case PROP_HAS_CLOSE_BUTTON:
-      g_value_set_boolean (value, demo_tagged_entry_tag_get_has_close_button (tag));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_tagged_entry_tag_measure (GtkWidget      *widget,
-                               GtkOrientation  orientation,
-                               int             for_size,
-                               int            *minimum,
-                               int            *natural,
-                               int            *minimum_baseline,
-                               int            *natural_baseline)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (widget);
-
-  gtk_widget_measure (tag->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-demo_tagged_entry_tag_size_allocate (GtkWidget *widget,
-                                     int        width,
-                                     int        height,
-                                     int        baseline)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (widget);
-
-  gtk_widget_size_allocate (tag->box,
-                            &(GtkAllocation) { 0, 0, width, height },
-                            baseline);
-}
-
-static void
-demo_tagged_entry_tag_class_init (DemoTaggedEntryTagClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo_tagged_entry_tag_dispose;
-  object_class->finalize = demo_tagged_entry_tag_finalize;
-  object_class->set_property = demo_tagged_entry_tag_set_property;
-  object_class->get_property = demo_tagged_entry_tag_get_property;
-
-  widget_class->measure = demo_tagged_entry_tag_measure;
-  widget_class->size_allocate = demo_tagged_entry_tag_size_allocate;
-
-  signals[SIGNAL_CLICKED] =
-      g_signal_new ("clicked",
-                    DEMO_TYPE_TAGGED_ENTRY_TAG,
-                    G_SIGNAL_RUN_FIRST,
-                    0, NULL, NULL, NULL,
-                    G_TYPE_NONE, 0);
-  signals[SIGNAL_BUTTON_CLICKED] =
-      g_signal_new ("button-clicked",
-                    DEMO_TYPE_TAGGED_ENTRY_TAG,
-                    G_SIGNAL_RUN_FIRST,
-                    0, NULL, NULL, NULL,
-                    G_TYPE_NONE, 0);
-
-  g_object_class_install_property (object_class, PROP_LABEL,
-      g_param_spec_string ("label", "Label", "Label",
-                           NULL, G_PARAM_READWRITE));
-  g_object_class_install_property (object_class, PROP_HAS_CLOSE_BUTTON,
-      g_param_spec_boolean ("has-close-button", "Has close button", "Whether this tag has a close button",
-                            FALSE, G_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
-
-  gtk_widget_class_set_css_name (widget_class, "tag");
-}
-
-DemoTaggedEntryTag *
-demo_tagged_entry_tag_new (const char *label)
-{
-  return DEMO_TAGGED_ENTRY_TAG (g_object_new (DEMO_TYPE_TAGGED_ENTRY_TAG,
-                                              "label", label,
-                                              NULL));
-}
-
-const char *
-demo_tagged_entry_tag_get_label (DemoTaggedEntryTag *tag)
-{
-  g_return_val_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag), NULL);
-
-  return gtk_label_get_label (GTK_LABEL (tag->label));
-}
-
-void
-demo_tagged_entry_tag_set_label (DemoTaggedEntryTag *tag,
-                                 const char         *label)
-{
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag));
-
-  gtk_label_set_label (GTK_LABEL (tag->label), label);
-}
-
-static void
-on_button_clicked (GtkButton          *button,
-                   DemoTaggedEntryTag *tag)
-{
-  g_signal_emit (tag, signals[SIGNAL_BUTTON_CLICKED], 0);
-}
-
-void
-demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
-                                            gboolean            has_close_button)
-{
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag));
-
-  if ((tag->button != NULL) == has_close_button)
-    return;
-
-  if (!has_close_button && tag->button)
-    {
-      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
-      tag->button = NULL;
-    }
-  else if (has_close_button && tag->button == NULL)
-    {
-      GtkWidget *image;
-
-      image = gtk_image_new_from_icon_name ("window-close-symbolic");
-      tag->button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (tag->button), image);
-      gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
-      gtk_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE);
-      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
-      g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
-    }
-
-  g_object_notify (G_OBJECT (tag), "has-close-button");
-}
-
-gboolean
-demo_tagged_entry_tag_get_has_close_button (DemoTaggedEntryTag *tag)
-{
-  g_return_val_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag), FALSE);
-
-  return tag->button != NULL;
-}

demos/gtk-demo/demotaggedentry.h

@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2019 Red Hat, Inc.
- *
- * Authors:
- * - Matthias Clasen <mclasen@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __DEMO_TAGGED_ENTRY_H__
-#define __DEMO_TAGGED_ENTRY_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define DEMO_TYPE_TAGGED_ENTRY                 (demo_tagged_entry_get_type ())
-#define DEMO_TAGGED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntry))
-#define DEMO_TAGGED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
-#define DEMO_IS_TAGGED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_IS_TAGGED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_TAGGED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
-
-typedef struct _DemoTaggedEntry       DemoTaggedEntry;
-typedef struct _DemoTaggedEntryClass  DemoTaggedEntryClass;
-
-struct _DemoTaggedEntry
-{
-  GtkWidget parent;
-};
-
-struct _DemoTaggedEntryClass
-{
-  GtkWidgetClass parent_class;
-};
-
-#define DEMO_TYPE_TAGGED_ENTRY_TAG                (demo_tagged_entry_tag_get_type ())
-#define DEMO_TAGGED_ENTRY_TAG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_TAGGED_ENTRY_TAG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_IS_TAGGED_ENTRY_TAG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_IS_TAGGED_ENTRY_TAG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_TAGGED_ENTRY_TAG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTagClass))
-
-typedef struct _DemoTaggedEntryTag       DemoTaggedEntryTag;
-typedef struct _DemoTaggedEntryTagClass  DemoTaggedEntryTagClass;
-
-
-GType           demo_tagged_entry_get_type (void) G_GNUC_CONST;
-GType           demo_tagged_entry_tag_get_type (void) G_GNUC_CONST;
-
-GtkWidget *     demo_tagged_entry_new     (void);
-
-void            demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
-                                           GtkWidget       *tag);
-
-void            demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
-                                                    GtkWidget       *tag,
-                                                    GtkWidget       *sibling);
-
-void            demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
-                                              GtkWidget       *tag);
-
-DemoTaggedEntryTag *
-                demo_tagged_entry_tag_new (const char *label);
-
-const char *    demo_tagged_entry_tag_get_label (DemoTaggedEntryTag *tag);
-
-void            demo_tagged_entry_tag_set_label (DemoTaggedEntryTag *tag,
-                                                 const char         *label);
-
-gboolean        demo_tagged_entry_tag_get_has_close_button (DemoTaggedEntryTag *tag);
-
-void            demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
-                                                            gboolean            has_close_button);
-
-G_END_DECLS
-
-#endif /* __DEMO_TAGGED_ENTRY_H__ */

demos/gtk-demo/dnd.c

@@ -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, GTK_PICK_DEFAULT);
+  child = gtk_widget_pick (widget, x, y);
 
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
     {
@@ -299,7 +299,7 @@ pressed_cb (GtkGesture *gesture,
       rect.height = 0;
 
       gtk_menu_popup_at_rect (GTK_MENU (menu),
-                              gtk_native_get_surface (gtk_widget_get_native (widget)),
+                              gtk_widget_get_surface (widget),
                               &rect,
                               GDK_GRAVITY_NORTH_WEST,
                               GDK_GRAVITY_NORTH_WEST,
@@ -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, 0);
+  child = gtk_widget_pick (widget, x, y);
 
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
     {
@@ -356,7 +356,7 @@ do_dnd (GtkWidget *do_widget)
       gtk_widget_set_hexpand (fixed, TRUE);
       gtk_widget_set_vexpand (fixed, TRUE);
 
-      multipress = gtk_gesture_click_new ();
+      multipress = gtk_gesture_multi_press_new ();
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (multipress), 0);
       g_signal_connect (multipress, "pressed", G_CALLBACK (pressed_cb), NULL);
       g_signal_connect (multipress, "released", G_CALLBACK (released_cb), NULL);

demos/gtk-demo/entry_buffer.c

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

demos/gtk-demo/expander.c

@@ -31,14 +31,13 @@ do_expander (GtkWidget *do_widget)
   GtkWidget *toplevel;
   GtkWidget *area;
   GtkWidget *expander;
-  GtkWidget *label;
   GtkWidget *sw;
   GtkWidget *tv;
   GtkTextBuffer *buffer;
 
   if (!window)
     {
-      toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
+      toplevel = gtk_widget_get_toplevel (do_widget);
       window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
                                                    0,
                                                    GTK_MESSAGE_ERROR,
@@ -51,19 +50,13 @@ do_expander (GtkWidget *do_widget)
 
       area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
 
-      label = gtk_widget_get_last_child (area);
-      gtk_label_set_wrap (GTK_LABEL (label), FALSE);
-      gtk_widget_set_vexpand (label, FALSE);
-
       expander = gtk_expander_new ("Details:");
-      gtk_widget_set_vexpand (expander, TRUE);
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (sw), TRUE);
 
       tv = gtk_text_view_new ();
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));

demos/gtk-demo/filtermodel.c

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

demos/gtk-demo/filtermodel.ui

@@ -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>

demos/gtk-demo/fishbowl.c

@@ -124,7 +124,7 @@ create_label (void)
 {
   GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
 
-  gtk_label_set_wrap (GTK_LABEL (w), TRUE);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
   gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
 
   return w;
@@ -164,26 +164,6 @@ create_switch (void)
   return w;
 }
 
-static void
-mapped (GtkWidget *w)
-{
-  gtk_menu_button_popup (GTK_MENU_BUTTON (w));
-}
-
-static GtkWidget *
-create_menu_button (void)
-{
-  GtkWidget *w = gtk_menu_button_new ();
-  GtkWidget *popover = gtk_popover_new (NULL);
-
-  gtk_container_add (GTK_CONTAINER (popover), gtk_button_new_with_label ("Hey!"));
-  gtk_popover_set_autohide (GTK_POPOVER (popover), FALSE);
-  gtk_menu_button_set_popover (GTK_MENU_BUTTON (w), popover);
-  g_signal_connect (w, "map", G_CALLBACK (mapped), NULL);
-
-  return w;
-}
-
 static const struct {
   const char *name;
   GtkWidget * (*create_func) (void);
@@ -199,7 +179,6 @@ static const struct {
   { "Video",      create_video          },
   { "Gears",      create_gears          },
   { "Switch",     create_switch         },
-  { "Menubutton", create_menu_button    },
 };
 
 static int selected_widget_type = -1;
@@ -219,15 +198,15 @@ set_widget_type (GtkFishbowl *fishbowl,
   gtk_fishbowl_set_creation_func (fishbowl,
                                   widget_types[selected_widget_type].create_func);
 
-  window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (fishbowl)));
+  window = gtk_widget_get_toplevel (GTK_WIDGET (fishbowl));
   headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
   gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
                             widget_types[selected_widget_type].name);
 }
 
 void
-fishbowl_next_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+next_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -241,8 +220,8 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
 }
 
 void
-fishbowl_prev_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+prev_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -255,23 +234,6 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
   set_widget_type (fishbowl, new_index);
 }
 
-void
-fishbowl_changes_toggled_cb (GtkToggleButton *button,
-                             gpointer         user_data)
-{
-  if (gtk_toggle_button_get_active (button))
-    gtk_button_set_icon_name (GTK_BUTTON (button), "changes-prevent");
-  else
-    gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
-}
-
-char *
-format_header_cb (GObject *object,
-                  guint    count,
-                  double   fps)
-{
-  return g_strdup_printf ("%u Icons, %.2f fps", count, fps);
-}
 
 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
@@ -296,6 +258,11 @@ do_fishbowl (GtkWidget *do_widget)
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
       builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
+                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -308,7 +275,6 @@ do_fishbowl (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_widget_realize (window);
-      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/fishbowl.ui

@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
     <property name="title" translatable="yes">Fishbowl</property>
-    <property name="default-width">400</property>
-    <property name="default-height">400</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
         <property name="show-title-buttons">1</property>
@@ -15,33 +12,69 @@
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="fishbowl_prev_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="fishbowl_next_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
           </object>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkLabel">
-            <binding name="label">
-              <closure type="gchararray" function="format_header_cb">
-                <lookup name="count">bowl</lookup>
-                <lookup name="framerate">bowl</lookup>
-              </closure>
-            </binding>
+            <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>
+          <object class="GtkLabel">
+            <property name="label">Icons, </property>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label" bind-source="bowl" bind-property="count"/>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
+        </child>
+        <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>
-            <signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
           </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="changes_prevent">
+            <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>
@@ -49,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 | sync-create"/>
+        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">1</property>
       </object>
     </child>
   </object>

demos/gtk-demo/fixed.c

@@ -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;
-}

demos/gtk-demo/fixed.css

@@ -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);
-}

demos/gtk-demo/flowbox.c

@@ -4,8 +4,6 @@
  * as needed and support sorting and filtering.
  *
  * The children of a GtkFlowBox are regular widgets
- *
- * The dataset used here has 665 colors.
  */
 
 #include <gtk/gtk.h>

demos/gtk-demo/font-features.ui

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

demos/gtk-demo/font_features.c

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

demos/gtk-demo/fontplane.c

@@ -19,6 +19,8 @@
 
 #include "fontplane.h"
 
+#include "gtk.h"
+
 enum {
   PROP_0,
   PROP_WEIGHT_ADJUSTMENT,
@@ -207,6 +209,7 @@ gtk_font_plane_init (GtkFontPlane *plane)
 {
   GtkGesture *gesture;
 
+  gtk_widget_set_has_surface (GTK_WIDGET (plane), FALSE);
   gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
 
   gesture = gtk_gesture_drag_new ();

demos/gtk-demo/fontrendering.c

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

demos/gtk-demo/fontrendering.ui

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

demos/gtk-demo/foreigndrawing.c

@@ -829,6 +829,7 @@ draw_spinbutton (GtkWidget *widget,
   GtkStyleContext *down_context;
   GtkIconTheme *icon_theme;
   GtkIconInfo *icon_info;
+  GdkPixbuf *pixbuf;
   GdkTexture *texture;
   gint icon_width, icon_height, icon_size;
   gint button_width;
@@ -856,22 +857,26 @@ draw_spinbutton (GtkWidget *widget,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL));
+  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (up_context, cr, x + width - button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
   gtk_render_icon (up_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 
   gtk_style_context_get (down_context,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL));
+  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (down_context, cr, x + width - 2 * button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
   gtk_render_icon (down_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 
   g_object_unref (down_context);

demos/gtk-demo/geninclude.py

@@ -13,16 +13,17 @@ in_files = sys.argv[2:]
 file_output = """
 typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
 
-typedef struct _DemoData DemoData;
+typedef struct _Demo Demo;
 
-struct _DemoData
+struct _Demo
 {
-  char *name;
-  char *title;
-  char *filename;
+  gchar *name;
+  gchar *title;
+  gchar *filename;
   GDoDemoFunc func;
-  DemoData *children;
+  Demo *children;
 };
+
 """
 
 # Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
@@ -66,7 +67,7 @@ for demo in demos:
 i = 0
 for parent in parents:
     id = parent_ids[i]
-    file_output += "\nDemoData child" + str(id) + "[] = {\n"
+    file_output += "\nDemo child" + str(id) + "[] = {\n"
     # iterate over all demos and check if the name starts with the given parent name
     for child in demos:
         if child[1].startswith(parent + "/"):
@@ -81,7 +82,7 @@ for parent in parents:
 # Sort demos by title
 demos = sorted(demos, key=lambda x: x[1])
 
-file_output += "\nDemoData gtk_demos[] = {\n"
+file_output += "\nDemo gtk_demos[] = {\n"
 for demo in demos:
     # Do not generate one of these for demos with a parent demo
     if "/" not in demo[1]:

demos/gtk-demo/glarea.c

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

demos/gtk-demo/gtkfishbowl.c

@@ -66,6 +66,8 @@ gtk_fishbowl_init (GtkFishbowl *fishbowl)
 {
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
 
+  gtk_widget_set_has_surface (GTK_WIDGET (fishbowl), FALSE);
+
   priv->update_delay = G_USEC_PER_SEC;
 }
 
@@ -489,8 +491,6 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
 
   n_frames = end_counter - start_counter;
   priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
-  priv->framerate = ((int)(priv->framerate * 100))/100.0;
-
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
 
   if (!priv->benchmark)

demos/gtk-demo/hypertext.c

@@ -41,7 +41,6 @@ show_page (GtkTextBuffer *buffer,
 
   gtk_text_buffer_set_text (buffer, "", 0);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
-  gtk_text_buffer_begin_irreversible_action (buffer);
   if (page == 1)
     {
       gtk_text_buffer_insert (buffer, &iter, "Some text to show that simple ", -1);
@@ -74,7 +73,6 @@ show_page (GtkTextBuffer *buffer,
                               "so that related items of information are connected.\n", -1);
       insert_link (buffer, &iter, "Go back", 1);
     }
-  gtk_text_buffer_end_irreversible_action (buffer);
 }
 
 /* Looks at all tags covering the position of iter in the text view,
@@ -138,11 +136,11 @@ static void set_cursor_if_appropriate (GtkTextView *text_view,
                                        gint         y);
 
 static void
-released_cb (GtkGestureClick *gesture,
-             guint            n_press,
-             gdouble          x,
-             gdouble          y,
-             GtkWidget       *text_view)
+released_cb (GtkGestureMultiPress *gesture,
+             guint                 n_press,
+             gdouble               x,
+             gdouble               y,
+             GtkWidget            *text_view)
 {
   GtkTextIter start, end, iter;
   GtkTextBuffer *buffer;
@@ -249,7 +247,7 @@ do_hypertext (GtkWidget *do_widget)
       g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), view);
       gtk_widget_add_controller (view, controller);
 
-      controller = GTK_EVENT_CONTROLLER (gtk_gesture_click_new ());
+      controller = GTK_EVENT_CONTROLLER (gtk_gesture_multi_press_new ());
       g_signal_connect (controller, "released",
                         G_CALLBACK (released_cb), view);
       gtk_widget_add_controller (view, controller);
@@ -260,7 +258,6 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_add_controller (view, controller);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_enable_undo (buffer, TRUE);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),

demos/gtk-demo/iconscroll.c

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

demos/gtk-demo/iconscroll.ui

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

demos/gtk-demo/infobar.c

@@ -20,7 +20,7 @@ on_bar_response (GtkInfoBar *info_bar,
       return;
     }
 
-  window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (info_bar)));
+  window = gtk_widget_get_toplevel (GTK_WIDGET (info_bar));
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
@@ -68,7 +68,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -80,7 +80,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -94,7 +94,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -106,7 +106,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -119,7 +119,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 

demos/gtk-demo/language-names.c

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

demos/gtk-demo/links.c

@@ -25,7 +25,7 @@ activate_link (GtkWidget   *label,
       GtkWidget *dialog;
       GtkWidget *parent;
 
-      parent = GTK_WIDGET (gtk_widget_get_root (label));
+      parent = gtk_widget_get_toplevel (label);
       dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent),
                  GTK_DIALOG_DESTROY_WITH_PARENT,
                  GTK_MESSAGE_INFO,

demos/gtk-demo/listbox.c

@@ -8,7 +8,6 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
-#include "award.h"
 
 static GdkPixbuf *avatar_pixbuf_other;
 static GtkWidget *window = NULL;
@@ -235,9 +234,9 @@ reshare_clicked (GtkMessageRow *row,
 {
   GtkMessageRowPrivate *priv = row->priv;
 
-  award ("listbox-reshare");
   priv->message->n_reshares++;
   gtk_message_row_update (row);
+
 }
 
 static void
@@ -256,14 +255,11 @@ gtk_message_row_state_flags_changed (GtkWidget    *widget,
 {
   GtkMessageRowPrivate *priv = GTK_MESSAGE_ROW (widget)->priv;
   GtkStateFlags flags;
-  gboolean visible;
 
   flags = gtk_widget_get_state_flags (widget);
 
-  visible = flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED) ? TRUE : FALSE;
-  gtk_widget_set_visible (priv->extra_buttons_box, visible);
-  if (visible && gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (widget)) % 100 == 99)
-    award ("listbox-100th-row");
+  gtk_widget_set_visible (priv->extra_buttons_box,
+                          flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED));
 
   GTK_WIDGET_CLASS (gtk_message_row_parent_class)->state_flags_changed (widget, previous_state_flags);
 }

demos/gtk-demo/listbox.ui

@@ -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">
@@ -171,18 +170,22 @@
                   <object class="GtkMenuButton" id="more-button">
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="popup">menu1</property>
                     <property name="relief">none</property>
-                    <property name="label" translatable="yes">More...</property>
+                    <property name="popup">menu1</property>
+                    <child>
+                      <object class="GtkLabel" id="label7">
+                        <property name="label" translatable="yes">More...</property>
+                      </object>
+                    </child>
                   </object>
                 </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">
@@ -247,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>

demos/gtk-demo/listview_applauncher.c

@@ -1,200 +0,0 @@
-/* Lists/Application launcher
- *
- * This demo uses the GtkCoverFlow widget as a fancy application launcher.
- *
- * It is also a very small introduction to listviews.
- */
-
-#include <gtk/gtk.h>
-
-/* This is the function that creates the #GListModel that we need.
- * GTK list widgets need a #GListModel to display, as models support change
- * notifications.
- * Unfortunately various older APIs do not provide list models, so we create
- * our own.
- */
-static GListModel *
-create_application_list (void)
-{
-  GListStore *store;
-  GList *apps, *l;
-
-  /* We use a #GListStore here, which is a simple array-like list implementation
-   * for manual management.
-   * List models need to know what type of data they provide, so we need to
-   * provide the type here. As we want to do a list of applications, #GAppInfo
-   * is the object we provide.
-   */
-  store = g_list_store_new (G_TYPE_APP_INFO);
-
-  apps = g_app_info_get_all ();
-
-  for (l = apps; l; l = l->next)
-    {
-      g_list_store_append (store, l->data);
-    }
-
-  g_list_free_full (apps, g_object_unref);
-
-  return G_LIST_MODEL (store);
-}
-
-/* This is the function we use for setting up new listitems to display.
- * We add just a #GtkImage here to display the application's icon as this is just
- * a simple demo.
- */
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new ();
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-
-  gtk_list_item_set_child (list_item, image);
-}
-
-/* Here we need to prepare the listitem for displaying its item. We get the
- * listitem already set up from the previous function, so we can reuse the
- * #GtkImage widget we set up above.
- * We get the item - which we know is a #GAppInfo because it comes out of
- * the model we set up above, grab its icon and display it.
- */
-static void
-bind_listitem_cb (GtkListItemFactory *factory,
-                  GtkListItem        *list_item)
-{
-  GtkWidget *image;
-  GAppInfo *app_info;
-
-  image = gtk_list_item_get_child (list_item);
-  app_info = gtk_list_item_get_item (list_item);
-
-  gtk_image_set_from_gicon (GTK_IMAGE (image), g_app_info_get_icon (app_info));
-}
-
-/* In more complex code, we would also need functions to unbind and teardown
- * the listitem, but this is simple code, so the default implementations are
- * enough. If we had connected signals, this step would have been necessary.
- *
- * The #GtkSignalListItemFactory documentation contains more information about
- * this step.
- */
-
-/* This function is called whenever an item in the list is activated. This is
- * the simple way to allow reacting to the Enter key or double-clicking on a
- * listitem.
- * Of course, it is possible to use far more complex interactions by turning
- * off activation and adding buttons or other widgets in the setup function
- * above, but this is a simple demo, so we'll use the simple way.
- */
-static void
-activate_cb (GtkCoverFlow *coverflow,
-             guint         position,
-             gpointer      unused)
-{
-  GAppInfo *app_info;
-  GdkAppLaunchContext *context;
-  GError *error = NULL;
-
-  app_info = g_list_model_get_item (gtk_cover_flow_get_model (coverflow), position);
-
-  /* Prepare the context for launching the application and launch it. This
-   * code is explained in detail in the documentation for #GdkAppLaunchContext
-   * and #GAppInfo.
-   */
-  context = gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (coverflow)));
-  if (!g_app_info_launch (app_info,
-                          NULL, 
-                          G_APP_LAUNCH_CONTEXT (context),
-                          &error))
-    {
-      GtkWidget *dialog;
-
-      /* And because error handling is important, even a simple demo has it:
-       * We display an error dialog that something went wrong.
-       */
-      dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (coverflow))),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Could not launch %s", g_app_info_get_display_name (app_info));
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
-      g_clear_error (&error);
-      gtk_widget_show (dialog);
-    }
-
-  g_object_unref (context);
-  g_object_unref (app_info);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_applauncher (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *coverflow, *sw;;
-      GListModel *model;
-      GtkListItemFactory *factory;
-
-      /* Create a window and set a few defaults */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 640, 320);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Application Launcher");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK(gtk_widget_destroyed), &window);
-    
-      /* The #GtkListitemFactory is what is used to create #GtkListItems
-       * to display the data from the model. So it is absolutely necessary
-       * to create one.
-       * We will use a #GtkSignalListItemFactory because it is the simplest
-       * one to use. Different ones are available for different use cases.
-       * The most powerful one is #GtkBuilderListItemFactory which uses
-       * #GtkBuilder .ui files, so it requires little code.
-       */
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-      g_signal_connect (factory, "bind", G_CALLBACK (bind_listitem_cb), NULL);
-
-      /* Create the list widget here: We use a coverflow widget because it's
-       * the coolest one. We could just as well use other list widgets such
-       * as a #GtkListView or a #GtkGridView and the code would look very
-       * similar.
-       */
-      coverflow = gtk_cover_flow_new_with_factory (factory);
-      /* We connect the activate signal here. It's the function we defined
-       * above for launching the selected application.
-       */
-      g_signal_connect (coverflow, "activate", G_CALLBACK (activate_cb), NULL);
-
-      /* And of course we need to set the data model. Here we call the function
-       * we wrote above that gives us the list of applications. Then we set
-       * it on the coverflow list widget.
-       * The coverflow will now take items from the model and use the factory
-       * to create as many listitems as it needs to show itself to the user.
-       */
-      model = create_application_list ();
-      gtk_cover_flow_set_model (GTK_COVER_FLOW (coverflow), model);
-      g_object_unref (model);
-
-      /* List widgets should always be contained in a #GtkScrolledWindow,
-       * because otherwise they might get too large or they might not
-       * be scrollable.
-       */
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), coverflow);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_clocks.c

@@ -1,491 +0,0 @@
-/* Lists/Clocks
- *
- * This demo displays the time in different timezones.
- *
- * It is using a GtkGridView.
- *
- * The goal is to show how to set up expressions that track changes
- * in objects and make them update widgets. For that, we create a
- * GtkClock object that updates its time every second and then use
- * various ways to display that time.
- *
- * Typically, this will be done using GtkBuilder .ui files with the
- * help of the <binding> tag, but this demo shows the code that runs
- * behind that.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_CLOCK (gtk_clock_get_type ())
-G_DECLARE_FINAL_TYPE (GtkClock, gtk_clock, GTK, CLOCK, GObject)
-
-/* This is our object. It's just a timezone */
-typedef struct _GtkClock GtkClock;
-struct _GtkClock
-{
-  GObject parent_instance;
-
-  /* We allow this to be NULL for the local timezone */
-  GTimeZone *timezone;
-  /* Name of the location we're displaying time for */
-  char *location;
-};
-
-enum {
-  PROP_0,
-  PROP_LOCATION,
-  PROP_TIME,
-  PROP_TIMEZONE,
-
-  N_PROPS
-};
-
-/* This function returns the current time in the clock's timezone.
- * Note that this returns a new object every time, so we need to
- * remember to unref it after use. */
-static GDateTime *
-gtk_clock_get_time (GtkClock *clock)
-{
-  if (clock->timezone)
-    return g_date_time_new_now (clock->timezone);
-  else
-    return g_date_time_new_now_local ();
-}
-
-/* Here, we implement the functionality required by the GdkPaintable interface.
- * This way we have a trivial way to display an analog clock.
- * It also allows demonstrating how to directly use objects in the listview
- * later by making this object do something interesting. */
-static void
-gtk_clock_snapshot (GdkPaintable *paintable,
-                    GdkSnapshot  *snapshot,
-                    double        width,
-                    double        height)
-{
-  GtkClock *self = GTK_CLOCK (paintable);
-  GDateTime *time;
-  GskRoundedRect outline;
-
-#define BLACK ((GdkRGBA) { 0, 0, 0, 1 })
-
-  /* save/restore() is necessary so we can undo the transforms we start
-   * out with. */
-  gtk_snapshot_save (snapshot);
-
-  /* First, we move the (0, 0) point to the center of the area so
-   * we can draw everything relative to it. */
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2, height / 2));
-  /* Next we scale it, so that we can pretend that the clock is
-   * 100px in size. That way, we don't need to do any complicated
-   * math later.
-   * We use MIN() here so that we use the smaller dimension for sizing.
-   * That way we don't overdraw but keep the aspect ratio. */
-  gtk_snapshot_scale (snapshot, MIN (width, height) / 100.0, MIN (width, height) / 100.0);
-  /* Now we have a circle with diameter 100px (and radius 50px) that
-   * has its (0, 0) point at the center.
-   * Let's draw a simple clock into it. */
-
-  time = gtk_clock_get_time (self);
-
-  /* First, draw a circle. This is a neat little trick to draw a circle
-   * without requiring Cairo. */
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-50, -50, 100, 100), 50);
-  gtk_snapshot_append_border (snapshot,
-                              &outline,
-                              (float[4]) { 4, 4, 4, 4 },
-                              (GdkRGBA [4]) { BLACK, BLACK, BLACK, BLACK });
-
-  /* Next, draw the hour hand.
-   * We do this using tranforms again: Instead of computing where the angle points
-   * to, we just rotate everything and then draw the hand as if if was :00.
-   * We don't even need to care about am/pm here because rotations just work. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 30 * g_date_time_get_hour (time) + 0.5 * g_date_time_get_minute (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -23, 4, 25), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* And the same as above for the minute hand. Just make this one longer
-   * so people can tell the hands apart. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_minute (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 45), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* and finally, the second indicator. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_second (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 10), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* And finally, don't forget to restore the initial save() that we did for
-   * the initial transformations. */
-  gtk_snapshot_restore (snapshot);
-
-  g_date_time_unref (time);
-}
-
-/* Our desired size is 100px. That sounds okay for an analog clock */
-static int
-gtk_clock_get_intrinsic_width (GdkPaintable *paintable)
-{
-  return 100;
-}
-
-static int
-gtk_clock_get_intrinsic_height (GdkPaintable *paintable)
-{
-  return 100;
-}
-
-/* Initialize the paintable interface. This way we turn our clock objects
- * into objects that can be drawn.
- * There are more functions to this interface to define desired size,
- * but this is enough.
- */
-static void
-gtk_clock_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_clock_snapshot;
-  iface->get_intrinsic_width = gtk_clock_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_clock_get_intrinsic_height;
-}
-
-/* Finally, we define the type. The important part is adding the paintable
- * interface, so GTK knows that this object can indeed be drawm.
- */
-G_DEFINE_TYPE_WITH_CODE (GtkClock, gtk_clock, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_clock_paintable_init))
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_clock_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  switch (property_id)
-    {
-    case PROP_LOCATION:
-      g_value_set_string (value, self->location);
-      break;
-
-    case PROP_TIME:
-      g_value_take_boxed (value, gtk_clock_get_time (self));
-      break;
-
-    case PROP_TIMEZONE:
-      g_value_set_boxed (value, self->timezone);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_clock_set_property (GObject      *object,
-                        guint         property_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  switch (property_id)
-    {
-    case PROP_LOCATION:
-      self->location = g_value_dup_string (value);
-      break;
-
-    case PROP_TIMEZONE:
-      self->timezone = g_value_dup_boxed (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-/* This is the list of all the ticking clocks */
-static GSList *ticking_clocks = NULL;
-/* This is the id of the timeout source that is updating all ticking clocks */
-static guint ticking_clock_id = 0;
-
-/* Every second, this function is called to tell everybody that the
- * clocks are ticking.
- */
-static gboolean
-gtk_clock_tick (gpointer unused)
-{
-  GSList *l;
-
-  for (l = ticking_clocks; l; l = l->next)
-    {
-      GtkClock *clock = l->data;
-
-      /* We will now return a different value for the time porperty,
-       * so notify about that.
-       */
-      g_object_notify_by_pspec (G_OBJECT (clock), properties[PROP_TIME]);
-      /* We will also draw the hands of the clock differently.
-       * So notify about that, too.
-       */
-      gdk_paintable_invalidate_contents (GDK_PAINTABLE (clock));
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-gtk_clock_stop_ticking (GtkClock *self)
-{
-  ticking_clocks = g_slist_remove (ticking_clocks, self);
-
-  /* If no clock is remaining, stop running the tick updates */
-  if (ticking_clocks == NULL && ticking_clock_id != 0)
-    g_clear_handle_id (&ticking_clock_id, g_source_remove);
-}
-
-static void
-gtk_clock_start_ticking (GtkClock *self)
-{
-  /* if no clock is ticking yet, start */
-  if (ticking_clock_id == 0)
-    ticking_clock_id = g_timeout_add_seconds (1, gtk_clock_tick, NULL);
-
-  ticking_clocks = g_slist_prepend (ticking_clocks, self);
-}
-
-static void
-gtk_clock_finalize (GObject *object)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  gtk_clock_stop_ticking (self);
-
-  g_free (self->location);
-  g_clear_pointer (&self->timezone, g_time_zone_unref);
-
-  G_OBJECT_CLASS (gtk_clock_parent_class)->finalize (object);
-}
-
-static void
-gtk_clock_class_init (GtkClockClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_clock_get_property;
-  gobject_class->set_property = gtk_clock_set_property;
-  gobject_class->finalize = gtk_clock_finalize;
-
-  properties[PROP_LOCATION] =
-    g_param_spec_string ("location", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_TIME] =
-    g_param_spec_boxed ("time", NULL, NULL, G_TYPE_DATE_TIME, G_PARAM_READABLE);
-  properties[PROP_TIMEZONE] =
-    g_param_spec_boxed ("timezone", NULL, NULL, G_TYPE_TIME_ZONE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_clock_init (GtkClock *self)
-{
-  gtk_clock_start_ticking (self);
-}
-
-static GtkClock *
-gtk_clock_new (const char *location,
-               GTimeZone  *timezone)
-{
-  GtkClock *result;
-
-  result = g_object_new (GTK_TYPE_CLOCK,
-                         "location", location,
-                         "timezone", timezone,
-                         NULL);
-
-  g_clear_pointer (&timezone, g_time_zone_unref);
-
-  return result;
-}
-
-static GListModel *
-create_clocks_model (void)
-{
-  GListStore *result;
-  GtkClock *clock;
-
-  result = g_list_store_new (GTK_TYPE_CLOCK);
-
-  /* local time */
-  clock = gtk_clock_new ("local", NULL);
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  /* UTC time */
-  clock = gtk_clock_new ("UTC", g_time_zone_new_utc ());
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  /* A bunch of timezones with GTK hackers */
-  clock = gtk_clock_new ("San Francisco", g_time_zone_new ("America/Los_Angeles"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Boston", g_time_zone_new ("America/New_York"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("London", g_time_zone_new ("Europe/London"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Berlin", g_time_zone_new ("Europe/Berlin"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Moscow", g_time_zone_new ("Europe/Moscow"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("New Delhi", g_time_zone_new ("Asia/Kolkata"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Shanghai", g_time_zone_new ("Asia/Shanghai"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-
-  return G_LIST_MODEL (result);
-}
-
-static char *
-convert_time_to_string (GObject   *image,
-                        GDateTime *time,
-                        gpointer   unused)
-{
-  return g_date_time_format (time, "%x\n%X");
-}
-
-/* And this function is the crux for this whole demo.
- * It shows how to use expressions to set up bindings.
- */
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *box, *picture, *location_label, *time_label;
-  GtkExpression *clock_expression, *expression;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  /* First, we create an expression that gets us the clock from the listitem:
-   * 1. Create an expression that gets the list item.
-   * 2. Use that expression's "item" property to get the clock
-   */
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  clock_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  /* Bind the clock's location to a label.
-   * This is easy: We just get the "location" property of the clock.
-   */
-  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
-                                            gtk_expression_ref (clock_expression),
-                                            "location");
-  /* Now create the label and bind the expression to it. */
-  location_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, location_label, "label", location_label);
-  gtk_container_add (GTK_CONTAINER (box), location_label);
-
-
-  /* Here we bind the item itself to a GdkPicture.
-   * This is simply done by using the clock expression itself.
-   */
-  expression = gtk_expression_ref (clock_expression);
-  /* Now create the widget and bind the expression to it. */
-  picture = gtk_picture_new ();
-  gtk_expression_bind (expression, picture, "paintable", picture);
-  gtk_container_add (GTK_CONTAINER (box), picture);
-
-
-  /* And finally, everything comes together.
-   * We create a label for displaying the time as text.
-   * For that, we need to transform the "GDateTime" of the
-   * time property into a string so that the label can display it.
-   */
-  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
-                                            gtk_expression_ref (clock_expression),
-                                            "time");
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, (GtkExpression *[1]) { expression },
-                                            G_CALLBACK (convert_time_to_string),
-                                            NULL, NULL);
-  /* Now create the label and bind the expression to it. */
-  time_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, time_label, "label", time_label);
-  gtk_container_add (GTK_CONTAINER (box), time_label);
-
-  gtk_expression_unref (clock_expression);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_clocks (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *gridview, *sw;
-      GtkListItemFactory *factory;
-      GListModel *model;
-      GtkNoSelection *selection;
-
-      /* This is the normal window setup code every demo does */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Clocks");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      /* List widgets go into a scrolled window. Always. */
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-
-      /* Create the factory that creates the listitems. Because we
-       * used bindings above during setup, we only need to connect
-       * to the setup signal.
-       * The bindings take care of the bind step.
-       */
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-
-      gridview = gtk_grid_view_new_with_factory (factory);
-      gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-      gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-
-      model = create_clocks_model ();
-      selection = gtk_no_selection_new (model);
-      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
-      gtk_container_add (GTK_CONTAINER (sw), gridview);
-      g_object_unref (selection);
-      g_object_unref (model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_colors.c

@@ -1,593 +0,0 @@
-/* Lists/Colors
- *
- * This demo displays a named colors.
- *
- * It is using a GtkGridView, and shows
- * how to sort the data in various ways.
- *
- * The dataset used here has 9283 items.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_COLOR (gtk_color_get_type ())
-G_DECLARE_FINAL_TYPE (GtkColor, gtk_color, GTK, COLOR, GObject)
-
-/* This is our object. It's just a color */
-typedef struct _GtkColor GtkColor;
-struct _GtkColor
-{
-  GObject parent_instance;
-
-  char *name;
-  GdkRGBA *color;
-  int h, s, v;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_COLOR,
-  PROP_RED,
-  PROP_GREEN,
-  PROP_BLUE,
-  PROP_HUE,
-  PROP_SATURATION,
-  PROP_VALUE,
-
-  N_PROPS
-};
-
-static void
-gtk_color_snapshot (GdkPaintable *paintable,
-                    GdkSnapshot  *snapshot,
-                    double        width,
-                    double        height)
-{
-  GtkColor *self = GTK_COLOR (paintable);
-
-  gtk_snapshot_append_color (snapshot, self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
-}
-
-static int
-gtk_color_get_intrinsic_width (GdkPaintable *paintable)
-{
-  return 32;
-}
-
-static int
-gtk_color_get_intrinsic_height (GdkPaintable *paintable)
-{
-  return 32;
-}
-
-static void
-gtk_color_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_color_snapshot;
-  iface->get_intrinsic_width = gtk_color_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_color_get_intrinsic_height;
-}
-
-/*
- * Finally, we define the type. The important part is adding the paintable
- * interface, so GTK knows that this object can indeed be drawm.
- */
-G_DEFINE_TYPE_WITH_CODE (GtkColor, gtk_color, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_color_paintable_init))
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_color_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  switch (property_id)
-    {
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_COLOR:
-      g_value_set_boxed (value, self->color);
-      break;
-
-    case PROP_RED:
-      g_value_set_float (value, self->color->red);
-      break;
-
-    case PROP_GREEN:
-      g_value_set_float (value, self->color->green);
-      break;
-
-    case PROP_BLUE:
-      g_value_set_float (value, self->color->blue);
-      break;
-
-    case PROP_HUE:
-      g_value_set_int (value, self->h);
-      break;
-
-    case PROP_SATURATION:
-      g_value_set_int (value, self->s);
-      break;
-
-    case PROP_VALUE:
-      g_value_set_int (value, self->v);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_set_property (GObject      *object,
-                        guint         property_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  switch (property_id)
-    {
-    case PROP_NAME:
-      self->name = g_value_dup_string (value);
-      break;
-
-    case PROP_COLOR:
-      self->color = g_value_dup_boxed (value);
-      break;
-
-    case PROP_HUE:
-      self->h = g_value_get_int (value);
-      break;
-
-    case PROP_SATURATION:
-      self->s = g_value_get_int (value);
-      break;
-
-    case PROP_VALUE:
-      self->v = g_value_get_int (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_finalize (GObject *object)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  g_free (self->name);
-  g_clear_pointer (&self->color, gdk_rgba_free);
-
-  G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
-}
-
-static void
-gtk_color_class_init (GtkColorClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_color_get_property;
-  gobject_class->set_property = gtk_color_set_property;
-  gobject_class->finalize = gtk_color_finalize;
-
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_COLOR] =
-    g_param_spec_boxed ("color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_RED] =
-    g_param_spec_float ("red", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_GREEN] =
-    g_param_spec_float ("green", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_BLUE] =
-    g_param_spec_float ("blue", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_HUE] =
-    g_param_spec_int ("hue", NULL, NULL, 0, 360, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_SATURATION] =
-    g_param_spec_int ("saturation", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_VALUE] =
-    g_param_spec_int ("value", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_color_init (GtkColor *self)
-{
-}
-
-static GtkColor *
-gtk_color_new (const char *name,
-               float r, float g, float b,
-               int h, int s, int v)
-{
-  GtkColor *result;
-  GdkRGBA color = { r, g, b, 1.0 };
-
-  result = g_object_new (GTK_TYPE_COLOR,
-                         "name", name,
-                         "color", &color,
-                         "hue", h,
-                         "saturation", s,
-                         "value", v,
-                         NULL);
-
-  return result;
-}
-
-static GListModel *
-create_colors_model (void)
-{
-  GListStore *result;
-  GtkColor *color;
-  GBytes *data;
-  char **lines;
-  guint i;
-
-  result = g_list_store_new (GTK_TYPE_COLOR);
-  data = g_resources_lookup_data ("/listview_colors/color.names.txt", 0, NULL);
-  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-  for (i = 0; lines[i]; i++)
-    {
-      const char *name;
-      char **fields;
-      int red, green, blue;
-      int h, s, v;
-
-      if (lines[i][0] == '#' || lines[i][0] == '\0')
-        continue;
-
-      fields = g_strsplit (lines[i], " ", 0);
-      name = fields[1];
-      red = atoi (fields[3]);
-      green = atoi (fields[4]);
-      blue = atoi (fields[5]);
-      h = atoi (fields[9]);
-      s = atoi (fields[10]);
-      v = atoi (fields[11]);
- 
-      color = gtk_color_new (name, red / 255., green / 255., blue / 255., h, s, v);
-      g_list_store_append (result, color);
-      g_object_unref (color);
-
-      g_strfreev (fields);
-    }
-  g_strfreev (lines);
-
-  g_bytes_unref (data);
-
-  return G_LIST_MODEL (result);
-}
-
-static char *
-get_rgb_markup (gpointer this,
-                GtkColor *color)
-{
-  if (!color)
-    return NULL;
-
-  return g_strdup_printf ("<b>R:</b> %d <b>G:</b> %d <b>B:</b> %d",
-                          (int)(color->color->red * 255), 
-                          (int)(color->color->green * 255),
-                          (int)(color->color->blue * 255));
-}
-
-static char *
-get_hsv_markup (gpointer this,
-                GtkColor *color)
-{
-  if (!color)
-    return NULL;
-
-  return g_strdup_printf ("<b>H:</b> %d <b>S:</b> %d <b>V:</b> %d",
-                          color->h, 
-                          color->s,
-                          color->v);
-}
-
-static void
-setup_simple_listitem_cb (GtkListItemFactory *factory,
-                          GtkListItem        *list_item)
-{
-  GtkWidget *picture;
-  GtkExpression *color_expression, *expression;
-
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  picture = gtk_picture_new ();
-  gtk_widget_set_size_request (picture, 32, 32);
-  gtk_expression_bind (color_expression, picture, "paintable", NULL);
-
-  gtk_list_item_set_child (list_item, picture);
-}
-
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *box, *picture, *name_label, *rgb_label, *hsv_label;;
-  GtkExpression *color_expression, *expression;
-  GtkExpression *params[1];
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  expression = gtk_property_expression_new (GTK_TYPE_COLOR,
-                                            gtk_expression_ref (color_expression),
-                                            "name");
-  name_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, name_label, "label", NULL);
-  gtk_container_add (GTK_CONTAINER (box), name_label);
-
-  expression = gtk_expression_ref (color_expression);
-  picture = gtk_picture_new ();
-  gtk_expression_bind (expression, picture, "paintable", NULL);
-  gtk_container_add (GTK_CONTAINER (box), picture);
-
-  params[0] = gtk_expression_ref (color_expression);
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, params,
-                                            (GCallback)get_rgb_markup,
-                                            NULL, NULL);
-
-  rgb_label = gtk_label_new (NULL);
-  gtk_label_set_use_markup (GTK_LABEL (rgb_label), TRUE);
-  gtk_expression_bind (expression, rgb_label, "label", NULL);
-  gtk_container_add (GTK_CONTAINER (box), rgb_label);
-
-  params[0] = gtk_expression_ref (color_expression);
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, params,
-                                            (GCallback)get_hsv_markup,
-                                            NULL, NULL);
-
-  hsv_label = gtk_label_new (NULL);
-  gtk_label_set_use_markup (GTK_LABEL (hsv_label), TRUE);
-  gtk_expression_bind (expression, hsv_label, "label", NULL);
-  gtk_container_add (GTK_CONTAINER (box), hsv_label);
-
-  gtk_expression_unref (color_expression);
-}
-
-static void
-set_title (gpointer    item,
-           const char *title)
-{
-  g_object_set_data (G_OBJECT (item), "title", (gpointer)title);
-}
-
-static char *
-get_title (gpointer item)
-{
-  return g_strdup ((char *)g_object_get_data (G_OBJECT (item), "title"));
-}
-
-static gboolean
-set_item (GBinding *binding,
-          const GValue *from,
-          GValue *to,
-          gpointer data)
-{
-  GObject *source = g_binding_get_source (binding);
-  GListModel *model;
-  guint selected;
-  gpointer item;
-
-  selected = g_value_get_uint (from);
-
-  model = gtk_drop_down_get_model (GTK_DROP_DOWN (source));
-  item = g_list_model_get_item (model, selected);
-
-  g_value_set_object (to, item);
-
-  g_clear_object (&item);
-
-  return TRUE;
-}
-
-GtkWidget *
-create_color_grid (void)
-{
-  GtkWidget *gridview;
-  GtkListItemFactory *factory;
-  GListModel *model, *selection;
-
-  gridview = gtk_grid_view_new ();
-  gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-  gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
-  gtk_grid_view_set_factory (GTK_GRID_VIEW (gridview), factory);
-  g_object_unref (factory);
- 
-  gtk_grid_view_set_max_columns (GTK_GRID_VIEW (gridview), 24);
-  gtk_grid_view_set_enable_rubberband (GTK_GRID_VIEW (gridview), TRUE);
-
-  model = G_LIST_MODEL (gtk_sort_list_model_new (create_colors_model (), NULL));
-  selection = G_LIST_MODEL (gtk_multi_selection_new (model));
-  gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);
-
-  return gridview;
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_colors (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *header, *gridview, *sw, *box, *dropdown;
-      GtkListItemFactory *factory;
-      GListStore *factories;
-      GListModel *model;
-
-      GtkSorter *sorter;
-      GtkSorter *multi_sorter;
-      GListStore *sorters;
-      GtkExpression *expression;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Colors");
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-
-      gridview = create_color_grid ();
-      gtk_container_add (GTK_CONTAINER (sw), gridview);
-      model = gtk_grid_view_get_model (GTK_GRID_VIEW (gridview));
-      g_object_get (model, "model", &model, NULL);
-
-      sorters = g_list_store_new (GTK_TYPE_SORTER);
-
-      sorter = gtk_string_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "name"));
-      set_title (sorter, "Name");
-      g_list_store_append (sorters, sorter);
-      g_object_unref (sorter);
-
-      multi_sorter = gtk_multi_sorter_new ();
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "red"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Red");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "green"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Green");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "blue"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Blue");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      set_title (multi_sorter, "RGB");
-      g_list_store_append (sorters, multi_sorter);
-      g_object_unref (multi_sorter);
-
-      multi_sorter = gtk_multi_sorter_new ();
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "hue"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Hue");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "saturation"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Saturation");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "value"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Value");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      set_title (multi_sorter, "HSV");
-      g_list_store_append (sorters, multi_sorter);
-      g_object_unref (multi_sorter);
-
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Sort by:"));
-      gtk_container_add (GTK_CONTAINER (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                                NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (sorters));
-      g_object_unref (sorters);
-
-      g_object_bind_property_full (dropdown, "selected",
-                                   model, "sorter",
-                                   G_BINDING_SYNC_CREATE,
-                                   set_item, NULL,
-                                   NULL, NULL);
-
-      factories = g_list_store_new (GTK_TYPE_LIST_ITEM_FACTORY);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
-      set_title (factory, "Colors");
-      g_list_store_append (factories, factory);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-      set_title (factory, "Everything");
-      g_list_store_append (factories, factory);
-
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Show:"));
-      gtk_container_add (GTK_CONTAINER (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                                NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (factories));
-      g_object_unref (factories);
-
-      g_object_bind_property_full (dropdown, "selected",
-                                   gridview, "factory",
-                                   G_BINDING_SYNC_CREATE,
-                                   set_item, NULL,
-                                   NULL, NULL);
-      g_object_unref (model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_filebrowser.c

@@ -1,256 +0,0 @@
-/* Lists/File browser
- *
- * This demo shows off the different layouts that are quickly achievable
- * with GtkListview and GtkGridView by implementing a file browser with
- * different views.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* Create a simple object that holds the data for the different views */
-typedef struct _FileBrowserView FileBrowserView;
-struct _FileBrowserView
-{
-  GObject parent_instance;
-
-  GtkListItemFactory *factory;
-  char *icon_name;
-  GtkOrientation orientation;
-};
-
-enum {
-  PROP_0,
-  PROP_FACTORY,
-  PROP_ICON_NAME,
-  PROP_ORIENTATION,
-
-  N_PROPS
-};
-
-#define FILE_BROWSER_TYPE_VIEW (file_browser_view_get_type ())
-G_DECLARE_FINAL_TYPE (FileBrowserView, file_browser_view, FILE_BROWSER, VIEW, GObject);
-
-G_DEFINE_TYPE (FileBrowserView, file_browser_view, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-file_browser_view_get_property (GObject    *object,
-                                guint       property_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  switch (property_id)
-    {
-    case PROP_FACTORY:
-      g_value_set_object (value, self->factory);
-      break;
-
-    case PROP_ICON_NAME:
-      g_value_set_string (value, self->icon_name);
-      break;
-
-    case PROP_ORIENTATION:
-      g_value_set_enum (value, self->orientation);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-file_browser_view_set_property (GObject      *object,
-                                guint         prop_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  switch (prop_id)
-    {
-    case PROP_FACTORY:
-      g_set_object (&self->factory, g_value_get_object (value));
-      break;
-
-    case PROP_ICON_NAME:
-      g_free (self->icon_name);
-      self->icon_name = g_value_dup_string (value);
-      break;
-
-    case PROP_ORIENTATION:
-      self->orientation = g_value_get_enum (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-file_browser_view_finalize (GObject *object)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  g_object_unref (self->factory);
-  g_free (self->icon_name);
-
-  G_OBJECT_CLASS (file_browser_view_parent_class)->dispose (object);
-}
-
-static void
-file_browser_view_class_init (FileBrowserViewClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = file_browser_view_get_property;
-  gobject_class->set_property = file_browser_view_set_property;
-  gobject_class->finalize = file_browser_view_finalize;
-
-  properties[PROP_FACTORY] =
-    g_param_spec_object ("factory",
-                         "factory",
-                         "factory to use in the main view",
-                         GTK_TYPE_LIST_ITEM_FACTORY,
-                         G_PARAM_READWRITE);
-  properties[PROP_ICON_NAME] =
-    g_param_spec_string ("icon-name",
-                         "icon name",
-                         "icon to display for selecting this view",
-                         NULL,
-                         G_PARAM_READWRITE);
-  properties[PROP_ORIENTATION] =
-    g_param_spec_enum ("orientation",
-                       "orientation",
-                       "orientation of the view",
-                       GTK_TYPE_ORIENTATION,
-                       GTK_ORIENTATION_VERTICAL,
-                       G_PARAM_READWRITE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void file_browser_view_init (FileBrowserView *self)
-{
-}
-
-char *
-filebrowser_get_display_name (GObject *object,
-                              GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_strdup (g_file_info_get_attribute_string (info, "standard::display-name"));
-}
-
-char *
-filebrowser_get_content_type (GObject *object,
-                              GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_strdup (g_file_info_get_attribute_string (info, "standard::content-type"));
-}
-
-char *
-filebrowser_get_size (GObject *object,
-                      GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_format_size (g_file_info_get_attribute_uint64 (info, "standard::size"));
-}
-
-GIcon *
-filebrowser_get_icon (GObject *object,
-                      GFileInfo *info)
-{
-  GIcon *icon;
-
-  if (info)
-    icon = G_ICON (g_file_info_get_attribute_object (info, "standard::icon"));
-  else
-    icon = NULL;
-
-  if (icon)
-    g_object_ref (icon);
-
-  return icon;
-}
-
-void
-filebrowser_up_clicked_cb (GtkButton        *button,
-                           GtkDirectoryList *list)
-{
-  GFile *file;
-
-  file = g_file_get_parent (gtk_directory_list_get_file (list));
-  if (file == NULL)
-    return;
-
-  gtk_directory_list_set_file (list, file);
-}
-
-void
-filebrowser_view_activated_cb (GtkGridView      *view,
-                               guint             pos,
-                               GtkDirectoryList *list)
-{
-  GFileInfo *info;
-
-  info = g_list_model_get_item (gtk_grid_view_get_model (view), pos);
-  if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
-    gtk_directory_list_set_file (list, G_FILE (g_file_info_get_attribute_object (info, "standard::file")));
-
-  g_object_unref (info);
-}
-
-GtkWidget *
-do_listview_filebrowser (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkBuilder *builder;
-      GtkDirectoryList *dirlist;
-      GFile *file;
-      char *cwd;
-
-      builder = gtk_builder_new_from_resource ("/listview_filebrowser/listview_filebrowser.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      /* Create the model and fill it with the contents of the current directory */
-      cwd = g_get_current_dir ();
-      file = g_file_new_for_path (cwd);
-      g_free (cwd);
-      dirlist = GTK_DIRECTORY_LIST (gtk_builder_get_object (builder, "dirlist"));
-      gtk_directory_list_set_file (dirlist, file);
-      g_object_unref (file);
-
-      /* grab focus in the view */
-      view = GTK_WIDGET (gtk_builder_get_object (builder, "view"));
-      gtk_widget_grab_focus (view);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_filebrowser.ui

@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GListStore" id="viewlist">
-    <property name="item-type">FileBrowserView</property>
-    <child>
-      <object class="FileBrowserView">
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkImage">
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="halign">start</property>
-            <binding name="label">
-              <closure type="gchararray" function="filebrowser_get_display_name">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="icon-name">view-list-symbolic</property>
-        <property name="orientation">horizontal</property>
-      </object>
-    </child>
-    <child>
-      <object class="FileBrowserView">
-        <property name="icon-name">view-grid-symbolic</property>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkImage">
-            <property name="icon-size">large</property>
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="wrap">1</property>
-            <property name="wrap-mode">word-char</property>
-            <property name="lines">2</property>
-            <property name="ellipsize">end</property>
-            <property name="width-chars">10</property>
-            <property name="max-width-chars">30</property>
-            <binding name="label">
-              <closure type="gchararray" function="filebrowser_get_display_name">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="orientation">vertical</property>
-      </object>
-    </child>
-    <child>
-      <object class="FileBrowserView">
-        <property name="icon-name">view-paged-symbolic</property>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkImage">
-            <property name="icon-size">large</property>
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_display_name">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_size">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_content_type">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="orientation">horizontal</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkDirectoryList" id="dirlist">
-    <property name="attributes">standard::name,standard::display-name,standard::icon,standard::size,standard::content-type</property>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">File browser</property>
-    <property name="default-width">600</property>
-    <property name="default-height">400</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkButton">
-            <property name="icon-name">go-up</property>
-            <signal name="clicked" handler="filebrowser_up_clicked_cb" object="dirlist" swapped="no"/>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkListView">
-            <property name="valign">center</property>
-            <property name="orientation">horizontal</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <property name="model">
-              <object class="GtkSingleSelection" id="selected-view">
-                <property name="model">viewlist</property>
-              </object>
-            </property>
-            <property name="factory">
-              <object class="GtkBuilderListItemFactory">
-                <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkImage">
-        <binding name="icon-name">
-          <lookup type="FileBrowserView" name="icon-name">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                ]]></property>
-              </object>
-            </property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow">
-        <property name="can-focus">1</property>
-        <child>
-          <object class="GtkGridView" id="view">
-            <property name="model">dirlist</property>
-            <property name="max-columns">15</property>
-            <binding name="factory">
-              <lookup name="factory" type="FileBrowserView">
-                <lookup name="selected-item">selected-view</lookup>
-              </lookup>
-            </binding>
-            <binding name="orientation">
-              <lookup name="orientation" type="FileBrowserView">
-                <lookup name="selected-item">selected-view</lookup>
-              </lookup>
-            </binding>
-            <signal name="activate" handler="filebrowser_view_activated_cb" object="dirlist" swapped="no"/>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/listview_minesweeper.c

@@ -1,473 +0,0 @@
-/* Lists/Minesweeper
- *
- * This demo shows how to develop a user interface for small game using a
- * gridview.
- *
- * It demonstrates how to use the activate signal and single-press behavior
- * to implement rather different interaction behavior to a typical list.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-/*** The cell object ***/
-
-/* Create an object that holds the data for a cell in the game */
-typedef struct _SweeperCell SweeperCell;
-struct _SweeperCell
-{
-  GObject parent_instance;
-
-  gboolean is_mine;
-  gboolean is_visible;
-  guint neighbor_mines;
-};
-
-enum {
-  CELL_PROP_0,
-  CELL_PROP_LABEL,
-
-  N_CELL_PROPS
-};
-
-#define SWEEPER_TYPE_CELL (sweeper_cell_get_type ())
-G_DECLARE_FINAL_TYPE (SweeperCell, sweeper_cell, SWEEPER, CELL, GObject);
-
-G_DEFINE_TYPE (SweeperCell, sweeper_cell, G_TYPE_OBJECT);
-static GParamSpec *cell_properties[N_CELL_PROPS] = { NULL, };
-
-static const char *
-sweeper_cell_get_label (SweeperCell *self)
-{
-  static const char *minecount_labels[10] = { "", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-  if (!self->is_visible)
-    return "?";
-  
-  if (self->is_mine)
-    return "💣";
-
-  return minecount_labels[self->neighbor_mines];
-}
-
-static void
-sweeper_cell_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SweeperCell *self = SWEEPER_CELL (object);
-
-  switch (property_id)
-    {
-    case CELL_PROP_LABEL:
-      g_value_set_string (value, sweeper_cell_get_label (self));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-sweeper_cell_class_init (SweeperCellClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = sweeper_cell_get_property;
-
-  cell_properties[CELL_PROP_LABEL] =
-    g_param_spec_string ("label",
-                         "label",
-                         "label to display for this row",
-                         NULL,
-                         G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_CELL_PROPS, cell_properties);
-}
-
-static void
-sweeper_cell_init (SweeperCell *self)
-{
-}
-
-static void
-sweeper_cell_reveal (SweeperCell *self)
-{
-  if (self->is_visible)
-    return;
-
-  self->is_visible = TRUE;
-
-  g_object_notify_by_pspec (G_OBJECT (self), cell_properties[CELL_PROP_LABEL]);
-}
-
-static SweeperCell *
-sweeper_cell_new ()
-{
-  return g_object_new (SWEEPER_TYPE_CELL, NULL);
-}
-
-/*** The board object ***/
-
-/* Create an object that holds the data for the game */
-typedef struct _SweeperGame SweeperGame;
-struct _SweeperGame
-{
-  GObject parent_instance;
-
-  GPtrArray *cells;
-  guint width;
-  guint height;
-  gboolean playing;
-  gboolean win;
-};
-
-enum {
-  GAME_PROP_0,
-  GAME_PROP_HEIGHT,
-  GAME_PROP_PLAYING,
-  GAME_PROP_WIDTH,
-  GAME_PROP_WIN,
-
-  N_GAME_PROPS
-};
-
-#define SWEEPER_TYPE_GAME (sweeper_game_get_type ())
-G_DECLARE_FINAL_TYPE (SweeperGame, sweeper_game, SWEEPER, GAME, GObject);
-
-static GType
-sweeper_game_list_model_get_item_type (GListModel *model)
-{
-  return SWEEPER_TYPE_GAME;
-}
-
-static guint
-sweeper_game_list_model_get_n_items (GListModel *model)
-{
-  SweeperGame *self = SWEEPER_GAME (model);
-
-  return self->width * self->height;
-}
-
-static gpointer
-sweeper_game_list_model_get_item (GListModel *model,
-                                  guint       position)
-{
-  SweeperGame *self = SWEEPER_GAME (model);
-
-  return g_object_ref (g_ptr_array_index (self->cells, position));
-}
-
-static void
-sweeper_game_list_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = sweeper_game_list_model_get_item_type;
-  iface->get_n_items = sweeper_game_list_model_get_n_items;
-  iface->get_item = sweeper_game_list_model_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (SweeperGame, sweeper_game, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, sweeper_game_list_model_init))
-
-static GParamSpec *game_properties[N_GAME_PROPS] = { NULL, };
-
-static void
-sweeper_game_dispose (GObject *object)
-{
-  SweeperGame *self = SWEEPER_GAME (object);
-
-  g_clear_pointer (&self->cells, g_ptr_array_unref);
-
-  G_OBJECT_CLASS (sweeper_game_parent_class)->dispose (object);
-}
-
-static void
-sweeper_game_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SweeperGame *self = SWEEPER_GAME (object);
-
-  switch (property_id)
-    {
-    case GAME_PROP_HEIGHT:
-      g_value_set_uint (value, self->height);
-      break;
-
-    case GAME_PROP_PLAYING:
-      g_value_set_boolean (value, self->playing);
-      break;
-
-    case GAME_PROP_WIDTH:
-      g_value_set_uint (value, self->width);
-      break;
-
-    case GAME_PROP_WIN:
-      g_value_set_boolean (value, self->win);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-sweeper_game_class_init (SweeperGameClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = sweeper_game_dispose;
-  gobject_class->get_property = sweeper_game_get_property;
-
-  game_properties[GAME_PROP_HEIGHT] =
-    g_param_spec_uint ("height",
-                       "height",
-                       "height of the game grid",
-                       1, G_MAXUINT, 8,
-                       G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_PLAYING] =
-    g_param_spec_boolean ("playing",
-                          "playing",
-                          "if the game is still going on",
-                          FALSE,
-                          G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_WIDTH] =
-    g_param_spec_uint ("width",
-                       "width",
-                       "width of the game grid",
-                       1, G_MAXUINT, 8,
-                       G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_WIN] =
-    g_param_spec_boolean ("win",
-                          "win",
-                          "if the game was won",
-                          FALSE,
-                          G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_GAME_PROPS, game_properties);
-}
-
-static void
-sweeper_game_reset_board (SweeperGame *self,
-                          guint        width,
-                          guint        height)
-{
-  guint i;
-
-  g_ptr_array_set_size (self->cells, 0);
-
-  for (i = 0; i < width * height; i++)
-    {
-      g_ptr_array_add (self->cells, sweeper_cell_new ());
-    }
-
-  if (self->width != width)
-    {
-      self->width = width;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIDTH]);
-    }
-  if (self->height != height)
-    {
-      self->height = height;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_HEIGHT]);
-    }
-  if (!self->playing)
-    {
-      self->playing = TRUE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
-    }
-  if (self->win)
-    {
-      self->win = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
-    }
-}
-
-static void
-sweeper_game_place_mines (SweeperGame *self,
-                          guint        n_mines)
-{
-  guint i;
-
-  for (i = 0; i < n_mines; i++)
-    {
-      SweeperCell *cell;
-
-      do {
-        cell = g_ptr_array_index (self->cells, g_random_int_range (0, self->cells->len));
-      } while (cell->is_mine);
-
-      cell->is_mine = TRUE;
-    }
-}
-
-static SweeperCell *
-get_cell (SweeperGame *self,
-          guint        x,
-          guint        y)
-{
-  return g_ptr_array_index (self->cells, y * self->width + x);
-}
-
-static void
-sweeper_game_count_neighbor_mines (SweeperGame *self,
-                                   guint        width,
-                                   guint        height)
-{
-  guint x, y, x2, y2;
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          SweeperCell *cell = get_cell (self, x, y);
-
-          for (y2 = MAX (1, y) - 1; y2 < MIN (height, y + 2); y2++)
-            {
-              for (x2 = MAX (1, x) - 1; x2 < MIN (width, x + 2); x2++)
-                {
-                  SweeperCell *other = get_cell (self, x2, y2);
-
-                  if (other->is_mine)
-                    cell->neighbor_mines++;
-                }
-            }
-        }
-    }
-}
-
-static void
-sweeper_game_new_game (SweeperGame *self,
-                       guint        width,
-                       guint        height,
-                       guint        n_mines)
-{
-  guint n_items_before;
-
-  g_return_if_fail (n_mines <= width * height);
-
-  n_items_before = self->width * self->height;
-
-  g_object_freeze_notify (G_OBJECT (self));
-
-  sweeper_game_reset_board (self, width, height);
-  sweeper_game_place_mines (self, n_mines);
-  sweeper_game_count_neighbor_mines (self, width, height);
-
-  g_list_model_items_changed (G_LIST_MODEL (self), 0, n_items_before, width * height);
-
-  g_object_thaw_notify (G_OBJECT (self));
-}
-
-static void
-sweeper_game_init (SweeperGame *self)
-{
-  self->cells = g_ptr_array_new_with_free_func (g_object_unref);
-
-  sweeper_game_new_game (self, 8, 8, 10);
-}
-
-static void
-sweeper_game_end (SweeperGame *self,
-                  gboolean     win)
-{
-  if (self->playing)
-    {
-      self->playing = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
-    }
-  if (self->win != win)
-    {
-      self->win = win;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
-    }
-}
-
-static void
-sweeper_game_check_finished (SweeperGame *self)
-{
-  guint i;
-
-  if (!self->playing)
-    return;
-
-  for (i = 0; i < self->cells->len; i++)
-    {
-      SweeperCell *cell = g_ptr_array_index (self->cells, i);
-
-      /* There's still a non-revealed cell that isn't a mine */
-      if (!cell->is_visible && !cell->is_mine)
-        return;
-    }
-
-  sweeper_game_end (self, TRUE);
-}
-
-static void
-sweeper_game_reveal_cell (SweeperGame *self,
-                          guint        position)
-{
-  SweeperCell *cell;
-
-  if (!self->playing)
-    return;
-
-  cell = g_ptr_array_index (self->cells, position);
-  sweeper_cell_reveal (cell);
-
-  if (cell->is_mine)
-    sweeper_game_end (self, FALSE);
-
-  sweeper_game_check_finished (self);
-}
-
-void
-minesweeper_cell_clicked_cb (GtkGridView *gridview,
-                             guint        pos,
-                             SweeperGame *game)
-{
-  sweeper_game_reveal_cell (game, pos);
-}
-
-void
-minesweeper_new_game_cb (GtkButton   *button,
-                         SweeperGame *game)
-{
-  sweeper_game_new_game (game, 8, 8, 10);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_minesweeper (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (SWEEPER_TYPE_GAME);
-
-      builder = gtk_builder_new_from_resource ("/listview_minesweeper/listview_minesweeper.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_minesweeper.ui

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="SweeperGame" id="game">
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Minesweeper</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkButton">
-            <property name="label">New Game</property>
-            <signal name="clicked" handler="minesweeper_new_game_cb" object="game" swapped="no"/>
-          </object>
-        </child>
-        <child type="title">
-          <object class="GtkImage">
-            <property name="icon-name">trophy-gold</property>
-            <binding name="visible">
-              <lookup name="win">game</lookup>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkGridView" id="view">
-        <property name="model">
-          <object class="GtkNoSelection">
-            <property name="model">game</property>
-          </object>
-        </property>
-        <binding name="max-columns">
-          <lookup name="width">game</lookup>
-        </binding>
-        <binding name="min-columns">
-          <lookup name="width">game</lookup>
-        </binding>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="resource">/listview_minesweeper/listview_minesweeper_cell.ui</property>
-          </object>
-        </property>
-        <signal name="activate" handler="minesweeper_cell_clicked_cb" object="game" swapped="no"/>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/listview_minesweeper_cell.ui

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="halign">center</property>
-        <property name="valign">center</property>
-        <binding name="label">
-          <lookup name="label" type="SweeperCell">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>

demos/gtk-demo/listview_settings.c

@@ -1,398 +0,0 @@
-/* Lists/Settings
- *
- * This demo shows a settings viewer for GSettings.
- *
- * It demonstrates how to implement support for trees with GtkListView.
- *
- * It also shows how to set up sorting for columns in a GtkColumnView.
- */
-
-#include <gtk/gtk.h>
-
-/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
-typedef struct _SettingsKey SettingsKey;
-struct _SettingsKey
-{
-  GObject parent_instance;
-
-  GSettings *settings;
-  GSettingsSchemaKey *key;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_SUMMARY,
-  PROP_DESCRIPTION,
-  PROP_VALUE,
-
-  N_PROPS
-};
-
-#define SETTINGS_TYPE_KEY (settings_key_get_type ())
-G_DECLARE_FINAL_TYPE (SettingsKey, settings_key, SETTINGS, KEY, GObject);
-
-G_DEFINE_TYPE (SettingsKey, settings_key, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-settings_key_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  switch (property_id)
-    {
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, g_settings_schema_key_get_description (self->key));
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, g_settings_schema_key_get_name (self->key));
-      break;
-
-    case PROP_SUMMARY:
-      g_value_set_string (value, g_settings_schema_key_get_summary (self->key));
-      break;
-
-    case PROP_VALUE:
-      {
-        GVariant *variant = g_settings_get_value (self->settings, g_settings_schema_key_get_name (self->key));
-        g_value_take_string (value, g_variant_print (variant, FALSE));
-        g_variant_unref (variant);
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-settings_key_finalize (GObject *object)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  g_object_unref (self->settings);
-  g_settings_schema_key_unref (self->key);
-
-  G_OBJECT_CLASS (settings_key_parent_class)->finalize (object);
-}
-
-static void
-settings_key_class_init (SettingsKeyClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = settings_key_finalize;
-  gobject_class->get_property = settings_key_get_property;
-
-  properties[PROP_DESCRIPTION] =
-    g_param_spec_string ("description", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_SUMMARY] =
-    g_param_spec_string ("summary", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_VALUE] =
-    g_param_spec_string ("value", NULL, NULL, NULL, G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-settings_key_init (SettingsKey *self)
-{
-}
-
-static SettingsKey *
-settings_key_new (GSettings          *settings,
-                  GSettingsSchemaKey *key)
-{
-  SettingsKey *result = g_object_new (SETTINGS_TYPE_KEY, NULL);
-
-  result->settings = g_object_ref (settings);
-  result->key = g_settings_schema_key_ref (key);
-
-  return result;
-}
-
-static int
-strvcmp (gconstpointer p1,
-         gconstpointer p2)
-{
-  const char * const *s1 = p1;
-  const char * const *s2 = p2;
-
-  return strcmp (*s1, *s2);
-}
-
-static GtkFilter *current_filter;
-
-static gboolean
-transform_settings_to_keys (GBinding     *binding,
-                            const GValue *from_value,
-                            GValue       *to_value,
-                            gpointer      data)
-{
-  GtkTreeListRow *treelistrow;
-  GSettings *settings;
-  GSettingsSchema *schema;
-  GListStore *store;
-  GtkSortListModel *sort_model;
-  GtkFilterListModel *filter_model;
-  GtkFilter *filter;
-  GtkExpression *expression;
-  char **keys;
-  guint i;
-
-  treelistrow = g_value_get_object (from_value);
-  if (treelistrow == NULL)
-    return TRUE;
-  settings = gtk_tree_list_row_get_item (treelistrow);
-  g_object_get (settings, "settings-schema", &schema, NULL);
-
-  store = g_list_store_new (SETTINGS_TYPE_KEY);
-
-  keys = g_settings_schema_list_keys (schema);
-
-  for (i = 0; keys[i] != NULL; i++)
-    {
-      GSettingsSchemaKey *almost_there = g_settings_schema_get_key (schema, keys[i]);
-      SettingsKey *finally = settings_key_new (settings, almost_there);
-      g_list_store_append (store, finally);
-      g_object_unref (finally);
-      g_settings_schema_key_unref (almost_there);
-    }
-
-  g_strfreev (keys);
-  g_settings_schema_unref (schema);
-  g_object_unref (settings);
-
-  sort_model = gtk_sort_list_model_new (G_LIST_MODEL (store),
-                                        gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
-  g_object_unref (store);
-  expression = gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name");
-  filter = gtk_string_filter_new ();
-  gtk_string_filter_set_expression (GTK_STRING_FILTER (filter), expression);
-  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  gtk_expression_unref (expression);
-  g_object_unref (sort_model);
-
-  g_set_object (&current_filter, filter);
-
-  g_object_unref (filter);
-
-  g_value_take_object (to_value, filter_model);
-
-  return TRUE;
-}
-
-static GListModel *
-create_settings_model (gpointer item,
-                       gpointer unused)
-{
-  GSettings *settings = item;
-  char **schemas;
-  GListStore *result;
-  guint i;
-
-  if (settings == NULL)
-    {
-      g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (),
-                                             TRUE,
-                                             &schemas,
-                                             NULL);
-    }
-  else
-    {
-      schemas = g_settings_list_children (settings);
-    }
-
-  if (schemas == NULL || schemas[0] == NULL)
-    {
-      g_free (schemas);
-      return NULL;
-    }
-
-  qsort (schemas, g_strv_length (schemas), sizeof (char *), strvcmp);
-
-  result = g_list_store_new (G_TYPE_SETTINGS);
-  for (i = 0;  schemas[i] != NULL; i++)
-    {
-      GSettings *child;
-
-      if (settings == NULL)
-        child = g_settings_new (schemas[i]);
-      else
-        child = g_settings_get_child (settings, schemas[i]);
-
-      g_list_store_append (result, child);
-      g_object_unref (child);
-    }
-
-  g_strfreev (schemas);
-
-  return G_LIST_MODEL (result);
-}
-
-static void
-search_enabled (GtkSearchEntry *entry)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-}
-
-static void
-search_changed (GtkSearchEntry *entry,
-                gpointer data)
-{
-  const char *text = gtk_editable_get_text (GTK_EDITABLE (entry));
-
-  if (current_filter)
-    gtk_string_filter_set_search (GTK_STRING_FILTER (current_filter), text);
-}
-
-static void
-stop_search (GtkSearchEntry *entry,
-             gpointer data)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-
-  if (current_filter)
-    gtk_string_filter_set_search (GTK_STRING_FILTER (current_filter), "");
-}
-
-static void
-move_column (GtkListView *columns_list, gboolean down)
-{
-  GListModel *columns;
-  guint position;
-  GtkColumnViewColumn *selected;
-  GtkColumnView *view;
-
-  columns = gtk_list_view_get_model (columns_list);
-  position = gtk_single_selection_get_selected (GTK_SINGLE_SELECTION (columns));
-  selected = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (columns));
-  view = gtk_column_view_column_get_column_view (selected);
- 
-  if (down && position + 1 < g_list_model_get_n_items (columns))
-    position++;
-  else if (!down && position > 0)
-    position--;
-  else
-    return;
-
-  gtk_column_view_insert_column (view, position, selected);
-  gtk_single_selection_set_selected (GTK_SINGLE_SELECTION (columns), position);
-}
-
-static void
-move_column_down (GtkListView *columns_list)
-{
-  move_column (columns_list, TRUE);
-}
-
-static void
-move_column_up (GtkListView *columns_list)
-{
-  move_column (columns_list, FALSE);
-}
-
-static void
-column_visible_toggled (GtkListItem *item, GtkToggleButton *button)
-{
-  GtkColumnViewColumn *column = gtk_list_item_get_item (item);
-
-  gtk_column_view_column_set_visible (column, gtk_toggle_button_get_active (button));
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_settings (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *listview, *columnview;
-      GListModel *model;
-      GtkTreeListModel *treemodel;
-      GtkSingleSelection *selection;
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GtkColumnViewColumn *name_column;
-      GtkSorter *sorter;
-      GtkWidget *menubutton, *popover;
-      GtkWidget *columns_list;
-
-      g_type_ensure (SETTINGS_TYPE_KEY);
-
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_enabled", (GCallback)search_enabled);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_changed", (GCallback)search_changed);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "stop_search", (GCallback)stop_search);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "move_column_down", (GCallback)move_column_down);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "move_column_up", (GCallback)move_column_up);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "column_visible_toggled", (GCallback)column_visible_toggled);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      {
-        g_autoptr(GError) error = NULL;
-      gtk_builder_add_from_resource (builder, "/listview_settings/listview_settings.ui", &error);
-      if (error)
-        g_warning ("%s", error->message);
-      }
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      listview = GTK_WIDGET (gtk_builder_get_object (builder, "listview"));
-      columnview = GTK_WIDGET (gtk_builder_get_object (builder, "columnview"));
-      model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (FALSE,
-                                           model,
-                                           TRUE,
-                                           create_settings_model,
-                                           NULL,
-                                           NULL);
-      selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
-      g_object_bind_property_full (selection, "selected-item",
-                                   columnview, "model",
-                                   G_BINDING_SYNC_CREATE,
-                                   transform_settings_to_keys,
-                                   NULL,
-                                   columnview, NULL);
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
-      g_object_unref (selection);
-      g_object_unref (treemodel);
-      g_object_unref (model);
-
-      name_column = GTK_COLUMN_VIEW_COLUMN (gtk_builder_get_object (builder, "name_column"));
-      sorter = gtk_string_sorter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
-      gtk_column_view_column_set_sorter (name_column, sorter);
-      g_object_unref (sorter);
-
-      menubutton = GTK_WIDGET (gtk_builder_get_object (builder, "menubutton"));
-      popover = GTK_WIDGET (gtk_builder_get_object (builder, "column_popover"));
-      gtk_menu_button_set_popover (GTK_MENU_BUTTON (menubutton), popover);
-
-      columns_list = GTK_WIDGET (gtk_builder_get_object (builder, "columns_list"));
-      model = G_LIST_MODEL (gtk_single_selection_new (gtk_column_view_get_columns (GTK_COLUMN_VIEW (columnview))));
-      gtk_list_view_set_model (GTK_LIST_VIEW (columns_list), model);
-      g_object_unref (model);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}