Add support for entering emoji by name

This commit adds some basic support for entering emoji by name
to GtkIMContextSimple. We respect the input-purpose property and
only support emoji in free-form fields.

To begin an emoji sequence, use Ctrl-Shift-e instead of Ctrl-Shift-u
that is used for hex input. Otherwise, the behavior is the same:
you can can let go of the modifier keys and end the sequence with
space or enter, or hold on to the modifier keys and end the sequence
by releasing them.

Only a limited, fixed set of names is supported:
:-)
8-)
<3
kiss
grin
joy
:-*
xD
like
dislike
up
v
ok
B-)
;-)
;-P
:-p
3(
:-(
;]
:'(
:_(
:((
:o
:|
3-)
>(
>((
O:)
;o
8|
8o
:X
}:)

.gitignore

@@ -1 +0,0 @@
-/subprojects/*/

.gitlab-ci.yml

@@ -1,82 +0,0 @@
-stages:
-  - build
-  - flatpak
-  - deploy
-
-.cache-paths: &cache-paths
-  paths:
-    - _ccache/
-    - subprojects/gdk-pixbuf/
-    - subprojects/glib/
-    - subprojects/graphene/
-    - subprojects/libepoxy/
-    - subprojects/pango/
-
-fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
-  stage: build
-  script:
-    - bash -x ./.gitlab-ci/test-docker.sh
-  artifacts:
-    when: on_failure
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
-
-.mingw-defaults: &mingw-defaults
-  stage: build
-  tags:
-    - win32
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
-  cache:
-    key: "%CI_JOB_NAME%"
-    <<: *cache-paths
-
-msys2-mingw32:
-  variables:
-    MSYSTEM: "MINGW32"
-    CHERE_INVOKING: "yes"
-  <<: *mingw-defaults
-
-.flatpak-defaults: &flatpak-defaults
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-  stage: flatpak
-  artifacts:
-    paths:
-      - "${APPID}-dev.flatpak"
-    expire_in: 1 day
-  script:
-    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
-
-flatpak:demo:
-  variables:
-    APPID: org.gtk.Demo
-  <<: *flatpak-defaults
-
-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

.gitlab-ci/Dockerfile

@@ -1,82 +0,0 @@
-FROM fedora:29
-
-RUN dnf -y install \
-    hicolor-icon-theme \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    colord-devel \
-    cups-devel \
-    desktop-file-utils \
-    elfutils-libelf-devel \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    git \
-    glib2-devel \
-    glibc-devel \
-    glibc-headers \
-    gobject-introspection-devel \
-    graphene-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    gtk-doc \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    lcov \
-    libattr-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libmount-devel \
-    librsvg2 \
-    libselinux-devel \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    libxslt \
-    mesa-dri-drivers \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    python3 \
-    python3-pip \
-    python3-wheel \
-    redhat-rpm-config \
-    sassc \
-    systemtap-sdt-devel \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    which \
-    xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson==0.49.0
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-
-USER user
-WORKDIR /home/user
-
-ENV LANG C.UTF-8

.gitlab-ci/flatpak-build.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-
-appid=$1
-
-builddir=app
-repodir=repo
-
-flatpak-builder \
-        --stop-at=gtk \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        meson \
-                --prefix /app \
-                --libdir /app/lib \
-                --buildtype debug \
-                -Dx11-backend=true \
-                -Dwayland-backend=true \
-                -Dprint-backends=file \
-                -Dbuild-tests=false \
-                -Dbuild-examples=false \
-                -Dintrospection=false \
-                -Ddemos=true \
-                _build .
-
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        ninja -C _build install
-
-flatpak-builder \
-        --finish-only \
-        --repo=${repodir} \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak build-bundle \
-        ${repodir} \
-        ${appid}-dev.flatpak \
-        --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \
-        ${appid}

.gitlab-ci/run-docker.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2"
-
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
-    --file "Dockerfile" .
-sudo docker run --rm --security-opt label=disable \
-    --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash

.gitlab-ci/test-docker.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-srcdir=$(pwd)
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-        -Dx11-backend=true \
-        -Dwayland-backend=true \
-        -Dbroadway-backend=true \
-        -Dvulkan=yes \
-        _build $srcdir
-unset CCACHE_DISABLE
-
-cd _build
-
-ninja
-ccache --show-stats
-
-xvfb-run -a -s "-screen 0 1024x768x24" \
-    meson test \
-        --print-errorlogs \
-        --suite=gtk+ \
-        --no-suite=gtk+:gsk \
-        --no-suite=gtk+:a11y

.gitlab-ci/test-msys2.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$MSYSTEM" == "MINGW32" ]]; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
-# Update everything
-pacman --noconfirm -Suy
-
-# Install the required packages
-pacman --noconfirm -S --needed \
-    base-devel \
-    git \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkg-config \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection \
-    mingw-w64-$MSYS2_ARCH-meson \
-    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
-    mingw-w64-$MSYS2_ARCH-atk \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \
-    mingw-w64-$MSYS2_ARCH-glib2 \
-    mingw-w64-$MSYS2_ARCH-graphene \
-    mingw-w64-$MSYS2_ARCH-json-glib \
-    mingw-w64-$MSYS2_ARCH-libepoxy \
-    mingw-w64-$MSYS2_ARCH-pango \
-    mingw-w64-$MSYS2_ARCH-fribidi \
-    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-# Build
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-    -Denable-x11-backend=false \
-    -Denable-wayland-backend=false \
-    -Denable-win32-backend=true \
-    -Dvulkan=no \
-    _build
-unset CCACHE_DISABLE
-
-ninja -C _build
-ccache --show-stats

.gitlab/issue_templates/Bug.md

@@ -1,36 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  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 that
-  exhibits the issue.
--->
-
-## Current behavior
-<!--
-  Please describe the current behaviour
--->
-
-## Expected outcome
-<!--
-  Please describe the expected outcome
--->
-
-## Version information
-<!--
- - 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
--->
-
-## Additional information
-<!--
- - Screenshots or screen recordings are useful for visual errors
- - Please report any warning or message printed on the terminal
--->

.gitlab/issue_templates/Crash.md

@@ -1,34 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  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 that
-  exhibits the issue.
--->
-
-## Version information
-<!--
- - 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
--->
-
-## Warnings
-<!--
- - If the application generates warning messages before crashing please
-   report them here
--->
-
-## Backtrace
-<!--
- - Attaching a stack trace obtained using GDB is appreciated; follow the
-   instructions on the wiki:
-
-   https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
--->

CONTRIBUTING.md

@@ -1,65 +0,0 @@
-If you want to hack on the GTK+ project, you'll need to have the development
-tools appropriate for your operating system, including:
-
- - Python 3.x
- - Meson
- - Ninja
- - Gettext (19.7 or newer)
- - a C99 compatible compiler
-
-Up-to-date instructions about developing GNOME applications and libraries
-can be found here:
-
- * https://developer.gnome.org
-
-Information about using GitLab with GNOME can be found here:
-
- * https://wiki.gnome.org/GitLab
-
-In order to get Git GTK+ installed on your system, you need to have the
-required versions of all the GTK+ dependencies; typically, this means a
-recent version of GLib, Cairo, Pango, and ATK, as well as the platform
-specific dependencies for the windowing system you are using (Wayland, X11,
-Windows, or macOS).
-
-You should start by forking the GTK repository from the GitLab web UI, and
-cloning from your fork:
-
-```ssh
-$ git clone https://gitlab.gnome.org/yourusername/gtk.git
-$ cd gtk
-```
-
-**Note**: if you plan to push changes to back to the main repository and
-have a GNOME account, you can skip the fork, and use the following instead:
-
-```sh
-$ git clone git@gitlab.gnome.org:GNOME/gtk.git
-$ cd gtk
-```
-
-To compile the Git version of GTK+ on your system, you will need to
-configure your build using Meson:
-
-```sh
-$ meson _builddir .
-$ cd _builddir
-$ ninja
-```
-
-**Note**: For information about submitting patches and pushing changes
-to Git, see the [README.md](./README.md) and [README.commits.md](./README.commits.md) files. In particular,
-don't, under any circumstances, push anything to Git before reading and
-understanding [README.commits.md](./README.commits.md).
-
-Typically, you should work on your own branch:
-
-```sh
-$ git checkout -b your-branch
-```
-
-Once you've finished working on the bug fix or feature, push the branch
-to the Git repository and open a new merge request, to let the GTK
-maintainers review your contribution. The [CODE-OWNERS](./docs/CODE-OWNERS)
-document contains the list of core contributors to GTK and the areas for
-which they are responsible.

HACKING

@@ -0,0 +1,64 @@
+If you want to hack on the GTK+ project, you'll need to have
+the following packages installed:
+
+        - GNU autoconf 2.62
+        - GNU automake 1.11
+        - GNU libtool 2.2
+        - indent (GNU indent 1.9.1 is known good)
+        - GNU gettext 10.40
+
+These should be available by ftp from ftp.gnu.org or any of the
+fine GNU mirrors.  Beta software can be found at alpha.gnu.org.
+
+Up-to-date instructions about developing GNOME applications and libraries
+can be found here:
+
+        http://library.gnome.org/devel/
+
+Information about using git with GNOME can be found here:
+
+        https://wiki.gnome.org/Git
+
+In order to get GIT GTK+ installed on your system, you need to have
+the most recent GIT versions of GLib, Pango, and ATK installed as well.
+The installation process of these libraries is similar to that of GTK+,
+but needs to be fulfilled prior to installation of GTK+.
+
+If at all possible, please use GIT to get the latest development version of
+gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
+
+        $ git clone git://git.gnome.org/glib
+        $ git clone git://git.gnome.org/pango
+        $ git clone git://git.gnome.org/atk
+        $ git clone git://git.gnome.org/gtk+
+
+Note: if you plan to push changes to back to the master repository and
+have a gnome account, you want to use the following instead:
+
+        $ git clone ssh://<username>@git.gnome.org/git/gtk+
+
+To compile the GIT version of GTK+ on your system, you will need to take
+several steps to setup the tree for compilation.  You can do all these
+steps at once by running:
+
+        gtk+$ ./autogen.sh
+
+Basically this does the following for you:
+
+        gtk+$ aclocal; automake; autoconf
+
+The above commands create the `configure' script.  Now you
+run the `configure' script in `gtk+/' to create all Makefiles.
+More information about that in `INSTALL'.
+
+Before running `autogen.sh' or `configure', make sure you have libtool
+in your path.
+
+Note that autogen.sh runs configure for you.  If you wish to pass
+options like `--prefix=/usr' to `configure' you can give those options
+to `autogen.sh' and they will be passed on to `configure'.
+
+For information about submitting patches and pushing changes
+to GIT, see the `README' and `README.commits' files. In particular,
+don't, under any circumstances, push anything to GIT before
+reading and understanding `README.commmits'.

INSTALL.in

@@ -0,0 +1,42 @@
+Prerequisites
+=============
+
+GTK+ requires the following packages:
+
+ - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
+   the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
+   GLib @GLIB_REQUIRED_VERSION@, Pango @PANGO_REQUIRED_VERSION@,
+   GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
+   and cairo @CAIRO_REQUIRED_VERSION@.
+
+ - libepoxy, for cross-platform OpenGL support.
+   It can be found here: https://github.com/anholt/libepoxy
+
+ - Each GDK backend has its own backend-specific requirements. For
+   the X11 backend, X11 R6 and XInput version 2 (as well as a number
+   of other extensions) are required. The Wayland backend requires
+   (obviously) the Wayland libraries.
+
+ - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.
+
+Simple install procedure
+========================
+
+  % tar xf gtk+-@GTK_VERSION@.tar.xz          # unpack the sources
+  % cd gtk+-@GTK_VERSION@                     # change to the toplevel directory
+  % ./configure                        # run the `configure' script
+  % make                               # build GTK+
+  [ Become root if necessary ]
+  % make install                       # install GTK+
+
+The Details
+===========
+
+Complete information about installing GTK+ and related libraries
+can be found in the file:
+
+ docs/reference/gtk/html/gtk-building.html
+
+Or online at:
+
+ http://library.gnome.org/devel/gtk/stable/gtk-building.html

MAINTAINERS

@@ -0,0 +1,12 @@
+Matthias Clasen
+E-mail: mclasen@redhat.com
+Userid: matthiasc
+
+Tim Janik
+E-mail: timj@gtk.org
+Userid: timj
+
+Note that a lot of people are contributing to GTK+, and some parts of it 
+are technically maintained by other people. The people listed above are
+meant as contacts for administrative questions such as cvs accounts. Other
+questions are best directed to the mailing list gtk-devel-list@gnome.org.

Makefile.am

@@ -0,0 +1,112 @@
+## Makefile.am for GTK+
+include $(top_srcdir)/Makefile.decl
+
+SRC_SUBDIRS = gdk gsk gtk modules demos tests testsuite examples
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs win32
+
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+meson_build_files = $(shell find . -type f -name '*meson.*' -print 2>/dev/null)
+meson_files = \
+	$(meson_build_files) \
+	meson_options.txt \
+	subprojects/graphene.wrap \
+	gdk/gen-gdk-gresources-xml.py \
+	gsk/gen-gsk-gresources-xml.py \
+	gtk/gen-gtk-gresources-xml.py \
+	gtk/gentypefuncs.py \
+	demos/gtk-demo/geninclude.py \
+	gdk/wayland/genprotocolfiles.py \
+	build-aux/meson/post-install.sh \
+	$()
+
+EXTRA_DIST +=			\
+	autogen.sh		\
+	HACKING			\
+	README			\
+	README.in		\
+	INSTALL			\
+	INSTALL.in		\
+	NEWS.pre-1-0		\
+	README.commits		\
+	README.win32		\
+	config.h.win32		\
+	makefile.msc		\
+	gtk-zip.sh.in		\
+	sanitize-la.sh		\
+	po/README.translators	\
+	po/po2tbl.sed.in	\
+	make-pot		\
+	$(meson_files)
+
+MAINTAINERCLEANFILES = \
+	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+	$(srcdir)/m4/gtk-doc.m4 \
+	$(srcdir)/INSTALL \
+	$(srcdir)/README \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/ChangeLog
+
+
+## Copy .pc files to target-specific names
+gtk+-x11-4.0.pc gtk+-win32-4.0.pc gtk+-quartz-4.0.pc gtk+-broadway-4.0.pc gtk+-wayland-4.0.pc gtk+-mir-4.0.pc: gtk+-4.0.pc
+	rm -f $@ && \
+	cp gtk+-4.0.pc $@
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gtk+-4.0.pc gail-4.0.pc
+pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-4.0.pc}
+
+if OS_UNIX
+pkgconfig_DATA += gtk+-unix-print-4.0.pc
+endif
+
+DISTCLEANFILES = \
+	gtk+-unix-print-4.0.pc		\
+	gtk+-4.0.pc			\
+	gtk+-x11-4.0.pc			\
+	gtk+-win32-4.0.pc		\
+	gtk+-quartz-4.0.pc		\
+	gtk+-broadway-4.0.pc		\
+	gtk+-wayland-4.0.pc		\
+	gtk+-mir-4.0.pc			\
+	gail-4.0.pc			\
+	config.lt
+
+distclean-local:
+	if test "$(srcdir)" = "."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git $(top_builddir)/build-aux/missing git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog
+
+uninstall-local:
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-4.0.pc
+
+AM_DISTCHECK_CONFIGURE_FLAGS =		\
+	--enable-gtk-doc 		\
+	--disable-doc-cross-references  \
+	--enable-man 			\
+	--disable-maintainer-mode 	\
+	--enable-introspection  	\
+	--enable-installed-tests
+
+GITIGNORE_TRANSLATION_DIRS = po-properties
+GITIGNOREFILES = po-properties/gtk40-properties.pot
+
+-include $(top_srcdir)/git.mk

Makefile.decl

@@ -0,0 +1,96 @@
+# GTK+ - The GIMP Toolkit
+
+GTESTER        = gtester -k		# in $PATH for non-GLIB packages
+GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
+
+# initialize variables for unconditional += appending
+EXTRA_DIST =
+TEST_PROGS =
+
+### testing rules
+
+# Xvfb based test rules
+XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
+XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
+   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
+   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
+  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
+  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
+  9995 9996 9997 9998 9999
+
+if USE_X11
+SKIP_GDKTARGET = \
+	false
+else
+SKIP_GDKTARGET = \
+	echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+endif
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
+XVFB_START = \
+	${XVFB} -help 2>/dev/null 1>&2 \
+	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
+	&& { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
+	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+	&& DISPLAY=:$$XID && export DISPLAY
+# call as: $(XVFB_START) && someprogram
+
+# test: run all tests in cwd and subdirs
+test: test-cwd test-recurse
+# test-cwd: run tests in cwd
+test-cwd: ${TEST_PROGS}
+	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
+	  $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose ${TEST_PROGS}; }; \
+	}
+# test-recurse: run tests in subdirs
+test-recurse:
+	@ for subdir in $(SUBDIRS) ; do \
+	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
+	  done
+# test-report: run tests in subdirs and generate report
+# perf-report: run tests in subdirs with -m perf and generate report
+# full-report: like test-report: with -m perf and -m slow
+test-report perf-report full-report:	${TEST_PROGS}
+	@ ignore_logdir=true ; \
+	  if test -z "$$GTESTER_LOGDIR" ; then \
+	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
+	    ignore_logdir=false ; \
+	  fi ; \
+	  for subdir in $(SUBDIRS) ; do \
+	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+	  done ; \
+	  $(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
+	    case $@ in \
+	    test-report) test_options="-k";; \
+	    perf-report) test_options="-k -m=perf";; \
+	    full-report) test_options="-k -m=perf -m=slow";; \
+	    esac ; \
+	    $(XVFB_START) && { \
+	      set -e; \
+	      if test -z "$$GTESTER_LOGDIR" ; then \
+	        G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+	      elif test -n "${TEST_PROGS}" ; then \
+	        G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+	      fi ; \
+	    }; \
+	  }; \
+	  $$ignore_logdir || { \
+	    echo '<?xml version="1.0"?>' > $@.xml ; \
+	    echo '<report-collection>'  >> $@.xml ; \
+	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
+	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
+	    done ; \
+	    echo >> $@.xml ; \
+	    echo '</report-collection>' >> $@.xml ; \
+	    rm -rf "$$GTESTER_LOGDIR"/ ; \
+	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
+	  }
+.PHONY: test test-cwd test-recurse test-report perf-report full-report
+# run make test-cwd as part of make check
+check-local: test-cwd

NEWS.pre-2.0

@@ -1,903 +0,0 @@
-Overview of Changes in GTK+ 2.0.0
-=================================
-
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, Darin Adler]
-* Build fixes [Anders Carlsson, Tor Lillqvist, Manish Singh]
-* Bug fixes. [Thomas Leonard, Owen Taylor]
-
-Overview of Changes in GTK+ 2.0.0 rc1
-=====================================
-
-* GtkTreeView fixes [Kristian Rietveld, Jonathan Blandford, Richard Hult]
-* Text widget fixes [Havoc Pennington]
-* Efficiency fixes when using Xft [Owen Taylor]
-* Key handling fixes and other fixes for Win32 [Hans Breuer, Tor Lillqvist]
-* Try to fix key handling without XKEYBOARD extension [Owen]
-* Documentation fixes and improvements 
-  [Matthias Clasen, Alexey Malyshev, Akira Tagoh, Vitaly Tishkov]
-* Widget drawing improvements [Soeren Sandmann]
-* Allow cycling between multiple menu bars with <Control>Tab [Owen]
-* Try to build libraries with only shared library dependencies on Xft to 
-  deal with transition to Xft2 [Owen]
-* Portability fixes [Owen, Miroslaw Dobrzanski-Neumann]
-* Don't use red as the default cursor color [Owen]
-* Bug fixes, bug fixes, bug fixes.
-
-Other contributors: Darin Adler, Jacob Berkman, Kevin Breit, Hans Breuer, 
-  Anders Carlsson, Damon Chaplin, Finlay Dobbie, Jody Goldberg,
-  Andreas J. Guelzow, Scott Guilbeaux, Vlad Harchev, James Henstridge,
-  Tim Janik, Satyajit Kanungo, Charles Kerr, Sergey Kuzminov, Miles Lane, 
-  Alexander Larsson, Paolo Maggi, Skip Montaro, Jan Mynarik, Sven Neumann, 
-  Padraig O'Briain, Narayani Pattipati, Mark Patton, Havoc Pennington, 
-  Ettore Perazzoli, Guillermo S. Romero, Manish Singh, Morten Welinder
-
-Overview of Changes in GTK+ 1.3.15
-==================================
-
-* New stock and improved icon images
-  [Tuomas Kuosmanen, Jakub Steiner, Anders Carlsson]
-* Widget drawing improvements for check and radio buttons,
-  spinbuttons [Soeren Sandmann]
-* Clean up module search path algorithm, use GTK_PATH [Owen Taylor]
-* Add GtkSetting for font name. [Richard Hestilow]
-* Much improved key matching code, accelerators work independent
-  of group [Owen]
-* Make mnemonics work for embedded GtkPlug widgets [Owen]
-* Keynav improvements for GtkTreeView [Kristian Rietveld]
-* Fix gtk_tree_view_scroll_to_cell() [Jonathan Blandford]
-* Rename gtk_tree_view_get_iter_root() and gtk_tree_path_new_root()
-  to gtk_tree_view_get_iter_first() and gtk_tree_path_new_first(),
-  add compatibility macros.
-* GtkTreeView bug fixes [Kristian, Anders, Damon Chaplin]
-* GtkTextView bug fixes [Havoc Pennington]
-* Pad class structures for future binary compatibility [Owen]
-* Tutorial improvements [Sven Neumann, Matthias Clasen]
-* Fixes for MULTIPLE selection target [Gregory Merchan, Owen]
-* Fix problems with initial widget size [Owen]
-* AIX compilation fixes [Miroslaw Dobrzanski-Neumann]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Miscellaneous bug fixes
-
-Other contributors: David L. Cooper, Eric Fischer, Jody Goldberg, 
-  Satajyit Kanungo, Thomas Leonard, Mark Patton, Manish Singh, 
-  Nicolas Setton
-
-Overview of Changes in GTK+ 1.3.14
-==================================
-
-* Keyboard focus improvements [Owen Taylor]
-* Code cleanup [Matthias Clasen, Manish Singh, Darin Adler]
-* Fix accidentally exported variables [Mark McLoughlin]
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, John Harper, Darin]
-* Default to yellow tooltips [Owen]
-* RC file fixes for reloading, priorities [Owen, Matthias]
-* GtkMenu behavior improvements and bug fixes [Owen, Arnaud Charlet]
-* GtkTextView fixes [Havoc Pennington, Daniel Elstner, Dennis Bjorklund]
-* Improve keynav for paned widgets, tooltips, spin buttons, notebooks, 
-  scrolled windows [Soeren Sandmann, Padraig, Owen]
-* Add Emacs/Default key themes [Owen]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Ethiopic input methods [Daniel Yacob]
-* Opaque paned window resizing [Soeren]
-* Tweak table expansion behavior [Tim Janik]
-* Fix GtkCalendar focus drawing [Bill Haneman]
-* Allow themeable cursor thickness [Bill]
-* Start of fixing of tutorial for GTK+-2.0 [Matthias]
-* Add a ::adjust-bounds signal to GtkRange to allow spreadsheet style
-  scrollbars. [Jody Goldberg]
-* Add the ability to turn on multiple selection for GtkFileSel [Manish]
-* Bug fixes
-
-Other contributors: Jacob Berkman, Padraig O'Briain, Anders Carlsson,
- Johan Dahlin, Richard Hult, Stefan Kost, Alex Larsson, Thomas Leonard,
- Paolo Maggi, Alexey Malyshev, Federico Mena Quintero, Skip Montaro,
- Sven Neumann, Havoc Pennington, Laszlo Peter, Christian Rose, Joe Shaw,
- Kevin Vandersloot,  Morten Welinder, Peter Williams
-
-Overview of Changes in GTK+ 1.3.13
-==================================
-
-* Tree view fixes. [Kristian Rietveld, Jonathan Blandford, Anders Carlsson]
-* Tree view support for low-vision themes [Bill Haneman]
-* Text view bug fixes. [Havoc Pennington]
-* Win32 fixes and improvements.  [Tor Lillqvist, Hans Breuer, 
-  Archaeopteryx Software]
-* Documentation improvements [Matthias Clasen, Havoc Pennington]
-* Accelerate alpha compositing using RENDER extension if present,
-  and optimize the non-RENDER case a lot. [Owen Taylor]
-* Add support for "optional keybindings" (action signal returns FALSE) [Owen]
-* Fixed the infamous changing directory deletes filename bug 
-  [Owen and a cast of thousands]
-* Add mouse cursor hiding for text widgets [Anders Carlsson]
-* Simple Hangul input module [Yusuke Tabata]
-* Removed the scary startup warning.
-* GdkPixbuf pixel handling fixes [Owen, Michael Hore, Jim Cape]
-* Converted GtkFileSelection and GtkFontSelection to use GtKTreeView widgets
-  instead of the deprecated GtkCList [Owen]
-* gtkhsv.h was installed by mistake, fixed that. [reported by Ross Burton]
-* gdk_pixbuf_render_to_drawable() now also handles alpha pixbufs.
-* Made Gtkimage draw GtkPixmap, GtkImage, GdkPixbuf insensitive, prelighted,
-  etc. [Havoc, Owen]
-* Marked gtk_item_factory_path_from_widget() G_CONST_RETURN. [Matt Wilson]
-* gtk_image_menu_item_new_from_stock() now falls back to
-  new_with_mnemonic, for consistency with gtk_button_new_from_stock()
-  [Havoc Pennington]
-* GdkModifierType is now consistently used for modifier mask parameters
-  [Mark Patton]
-* gtk_widget_set_accel_path() is now publically exported.
-
-Other contributors: Darin Adler, Jeffrey Baker, Damon Chaplin, Brian Cameron, 
-  Murray Cumming, James Henstridge, Jacob Berkman, Arnaud Charlet, Jeff Franks, 
-  Jeff Garzik, Jody Goldberg, Diego Gonzalez, Melvin Hadasht, Raja Harinath, 
-  Tim Janik, Mike Kestner, Mathieu Lacage, Alex Larsson, Ryan Lovett, 
-  Mark McLoughlin, Sven Neumann, Padraig O'Briain, Xavier Ordoquy, Chris Phelps, 
-  Detlef Reichl, Guillermo S. Romero, Federico Mena Quintero, Manish Singh,
-  HideToshi Tajima, Vitaly Tishkov, Jon Trowbridge, Sergey Vlasov.
-
-Overview of Changes in GTK+ 1.3.12
-==================================
-
-* Fix problems with PNG saving [Michael Natterer]
-* Cleanups of deprecated usages [Sebastian Wilhelmi]
-* Win32 fixes [Tor Lillqvist]
-* Documentation improvements [Matthias Clasen, Havoc Pennington, 
-  Vitaly Tishkov]
-* Frame buffer port fixes [Manish Singh]
-* GtkTextView bug fixes [Havoc Pennington, Chris Phelps]
-* Menu behavior improvements [Kristian Rietveld]
-* Make focus line width configurable, focus color work on 
-  dark themes. [Bill Haneman, Owen Taylor]
-* Add state argument to gtk_paint_focus() [Bill]
-* Added incremental revalidation to tree view, for better apparent speed 
-  [Jonathan Blandford]
-* Remove useless gtk_tree_view_column_cell_event() [Jonathan]
-* Display XIM status in a separate window [HideToshi Tajima]
-* Add GDK_DEBUG=nograbs to disable pointer, keyboard grabs [Jacob Berkman]
-* Add menu of Unicode control characters to GtkEntry, GtkTextView 
-  [Dov Grobgeld, Havoc]
-* Pass key releases along to input methods [Owen]
-* Many bug fixes
-
-Other contributors: Darin Adler, Fabrice Bellet, Chris Blizzard, 
-  Hans Breuer, Anders Carlsson, Damon Chaplin, Murray Cumming, Jeff Franks, 
-  James Henstridge, Tim Janik, Alex Larsson, George Lebl, Kjartan, Maraas, 
-  Sven Neumann, Seth Nickell, Padraig O'Briain, Soeren Sandmann, Manish Singh, 
-  Matt Wilson
-
-Overview of Changes in GTK+ 1.3.11
-==================================
-
-* Massive rework of accelerator API and implementation (Tim Janik)
-* Major fixes to resizing and redrawing to eliminate hysteresis
-  and optimize. (Owen Taylor, Soeren Sandmann)
-* Make many widgets NO_WINDOW to improve appearance and reduce
-  drawing overhead (Owen)
-* Text view fixes (Havoc Pennington)
-* Make child widgets in GtkTextView work (Havoc)
-* GtkTreeModelSort fixage (Jonathan Blandford, Kristian Rietveld)
-* Clean up GtkTreeView drag and drop support (Owen)
-* Misc tree view fixes and improvements (Jonathan, Kristian, Anders, Matt Wilson)
-* Add gtk_window_get/set_focus(), gtk_window_set_default() as public
-  functions (Owen, Damian Ivereigh)
-* Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen)
-* Change button ordering in standard dialogs to correspond to 
-  GNOME usability project proposal (Gregory Merchan)
-* Add support for context sensitivity in input methods (Owen)
-* Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima)
-* Fix gdk_window_scroll() and other aspects of big windows (Owen)
-* Remove need for X connection for class initialization (Jacob Berkman)
-* Propagate key events to parents of focused widget (Owen)
-* Don't export normal GTK+ marshalers, export deprecated compat marshalers (Owen)
-* Many Win32 Fixes and improvements (Hans Breuer, Tor Lillqvist)
-* Bug and documentation fixing (Matthias Clasen, Anders Carlsson,
-  Jacob Berkman, others.)
-
-Other Contributors:
-  Darin Adler, Marius Andreiana, Erwann Chenede, Murray Cumming, Janet Davis, 
-  Daniel Egger, Daniel Elstner, Jeff Franks, Alex Larsson, George Lebl, 
-  Sergey Kuzminov, Eric Lemings, Arkadiusz Miskiewicz, Padraig O'Briain, Sven Neumann, 
-  Kristian Rietveld, Nicolas Setton, Manish Singh,  Vitaly Tishkov, Sebastian Wilhelmi, 
-  Michael Natterer
-
-Overview of Changes in GTK+ 1.3.10
-==================================
-
-* GtkTextView fixes [Havoc Pennington]
-* GtkTreeView fixes and improvements [Jonathan Blandford, Kristian,
-  Manish Singh, Joshua Pritikin, Oleg Maiboroda, James Henstridge]
-* gtkdemo improvements [Kristian Rietveld]
-* Drag and drop fixes to generic code and widgets 
-  [Owen Taylor, Damian Ivereigh]
-* Documentation improvement [Havoc Pennington, Matthias Clasen]
-* Spelling fixes [Jacob Berkman]
-* Move signals to the GtkEditable interface [Kristian]
-* Further stock image improvements [Jakub Steiner]
-* Support text chunks for the PGN loader, add gdk_pixbuf_get_option()
-  [Sven Neumann]
-* Rename gdk_pixbuf_new_from_stream back to new_from_inline [Owen]
-* Automatically call setlocale(), unless explicitly disabled [Owen]
-* Property addition to various widgets [Michael Meeks, Owen]
-* Support building with automake-1.4 [James]
-* Make GtkRadioButton groups act as a single focus point [Owen]
-* Move gdk_window_lookup etc. to be cross-platform [Matthias]
-* Draw spinbuttons variably sized [Kristian]
-* Separate GdkAtom out from X atoms for compatibility with future
-  multihead changes [Owen]
-* Require gdk_threads_init() to be explicitly called instead
-  of piggybacking off of g_thread_init(). [Owen]
-* Improvements to text-view/label/entry popup menus [Damian, Jacob, Owen]
-* Bug fixes and cleanup [Matthias, others]
-
-Other Contributors:
-  Mark McLoughin, Mikael Hermansson, Soeren Sandmann, Anders Carlsson,
-  Tim Janik, Murray Cumming, Hidetoshi Tajima, Padraig O'Briain, 
-  Hans Breuer, Vitaly Tishkov, Dov Grobgeld
- 
-
-Overview of Changes in GTK+ 1.3.9
-=================================
-
-* Add editable text cells to GtkTreeView.
-  Keynav, drawing fixes in GtkTreeView [Jonathan Blandford]
-* Text widget no longer always has a \n in it. [Havoc Pennington]
-* Text widget bug fixes [Havoc, Dov Grobgeld, Hidetoshi Tajima]
-* Allow -1 for width/height in gdk_pixbuf_render_*(). [Matthias Clasen]
-* Minor fix for major resizing problems in recent releases [Owen Taylor]
-* Restore ability to set _set properties to TRUE for 
-  GtkCellRendererText, GtkTextTag [Owen]
-* Cursor drawing improvements [Owen]
-* Win32 fixes [Hans Breuer]
-* Mark various functions as deprecated or private.
-* Misc bug fixes, portability fixes, and cleanups.
-
-Other Contributors: 
- Vitaly Tishkov, Christian Rose, Frank Belew, Jeff Franks, Sven Neumann,
- Kristian Rietveld, Vitaly Tishkov, Joshua N. Pritikin, Matt Wilson, 
- James Henstridge, Detlef Reichl
-
-Overview of Changes in GTK+ 1.3.8
-=================================
-
-* GtkTreeView and GtkTreeModel API cleanups/improvements [Jrb]
-* GtkOptionMenu scrollwheel support [Alex]
-* GtkModule search paths [Owen]
-* Documenatation updates [Havoc,Jrb]
-* Major Gdk cleanup [Owen]
-* Miscellaneous other fixes/cleanups
-
-Other Contributors:
-  Joshua N Pritikin, Padraig O'Briain, Jakub Steiner, Matthias Clasen,
-  Matt Wilson, James Henstridge
-
-Overview of Changes in GTK+ 1.3.7
-=================================
-
-* Many Pixbuf (loader) improvements [Matthias Clasen, Soeren Sandmann]
-* Added publically installed utility gdk-pixbuf-csource to generate
-  inlined pixbufs in C source code [Tim Janik]
-* Optional movement of button children on press [Soeren, Owen Taylor]
-* Interactive searching in GtkTreeView [Kristian Rietveld]
-* Sorting/ordering improvements for GtkTreeView [Kris, Jonathan Blandford]
-* Animation of expander motion for GtkTreeView [Anders Carlsson]
-* Lots of misc GtkTreeView fixes and improvements [Jonathan]
-* New/improved stock icons [Jakub Steiner] 
-* Code and API rework for window resizing [Havoc Pennington]
-* Converted accel groups to GObject [James Henstridge]
-* More property support improvements
-* Add facility for "secondary" buttons in 
-  GtkButtonBox/GtkDialog [Gregory Merchan]
-* Disentangled child visability from MAPPED state [Owen]
-* Plug/Socket improvements and port to the XEMBED protocol [Owen]
-* Added priorities for styles in RC files, 
-  support multiple parse contents [Owen]
-* Made GdkVisual and GdkDevice GObjects [Alexander Larsson]
-* Key binding improvements [Havoc]
-* Added GtkWidget::event-after signal since normal event handling
-  is now aborted as soon as a handler returned TRUE [Tim]
-* Dnd fixes and improved icon support [Owen]
-* Removed GtkPacker widget
-* Fixing missing paired getters/setters [Kris]
-* Nuked remaining GtkArg cruft, implemented container/child properties [Tim]
-* Added window grab groups [Owen]
-* Many frame buffer improvements [Alex]
-* Win32 fixes and improvements [Hans Breuer]
-* Warning fixes [Darin Adler]
-* Miscellaneous bug and API fixes [Matthias et. al]
-
-Other Contributors:
-  Joshua N Pritikin, Hidetoshi Tajima, Manish Singh, ERDI Gergo, Jens Finke,
-  Chema Celorio, Lee Mallabone, Vitaly Tishkov, Sebastian Wilhelmi,
-  Nicola Girardi, Sven Neumann, Padraig O'Briain, Michael Natterer,
-  Suresh Chandrasekharan, Jonas Borgström, Jay Cox, Michael Meeks,
-  Mathias Hasselmann, Peter Williams, Thomas Broyer, Kjartan Maraas,
-  Joel Becker, Jeff Franks, Brian Cameron, Skip Montanaro
-
-Overview of Changes in GTK+ 1.3.6
-=================================
-
-* Properly renders strikethrough text
-* win32 fixes
-* Added "scale" property to GtkTextTag and GtkCellRendererText to do 
-  relative font scaling
-* Added "format_value" signal to GtkScale to reformat value text
-* framebuffer fixes
-* Property support added to lots of widgets
-* Many GtkTreeView new features and API/implementation fixes
-* Lots of new_with_mnemonic() convenience functions
-* Change GtkImageMenuItem API to be more consistent/useful
-* Added lots of new stock items/icons
-* Rewrote GtkRange/GtkScale/GtkScrollbar, includes support for
-  enabling/disabling extra scrollbar stepper arrows in gtkrc so NeXT
-  themes won't need broken hacks
-* Convenience API for GtkRange similar to the one added to GtkSpinButton
-  a while back
-* Make menubar/toolbar work properly with xthickness/ythickness of 1 or 0, 
-  and move some attributes from program settings to user settings.
-  Allows nice 1-pixel-bevel themes.
-* Moved ::focus virtual function from GtkContainer to GtkWidget
-* Plenty of bug fixes
-
-Overview of Changes in GTK+ 1.3.5
-=================================
-
-* New default theme based on Raleigh theme for 1.2.x.
-* Dependency on the ATK library added as a step to
-  providing accessibility-enabling interfaces
-* XEMBED-based GtkPlug/GtkSocket now basically works.
-* Drag and drop of column headers in GtkTreeView
-* GtkColorSelector work: hooks for saving and propagating palette, UI tweaks,
-  and API sanitation
-* Key binding fixes
-* Configurable padding/spacing in a lot of places
-* Invisible text in GtkTextView fixed
-* SHM segments now created with a mode of 0600
-* Bug fixes
-
-Overview of Changes in GTK+ 1.3.4
-=================================
-
-* Win32 fixes
-* GtkTreeView improvements and fixes
-* Fix glib-2.0.m4
-* Miscellaneous bug fixes
-
-Overview of Changes in GTK+ 1.3.3
-=================================
-
-[ 5600 lines of ChangeLog ]
-
-* API cleanups
-* Win32 work (Tor, Hans Breuer)
-* Focus improvements (Owen)
-* Frame buffer improvements (Alex)
-* Work on GtkTextView (Havoc)
-* Much work on GtkTreeView (Jonathan)
-* Selectable labels (Havoc)
-* Converted many arguments to properties (Lee Mallabone, John Margaglione)
-* Add exact regions to GdkExposeEvent, propagate it. (Alex)
-* Added ability to have resize grips in status bars (etc.) using
-  _NET_WM_MOVERESIZE protocol. (Havoc)
-* Added mnemnonic mechanism to make setting underline accelerators
-  much easier. (Alex)
-* Add per-style property mechanism to allow themes to change 
-  geometry parameters. (Tim)
-* Added global settings mechanisms for settings such as double-click
-  time. (Tim, Owen)
-* Various support functions for new and old WM properties (Havoc, Alex)
-* Add TRUE-stops-returns for boolean-returning signals (Ron Steinke)
-
-Overview of Changes in GTK+ 1.3.2
-=================================
-
-GTK Core:
-
-* New stock-icon and stock-item system. Use themeable pixbufs in
-  dialogs, buttons, etc. [Havoc]
-* Theme engines reworked to use derivation and new object system. [Owen]
-* Added GtkClipboard object for simple selection handling. [Owen]
-* Make GtkEditable an interface, move implementation to GtkOldEditable for
-  compat. [Owen]
-* Better handling of default directionality. [Robert]
-* Use GSignal as backend for GtkSignal and other GObject stuff. [Tim]
-* Move theme engines to GTypePlugin. [Owen]
-
-GDK:
-
-* Beginning of implementation of client parts of new window manager spec. [Owen]
-* Make gdk_drawable_get_image() work with backing store. [Havoc]
-
-Widgets:
-
-* New text widget [Havoc]
-  - Adjustable tab handling.
-  - Ability to have scrolling side areas in new text widget for tabs/line numbers.
-  - Many cleanups and small improvements.
-* Improvements to submenu navigation [Nils Barth/David Santiago] and
-  scrolling menus. [Alex]
-* Simplification of progress bar API. [Havoc]
-* Make GtkImage a generic image-display widget. [Havoc]
-* New GtkTreeView tree widget. Model/view architecture, flexible rendering,
-  large datasets, etc. [Jonathan]
-* New GtkMessageBox widget for message display. [Havoc]
-* Allow labels to have contents set from XML-like markup language. [Havoc]
-* Make dialogs derive from GtkDialog and use stock buttons. [Havoc]
-
-Internationalization:
-
-* Proper character set conversion for clipboard/selection. [Owen]
-* New input method system via loadable modules; support on-the-spot
-  preedit in GtkEntry and new text widget; allow switching input methods
-  on the fly; include modules for XIM and demo Cyrillic-transliteration 
-  module. [Owen]
-* VIQR, Thai, and Inuktitut input methods. [Robert]
-* Convert po files to UTF-8. [Robert]
-
-gdk-pixbuf:
-
-* Full-alpha compositing for gdk-pixbuf on drawable. [Havoc]
-* Add simple saving to gdk-pixbuf. [David Welton/Havoc]
-* Add improved error handling with GError to gdk-pixbuf. [Havoc]
-
-Ports:
-
-* Much work on Win32 Port. [Tor/Hans]
-* Much work on Linux-FB Port. [Elliot/Alex]
-
-Misc:
-
-* Start of new gtk-demo demo program. [Owen/Jonathan]
-* Bug fixes and more bug fixes.
-
-
-Overview of Changes in GTK+ 1.3.1:
-
-* GTK+ now uses the Pango library for text manipulation. All
-  strings in GTK+ now are in Unicode, languages written
-  from right-to-left, and complex-text languages are now supported.
-* The gdk-pixbuf library for image loading and manipulation is 
-  has been integrated with GTK+.
-* The GTK+ object system has mostly been moved to GLib, separating
-  it from the GUI code. Many significant enhancements have been
-  made as part of this.
-* A new text widget is now included. This started as a port
-  of the Tk text widget, and includes such features of the Tk
-  text widget as tags, marks, and unicode text support. It
-  has been enhanced to support model-view operation and the
-  full power of Pango.
-* The GDK library has been extensively revised to support multiple
-  windowing systems. The only fully functional backend in 1.3.1
-  is the X11 backend, however, ports to Win32, Linux-framebuffer,
-  Nano-X, BeOS, and MacOS exist in various states of completion,
-  and at least some of these will be finished and integrated in 
-  before the final GTK+-2.0 release.
-* 32-bit coordinates are now supported throughout GDK and GTK+
-  (they are emulated where not supported by the windowing system.)
-* Many minor bug fixes and enhancements. Incompatible changes
-  are documented in docs/Changes-2.0.txt
-
-Overview of Changes in GTK+ 1.2.8:
-
-* GNU Make 3.79 bug workaround
-* FAQ and tutorial updates and improvements
-* Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection
-
-Overview of Changes in GTK+ 1.2.7:
-
-* More header cleanups.
-* Fixed activation bug for insensitive widgets.
-* Locale fixes to RC file parsing code.
-* Miscellaneous bugfixes for Item Factory, CList, CTree, X Selections,
-  HScale, VScale, Pixmap, Viewport, OptionMenu, Entry and Notebook.
-* Upgrade to libtool 1.3.4.
-
-Overview of Changes in GTK+ 1.2.6:
-
-* container queue_resize fixes
-* gtk[vh]scale: minor fixups
-* rename idle to idle_id in testgtk to avoid conflicts with 
-  broken libs
-* More consistent naming of gtkrc files
-* Added language support: ro, uk
-
-Overview of Changes in GTK+ 1.2.5:
-
-* more GtkCTree and GtkWindow bug fixes.
-* more redraw/resize queue fixes, better expose event
-  discarding code.
-* more miscellaneous bugs fixed
-* new configure.in option --disable-rebuilds to completely disable
-  rebuilds of autogenerated sources.
-* check for 5.002 now, to avoid failing autogeneration build rules due
-  to old perl versions.
-* fonts (and fontsets) are cached now.
-* more autogeneration make rules and dependency fixups, we should be
-  save with autogeneration up to make -j12 now ;)
-* new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the
-  GtkWindow on every size change.
-* major rework of window manager hints handling code, fixed a bunch of
-  races with the new resizing code.
-* the new wm hints and resizing code is absolutely perfect and bug free now,
-  it only lacks testing ;)
-* fixed up various rc style memory problems.
-* gtk_widget_modify_style() now properly changes the style of realized widgets
-  and references the style passed into it. if people worked around this bug,
-  this will introduce a slight memory leak in their code.
-  The code should typically look like:
-            GtkRcStyle *rc_style = gtk_rc_style_new ();
-            [...]
-            gtk_widget_modify_style (widget, rc_style);
-            gtk_rc_style_unref (rc_style);
-* fix problems with positioning menus offscreen.
-* GtkText fixes for some crashes and drawing errors.
-* Better handling for unexpected window destroys in GDK and GTK+.
-  This should make it possible to use a GtkPlug and catch the
-  case where its parent socket is randomly killed.
-* FAQ updates.
-* FileSelection i18n patches, RadioButton fixups.
-* many translation improvements.
-* miscellaneous other bugs fixed.
-
-Overview of Changes in GTK+ 1.2.4:
-
-* DnD improvements (drags can be canceled with Esc now).
-* suppressed configure event reordering in Gdk.
-* rewrite of Gtk's configure event handling.
-* major improvements for the object argument system (Elena Devdariani).
-* major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and
-  GtkCTree.
-* tutorial/FAQ updates, new file generation.txt on autogenerated sources.
-* configure's --with-glib= is "officially" unsupported.
-* upgrade to libtool 1.3.3.
-* various buglets fixed.
-
-Overview of Changes in GTK+ 1.2.3:
-
-* Upgrade to libtool 1.3
-* Check for dgettext (for systems with old versions of GNU Gettext)
-* Many bug fixes (see ChangeLog for details)
-
-Overview of Changes in GTK+ 1.2.2:
-
-* Improved Dnd behaviour with Motif applications.
-* Bug fixes for the Gtk selection code.
-* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
-* Bug fixes and leak plugs for the Gdk IM code.
-* Added gtk_object_get() facility to retrieve object arguments easily.
-  The var args list expects ("arg-name", &value) pairs.
-* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
-  problems where closed pipes were no longer signaling GDK_INPUT_READ on
-  systems with a native poll().
-* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
-  anymore).
-* We don't attempt to lookup xpm color "None" anymore, this should prevent
-  eXodus (commercial X windows server) from popping up a color dialog every
-  time a transparent pixmap is created.
-* Fixed bug where Gtk timeout/idle handlers would execute without the global
-  Gdk lock being held.
-* Other minor bug fixes.
-
-Overview of Changes in GTK+ 1.2.1:
-
-* Many Bug fixes have been applied to the menu and accelerator code.
-* GtkItemFactory can "adopt" foreign menu items now and manage their
-  accelerator installation. This is often required to get GtkItemFactory
-  like accelerator propagation between different windows with the same
-  menu hierarchy and for centralized parsing and saving of accelerators.
-* GtkCList/GtkCTree buttons should always display correctly now.
-* Miscellaneous other bug fixes.
-
-What's New in GTK+ 1.2.0 (since 1.0.x):
-
-* New widgets: GtkFontSelector, GtkPacker, GtkItemFactory, GtkCTree,
-  GtkInvisible, GtkCalendar, GtkLayout, GtkPlug, GtkSocket
-* Many new features and robustness for existing widgets
-* Theme support
-* New DND implementation
-* Internationalization of standard dialogs
-* New key binding system
-* Tearoff menus and menu accelerators
-* Wide character support for entry and text
-* Resizing code has been overhauled
-* Queued redraws of partial areas
-* Far better support for object arguments
-* Speed optimizations
-* Runtime loading of dynamic modules
-* Support for GLib log domains
-* Tutorial improvements
-* A bug fix or two
-
-Overview of Changes in GTK+ 1.1.16:
-
-* Major fixes and improvements for handlebox
-* A change to the way widget->requisition works. Now,
-  widget->requisition is always what the widget requested,
-  unmodified by the usize. See Changes-1.2.txt for details.
-  This correct various bugs with gtk_widget_set_usize().
-* Fixes for XIM on X11R5 systems
-* Don't allow cut-and-paste of text in password-style entries
-* --enable-debug is now on by default for the development release.
-  (When compiling for "production", use --enable-debug=minimum)
-* Handle systems where Helvetica is not present more gracefully
-* Fixes for memory leaks
-* CList and CTree fixes
-* Bug fixes for drawing problems. 
-* Miscellaneous bug fixes to GtkLabel, GtkCList, GtkCTree,
-  GtkColorsel, Focusing, DND
-* Tutorial improvements
-
-Overview of Changes in GTK+ 1.1.15:
-
-* Tutorial Updates
-* Added --libs gthread to gtk-config 
-* Bug fixes
-
-What is new in GTK+ 1.1.14:
-
-* Additions to docs/Changes-1.2.txt
-* Just warn when loading theme engine fails
-* CLAMP GtkScale digits to a meaningful range
-* GTK_LOCALDIR is now defined in a better fashion
-* New functions (feature freeze, we know...):
-    gtk_menu_set_title()
-    gtk_toggle_button_get_active()
-* Some locale fixups in gtkrc code
-* Fixes to make gtk_radio_button_set_group() keep only
-  one radio button in the group active
-* Foreign windows are now always treated as viewable; this fixes
-  a problem where updating didn't occur properly in GtkPlug
-* DND fixes for 64 bit architectures, and for specifying operations 
-  with modifier keys.
-* Major revisions to GtkLayout: avoid having to create window
-  for NO_WINDOW children, adjust allocations of children as 
-  scrolled so queued draws work, and a resize is queued instead
-  of allocating directly in a put() or move()
-
-What is new in GTK+ 1.1.13:
-
-* Dnd and selection bug fixes and memory purification.
-* Widget sensitivity fixups.
-* Tooltips windows are now named "gtk-tooltips" so rc file rules
-  can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
-  widgets.
-* Spin buttons now update their values upon value retrieval.
-* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
-  a lot. Gtk makes full use of the draw_area coalescing code now, which
-  got minorly improved as well.
-* Containers map their Gdk windows after their children now to reduce
-  expose event generation.
-* Gdk event queue fixups, this solves the double-click problems people were
-  recently having.
-* Account for the fact that GSource's are only properly reentrant from
-  within dispatch(), thus we don't do Gdk event processing from within
-  check() or prepare() anymore.
-* Rc files feature a bg_pixmap value of "<none>" now.
-* Improved session management support in Gdk.  
-* Automatic disabling of NLS if no gettext is found should work now.
-* Removed deprecated functions, docs/Changes-1.2.txt gives an overview.
-* Gtk+ development now requires GNU autoconf 2.13, GNU automake 1.4
-  and GNU libtool 1.2d.
-* More bug fixes all over the place.
-
-What is new in GTK+ 1.1.12:
-
-* Korean translation added
-* Fixed memory leaks
-* A few other bug fixes
-
-What is new in GTK+ 1.1.11:
-
-* Dutch, Japanese, Swedish, Polish, and Norwegian translations
-* Removed deprecated _interp variants: gtk_container_foreach_interp, 
-  gtk_idle_add_interp, gtk_timeout_add_interp, gtk_signal_connect_interp
-* Lots of cast corrections
-* Many fixes 
-
-What is new in GTK+ 1.1.9:
-
-* Check for broken glibc 2.0 mb functions and avoid them
-* Label and Entry display fixes 
-* Move main thread back to GDK, for locking when translating events
-* Bug fixes
-
-What is new in GTK+ 1.1.8:
-
-* Added support for gettext and the localization of the standard
-  dialogs.
-* Added line-wrapping for the label, and JUSTIFY_FILL
-* Support reordering via drag and drop in  CList and CTree.
-* Replaced GtkDrawWindow widget with a GTK_USER_DRAW flag
-* Extended gtkpaned API to support minimum sizes and proportional
-  resizing.
-* Changed the handling of shared memory segments so as to 
-  remove the need for GTK+ to set up signal handlers.
-* Re-implemented event loop in terms of the event loop
-  that has been added to GLib 1.1.8
-* Added 'grab_focus' signal to allow keyboard accelerators
-  for entries.
-* Load locale specific RC files if present.
-* Bug fixes.
-
-What is new in GTK+ 1.1.7:
-
-* Fixed memory mis-allocation in default files code
-* Various event handling fixes
-* Wide character support for entry and text
-* Destroy widgets _after_ propagating unrealize signals through 
-  widget hierarchy
-* Only build XIM-support if available
-* Tutorial and examples updates
-* Added gtk_drag_source_unset()
-
-What is new in GTK+ 1.1.6:
-
-* The signal system now features emission hooks with special semantics,
-  refer to the ChangeLog for this.
-* Minor? speedups and memory reductions to the emission handling of the
-  signal system.
-* _interp() function variants are deprecated now. the corresponding *_full()
-  variants are provided for a long time now.
-* Dnd abort timeout increased to 10 minutes.
-* GtkScrolledWindow inherits from GtkBin now.
-* GTK_POLICY_NEVER is implemented for scrolled windows now.
-* Lots of API clean ups.
-* Incremental freezing abilities.
-* Integrated widgets from the GNOME tree: GtkLayout, GtkPlug and GtkSocket.
-* New window functions for transient relationship, default size, and 
-  geometry hints
-* Default rc files are now read in (<sysconfdir/etc/gtkrc and ~/.gtkrc)
-  GTK_RC_FILES environment variable and functions are provided to configure
-  this behavior
-* Read doc/Changes-1.2.txt to properly adapt your code.
-* Bug Fixes.
-
-What is new in GTK+ 1.1.5:
-
-* Theme integration
-* Widget style modification is now handled through GtkRcStyles
-* GtkPixmaps now grey out pixmaps when insensitive
-* Notebook enhancements
-* Shadow configurability for menubars and handleboxes
-* DND enhancements
-* gtkfilesel now supports automounters better
-* Implementation of expose compression
-* Queued redraws of partial areas
-* Scrolledwindow (+Viewport) source incompatibilities, children that are added
-  to a scrolled window don't get an automatic viewport anymore. a convenience
-  function gtk_scrolled_window_add_with_viewport() is supplied for this task
-* Deprecated functions will now issue a message, informing the programmer about
-  the use of this function. These functions will get removed in future versions
-* Non-functional functions got removed entirely
-* gtk_widget_new() and gtk_object_new() will now auto-construct new objects.
-  A new function gtk_object_default_construct() is provided now which should
-  be called after every gtk_type_new() to perform the auto-construction
-* Improved argument support of several widgets
-* Bug Fixes
-
-What is new in GTK+ 1.1.3:
-
-* GtkCList/GtkCTree now have the ability to:
-    - hide/show individual columns
-    - disable/enable column resizing
-    - set min and max for column widths
-    - set expander style of the ctree
-    - set/get row and cell styles
-    - set spacing between tree expander and cell contents in ctree
-    - toggle auto_resize for columns
-* Must enhanced DND support, removed old DND code
-* Idle functions are now implemented via GHook, giving a slight speed
-  improvement
-* An environment variable GTK_MODULES which takes a colon separated
-  list of module names GTK+ will now automatically load at gtk_init() startup
-* GtkFontSel now has support for an extra 'base' filter
-* New function gdk_window_set_root_origin to get the real geometry taking
-  into account window manager offsets
-* New function gtk_text_set_line_wrap to toggle line wrapping
-* New function gtk_widget_add_events which safely adds additional
-  events to a widget's event mask
-* New function gdk_event_get_time to get the timestamp from a generic
-  event
-* New widget GtkCalendar
-* New widget GtkInvisible - InputOnly offscreen windows used for reliable
-  pointer grabs and selection handling in DND code
-* New functions gtk_object_remove_no_notify[_by_id] to remove a certain
-  data portion without invocation of its destroy notifier 
-* gtk_spin_button_construct is now deprecated, use gtk_spin_button_configure
-  instead 
-* gtk_clist_set_border is now deprecated, use gtk_clist_set_shadow_type 
-  instead
-* Removed functions gtk_object_set_data_destroy[_by_id] 
-* Documentation additions/updates 
-* HTML and plain text files are now included in the distribution
-* Bug fixes, typeness corrections, and general fixups
-
-What is new in GTK+ 1.1.2:
-
-* Gtk+ is now featuring runtime loading of dynamic modules via the
-  --gtk-modules= command line switch. such modules have to export a
-  G_MODULE_EXPORT void gtk_module_init (gint *argc, gchar ***argv);
-  function which will be invoked to initialize the module. since such
-  modules may create new widget types, they are always resident.
-* The tutorial has been updated again.
-* Changes to menus including tearoff menus and accelerators.
-* Better support for modal dialogs.
-* Removed CAN_FOCUS by default from scrollbars and button children of toolbar.
-* More improvements and fixes for GtkCList and GtkCTree (i.e. row sorting).
-* GtkCTree rows can be unselectable now.
-* The GtkCTree API has undergone major renames (see ChangeLog entry from Lars
-  Hamann on Tue Aug 18 00:29:13 1998).
-* A bunch of varargs functions changed to get va_lists working on systems that
-  implement va_lists as arrays.
-* Improvements to the gdkrgb code.
-* Improvements to Gdk color handling so we greatly reduce server traffic and
-  don't leak colors anymore.
-* Improved internal widget tree iterators (the GtkContainer::foreach signal
-  vanished because of this).
-* Option menus can have the keyboard focus now.
-* More fixups to the text widget.
-* GtkFileSelection should behave much more nicely in combination with AFS now.
-* Support for label underlining.
-* Support for GLib 1.1.3 log domains.
-* Documentation improvements.
-* Configuration fixes on various platforms.
-* Miscellaneous fixes to XInput support.
-* Build with shared library dependencies on Linux
-* Fix for a major bug in the type systems memory allocation code that could
-  cause random crashes.
-* Libtool update to version 1.2b.
-* Lots of bugfixes and cleanups again ;)
-
-
-What is new in GTK+ 1.1.1:
-
-* Tutorial updates and additions.
-* Key binding support for GtkListItems and GtkList.
-* Extended selection mode and autoscrolling for GtkLists.
-* A GtkCtree now operates on GtkCTreeNode* structures rather than GList*.
-* GtkCTreeNodes can now be created from GNode trees.
-* Bug fixes for GtkNotebook, GtkCList, GtkCombo and GdkWindow reparentation.
-
-
-What is new in GTK+ 1.1.0:
-
-* New widget GtkFontSelector.
-* New featureful progress bar.
-* New container widget GtkPacker.
-* New object GtkItemFactory, GtkMenuFactory is deprecated.
-* New key binding system, configurable via rcfiles, similar to styles.
-* New widget GtkCTree with drag selections and keyboard movement and
-  and horizontal scrolling. Features also implemented for GtkCList.
-* Significant speedups to widget creation and destruction through caching
-  colormap and visual queries to the XServer.
-* Speedups for type creation and especially gtk_type_is_a() checks.
-* Speedups in signal lookup, creation and emissions and connection handling.
-* Minor speedups with object data allocation and destruction.
-* Additions to the signal handling API (e.g. *_emitv).
-* Support for rc-file reparsing.
-* Resizing logic is now implemented on container widget basis, rather than
-  for toplevel GtkWindows only.
-* Buttons support relief styles now.
-* Some widgets are now allocated through memchunks to behave more memory wise.
-* Newly included file gtkfeatures.h which defines compatibility macros to
-  test for certain API features upon program compilation.
-* Child arguments support for container widgets.
-* Far better support for object arguments, revamp of the underlying
-  mechanism for speed and reusability. Child/object arguments don't
-  need to be preceded by the "GtkType::" portion anymore.
-* Removed GtkAcceleratorTable in favour of GtkAccelGroup, accelerator display
-  is now performed by a new widget GtkAccelLabel.
-* Overhaul of the resizing code. Resizing behaviour can now be specified
-  on GtkContainer basis, so the underlying algorithm isn't only available
-  for GtkWindows.
-* GtkTables are now fully resizable.
-* The GtkType system now supports an additional base class initialization
-  function.
-* GtkStyles and key bindings can now be looked up depending on the base
-  types of a widget, through a new keyword `class' in rc files.
-* GtkButton derives from GtkBin (finally).  
-* More descriptive error messages on rc parsing.  
-* Runtime information is available to query enum/flag definition values.
-* Upgrade to libtool-1.2
-* Legions of bug fixes, memory leaks, segfaults, of-by-something errors...
-  including those that already went into the 1.0.x branch.
-* A big bunch of features and cosmetic fixups that just got lost in
-  the masses of changesonfigure problem when cross-compiling

README.commits

@@ -7,23 +7,25 @@ avoid unnecessary breakage, and to take advantage of the knowledge
 about GTK+ that has been built up over the years, we'd like to ask
 people committing to GTK+ to follow a few rules:
 
-0. Ask first. If your changes are major, or could possibly break existing
+0) Ask first. If your changes are major, or could possibly break existing
    code, you should always ask. If your change is minor and you've
    been working on GTK+ for a while it probably isn't necessary
    to ask. But when in doubt, ask. Even if your change is correct,
    somebody may know a better way to do things.
+
    If you are making changes to GTK+, you should be subscribed
    to gtk-devel-list@gnome.org. (Subscription address:
    gtk-devel-list-request@gnome.org.) This is a good place to ask
    about intended changes.
+
    #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
    is also a good place to find GTK+ developers to discuss changes with,
    however, email to gtk-devel-list is the most certain and preferred
    method.
 
-0. Ask _first_.
+1) Ask _first_.
 
-0. With git, we no longer maintain a ChangeLog file, but you are expected
+2) With git, we no longer maintain a ChangeLog file, but you are expected
    to produce a meaningful commit message. Changes without a sufficient
    commit message will be reverted. See below for the expected format
    of commit messages.
@@ -37,13 +39,13 @@ Notes:
 
 * The expected format for git commit messages is as follows:
 
-```
+=== begin example commit ===
 Short explanation of the commit
 
 Longer explanation explaining exactly what's changed, whether any
 external or private interfaces changed, what bugs were fixed (with bug
 tracker reference if applicable) and so forth. Be concise but not too brief.
-```
+=== end example commit ===
 
   - Always add a brief description of the commit to the _first_ line of
     the commit and terminate by two newlines (it will work without the
@@ -58,8 +60,8 @@ tracker reference if applicable) and so forth. Be concise but not too brief.
     punctuation and capital letters where appropriate. Normally, for patches
     sent to a mailing list it's copied from there.
 
-  - When committing code on behalf of others use the `--author` option, e.g.
-    `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.
+  - When committing code on behalf of others use the --author option, e.g.
+    git commit -a --author "Joe Coder <joe@coder.org>" and --signoff.
 
 
 Owen Taylor
@@ -68,4 +70,3 @@ Owen Taylor
 
 Matthias Clasen
 31 Mar 2009
-

README.in

@@ -0,0 +1,82 @@
+General Information
+===================
+
+This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for
+creating graphical user interfaces. Offering a complete set of widgets,
+GTK+ is suitable for projects ranging from small one-off projects to
+complete application suites.
+
+GTK+ is free software and part of the GNU Project. However, the
+licensing terms for GTK+, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.
+
+The official download locations are:
+  ftp://ftp.gtk.org/pub/gtk
+  http://download.gnome.org/sources/gtk+
+
+The official web site is:
+  http://www.gtk.org/
+
+Information about mailing lists can be found at
+  http://www.gtk.org/mailing-lists.php
+
+
+Installation
+============
+
+See the file 'INSTALL'
+
+
+How to report bugs
+==================
+
+Bugs should be reported to the GNOME bug tracking system.
+(http://bugzilla.gnome.org, product glib.) You will need
+to create an account for yourself.
+
+In the bug report please include:
+
+* Information about your system. For instance:
+
+   - What operating system and version
+   - For Linux, what version of the C library
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug.
+
+  If you can reproduce it with one of the test programs that are built
+  in the tests/ subdirectory, that will be most convenient.  Otherwise,
+  please include a short test program that exhibits the behavior.
+  As a last resort, you can also provide a pointer to a larger piece
+  of software that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out
+  when the crash occurred.
+
+* Further information such as stack traces may be useful, but
+  is not necessary.
+
+
+Patches
+=======
+
+Patches should also be submitted to bugzilla.gnome.org. If the
+patch fixes an existing bug, add the patch as an attachment
+to that bug report.
+
+Otherwise, enter a new bug report that describes the patch,
+and attach the patch to that bug report.
+
+Patches should be in unified diff form. (The -up option to GNU diff)
+Even better are git-formatted patches. (Use git format-patch)
+
+
+Release notes
+=============
+
+Release notes for releases of GTK+ 3.x are part of the migration
+guide in the GTK+ documentation. See
+
+https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html

README.md

@@ -1,159 +0,0 @@
-GTK+ — The GTK toolkit
-======================
-
-[![Build Status](https://gitlab.gnome.org/GNOME/gtk/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gtk/pipelines)
-
-General information
--------------------
-
-GTK+ is a multi-platform toolkit for creating graphical user interfaces.
-Offering a complete set of widgets, GTK+ is suitable for projects ranging
-from small one-off projects to complete application suites.
-
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
-
-The official download location
-
-  - https://download.gnome.org/sources/gtk+
-
-The official web site
-
-  - https://www.gtk.org
-
-The official developers blog
-
-  - https://blog.gtk.org
-
-Information about mailing lists can be found at
-
-  - http://www.gtk.org/mailing-lists.php
-
-Nightly documentation can be found at
-  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
-  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk/
-  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk/
-
-Building and installing
------------------------
-
-In order to build GTK+ you will need:
-
-  - [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
-  - [Python 3](https://www.python.org/)
-  - [Meson](http://mesonbuild.com)
-  - [Ninja](https://ninja-build.org)
-
-You will also need various dependencies, based on the platform you are
-building for:
-
-  - [GLib](https://download.gnome.org/sources/glib)
-  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf)
-  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection)
-  - [Cairo](https://www.cairographics.org)
-  - [Pango](https://download.gnome.org/sources/pango)
-  - [Epoxy](https://github.com/anholt/libepoxy)
-  - [Graphene](https://github.com/ebassi/graphene)
-  - [ATK](https://download.gnome.org/sources/atk)
-  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
-
-If you are building the X11 backend, you will also need:
-
-  - Xlib, and the following X extensions:
-    - xrandr
-    - xrender
-    - xi
-    - xext
-    - xfixes
-    - xcursor
-    - xdamage
-    - xcomposite
-  - [atk-bridge-2.0](https://download.gnome.org/sources/at-spi2-atk)
-
-If you are building the Wayland backend, you will also need:
-
-  - Wayland-client
-  - Wayland-protocols
-  - Wayland-cursor
-  - Wayland-EGL
-
-Once you have all the necessary dependencies, you can build GTK+ by using
-Meson:
-
-```sh
-$ meson _build .
-$ cd _build
-$ ninja
-```
-
-You can run the test suite using:
-
-```sh
-$ meson test
-```
-
-And, finally, you can install GTK+ using:
-
-```
-$ sudo ninja install
-```
-
-Complete information about installing GTK+ and related libraries
-can be found in the file:
-
-```
-docs/reference/gtk/html/gtk-building.html
-```
-
-Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)
-
-How to report bugs
-------------------
-
-Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/new).
-
-In the bug report please include:
-
-* Information about your system. For instance:
-
-   - which version of GTK+ you are using
-   - what operating system and version
-   - for Linux, which distribution
-   - if you built GTK+, the list of options used to configure the build
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug.
-
-  If you can reproduce it with one of the demo applications that are
-  built in the demos/ subdirectory, on one of the test programs that
-  are built in the tests/ subdirectory, that will be most convenient.
-  Otherwise, please include a short test program that exhibits the
-  behavior. As a last resort, you can also provide a pointer to a
-  larger piece of software that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out
-  when the crash occurred.
-
-* Further information such as stack traces may be useful, but
-  is not necessary.
-
-Release notes
--------------
-
-The release notes for GTK+ are part of the migration guide in the API
-reference. See:
-
- - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
- - [4.x release notes](https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html)
-
-Licensing terms
----------------
-
-GTK+ is released under the terms of the GNU Lesser General Public License,
-version 2.1 or, at your option, any later version, as published by the Free
-Software Foundation.
-
-Please, see the `COPYING` file for further information.

README.win32

@@ -0,0 +1,206 @@
+The Win32 backend in GTK+ is not as stable or correct as the X11 one.
+
+For prebuilt runtime and developer packages see
+http://ftp.gnome.org/pub/gnome/binaries/win32/
+
+Building GTK+ on Win32
+======================
+
+First you obviously need developer packages for the compile-time
+dependencies: GDK-Pixbuf, Pango, atk, glib, gettext-runtime, libiconv at least.
+See http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+
+For people compiling GTK+ with Visual C++ 2005 or later, it is
+recommended that the same compiler is used for at least GDK-Pixbuf,
+Pango, atk and glib so that crashes and errors caused by different CRTs
+can be avoided.  The VS 2008 project files and/or VS Makefiles are
+either already available or will be available in the next stable release.
+Unfortunately compiling with Microsoft's compilers versions 2003 or earlier
+is not supported as compiling the latest stable GLib (which *is* required for
+building this GTK+ release) requires features from newer compilers
+and/or Platform SDKs
+
+After installing the dependencies, there are two ways to build GTK+
+for win32.
+
+1) GNU tools, ./configure && make install
+-----------------------------------------
+
+This requires you have mingw and MSYS.
+
+Use the configure script, and the resulting Makefiles (which use
+libtool and gcc to do the compilation). I use this myself, but it can
+be hard to setup correctly.
+
+The full script I run to build GTK+ 2.16 unpacked from a source
+distribution is as below. This is from bulding GTK+ 2.16.5. I don't
+use any script like this to build the development branch, as I don't
+distribute any binaries from development branches.
+
+# This is a shell script that calls functions and scripts from
+# tml@iki.fi's personal work env<6E>ronment. It is not expected to be
+# usable unmodified by others, and is included only for reference.
+
+MOD=gtk+
+VER=2.16.5
+REV=1
+ARCH=win32
+
+THIS=${MOD}_${VER}-${REV}_${ARCH}
+
+RUNZIP=${MOD}_${VER}-${REV}_${ARCH}.zip
+DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
+
+HEX=`echo $THIS | md5sum | cut -d' ' -f1`
+TARGET=c:/devel/target/$HEX
+
+usedev
+usemsvs6
+
+(
+
+set -x
+
+DEPS=`latest --arch=${ARCH} glib atk cairo pango libpng zlib libtiff jpeg`
+PROXY_LIBINTL=`latest --arch=${ARCH} proxy-libintl`
+
+PKG_CONFIG_PATH=
+for D in $DEPS; do
+    PATH=/devel/dist/${ARCH}/$D/bin:$PATH
+    [ -d /devel/dist/${ARCH}/$D/lib/pkgconfig ] && PKG_CONFIG_PATH=/devel/dist/${ARCH}/$D/lib/pkgconfig:$PKG_CONFIG_PATH
+done
+
+LIBPNG=`latest --arch=${ARCH} libpng`
+ZLIB=`latest --arch=${ARCH} zlib`
+LIBTIFF=`latest --arch=${ARCH} libtiff`
+JPEG=`latest --arch=${ARCH} jpeg`
+
+patch -p0 <<'EOF'
+EOF
+
+lt_cv_deplibs_check_method='pass_all' \
+CC='gcc -mtune=pentium3 -mthreads' \
+CPPFLAGS="-I/devel/dist/${ARCH}/${LIBPNG}/include \
+-I/devel/dist/${ARCH}/${ZLIB}/include \
+-I/devel/dist/${ARCH}/${LIBTIFF}/include \
+-I/devel/dist/${ARCH}/${JPEG}/include \
+-I/devel/dist/${ARCH}/${PROXY_LIBINTL}/include" \
+LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
+-L/devel/dist/${ARCH}/${ZLIB}/lib \
+-L/devel/dist/${ARCH}/${LIBTIFF}/lib \
+-L/devel/dist/${ARCH}/${JPEG}/lib \
+-L/devel/dist/${ARCH}/${PROXY_LIBINTL}/lib -Wl,--exclude-libs=libintl.a \
+-Wl,--enable-auto-image-base" \
+LIBS=-lintl \
+CFLAGS=-O2 \
+./configure \
+--enable-win32-backend \
+--disable-gdiplus \
+--with-included-immodules \
+--without-libjasper \
+--enable-debug=yes \
+--enable-explicit-deps=no \
+--disable-gtk-doc \
+--disable-static \
+--prefix=$TARGET &&
+
+libtoolcacheize &&
+rm gtk/gtk.def &&
+(PATH="$PWD/gdk-pixbuf/.libs:/devel/target/$HEX/bin:$PATH" make -j3 install || (rm .libtool-cache* && PATH="/devel/target/$HEX/bin:$PATH" make -j3 install)) &&
+
+PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >/devel/target/$HEX/etc/gtk-2.0/gdk-pixbuf.loaders &&
+
+grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
+    mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
+grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
+    mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
+
+./gtk-zip.sh &&
+
+mv /tmp/${MOD}-${VER}.zip /tmp/$RUNZIP &&
+mv /tmp/${MOD}-dev-${VER}.zip /tmp/$DEVZIP
+
+) 2>&1 | tee /devel/src/tml/packaging/$THIS.log
+
+(cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) &&
+manifestify /tmp/$RUNZIP /tmp/$DEVZIP
+
+You should not just copy the above blindly. There are some things in
+the script that are very specific to *my* build setup on *my* current
+machine. For instance the "latest" command, the "usedev" and
+"usemsvs6" shell functions, the /devel/dist folder. The above script
+is really just meant for reference, to give an idea. You really need
+to understand what things like PKG_CONFIG_PATH are and set them up
+properly after installing the dependencies before building GTK+.
+
+As you see above, after running configure, one can just say "make
+install", like on Unix. A post-build fix is needed, running
+gdk-pixbuf-query-loaders once more to get a correct gdk-pixbuf.loaders
+file.
+
+For a 64-bit build you need to remove the gtk/gtk.def file and let it
+be regenerated by the makefilery. This is because the 64-bit GTK dll
+has a slightly different list of exported function names. This is on
+purpose and not a bug. The API is the same at the source level, and
+the same #defines of some function names to actually have a _utf8
+suffix is used (just to keep the header simpler). But the
+corresponding non-suffixed function to maintain ABI stability are not
+needed in the 64-bit case (because there are no older EXEs around that
+would require such for ABI stability).
+
+
+2) Microsoft's tools
+--------------------
+
+Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
+makefile.msc in gdk and gtk. Be prepared to manually edit various
+makefile.msc files, and the makefile snippets in build/win32.
+
+There are also VS 2008/2010 solution and project files to build GTK+, which
+are maintained by Chun-wei Fan.  They should build GTK+ out of the box,
+provided that the afore-mentioned dependencies are installed.  They will
+build GDK with the Win32 backend, GTK+ itself (with GAIL/a11y built in),
+the GAIL-Util library and the gtk-demo program.
+
+Please refer to the following GNOME Live! page for a more detailed ouline
+on the process of building the GTK+ stack and its dependencies with Visual
+C++:
+
+https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack
+
+Alternative 1 also generates Microsoft import libraries (.lib), if you
+have lib.exe available. It might also work for cross-compilation from
+Unix.
+
+I (Tor) use method 1 myself. Hans Breuer has been taking care of the MSVC
+makefiles. At times, we disagree a bit about various issues, and for
+instance the makefile.msc files might not produce identically named
+DLLs and import libraries as the "autoconfiscated" makefiles and
+libtool do. If this bothers you, you will have to fix the makefiles.
+
+Using GTK+ on Win32
+===================
+
+To use GTK+ on Win32, you also need either one of the above mentioned
+compilers. Other compilers might work, but don't count on it. Look for
+prebuilt developer packages (DLLs, import libraries, headers) on the
+above website.
+
+Multi-threaded use of GTK+ on Win32
+===================================
+
+Multi-threaded GTK+ programs might work on Windows in special simple
+cases, but not in general. Sorry. If you have all GTK+ and GDK calls
+in the same thread, it might work. Otherwise, probably not at
+all. Possible ways to fix this are being investigated.
+
+Wintab
+======
+
+The tablet support uses the Wintab API. The Wintab development kit is
+no longer required. The wintab.h header file is bundled with GTK+
+sources. Unfortunately it seems that only Wacom tablets come with
+support for the Wintab API nowadays.
+
+--Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+--Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>

acinclude.m4

@@ -0,0 +1,79 @@
+# autoconf 2.13 / 2.50 compatibility macro
+
+# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
+# ---------------------------------
+# Put STUFF early enough so that they are available for $ac_help expansion.
+# Handle both classic (<= v2.13) and modern autoconf
+AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
+       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
+              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+$1
+AC_DIVERT_POP()])])])
+
+# GTK_ADD_LIB(VAR,LIBNAME)
+# ---------------------------------
+# Helper macro to add a -lBlah to a variable, avoiding repeats
+# Note that this needs to be quoted when used in an enclosing macro
+AC_DEFUN([GTK_ADD_LIB],
+[ case "$$1 " in
+    *-l$2[[\ \	]]*)               ;;
+    *)               $1="-l$2 $$1" ;;
+  esac
+])
+
+
+# Checks the location of the XML Catalog
+# Usage:
+#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
+AC_DEFUN([JH_PATH_XML_CATALOG],
+[
+  # check for the presence of the XML catalog
+  AC_ARG_WITH([xml-catalog],
+              AC_HELP_STRING([--with-xml-catalog=CATALOG],
+                             [path to xml catalog to use]),,
+              [with_xml_catalog=/etc/xml/catalog])
+  jh_found_xmlcatalog=true
+  XML_CATALOG_FILE="$with_xml_catalog"
+  AC_SUBST([XML_CATALOG_FILE])
+  AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
+  if test -f "$XML_CATALOG_FILE"; then
+    AC_MSG_RESULT([found])
+  else
+    jh_found_xmlcatalog=false
+    AC_MSG_RESULT([not found])
+  fi
+
+  # check for the xmlcatalog program
+  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
+  if test "x$XMLCATALOG" = xno; then
+    jh_found_xmlcatalog=false
+  fi
+
+  if $jh_found_xmlcatalog; then
+    ifelse([$1],,[:],[$1])
+  else
+    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
+  fi
+])
+
+# Checks if a particular URI appears in the XML catalog
+# Usage:
+#   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([JH_CHECK_XML_CATALOG],
+[
+  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+  AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+  if $jh_found_xmlcatalog && \
+     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+    AC_MSG_RESULT([found])
+    ifelse([$3],,,[$3
+])dnl
+  else
+    AC_MSG_RESULT([not found])
+    ifelse([$4],,
+       [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
+       [$4])
+  fi
+])

autogen.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd "$srcdir"
+
+mkdir -p m4
+
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+        echo "*** No GTK-Doc found, please install it ***"
+        exit 1
+else
+        gtkdocize || exit $?
+fi
+
+PKGCONFIG=`which pkg-config`
+if test -z "$PKGCONFIG"; then
+        echo "*** pkg-config not found, please install it ***"
+        exit 1
+fi
+
+pkg-config --print-errors gobject-introspection-1.0
+if [ $? != 0 ]; then
+	echo "You probably need to install 'libgirepository1.0-dev'"
+	exit 1
+fi
+
+# README and INSTALL are required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch these here, they will be
+# regenerated from their corresponding *.in files by ./configure anyway.
+touch README INSTALL
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+else
+        autoreconf --force --install --verbose || exit $?
+fi
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"

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

@@ -1,74 +0,0 @@
-{
-    "app-id": "org.gtk.Demo",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-demo",
-    "tags": ["devel", "development", "nightly"],
-    "rename-icon": "gtk4-demo",
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "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,74 +0,0 @@
-{
-    "app-id": "org.gtk.WidgetFactory",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-widget-factory",
-    "tags": ["devel", "development", "nightly"],
-    "rename-icon": "gtk4-widget-factory",
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "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/meson/post-install.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-gtk_api_version=$1
+gtk_version=$1
 gtk_abi_version=$2
 gtk_libdir=$3
 gtk_datadir=$4
@@ -16,11 +16,6 @@ if [ -z "$DESTDIR" ]; then
   echo Updating icon cache...
   gtk-update-icon-cache -q -t -f ${gtk_datadir}/icons/hicolor
 
-  echo Updating module cache for print backends...
-  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
-  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
-
-  echo Updating module cache for input methods...
-  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/immodules
-  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/immodules
+  echo Updating input method modules cache...
+  gtk4-query-immodules > ${gtk_libdir}/gtk-${version}/${gtk_abi_version}/immodules.cache
 fi

config.h.meson

@@ -1,7 +1,7 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
+#mesondefine ENABLE_NLS
 
 /* The prefix for our gettext translation domains. */
 #mesondefine GETTEXT_PACKAGE
@@ -15,9 +15,6 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
 
-/* Have the cloudproviders library */
-#mesondefine HAVE_CLOUDPROVIDERS
-
 /* define if we have colord */
 #mesondefine HAVE_COLORD
 
@@ -41,9 +38,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #mesondefine HAVE_DLFCN_H
 
-/* Have the ffmpeg library */
-#mesondefine HAVE_FFMPEG
-
 /* Define to 1 if you have the <ftw.h> header file. */
 #mesondefine HAVE_FTW_H
 
@@ -56,9 +50,6 @@
 /* Define if gio-unix is available */
 #mesondefine HAVE_GIO_UNIX
 
-/* Define if GStreamer support is available */
-#mesondefine HAVE_GSTREAMER
-
 /* Define to 1 if you have the `httpGetAuthString' function. */
 #mesondefine HAVE_HTTPGETAUTHSTRING
 
@@ -286,10 +277,6 @@
 /* Define to 1 if linux/memfd.h exists */
 #mesondefine HAVE_LINUX_MEMFD_H
 
-#mesondefine HAVE_LINUX_INPUT_H
-
-#mesondefine HAVE_DEV_EVDEV_INPUT_H
-
 #mesondefine GTK_SYSCONFDIR
 
 #mesondefine GTK_LOCALEDIR
@@ -299,19 +286,3 @@
 #mesondefine GTK_LIBDIR
 
 #mesondefine GTK_PRINT_BACKENDS
-
-#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

config.h.win32.in

@@ -0,0 +1,337 @@
+/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* always defined to indicate that i18n is enabled */
+#define ENABLE_NLS 1
+
+/* define to enable packagekit */
+/* #undef ENABLE_PACKAGEKIT */
+
+/* The prefix for our gettext translation domains. */
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+
+/* Disable deprecation warnings from glib */
+/* #undef GLIB_DISABLE_DEPRECATION_WARNINGS */
+
+/* Define if debugging is enabled */
+#define GTK_COMPILED_WITH_DEBUGGING "yes"
+
+/* Define the location where the catalogs will be installed */
+#define GTK_LOCALEDIR "NONE/share/locale"
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+
+/* define if we have colord */
+/* #undef HAVE_COLORD */
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+/* #undef HAVE_CRT_EXTERNS_H */
+
+/* Define to 1 if CUPS 1.2 API is available */
+/* #undef HAVE_CUPS_API_1_2 */
+
+/* Define to 1 if you have the `dcgettext' function. */
+#define HAVE_DCGETTEXT 1
+
+/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
+   */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_DECL_ISINF 1
+#endif
+
+/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
+   */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_DECL_ISNAN 1
+#endif
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you have the `exp2' function. */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_EXP2 1
+#endif
+
+/* Define to 1 if you have the `flockfile' function. */
+#undef HAVE_FLOCKFILE
+
+/* Define to 1 if you have the <ftw.h> header file. */
+/* #undef HAVE_FTW_H */
+
+/* Define to 1 if you have the `getpagesize' function. */
+#ifndef _MSC_VER
+#define HAVE_GETPAGESIZE 1
+#else
+/* #undef HAVE_GETPAGESIZE */
+#endif
+
+/* Define to 1 if you have the `getresuid' function. */
+/* #undef HAVE_GETRESUID */
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* Define if gio-unix is available */
+/* #undef HAVE_GIO_UNIX */
+
+/* Have GNU ftw */
+/* #undef HAVE_GNU_FTW */
+
+/* Define to 1 if you have the `httpGetAuthString' function. */
+/* #undef HAVE_HTTPGETAUTHSTRING */
+
+/* Define if cups http_t authstring field is accessible */
+/* #undef HAVE_HTTP_AUTHSTRING */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_INTTYPES_H 1
+#else
+/* #undef HAVE_INTTYPES_H */
+#endif
+
+/* Define to 1 if the system has the type `IPrintDialogCallback'. */
+#define HAVE_IPRINTDIALOGCALLBACK 1
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+/* #undef HAVE_LC_MESSAGES */
+
+/* Define to 1 if you have the `m' library (-lm). */
+#ifndef _MSC_VER
+#define HAVE_LIBM 1
+#endif
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+/* #undef HAVE_LOCALTIME_R */
+
+/* Define to 1 if you have the `log2' function. */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_LOG2 1
+#endif
+
+/* Define to 1 if you have the `lstat' function. */
+/* #undef HAVE_LSTAT */
+
+/* Define to 1 if you have the `mallinfo' function. */
+/* #undef HAVE_MALLINFO */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkstemp' function. */
+/* #undef HAVE_MKSTEMP */
+
+/* Define to 1 if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define to 1 if nearbyint() is available */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_NEARBYINT 1
+#endif
+
+/* Define to 1 if libpapi available */
+/* #undef HAVE_PAPI */
+
+/* Define to 1 if you have the <pwd.h> header file. */
+/* #undef HAVE_PWD_H */
+
+/* Have the Xrandr extension library */
+/* #undef HAVE_RANDR */
+
+/* Define to 1 if rint() is available */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_RINT 1
+#endif
+
+/* Define to 1 if round() is available */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_ROUND 1
+#endif
+
+/* Define to 1 if sincos() is available */
+/* #undef HAVE_SINCOS */
+
+/* Have the sockaddr_un.sun_len member */
+/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
+
+/* Define to 1 if solaris xinerama is available */
+/* #undef HAVE_SOLARIS_XINERAMA */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_STDINT_H 1
+#else
+#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */
+#define HAVE_STDINT_H 1
+#endif
+/* #undef HAVE_STDINT_H */
+#endif
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_STRINGS_H 1
+#endif
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if sys/sysinfo.h is available */
+/* #undef HAVE_SYS_SYSINFO_H */
+
+/* Define to 1 if sys/systeminfo.h is available */
+/* #undef HAVE_SYS_SYSTEMINFO_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_SYS_TIME_H */
+#endif
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H 1
+#else
+/* #undef HAVE_UNISTD_H */
+#endif
+
+/* Have the XCOMPOSITE X extension */
+/* #undef HAVE_XCOMPOSITE */
+
+/* Have the Xcursor library */
+/* #undef HAVE_XCURSOR */
+
+/* Have the XDAMAGE X extension */
+/* #undef HAVE_XDAMAGE */
+
+/* Have the XFIXES X extension */
+/* #undef HAVE_XFIXES */
+
+/* Define to 1 if XFree Xinerama is available */
+/* #undef HAVE_XFREE_XINERAMA */
+
+/* Have XGenericEvent */
+/* #undef HAVE_XGENERICEVENTS */
+
+/* Define to 1 if xinerama is available */
+/* #undef HAVE_XINERAMA */
+
+/* Define to use XKB extension */
+/* #undef HAVE_XKB */
+
+/* Have the SYNC extension library */
+/* #undef HAVE_XSYNC */
+
+/* Define to 1 if you have the `_lock_file' function. */
+#define HAVE__LOCK_FILE
+
+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
+/* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */
+
+/* Define if _NL_PAPER_HEIGHT is available */
+/* #undef HAVE__NL_PAPER_HEIGHT */
+
+/* Define if _NL_PAPER_WIDTH is available */
+/* #undef HAVE__NL_PAPER_WIDTH */
+
+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
+/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
+
+/* Define to 1 if you have the `_NSGetEnviron' function. */
+/* #undef HAVE__NSGETENVIRON */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define if <X11/extensions/XIproto.h> needed for xReply */
+/* #undef NEED_XIPROTO_H_FOR_XREPLY */
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#ifndef _MSC_VER
+/* #undef NO_MINUS_C_MINUS_O */
+#else 
+#define NO_MINUS_C_MINUS_O 1
+#endif
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "gtk+"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "gtk+ @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "gtk+"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
+
+/* Use NSBundle functions to determine load paths for libraries, translations,
+   etc. */
+/* #undef QUARTZ_RELOCATION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if gmodule works and should be used */
+#define USE_GMODULE 1
+
+/* Define to 1 if XInput 2.0 is available */
+/* #undef XINPUT_2 */
+
+/* Define to 1 if XInput 2.2 is available */
+/* #undef XINPUT_2_2 */
+
+/* Define to 1 if the X Window System is missing or not being used. */
+/* #undef X_DISPLAY_MISSING */
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+/* # define _DARWIN_USE_64_BIT_INODE 1 */
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* defines how to decorate public symbols while building */
+#ifdef _MSC_VER
+#define _GDK_EXTERN __declspec (dllexport) extern
+#else
+#define _GDK_EXTERN __attribute__((visibility("default")))  __declspec (dllexport) extern
+#endif
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define gid_t int
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define uid_t int

demos/Makefile.am

@@ -0,0 +1,6 @@
+## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = gtk-demo widget-factory icon-browser
+
+-include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -0,0 +1,206 @@
+## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
+
+## These should be in the order you want them to appear in the
+## demo app, which means alphabetized by demo title, not filename
+demos_base =					\
+	application_demo.c			\
+	assistant.c				\
+	builder.c				\
+	button_box.c				\
+	changedisplay.c				\
+	clipboard.c				\
+	colorsel.c				\
+	combobox.c				\
+	css_accordion.c                         \
+	css_basics.c				\
+	css_blendmodes.c			\
+	css_multiplebgs.c			\
+	css_pixbufs.c				\
+	css_shadows.c				\
+	cursors.c				\
+	dialog.c				\
+	drawingarea.c				\
+	editable_cells.c			\
+	entry_buffer.c				\
+	entry_completion.c			\
+	event_axes.c				\
+	expander.c  				\
+        filtermodel.c				\
+	fishbowl.c				\
+	widgetbowl.c				\
+	foreigndrawing.c			\
+	gestures.c				\
+	glarea.c				\
+	headerbar.c				\
+	hypertext.c				\
+	iconview.c				\
+	iconview_edit.c				\
+	images.c				\
+	infobar.c				\
+	links.c					\
+	listbox.c				\
+	flowbox.c				\
+	list_store.c				\
+	markup.c				\
+	menus.c					\
+	modelbutton.c				\
+	overlay.c				\
+	overlay2.c				\
+	panes.c					\
+	pickers.c				\
+	pixbufs.c				\
+	popover.c				\
+	printing.c				\
+	revealer.c				\
+	rotated_text.c				\
+	scale.c					\
+	search_entry.c				\
+	search_entry2.c				\
+	shortcuts.c				\
+	sidebar.c				\
+	sizegroup.c				\
+	spinbutton.c				\
+	spinner.c				\
+	stack.c					\
+	tabs.c					\
+	textmask.c				\
+	textview.c				\
+	textscroll.c				\
+	theming_style_classes.c			\
+	toolpalette.c				\
+	transparent.c				\
+	tree_store.c
+
+demos_opt =
+
+if BUILD_FONT_DEMO
+demos_opt += font_features.c
+endif
+
+if OS_UNIX
+demos_opt += pagesetup.c
+endif
+
+demos = $(demos_base) $(demos_opt)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir) 			\
+	-I$(top_builddir)/gdk			\
+	-DGDK_DISABLE_DEPRECATED		\
+	-DGTK_DISABLE_DEPRECATED 		\
+	$(GTK_DEBUG_FLAGS)			\
+	$(GTK_DEP_CFLAGS)
+
+DEPS = \
+	$(top_builddir)/gtk/libgtk-4.la
+
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-4.la		\
+	$(GTK_DEP_LIBS)				\
+	$(GDK_DEP_LIBS)				\
+	-lm
+
+if BUILD_FONT_DEMO
+AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
+LDADDS += $(FONTDEMO_LIBS)
+endif
+
+bin_PROGRAMS = gtk4-demo gtk4-demo-application
+
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = gtk4-demo.desktop
+
+BUILT_SOURCES = demos.h demo_resources.c
+
+EXTRA_DIST += 				\
+	data/source.svg			\
+	data/symbolic-source.svg	\
+	demo.gresource.xml		\
+	$(resource_files)		\
+	org.gtk.Demo.gschema.xml	\
+	demos.h.win32
+
+gsettings_SCHEMAS = \
+	org.gtk.Demo.gschema.xml
+
+@GSETTINGS_RULES@
+
+demos.h: $(demos) geninclude.pl
+	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
+
+demos.h.win32: $(demos_base) geninclude.pl
+	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
+
+nodist_gtk4_demo_SOURCES = demos.h
+
+gtk4_demo_SOURCES = 		\
+	$(demos)		\
+	gtkfishbowl.c		\
+	gtkfishbowl.h		\
+	demo_resources.c	\
+	main.c
+
+gtk4_demo_DEPENDENCIES = $(DEPS)
+gtk4_demo_LDADD = $(LDADDS)
+gtk4_demo_LDFLAGS = -export-dynamic
+
+gtk4_demo_application_SOURCES = \
+	application.c 		\
+	demo_resources.c
+
+gtk4_demo_application_LDADD = $(LDADDS)
+
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)
+
+demo_resources.c: demo.gresource.xml $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
+
+iconthemedir = $(datadir)/icons/hicolor
+
+appsicon16dir = $(iconthemedir)/16x16/apps
+appsicon22dir = $(iconthemedir)/22x22/apps
+appsicon24dir = $(iconthemedir)/24x24/apps
+appsicon32dir = $(iconthemedir)/32x32/apps
+appsicon48dir = $(iconthemedir)/48x48/apps
+appsicon256dir = $(iconthemedir)/256x256/apps
+appsiconscalabledir = $(iconthemedir)/scalable/apps
+
+dist_appsicon16_DATA = data/16x16/gtk4-demo.png data/16x16/gtk4-demo-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-demo.png data/22x22/gtk4-demo-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-demo.png data/24x24/gtk4-demo-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-demo.png data/32x32/gtk4-demo-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-demo.png data/48x48/gtk4-demo-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-demo.png data/256x256/gtk4-demo-symbolic.symbolic.png
+
+update_icon_cache = $(top_builddir)/gtk/gtk4-update-icon-cache$(EXEEXT) --ignore-theme-index --force
+
+install-data-hook: install-update-icon-cache
+uninstall-hook: uninstall-update-icon-cache
+
+install-update-icon-cache:
+	$(AM_V_at)$(POST_INSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+uninstall-update-icon-cache:
+	$(AM_V_at)$(POST_UNINSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+# ------------------- MSVC Build Items ----------------
+MSVCPROJS = gtk4-demo gtk4-demo-application
+
+gtk4_demo_FILES = $(gtk4_demo_SOURCES)
+gtk4_demo_EXCLUDES = font_features.c|pagesetup.c
+
+gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES)
+gtk4_demo_application_EXCLUDES = dummy
+
+include $(top_srcdir)/win32/Makefile.msvcproj
+
+dist-hook: \
+	$(top_builddir)/win32/vs12/gtk4-demo.vcxproj	\
+	$(top_builddir)/win32/vs12/gtk4-demo-application.vcxproj
+
+DISTCLEANFILES = demos.h demos.h.win32
+
+-include $(top_srcdir)/git.mk

demos/gtk-demo/application.c

@@ -455,49 +455,34 @@ demo_application_window_constructed (GObject *object)
 }
 
 static void
-demo_application_window_size_allocate (GtkWidget *widget,
-                                       int        width,
-                                       int        height,
-                                       int        baseline)
+demo_application_window_size_allocate (GtkWidget           *widget,
+                                       const GtkAllocation *allocation,
+                                       int                  baseline,
+                                       GtkAllocation       *out_clip)
 {
   DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
 
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget,
-                                                                          width,
-                                                                          height,
-                                                                          baseline);
+  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget, allocation,
+                                                                          baseline, out_clip);
 
   if (!window->maximized && !window->fullscreen)
     gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
 }
 
-static void
-surface_state_changed (GtkWidget *widget)
+static gboolean
+demo_application_window_state_event (GtkWidget           *widget,
+                                     GdkEventWindowState *event)
 {
   DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-  GdkSurfaceState new_state;
+  gboolean res = GDK_EVENT_PROPAGATE;
 
-  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;
-}
+  if (GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event)
+    res = GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event (widget, event);
 
-static void
-demo_application_window_realize (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);
+  window->maximized = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  window->fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
 
-  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_widget_get_surface (widget),
-                                        surface_state_changed, widget);
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
+  return res;
 }
 
 static void
@@ -519,8 +504,7 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
   object_class->constructed = demo_application_window_constructed;
 
   widget_class->size_allocate = demo_application_window_size_allocate;
-  widget_class->realize = demo_application_window_realize;
-  widget_class->unrealize = demo_application_window_unrealize;
+  widget_class->window_state_event = demo_application_window_state_event;
   widget_class->destroy = demo_application_window_destroy;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");

demos/gtk-demo/application.ui

@@ -7,29 +7,35 @@
     <property name="icon-name">document-open</property>
     <child>
       <object class="GtkGrid">
+        <property name="visible">1</property>
         <child>
           <object class="GtkToolbar">
+            <property name="visible">1</property>
             <property name="hexpand">1</property>
             <style>
               <class name="primary-toolbar"/>
             </style>
             <child>
               <object class="GtkMenuToolButton" id="menutool">
+                <property name="visible">1</property>
                 <property name="icon-name">document-open</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="icon-name">application-exit</property>
                 <property name="action-name">app.quit</property>
               </object>
             </child>
             <child>
               <object class="GtkSeparatorToolItem">
+                <property name="visible">1</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="icon-name">applications-other</property>
                 <property name="action-name">win.logo</property>
               </object>
@@ -48,6 +54,7 @@
               <object class="GtkBox" id="content_area">
                 <child>
                   <object class="GtkLabel" id="message">
+                    <property name="visible">1</property>
                     <property name="hexpand">1</property>
                   </object>
                 </child>
@@ -57,9 +64,10 @@
               <object class="GtkBox">
                 <child>
                   <object class="GtkButton">
+                    <property name="visible">1</property>
                     <property name="valign">center</property>
                     <property name="label" translatable="yes">_OK</property>
-                    <property name="use-underline">1</property>
+                    <property name="use_underline">1</property>
                     <signal name="clicked" handler="clicked_cb"/>
                   </object>
                 </child>
@@ -73,9 +81,11 @@
         </child>
         <child>
           <object class="GtkScrolledWindow">
+            <property name="visible">1</property>
             <property name="shadow-type">in</property>
             <child>
               <object class="GtkTextView">
+                <property name="visible">1</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>
                 <property name="buffer">buffer</property>
@@ -90,6 +100,7 @@
         <child>
           <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
+            <property name="visible">1</property>
           </object>
           <packing>
             <property name="left-attach">0</property>

demos/gtk-demo/assistant.c

@@ -144,11 +144,8 @@ static void
 create_page4 (GtkWidget *assistant)
 {
   progress_bar = gtk_progress_bar_new ();
-  gtk_widget_set_halign (progress_bar, GTK_ALIGN_FILL);
+  gtk_widget_set_halign (progress_bar, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (progress_bar, GTK_ALIGN_CENTER);
-  gtk_widget_set_hexpand (progress_bar, TRUE);
-  gtk_widget_set_margin_start (progress_bar, 40);
-  gtk_widget_set_margin_end (progress_bar, 40);
 
   gtk_widget_show (progress_bar);
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), progress_bar);
@@ -170,8 +167,8 @@ do_assistant (GtkWidget *do_widget)
 
       gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
 
-      gtk_window_set_display (GTK_WINDOW (assistant),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (assistant),
+                             gtk_widget_get_screen (do_widget));
 
       create_page1 (assistant);
       create_page2 (assistant);

demos/gtk-demo/blendmodes.ui

@@ -2,16 +2,21 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="window">
-    <property name="resizable">0</property>
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
     <property name="title">CSS Blend Modes</property>
-    <property name="default-width">400</property>
-    <property name="default-height">300</property>
+    <property name="default_width">400</property>
+    <property name="default_height">300</property>
     <child>
       <object class="GtkGrid">
-        <property name="row-spacing">12</property>
-        <property name="column-spacing">12</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="row_spacing">12</property>
+        <property name="column_spacing">12</property>
         <child>
           <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Blend mode:</property>
             <property name="xalign">0</property>
             <style>
@@ -19,108 +24,128 @@
             </style>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="can-focus">1</property>
-            <property name="vexpand">1</property>
-            <property name="shadow-type">in</property>
-            <property name="min-content-width">150</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="vexpand">True</property>
+            <property name="shadow_type">in</property>
+            <property name="min_content_width">150</property>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkStackSwitcher">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="halign">center</property>
-            <property name="hexpand">1</property>
+            <property name="hexpand">True</property>
             <property name="stack">stack</property>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkStack" id="stack">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="hhomogeneous">0</property>
-            <property name="vhomogeneous">0</property>
-            <property name="transition-type">crossfade</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="hhomogeneous">False</property>
+            <property name="vhomogeneous">False</property>
+            <property name="transition_type">crossfade</property>
             <child>
               <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
+                <property name="hexpand">False</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">12</property>
+                <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Duck</property>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Background</property>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <style>
                       <class name="duck"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <style>
                       <class name="gradient"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">
 Blended picture</property>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <style>
                       <class name="blend0"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -132,72 +157,87 @@ Blended picture</property>
             </child>
             <child>
               <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
+                <property name="hexpand">False</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">12</property>
+                <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Red</property>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Blue</property>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <style>
                       <class name="red"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <style>
                       <class name="blue"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">
 Blended picture</property>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <style>
                       <class name="blend1"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -209,59 +249,71 @@ Blended picture</property>
             </child>
             <child>
               <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">12</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <style>
                       <class name="cyan"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <style>
                       <class name="magenta"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <style>
                       <class name="yellow"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <style>
                       <class name="blend2"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Cyan</property>
                     <property name="xalign">0</property>
                     <style>
@@ -269,12 +321,14 @@ Blended picture</property>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Magenta</property>
                     <property name="xalign">0</property>
                     <style>
@@ -282,12 +336,14 @@ Blended picture</property>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Yellow</property>
                     <property name="xalign">0</property>
                     <style>
@@ -295,12 +351,14 @@ Blended picture</property>
                     </style>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Blended picture</property>
                     <property name="xalign">0</property>
                     <attributes>
@@ -308,8 +366,8 @@ Blended picture</property>
                     </attributes>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
                   </packing>
                 </child>
               </object>
@@ -320,13 +378,14 @@ Blended picture</property>
             </child>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
       </object>
     </child>
     <child type="titlebar">
+      <placeholder/>
     </child>
   </object>
 </interface>

demos/gtk-demo/builder.c

@@ -61,8 +61,8 @@ do_builder (GtkWidget *do_widget)
 
       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));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
       toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));

demos/gtk-demo/button_box.c

@@ -55,8 +55,8 @@ do_button_box (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
 
     g_signal_connect (window, "destroy",

demos/gtk-demo/changedisplay.c

@@ -68,33 +68,32 @@ enum
 static GtkWidget *
 find_toplevel_at_pointer (GdkDisplay *display)
 {
-  GdkSurface *pointer_window;
+  GdkWindow *pointer_window;
   GtkWidget *widget = NULL;
 
-  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (),
+  pointer_window = gdk_device_get_window_at_position (gtk_get_current_event_device (),
                                                       NULL, NULL);
 
-  /* The user data field of a GdkSurface is used to store a pointer
+  /* The user data field of a GdkWindow is used to store a pointer
    * to the widget that created it.
    */
   if (pointer_window)
     {
       gpointer widget_ptr;
-      gdk_surface_get_user_data (pointer_window, &widget_ptr);
+      gdk_window_get_user_data (pointer_window, &widget_ptr);
       widget = widget_ptr;
     }
 
   return widget ? gtk_widget_get_toplevel (widget) : NULL;
 }
 
-static void
-released_cb (GtkGestureMultiPress *gesture,
-             guint                 n_press,
-             gdouble               x,
-             gdouble               y,
-             gboolean             *clicked)
+static gboolean
+button_release_event_cb (GtkWidget       *widget,
+                         GdkEventButton  *event,
+                         gboolean        *clicked)
 {
   *clicked = TRUE;
+  return TRUE;
 }
 
 /* Asks the user to click on a window, then waits for them click
@@ -102,16 +101,17 @@ released_cb (GtkGestureMultiPress *gesture,
  * window under the pointer, or NULL, if there is none.
  */
 static GtkWidget *
-query_for_toplevel (GdkDisplay *display,
+query_for_toplevel (GdkScreen  *screen,
                     const char *prompt)
 {
+  GdkDisplay *display = gdk_screen_get_display (screen);
   GtkWidget *popup, *label, *frame;
   GdkCursor *cursor;
   GtkWidget *toplevel = NULL;
   GdkDevice *device;
 
   popup = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_window_set_display (GTK_WINDOW (popup), display);
+  gtk_window_set_screen (GTK_WINDOW (popup), screen);
   gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
   gtk_window_set_position (GTK_WINDOW (popup), GTK_WIN_POS_CENTER);
 
@@ -124,37 +124,34 @@ query_for_toplevel (GdkDisplay *display,
   gtk_container_add (GTK_CONTAINER (frame), label);
 
   gtk_widget_show (popup);
-  cursor = gdk_cursor_new_from_name ("crosshair", NULL);
+  cursor = gdk_cursor_new_from_name (display, "crosshair");
   device = gtk_get_current_event_device ();
 
   if (gdk_seat_grab (gdk_device_get_seat (device),
-                     gtk_widget_get_surface (popup),
+                     gtk_widget_get_window (popup),
                      GDK_SEAT_CAPABILITY_ALL_POINTING,
                      FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
     {
-      GtkGesture *gesture = gtk_gesture_multi_press_new ();
       gboolean clicked = FALSE;
 
-      g_signal_connect (gesture, "released",
-                        G_CALLBACK (released_cb), &clicked);
-      gtk_widget_add_controller (popup, GTK_EVENT_CONTROLLER (gesture));
+      g_signal_connect (popup, "button-release-event",
+                        G_CALLBACK (button_release_event_cb), &clicked);
 
-      /* Process events until clicked is set by our button release event handler.
+      /* Process events until clicked is set by button_release_event_cb.
        * We pass in may_block=TRUE since we want to wait if there
        * are no events currently.
        */
       while (!clicked)
         g_main_context_iteration (NULL, TRUE);
 
-      gdk_seat_ungrab (gdk_device_get_seat (device));
-
-      toplevel = find_toplevel_at_pointer (display);
+      toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
       if (toplevel == popup)
         toplevel = NULL;
     }
 
   g_object_unref (cursor);
   gtk_widget_destroy (popup);
+  gdk_flush ();                 /* Really release the grab */
 
   return toplevel;
 }
@@ -165,17 +162,17 @@ query_for_toplevel (GdkDisplay *display,
 static void
 query_change_display (ChangeDisplayInfo *info)
 {
-  GdkDisplay *display = gtk_widget_get_display (info->window);
+  GdkScreen *screen = gtk_widget_get_screen (info->window);
   GtkWidget *toplevel;
 
-  toplevel = query_for_toplevel (display,
+  toplevel = query_for_toplevel (screen,
                                  "Please select the toplevel\n"
-                                 "to move to the new display");
+                                 "to move to the new screen");
 
   if (toplevel)
-    gtk_window_set_display (GTK_WINDOW (toplevel), info->current_display);
+    gtk_window_set_screen (GTK_WINDOW (toplevel), gdk_display_get_default_screen (info->current_display));
   else
-    gdk_display_beep (display);
+    gdk_display_beep (gdk_screen_get_display (screen));
 }
 
 /* Called when the user clicks on a button in our dialog or

demos/gtk-demo/clipboard.c

@@ -1,6 +1,6 @@
 /* Clipboard
  *
- * GdkClipboard is used for clipboard handling. This demo shows how to
+ * GtkClipboard is used for clipboard handling. This demo shows how to
  * copy and paste text to and from the clipboard.
  *
  * It also shows how to transfer images via the clipboard or via
@@ -13,104 +13,78 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-static GtkWidget *window = NULL;
-
 void
 copy_button_clicked (GtkWidget *button,
                      gpointer   user_data)
 {
   GtkWidget *entry;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
 
   entry = GTK_WIDGET (user_data);
 
   /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);
 
   /* Set clipboard text */
-  gdk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)));
+  gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
 }
 
 void
-paste_received (GObject      *source_object,
-                GAsyncResult *result,
+paste_received (GtkClipboard *clipboard,
+                const gchar  *text,
                 gpointer      user_data)
 {
-  GdkClipboard *clipboard;
   GtkWidget *entry;
-  char *text;
-  GError *error = NULL;
 
-  clipboard = GDK_CLIPBOARD (source_object);
   entry = GTK_WIDGET (user_data);
 
-  /* Get the resulting text of the read operation */
-  text = gdk_clipboard_read_text_finish (clipboard, result, &error);
-
-  if (text)
-    {
-      /* Set the entry text */
-      gtk_entry_set_text (GTK_ENTRY (entry), text);
-      g_free (text);
-    }
-  else
-    {
-      GtkWidget *dialog;
-
-      /* Show an error about why pasting failed.
-       * Usually you probably want to ignore such failures,
-       * but for demonstration purposes, we show the error.
-       */
-      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Could not paste text: %s",
-                                       error->message);
-      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
-      gtk_widget_show (dialog);
-
-      g_error_free (error);
-    }
+  /* Set the entry text */
+  if(text)
+    gtk_entry_set_text (GTK_ENTRY (entry), text);
 }
 
 void
 paste_button_clicked (GtkWidget *button,
-                      gpointer   user_data)
+                     gpointer   user_data)
 {
   GtkWidget *entry;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
 
   entry = GTK_WIDGET (user_data);
 
   /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);
 
   /* Request the contents of the clipboard, contents_received will be
      called when we do get the contents.
    */
-  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
+  gtk_clipboard_request_text (clipboard,
+                              paste_received, entry);
 }
 
-static GdkPaintable *
-get_image_paintable (GtkImage *image)
+static GdkPixbuf *
+get_image_pixbuf (GtkImage *image)
 {
   const gchar *icon_name;
+  GtkIconSize size;
   GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
+  int width;
 
   switch (gtk_image_get_storage_type (image))
     {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
+    case GTK_IMAGE_PIXBUF:
+      return g_object_ref (gtk_image_get_pixbuf (image));
     case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (image);
-      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
-      if (icon_info == NULL)
-        return NULL;
-      return GDK_PAINTABLE (gtk_icon_info_load_texture (icon_info));
+      gtk_image_get_icon_name (image, &icon_name, &size);
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (image)));
+      gtk_icon_size_lookup (size, &width, NULL);
+      return gtk_icon_theme_load_icon (icon_theme,
+                                       icon_name,
+                                       width,
+                                       GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+                                       NULL);
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
@@ -120,46 +94,48 @@ get_image_paintable (GtkImage *image)
 
 static void
 drag_begin (GtkWidget      *widget,
-            GdkDrag        *drag,
+            GdkDragContext *context,
             gpointer        data)
 {
-  GdkPaintable *paintable;
+  GdkPixbuf *pixbuf;
 
-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (paintable)
-    {
-      gtk_drag_set_icon_paintable (drag, paintable, -2, -2);
-      g_object_unref (paintable);
-    }
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
+  g_object_unref (pixbuf);
 }
 
 void
 drag_data_get (GtkWidget        *widget,
-               GdkDrag          *drag,
+               GdkDragContext   *context,
                GtkSelectionData *selection_data,
                guint             info,
+               guint             time,
                gpointer          data)
 {
-  GdkPaintable *paintable;
+  GdkPixbuf *pixbuf;
 
-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (GDK_IS_TEXTURE (paintable))
-    gtk_selection_data_set_texture (selection_data, GDK_TEXTURE (paintable));
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
+  gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static void
 drag_data_received (GtkWidget        *widget,
-                    GdkDrop          *drop,
+                    GdkDragContext   *context,
+                    gint              x,
+                    gint              y,
                     GtkSelectionData *selection_data,
+                    guint             info,
+                    guint32           time,
                     gpointer          data)
 {
+  GdkPixbuf *pixbuf;
+
   if (gtk_selection_data_get_length (selection_data) > 0)
     {
-      GdkTexture *texture;
-
-      texture = gtk_selection_data_get_texture (selection_data);
-      gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
-      g_object_unref (texture);
+      pixbuf = gtk_selection_data_get_pixbuf (selection_data);
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
     }
 }
 
@@ -167,86 +143,76 @@ static void
 copy_image (GtkMenuItem *item,
             gpointer     data)
 {
-  GdkClipboard *clipboard;
-  GdkPaintable *paintable;
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  paintable = get_image_paintable (GTK_IMAGE (data));
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = get_image_pixbuf (GTK_IMAGE (data));
 
-  if (GDK_IS_TEXTURE (paintable))
-    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
-
-  if (paintable)
-    g_object_unref (paintable);
-}
-
-static void
-paste_image_received (GObject      *source,
-                      GAsyncResult *result,
-                      gpointer      data)
-{
-  GdkTexture *texture;
-
-  texture = gdk_clipboard_read_texture_finish (GDK_CLIPBOARD (source), result, NULL);
-  if (texture == NULL)
-    return;
-    
-  gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
+  gtk_clipboard_set_image (clipboard, pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static void
 paste_image (GtkMenuItem *item,
              gpointer     data)
 {
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
+  GdkPixbuf *pixbuf;
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  gdk_clipboard_read_texture_async (clipboard,
-                                    NULL,
-                                    paste_image_received,
-                                    data);
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  pixbuf = gtk_clipboard_wait_for_image (clipboard);
+
+  if (pixbuf)
+    {
+      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
+      g_object_unref (pixbuf);
+    }
 }
 
-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            GtkWidget  *image)
+static gboolean
+button_press (GtkWidget      *widget,
+              GdkEventButton *button,
+              gpointer        data)
 {
   GtkWidget *menu;
   GtkWidget *item;
 
+  if (button->button != GDK_BUTTON_SECONDARY)
+    return FALSE;
+
   menu = gtk_menu_new ();
 
   item = gtk_menu_item_new_with_mnemonic (_("_Copy"));
-  g_signal_connect (item, "activate", G_CALLBACK (copy_image), image);
+  g_signal_connect (item, "activate", G_CALLBACK (copy_image), data);
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
   item = gtk_menu_item_new_with_mnemonic (_("_Paste"));
-  g_signal_connect (item, "activate", G_CALLBACK (paste_image), image);
+  g_signal_connect (item, "activate", G_CALLBACK (paste_image), data);
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+  gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) button);
+  return TRUE;
 }
 
 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
   if (!window)
     {
       GtkWidget *vbox, *hbox;
       GtkWidget *label;
       GtkWidget *entry, *button;
-      GtkWidget *image;
-      GtkGesture *gesture;
+      GtkWidget *ebox, *image;
+      GtkClipboard *clipboard;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
 
       g_signal_connect (window, "destroy",
@@ -300,54 +266,60 @@ do_clipboard (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       /* Create the first image */
-      image = gtk_image_new_from_icon_name ("dialog-warning");
-      gtk_container_add (GTK_CONTAINER (hbox), image);
+      image = gtk_image_new_from_icon_name ("dialog-warning",
+                                            GTK_ICON_SIZE_BUTTON);
+      ebox = gtk_event_box_new ();
+      gtk_container_add (GTK_CONTAINER (ebox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), ebox);
 
-      /* make image a drag source */
-      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (image);
-      g_signal_connect (image, "drag-begin",
+      /* make ebox a drag source */
+      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag-begin",
                         G_CALLBACK (drag_begin), image);
-      g_signal_connect (image, "drag-data-get",
+      g_signal_connect (ebox, "drag-data-get",
                         G_CALLBACK (drag_data_get), image);
 
-      /* accept drops on image */
-      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
-                         NULL, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (image);
-      g_signal_connect (image, "drag-data-received",
+      /* accept drops on ebox */
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
+                         NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag-data-received",
                         G_CALLBACK (drag_data_received), image);
 
-      /* context menu on image */
-      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));
+      /* context menu on ebox */
+      g_signal_connect (ebox, "button-press-event",
+                        G_CALLBACK (button_press), image);
 
       /* Create the second image */
-      image = gtk_image_new_from_icon_name ("process-stop");
-      gtk_container_add (GTK_CONTAINER (hbox), image);
+      image = gtk_image_new_from_icon_name ("process-stop",
+                                            GTK_ICON_SIZE_BUTTON);
+      ebox = gtk_event_box_new ();
+      gtk_container_add (GTK_CONTAINER (ebox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), ebox);
 
-      /* make image a drag source */
-      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (image);
-      g_signal_connect (image, "drag-begin",
+      /* make ebox a drag source */
+      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag-begin",
                         G_CALLBACK (drag_begin), image);
-      g_signal_connect (image, "drag-data-get",
+      g_signal_connect (ebox, "drag-data-get",
                         G_CALLBACK (drag_data_get), image);
 
-      /* accept drops on image */
-      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
-                         NULL, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (image);
-      g_signal_connect (image, "drag-data-received",
+      /* accept drops on ebox */
+      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
+                         NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (ebox);
+      g_signal_connect (ebox, "drag-data-received",
                         G_CALLBACK (drag_data_received), image);
 
-      /* context menu on image */
-      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));
+      /* context menu on ebox */
+      g_signal_connect (ebox, "button-press-event",
+                        G_CALLBACK (button_press), image);
+
+      /* tell the clipboard manager to make the data persistent */
+      clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+      gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/colorsel.c

@@ -70,10 +70,9 @@ do_colorsel (GtkWidget *do_widget)
       color.alpha = 1;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Color Chooser");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/combobox.c

@@ -144,7 +144,7 @@ create_capital_store (void)
     { NULL, "Jackson" },
     { NULL, "Jefferson City" },
     { NULL, "Juneau" },
-    { "K - O", NULL },
+    { "K - O" },
     { NULL, "Lansing" },
     { NULL, "Lincoln" },
     { NULL, "Little Rock" },
@@ -154,7 +154,7 @@ create_capital_store (void)
     { NULL, "Nashville" },
     { NULL, "Oklahoma City" },
     { NULL, "Olympia" },
-    { "P - S", NULL },
+    { NULL, "P - S" },
     { NULL, "Phoenix" },
     { NULL, "Pierre" },
     { NULL, "Providence" },
@@ -311,8 +311,8 @@ do_combobox (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
 
     g_signal_connect (window, "destroy",

demos/gtk-demo/css_basics.c

@@ -47,6 +47,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/css_blendmodes.c

@@ -28,7 +28,7 @@ struct {
   { "Multiply", "multiply" },
   { "Normal", "normal" },
   { "Overlay", "overlay" },
-  { "Saturate", "saturation" },
+  { "Saturate", "saturate" },
   { "Screen", "screen" },
   { "Soft Light", "soft-light" },
   { NULL }
@@ -130,9 +130,9 @@ do_css_blendmodes (GtkWidget *do_widget)
       /* Setup the CSS provider for window */
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  provider,
-                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+      gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                                 provider,
+                                                 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
       setup_listbox (builder, provider);
     }

demos/gtk-demo/css_multiplebgs.c

@@ -47,6 +47,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/css_pixbufs.c

@@ -46,6 +46,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/css_shadows.c

@@ -45,6 +45,8 @@ css_text_changed (GtkTextBuffer  *buffer,
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
+
+  gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
 static void

demos/gtk-demo/cursors.c

@@ -1,44 +1,161 @@
 /* Cursors
  *
- * Demonstrates a useful set of available cursors. The cursors shown here are the ones
- * defined by CSS, which we assume to be available.
- *
- * The example shows creating cursors by name or from an image, with or without a fallback.
+ * Demonstrates a useful set of available cursors.
  */
-
 #include <gtk/gtk.h>
 
-static GtkWidget *window = NULL;
+static void
+set_cursor (GtkWidget *button, gpointer data)
+{
+  GtkWidget *toplevel;
+  GdkCursor *cursor = data;
+  GdkWindow *window;
+
+  toplevel = gtk_widget_get_toplevel (button);
+  window = gtk_widget_get_window (toplevel);
+  gdk_window_set_cursor (window, cursor);
+}
+
+static GtkWidget *
+add_section (GtkWidget   *box,
+             const gchar *heading)
+{
+  GtkWidget *label;
+  GtkWidget *section;
+
+  label = gtk_label_new (heading);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_widget_set_margin_top (label, 10);
+  gtk_widget_set_margin_bottom (label, 10);
+  gtk_box_pack_start (GTK_BOX (box), label);
+  section = gtk_flow_box_new ();
+  gtk_widget_set_halign (section, GTK_ALIGN_START);
+  gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (section), GTK_SELECTION_NONE);
+  gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (section), 2);
+  gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (section), 20);
+  gtk_box_pack_start (GTK_BOX (box), section);
+
+  return section;
+}
 
 static void
-on_destroy (gpointer data)
+add_button (GtkWidget   *section,
+            const gchar *css_name)
 {
-  window = NULL;
+  GtkWidget *image, *button;
+  GdkDisplay *display;
+  GdkCursor *cursor;
+
+  display = gtk_widget_get_display (section);
+  cursor = gdk_cursor_new_from_name (display, css_name);
+  if (cursor == NULL)
+    image = gtk_image_new_from_icon_name ("image-missing", GTK_ICON_SIZE_MENU);
+  else
+    {
+      gchar *path;
+
+      path = g_strdup_printf ("/cursors/%s_cursor.png", css_name);
+      g_strdelimit (path, "-", '_');
+      image = gtk_image_new_from_resource (path);
+      g_free (path);
+    }
+  gtk_widget_set_size_request (image, 32, 32);
+  button = gtk_button_new ();
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button");
+  g_signal_connect (button, "clicked", G_CALLBACK (set_cursor), cursor);
+
+  gtk_widget_set_tooltip_text (button, css_name);
+  gtk_container_add (GTK_CONTAINER (section), button);
 }
 
 GtkWidget *
 do_cursors (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
   if (!window)
     {
-      GtkBuilder *builder;
+      GtkWidget *sw;
+      GtkWidget *box;
+      GtkWidget *section;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Cursors");
+      gtk_window_set_default_size (GTK_WINDOW (window), 500, 500);
 
-      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));
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &window);
+
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);
+      gtk_container_add (GTK_CONTAINER (window), sw);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      g_object_set (box,
+                    "margin-start", 20,
+                    "margin-end", 20,
+                    "margin-bottom", 10,
+                    NULL);
+      gtk_container_add (GTK_CONTAINER (sw), box);
+
+      section = add_section (box, "General");
+      add_button (section, "default");
+      add_button (section, "none");
+
+      section = add_section (box, "Link & Status");
+      add_button (section, "context-menu");
+      add_button (section, "help");
+      add_button (section, "pointer");
+      add_button (section, "progress");
+      add_button (section, "wait");
+
+      section = add_section (box, "Selection");
+      add_button (section, "cell");
+      add_button (section, "crosshair");
+      add_button (section, "text");
+      add_button (section, "vertical-text");
+
+      section = add_section (box, "Drag & Drop");
+      add_button (section, "alias");
+      add_button (section, "copy");
+      add_button (section, "move");
+      add_button (section, "no-drop");
+      add_button (section, "not-allowed");
+      add_button (section, "grab");
+      add_button (section, "grabbing");
+
+      section = add_section (box, "Resize & Scrolling");
+      add_button (section, "all-scroll");
+      add_button (section, "col-resize");
+      add_button (section, "row-resize");
+      add_button (section, "n-resize");
+      add_button (section, "e-resize");
+      add_button (section, "s-resize");
+      add_button (section, "w-resize");
+      add_button (section, "ne-resize");
+      add_button (section, "nw-resize");
+      add_button (section, "se-resize");
+      add_button (section, "sw-resize");
+      add_button (section, "ew-resize");
+      add_button (section, "ns-resize");
+      add_button (section, "nesw-resize");
+      add_button (section, "nwse-resize");
+
+      section = add_section (box, "Zoom");
+      add_button (section, "zoom-in");
+      add_button (section, "zoom-out");
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    {
-      gtk_widget_destroy (window);
-    }
+    gtk_widget_destroy (window);
+
 
   return window;
 }

demos/gtk-demo/demo.gresource.xml

@@ -57,7 +57,6 @@
     <file>reset.css</file>
   </gresource>
   <gresource prefix="/cursors">
-    <file>cursors.ui</file>
     <file>alias_cursor.png</file>
     <file>all_scroll_cursor.png</file>
     <file>cell_cursor.png</file>
@@ -68,7 +67,6 @@
     <file>default_cursor.png</file>
     <file>e_resize_cursor.png</file>
     <file>ew_resize_cursor.png</file>
-    <file>gtk_logo_cursor.png</file>
     <file>grabbing_cursor.png</file>
     <file>grab_cursor.png</file>
     <file>hand_cursor.png</file>
@@ -102,8 +100,11 @@
     <file>gtkfishbowl.h</file>
   </gresource>
   <gresource prefix="/iconview">
-    <file>gnome-fs-directory.png</file>
-    <file>gnome-fs-regular.png</file>
+    <file preprocess="to-pixdata">gnome-fs-directory.png</file>
+    <file preprocess="to-pixdata">gnome-fs-regular.png</file>
+  </gresource>
+  <gresource prefix="/stack">
+    <file>stack.ui</file>
   </gresource>
   <gresource prefix="/shortcuts">
     <file>shortcuts.ui</file>
@@ -112,21 +113,12 @@
     <file>shortcuts-clocks.ui</file>
     <file>shortcuts-boxes.ui</file>
   </gresource>
-  <gresource prefix="/sliding_puzzle">
-    <file>puzzlepiece.c</file>
-    <file>puzzlepiece.h</file>
-    <file>portland-rose.jpg</file>
-  </gresource>
-  <gresource prefix="/stack">
-    <file>stack.ui</file>
-  </gresource>
   <gresource prefix="/revealer">
     <file>revealer.ui</file>
   </gresource>
   <gresource prefix="/images">
     <file>alphatest.png</file>
     <file>floppybuddy.gif</file>
-    <file>gtk-logo.webm</file>
   </gresource>
   <gresource prefix="/pixbufs">
     <file>apple-red.png</file>
@@ -157,17 +149,17 @@
     <file>cursors.c</file>
     <file>dialog.c</file>
     <file>drawingarea.c</file>
-    <file>dnd.c</file>
     <file>editable_cells.c</file>
     <file>entry_buffer.c</file>
     <file>entry_completion.c</file>
+    <file>event_axes.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>fishbowl.c</file>
+    <file>widgetbowl.c</file>
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>
-    <file>fontplane.c</file>
     <file>gestures.c</file>
     <file>glarea.c</file>
     <file>headerbar.c</file>
@@ -179,17 +171,12 @@
     <file>links.c</file>
     <file>listbox.c</file>
     <file>list_store.c</file>
-    <file>listview.c</file>
     <file>markup.c</file>
     <file>menus.c</file>
     <file>modelbutton.c</file>
     <file>overlay.c</file>
     <file>overlay2.c</file>
-    <file>paint.c</file>
     <file>pagesetup.c</file>
-    <file>paintable.c</file>
-    <file>paintable_animated.c</file>
-    <file>paintable_mediastream.c</file>
     <file>panes.c</file>
     <file>pickers.c</file>
     <file>pixbufs.c</file>
@@ -203,7 +190,6 @@
     <file>shortcuts.c</file>
     <file>sizegroup.c</file>
     <file>sidebar.c</file>
-    <file>sliding_puzzle.c</file>
     <file>stack.c</file>
     <file>spinbutton.c</file>
     <file>spinner.c</file>
@@ -211,10 +197,10 @@
     <file>textview.c</file>
     <file>textscroll.c</file>
     <file>theming_style_classes.c</file>
+    <file>toolpalette.c</file>
     <file>transparent.c</file>
     <file>tree_store.c</file>
     <file>textmask.c</file>
-    <file>video_player.c</file>
   </gresource>
   <gresource prefix="/textview">
     <file>floppybuddy.gif</file>
@@ -224,11 +210,6 @@
     <file>messages.txt</file>
     <file>apple-red.png</file>
   </gresource>
-  <gresource prefix="/listview">
-    <file>listview.ui</file>
-    <file>messages.txt</file>
-    <file>apple-red.png</file>
-  </gresource>
   <gresource prefix="/popover">
     <file>popover.ui</file>
   </gresource>
@@ -240,7 +221,6 @@
   </gresource>
   <gresource prefix="/font_features">
     <file>font-features.ui</file>
-    <file>fontplane.c</file>
   </gresource>
   <gresource prefix="/spinbutton">
     <file>spinbutton.ui</file>
@@ -252,9 +232,6 @@
     <file>decor1.png</file>
     <file>decor2.png</file>
   </gresource>
-  <gresource prefix="/transparent">
-    <file>portland-rose.jpg</file>
-  </gresource>
   <gresource prefix="/markup">
     <file>markup.txt</file>
   </gresource>
@@ -264,7 +241,4 @@
   <gresource prefix="/modelbutton">
     <file>modelbutton.ui</file>
   </gresource>
-  <gresource prefix="/dnd">
-    <file>dnd.css</file>
-  </gresource>
 </gresources>

demos/gtk-demo/demo.ui

@@ -31,14 +31,16 @@
     </accessibility>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="default-height">250</property>
-    <property name="default-width">440</property>
+    <property name="default_height">250</property>
+    <property name="default_width">440</property>
     <property name="title" translatable="yes">Builder</property>
     <child>
       <object class="GtkBox" id="vbox1">
+        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar1">
+            <property name="visible">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a11y-menubar">
                 <property name="AtkObject::accessible-name">The menubar</property>
@@ -46,30 +48,35 @@
             </child>
             <child>
               <object class="GtkMenuItem">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="new_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_New</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="open_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Open</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="save_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Save</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="save_as_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">Save _As</property>
                         <property name="use-underline">1</property>
                         <accelerator key="s" modifiers="primary | shift-mask" signal="activate"/>
@@ -77,10 +84,12 @@
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem">
+                        <property name="visible">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="quit_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Quit</property>
                         <property name="use-underline">1</property>
                         <property name="action-name">win.quit</property>
@@ -92,24 +101,28 @@
             </child>
             <child>
               <object class="GtkMenuItem">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="copy_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Copy</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="cut_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Cut</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="paste_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Paste</property>
                         <property name="use-underline">1</property>
                       </object>
@@ -120,12 +133,14 @@
             </child>
             <child>
               <object class="GtkMenuItem">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="help_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Help</property>
                         <property name="use-underline">1</property>
                         <property name="action-name">win.help</property>
@@ -133,6 +148,7 @@
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="about_item">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_About</property>
                         <property name="use-underline">1</property>
                         <property name="action-name">win.about</property>
@@ -146,6 +162,7 @@
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar1">
+            <property name="visible">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a11y-toolbar">
                 <property name="AtkObject::accessible-name">The toolbar</property>
@@ -153,6 +170,7 @@
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">New</property>
                 <property name="tooltip-text" translatable="yes">Create a new file</property>
                 <property name="icon-name">document-new</property>
@@ -160,6 +178,7 @@
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="tooltip-text" translatable="yes">Open a file</property>
                 <property name="icon-name">document-open</property>
@@ -167,6 +186,7 @@
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="tooltip-text" translatable="yes">Save a file</property>
                 <property name="icon-name">document-save</property>
@@ -175,10 +195,12 @@
             </child>
             <child>
               <object class="GtkSeparatorToolItem">
+                <property name="visible">1</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Copy</property>
                 <property name="tooltip-text" translatable="yes">Copy selected object into the clipboard</property>
                 <property name="icon-name">edit-copy</property>
@@ -186,6 +208,7 @@
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Cut</property>
                 <property name="tooltip-text" translatable="yes">Cut selected object into the clipboard</property>
                 <property name="icon-name">edit-cut</property>
@@ -193,6 +216,7 @@
             </child>
             <child>
               <object class="GtkToolButton">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Paste</property>
                 <property name="tooltip-text" translatable="yes">Paste object from the clipboard</property>
                 <property name="icon-name">edit-paste</property>
@@ -205,10 +229,12 @@
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="shadow-type">in</property>
+            <property name="shadow_type">in</property>
+            <property name="visible">1</property>
             <property name="expand">1</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
+                <property name="visible">1</property>
                 <property name="model">liststore1</property>
                 <property name="tooltip-column">3</property>
                 <child internal-child="accessible">
@@ -261,6 +287,7 @@
         </child>
         <child>
           <object class="GtkStatusbar" id="statusbar1">
+            <property name="visible">1</property>
           </object>
           <packing>
             <property name="position">3</property>

demos/gtk-demo/dialog.c

@@ -58,8 +58,7 @@ interactive_dialog_clicked (GtkButton *button,
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   gtk_box_pack_start (GTK_BOX (content_area), hbox);
 
-  image = gtk_image_new_from_icon_name ("dialog-question");
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+  image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), image);
 
   table = gtk_grid_new ();
@@ -106,8 +105,8 @@ do_dialog (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/dnd.c

@@ -1,378 +0,0 @@
-/* Drag-and-Drop
- *
- * I can't believe its not glade!
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-typedef struct _GtkDemoWidget GtkDemoWidget;
-struct _GtkDemoWidget
-{
-  GType type;
-  union {
-    char *text;
-    gboolean active;
-  };
-};
-
-static gpointer
-copy_demo_widget (gpointer data)
-{
-  GtkDemoWidget *demo = g_memdup (data, sizeof (GtkDemoWidget));
-
-  if (demo->type == GTK_TYPE_LABEL)
-    demo->text = g_strdup (demo->text);
-
-  return demo;
-}
-
-static void
-free_demo_widget (gpointer data)
-{
-  GtkDemoWidget *demo = data;
-
-  if (demo->type == GTK_TYPE_LABEL)
-    g_free (demo->text);
-
-  g_free (demo);
-}
-
-#define GTK_TYPE_DEMO_WIDGET (gtk_demo_widget_get_type ())
-
-G_DEFINE_BOXED_TYPE (GtkDemoWidget, gtk_demo_widget, copy_demo_widget, free_demo_widget)
-
-static GtkDemoWidget *
-serialize_widget (GtkWidget *widget)
-{
-  GtkDemoWidget *demo;
-
-  demo = g_new0 (GtkDemoWidget, 1);
-  demo->type = G_OBJECT_TYPE (widget);
-
-  if (GTK_IS_LABEL (widget))
-    {
-      demo->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
-    }
-  else if (GTK_IS_SPINNER (widget))
-    {
-      g_object_get (widget, "active", &demo->active, NULL);
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return demo;
-}
-
-static GtkWidget *
-deserialize_widget (GtkDemoWidget *demo)
-{
-  GtkWidget *widget = NULL;
-
-  if (demo->type == GTK_TYPE_LABEL)
-    {
-      widget = gtk_label_new (demo->text);
-    }
-  else if (demo->type == GTK_TYPE_SPINNER)
-    {
-      widget = g_object_new (demo->type, "active", demo->active, NULL);
-      gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return widget;
-}
-
-static double pos_x, pos_y;
-
-static void
-new_label_cb (GtkMenuItem *item,
-              gpointer     data)
-{
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
-
-  widget = gtk_label_new ("Label");
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
-}
-
-static void
-new_spinner_cb (GtkMenuItem *item,
-                gpointer     data)
-{
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
-
-  widget = gtk_spinner_new ();
-  gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-  gtk_spinner_start (GTK_SPINNER (widget));
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
-}
-
-static void
-copy_cb (GtkWidget *child)
-{
-  GdkClipboard *clipboard;
-  GtkDemoWidget *demo;
-
-  g_print ("Copy %s\n", G_OBJECT_TYPE_NAME (child));
-
-  demo = serialize_widget (child);
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  gdk_clipboard_set (clipboard, GTK_TYPE_DEMO_WIDGET, demo);
-}
-
-static void
-delete_cb (GtkWidget *child)
-{
-  gtk_widget_destroy (child);
-}
-
-static void
-cut_cb (GtkWidget *child)
-{
-  copy_cb (child);
-  delete_cb (child);
-}
-
-static void
-value_read (GObject      *source,
-            GAsyncResult *res,
-            gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  GError *error = NULL;
-  const GValue *value;
-  GtkDemoWidget *demo;
-  GtkWidget *widget = NULL;
-
-  value = gdk_clipboard_read_value_finish (clipboard, res, &error);
-
-  if (value == NULL)
-    {
-      g_print ("error: %s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  if (!G_VALUE_HOLDS (value, GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("can't handle clipboard contents\n");
-      return;
-    }
-
-  demo = g_value_get_boxed (value);
-  widget = deserialize_widget (demo);
-
-  gtk_fixed_put (GTK_FIXED (data), widget, pos_x, pos_y);
-}
-
-static void
-paste_cb (GtkWidget *fixed)
-{
-  GdkClipboard *clipboard;
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("Paste %s\n", g_type_name (GTK_TYPE_DEMO_WIDGET));
-      gdk_clipboard_read_value_async (clipboard, GTK_TYPE_DEMO_WIDGET, 0, NULL, value_read, fixed);
-    }
-  else
-    g_print ("Don't know how to handle clipboard contents\n");
-}
-
-static void
-edit_label_done (GtkWidget *entry, gpointer data)
-{
-  GtkWidget *fixed = gtk_widget_get_parent (entry);
-  GtkWidget *label;
-  int 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_entry_get_text (GTK_ENTRY (entry)));
-
-  gtk_widget_destroy (entry);
-}
-
-static void
-edit_cb (GtkWidget *child)
-{
-  GtkWidget *fixed = gtk_widget_get_parent (child);
-  int x, y;
-
-  gtk_container_child_get (GTK_CONTAINER (fixed), child, "x", &x, "y", &y, NULL);
-
-  if (GTK_IS_LABEL (child))
-    {
-      GtkWidget *entry = gtk_entry_new ();
-
-      g_object_set_data (G_OBJECT (entry), "label", child);
-
-      gtk_entry_set_text (GTK_ENTRY (entry), gtk_label_get_text (GTK_LABEL (child)));
-      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
-      gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
-      gtk_widget_grab_focus (entry);
-    }
-  else if (GTK_IS_SPINNER (child))
-    {
-      gboolean active;
-
-      g_object_get (child, "active", &active, NULL);
-      g_object_set (child, "active", !active, NULL);
-    }
-}
-
-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            gpointer    data)
-{
-  GtkWidget *widget;
-  GtkWidget *child;
-
-  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y);
-
-  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
-    {
-      GdkRectangle rect;
-      GtkWidget *menu;
-      GtkWidget *item;
-      GdkClipboard *clipboard;
-
-      pos_x = x;
-      pos_y = y;
-
-      menu = gtk_menu_new ();
-      item = gtk_menu_item_new_with_label ("New Label");
-      g_signal_connect (item, "activate", G_CALLBACK (new_label_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("New Spinner");
-      g_signal_connect (item, "activate", G_CALLBACK (new_spinner_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_separator_menu_item_new ();
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_menu_item_new_with_label ("Edit");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (edit_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_separator_menu_item_new ();
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_menu_item_new_with_label ("Cut");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (cut_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Copy");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (copy_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Paste");
-      clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-      gtk_widget_set_sensitive (item,
-                                gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (paste_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Delete");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (delete_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      rect.x = x;
-      rect.y = y;
-      rect.width = 0;
-      rect.height = 0;
-
-      gtk_menu_popup_at_rect (GTK_MENU (menu),
-                              gtk_widget_get_surface (widget),
-                              &rect,
-                              GDK_GRAVITY_NORTH_WEST,
-                              GDK_GRAVITY_NORTH_WEST,
-                              NULL);
-
-      return;
-    }
-}
-
-static void
-released_cb (GtkGesture *gesture,
-             int         n_press,
-             double      x,
-             double      y,
-             gpointer    data)
-{
-  GtkWidget *widget;
-  GtkWidget *child;
-
-  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y);
-
-  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
-    {
-      if (child != NULL && child != widget)
-        edit_cb (child);
-    }
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_dnd (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox, *fixed;
-      GtkGesture *multipress;
-      GtkCssProvider *provider;
-
-      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), "Drag-and-drop");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      fixed = gtk_fixed_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), fixed);
-      gtk_widget_set_hexpand (fixed, TRUE);
-      gtk_widget_set_vexpand (fixed, TRUE);
-
-      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);
-      gtk_widget_add_controller (fixed, GTK_EVENT_CONTROLLER (multipress));
-
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/dnd/dnd.css");
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  800);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/dnd.css

@@ -1,3 +0,0 @@
-spinner.demo {
-  opacity: 1;
-}

demos/gtk-demo/drawingarea.c

@@ -4,8 +4,8 @@
  * of various kinds.
  *
  * This demo has two drawing areas. The checkerboard area shows
- * how you can just draw something; all you have to do is set a function
- * via gtk_drawing_area_set_draw_func(), as shown here.
+ * how you can just draw something; all you have to do is write
+ * a signal handler for expose_event, as shown here.
  *
  * The "scribble" area is a bit more advanced, and shows how to handle
  * events such as button presses and mouse motion. Click the mouse
@@ -20,17 +20,22 @@ static GtkWidget *window = NULL;
 static cairo_surface_t *surface = NULL;
 
 /* Create a new surface of the appropriate size to store our scribbles */
-static void
-create_surface (GtkWidget *widget)
+static gboolean
+scribble_configure_event (GtkWidget         *widget,
+                          GdkEventConfigure *event,
+                          gpointer           data)
 {
+  GtkAllocation allocation;
   cairo_t *cr;
 
   if (surface)
     cairo_surface_destroy (surface);
 
-  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                        gtk_widget_get_width (widget),
-                                        gtk_widget_get_height (widget));
+  gtk_widget_get_allocation (widget, &allocation);
+  surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
+                                               CAIRO_CONTENT_COLOR,
+                                               allocation.width,
+                                               allocation.height);
 
   /* Initialize the surface to white */
   cr = cairo_create (surface);
@@ -39,12 +44,9 @@ create_surface (GtkWidget *widget)
   cairo_paint (cr);
 
   cairo_destroy (cr);
-}
 
-static void
-scribble_size_allocate (GtkWidget *widget)
-{
-  create_surface (widget);
+  /* We've handled the configure event, no need for further processing. */
+  return TRUE;
 }
 
 /* Redraw the screen from the surface */
@@ -68,11 +70,6 @@ draw_brush (GtkWidget *widget,
   GdkRectangle update_rect;
   cairo_t *cr;
 
-  if (surface == NULL ||
-      cairo_image_surface_get_width (surface) != gtk_widget_get_width (widget) ||
-      cairo_image_surface_get_height (surface) != gtk_widget_get_height (widget))
-    create_surface (widget);
-
   update_rect.x = x - 3;
   update_rect.y = y - 3;
   update_rect.width = 6;
@@ -86,41 +83,58 @@ draw_brush (GtkWidget *widget,
 
   cairo_destroy (cr);
 
-  gtk_widget_queue_draw (widget);
+  /* Now invalidate the affected region of the drawing area. */
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
+                              &update_rect,
+                              FALSE);
 }
 
-static double start_x;
-static double start_y;
-
-static void
-drag_begin (GtkGestureDrag *gesture,
-            double          x,
-            double          y,
-            GtkWidget      *area)
+static gboolean
+scribble_button_press_event (GtkWidget      *widget,
+                             GdkEventButton *event,
+                             gpointer        data)
 {
-  start_x = x;
-  start_y = y;
+  if (surface == NULL)
+    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
-  draw_brush (area, x, y);
+  if (event->button == GDK_BUTTON_PRIMARY)
+    draw_brush (widget, event->x, event->y);
+
+  /* We've handled the event, stop processing */
+  return TRUE;
 }
 
-static void
-drag_update (GtkGestureDrag *gesture,
-             double          x,
-             double          y,
-             GtkWidget      *area)
+static gboolean
+scribble_motion_notify_event (GtkWidget      *widget,
+                              GdkEventMotion *event,
+                              gpointer        data)
 {
-  draw_brush (area, start_x + x, start_y + y);
+  int x, y;
+  GdkModifierType state;
+
+  if (surface == NULL)
+    return FALSE; /* paranoia check, in case we haven't gotten a configure event */
+
+  /* This call is very important; it requests the next motion event.
+   * If you don't call gdk_window_get_pointer() you'll only get
+   * a single motion event. The reason is that we specified
+   * GDK_POINTER_MOTION_HINT_MASK to gtk_widget_set_events().
+   * If we hadn't specified that, we could just use event->x, event->y
+   * as the pointer location. But we'd also get deluged in events.
+   * By requesting the next event as we handle the current one,
+   * we avoid getting a huge number of events faster than we
+   * can cope.
+   */
+
+  gdk_window_get_device_position (event->window, event->device, &x, &y, &state);
+
+  if (state & GDK_BUTTON1_MASK)
+    draw_brush (widget, x, y);
+
+  /* We've handled it, stop processing */
+  return TRUE;
 }
 
-static void
-drag_end (GtkGestureDrag *gesture,
-          double          x,
-          double          y,
-          GtkWidget      *area)
-{
-  draw_brush (area, start_x + x, start_y + y);
-}
 
 static void
 checkerboard_draw (GtkDrawingArea *da,
@@ -137,7 +151,7 @@ checkerboard_draw (GtkDrawingArea *da,
   /* At the start of a draw handler, a clip region has been set on
    * the Cairo context, and the contents have been cleared to the
    * widget's background color. The docs for
-   * gdk_surface_begin_paint_region() give more details on how this
+   * gdk_window_begin_paint_region() give more details on how this
    * works.
    */
 
@@ -185,13 +199,12 @@ do_drawingarea (GtkWidget *do_widget)
   GtkWidget *vbox;
   GtkWidget *da;
   GtkWidget *label;
-  GtkGesture *drag;
 
   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_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
 
       g_signal_connect (window, "destroy",
@@ -212,7 +225,6 @@ do_drawingarea (GtkWidget *do_widget)
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_vexpand (frame, TRUE);
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       da = gtk_drawing_area_new ();
@@ -231,7 +243,6 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_widget_set_vexpand (frame, TRUE);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
@@ -241,17 +252,17 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      g_signal_connect (da, "size-allocate",
-                        G_CALLBACK (scribble_size_allocate), NULL);
+      /* Signals used to handle backing surface */
 
-      drag = gtk_gesture_drag_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
-      gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
+      g_signal_connect (da,"configure-event",
+                        G_CALLBACK (scribble_configure_event), NULL);
 
-      g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);
-      g_signal_connect (drag, "drag-update", G_CALLBACK (drag_update), da);
-      g_signal_connect (drag, "drag-end", G_CALLBACK (drag_end), da);
+      /* Event signals */
 
+      g_signal_connect (da, "motion-notify-event",
+                        G_CALLBACK (scribble_motion_notify_event), NULL);
+      g_signal_connect (da, "button-press-event",
+                        G_CALLBACK (scribble_button_press_event), NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/editable_cells.c

@@ -346,8 +346,8 @@ do_editable_cells (GtkWidget *do_widget)
       GtkTreeModel *numbers_model;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -373,7 +373,6 @@ do_editable_cells (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (items_model);
-      gtk_widget_set_vexpand (treeview, TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_SINGLE);
 

demos/gtk-demo/entry_buffer.c

@@ -20,8 +20,8 @@ do_entry_buffer (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Buffer");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_signal_connect (window, "destroy",

demos/gtk-demo/entry_completion.c

@@ -46,8 +46,8 @@ do_entry_completion (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 

demos/gtk-demo/event_axes.c

@@ -0,0 +1,654 @@
+/* Touch and Drawing Tablets
+ *
+ * Demonstrates advanced handling of event information from exotic
+ * input devices.
+ *
+ * On one hand, this snippet demonstrates management of drawing tablets,
+ * those contain additional information for the pointer other than
+ * X/Y coordinates. Tablet pads events are mapped to actions, which
+ * are both defined and interpreted by the application.
+ *
+ * Input axes are dependent on hardware devices, on linux/unix you
+ * can see the device axes through xinput list <device>. Each time
+ * a different hardware device is used to move the pointer, the
+ * master device will be updated to match the axes it provides,
+ * these changes can be tracked through GdkDevice::changed, or
+ * checking gdk_event_get_source_device().
+ *
+ * On the other hand, this demo handles basic multitouch events,
+ * each event coming from an specific touchpoint will contain a
+ * GdkEventSequence that's unique for its lifetime, so multiple
+ * touchpoints can be tracked.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+typedef struct {
+  GdkDevice *last_source;
+  GdkDeviceTool *last_tool;
+  gdouble *axes;
+  GdkRGBA color;
+  gdouble x;
+  gdouble y;
+} AxesInfo;
+
+typedef struct {
+  GHashTable *pointer_info; /* GdkDevice -> AxesInfo */
+  GHashTable *touch_info; /* GdkEventSequence -> AxesInfo */
+} EventData;
+
+const gchar *colors[] = {
+  "black",
+  "orchid",
+  "fuchsia",
+  "indigo",
+  "thistle",
+  "sienna",
+  "azure",
+  "plum",
+  "lime",
+  "navy",
+  "maroon",
+  "burlywood"
+};
+
+static GtkPadActionEntry pad_actions[] = {
+  { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Nuclear strike"), "pad.nuke" },
+  { GTK_PAD_ACTION_BUTTON, 2, -1, N_("Release siberian methane reserves"), "pad.heat" },
+  { GTK_PAD_ACTION_BUTTON, 3, -1, N_("Release solar flare"), "pad.fry" },
+  { GTK_PAD_ACTION_BUTTON, 4, -1, N_("De-stabilize Oort cloud"), "pad.fall" },
+  { GTK_PAD_ACTION_BUTTON, 5, -1, N_("Ignite WR-104"), "pad.burst" },
+  { GTK_PAD_ACTION_BUTTON, 6, -1, N_("Lart whoever asks about this button"), "pad.lart" },
+  { GTK_PAD_ACTION_RING, -1, -1, N_("Earth axial tilt"), "pad.tilt" },
+  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Extent of weak nuclear force"), "pad.dissolve" },
+};
+
+static const gchar *pad_action_results[] = {
+  "☢",
+  "♨",
+  "☼",
+  "☄",
+  "⚡",
+  "💫",
+  "◑",
+  "⚛"
+};
+
+static guint cur_color = 0;
+static guint pad_action_timeout_id = 0;
+
+static AxesInfo *
+axes_info_new (void)
+{
+  AxesInfo *info;
+
+  info = g_new0 (AxesInfo, 1);
+  gdk_rgba_parse (&info->color, colors[cur_color]);
+
+  cur_color = (cur_color + 1) % G_N_ELEMENTS (colors);
+
+  return info;
+}
+
+static EventData *
+event_data_new (void)
+{
+  EventData *data;
+
+  data = g_new0 (EventData, 1);
+  data->pointer_info = g_hash_table_new_full (NULL, NULL, NULL,
+                                              (GDestroyNotify) g_free);
+  data->touch_info = g_hash_table_new_full (NULL, NULL, NULL,
+                                            (GDestroyNotify) g_free);
+
+  return data;
+}
+
+static void
+event_data_free (EventData *data)
+{
+  g_hash_table_destroy (data->pointer_info);
+  g_hash_table_destroy (data->touch_info);
+  g_free (data);
+}
+
+static void
+update_axes_from_event (GdkEvent  *event,
+                        EventData *data)
+{
+  GdkDevice *device, *source_device;
+  GdkEventSequence *sequence;
+  GdkDeviceTool *tool;
+  gdouble x, y;
+  AxesInfo *info;
+
+  device = gdk_event_get_device (event);
+  source_device = gdk_event_get_source_device (event);
+  sequence = gdk_event_get_event_sequence (event);
+  tool = gdk_event_get_device_tool (event);
+
+  if (event->type == GDK_TOUCH_END ||
+      event->type == GDK_TOUCH_CANCEL)
+    {
+      g_hash_table_remove (data->touch_info, sequence);
+      return;
+    }
+  else if (event->type == GDK_LEAVE_NOTIFY)
+    {
+      g_hash_table_remove (data->pointer_info, device);
+      return;
+    }
+
+  if (!sequence)
+    {
+      info = g_hash_table_lookup (data->pointer_info, device);
+
+      if (!info)
+        {
+          info = axes_info_new ();
+          g_hash_table_insert (data->pointer_info, device, info);
+        }
+    }
+  else
+    {
+      info = g_hash_table_lookup (data->touch_info, sequence);
+
+      if (!info)
+        {
+          info = axes_info_new ();
+          g_hash_table_insert (data->touch_info, sequence, info);
+        }
+    }
+
+  if (info->last_source != source_device)
+    info->last_source = source_device;
+
+  if (info->last_tool != tool)
+    info->last_tool = tool;
+
+  g_clear_pointer (&info->axes, g_free);
+
+  if (event->type == GDK_TOUCH_BEGIN ||
+      event->type == GDK_TOUCH_UPDATE)
+    {
+      if (sequence && event->touch.emulating_pointer)
+        g_hash_table_remove (data->pointer_info, device);
+    }
+  if (event->type == GDK_MOTION_NOTIFY)
+    {
+      info->axes =
+      g_memdup (event->motion.axes,
+                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
+    }
+  else if (event->type == GDK_BUTTON_PRESS ||
+           event->type == GDK_BUTTON_RELEASE)
+    {
+      info->axes =
+      g_memdup (event->button.axes,
+                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
+    }
+
+  if (gdk_event_get_coords (event, &x, &y))
+    {
+      info->x = x;
+      info->y = y;
+    }
+}
+
+static gboolean
+event_cb (GtkWidget *widget,
+          GdkEvent  *event,
+          gpointer   user_data)
+{
+  update_axes_from_event (event, user_data);
+  gtk_widget_queue_draw (widget);
+  return FALSE;
+}
+
+static void
+render_arrow (cairo_t     *cr,
+              gdouble      x_diff,
+              gdouble      y_diff,
+              const gchar *label)
+{
+  cairo_save (cr);
+
+  cairo_set_source_rgb (cr, 0, 0, 0);
+  cairo_new_path (cr);
+  cairo_move_to (cr, 0, 0);
+  cairo_line_to (cr, x_diff, y_diff);
+  cairo_stroke (cr);
+
+  cairo_move_to (cr, x_diff, y_diff);
+  cairo_show_text (cr, label);
+
+  cairo_restore (cr);
+}
+
+static void
+draw_axes_info (cairo_t       *cr,
+                AxesInfo      *info,
+                GtkAllocation *allocation)
+{
+  gdouble pressure, tilt_x, tilt_y, distance, wheel, rotation, slider;
+  GdkAxisFlags axes = gdk_device_get_axes (info->last_source);
+
+  cairo_save (cr);
+
+  cairo_set_line_width (cr, 1);
+  gdk_cairo_set_source_rgba (cr, &info->color);
+
+  cairo_move_to (cr, 0, info->y);
+  cairo_line_to (cr, allocation->width, info->y);
+  cairo_move_to (cr, info->x, 0);
+  cairo_line_to (cr, info->x, allocation->height);
+  cairo_stroke (cr);
+
+  cairo_translate (cr, info->x, info->y);
+
+  if (!info->axes)
+    {
+      cairo_restore (cr);
+      return;
+    }
+
+  if (axes & GDK_AXIS_FLAG_PRESSURE)
+    {
+      cairo_pattern_t *pattern;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_PRESSURE,
+                           &pressure);
+
+      pattern = cairo_pattern_create_radial (0, 0, 0, 0, 0, 100);
+      cairo_pattern_add_color_stop_rgba (pattern, pressure, 1, 0, 0, pressure);
+      cairo_pattern_add_color_stop_rgba (pattern, 1, 0, 0, 1, 0);
+
+      cairo_set_source (cr, pattern);
+
+      cairo_arc (cr, 0, 0, 100, 0, 2 * G_PI);
+      cairo_fill (cr);
+
+      cairo_pattern_destroy (pattern);
+    }
+
+  if (axes & GDK_AXIS_FLAG_XTILT &&
+      axes & GDK_AXIS_FLAG_YTILT)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_XTILT,
+                           &tilt_x);
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_YTILT,
+                           &tilt_y);
+
+      render_arrow (cr, tilt_x * 100, tilt_y * 100, "Tilt");
+    }
+
+  if (axes & GDK_AXIS_FLAG_DISTANCE)
+    {
+      double dashes[] = { 5.0, 5.0 };
+      cairo_text_extents_t extents;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_DISTANCE,
+                           &distance);
+
+      cairo_save (cr);
+
+      cairo_move_to (cr, distance * 100, 0);
+
+      cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+      cairo_set_dash (cr, dashes, 2, 0.0);
+      cairo_arc (cr, 0, 0, distance * 100, 0, 2 * G_PI);
+      cairo_stroke (cr);
+
+      cairo_move_to (cr, 0, -distance * 100);
+      cairo_text_extents (cr, "Distance", &extents);
+      cairo_rel_move_to (cr, -extents.width / 2, 0);
+      cairo_show_text (cr, "Distance");
+
+      cairo_move_to (cr, 0, 0);
+
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_WHEEL)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_WHEEL,
+                           &wheel);
+
+      cairo_save (cr);
+      cairo_set_line_width (cr, 10);
+      cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr, 0, 0, 100, 0, wheel * 2 * G_PI);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_ROTATION)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_ROTATION,
+                           &rotation);
+      rotation *= 2 * G_PI;
+
+      cairo_save (cr);
+      cairo_rotate (cr, - G_PI / 2);
+      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+      cairo_set_line_width (cr, 5);
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr, 0, 0, 100, 0, rotation);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_SLIDER)
+    {
+      cairo_pattern_t *pattern, *mask;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_SLIDER,
+                           &slider);
+
+      cairo_save (cr);
+
+      cairo_move_to (cr, 0, -10);
+      cairo_rel_line_to (cr, 0, -50);
+      cairo_rel_line_to (cr, 10, 0);
+      cairo_rel_line_to (cr, -5, 50);
+      cairo_close_path (cr);
+
+      cairo_clip_preserve (cr);
+
+      pattern = cairo_pattern_create_linear (0, -10, 0, -60);
+      cairo_pattern_add_color_stop_rgb (pattern, 0, 0, 1, 0);
+      cairo_pattern_add_color_stop_rgb (pattern, 1, 1, 0, 0);
+      cairo_set_source (cr, pattern);
+      cairo_pattern_destroy (pattern);
+
+      mask = cairo_pattern_create_linear (0, -10, 0, -60);
+      cairo_pattern_add_color_stop_rgba (mask, 0, 0, 0, 0, 1);
+      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 1);
+      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 0);
+      cairo_pattern_add_color_stop_rgba (mask, 1, 0, 0, 0, 0);
+      cairo_mask (cr, mask);
+      cairo_pattern_destroy (mask);
+
+      cairo_set_source_rgb (cr, 0, 0, 0);
+      cairo_stroke (cr);
+
+      cairo_restore (cr);
+    }
+
+  cairo_restore (cr);
+}
+
+static const gchar *
+tool_type_to_string (GdkDeviceToolType tool_type)
+{
+  switch (tool_type)
+    {
+    case GDK_DEVICE_TOOL_TYPE_PEN:
+      return "Pen";
+    case GDK_DEVICE_TOOL_TYPE_ERASER:
+      return "Eraser";
+    case GDK_DEVICE_TOOL_TYPE_BRUSH:
+      return "Brush";
+    case GDK_DEVICE_TOOL_TYPE_PENCIL:
+      return "Pencil";
+    case GDK_DEVICE_TOOL_TYPE_AIRBRUSH:
+      return "Airbrush";
+    case GDK_DEVICE_TOOL_TYPE_MOUSE:
+      return "Mouse";
+    case GDK_DEVICE_TOOL_TYPE_LENS:
+      return "Lens cursor";
+    case GDK_DEVICE_TOOL_TYPE_UNKNOWN:
+    default:
+      return "Unknown";
+    }
+}
+
+static void
+draw_device_info (GtkWidget        *widget,
+                  cairo_t          *cr,
+                  GdkEventSequence *sequence,
+                  gint             *y,
+                  AxesInfo         *info)
+{
+  PangoLayout *layout;
+  GString *string;
+  gint height;
+
+  cairo_save (cr);
+
+  string = g_string_new (NULL);
+  g_string_append_printf (string, "Source: %s",
+                          gdk_device_get_name (info->last_source));
+
+  if (sequence)
+    g_string_append_printf (string, "\nSequence: %d",
+                            GPOINTER_TO_UINT (sequence));
+
+  if (info->last_tool)
+    {
+      const gchar *tool_type;
+      guint64 serial;
+
+      tool_type = tool_type_to_string (gdk_device_tool_get_tool_type (info->last_tool));
+      serial = gdk_device_tool_get_serial (info->last_tool);
+      g_string_append_printf (string, "\nTool: %s", tool_type);
+
+      if (serial != 0)
+        g_string_append_printf (string, ", Serial: %lx", serial);
+    }
+
+  cairo_move_to (cr, 10, *y);
+  layout = gtk_widget_create_pango_layout (widget, string->str);
+  pango_cairo_show_layout (cr, layout);
+  cairo_stroke (cr);
+
+  pango_layout_get_pixel_size (layout, NULL, &height);
+
+  gdk_cairo_set_source_rgba (cr, &info->color);
+  cairo_set_line_width (cr, 10);
+  cairo_move_to (cr, 0, *y);
+
+  *y = *y + height;
+  cairo_line_to (cr, 0, *y);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+
+  g_object_unref (layout);
+  g_string_free (string, TRUE);
+}
+
+static gboolean
+draw_cb (GtkWidget *widget,
+         cairo_t   *cr,
+         gpointer   user_data)
+{
+  EventData *data = user_data;
+  GtkAllocation allocation;
+  AxesInfo *info;
+  GHashTableIter iter;
+  gpointer key, value;
+  gint y = 0;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  /* Draw Abs info */
+  g_hash_table_iter_init (&iter, data->pointer_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_axes_info (cr, info, &allocation);
+    }
+
+  g_hash_table_iter_init (&iter, data->touch_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_axes_info (cr, info, &allocation);
+    }
+
+  /* Draw name, color legend and misc data */
+  g_hash_table_iter_init (&iter, data->pointer_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_device_info (widget, cr, NULL, &y, info);
+    }
+
+  g_hash_table_iter_init (&iter, data->touch_info);
+
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      info = value;
+      draw_device_info (widget, cr, key, &y, info);
+    }
+
+  return FALSE;
+}
+
+static void
+update_label_text (GtkWidget   *label,
+                   const gchar *text)
+{
+  gchar *markup = NULL;
+
+  if (text)
+    markup = g_strdup_printf ("<span font='48.0'>%s</span>", text);
+  gtk_label_set_markup (GTK_LABEL (label), markup);
+  g_free (markup);
+}
+
+static gboolean
+reset_label_text_timeout_cb (gpointer user_data)
+{
+  GtkWidget *label = user_data;
+
+  update_label_text (label, NULL);
+  pad_action_timeout_id = 0;
+  return G_SOURCE_REMOVE;
+}
+
+static void
+update_label_and_timeout (GtkWidget   *label,
+                          const gchar *text)
+{
+  if (pad_action_timeout_id)
+    g_source_remove (pad_action_timeout_id);
+
+  update_label_text (label, text);
+  pad_action_timeout_id = g_timeout_add (200, reset_label_text_timeout_cb, label);
+}
+
+static void
+on_action_activate (GSimpleAction *action,
+                    GVariant      *parameter,
+                    gpointer       user_data)
+{
+  GtkWidget *label = user_data;
+  const gchar *result;
+  gchar *str;
+
+  result = g_object_get_data (G_OBJECT (action), "action-result");
+
+  if (!parameter)
+    update_label_and_timeout (label, result);
+  else
+    {
+      str = g_strdup_printf ("%s %.2f", result, g_variant_get_double (parameter));
+      update_label_and_timeout (label, str);
+      g_free (str);
+    }
+}
+
+static void
+init_pad_controller (GtkWidget *window,
+                     GtkWidget *label)
+{
+  GtkPadController *pad_controller;
+  GSimpleActionGroup *action_group;
+  GSimpleAction *action;
+  gint i;
+
+  action_group = g_simple_action_group_new ();
+  pad_controller = gtk_pad_controller_new (GTK_WINDOW (window),
+                                           G_ACTION_GROUP (action_group),
+                                           NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
+    {
+      if (pad_actions[i].type == GTK_PAD_ACTION_BUTTON)
+        {
+          action = g_simple_action_new (pad_actions[i].action_name, NULL);
+        }
+      else
+        {
+          action = g_simple_action_new_stateful (pad_actions[i].action_name,
+                                                 G_VARIANT_TYPE_DOUBLE, NULL);
+        }
+
+      g_signal_connect (action, "activate",
+                        G_CALLBACK (on_action_activate), label);
+      g_object_set_data (G_OBJECT (action), "action-result",
+                         (gpointer) pad_action_results[i]);
+      g_action_map_add_action (G_ACTION_MAP (action_group), G_ACTION (action));
+      g_object_unref (action);
+    }
+
+  gtk_pad_controller_set_action_entries (pad_controller, pad_actions,
+                                         G_N_ELEMENTS (pad_actions));
+  g_object_set_data_full (G_OBJECT (window), "pad-controller",
+                          pad_controller, g_object_unref);
+
+  g_object_unref (action_group);
+}
+
+GtkWidget *
+do_event_axes (GtkWidget *toplevel)
+{
+  static GtkWidget *window = NULL;
+  EventData *event_data;
+  GtkWidget *box, *label;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Event Axes");
+      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      box = gtk_event_box_new ();
+      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_widget_set_support_multidevice (box, TRUE);
+
+      event_data = event_data_new ();
+      g_object_set_data_full (G_OBJECT (box), "gtk-demo-event-data",
+                              event_data, (GDestroyNotify) event_data_free);
+
+      g_signal_connect (box, "event",
+                        G_CALLBACK (event_cb), event_data);
+      g_signal_connect (box, "draw",
+                        G_CALLBACK (draw_cb), event_data);
+
+      label = gtk_label_new ("");
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      gtk_container_add (GTK_CONTAINER (box), label);
+
+      init_pad_controller (window, label);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/filtermodel.c

@@ -124,8 +124,8 @@ do_filtermodel (GtkWidget *do_widget)
       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));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/filtermodel.ui

@@ -34,31 +34,31 @@
     <property name="title" translatable="yes">Filter Model</property>
     <child>
       <object class="GtkGrid" id="grid1">
+        <property name="visible">1</property>
         <property name="margin">10</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <property name="column-homogeneous">1</property>
+        <property name="row_spacing">10</property>
+        <property name="column_spacing">10</property>
+        <property name="column_homogeneous">1</property>
         <child>
           <object class="GtkLabel" id="label1">
+            <property name="visible">1</property>
             <property name="label" translatable="yes">Original</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview1"/>
-            </accessibility>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="can-focus">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="model">liststore1</property>
-            <property name="headers-clickable">0</property>
+            <property name="headers_clickable">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection1"/>
             </child>
@@ -84,20 +84,18 @@
                 </child>
               </object>
             </child>
-            <accessibility>
-              <relation type="labelled-by" target="label1"/>
-            </accessibility>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="can-focus">1</property>
-            <property name="headers-clickable">0</property>
-            <property name="search-column">0</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="headers_clickable">0</property>
+            <property name="search_column">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection3"/>
             </child>
@@ -135,52 +133,46 @@
                 </child>
               </object>
             </child>
-            <accessibility>
-              <relation type="labelled-by" target="label2"/>
-            </accessibility>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
+            <property name="visible">1</property>
             <property name="label" translatable="yes">Computed Columns</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview2"/>
-            </accessibility>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
+            <property name="visible">1</property>
             <property name="label" translatable="yes">Filtered</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview3"/>
-            </accessibility>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="can-focus">1</property>
-            <property name="headers-clickable">0</property>
-            <property name="search-column">0</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="headers_clickable">0</property>
+            <property name="search_column">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection5"/>
             </child>
@@ -200,13 +192,10 @@
                 </child>
               </object>
             </child>
-            <accessibility>
-              <relation type="labelled-by" target="label3"/>
-            </accessibility>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
       </object>

demos/gtk-demo/fishbowl.c

@@ -8,270 +8,165 @@
 #include <gtk/gtk.h>
 
 #include "gtkfishbowl.h"
-#include "gtkgears.h"
 
-const char *const css =
-".blurred-button {"
-"  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
-"}"
-"";
+GtkWidget *allow_changes;
 
-char **icon_names = NULL;
-gsize n_icon_names = 0;
+#define N_STATS 5
 
-static void
-init_icon_names (GtkIconTheme *theme)
-{
-  GPtrArray *icons;
-  GList *l, *icon_list;
+#define STATS_UPDATE_TIME G_USEC_PER_SEC
 
-  if (icon_names)
-    return;
+typedef struct _Stats Stats;
+struct _Stats {
+  gint64 last_stats;
+  gint64 last_frame;
+  gint last_suggestion;
+  guint frame_counter_max;
 
-  icon_list = gtk_icon_theme_list_icons (theme, NULL);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
-}
-
-static const char *
-get_random_icon_name (GtkIconTheme *theme)
-{
-  init_icon_names (theme);
-
-  return icon_names[g_random_int_range(0, n_icon_names)];
-}
-
-GtkWidget *
-create_icon (void)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()));
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-
-  return image;
-}
-
-static GtkWidget *
-create_button (void)
-{
-  return gtk_button_new_with_label ("Button");
-}
-
-static GtkWidget *
-create_blurred_button (void)
-{
-  GtkWidget *w = gtk_button_new ();
-
-  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
-
-  return w;
-}
-
-static GtkWidget *
-create_font_button (void)
-{
-  return gtk_font_button_new ();
-}
-
-static GtkWidget *
-create_level_bar (void)
-{
-  GtkWidget *w = gtk_level_bar_new_for_interval (0, 100);
-
-  gtk_level_bar_set_value (GTK_LEVEL_BAR (w), 50);
-
-  /* Force them to be a bit larger */
-  gtk_widget_set_size_request (w, 200, -1);
-
-  return w;
-}
-
-static GtkWidget *
-create_spinner (void)
-{
-  GtkWidget *w = gtk_spinner_new ();
-
-  gtk_spinner_start (GTK_SPINNER (w));
-
-  return w;
-}
-
-static GtkWidget *
-create_spinbutton (void)
-{
-  GtkWidget *w = gtk_spin_button_new_with_range (0, 10, 1);
-
-  return w;
-}
-
-static GtkWidget *
-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_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
-
-  return w;
-}
-
-static GtkWidget *
-create_video (void)
-{
-  GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-  GtkWidget *w = gtk_picture_new_for_paintable (GDK_PAINTABLE (stream));
-
-  gtk_widget_set_size_request (w, 64, 64);
-  gtk_media_stream_set_loop (stream, TRUE);
-  gtk_media_stream_play (stream);
-  g_object_unref (stream);
-
-  return w;
-}
-
-static GtkWidget *
-create_gears (void)
-{
-  GtkWidget *w = gtk_gears_new ();
-
-  gtk_widget_set_size_request (w, 100, 100);
-
-  return w;
-}
-
-static GtkWidget *
-create_switch (void)
-{
-  GtkWidget *w = gtk_switch_new ();
-
-  gtk_switch_set_state (GTK_SWITCH (w), TRUE);
-
-  return w;
-}
-
-static const struct {
-  const char *name;
-  GtkWidget * (*create_func) (void);
-} widget_types[] = {
-  { "Icon",       create_icon           },
-  { "Button",     create_button         },
-  { "Blurbutton", create_blurred_button },
-  { "Fontbutton", create_font_button    },
-  { "Levelbar",   create_level_bar      },
-  { "Label",      create_label          },
-  { "Spinner",    create_spinner        },
-  { "Spinbutton", create_spinbutton     },
-  { "Video",      create_video          },
-  { "Gears",      create_gears          },
-  { "Switch",     create_switch         },
+  guint stats_index;
+  guint frame_counter[N_STATS];
+  guint item_counter[N_STATS];
 };
 
-static int selected_widget_type = -1;
-static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
+static Stats *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      stats = g_new0 (Stats, 1);
+      g_object_set_qdata_full (G_OBJECT (widget), stats_quark, stats, g_free);
+      stats->last_frame = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+      stats->last_stats = stats->last_frame;
+    }
+
+  return stats;
+}
 
 static void
-set_widget_type (GtkFishbowl *fishbowl,
-                 int          widget_type_index)
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
 {
-  GtkWidget *window, *headerbar;
+  Stats *stats;
+  gint64 frame_time;
 
-  if (widget_type_index == selected_widget_type)
-    return;
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
 
-  selected_widget_type = widget_type_index;
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
+    {
+      char *new_label;
+      guint i, n_frames;
 
-  gtk_fishbowl_set_creation_func (fishbowl,
-                                  widget_types[selected_widget_type].create_func);
+      n_frames = 0;
+      for (i = 0; i < N_STATS; i++)
+        {
+          n_frames += stats->frame_counter[i];
+        }
+      
+      new_label = g_strdup_printf ("icons - %.1f fps",
+                                   (double) G_USEC_PER_SEC * n_frames
+                                       / (N_STATS * STATS_UPDATE_TIME));
+      gtk_label_set_label (GTK_LABEL (info_label), new_label);
+      g_free (new_label);
 
-  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);
-}
+      if (stats->frame_counter[stats->stats_index] >= 19 * stats->frame_counter_max / 20)
+        {
+          if (stats->last_suggestion > 0)
+            stats->last_suggestion *= 2;
+          else
+            stats->last_suggestion = 1;
+        }
+      else
+        {
+          if (stats->last_suggestion < 0)
+            stats->last_suggestion--;
+          else
+            stats->last_suggestion = -1;
+          stats->last_suggestion = MAX (stats->last_suggestion, 1 - (int) stats->item_counter[stats->stats_index]);
+        }
 
-void
-next_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
-
-  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
+      stats->stats_index = (stats->stats_index + 1) % N_STATS;
+      stats->frame_counter[stats->stats_index] = 0;
+      stats->item_counter[stats->stats_index] = stats->item_counter[(stats->stats_index + N_STATS - 1) % N_STATS];
+      stats->last_stats = frame_time;
+      
+      if (suggested_change)
+        *suggested_change = stats->last_suggestion;
+      else
+        stats->last_suggestion = 0;
+    }
   else
-    new_index = selected_widget_type + 1;
+    {
+      if (suggested_change)
+        *suggested_change = 0;
+    }
 
-  set_widget_type (fishbowl, new_index);
+  stats->last_frame = frame_time;
+  stats->frame_counter[stats->stats_index]++;
+  stats->frame_counter_max = MAX (stats->frame_counter_max, stats->frame_counter[stats->stats_index]);
 }
 
-void
-prev_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
+static void
+stats_update (GtkWidget *widget)
 {
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
+  Stats *stats;
 
-  if (selected_widget_type - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
-  else
-    new_index = selected_widget_type - 1;
+  stats = get_stats (widget);
 
-  set_widget_type (fishbowl, new_index);
+  stats->item_counter[stats->stats_index] = gtk_fishbowl_get_count (GTK_FISHBOWL (widget));
 }
 
+static gboolean
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
+{
+  gint suggested_change = 0;
+  
+  do_stats (bowl,
+            info_label,
+            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
+
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl),
+                          gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change);
+  stats_update (bowl);
+
+  return G_SOURCE_CONTINUE;
+}
 
 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  static GtkCssProvider *provider = NULL;
-
-  if (provider == NULL)
-    {
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css, -1);
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
 
   if (!window)
     {
       GtkBuilder *builder;
-      GtkWidget *bowl;
+      GtkWidget *bowl, *info_label;
 
       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"));
       bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
-      set_widget_type (GTK_FISHBOWL (bowl), 0);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), TRUE);
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_widget_realize (window);
+      gtk_widget_add_tick_callback (bowl, move_fish, info_label, NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/fishbowl.ui

@@ -5,66 +5,34 @@
     <property name="title" translatable="yes">Fishbowl</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
+        <property name="visible">True</property>
+        <property name="show-close-button">True</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="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="next_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">fps</property>
+          <object class="GtkLabel" id="info_label">
+            <property name="visible">True</property>
           </object>
           <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="label" bind-source="bowl" bind-property="framerate"/>
+            <property name="visible">True</property>
+            <property name="label" bind-source="bowl" bind-property="count">0</property>
           </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>
+            <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="active">False</property>
+            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
           </object>
           <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
           </packing>
         </child>
         <child>
@@ -75,7 +43,7 @@
             <property name="relief">none</property>
           </object>
           <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
           </packing>
         </child>
       </object>
@@ -84,7 +52,6 @@
       <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">True</property>
       </object>
     </child>
   </object>

demos/gtk-demo/flowbox.c

@@ -720,8 +720,8 @@ do_flowbox (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
 

demos/gtk-demo/fontplane.c

@@ -1,315 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 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 "config.h"
-
-#include "fontplane.h"
-
-#include "gtk.h"
-
-enum {
-  PROP_0,
-  PROP_WEIGHT_ADJUSTMENT,
-  PROP_WIDTH_ADJUSTMENT
-};
-
-G_DEFINE_TYPE (GtkFontPlane, gtk_font_plane, GTK_TYPE_WIDGET)
-
-static double
-adjustment_get_normalized_value (GtkAdjustment *adj)
-{
-  return (gtk_adjustment_get_value (adj) - gtk_adjustment_get_lower (adj)) /
-        (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj));
-}
-
-static void
-val_to_xy (GtkFontPlane *plane,
-           gint          *x,
-           gint          *y)
-{
-  gdouble u, v;
-  gint width, height;
-
-  width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
-  height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
-
-  u = adjustment_get_normalized_value (plane->width_adj);
-  v = adjustment_get_normalized_value (plane->weight_adj);
-
-  *x = CLAMP (width * u, 0, width - 1);
-  *y = CLAMP (height * (1 - v), 0, height - 1);
-}
-
-static void
-plane_snapshot (GtkWidget   *widget,
-                GtkSnapshot *snapshot)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (widget);
-  gint x, y;
-  gint width, height;
-  cairo_t *cr;
-
-  val_to_xy (plane, &x, &y);
-  width = gtk_widget_get_allocated_width (widget);
-  height = gtk_widget_get_allocated_height (widget);
-
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT (0, 0, width, height));
-
-  cairo_set_source_rgb (cr, 0, 0, 0);
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_paint (cr);
-
-  cairo_move_to (cr, 0,     y + 0.5);
-  cairo_line_to (cr, width, y + 0.5);
-
-  cairo_move_to (cr, x + 0.5, 0);
-  cairo_line_to (cr, x + 0.5, height);
-
-  if (gtk_widget_has_visible_focus (widget))
-    {
-      cairo_set_line_width (cr, 3.0);
-      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.6);
-      cairo_stroke_preserve (cr);
-
-      cairo_set_line_width (cr, 1.0);
-      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      cairo_set_line_width (cr, 1.0);
-      cairo_set_source_rgba (cr, 0.8, 0.8, 0.8, 0.8);
-      cairo_stroke (cr);
-    }
-
-  cairo_destroy (cr);
-}
-
-static void
-set_cross_cursor (GtkWidget *widget,
-                  gboolean   enabled)
-{
-  if (enabled)
-    gtk_widget_set_cursor_from_name (widget, "crosshair");
-  else
-    gtk_widget_set_cursor (widget, NULL);
-}
-
-static void
-adj_changed (GtkFontPlane *plane)
-{
-  gtk_widget_queue_draw (GTK_WIDGET (plane));
-}
-
-static void
-adjustment_set_normalized_value (GtkAdjustment *adj,
-                                 double         val)
-{
-  gtk_adjustment_set_value (adj,
-      gtk_adjustment_get_lower (adj) +
-          val * (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj)));
-}
-
-static void
-update_value (GtkFontPlane *plane,
-              gint           x,
-              gint           y)
-{
-  GtkWidget *widget = GTK_WIDGET (plane);
-  gdouble u, v;
-
-  u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1);
-  v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1);
-
-  adjustment_set_normalized_value (plane->width_adj, u);
-  adjustment_set_normalized_value (plane->weight_adj, v);
-
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-hold_action (GtkGestureLongPress *gesture,
-             gdouble              x,
-             gdouble              y,
-             GtkFontPlane       *plane)
-{
-  gboolean handled;
-
-  g_signal_emit_by_name (plane, "popup-menu", &handled);
-}
-
-static void
-plane_drag_gesture_begin (GtkGestureDrag *gesture,
-                          gdouble         start_x,
-                          gdouble         start_y,
-                          GtkFontPlane  *plane)
-{
-  guint button;
-
-  button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
-
-  if (button == GDK_BUTTON_SECONDARY)
-    {
-      gboolean handled;
-
-      g_signal_emit_by_name (plane, "popup-menu", &handled);
-    }
-
-  if (button != GDK_BUTTON_PRIMARY)
-    {
-      gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
-      return;
-    }
-
-  set_cross_cursor (GTK_WIDGET (plane), TRUE);
-  update_value (plane, start_x, start_y);
-  gtk_widget_grab_focus (GTK_WIDGET (plane));
-  gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
-}
-
-static void
-plane_drag_gesture_update (GtkGestureDrag *gesture,
-                           gdouble         offset_x,
-                           gdouble         offset_y,
-                           GtkFontPlane  *plane)
-{
-  gdouble start_x, start_y;
-
-  gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture),
-                                    &start_x, &start_y);
-  update_value (plane, start_x + offset_x, start_y + offset_y);
-}
-
-static void
-plane_drag_gesture_end (GtkGestureDrag *gesture,
-                        gdouble         offset_x,
-                        gdouble         offset_y,
-                        GtkFontPlane  *plane)
-{
-  set_cross_cursor (GTK_WIDGET (plane), FALSE);
-}
-
-static void
-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 ();
-  g_signal_connect (gesture, "drag-begin",
-		    G_CALLBACK (plane_drag_gesture_begin), plane);
-  g_signal_connect (gesture, "drag-update",
-		    G_CALLBACK (plane_drag_gesture_update), plane);
-  g_signal_connect (gesture, "drag-end",
-		    G_CALLBACK (plane_drag_gesture_end), plane);
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
-  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
-
-  gesture = gtk_gesture_long_press_new ();
-  g_signal_connect (gesture, "pressed",
-                    G_CALLBACK (hold_action), plane);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture),
-                                     TRUE);
-  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
-}
-
-static void
-plane_finalize (GObject *object)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (object);
-
-  g_clear_object (&plane->weight_adj);
-  g_clear_object (&plane->width_adj);
-
-  G_OBJECT_CLASS (gtk_font_plane_parent_class)->finalize (object);
-}
-
-static void
-plane_set_property (GObject      *object,
-		    guint         prop_id,
-		    const GValue *value,
-		    GParamSpec   *pspec)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (object);
-  GtkAdjustment *adjustment;
-
-  switch (prop_id)
-    {
-    case PROP_WEIGHT_ADJUSTMENT:
-      adjustment = GTK_ADJUSTMENT (g_value_get_object (value));
-      if (adjustment)
-	{
-	  plane->weight_adj = g_object_ref_sink (adjustment);
-	  g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (adj_changed), plane);
-	}
-      break;
-    case PROP_WIDTH_ADJUSTMENT:
-      adjustment = GTK_ADJUSTMENT (g_value_get_object (value));
-      if (adjustment)
-	{
-	  plane->width_adj = g_object_ref_sink (adjustment);
-	  g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (adj_changed), plane);
-	}
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_font_plane_class_init (GtkFontPlaneClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->finalize = plane_finalize;
-  object_class->set_property = plane_set_property;
-
-  widget_class->snapshot = plane_snapshot;
-
-  g_object_class_install_property (object_class,
-                                   PROP_WEIGHT_ADJUSTMENT,
-                                   g_param_spec_object ("weight-adjustment",
-                                                        NULL,
-                                                        NULL,
-							GTK_TYPE_ADJUSTMENT,
-							G_PARAM_WRITABLE |
-							G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class,
-                                   PROP_WIDTH_ADJUSTMENT,
-                                   g_param_spec_object ("width-adjustment",
-                                                        NULL,
-                                                        NULL,
-							GTK_TYPE_ADJUSTMENT,
-							G_PARAM_WRITABLE |
-							G_PARAM_CONSTRUCT_ONLY));
-}
-
-GtkWidget *
-gtk_font_plane_new (GtkAdjustment *weight_adj,
-                     GtkAdjustment *width_adj)
-{
-  return g_object_new (GTK_TYPE_FONT_PLANE,
-                       "weight-adjustment", weight_adj,
-                       "width-adjustment", width_adj,
-                       NULL);
-}

demos/gtk-demo/fontplane.h

@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 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/>.
- */
-
-#ifndef __GTK_FONT_PLANE_H__
-#define __GTK_FONT_PLANE_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FONT_PLANE            (gtk_font_plane_get_type ())
-#define GTK_FONT_PLANE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_PLANE, GtkFontPlane))
-#define GTK_FONT_PLANE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_PLANE, GtkFontPlaneClass))
-#define GTK_IS_FONT_PLANE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_PLANE))
-#define GTK_IS_FONT_PLANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_PLANE))
-#define GTK_FONT_PLANE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_PLANE, GtkFontPlaneClass))
-
-
-typedef struct _GtkFontPlane         GtkFontPlane;
-typedef struct _GtkFontPlaneClass    GtkFontPlaneClass;
-
-struct _GtkFontPlane
-{
-  GtkWidget parent_instance;
-
-  GtkAdjustment *weight_adj;
-  GtkAdjustment *width_adj;
-
-  GtkGesture *drag_gesture;
-};
-
-struct _GtkFontPlaneClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType       gtk_font_plane_get_type (void) G_GNUC_CONST;
-GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
-                                     GtkAdjustment *weight_adj);
-
-G_END_DECLS
-
-#endif /* __GTK_FONT_PLANE_H__ */

demos/gtk-demo/foreigndrawing.c

@@ -830,7 +830,6 @@ draw_spinbutton (GtkWidget *widget,
   GtkIconTheme *icon_theme;
   GtkIconInfo *icon_info;
   GdkPixbuf *pixbuf;
-  GdkTexture *texture;
   gint icon_width, icon_height, icon_size;
   gint button_width;
   gint contents_x, contents_y, contents_width, contents_height;
@@ -851,33 +850,30 @@ draw_spinbutton (GtkWidget *widget,
   draw_style_common (spin_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
   draw_style_common (entry_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
 
-  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
 
   gtk_style_context_get (up_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-add-symbolic", icon_size, 0);
   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);
+  gtk_render_icon (up_context, cr, pixbuf, 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);
   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);
+  gtk_render_icon (down_context, cr, pixbuf, contents_x, contents_y + (contents_height - icon_size) / 2);
   g_object_unref (pixbuf);
-  g_object_unref (texture);
 
   g_object_unref (down_context);
   g_object_unref (up_context);
@@ -964,8 +960,8 @@ do_foreigndrawing (GtkWidget *do_widget)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_title (GTK_WINDOW (window), "Foreign drawing");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/geninclude.pl.in

@@ -0,0 +1,164 @@
+#!@PERL@ -w
+
+print <<EOT;
+typedef	GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
+
+typedef struct _Demo Demo;
+
+struct _Demo 
+{
+  gchar *name;
+  gchar *title;
+  gchar *filename;
+  GDoDemoFunc func;
+  Demo *children;
+};
+
+EOT
+
+for $file (@ARGV) {
+    my %demo;
+    
+    ($basename = $file) =~ s/\.c$//;
+
+    open INFO_FILE, $file or die "Cannot open '$file'\n";
+    $title = <INFO_FILE>;
+    $title =~ s@^\s*/\*\s*@@;
+    $title =~ s@\s*$@@;
+
+    close INFO_FILE;
+
+    print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
+
+    push @demos, {"name" => $basename, "title" => $title, "file" => $file,
+		  "func"  => "do_$basename"};
+}
+
+# generate a list of 'parent names'
+foreach $href (@demos) {
+    if ($href->{"title"} =~ m|^([-\w\s]+)/[-\w\s]+$|) {
+	my $parent_name = $1;
+	my $do_next = 0;
+
+	# parent detected
+	if (@parents) {
+	    foreach $foo (@parents) {
+		if ($foo eq $parent_name) {
+		    $do_next = 1;
+		}
+	    }
+	    
+	    if ($do_next) {
+		next;
+	    }
+	}
+
+	push @parents, $parent_name;
+
+	$tmp = (@child_arrays)?($#child_arrays + 1):0;
+	push @child_arrays, "child$tmp";
+
+	push @demos, {"name" => "NULL", "title" => $parent_name, "file" => "NULL",
+		      "func" => "NULL"};
+    }
+}
+
+if (@parents) {
+    $i = 0;
+    for ($i = 0; $i <= $#parents; $i++) {
+	$first = 1;
+	
+	print "\nDemo ", $child_arrays[$i], "[] = {\n";
+	
+	$j = 0;
+	for ($j = 0; $j <= $#demos; $j++) {
+	    $href = $demos[$j];
+	    
+	    if (!$demos[$j]) {
+		next;
+	    }
+	    
+	    if ($demos[$j]{"title"} =~ m|^$parents[$i]/([-\w\s]+)$|) {
+		if ($first) {
+		    $first = 0;
+		} else {
+		    print ",\n";
+		}
+		
+		print qq (  { "$demos[$j]{name}", "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
+
+		# hack ... ugly
+		$demos[$j]{"title"} = "foo";
+	    }
+	}
+
+	print ",\n";
+	print qq (  { NULL } );
+	print "\n};\n";
+    }   
+}
+
+# sort @demos
+@demos_old = @demos;
+
+@demos = sort {
+    $a->{"title"} cmp $b->{"title"};
+} @demos_old;
+
+# sort the child arrays
+if (@child_arrays) {
+    for ($i = 0; $i <= $#child_arrays; $i++) {
+	@foo_old = @{$child_arrays[$i]};
+
+	@{$child_arrays[$i]} = sort {
+	    $a->{"title"} cmp $b->{"title"};
+	} @foo_old;
+    }
+}
+
+# toplevel
+print "\nDemo gtk_demos[] = {\n";
+
+$first = 1;
+foreach $href (@demos) {
+    $handled = 0;
+
+    # ugly evil hack
+    if ($href->{title} eq "foo") {
+	next;
+    }
+
+    if ($first) {
+	$first = 0;
+    } else {
+	print ", \n";
+    }
+
+    if (@parents) {
+	for ($i = 0; $i <= $#parents; $i++) {
+	    if ($parents[$i] eq $href->{title}) {
+
+		if ($href->{file} eq 'NULL') {
+		    print qq (  { NULL, "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
+		} else {
+		    print qq (  { "$href->{name}", "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
+		}
+		
+		$handled = 1;
+		last;
+	    }
+	}
+    }
+    
+    if ($handled) {
+	next;
+    }
+    
+    print qq (  { "$href->{name}", "$href->{title}", "$href->{file}", $href->{func}, NULL });
+}
+
+print ",\n";
+print qq (  { NULL } );
+print "\n};\n";
+
+exit 0;

demos/gtk-demo/geninclude.py

@@ -33,7 +33,7 @@ demos = []
 for demo_file in in_files:
     filename =  demo_file[demo_file.rfind('/')+1:]
     demo_name = filename.replace(".c", "")
-    with open(demo_file, 'r', encoding='utf-8') as f:
+    with open(demo_file, 'r') as f:
         title = f.readline().replace("/*", "").strip()
 
 

demos/gtk-demo/gestures.c

@@ -157,15 +157,16 @@ do_gestures (GtkWidget *do_widget)
                                       NULL, NULL);
 
       /* Swipe */
-      gesture = gtk_gesture_swipe_new ();
+      gesture = gtk_gesture_swipe_new (drawing_area);
       g_signal_connect (gesture, "swipe",
                         G_CALLBACK (swipe_gesture_swept), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* 3fg swipe for touchpads */
       gesture = g_object_new (GTK_TYPE_GESTURE_SWIPE,
+                              "widget", drawing_area,
                               "n-points", 3,
                               NULL);
       g_signal_connect (gesture, "begin",
@@ -174,34 +175,33 @@ do_gestures (GtkWidget *do_widget)
                         G_CALLBACK (swipe_gesture_swept), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
-
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Long press */
-      gesture = gtk_gesture_long_press_new ();
+      gesture = gtk_gesture_long_press_new (drawing_area);
       g_signal_connect (gesture, "pressed",
                         G_CALLBACK (long_press_gesture_pressed), drawing_area);
       g_signal_connect (gesture, "end",
                         G_CALLBACK (long_press_gesture_end), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Rotate */
-      rotate = gesture = gtk_gesture_rotate_new ();
+      rotate = gesture = gtk_gesture_rotate_new (drawing_area);
       g_signal_connect (gesture, "angle-changed",
                         G_CALLBACK (rotation_angle_changed), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Zoom */
-      zoom = gesture = gtk_gesture_zoom_new ();
+      zoom = gesture = gtk_gesture_zoom_new (drawing_area);
       g_signal_connect (gesture, "scale-changed",
                         G_CALLBACK (zoom_scale_changed), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/glarea.c

@@ -390,7 +390,7 @@ create_glarea_window (GtkWidget *do_widget)
   int i;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
+  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
   gtk_window_set_title (GTK_WINDOW (window), "OpenGL Area");
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

demos/gtk-demo/gtkfishbowl.c

@@ -24,18 +24,13 @@ typedef struct _GtkFishbowlChild         GtkFishbowlChild;
 
 struct _GtkFishbowlPrivate
 {
-  GtkFishCreationFunc creation_func;
   GList *children;
   guint count;
 
   gint64 last_frame_time;
-  gint64 update_delay;
   guint tick_id;
 
-  double framerate;
-  int last_benchmark_change;
-
-  guint benchmark : 1;
+  guint use_icons: 1;
 };
 
 struct _GtkFishbowlChild
@@ -50,25 +45,18 @@ struct _GtkFishbowlChild
 enum {
    PROP_0,
    PROP_ANIMATING,
-   PROP_BENCHMARK,
    PROP_COUNT,
-   PROP_FRAMERATE,
-   PROP_UPDATE_DELAY,
    NUM_PROPERTIES
 };
 
 static GParamSpec *props[NUM_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_CONTAINER)
 
 static void
 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;
+  gtk_widget_set_has_window (GTK_WIDGET (fishbowl), FALSE);
 }
 
 /**
@@ -84,6 +72,15 @@ gtk_fishbowl_new (void)
   return g_object_new (GTK_TYPE_FISHBOWL, NULL);
 }
 
+void
+gtk_fishbowl_set_use_icons (GtkFishbowl *fishbowl,
+                            gboolean     use_icons)
+{
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+
+  priv->use_icons = use_icons;
+}
+
 static void
 gtk_fishbowl_measure (GtkWidget      *widget,
                       GtkOrientation  orientation,
@@ -109,18 +106,7 @@ gtk_fishbowl_measure (GtkWidget      *widget,
       if (!gtk_widget_get_visible (child->widget))
         continue;
 
-
-      if (orientation == GTK_ORIENTATION_HORIZONTAL)
-        {
-          gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);
-        }
-      else
-        {
-          int min_width;
-
-          gtk_widget_measure (child->widget, GTK_ORIENTATION_HORIZONTAL, -1, &min_width, NULL, NULL, NULL);
-          gtk_widget_measure (child->widget, orientation, min_width, &child_min, &child_nat, NULL, NULL);
-        }
+      gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);
 
       *minimum = MAX (*minimum, child_min);
       *natural = MAX (*natural, child_nat);
@@ -128,10 +114,10 @@ gtk_fishbowl_measure (GtkWidget      *widget,
 }
 
 static void
-gtk_fishbowl_size_allocate (GtkWidget *widget,
-                            int        width,
-                            int        height,
-                            int        baseline)
+gtk_fishbowl_size_allocate (GtkWidget           *widget,
+                            const GtkAllocation *allocation,
+                            int                  baseline,
+                            GtkAllocation       *out_clip)
 {
   GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
@@ -142,18 +128,20 @@ gtk_fishbowl_size_allocate (GtkWidget *widget,
 
   for (children = priv->children; children; children = children->next)
     {
+      GtkAllocation child_clip;
+
       child = children->data;
 
       if (!gtk_widget_get_visible (child->widget))
         continue;
 
       gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
-      child_allocation.x = round (child->x * (width - child_requisition.width));
-      child_allocation.y = round (child->y * (height - child_requisition.height));
+      child_allocation.x = allocation->x + round (child->x * (allocation->width - child_requisition.width));
+      child_allocation.y = allocation->y + round (child->y * (allocation->height - child_requisition.height));
       child_allocation.width = child_requisition.width;
       child_allocation.height = child_requisition.height;
 
-      gtk_widget_size_allocate (child->widget, &child_allocation, -1);
+      gtk_widget_size_allocate (child->widget, &child_allocation, -1, &child_clip);
     }
 }
 
@@ -165,9 +153,10 @@ new_speed (void)
 }
 
 static void
-gtk_fishbowl_add (GtkFishbowl *fishbowl,
-                  GtkWidget   *widget)
+gtk_fishbowl_add (GtkContainer *container,
+                  GtkWidget    *widget)
 {
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
   GtkFishbowlChild *child_info;
 
@@ -189,12 +178,13 @@ gtk_fishbowl_add (GtkFishbowl *fishbowl,
 }
 
 static void
-gtk_fishbowl_remove (GtkFishbowl *fishbowl,
-                     GtkWidget   *widget)
+gtk_fishbowl_remove (GtkContainer *container,
+                     GtkWidget    *widget)
 {
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
   GtkFishbowlChild *child;
-  GtkWidget *widget_bowl = GTK_WIDGET (fishbowl);
+  GtkWidget *widget_container = GTK_WIDGET (container);
   GList *children;
 
   for (children = priv->children; children; children = children->next)
@@ -211,8 +201,8 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
           g_list_free (children);
           g_free (child);
 
-          if (was_visible && gtk_widget_get_visible (widget_bowl))
-            gtk_widget_queue_resize (widget_bowl);
+          if (was_visible && gtk_widget_get_visible (widget_container))
+            gtk_widget_queue_resize (widget_container);
 
           priv->count--;
           g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
@@ -221,6 +211,26 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
     }
 }
 
+static void
+gtk_fishbowl_forall (GtkContainer *container,
+                     GtkCallback   callback,
+                     gpointer      callback_data)
+{
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+  GtkFishbowlChild *child;
+  GList *children;
+
+  children = priv->children;
+  while (children)
+    {
+      child = children->data;
+      children = children->next;
+
+      (* callback) (child->widget, callback_data);
+    }
+}
+
 static void
 gtk_fishbowl_dispose (GObject *object)
 {
@@ -246,18 +256,10 @@ gtk_fishbowl_set_property (GObject         *object,
       gtk_fishbowl_set_animating (fishbowl, g_value_get_boolean (value));
       break;
 
-    case PROP_BENCHMARK:
-      gtk_fishbowl_set_benchmark (fishbowl, g_value_get_boolean (value));
-      break;
-
     case PROP_COUNT:
       gtk_fishbowl_set_count (fishbowl, g_value_get_uint (value));
       break;
 
-    case PROP_UPDATE_DELAY:
-      gtk_fishbowl_set_update_delay (fishbowl, g_value_get_int64 (value));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -278,22 +280,10 @@ gtk_fishbowl_get_property (GObject         *object,
       g_value_set_boolean (value, gtk_fishbowl_get_animating (fishbowl));
       break;
 
-    case PROP_BENCHMARK:
-      g_value_set_boolean (value, gtk_fishbowl_get_benchmark (fishbowl));
-      break;
-
     case PROP_COUNT:
       g_value_set_uint (value, gtk_fishbowl_get_count (fishbowl));
       break;
 
-    case PROP_FRAMERATE:
-      g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
-      break;
-
-    case PROP_UPDATE_DELAY:
-      g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -305,6 +295,7 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
 
   object_class->dispose = gtk_fishbowl_dispose;
   object_class->set_property = gtk_fishbowl_set_property;
@@ -313,6 +304,10 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
   widget_class->measure = gtk_fishbowl_measure;
   widget_class->size_allocate = gtk_fishbowl_size_allocate;
 
+  container_class->add = gtk_fishbowl_add;
+  container_class->remove = gtk_fishbowl_remove;
+  container_class->forall = gtk_fishbowl_forall;
+
   props[PROP_ANIMATING] =
       g_param_spec_boolean ("animating",
                             "animating",
@@ -320,36 +315,13 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                             FALSE,
                             G_PARAM_READWRITE);
 
-  props[PROP_BENCHMARK] =
-      g_param_spec_boolean ("benchmark",
-                            "Benchmark",
-                            "Adapt the count property to hit the maximum framerate",
-                            FALSE,
-                            G_PARAM_READWRITE);
-
   props[PROP_COUNT] =
       g_param_spec_uint ("count",
                          "Count",
                          "Number of widgets",
                          0, G_MAXUINT,
                          0,
-                         G_PARAM_READWRITE);
-
-  props[PROP_FRAMERATE] =
-      g_param_spec_double ("framerate",
-                           "Framerate",
-                           "Framerate of this widget in frames per second",
-                           0, G_MAXDOUBLE,
-                           0,
-                           G_PARAM_READABLE);
-
-  props[PROP_UPDATE_DELAY] =
-      g_param_spec_int64 ("update-delay",
-                          "Update delay",
-                          "Number of usecs between updates",
-                          0, G_MAXINT64,
-                          G_USEC_PER_SEC,
-                          G_PARAM_READWRITE);
+                         G_PARAM_READABLE);
 
   g_object_class_install_properties (object_class, NUM_PROPERTIES, props);
 }
@@ -362,58 +334,94 @@ gtk_fishbowl_get_count (GtkFishbowl *fishbowl)
   return priv->count;
 }
 
+char **icon_names = NULL;
+gsize n_icon_names = 0;
+
+static void
+init_icon_names (GtkIconTheme *theme)
+{
+  GPtrArray *icons;
+  GList *l, *icon_list;
+
+  if (icon_names)
+    return;
+
+  icon_list = gtk_icon_theme_list_icons (theme, NULL);
+  icons = g_ptr_array_new ();
+
+  for (l = icon_list; l; l = l->next)
+    {
+      if (g_str_has_suffix (l->data, "symbolic"))
+        continue;
+
+      g_ptr_array_add (icons, g_strdup (l->data));
+    }
+
+  n_icon_names = icons->len;
+  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
+  icon_names = (char **) g_ptr_array_free (icons, FALSE);
+
+  /* don't free strings, we assigned them to the array */
+  g_list_free_full (icon_list, g_free);
+}
+
+static const char *
+get_random_icon_name (GtkIconTheme *theme)
+{
+  init_icon_names (theme);
+
+  return icon_names[g_random_int_range(0, n_icon_names)];
+}
+
+static GType
+get_random_widget_type ()
+{
+  GType types[] = {
+    GTK_TYPE_SWITCH,
+    GTK_TYPE_BUTTON,
+    GTK_TYPE_ENTRY,
+    GTK_TYPE_SPIN_BUTTON,
+    GTK_TYPE_FONT_BUTTON,
+    GTK_TYPE_SCROLLBAR,
+    GTK_TYPE_SCALE,
+    GTK_TYPE_LEVEL_BAR,
+    GTK_TYPE_PROGRESS_BAR,
+    GTK_TYPE_RADIO_BUTTON,
+    GTK_TYPE_CHECK_BUTTON
+  };
+  return types[g_random_int_range (0, G_N_ELEMENTS (types))];
+}
+
 void
 gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
                         guint        count)
 {
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
 
-  if (priv->count == count)
-    return;
-
   g_object_freeze_notify (G_OBJECT (fishbowl));
 
   while (priv->count > count)
     {
-      gtk_fishbowl_remove (fishbowl, gtk_widget_get_first_child (GTK_WIDGET (fishbowl)));
+      gtk_container_remove (GTK_CONTAINER (fishbowl),
+                            ((GtkFishbowlChild *) priv->children->data)->widget);
     }
 
   while (priv->count < count)
     {
       GtkWidget *new_widget;
 
-      new_widget = priv->creation_func ();
+      if (priv->use_icons)
+        new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()),
+                                                   GTK_ICON_SIZE_DIALOG);
+      else
+        new_widget = g_object_new (get_random_widget_type (), NULL);
 
-      gtk_fishbowl_add (fishbowl, new_widget);
+      gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
     }
 
   g_object_thaw_notify (G_OBJECT (fishbowl));
 }
 
-gboolean
-gtk_fishbowl_get_benchmark (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->benchmark;
-}
-
-void
-gtk_fishbowl_set_benchmark (GtkFishbowl *fishbowl,
-                            gboolean     benchmark)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->benchmark == benchmark)
-    return;
-
-  priv->benchmark = benchmark;
-  if (!benchmark)
-    priv->last_benchmark_change = 0;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_BENCHMARK]);
-}
-
 gboolean
 gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
 {
@@ -422,111 +430,6 @@ gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
   return priv->tick_id != 0;
 }
 
-static gint64
-guess_refresh_interval (GdkFrameClock *frame_clock)
-{
-  gint64 interval;
-  gint64 i;
-
-  interval = G_MAXINT64;
-
-  for (i = gdk_frame_clock_get_history_start (frame_clock);
-       i < gdk_frame_clock_get_frame_counter (frame_clock);
-       i++)
-    {
-      GdkFrameTimings *t, *before;
-      gint64 ts, before_ts;
-
-      t = gdk_frame_clock_get_timings (frame_clock, i);
-      before = gdk_frame_clock_get_timings (frame_clock, i - 1);
-      if (t == NULL || before == NULL)
-        continue;
-
-      ts = gdk_frame_timings_get_frame_time (t);
-      before_ts = gdk_frame_timings_get_frame_time (before);
-      if (ts == 0 || before_ts == 0)
-        continue;
-
-      interval = MIN (interval, ts - before_ts);
-    }
-
-  if (interval == G_MAXINT64)
-    return 0;
-
-  return interval;
-}
-
-static void
-gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GdkFrameClock *frame_clock;
-  GdkFrameTimings *start, *end;
-  gint64 start_counter, end_counter;
-  gint64 n_frames, expected_frames;
-  gint64 start_timestamp, end_timestamp;
-  gint64 interval;
-
-  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (fishbowl));
-  if (frame_clock == NULL)
-    return;
-
-  start_counter = gdk_frame_clock_get_history_start (frame_clock);
-  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
-  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
-  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
-       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
-       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
-    end_counter--;
-  if (end_counter - start_counter < 4)
-    return;
-
-  start_timestamp = gdk_frame_timings_get_presentation_time (start);
-  end_timestamp = gdk_frame_timings_get_presentation_time (end);
-  if (start_timestamp == 0 || end_timestamp == 0)
-    {
-      start_timestamp = gdk_frame_timings_get_frame_time (start);
-      end_timestamp = gdk_frame_timings_get_frame_time (end);
-    }
-
-  n_frames = end_counter - start_counter;
-  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
-
-  if (!priv->benchmark)
-    return;
-
-  interval = gdk_frame_timings_get_refresh_interval (end);
-  if (interval == 0)
-    {
-      interval = guess_refresh_interval (frame_clock);
-      if (interval == 0)
-        return;
-    }
-  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
-
-  if (n_frames >= expected_frames)
-    {
-      if (priv->last_benchmark_change > 0)
-        priv->last_benchmark_change *= 2;
-      else
-        priv->last_benchmark_change = 1;
-    }
-  else if (n_frames + 1 < expected_frames)
-    {
-      if (priv->last_benchmark_change < 0)
-        priv->last_benchmark_change--;
-      else
-        priv->last_benchmark_change = -1;
-    }
-  else
-    {
-      priv->last_benchmark_change = 0;
-    }
-
-  gtk_fishbowl_set_count (fishbowl, MAX (1, (int) priv->count + priv->last_benchmark_change));
-}
-
 static gboolean
 gtk_fishbowl_tick (GtkWidget     *widget,
                    GdkFrameClock *frame_clock,
@@ -537,11 +440,9 @@ gtk_fishbowl_tick (GtkWidget     *widget,
   GtkFishbowlChild *child;
   GList *l;
   gint64 frame_time, elapsed;
-  gboolean do_update;
 
   frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
   elapsed = frame_time - priv->last_frame_time;
-  do_update = frame_time / priv->update_delay != priv->last_frame_time / priv->update_delay;
   priv->last_frame_time = frame_time;
 
   /* last frame was 0, so we're just starting to animate */
@@ -580,9 +481,6 @@ gtk_fishbowl_tick (GtkWidget     *widget,
 
   gtk_widget_queue_allocate (widget);
 
-  if (do_update)
-    gtk_fishbowl_do_update (fishbowl);
-
   return G_SOURCE_CONTINUE;
 }
 
@@ -607,57 +505,8 @@ gtk_fishbowl_set_animating (GtkFishbowl *fishbowl,
       priv->last_frame_time = 0;
       gtk_widget_remove_tick_callback (GTK_WIDGET (fishbowl), priv->tick_id);
       priv->tick_id = 0;
-      priv->framerate = 0;
-      g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
     }
 
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_ANIMATING]);
 }
 
-double
-gtk_fishbowl_get_framerate (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->framerate;
-}
-
-gint64
-gtk_fishbowl_get_update_delay (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->update_delay;
-}
-
-void
-gtk_fishbowl_set_update_delay (GtkFishbowl *fishbowl,
-                               gint64       update_delay)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->update_delay == update_delay)
-    return;
-
-  priv->update_delay = update_delay;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_UPDATE_DELAY]);
-}
-
-void
-gtk_fishbowl_set_creation_func (GtkFishbowl         *fishbowl,
-                                GtkFishCreationFunc  creation_func)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  g_object_freeze_notify (G_OBJECT (fishbowl));
-
-  gtk_fishbowl_set_count (fishbowl, 0);
-  priv->last_benchmark_change = 0;
-
-  priv->creation_func = creation_func;
-
-  gtk_fishbowl_set_count (fishbowl, 1);
-
-  g_object_thaw_notify (G_OBJECT (fishbowl));
-}

demos/gtk-demo/gtkfishbowl.h

@@ -32,37 +32,29 @@ G_BEGIN_DECLS
 typedef struct _GtkFishbowl              GtkFishbowl;
 typedef struct _GtkFishbowlClass         GtkFishbowlClass;
 
-typedef GtkWidget * (* GtkFishCreationFunc) (void);
-
 struct _GtkFishbowl
 {
-  GtkWidget parent;
+  GtkContainer container;
 };
 
 struct _GtkFishbowlClass
 {
-  GtkWidgetClass parent_class;
+  GtkContainerClass parent_class;
 };
 
 GType      gtk_fishbowl_get_type          (void) G_GNUC_CONST;
 
 GtkWidget* gtk_fishbowl_new               (void);
 
+void       gtk_fishbowl_set_use_icons     (GtkFishbowl       *fishbowl,
+                                           gboolean           use_icons);
+
 guint      gtk_fishbowl_get_count         (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_count         (GtkFishbowl       *fishbowl,
                                            guint              count);
 gboolean   gtk_fishbowl_get_animating     (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_animating     (GtkFishbowl       *fishbowl,
                                            gboolean           animating);
-gboolean   gtk_fishbowl_get_benchmark     (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_benchmark     (GtkFishbowl       *fishbowl,
-                                           gboolean           animating);
-double     gtk_fishbowl_get_framerate     (GtkFishbowl       *fishbowl);
-gint64     gtk_fishbowl_get_update_delay  (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_update_delay  (GtkFishbowl       *fishbowl,
-                                           gint64             update_delay);
-void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
-                                           GtkFishCreationFunc creation_func);
 
 G_END_DECLS
 

demos/gtk-demo/gtkgears.c

@@ -1,960 +0,0 @@
-/* The rendering code in here is taken from es2gears, which has the
- * following copyright notice:
- *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Ported to GLES2.
- * Kristian Høgsberg <krh@bitplanet.net>
- * May 3, 2010
- *
- * Improve GLES2 port:
- *   * Refactor gear drawing.
- *   * Use correct normals for surfaces.
- *   * Improve shader.
- *   * Use perspective projection transformation.
- *   * Add FPS count.
- *   * Add comments.
- * Alexandros Frantzis <alexandros.frantzis@linaro.org>
- * Jul 13, 2010
- */
-
-#include "config.h"
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <epoxy/gl.h>
-
-#include "gtkgears.h"
-
-#define STRIPS_PER_TOOTH 7
-#define VERTICES_PER_TOOTH 34
-#define GEAR_VERTEX_STRIDE 6
-
-#ifndef HAVE_SINCOS
-static void
-sincos (double x, double *_sin, double *_cos)
-{
-  *_sin = sin (x);
-  *_cos = cos (x);
-}
-#endif
-
-/**
- * Struct describing the vertices in triangle strip
- */
-struct vertex_strip {
-   /** The first vertex in the strip */
-   GLint first;
-   /** The number of consecutive vertices in the strip after the first */
-   GLint count;
-};
-
-/* Each vertex consist of GEAR_VERTEX_STRIDE GLfloat attributes */
-typedef GLfloat GearVertex[GEAR_VERTEX_STRIDE];
-
-/**
- * Struct representing a gear.
- */
-struct gear {
-   /** The array of vertices comprising the gear */
-   GearVertex *vertices;
-   /** The number of vertices comprising the gear */
-   int nvertices;
-   /** The array of triangle strips comprising the gear */
-   struct vertex_strip *strips;
-   /** The number of triangle strips comprising the gear */
-   int nstrips;
-};
-
-typedef struct {
-  /* The view rotation [x, y, z] */
-  GLfloat view_rot[GTK_GEARS_N_AXIS];
-
-  /* The Vertex Array Object */
-  GLuint vao;
-
-  /* The shader program */
-  GLuint program;
-
-  /* The gears */
-  struct gear *gear1;
-  struct gear *gear2;
-  struct gear *gear3;
-
-  /** The Vertex Buffer Object holding the vertices in the graphics card */
-  GLuint gear_vbo[3];
-
-  /** The location of the shader uniforms */
-  GLuint ModelViewProjectionMatrix_location;
-  GLuint NormalMatrix_location;
-  GLuint LightSourcePosition_location;
-  GLuint MaterialColor_location;
-
-  /* The current gear rotation angle */
-  GLfloat angle;
-
-  /* The projection matrix */
-  GLfloat ProjectionMatrix[16];
-
-  /* The direction of the directional light for the scene */
-  GLfloat LightSourcePosition[4];
-
-  gint64 first_frame_time;
-  guint tick;
-  GtkLabel *fps_label;
-} GtkGearsPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (GtkGears, gtk_gears, GTK_TYPE_GL_AREA)
-
-static gboolean gtk_gears_render        (GtkGLArea     *area,
-                                         GdkGLContext  *context);
-static void     gtk_gears_reshape       (GtkGLArea     *area,
-                                         int            width,
-                                         int            height);
-static void     gtk_gears_realize       (GtkWidget     *widget);
-static void     gtk_gears_unrealize     (GtkWidget     *widget);
-static gboolean gtk_gears_tick          (GtkWidget     *widget,
-                                         GdkFrameClock *frame_clock,
-                                         gpointer       user_data);
-
-static void destroy_gear (struct gear *g);
-
-GtkWidget *
-gtk_gears_new (void)
-{
-  return g_object_new (gtk_gears_get_type (),
-                       "has-depth-buffer", TRUE,
-                       NULL);
-}
-
-static void
-gtk_gears_init (GtkGears *gears)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  priv->view_rot[GTK_GEARS_X_AXIS] = 20.0;
-  priv->view_rot[GTK_GEARS_Y_AXIS] = 30.0;
-  priv->view_rot[GTK_GEARS_Z_AXIS] = 20.0;
-
-  priv->LightSourcePosition[0] = 5.0;
-  priv->LightSourcePosition[1] = 5.0;
-  priv->LightSourcePosition[2] = 10.0;
-  priv->LightSourcePosition[3] = 1.0;
-
-  priv->tick = gtk_widget_add_tick_callback (GTK_WIDGET (gears), gtk_gears_tick, gears, NULL);
-}
-
-static void
-gtk_gears_finalize (GObject *obj)
-{
-  GtkGears *gears = GTK_GEARS (obj);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  gtk_widget_remove_tick_callback (GTK_WIDGET (gears), priv->tick);
-
-  g_clear_object (&priv->fps_label);
-
-  g_clear_pointer (&priv->gear1, destroy_gear);
-  g_clear_pointer (&priv->gear2, destroy_gear);
-  g_clear_pointer (&priv->gear3, destroy_gear);
-
-  G_OBJECT_CLASS (gtk_gears_parent_class)->finalize (obj);
-}
-
-static void
-gtk_gears_class_init (GtkGearsClass *klass)
-{
-  GTK_GL_AREA_CLASS (klass)->render = gtk_gears_render;
-  GTK_GL_AREA_CLASS (klass)->resize = gtk_gears_reshape;
-
-  GTK_WIDGET_CLASS (klass)->realize = gtk_gears_realize;
-  GTK_WIDGET_CLASS (klass)->unrealize = gtk_gears_unrealize;
-
-  G_OBJECT_CLASS (klass)->finalize = gtk_gears_finalize;
-}
-
-/*
- * Fills a gear vertex.
- *
- * @param v the vertex to fill
- * @param x the x coordinate
- * @param y the y coordinate
- * @param z the z coortinate
- * @param n pointer to the normal table
- *
- * @return the operation error code
- */
-static GearVertex *
-vert (GearVertex *v,
-      GLfloat x,
-      GLfloat y,
-      GLfloat z,
-      GLfloat n[3])
-{
-  v[0][0] = x;
-  v[0][1] = y;
-  v[0][2] = z;
-  v[0][3] = n[0];
-  v[0][4] = n[1];
-  v[0][5] = n[2];
-
-  return v + 1;
-}
-
-static void
-destroy_gear (struct gear *g)
-{
-  g_free (g->strips);
-  g_free (g);
-}
-
-/**
- *  Create a gear wheel.
- *
- *  @param inner_radius radius of hole at center
- *  @param outer_radius radius at center of teeth
- *  @param width width of gear
- *  @param teeth number of teeth
- *  @param tooth_depth depth of tooth
- *
- *  @return pointer to the constructed struct gear
- */
-static struct gear *
-create_gear (GLfloat inner_radius,
-             GLfloat outer_radius,
-             GLfloat width,
-             GLint teeth,
-             GLfloat tooth_depth)
-{
-  GLfloat r0, r1, r2;
-  GLfloat da;
-  GearVertex *v;
-  struct gear *gear;
-  double s[5], c[5];
-  GLfloat normal[3];
-  int cur_strip = 0;
-  int i;
-
-  /* Allocate memory for the gear */
-  gear = g_malloc (sizeof *gear);
-
-  /* Calculate the radii used in the gear */
-  r0 = inner_radius;
-  r1 = outer_radius - tooth_depth / 2.0;
-  r2 = outer_radius + tooth_depth / 2.0;
-
-  da = 2.0 * M_PI / teeth / 4.0;
-
-  /* Allocate memory for the triangle strip information */
-  gear->nstrips = STRIPS_PER_TOOTH * teeth;
-  gear->strips = g_malloc0_n (gear->nstrips, sizeof (*gear->strips));
-
-  /* Allocate memory for the vertices */
-  gear->vertices = g_malloc0_n (VERTICES_PER_TOOTH * teeth, sizeof(*gear->vertices));
-  v = gear->vertices;
-
-  for (i = 0; i < teeth; i++) {
-    /* A set of macros for making the creation of the gears easier */
-#define  GEAR_POINT(p, r, da) do { p.x = (r) * c[(da)]; p.y = (r) * s[(da)]; } while(0)
-#define  SET_NORMAL(x, y, z) do { \
-   normal[0] = (x); normal[1] = (y); normal[2] = (z); \
-} while(0)
-
-#define  GEAR_VERT(v, point, sign) vert((v), p[(point)].x, p[(point)].y, (sign) * width * 0.5, normal)
-
-#define START_STRIP do { \
-   gear->strips[cur_strip].first = v - gear->vertices; \
-} while(0);
-
-#define END_STRIP do { \
-   int _tmp = (v - gear->vertices); \
-   gear->strips[cur_strip].count = _tmp - gear->strips[cur_strip].first; \
-   cur_strip++; \
-} while (0)
-
-#define QUAD_WITH_NORMAL(p1, p2) do { \
-   SET_NORMAL((p[(p1)].y - p[(p2)].y), -(p[(p1)].x - p[(p2)].x), 0); \
-   v = GEAR_VERT(v, (p1), -1); \
-   v = GEAR_VERT(v, (p1), 1); \
-   v = GEAR_VERT(v, (p2), -1); \
-   v = GEAR_VERT(v, (p2), 1); \
-} while(0)
-    struct point {
-      GLfloat x;
-      GLfloat y;
-    };
-
-    /* Create the 7 points (only x,y coords) used to draw a tooth */
-    struct point p[7];
-
-    /* Calculate needed sin/cos for varius angles */
-    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
-
-    GEAR_POINT(p[0], r2, 1);
-    GEAR_POINT(p[1], r2, 2);
-    GEAR_POINT(p[2], r1, 0);
-    GEAR_POINT(p[3], r1, 3);
-    GEAR_POINT(p[4], r0, 0);
-    GEAR_POINT(p[5], r1, 4);
-    GEAR_POINT(p[6], r0, 4);
-
-    /* Front face */
-    START_STRIP;
-    SET_NORMAL(0, 0, 1.0);
-    v = GEAR_VERT(v, 0, +1);
-    v = GEAR_VERT(v, 1, +1);
-    v = GEAR_VERT(v, 2, +1);
-    v = GEAR_VERT(v, 3, +1);
-    v = GEAR_VERT(v, 4, +1);
-    v = GEAR_VERT(v, 5, +1);
-    v = GEAR_VERT(v, 6, +1);
-    END_STRIP;
-
-    /* Inner face */
-    START_STRIP;
-    QUAD_WITH_NORMAL(4, 6);
-    END_STRIP;
-
-    /* Back face */
-    START_STRIP;
-    SET_NORMAL(0, 0, -1.0);
-    v = GEAR_VERT(v, 6, -1);
-    v = GEAR_VERT(v, 5, -1);
-    v = GEAR_VERT(v, 4, -1);
-    v = GEAR_VERT(v, 3, -1);
-    v = GEAR_VERT(v, 2, -1);
-    v = GEAR_VERT(v, 1, -1);
-    v = GEAR_VERT(v, 0, -1);
-    END_STRIP;
-
-    /* Outer face */
-    START_STRIP;
-    QUAD_WITH_NORMAL(0, 2);
-    END_STRIP;
-
-    START_STRIP;
-    QUAD_WITH_NORMAL(1, 0);
-    END_STRIP;
-
-    START_STRIP;
-    QUAD_WITH_NORMAL(3, 1);
-    END_STRIP;
-
-    START_STRIP;
-    QUAD_WITH_NORMAL(5, 3);
-    END_STRIP;
-  }
-
-  gear->nvertices = (v - gear->vertices);
-
-  return gear;
-}
-
-/** 
- * Multiplies two 4x4 matrices.
- *
- * The result is stored in matrix m.
- *
- * @param m the first matrix to multiply
- * @param n the second matrix to multiply
- */
-static void
-multiply (GLfloat *m, const GLfloat *n)
-{
-   GLfloat tmp[16];
-   const GLfloat *row, *column;
-   div_t d;
-   int i, j;
-
-   for (i = 0; i < 16; i++) {
-      tmp[i] = 0;
-      d = div(i, 4);
-      row = n + d.quot * 4;
-      column = m + d.rem;
-      for (j = 0; j < 4; j++)
-         tmp[i] += row[j] * column[j * 4];
-   }
-   memcpy(m, &tmp, sizeof tmp);
-}
-
-/** 
- * Rotates a 4x4 matrix.
- *
- * @param[in,out] m the matrix to rotate
- * @param angle the angle to rotate
- * @param x the x component of the direction to rotate to
- * @param y the y component of the direction to rotate to
- * @param z the z component of the direction to rotate to
- */
-static void
-rotate(GLfloat *m, GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
-{
-   double s = sin (angle);
-   double c = cos (angle);
-
-   GLfloat r[16] = {
-      x * x * (1 - c) + c,     y * x * (1 - c) + z * s, x * z * (1 - c) - y * s, 0,
-      x * y * (1 - c) - z * s, y * y * (1 - c) + c,     y * z * (1 - c) + x * s, 0,
-      x * z * (1 - c) + y * s, y * z * (1 - c) - x * s, z * z * (1 - c) + c,     0,
-      0, 0, 0, 1
-   };
-
-   multiply(m, r);
-}
-
-/** 
- * Translates a 4x4 matrix.
- * 
- * @param[in,out] m the matrix to translate
- * @param x the x component of the direction to translate to
- * @param y the y component of the direction to translate to
- * @param z the z component of the direction to translate to
- */
-static void
-translate(GLfloat *m, GLfloat x, GLfloat y, GLfloat z)
-{
-   GLfloat t[16] = { 1, 0, 0, 0,  0, 1, 0, 0,  0, 0, 1, 0,  x, y, z, 1 };
-
-   multiply(m, t);
-}
-
-/** 
- * Creates an identity 4x4 matrix.
- * 
- * @param m the matrix make an identity matrix
- */
-static void
-identity(GLfloat *m)
-{
-   GLfloat t[16] = {
-      1.0, 0.0, 0.0, 0.0,
-      0.0, 1.0, 0.0, 0.0,
-      0.0, 0.0, 1.0, 0.0,
-      0.0, 0.0, 0.0, 1.0,
-   };
-
-   memcpy(m, t, sizeof(t));
-}
-
-/** 
- * Transposes a 4x4 matrix.
- *
- * @param m the matrix to transpose
- */
-static void
-transpose(GLfloat *m)
-{
-   GLfloat t[16] = {
-      m[0], m[4], m[8],  m[12],
-      m[1], m[5], m[9],  m[13],
-      m[2], m[6], m[10], m[14],
-      m[3], m[7], m[11], m[15]};
-
-   memcpy(m, t, sizeof(t));
-}
-
-/**
- * Inverts a 4x4 matrix.
- *
- * This function can currently handle only pure translation-rotation matrices.
- * Read http://www.gamedev.net/community/forums/topic.asp?topic_id=425118
- * for an explanation.
- */
-static void
-invert(GLfloat *m)
-{
-   GLfloat t[16];
-   identity(t);
-
-   // Extract and invert the translation part 't'. The inverse of a
-   // translation matrix can be calculated by negating the translation
-   // coordinates.
-   t[12] = -m[12]; t[13] = -m[13]; t[14] = -m[14];
-
-   // Invert the rotation part 'r'. The inverse of a rotation matrix is
-   // equal to its transpose.
-   m[12] = m[13] = m[14] = 0;
-   transpose(m);
-
-   // inv(m) = inv(r) * inv(t)
-   multiply(m, t);
-}
-
-/** 
- * Calculate a perspective projection transformation.
- * 
- * @param m the matrix to save the transformation in
- * @param fovy the field of view in the y direction
- * @param aspect the view aspect ratio
- * @param zNear the near clipping plane
- * @param zFar the far clipping plane
- */
-void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar)
-{
-   GLfloat tmp[16];
-   double sine, cosine, cotangent, deltaZ;
-   GLfloat radians = fovy / 2 * M_PI / 180;
-   identity(tmp);
-
-   deltaZ = zFar - zNear;
-   sincos(radians, &sine, &cosine);
-
-   if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
-      return;
-
-   cotangent = cosine / sine;
-
-   tmp[0] = cotangent / aspect;
-   tmp[5] = cotangent;
-   tmp[10] = -(zFar + zNear) / deltaZ;
-   tmp[11] = -1;
-   tmp[14] = -2 * zNear * zFar / deltaZ;
-   tmp[15] = 0;
-
-   memcpy(m, tmp, sizeof(tmp));
-}
-
-/**
- * Draws a gear.
- *
- * @param gear the gear to draw
- * @param transform the current transformation matrix
- * @param x the x position to draw the gear at
- * @param y the y position to draw the gear at
- * @param angle the rotation angle of the gear
- * @param color the color of the gear
- */
-static void
-draw_gear(GtkGears *self,
-          struct gear *gear,
-          GLuint gear_vbo,
-          GLfloat *transform,
-          GLfloat x,
-          GLfloat y,
-          GLfloat angle,
-          const GLfloat color[4])
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (self);
-  GLfloat model_view[16];
-  GLfloat normal_matrix[16];
-  GLfloat model_view_projection[16];
-  int n;
-
-  /* Translate and rotate the gear */
-  memcpy(model_view, transform, sizeof (model_view));
-  translate(model_view, x, y, 0);
-  rotate(model_view, 2 * G_PI * angle / 360.0, 0, 0, 1);
-
-  /* Create and set the ModelViewProjectionMatrix */
-  memcpy(model_view_projection, priv->ProjectionMatrix, sizeof(model_view_projection));
-  multiply(model_view_projection, model_view);
-
-  glUniformMatrix4fv(priv->ModelViewProjectionMatrix_location, 1, GL_FALSE,
-                     model_view_projection);
-
-  /* 
-   * Create and set the NormalMatrix. It's the inverse transpose of the
-   * ModelView matrix.
-   */
-  memcpy(normal_matrix, model_view, sizeof (normal_matrix));
-  invert(normal_matrix);
-  transpose(normal_matrix);
-  glUniformMatrix4fv(priv->NormalMatrix_location, 1, GL_FALSE, normal_matrix);
-
-  /* Set the gear color */
-  glUniform4fv(priv->MaterialColor_location, 1, color);
-
-  /* Set the vertex buffer object to use */
-  glBindBuffer(GL_ARRAY_BUFFER, gear_vbo);
-
-  /* Set up the position of the attributes in the vertex buffer object */
-  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), NULL);
-  glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), (GLfloat *) 0 + 3);
-
-  /* Enable the attributes */
-  glEnableVertexAttribArray(0);
-  glEnableVertexAttribArray(1);
-
-  /* Draw the triangle strips that comprise the gear */
-  for (n = 0; n < gear->nstrips; n++) {
-    glDrawArrays(GL_TRIANGLE_STRIP, gear->strips[n].first, gear->strips[n].count);
-  }
-
-  /* Disable the attributes */
-  glDisableVertexAttribArray(1);
-  glDisableVertexAttribArray(0);
-}
-
-/* new window size or exposure */
-static void
-gtk_gears_reshape (GtkGLArea *area, int width, int height)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private ((GtkGears *) area);
-
-  /* Update the projection matrix */
-  perspective (priv->ProjectionMatrix, 60.0, width / (float)height, 1.0, 1024.0);
-
-  /* Set the viewport */
-  glViewport (0, 0, (GLint) width, (GLint) height);
-}
-
-static gboolean
-gtk_gears_render (GtkGLArea    *area,
-                  GdkGLContext *context)
-{
-  static const GLfloat red[4]   = { 0.8, 0.1, 0.0, 1.0 };
-  static const GLfloat green[4] = { 0.0, 0.8, 0.2, 1.0 };
-  static const GLfloat blue[4]  = { 0.2, 0.2, 1.0, 1.0 };
-
-  GtkGears *self = GTK_GEARS (area);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (self);
-  GLfloat transform[16];
-
-  identity (transform);
-
-  glClearColor (0.0, 0.0, 0.0, 0.0);
-  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  /* Translate and rotate the view */
-  translate (transform, 0, 0, -20);
-  rotate (transform, 2 * G_PI * priv->view_rot[0] / 360.0, 1, 0, 0);
-  rotate (transform, 2 * G_PI * priv->view_rot[1] / 360.0, 0, 1, 0);
-  rotate (transform, 2 * G_PI * priv->view_rot[2] / 360.0, 0, 0, 1);
-
-  /* Draw the gears */
-  draw_gear (self, priv->gear1, priv->gear_vbo[0], transform, -3.0, -2.0,      priv->angle,        red);
-  draw_gear (self, priv->gear2, priv->gear_vbo[1], transform,  3.1, -2.0, -2 * priv->angle - 9.0,  green);
-  draw_gear (self, priv->gear3, priv->gear_vbo[2], transform, -3.1,  4.2, -2 * priv->angle - 25.0, blue);
-
-  return TRUE;
-}
-
-static const char vertex_shader_gl[] =
-"#version 150\n"
-"\n"
-"in vec3 position;\n"
-"in vec3 normal;\n"
-"\n"
-"uniform mat4 ModelViewProjectionMatrix;\n"
-"uniform mat4 NormalMatrix;\n"
-"uniform vec4 LightSourcePosition;\n"
-"uniform vec4 MaterialColor;\n"
-"\n"
-"smooth out vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    // Transform the normal to eye coordinates\n"
-"    vec3 N = normalize(vec3(NormalMatrix * vec4(normal, 1.0)));\n"
-"\n"
-"    // The LightSourcePosition is actually its direction for directional light\n"
-"    vec3 L = normalize(LightSourcePosition.xyz);\n"
-"\n"
-"    // Multiply the diffuse value by the vertex color (which is fixed in this case)\n"
-"    // to get the actual color that we will use to draw this vertex with\n"
-"    float diffuse = max(dot(N, L), 0.0);\n"
-"    Color = diffuse * MaterialColor;\n"
-"\n"
-"    // Transform the position to clip coordinates\n"
-"    gl_Position = ModelViewProjectionMatrix * vec4(position, 1.0);\n"
-"}";
-
-static const char fragment_shader_gl[] =
-"#version 150\n"
-"\n"
-"smooth in vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    gl_FragColor = Color;\n"
-"}";
-
-static const char vertex_shader_gles[] =
-"attribute vec3 position;\n"
-"attribute vec3 normal;\n"
-"\n"
-"uniform mat4 ModelViewProjectionMatrix;\n"
-"uniform mat4 NormalMatrix;\n"
-"uniform vec4 LightSourcePosition;\n"
-"uniform vec4 MaterialColor;\n"
-"\n"
-"varying vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    // Transform the normal to eye coordinates\n"
-"    vec3 N = normalize(vec3(NormalMatrix * vec4(normal, 1.0)));\n"
-"\n"
-"    // The LightSourcePosition is actually its direction for directional light\n"
-"    vec3 L = normalize(LightSourcePosition.xyz);\n"
-"\n"
-"    // Multiply the diffuse value by the vertex color (which is fixed in this case)\n"
-"    // to get the actual color that we will use to draw this vertex with\n"
-"    float diffuse = max(dot(N, L), 0.0);\n"
-"    Color = diffuse * MaterialColor;\n"
-"\n"
-"    // Transform the position to clip coordinates\n"
-"    gl_Position = ModelViewProjectionMatrix * vec4(position, 1.0);\n"
-"}";
-
-static const char fragment_shader_gles[] =
-"precision mediump float;\n"
-"varying vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    gl_FragColor = Color;\n"
-"}";
-
-static void
-gtk_gears_realize (GtkWidget *widget)
-{
-  GtkGLArea *glarea = GTK_GL_AREA (widget);
-  GtkGears *gears = GTK_GEARS (widget);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-  GdkGLContext *context;
-  GLuint vao, v, f, program;
-  const char *p;
-  char msg[512];
-
-  GTK_WIDGET_CLASS (gtk_gears_parent_class)->realize (widget);
-
-  gtk_gl_area_make_current (glarea);
-  if (gtk_gl_area_get_error (glarea) != NULL)
-    return;
-
-  context = gtk_gl_area_get_context (glarea);
-
-  glEnable (GL_CULL_FACE);
-  glEnable (GL_DEPTH_TEST);
-
-  /* Create the VAO */
-  glGenVertexArrays (1, &vao);
-  glBindVertexArray (vao);
-  priv->vao = vao;
-
-  /* Compile the vertex shader */
-  if (gdk_gl_context_get_use_es (context))
-    p = vertex_shader_gles;
-  else
-    p = vertex_shader_gl;
-  v = glCreateShader(GL_VERTEX_SHADER);
-  glShaderSource(v, 1, &p, NULL);
-  glCompileShader(v);
-  glGetShaderInfoLog(v, sizeof msg, NULL, msg);
-  g_print ("vertex shader info: %s\n", msg);
-
-  /* Compile the fragment shader */
-  if (gdk_gl_context_get_use_es (context))
-    p = fragment_shader_gles;
-  else
-    p = fragment_shader_gl;
-  f = glCreateShader(GL_FRAGMENT_SHADER);
-  glShaderSource(f, 1, &p, NULL);
-  glCompileShader(f);
-  glGetShaderInfoLog(f, sizeof msg, NULL, msg);
-  g_print ("fragment shader info: %s\n", msg);
-
-  /* Create and link the shader program */
-  program = glCreateProgram();
-  glAttachShader(program, v);
-  glAttachShader(program, f);
-  glBindAttribLocation(program, 0, "position");
-  glBindAttribLocation(program, 1, "normal");
-
-  glLinkProgram(program);
-  glGetProgramInfoLog(program, sizeof msg, NULL, msg);
-  g_print ("program info: %s\n", msg);
-  glDeleteShader (v);
-  glDeleteShader (f);
-
-  /* Enable the shaders */
-  glUseProgram(program);
-  priv->program = program;
-
-  /* Get the locations of the uniforms so we can access them */
-  priv->ModelViewProjectionMatrix_location = glGetUniformLocation(program, "ModelViewProjectionMatrix");
-  priv->NormalMatrix_location = glGetUniformLocation(program, "NormalMatrix");
-  priv->LightSourcePosition_location = glGetUniformLocation(program, "LightSourcePosition");
-  priv->MaterialColor_location = glGetUniformLocation(program, "MaterialColor");
-
-  /* Set the LightSourcePosition uniform which is constant throught the program */
-  glUniform4fv(priv->LightSourcePosition_location, 1, priv->LightSourcePosition);
-
-  /* make the gears */
-  priv->gear1 = create_gear(1.0, 4.0, 1.0, 20, 0.7);
-
-  /* Store the vertices in a vertex buffer object (VBO) */
-  glGenBuffers (1, &(priv->gear_vbo[0]));
-  glBindBuffer (GL_ARRAY_BUFFER, priv->gear_vbo[0]);
-  glBufferData (GL_ARRAY_BUFFER,
-                priv->gear1->nvertices * sizeof(GearVertex),
-                priv->gear1->vertices,
-                GL_STATIC_DRAW);
-
-  priv->gear2 = create_gear(0.5, 2.0, 2.0, 10, 0.7);
-  glGenBuffers (1, &(priv->gear_vbo[1]));
-  glBindBuffer (GL_ARRAY_BUFFER, priv->gear_vbo[1]);
-  glBufferData (GL_ARRAY_BUFFER,
-                priv->gear2->nvertices * sizeof(GearVertex),
-                priv->gear2->vertices,
-                GL_STATIC_DRAW);
-
-  priv->gear3 = create_gear(1.3, 2.0, 0.5, 10, 0.7);
-  glGenBuffers (1, &(priv->gear_vbo[2]));
-  glBindBuffer (GL_ARRAY_BUFFER, priv->gear_vbo[2]);
-  glBufferData (GL_ARRAY_BUFFER,
-                priv->gear3->nvertices * sizeof(GearVertex),
-                priv->gear3->vertices,
-                GL_STATIC_DRAW);
-}
-
-static void
-gtk_gears_unrealize (GtkWidget *widget)
-{
-  GtkGLArea *glarea = GTK_GL_AREA (widget);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private ((GtkGears *) widget);
-
-  gtk_gl_area_make_current (glarea);
-  if (gtk_gl_area_get_error (glarea) != NULL)
-    return;
-
-  /* Release the resources associated with OpenGL */
-  if (priv->gear_vbo[0] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[0]));
-
-  if (priv->gear_vbo[1] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[1]));
-
-  if (priv->gear_vbo[2] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[2]));
-
-  if (priv->vao != 0)
-    glDeleteVertexArrays (1, &priv->vao);
-
-  if (priv->program != 0)
-    glDeleteProgram (priv->program);
-
-  priv->ModelViewProjectionMatrix_location = 0;
-  priv->NormalMatrix_location = 0;
-  priv->LightSourcePosition_location = 0;
-  priv->MaterialColor_location = 0;
-
-  GTK_WIDGET_CLASS (gtk_gears_parent_class)->unrealize (widget);
-}
-
-static gboolean
-gtk_gears_tick (GtkWidget     *widget,
-                GdkFrameClock *frame_clock,
-                gpointer       user_data)
-{
-  GtkGears *gears = GTK_GEARS (widget);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-  GdkFrameTimings *timings, *previous_timings;
-  gint64 previous_frame_time = 0;
-  gint64 frame_time;
-  gint64 history_start, history_len;
-  gint64 frame;
-  char *s;
-
-  frame = gdk_frame_clock_get_frame_counter (frame_clock);
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-
-  if (priv->first_frame_time == 0)
-    {
-      /* No need for changes on first frame */
-      priv->first_frame_time = frame_time;
-      if (priv->fps_label)
-        gtk_label_set_label (priv->fps_label, "FPS: ---");
-      return G_SOURCE_CONTINUE;
-    }
-
-  /* glxgears advances 70 degrees per second, so do the same */
-
-  priv->angle = fmod ((frame_time - priv->first_frame_time) / (double)G_USEC_PER_SEC * 70.0, 360.0);
-
-  gtk_widget_queue_draw (widget);
-
-  history_start = gdk_frame_clock_get_history_start (frame_clock);
-
-  if (priv->fps_label && frame % 60 == 0)
-    {
-      history_len = frame - history_start;
-      if (history_len > 0)
-        {
-          previous_timings = gdk_frame_clock_get_timings (frame_clock, frame - history_len);
-          previous_frame_time = gdk_frame_timings_get_frame_time (previous_timings);
-
-          s = g_strdup_printf ("FPS: %-4.1f", (G_USEC_PER_SEC * history_len) / (double)(frame_time - previous_frame_time));
-          gtk_label_set_label (priv->fps_label, s);
-          g_free (s);
-        }
-    }
-
-  timings = gdk_frame_clock_get_current_timings (frame_clock);
-  previous_timings = gdk_frame_clock_get_timings (frame_clock,
-                                                  gdk_frame_timings_get_frame_counter (timings) - 1);
-  if (previous_timings != NULL)
-    previous_frame_time = gdk_frame_timings_get_frame_time (previous_timings);
-
-  return G_SOURCE_CONTINUE;
-}
-
-void
-gtk_gears_set_axis (GtkGears *gears, int axis, double value)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  if (axis < 0 || axis >= GTK_GEARS_N_AXIS)
-    return;
-
-  priv->view_rot[axis] = value;
-
-  gtk_widget_queue_draw (GTK_WIDGET (gears));
-}
-
-double
-gtk_gears_get_axis (GtkGears *gears, int axis)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  if (axis < 0 || axis >= GTK_GEARS_N_AXIS)
-    return 0.0;
-
-  return priv->view_rot[axis];
-}
-
-void
-gtk_gears_set_fps_label (GtkGears *gears, GtkLabel *label)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  if (label)
-    g_object_ref (label);
-
-  g_clear_object (&priv->fps_label);
-
-  priv->fps_label = label;
-}

demos/gtk-demo/gtkgears.h

@@ -1,48 +0,0 @@
-#ifndef __GTK_GEARS_H__
-#define __GTK_GEARS_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-enum {
-  GTK_GEARS_X_AXIS,
-  GTK_GEARS_Y_AXIS,
-  GTK_GEARS_Z_AXIS,
-
-  GTK_GEARS_N_AXIS
-};
-
-#define GTK_TYPE_GEARS      (gtk_gears_get_type ())
-#define GTK_GEARS(inst)     (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                             GTK_TYPE_GEARS,             \
-                             GtkGears))
-#define GTK_IS_GEARS(inst)  (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                             GTK_TYPE_GEARS))
-
-typedef struct _GtkGears GtkGears;
-typedef struct _GtkGearsClass GtkGearsClass;
-
-struct _GtkGears {
-  GtkGLArea parent;
-};
-
-struct _GtkGearsClass {
-  GtkGLAreaClass parent_class;
-};
-
-GType      gtk_gears_get_type      (void) G_GNUC_CONST;
-
-GtkWidget *gtk_gears_new           (void);
-void       gtk_gears_set_axis      (GtkGears *gears,
-                                    int       axis,
-                                    double    value);
-double     gtk_gears_get_axis      (GtkGears *gears,
-                                    int       axis);
-void       gtk_gears_set_fps_label (GtkGears *gears,
-                                    GtkLabel *label);
-
-
-G_END_DECLS
-
-#endif /* __GTK_GEARS_H__ */

demos/gtk-demo/headerbar.c

@@ -24,19 +24,19 @@ do_headerbar (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
 
       header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Welcome to Facebook - Log in, sign up or learn more");
       gtk_header_bar_set_has_subtitle (GTK_HEADER_BAR (header), FALSE);
 
       button = gtk_button_new ();
       icon = g_themed_icon_new ("mail-send-receive-symbolic");
-      image = gtk_image_new_from_gicon (icon);
+      image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_BUTTON);
       g_object_unref (icon);
       gtk_container_add (GTK_CONTAINER (button), image);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
@@ -44,10 +44,10 @@ do_headerbar (GtkWidget *do_widget)
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked");
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
+      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic", GTK_ICON_SIZE_BUTTON));
       gtk_container_add (GTK_CONTAINER (box), button);
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
+      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic", GTK_ICON_SIZE_BUTTON));
       gtk_container_add (GTK_CONTAINER (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

demos/gtk-demo/hypertext.c

@@ -105,16 +105,13 @@ follow_if_link (GtkWidget   *text_view,
 /* Links can be activated by pressing Enter.
  */
 static gboolean
-key_pressed (GtkEventController *controller,
-             guint               keyval,
-             guint               keycode,
-             GdkModifierType     modifiers,
-             GtkWidget          *text_view)
+key_press_event (GtkWidget *text_view,
+                 GdkEventKey *event)
 {
   GtkTextIter iter;
   GtkTextBuffer *buffer;
 
-  switch (keyval)
+  switch (event->keyval)
     {
       case GDK_KEY_Return:
       case GDK_KEY_KP_Enter:
@@ -128,52 +125,63 @@ key_pressed (GtkEventController *controller,
         break;
     }
 
-  return GDK_EVENT_PROPAGATE;
+  return FALSE;
 }
 
-static void set_cursor_if_appropriate (GtkTextView *text_view,
-                                       gint         x,
-                                       gint         y);
-
-static void
-released_cb (GtkGestureMultiPress *gesture,
-             guint                 n_press,
-             gdouble               x,
-             gdouble               y,
-             GtkWidget            *text_view)
+/* Links can also be activated by clicking or tapping.
+ */
+static gboolean
+event_after (GtkWidget *text_view,
+             GdkEvent  *ev)
 {
   GtkTextIter start, end, iter;
   GtkTextBuffer *buffer;
-  int tx, ty;
+  gdouble ex, ey;
+  gint x, y;
 
-  if (gtk_gesture_single_get_button (GTK_GESTURE_SINGLE (gesture)) > 1)
-    return;
+  if (ev->type == GDK_BUTTON_RELEASE)
+    {
+      GdkEventButton *event;
 
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
-                                         GTK_TEXT_WINDOW_WIDGET,
-                                         x, y, &tx, &ty);
+      event = (GdkEventButton *)ev;
+      if (event->button != GDK_BUTTON_PRIMARY)
+        return FALSE;
+
+      ex = event->x;
+      ey = event->y;
+    }
+  else if (ev->type == GDK_TOUCH_END)
+    {
+      GdkEventTouch *event;
+
+      event = (GdkEventTouch *)ev;
+
+      ex = event->x;
+      ey = event->y;
+    }
+  else
+    return FALSE;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
 
   /* we shouldn't follow a link if the user has selected something */
   gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
   if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
-    return;
+    return FALSE;
+
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         ex, ey, &x, &y);
 
   if (gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y))
     follow_if_link (text_view, &iter);
-}
 
-static void
-motion_cb (GtkEventControllerMotion *controller,
-           gdouble                   x,
-           gdouble                   y,
-           GtkTextView              *text_view)
-{
-  set_cursor_if_appropriate (text_view, x, y);
+  return TRUE;
 }
 
 static gboolean hovering_over_link = FALSE;
+static GdkCursor *hand_cursor = NULL;
+static GdkCursor *regular_cursor = NULL;
 
 /* Looks at all tags covering the position (x, y) in the text view,
  * and if one of them is a link, change the cursor to the "hands" cursor
@@ -209,15 +217,32 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
       hovering_over_link = hovering;
 
       if (hovering_over_link)
-        gtk_widget_set_cursor_from_name (GTK_WIDGET (text_view), "pointer");
+        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), hand_cursor);
       else
-        gtk_widget_set_cursor_from_name (GTK_WIDGET (text_view), "text");
+        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), regular_cursor);
     }
 
   if (tags)
     g_slist_free (tags);
 }
 
+/* Update the cursor image if the pointer moved.
+ */
+static gboolean
+motion_notify_event (GtkWidget      *text_view,
+                     GdkEventMotion *event)
+{
+  gint x, y;
+
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         event->x, event->y, &x, &y);
+
+  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
+
+  return FALSE;
+}
+
 GtkWidget *
 do_hypertext (GtkWidget *do_widget)
 {
@@ -228,12 +253,16 @@ do_hypertext (GtkWidget *do_widget)
       GtkWidget *view;
       GtkWidget *sw;
       GtkTextBuffer *buffer;
-      GtkEventController *controller;
+      GdkDisplay *display;
+
+      display = gtk_widget_get_display (do_widget);
+      hand_cursor = gdk_cursor_new_from_name (display, "pointer");
+      regular_cursor = gdk_cursor_new_from_name (display, "text");
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
 
       g_signal_connect (window, "destroy",
@@ -243,19 +272,12 @@ do_hypertext (GtkWidget *do_widget)
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
       gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
       gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 20);
-      controller = gtk_event_controller_key_new ();
-      g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), view);
-      gtk_widget_add_controller (view, controller);
-
-      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);
-
-      controller = gtk_event_controller_motion_new ();
-      g_signal_connect (controller, "motion",
-                        G_CALLBACK (motion_cb), view);
-      gtk_widget_add_controller (view, controller);
+      g_signal_connect (view, "key-press-event",
+                        G_CALLBACK (key_press_event), NULL);
+      g_signal_connect (view, "event-after",
+                        G_CALLBACK (event_after), NULL);
+      g_signal_connect (view, "motion-notify-event",
+                        G_CALLBACK (motion_notify_event), NULL);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 

demos/gtk-demo/iconview.c

@@ -253,8 +253,8 @@ do_iconview (GtkWidget *do_widget)
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Icon View Basics");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/iconview_edit.c

@@ -108,8 +108,8 @@ do_iconview_edit (GtkWidget *do_widget)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/images.c

@@ -1,15 +1,15 @@
 /* Images
  *
- * GtkImage and GtkPicture are used to display an image; the image can be
- * in a number of formats.
- *
- * GtkImage is the widget used to display icons or images that should be
- * sized and styled like an icon, while GtkPicture is used for images
- * that should be displayed as-is.
+ * GtkImage is used to display an image; the image can be in a number of formats.
+ * Typically, you load an image into a GdkPixbuf, then display the pixbuf.
  *
  * This demo code shows some of the more obscure cases, in the simple
- * case a call to gtk_picture_new_for_file() or
- * gtk_image_new_from_icon_name() is all you need.
+ * case a call to gtk_image_new_from_file() is all you need.
+ *
+ * If you want to put image data in your program as a C variable,
+ * use the make-inline-pixbuf program that comes with GTK+.
+ * This way you won't need to depend on loading external files, your
+ * application binary can be self-contained.
  */
 
 #include <gtk/gtk.h>
@@ -27,9 +27,9 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
                                gpointer         data)
 {
   GdkPixbuf *pixbuf;
-  GtkWidget *picture;
+  GtkWidget *image;
 
-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);
 
   pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 
@@ -38,7 +38,7 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
    */
   gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
 
-  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }
 
 static void
@@ -49,21 +49,30 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                               gint                 height,
                               gpointer     data)
 {
-  GtkWidget *picture;
+  GtkWidget *image;
   GdkPixbuf *pixbuf;
 
-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);
 
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
+  /* We know the pixbuf inside the GtkImage has changed, but the image
+   * itself doesn't know this; so give it a hint by setting the pixbuf
+   * again. Queuing a redraw used to be sufficient, but nowadays GtkImage
+   * uses GtkIconHelper which caches the pixbuf state and will just redraw
+   * from the cache.
+   */
+
+  pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
+  g_object_ref (pixbuf);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static gint
 progressive_timeout (gpointer data)
 {
-  GtkWidget *picture;
+  GtkWidget *image;
 
-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);
 
   /* This shows off fully-paranoid error handling, so looks scary.
    * You could factor out the error handling code into a nice separate
@@ -241,10 +250,10 @@ progressive_timeout (gpointer data)
       pixbuf_loader = gdk_pixbuf_loader_new ();
 
       g_signal_connect (pixbuf_loader, "area-prepared",
-                        G_CALLBACK (progressive_prepared_callback), picture);
+                        G_CALLBACK (progressive_prepared_callback), image);
 
       g_signal_connect (pixbuf_loader, "area-updated",
-                        G_CALLBACK (progressive_updated_callback), picture);
+                        G_CALLBACK (progressive_updated_callback), image);
     }
 
   /* leave timeout installed */
@@ -252,7 +261,7 @@ progressive_timeout (gpointer data)
 }
 
 static void
-start_progressive_loading (GtkWidget *picture)
+start_progressive_loading (GtkWidget *image)
 {
   /* This is obviously totally contrived (we slow down loading
    * on purpose to show how incremental loading works).
@@ -261,7 +270,9 @@ start_progressive_loading (GtkWidget *picture)
    * The timeout simply simulates a slow data source by inserting
    * pauses in the reading process.
    */
-  load_timeout = g_timeout_add (150, progressive_timeout, picture);
+  load_timeout = gdk_threads_add_timeout (150,
+                                progressive_timeout,
+                                image);
   g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
 }
 
@@ -317,23 +328,18 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
 GtkWidget *
 do_images (GtkWidget *do_widget)
 {
-  GtkWidget *video;
   GtkWidget *frame;
   GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *base_vbox;
   GtkWidget *image;
-  GtkWidget *picture;
   GtkWidget *label;
   GtkWidget *button;
-  GdkPaintable *paintable;
-  GIcon *gicon;
+  GIcon     *gicon;
 
   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_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
 
       g_signal_connect (window, "destroy",
@@ -341,15 +347,9 @@ do_images (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (cleanup_callback), NULL);
 
-      base_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (base_vbox, "margin", 16, NULL);
-      gtk_container_add (GTK_CONTAINER (window), base_vbox);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
-      gtk_container_add (GTK_CONTAINER (base_vbox), hbox);
-
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      g_object_set (vbox, "margin", 16, NULL);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
@@ -362,8 +362,7 @@ do_images (GtkWidget *do_widget)
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
-      image = gtk_image_new_from_icon_name ("gtk3-demo");
-      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+      image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG);
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
@@ -381,9 +380,9 @@ do_images (GtkWidget *do_widget)
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
-      picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");
+      image = gtk_image_new_from_resource ("/images/floppybuddy.gif");
 
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      gtk_container_add (GTK_CONTAINER (frame), image);
 
       /* Symbolic icon */
 
@@ -399,15 +398,12 @@ do_images (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
-      image = gtk_image_new_from_gicon (gicon);
-      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
 
       /* Progressive */
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
@@ -423,52 +419,18 @@ do_images (GtkWidget *do_widget)
       /* Create an empty image for now; the progressive loader
        * will create the pixbuf and fill it in.
        */
-      picture = gtk_picture_new ();
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      image = gtk_image_new_from_pixbuf (NULL);
+      gtk_container_add (GTK_CONTAINER (frame), image);
 
-      start_progressive_loading (picture);
-
-      /* Video */
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Displaying video</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
-
-      video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
-      gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
-      gtk_container_add (GTK_CONTAINER (frame), video);
-
-      /* Widget paintables */
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>GtkWidgetPaintable</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
-
-      paintable = gtk_widget_paintable_new (do_widget);
-      picture = gtk_picture_new_for_paintable (paintable);
-      gtk_widget_set_size_request (picture, 100, 100);
-      gtk_widget_set_valign (picture, GTK_ALIGN_START);
-      gtk_container_add (GTK_CONTAINER (vbox), picture);
+      start_progressive_loading (image);
 
       /* Sensitivity control */
       button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (base_vbox), button);
+      gtk_box_pack_start (GTK_BOX (vbox), button);
 
       g_signal_connect (button, "toggled",
                         G_CALLBACK (toggle_sensitivity_callback),
-                        base_vbox);
+                        vbox);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/infobar.c

@@ -54,8 +54,8 @@ do_infobar (GtkWidget *do_widget)
       actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/language-names.c

@@ -1,239 +0,0 @@
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <errno.h>
-#include <locale.h>
-#include <sys/stat.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <hb-ot.h>
-
-#include "language-names.h"
-
-#define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
-#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-
-static GHashTable *language_map;
-
-static char *
-get_first_item_in_semicolon_list (const char *list)
-{
-  char **items;
-  char  *item;
-
-  items = g_strsplit (list, "; ", 2);
-
-  item = g_strdup (items[0]);
-  g_strfreev (items);
-
-  return item;
-}
-
-static char *
-capitalize_utf8_string (const char *str)
-{
-  char first[8] = { 0 };
-
-  if (!str)
-    return NULL;
-
-  g_unichar_to_utf8 (g_unichar_totitle (g_utf8_get_char (str)), first);
-
-  return g_strconcat (first, g_utf8_offset_to_pointer (str, 1), NULL);
-}
-
-static char *
-get_display_name (const char *language)
-{
-  const char  *translated;
-  char *tmp;
-  char *name;
-
-  translated = dgettext ("iso_639", language);
-
-  tmp = get_first_item_in_semicolon_list (translated);
-  name = capitalize_utf8_string (tmp);
-  g_free (tmp);
-
-  return name;
-}
-
-static void
-languages_parse_start_tag (GMarkupParseContext  *ctx,
-                           const char           *element_name,
-                           const char          **attr_names,
-                           const char          **attr_values,
-                           gpointer              user_data,
-                           GError              **error)
-{
-  const char *ccode_longB;
-  const char *ccode_longT;
-  const char *ccode;
-  const char *ccode_id;
-  const char *lang_name;
-  char *display_name;
-
-  if (!(g_str_equal (element_name, "iso_639_entry") ||
-        g_str_equal (element_name, "iso_639_3_entry")) ||
-        attr_names == NULL ||
-        attr_values == NULL)
-    return;
-
-  ccode = NULL;
-  ccode_longB = NULL;
-  ccode_longT = NULL;
-  ccode_id = NULL;
-  lang_name = NULL;
-
-  while (*attr_names && *attr_values)
-    {
-      if (g_str_equal (*attr_names, "iso_639_1_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 2)
-                return;
-              ccode = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "iso_639_2B_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 3)
-                return;
-              ccode_longB = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "iso_639_2T_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 3)
-                return;
-              ccode_longT = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "id"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 2 &&
-                  strlen (*attr_values) != 3)
-                return;
-              ccode_id = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "name"))
-        {
-          lang_name = *attr_values;
-        }
-
-      ++attr_names;
-      ++attr_values;
-    }
-
-  if (lang_name == NULL)
-    return;
-
-  display_name = get_display_name (lang_name);
-
-  if (ccode != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode),
-                         g_strdup (display_name));
-
-  if (ccode_longB != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_longB),
-                         g_strdup (display_name));
-
-  if (ccode_longT != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_longT),
-                         g_strdup (display_name));
-
-  if (ccode_id != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_id),
-                         g_strdup (display_name));
-
-  g_free (display_name);
-}
-
-static void
-languages_variant_init (const char *variant)
-{
-  gboolean res;
-  gsize    buf_len;
-  char *buf = NULL;
-  char *filename = NULL;
-  GError *error = NULL;
-
-  bindtextdomain (variant, ISO_CODES_LOCALESDIR);
-  bind_textdomain_codeset (variant, "UTF-8");
-
-  error = NULL;
-  filename = g_strconcat (ISO_CODES_DATADIR, "/", variant, ".xml", NULL);
-  res = g_file_get_contents (filename, &buf, &buf_len, &error);
-  if (res)
-    {
-      GMarkupParseContext *ctx = NULL;
-      GMarkupParser parser = { languages_parse_start_tag, NULL, NULL, NULL, NULL };
-
-      ctx = g_markup_parse_context_new (&parser, 0, NULL, NULL);
-
-      g_free (error);
-      error = NULL;
-      res = g_markup_parse_context_parse (ctx, buf, buf_len, &error);
-      g_free (ctx);
-
-      if (!res)
-        g_warning ("Failed to parse '%s': %s\n", filename, error->message);
-    }
-  else
-    g_warning ("Failed to load '%s': %s\n", filename, error->message);
-
-  g_free (error);
-  g_free (filename);
-  g_free (buf);
-}
-
-static void
-languages_init (void)
-{
-  if (language_map)
-    return;
-
-  language_map = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-  languages_variant_init ("iso_639");
-  languages_variant_init ("iso_639_3");
-}
-
-const char *
-get_language_name (PangoLanguage *language)
-{
-  languages_init ();
-
-  return (const char *) g_hash_table_lookup (language_map, language);
-}
-
-const char *
-get_language_name_for_tag (guint32 tag)
-{
-  hb_language_t lang;
-  const char *s;
-
-  lang = hb_ot_tag_to_language (tag);
-  s = hb_language_to_string (lang);
-
-  return get_language_name (pango_language_from_string (s));
-}

demos/gtk-demo/language-names.h

@@ -1,13 +0,0 @@
-#ifndef LANGUAGE_NAMES_H
-#define LANGUAGE_NAMES_H
-
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-const char * get_language_name (PangoLanguage *language);
-const char * get_language_name_for_tag (guint32 tag);
-
-G_END_DECLS
-
-#endif

demos/gtk-demo/links.c

@@ -53,8 +53,8 @@ do_links (GtkWidget *do_widget)
   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_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Links");
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/list_store.c

@@ -37,7 +37,7 @@ enum
 static Bug data[] =
 {
   { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
-  { FALSE, 60620, "Critical",   "gdk_surface_clear_area (gdksurface-win32.c) is not thread-safe" },
+  { FALSE, 60620, "Critical",   "gdk_window_clear_area (gdkwindow-win32.c) is not thread-safe" },
   { FALSE, 50214, "Major",      "Xft support does not clean up correctly" },
   { TRUE,  52877, "Major",      "GtkFileSelection needs a refresh method. " },
   { FALSE, 56070, "Normal",     "Can't click button after setting in sensitive" },
@@ -256,8 +256,8 @@ do_list_store (GtkWidget *do_widget)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Store");
 
       g_signal_connect (window, "destroy",
@@ -283,7 +283,6 @@ do_list_store (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (model);
-      gtk_widget_set_vexpand (treeview, TRUE);
       gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
                                        COLUMN_DESCRIPTION);
 
@@ -296,7 +295,8 @@ do_list_store (GtkWidget *do_widget)
 
       /* finish & show */
       gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
-      g_signal_connect (window, "destroy", G_CALLBACK (window_closed), NULL);
+      g_signal_connect (window, "delete-event",
+                        G_CALLBACK (window_closed), NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/listbox.c

@@ -9,11 +9,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "message.h"
-
 static GdkPixbuf *avatar_pixbuf_other;
 static GtkWidget *window = NULL;
 
+#define GTK_TYPE_MESSAGE		  (gtk_message_get_type ())
+#define GTK_MESSAGE(message)		  (G_TYPE_CHECK_INSTANCE_CAST ((message), GTK_TYPE_MESSAGE, GtkMessage))
+#define GTK_MESSAGE_CLASS(klass)		  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MESSAGE, GtkMessageClass))
+#define GTK_IS_MESSAGE(message)		  (G_TYPE_CHECK_INSTANCE_TYPE ((message), GTK_TYPE_MESSAGE))
+#define GTK_IS_MESSAGE_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE))
+#define GTK_MESSAGE_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE, GtkMessageClass))
+
 #define GTK_TYPE_MESSAGE_ROW		  (gtk_message_row_get_type ())
 #define GTK_MESSAGE_ROW(message_row)		  (G_TYPE_CHECK_INSTANCE_CAST ((message_row), GTK_TYPE_MESSAGE_ROW, GtkMessageRow))
 #define GTK_MESSAGE_ROW_CLASS(klass)		  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MESSAGE_ROW, GtkMessageRowClass))
@@ -21,10 +26,33 @@ static GtkWidget *window = NULL;
 #define GTK_IS_MESSAGE_ROW_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE_ROW))
 #define GTK_MESSAGE_ROW_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_ROW, GtkMessageRowClass))
 
+typedef struct _GtkMessage   GtkMessage;
+typedef struct _GtkMessageClass  GtkMessageClass;
 typedef struct _GtkMessageRow   GtkMessageRow;
 typedef struct _GtkMessageRowClass  GtkMessageRowClass;
 typedef struct _GtkMessageRowPrivate  GtkMessageRowPrivate;
 
+
+struct _GtkMessage
+{
+  GObject parent;
+
+  guint id;
+  char *sender_name;
+  char *sender_nick;
+  char *message;
+  gint64 time;
+  guint reply_to;
+  char *resent_by;
+  int n_favorites;
+  int n_reshares;
+};
+
+struct _GtkMessageClass
+{
+  GObjectClass parent_class;
+};
+
 struct _GtkMessageRow
 {
   GtkListBoxRow parent;
@@ -55,10 +83,84 @@ struct _GtkMessageRowPrivate
   GtkButton *expand_button;
 };
 
+GType      gtk_message_get_type  (void) G_GNUC_CONST;
 GType      gtk_message_row_get_type  (void) G_GNUC_CONST;
 
+G_DEFINE_TYPE (GtkMessage, gtk_message, G_TYPE_OBJECT);
+
+static void
+gtk_message_finalize (GObject *obj)
+{
+  GtkMessage *msg = GTK_MESSAGE (obj);
+
+  g_free (msg->sender_name);
+  g_free (msg->sender_nick);
+  g_free (msg->message);
+  g_free (msg->resent_by);
+
+  G_OBJECT_CLASS (gtk_message_parent_class)->finalize (obj);
+}
+static void
+gtk_message_class_init (GtkMessageClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = gtk_message_finalize;
+}
+
+static void
+gtk_message_init (GtkMessage *msg)
+{
+}
+
+static void
+gtk_message_parse (GtkMessage *msg, const char *str)
+{
+  char **strv;
+  int i;
+
+  strv = g_strsplit (str, "|", 0);
+
+  i = 0;
+  msg->id = strtol (strv[i++], NULL, 10);
+  msg->sender_name = g_strdup (strv[i++]);
+  msg->sender_nick = g_strdup (strv[i++]);
+  msg->message = g_strdup (strv[i++]);
+  msg->time = strtol (strv[i++], NULL, 10);
+  if (strv[i])
+    {
+      msg->reply_to = strtol (strv[i++], NULL, 10);
+      if (strv[i])
+        {
+          if (*strv[i])
+            msg->resent_by = g_strdup (strv[i]);
+          i++;
+          if (strv[i])
+            {
+              msg->n_favorites = strtol (strv[i++], NULL, 10);
+              if (strv[i])
+                {
+                  msg->n_reshares = strtol (strv[i++], NULL, 10);
+                }
+
+            }
+        }
+    }
+
+  g_strfreev (strv);
+}
+
+static GtkMessage *
+gtk_message_new (const char *str)
+{
+  GtkMessage *msg;
+  msg = g_object_new (gtk_message_get_type (), NULL);
+  gtk_message_parse (msg, str);
+  return msg;
+}
+
 G_DEFINE_TYPE_WITH_PRIVATE (GtkMessageRow, gtk_message_row, GTK_TYPE_LIST_BOX_ROW);
 
+
 static void
 gtk_message_row_update (GtkMessageRow *row)
 {
@@ -95,10 +197,7 @@ gtk_message_row_update (GtkMessageRow *row)
     gtk_button_set_label (GTK_BUTTON (priv->resent_by_button), priv->message->resent_by);
 
   if (strcmp (priv->message->sender_nick, "@GTKtoolkit") == 0)
-    {
-      gtk_image_set_from_icon_name (priv->avatar_image, "gtk3-demo");
-      gtk_image_set_icon_size (priv->avatar_image, GTK_ICON_SIZE_LARGE);
-    }
+    gtk_image_set_from_icon_name (priv->avatar_image, "gtk3-demo", GTK_ICON_SIZE_DND);
   else
     gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_other);
 
@@ -231,77 +330,32 @@ row_activated (GtkListBox *listbox, GtkListBoxRow *row)
   gtk_message_row_expand (GTK_MESSAGE_ROW (row));
 }
 
-static void
-update_count (GtkListBox *listbox, GtkLabel *label)
-{
-  GList *children = gtk_container_get_children (GTK_CONTAINER (listbox));
-  guint n_items = g_list_length (children);
-  g_list_free (children);
-
-  char *text = g_strdup_printf ("%u rows", n_items);
-  gtk_label_set_label (label, text);
-  g_free (text);
-}
-
-static GtkWidget *header_label;
-
-static void
-add_more (GtkListBox *listbox)
-{
-  GBytes *data;
-  char **lines;
-  int i;
-
-  data = g_resources_lookup_data ("/listbox/messages.txt", 0, NULL);
-  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-  for (i = 0; lines[i] != NULL && *lines[i]; i++)
-    {
-      GtkMessage *message = gtk_message_new (lines[i]);
-      GtkMessageRow *row = gtk_message_row_new (message);
-      gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
-    }
-
-  g_strfreev (lines);
-  g_bytes_unref (data);
-
-  update_count (listbox, GTK_LABEL (header_label));
-}
-
 GtkWidget *
 do_listbox (GtkWidget *do_widget)
 {
   GtkWidget *scrolled, *listbox, *vbox, *label;
-  GtkWidget *header, *more;
+  GtkMessage *message;
+  GtkMessageRow *row;
+  GBytes *data;
+  char **lines;
+  int i;
 
   if (!window)
     {
       avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, NULL);
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "List Box");
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   400, 600);
 
       /* NULL window variable when window is closed */
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed),
                         &window);
 
-      listbox = gtk_list_box_new ();
-
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "List View");
-      header_label = gtk_label_new ("");
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), header_label);
-      more = gtk_button_new_from_icon_name ("list-add");
-
-      g_signal_connect_swapped (more, "clicked", G_CALLBACK (add_more), listbox);
-
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), more);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       label = gtk_label_new ("Messages from Gtk+ and friends");
@@ -310,14 +364,26 @@ do_listbox (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
       gtk_widget_set_vexpand (scrolled, TRUE);
       gtk_box_pack_start (GTK_BOX (vbox), scrolled);
+      listbox = gtk_list_box_new ();
       gtk_container_add (GTK_CONTAINER (scrolled), listbox);
 
       gtk_list_box_set_sort_func (GTK_LIST_BOX (listbox), (GtkListBoxSortFunc)gtk_message_row_sort, listbox, NULL);
       gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (listbox), FALSE);
       g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), NULL);
 
-      add_more (listbox);
-      update_count (listbox, header_label);
+      data = g_resources_lookup_data ("/listbox/messages.txt", 0, NULL);
+      lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
+
+      for (i = 0; lines[i] != NULL && *lines[i]; i++)
+        {
+          message = gtk_message_new (lines[i]);
+          row = gtk_message_row_new (message);
+          gtk_widget_show (GTK_WIDGET (row));
+          gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
+        }
+
+      g_strfreev (lines);
+      g_bytes_unref (data);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/listbox.ui

@@ -3,53 +3,61 @@
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkdemo 3.10 -->
   <object class="GtkMenu" id="menu1">
+    <property name="visible">1</property>
     <child>
       <object class="GtkMenuItem" id="menuitem1">
+        <property name="visible">1</property>
         <property name="label" translatable="yes">Email message</property>
-        <property name="use-underline">1</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem2">
+        <property name="visible">1</property>
         <property name="label" translatable="yes">Embed message</property>
-        <property name="use-underline">1</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <template class="GtkMessageRow" parent="GtkListBoxRow">
     <child>
       <object class="GtkGrid" id="grid1">
+        <property name="visible">1</property>
         <property name="hexpand">1</property>
         <child>
           <object class="GtkImage" id="avatar_image">
-            <property name="width-request">32</property>
-            <property name="height-request">32</property>
+            <property name="width_request">32</property>
+            <property name="height_request">32</property>
+            <property name="visible">1</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
-            <property name="margin-top">8</property>
-            <property name="margin-bottom">8</property>
-            <property name="margin-start">8</property>
-            <property name="margin-end">8</property>
+            <property name="margin_top">8</property>
+            <property name="margin_bottom">8</property>
+            <property name="margin_start">8</property>
+            <property name="margin_end">8</property>
             <property name="icon-name">image-missing</property>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <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">
+            <property name="visible">1</property>
             <property name="hexpand">1</property>
-            <property name="baseline-position">top</property>
+            <property name="baseline_position">top</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="valign">baseline</property>
                 <property name="relief">none</property>
                 <child>
                   <object class="GtkLabel" id="source_name">
+                    <property name="visible">1</property>
                     <property name="valign">baseline</property>
                     <property name="label" translatable="0">Username</property>
                     <attributes>
@@ -61,6 +69,7 @@
             </child>
             <child>
               <object class="GtkLabel" id="source_nick">
+                <property name="visible">1</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="0">@nick</property>
                 <style>
@@ -73,6 +82,7 @@
             </child>
             <child>
               <object class="GtkLabel" id="short_time_label">
+                <property name="visible">1</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="yes">38m</property>
                 <style>
@@ -80,42 +90,42 @@
                 </style>
               </object>
               <packing>
-                <property name="pack-type">end</property>
+                <property name="pack_type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="content_label">
+            <property name="visible">1</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
             <property name="label" translatable="0">Message</property>
             <property name="wrap">1</property>
-            <accessibility>
-              <role type="static"/>
-            </accessibility>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="resent_box">
             <child>
               <object class="GtkImage" id="image2">
-                <property name="icon-name">media-playlist-repeat</property>
+                <property name="visible">1</property>
+                <property name="icon_name">media-playlist-repeat</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Resent by</property>
               </object>
               <packing>
@@ -125,8 +135,9 @@
             <child>
               <object class="GtkLinkButton" id="resent_by_button">
                 <property name="label" translatable="0">reshareer</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="relief">none</property>
                 <property name="uri">http://www.gtk.org</property>
               </object>
@@ -136,39 +147,42 @@
             </child>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
+            <property name="visible">1</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkButton" id="expand_button">
                 <property name="label" translatable="yes">Expand</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="relief">none</property>
                 <signal name="clicked" handler="expand_clicked" swapped="yes"/>
               </object>
             </child>
             <child>
               <object class="GtkBox" id="extra_buttons_box">
-                <property name="visible">0</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="reply-button">
                     <property name="label" translatable="yes">Reply</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkButton" id="reshare-button">
                     <property name="label" translatable="yes">Reshare</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                     <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                   </object>
@@ -179,8 +193,9 @@
                 <child>
                   <object class="GtkButton" id="favorite-buttton">
                     <property name="label" translatable="yes">Favorite</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                     <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                   </object>
@@ -190,12 +205,14 @@
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="more-button">
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                     <property name="popup">menu1</property>
                     <child>
                       <object class="GtkLabel" id="label7">
+                        <property name="visible">1</property>
                         <property name="label" translatable="yes">More...</property>
                       </object>
                     </child>
@@ -211,44 +228,53 @@
             </child>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="details_revealer">
+            <property name="visible">1</property>
             <child>
               <object class="GtkBox" id="box5">
+                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="box7">
-                    <property name="margin-top">2</property>
-                    <property name="margin-bottom">2</property>
+                    <property name="visible">1</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkFrame" id="frame1">
-                        <property name="shadow-type">none</property>
+                        <property name="visible">1</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_reshares_label">
+                            <property name="visible">1</property>
                             <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 Reshares</property>
-                            <property name="use-markup">1</property>
+                            <property name="use_markup">1</property>
                           </object>
                         </child>
-                        <child type="label_item"/>
+                        <child type="label_item">
+                        </child>
                       </object>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame2">
-                        <property name="shadow-type">none</property>
+                        <property name="visible">1</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_favorites_label">
+                            <property name="visible">1</property>
                             <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 FAVORITES</property>
-                            <property name="use-markup">1</property>
+                            <property name="use_markup">1</property>
                           </object>
                         </child>
-                        <child type="label_item"/>
+                        <child type="label_item">
+                        </child>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -261,8 +287,10 @@ FAVORITES</property>
                 </child>
                 <child>
                   <object class="GtkBox" id="box6">
+                    <property name="visible">1</property>
                     <child>
                       <object class="GtkLabel" id="detailed_time_label">
+                        <property name="visible">1</property>
                         <property name="label" translatable="0">4:25 AM - 14 Jun 13 </property>
                         <style>
                           <class name="dim-label"/>
@@ -272,8 +300,9 @@ FAVORITES</property>
                     <child>
                       <object class="GtkButton" id="button5">
                         <property name="label" translatable="yes">Details</property>
-                        <property name="can-focus">1</property>
-                        <property name="receives-default">1</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
+                        <property name="receives_default">1</property>
                         <property name="relief">none</property>
                         <style>
                           <class name="dim-label"/>
@@ -292,8 +321,8 @@ FAVORITES</property>
             </child>
           </object>
           <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">4</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
           </packing>
         </child>
       </object>

demos/gtk-demo/listview.c

@@ -1,323 +0,0 @@
-/* List View
- *
- * GtkListView allows lists with complicated layouts, using
- * models to hold the data, and creating rows on demand.
- */
-
-#include <gtk/gtk.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "message.h"
-
-static GdkPixbuf *avatar_pixbuf_other;
-static GtkWidget *window = NULL;
-
-#define GTK_TYPE_MSG_ROW		  (gtk_msg_row_get_type ())
-#define GTK_MSG_ROW(msg_row)		  (G_TYPE_CHECK_INSTANCE_CAST ((msg_row), GTK_TYPE_MSG_ROW, GtkMsgRow))
-#define GTK_MSG_ROW_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MSG_ROW, GtkMsgRowClass))
-#define GTK_IS_MSG_ROW(msg_row)		  (G_TYPE_CHECK_INSTANCE_TYPE ((msg_row), GTK_TYPE_MSG_ROW))
-#define GTK_IS_MSG_ROW_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MSG_ROW))
-#define GTK_MSG_ROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MSG_ROW, GtkMsgRowClass))
-
-typedef struct _GtkMsgRow   GtkMsgRow;
-typedef struct _GtkMsgRowClass  GtkMsgRowClass;
-
-struct _GtkMsgRow
-{
-  GtkBin parent;
-
-  GtkMessage *message;
-  GtkRevealer *details_revealer;
-  GtkImage *avatar_image;
-  GtkWidget *extra_buttons_box;
-  GtkLabel *content_label;
-  GtkLabel *source_name;
-  GtkLabel *source_nick;
-  GtkLabel *short_time_label;
-  GtkLabel *detailed_time_label;
-  GtkBox *resent_box;
-  GtkLinkButton *resent_by_button;
-  GtkLabel *n_favorites_label;
-  GtkLabel *n_reshares_label;
-  GtkButton *expand_button;
-};
-
-struct _GtkMsgRowClass
-{
-  GtkBinClass parent_class;
-};
-
-static GType      gtk_msg_row_get_type  (void) G_GNUC_CONST;
-
-G_DEFINE_TYPE (GtkMsgRow, gtk_msg_row, GTK_TYPE_BIN);
-
-static void
-gtk_msg_row_update (GtkMsgRow *row)
-{
-  GDateTime *t;
-  char *s;
-
-  gtk_label_set_text (row->source_name, row->message->sender_name);
-  gtk_label_set_text (row->source_nick, row->message->sender_nick);
-  gtk_label_set_text (row->content_label, row->message->message);
-  t = g_date_time_new_from_unix_utc (row->message->time);
-  s = g_date_time_format (t, "%e %b %y");
-  gtk_label_set_text (row->short_time_label, s);
-  g_free (s);
-  s = g_date_time_format (t, "%X - %e %b %Y");
-  gtk_label_set_text (row->detailed_time_label, s);
-  g_free (s);
-  g_date_time_unref (t);
-
-  gtk_widget_set_visible (GTK_WIDGET(row->n_favorites_label),
-                          row->message->n_favorites != 0);
-  s = g_strdup_printf ("<b>%d</b>\nFavorites", row->message->n_favorites);
-  gtk_label_set_markup (row->n_favorites_label, s);
-  g_free (s);
-
-  gtk_widget_set_visible (GTK_WIDGET(row->n_reshares_label),
-                          row->message->n_reshares != 0);
-  s = g_strdup_printf ("<b>%d</b>\nReshares", row->message->n_reshares);
-  gtk_label_set_markup (row->n_reshares_label, s);
-  g_free (s);
-
-  gtk_widget_set_visible (GTK_WIDGET (row->resent_box), row->message->resent_by != NULL);
-  if (row->message->resent_by)
-    gtk_button_set_label (GTK_BUTTON (row->resent_by_button), row->message->resent_by);
-
-  if (strcmp (row->message->sender_nick, "@GTKtoolkit") == 0)
-    {
-      gtk_image_set_from_icon_name (row->avatar_image, "gtk3-demo");
-      gtk_image_set_icon_size (row->avatar_image, GTK_ICON_SIZE_LARGE);
-    }
-  else
-    gtk_image_set_from_pixbuf (row->avatar_image, avatar_pixbuf_other);
-
-}
-
-static void
-gtk_msg_row_expand (GtkMsgRow *row)
-{
-  gboolean expand;
-
-  expand = !gtk_revealer_get_reveal_child (row->details_revealer);
-
-  gtk_revealer_set_reveal_child (row->details_revealer, expand);
-  if (expand)
-    gtk_button_set_label (row->expand_button, "Hide");
-  else
-    gtk_button_set_label (row->expand_button, "Expand");
-}
-
-static void
-expand_clicked (GtkMsgRow *row,
-                GtkButton *button)
-{
-  gtk_msg_row_expand (row);
-}
-
-static void
-reshare_clicked (GtkMsgRow *row,
-                 GtkButton *button)
-{
-  row->message->n_reshares++;
-  gtk_msg_row_update (row);
-
-}
-
-static void
-favorite_clicked (GtkMsgRow *row,
-                  GtkButton *button)
-{
-  row->message->n_favorites++;
-  gtk_msg_row_update (row);
-}
-
-static void
-gtk_msg_row_state_flags_changed (GtkWidget    *widget,
-                                 GtkStateFlags previous_state_flags)
-{
-  GtkMsgRow *row = GTK_MSG_ROW (widget);
-  GtkStateFlags flags;
-
-  flags = gtk_widget_get_state_flags (widget);
-
-  gtk_widget_set_visible (row->extra_buttons_box,
-                          flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED));
-
-  GTK_WIDGET_CLASS (gtk_msg_row_parent_class)->state_flags_changed (widget, previous_state_flags);
-}
-
-static void
-gtk_msg_row_finalize (GObject *obj)
-{
-  G_OBJECT_CLASS (gtk_msg_row_parent_class)->finalize(obj);
-}
-
-static void
-gtk_msg_row_class_init (GtkMsgRowClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = gtk_msg_row_finalize;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/listview/listview.ui");
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, content_label);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, source_name);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, source_nick);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, short_time_label);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, detailed_time_label);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, extra_buttons_box);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, details_revealer);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, avatar_image);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, resent_box);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, resent_by_button);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, n_reshares_label);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, n_favorites_label);
-  gtk_widget_class_bind_template_child (widget_class, GtkMsgRow, expand_button);
-  gtk_widget_class_bind_template_callback (widget_class, expand_clicked);
-  gtk_widget_class_bind_template_callback (widget_class, reshare_clicked);
-  gtk_widget_class_bind_template_callback (widget_class, favorite_clicked);
-
-  widget_class->state_flags_changed = gtk_msg_row_state_flags_changed;
-}
-
-static void
-row_activated (GtkGestureMultiPress *gesture,
-               int n_press,
-               double x,
-               double y,
-               GtkMsgRow *row)
-{
-  if (n_press == 2)
-    gtk_msg_row_expand (row);
-}
-
-static void
-gtk_msg_row_init (GtkMsgRow *row)
-{
-  GtkGesture *double_click;
-
-  gtk_widget_init_template (GTK_WIDGET (row));
-
-  double_click = gtk_gesture_multi_press_new ();
-  g_signal_connect (double_click, "pressed", G_CALLBACK (row_activated), row);
-  gtk_widget_add_controller (GTK_WIDGET (row), GTK_EVENT_CONTROLLER (double_click));
-}
-
-static int
-gtk_message_sort (gconstpointer a, gconstpointer b, gpointer data)
-{
-  return ((const GtkMessage *)b)->time - ((const GtkMessage *)a)->time;
-}
-
-static void
-bind_msg_row (GObject *list_item, GParamSpec *pspec, gpointer data)
-{
-  GtkMessage *message = (GtkMessage *)gtk_list_item_get_item (GTK_LIST_ITEM (list_item));
-  GtkMsgRow *row = (GtkMsgRow *) gtk_bin_get_child (GTK_BIN (list_item));
-
-  row->message = message;
-  if (message)
-    gtk_msg_row_update (row);
-}
-
-static void
-setup_row (GtkListItem *item,
-           gpointer data)
-{
-  g_signal_connect (item, "notify::item", G_CALLBACK (bind_msg_row), data);
-  gtk_container_add (GTK_CONTAINER (item), g_object_new (gtk_msg_row_get_type (), NULL));
-}
-
-static void
-update_count (GListModel *model, guint position, guint removed, guint added, GtkLabel *label)
-{
-  guint n_items = g_list_model_get_n_items (model);
-  char *text = g_strdup_printf ("%u rows", n_items);
-  gtk_label_set_label (label, text);
-  g_free (text);
-}
-
-static void
-add_more (GListModel *model)
-{
-  GBytes *data;
-  char **lines;
-  int i;
-
-  data = g_resources_lookup_data ("/listview/messages.txt", 0, NULL);
-  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-  for (i = 0; lines[i] != NULL && *lines[i]; i++)
-    {
-      GtkMessage *message = gtk_message_new (lines[i]);
-      g_list_store_append (G_LIST_STORE (model), message);
-    }
-
-  g_strfreev (lines);
-  g_bytes_unref (data);
-}
-
-GtkWidget *
-do_listview (GtkWidget *do_widget)
-{
-  GtkWidget *scrolled, *listview, *vbox, *label;
-  GtkWidget *header, *header_label, *more;
-  GListModel *model;
-
-  if (!window)
-    {
-      avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, NULL);
-
-      model = G_LIST_MODEL (g_list_store_new (gtk_message_get_type ()));
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-
-      /* NULL window variable when window is closed */
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
-
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "List View");
-      header_label = gtk_label_new ("");
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), header_label);
-      more = gtk_button_new_from_icon_name ("list-add");
-
-      g_signal_connect_swapped (more, "clicked", G_CALLBACK (add_more), model);
-      g_signal_connect (model, "items-changed", G_CALLBACK (update_count), header_label);
-
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), more);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-      label = gtk_label_new ("Messages from Gtk+ and friends");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
-      scrolled = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-      gtk_widget_set_vexpand (scrolled, TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), scrolled);
-      listview = gtk_list_view_new ();
-      gtk_container_add (GTK_CONTAINER (scrolled), listview);
-
-      gtk_list_view_set_functions (GTK_LIST_VIEW (listview), setup_row, NULL, NULL, NULL);
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (gtk_sort_list_model_new (model, gtk_message_sort, NULL, NULL)));
-
-      add_more (model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview.ui

@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
-  <!-- interface-requires gtkdemo 3.10 -->
-  <object class="GtkMenu" id="menu1">
-    <child>
-      <object class="GtkMenuItem" id="menuitem1">
-        <property name="label" translatable="yes">Email message</property>
-        <property name="use-underline">1</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="menuitem2">
-        <property name="label" translatable="yes">Embed message</property>
-        <property name="use-underline">1</property>
-      </object>
-    </child>
-  </object>
-  <template class="GtkMsgRow" parent="GtkBin">
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <property name="hexpand">1</property>
-        <child>
-          <object class="GtkImage" id="avatar_image">
-            <property name="width-request">32</property>
-            <property name="height-request">32</property>
-            <property name="halign">center</property>
-            <property name="valign">start</property>
-            <property name="margin-top">8</property>
-            <property name="margin-bottom">8</property>
-            <property name="margin-start">8</property>
-            <property name="margin-end">8</property>
-            <property name="icon-name">image-missing</property>
-          </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">
-            <property name="hexpand">1</property>
-            <property name="baseline-position">top</property>
-            <child>
-              <object class="GtkButton" id="button2">
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-                <property name="valign">baseline</property>
-                <property name="relief">none</property>
-                <child>
-                  <object class="GtkLabel" id="source_name">
-                    <property name="valign">baseline</property>
-                    <property name="label" translatable="0">Username</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="source_nick">
-                <property name="valign">baseline</property>
-                <property name="label" translatable="0">@nick</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="short_time_label">
-                <property name="valign">baseline</property>
-                <property name="label" translatable="yes">38m</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="pack-type">end</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="content_label">
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="0">Message</property>
-            <property name="wrap">1</property>
-            <accessibility>
-              <role type="static"/>
-            </accessibility>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="resent_box">
-            <child>
-              <object class="GtkImage" id="image2">
-                <property name="icon-name">media-playlist-repeat</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label4">
-                <property name="label" translatable="yes">Resent by</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLinkButton" id="resent_by_button">
-                <property name="label" translatable="0">reshareer</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-                <property name="relief">none</property>
-                <property name="uri">http://www.gtk.org</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box3">
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkButton" id="expand_button">
-                <property name="label" translatable="yes">Expand</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-                <property name="relief">none</property>
-                <signal name="clicked" handler="expand_clicked" swapped="yes"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox" id="extra_buttons_box">
-                <property name="visible">0</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkButton" id="reply-button">
-                    <property name="label" translatable="yes">Reply</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
-                    <property name="relief">none</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="reshare-button">
-                    <property name="label" translatable="yes">Reshare</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
-                    <property name="relief">none</property>
-                    <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="favorite-buttton">
-                    <property name="label" translatable="yes">Favorite</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
-                    <property name="relief">none</property>
-                    <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkMenuButton" id="more-button">
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
-                    <property name="relief">none</property>
-                    <property name="popup">menu1</property>
-                    <child>
-                      <object class="GtkLabel" id="label7">
-                        <property name="label" translatable="yes">More...</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="details_revealer">
-            <child>
-              <object class="GtkBox" id="box5">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox" id="box7">
-                    <property name="margin-top">2</property>
-                    <property name="margin-bottom">2</property>
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkFrame" id="frame1">
-                        <property name="shadow-type">none</property>
-                        <child>
-                          <object class="GtkLabel" id="n_reshares_label">
-                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
-Reshares</property>
-                            <property name="use-markup">1</property>
-                          </object>
-                        </child>
-                        <child type="label_item"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame2">
-                        <property name="shadow-type">none</property>
-                        <child>
-                          <object class="GtkLabel" id="n_favorites_label">
-                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
-FAVORITES</property>
-                            <property name="use-markup">1</property>
-                          </object>
-                        </child>
-                        <child type="label_item"/>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="box6">
-                    <child>
-                      <object class="GtkLabel" id="detailed_time_label">
-                        <property name="label" translatable="0">4:25 AM - 14 Jun 13 </property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button5">
-                        <property name="label" translatable="yes">Details</property>
-                        <property name="can-focus">1</property>
-                        <property name="receives-default">1</property>
-                        <property name="relief">none</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">4</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

demos/gtk-demo/main.c

@@ -250,13 +250,13 @@ static gchar *types[] =
   "GtkTreeSelection ",
   "GdkDisplay ",
   "GdkScreen ",
-  "GdkSurface ",
+  "GdkWindow ",
   "GdkEventButton ",
   "GdkCursor ",
   "GtkTreeIter ",
   "GtkTreeViewColumn ",
   "GdkDisplayManager ",
-  "GdkClipboard ",
+  "GtkClipboard ",
   "GtkIconSize ",
   "GtkImage ",
   "GdkDragContext ",
@@ -300,6 +300,7 @@ static gchar *types[] =
   "GdkEvent ",
   "GdkEventKey ",
   "GtkTextView ",
+  "GdkEventVisibility ",
   "GdkBitmap ",
   "GtkTextChildAnchor ",
   "GArray ",
@@ -532,106 +533,7 @@ fontify (GtkTextBuffer *source_buffer)
     }
 }
 
-static GtkWidget *
-display_image (const char *resource)
-{
-  GtkWidget *sw, *image;
-
-  image = gtk_image_new_from_resource (resource);
-  gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (sw), image);
-
-  return sw;
-}
-
-static GtkWidget *
-display_text (const char *resource)
-{
-  GtkTextBuffer *buffer;
-  GtkWidget *textview, *sw;
-  GBytes *bytes;
-
-  bytes = g_resources_lookup_data (resource, 0, NULL);
-  g_assert (bytes);
-
-  g_assert (g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL));
-
-  textview = gtk_text_view_new ();
-  g_object_set (textview,
-                "left-margin", 20,
-                "right-margin", 20,
-                "top-margin", 20,
-                "bottom-margin", 20,
-                NULL);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview), FALSE);
-  /* Make it a bit nicer for text. */
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD);
-  gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (textview), 2);
-  gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (textview), 2);
-
-  buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-  if (g_str_has_suffix (resource, ".c"))
-    fontify (buffer);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-
-  g_bytes_unref (bytes);
-
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                       GTK_SHADOW_NONE);
-  gtk_container_add (GTK_CONTAINER (sw), textview);
-
-  return sw;
-}
-
-static GtkWidget *
-display_video (const char *resource)
-{
-  GtkWidget *video;
-
-  video = gtk_video_new_for_resource (resource);
-  gtk_video_set_loop (GTK_VIDEO (video), TRUE);
-
-  return video;
-}
-
-static GtkWidget *
-display_nothing (const char *resource)
-{
-  GtkWidget *widget;
-  char *str;
-
-  str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource);
-  widget = gtk_label_new (str);
-  gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-
-  g_free (str);
-
-  return widget;
-}
-
-static struct {
-  const char *extension;
-  GtkWidget * (* display_func) (const char *resource);
-} display_funcs[] = {
-  { ".gif", display_image },
-  { ".jpg", display_image },
-  { ".png", display_image },
-  { ".c", display_text },
-  { ".css", display_text },
-  { ".glsl", display_text },
-  { ".h", display_text },
-  { ".txt", display_text },
-  { ".ui", display_text },
-  { ".webm", display_video }
-};
+static GtkWidget *create_text (GtkWidget **text_view, gboolean is_source);
 
 static void
 add_data_tab (const gchar *demoname)
@@ -639,7 +541,7 @@ add_data_tab (const gchar *demoname)
   gchar *resource_dir, *resource_name;
   gchar **resources;
   GtkWidget *widget, *label;
-  guint i, j;
+  guint i;
 
   resource_dir = g_strconcat ("/", demoname, NULL);
   resources = g_resources_enumerate_children (resource_dir, 0, NULL);
@@ -653,22 +555,48 @@ add_data_tab (const gchar *demoname)
     {
       resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);
 
-      for (j = 0; j < G_N_ELEMENTS(display_funcs); j++)
+      widget = gtk_image_new_from_resource (resource_name);
+      if (gtk_image_get_pixbuf (GTK_IMAGE (widget)) == NULL &&
+          gtk_image_get_animation (GTK_IMAGE (widget)) == NULL)
         {
-          if (g_str_has_suffix (resource_name, display_funcs[j].extension))
-            break;
-        }
+          GBytes *bytes;
 
-      if (j < G_N_ELEMENTS(display_funcs))
-        widget = display_funcs[j].display_func (resource_name);
-      else
-        widget = display_nothing (resource_name);
+          /* So we've used the best API available to figure out it's
+           * not an image. Let's try something else then.
+           */
+          g_object_ref_sink (widget);
+          g_object_unref (widget);
+
+          bytes = g_resources_lookup_data (resource_name, 0, NULL);
+          g_assert (bytes);
+
+          if (g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
+            {
+              /* Looks like it parses as text. Dump it into a textview then! */
+              GtkTextBuffer *buffer;
+              GtkWidget *textview;
+
+              widget = create_text (&textview, FALSE);
+              buffer = gtk_text_buffer_new (NULL);
+              gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
+              if (g_str_has_suffix (resource_name, ".c"))
+                fontify (buffer);
+              gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
+            }
+          else
+            {
+              g_warning ("Don't know how to display resource '%s'", resource_name);
+              widget = NULL;
+            }
+
+          g_bytes_unref (bytes);
+        }
 
       label = gtk_label_new (resources[i]);
       gtk_widget_show (label);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
       gtk_container_child_set (GTK_CONTAINER (notebook),
-                               widget,
+                               GTK_WIDGET (widget),
                                "tab-expand", TRUE,
                                NULL);
 
@@ -831,14 +759,15 @@ load_file (const gchar *demoname,
           /* Skipping blank lines */
           while (g_ascii_isspace (*p))
             p++;
-
-          if (!*p)
+          if (*p)
+            {
+              p = lines[i];
+              state++;
+              /* Fall through */
+            }
+          else
             break;
 
-          p = lines[i];
-          state++;
-          /* Fall through */
-
         case 3:
           /* Reading program body */
           gtk_text_buffer_insert (source_buffer, &start, p, -1);
@@ -887,6 +816,49 @@ selection_cb (GtkTreeSelection *selection,
   g_free (filename);
 }
 
+static GtkWidget *
+create_text (GtkWidget **view,
+             gboolean    is_source)
+{
+  GtkWidget *scrolled_window;
+  GtkWidget *text_view;
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                       GTK_SHADOW_NONE);
+
+  *view = text_view = gtk_text_view_new ();
+  g_object_set (text_view,
+                "left-margin", 20,
+                "right-margin", 20,
+                "top-margin", 20,
+                "bottom-margin", 20,
+                NULL);
+
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
+  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
+
+  if (is_source)
+    {
+      gtk_text_view_set_monospace (GTK_TEXT_VIEW (text_view), TRUE);
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE);
+    }
+  else
+    {
+      /* Make it a bit nicer for text. */
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
+      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view), 2);
+      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view), 2);
+    }
+
+  return scrolled_window;
+}
+
 static void
 populate_model (GtkTreeModel *model)
 {
@@ -975,7 +947,7 @@ start_cb (GtkMenuItem *item, GtkWidget *scrollbar)
 {
   GtkAdjustment *adj;
 
-  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  adj = gtk_range_get_adjustment (GTK_RANGE (scrollbar));
   gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
 }
 
@@ -984,7 +956,7 @@ end_cb (GtkMenuItem *item, GtkWidget *scrollbar)
 {
   GtkAdjustment *adj;
 
-  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  adj = gtk_range_get_adjustment (GTK_RANGE (scrollbar));
   gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj));
 }
 

demos/gtk-demo/main.ui

@@ -16,24 +16,27 @@
     </columns>
   </object>
   <object class="GtkApplicationWindow" id="window">
-    <style><class name="devel"/></style>
     <property name="default-width">800</property>
     <property name="default-height">600</property>
     <property name="title">GTK+ Demo</property>
+    <signal name="delete-event" handler="gtk_false" swapped="no"/>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="show-title-buttons">1</property>
+        <property name="visible">1</property>
+        <property name="show-close-button">1</property>
         <child>
           <object class="GtkButton">
+            <property name="visible">1</property>
             <property name="valign">center</property>
-            <property name="can-focus">1</property>
-            <property name="action-name">win.run</property>
+            <property name="can_focus">1</property>
+            <property name="action_name">win.run</property>
             <style>
               <class name="text-button"/>
             </style>
             <child>
               <object class="GtkLabel">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Run</property>
               </object>
             </child>
@@ -43,19 +46,23 @@
     </child>
     <child>
       <object class="GtkBox">
+        <property name="visible">1</property>
         <child>
           <object class="GtkFrame">
+            <property name="visible">1</property>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="width-request">120</property>
-                <property name="can-focus">1</property>
-                <property name="hscrollbar-policy">never</property>
-                <property name="min-content-width">150</property>
+                <property name="width_request">120</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="min_content_width">150</property>
                 <child>
                   <object class="GtkTreeView" id="treeview">
-                    <property name="can-focus">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="model">treestore</property>
-                    <property name="headers-visible">0</property>
+                    <property name="headers_visible">0</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection" id="treeview-selection">
                         <property name="mode">browse</property>
@@ -85,70 +92,77 @@
         </child>
         <child>
           <object class="GtkNotebook" id="notebook">
-            <property name="can-focus">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="scrollable">1</property>
-            <property name="enable-popup">1</property>
-            <property name="show-border">0</property>
+            <property name="enable_popup">1</property>
+            <property name="show_border">0</property>
             <property name="expand">1</property>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="can-focus">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <child>
                   <object class="GtkTextView" id="info-textview">
-                    <property name="can-focus">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="left-margin">20</property>
                     <property name="right-margin">20</property>
                     <property name="top-margin">20</property>
                     <property name="bottom-margin">20</property>
-                    <property name="pixels-above-lines">2</property>
-                    <property name="pixels-below-lines">2</property>
+                    <property name="pixels_above_lines">2</property>
+                    <property name="pixels_below_lines">2</property>
                     <property name="editable">0</property>
-                    <property name="wrap-mode">word</property>
-                    <property name="cursor-visible">0</property>
+                    <property name="wrap_mode">word</property>
+                    <property name="cursor_visible">0</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="tab-expand">1</property>
+                <property name="tab_expand">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">_Info</property>
-                <property name="use-underline">1</property>
+                <property name="use_underline">1</property>
               </object>
               <packing>
-                <property name="tab-expand">1</property>
-                <property name="tab-fill">0</property>
+                <property name="tab_expand">1</property>
+                <property name="tab_fill">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow" id="source-scrolledwindow">
-                <property name="can-focus">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <child>
                   <object class="GtkTextView" id="source-textview">
-                    <property name="can-focus">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="left-margin">20</property>
                     <property name="right-margin">20</property>
                     <property name="top-margin">20</property>
                     <property name="bottom-margin">20</property>
                     <property name="editable">0</property>
-                    <property name="cursor-visible">0</property>
+                    <property name="cursor_visible">0</property>
                   </object>
                 </child>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab-expand">1</property>
+                <property name="tab_expand">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
+                <property name="visible">1</property>
                 <property name="label" translatable="yes">Source</property>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab-fill">0</property>
+                <property name="tab_fill">0</property>
               </packing>
             </child>
           </object>

demos/gtk-demo/makefile.msc.in

@@ -0,0 +1,91 @@
+## Makefile for building the gtk test apps with Microsoft C
+## Use: nmake -f makefile.msc
+
+## There is no install target, you have to decide where and 
+## how to install for yourself.
+
+TOP = ..\..\..
+!INCLUDE $(TOP)/glib/build/win32/make.msc
+
+!IFNDEF PERL
+PERL = perl
+!ENDIF
+
+################################################################
+
+# Possibly override versions from build/win32/module.defs
+GTK_VER = 2.0
+GDK_PIXBUF_VER = 2.0
+
+GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
+GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
+GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
+
+INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
+DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
+LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
+DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
+	-DDEMOCODEDIR=\".\"
+
+TOUCH = copy makefile.msc+nul
+
+all :	\
+	demos.h \
+	gtk-demo.exe
+
+## These should be in the order you want them to appear in the 
+## demo app, which means alphabetized by demo title, not filename
+DEMOS = \
+	button_box.c	\
+	clipboard.c	\
+	colorsel.c	\
+	dialog.c		\
+	drawingarea.c	\
+	editable_cells.c	\
+	entry_completion.c	\
+	expander.c	\
+	hypertext.c	\
+	iconview.c	\
+	images.c		\
+	list_store.c	\
+	menus.c		\
+	panes.c		\
+	pixbufs.c		\
+	rotated_text.c	\
+	sizegroup.c	\
+	textview.c	\
+	tree_store.c	\
+	ui_manager.c	\
+
+
+demos.h: $(DEMOS) geninclude.pl
+	$(PERL) geninclude.pl $(DEMOS) > demos.h
+
+OBJECTS = \
+	button_box.obj	\
+	changedisplay.obj	\
+	clipboard.obj	\
+	colorsel.obj	\
+	dialog.obj	\
+	drawingarea.obj	\
+	editable_cells.obj	\
+	entry_completion.obj	\
+	expander.obj	\
+	hypertext.obj	\
+	iconview.obj	\
+	images.obj	\
+	list_store.obj	\
+	menus.obj		\
+	panes.obj		\
+	pixbufs.obj	\
+	rotated_text.obj \
+	sizegroup.obj	\
+	textview.obj	\
+	tree_store.obj	\
+	ui_manager.obj	\
+	main.obj \
+
+gtk-demo.exe : demos.h $(OBJECTS)
+	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
+	$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+

demos/gtk-demo/markup.c

@@ -53,8 +53,8 @@ do_markup (GtkWidget *do_widget)
       GtkWidget *show_source;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -68,7 +68,7 @@ do_markup (GtkWidget *do_widget)
       g_signal_connect (show_source, "toggled", G_CALLBACK (source_toggled), stack);
 
       header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source);
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 

demos/gtk-demo/menus.c

@@ -96,8 +96,8 @@ do_menus (GtkWidget *do_widget)
       GtkAccelGroup *accel_group;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Menus");
       g_signal_connect (window, "destroy",
                         G_CALLBACK(gtk_widget_destroyed), &window);