GtkTooltip: fix tooltip position when inside a Popover in Wayland

When pointer is over a Popover in Wayland, gdk_window_get_device_position()
call fails to retrieve x relative to the passed in toplevel widget,
and instead returns x relative to the Popover. So to fix that behaviour
in the GtkTooltip code, we use gtk_widget_translate_coordinates()
to obtain the x offset of the Popover wrt the toplevel widget, and then
add that to the previous incomplete pointer_x so now pointer_x contains
the expected x relative to the 'effective_toplevel' widget.

This fixes issue #1708

.gitlab-ci.yml

@@ -1,51 +1,93 @@
-image: registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2
-
 stages:
   - build
+  - docs
 
 cache:
   paths:
     - _ccache/
 
 fedora-autotools:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
   stage: build
   script:
-   - bash -x ./.gitlab-ci/test-docker-autotools.sh
+    - bash -x ./.gitlab-ci/test-docker-autotools.sh
+
+fedora-distcheck:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
+  variables:
+    DO_DISTCHECK: "yes"
+  when: manual
+  stage: build
+  script:
+    - bash -x ./.gitlab-ci/test-docker-autotools.sh
 
 fedora-meson:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
   stage: build
+  variables:
+    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
   script:
-   - bash -x ./.gitlab-ci/test-docker-meson.sh
+    - bash -x ./.gitlab-ci/test-docker-meson.sh
   artifacts:
     when: always
     name: "gtk3-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     paths:
       - "_build/meson-logs"
+      - "_build/testsuite/reftests/output"
 
-msys2-mingw32-meson:
+debian-meson:
+  image: registry.gitlab.gnome.org/gnome/gtk/debian-gtk3:v1
+  stage: build
   variables:
-    MSYSTEM: "MINGW32"
+    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
+  script:
+    - bash -x ./.gitlab-ci/test-docker-meson.sh
+  artifacts:
+    when: always
+    name: "gtk3-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    paths:
+      - "_build/meson-logs"
+      - "_build/testsuite/reftests/output"
+
+reference:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
+  stage: docs
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=release -Dgtk_doc=true -Dman=true"
+  script:
+    - bash -x ./.gitlab-ci/test-docker-meson.sh
+    - ninja -C _build gdk3-doc gtk3-doc
+    - tar -c -J -f gdk3-docs.tar.xz _build/docs/reference/gdk
+    - tar -c -J -f gtk3-docs.tar.xz _build/docs/reference/gtk
+  artifacts:
+    paths:
+      - gdk3-docs.tar.xz
+      - gtk3-docs.tar.xz
+
+msys2-mingw64-meson:
+  variables:
+    MSYSTEM: "MINGW64"
     CHERE_INVOKING: "yes"
   stage: build
   tags:
-    - win32
+    - win32-ps
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh"
   artifacts:
     when: always
-    name: "gtk3-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
+    name: "gtk3-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     paths:
       - "_build/meson-logs"
 
-msys2-mingw32-autotools:
+msys2-mingw64-autotools:
   when: manual
   variables:
-    MSYSTEM: "MINGW32"
+    MSYSTEM: "MINGW64"
     CHERE_INVOKING: "yes"
   stage: build
   tags:
-    - win32
+    - win32-ps
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh"

.gitlab-ci/debian-gtk3.Dockerfile

@@ -0,0 +1,71 @@
+FROM debian:buster
+
+RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
+    adwaita-icon-theme \
+    ccache \
+    dconf-gsettings-backend \
+    g++ \
+    gcc \
+    gettext \
+    git \
+    gobject-introspection \
+    gvfs \
+    hicolor-icon-theme \
+    itstool \
+    libatk-bridge2.0-dev \
+    libatk1.0-dev \
+    libc6-dev \
+    libcairo2-dev \
+    libcairo-gobject2 \
+    libcolord-dev \
+    libcups2-dev \
+    libegl1-mesa-dev \
+    libepoxy-dev \
+    libfontconfig1-dev \
+    libfreetype6-dev \
+    libgdk-pixbuf2.0-dev \
+    libgirepository1.0-dev \
+    libglib2.0-dev \
+    libharfbuzz-dev \
+    libjson-glib-dev \
+    libpango1.0-dev \
+    librest-dev \
+    librsvg2-common \
+    libsoup2.4-dev \
+    libwayland-dev \
+    libx11-dev \
+    libxcomposite-dev \
+    libxcursor-dev \
+    libxdamage-dev \
+    libxext-dev \
+    libxfixes-dev \
+    libxi-dev \
+    libxinerama-dev \
+    libxkbcommon-dev \
+    libxkbcommon-x11-dev \
+    libxml2-dev \
+    libxrandr-dev \
+    locales \
+    ninja-build \
+    pkg-config \
+    python3 \
+    python3-pip \
+    python3-setuptools \
+    python3-wheel \
+    shared-mime-info \
+    wayland-protocols \
+    xauth \
+    xvfb \
+ && rm -rf /usr/share/doc/* /usr/share/man/*
+
+# Locale for our build
+RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8
+
+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 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8

.gitlab-ci/fedora-gtk3.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM fedora:31
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -41,6 +41,7 @@ RUN dnf -y install \
     libxkbcommon-devel \
     libXrandr-devel \
     libXrender-devel \
+    libXtst-devel \
     make \
     mesa-libEGL-devel \
     mesa-libwayland-egl-devel \

.gitlab-ci/run-docker.sh

@@ -1,19 +1,135 @@
 #!/bin/bash
-#
-# This script builds an image from the Dockerfile, starts a container with
-# the parent directory mounted as working directory and start a bash session
-# there so you can test things.
-# Once you are happy you can push it to the docker hub:
-#     sudo docker push "${TAG}"
+
+read_arg() {
+    # $1 = arg name
+    # $2 = arg value
+    # $3 = arg parameter
+    local rematch='^[^=]*=(.*)$'
+    if [[ $2 =~ $rematch ]]; then
+        read "$1" <<< "${BASH_REMATCH[1]}"
+    else
+        read "$1" <<< "$3"
+        # There is no way to shift our callers args, so
+        # return 1 to indicate they should do it instead.
+        return 1
+    fi
+}
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2"
+build=0
+run=0
+push=0
+list=0
+print_help=0
+no_login=0
 
-# HOST_USER_ID gets used to create a user with the same ID so that files
-# created in the mounted volume have the same owner
-sudo docker build \
-    --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
-sudo docker run --security-opt label=disable \
-    --rm --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash
+while (($# > 0)); do
+        case "${1%%=*}" in
+                build) build=1;;
+                run) run=1;;
+                push) push=1;;
+                list) list=1;;
+                help) print_help=1;;
+                --base|-b) read_arg base "$@" || shift;;
+                --base-version) read_arg base_version "$@" || shift;;
+                --no-login) no_login=1;;
+                *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
+        esac
+        shift
+done
+
+if [ $print_help == 1 ]; then
+        echo "$0 - Build and run Docker images"
+        echo ""
+        echo "Usage: $0 <command> [options] [basename]"
+        echo ""
+        echo "Available commands"
+        echo ""
+        echo "  build --base=<BASENAME> - Build Docker image <BASENAME>.Dockerfile"
+        echo "  run --base=<BASENAME>   - Run Docker image <BASENAME>"
+        echo "  push --base=<BASENAME>  - Push Docker image <BASENAME> to the registry"
+        echo "  list                    - List available images"
+        echo "  help                    - This help message"
+        echo ""
+        exit 0
+fi
+
+cd "$(dirname "$0")"
+
+if [ $list == 1 ]; then
+        echo "Available Docker images:"
+        for f in *.Dockerfile; do
+                filename=$( basename -- "$f" )
+                basename="${filename%.*}"
+
+                echo -e "  \e[1;39m$basename\e[0m"
+        done
+        exit 0
+fi
+
+# All commands after this require --base to be set
+if [ -z $base ]; then
+        echo "Usage: $0 <command>"
+        exit 1
+fi
+
+if [ ! -f "$base.Dockerfile" ]; then
+        echo -e "\e[1;31mERROR\e[0m: Dockerfile for '$base' not found"
+        exit 1
+fi
+
+if [ -z $base_version ]; then
+        base_version="latest"
+else
+        base_version="v$base_version"
+fi
+
+if [ ! -x "$(command -v docker)" ] || [ docker --help |& grep -q podman ]; then
+        # Docker is actually implemented by podman, and its OCI output
+        # is incompatible with some of the dockerd instances on GitLab
+        # CI runners.
+        echo "Using: Podman"
+        format="--format docker"
+        CMD="podman"
+else
+        echo "Using: Docker"
+        format=""
+        CMD="sudo socker"
+fi
+
+REGISTRY="registry.gitlab.gnome.org"
+TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
+
+if [ $build == 1 ]; then
+        echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
+        ${CMD} build \
+                ${format} \
+                --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
+        exit $?
+fi
+
+if [ $push == 1 ]; then
+        echo -e "\e[1;32mPUSHING\e[0m: ${base} as ${TAG}"
+
+        if [ $no_login == 0 ]; then
+                ${CMD} login ${REGISTRY}
+        fi
+
+        ${CMD} push ${TAG}
+        exit $?
+fi
+
+if [ $run == 1 ]; then
+        echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}"
+        ${CMD} run \
+                --rm \
+                --volume "$(pwd)/..:/home/user/app" \
+                --workdir "/home/user/app" \
+                --tty \
+                --interactive "${TAG}" \
+                bash
+        exit $?
+fi

.gitlab-ci/test-docker-autotools.sh

@@ -5,12 +5,31 @@ set -e
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+export N_PROCS=$(($(nproc) - 1))
+
+EXTRA_CONFIGURE_OPT=""
+
+# Only enable documentation when distchecking, since it's required
+if [ -n "${DO_DISTCHECK-}" ]; then
+    EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-gtk-doc"
+fi
+
+NOCONFIGURE=1 ./autogen.sh
 
 mkdir _build
 cd _build
-../autogen.sh \
+
+../configure \
     --enable-cloudproviders \
     --enable-broadway-backend \
+    --enable-wayland-backend \
+    --enable-x11-backend \
     --enable-xinerama \
-    --enable-gtk-doc
-make -j8
+    ${EXTRA_CONFIGURE_OPTS}
+
+make -j${N_PROCS}
+
+if [ -n "${DO_DISTCHECK-}" ]; then
+  make -j${N_PROCS} check SKIP_GDKTARGET="echo Not actually running tests for now"
+  make -j${N_PROCS} distcheck SKIP_GDKTARGET="echo Not actually running tests for now"
+fi

.gitlab-ci/test-docker-meson.sh

@@ -10,11 +10,13 @@ export PATH="${HOME}/.local/bin:${PATH}"
 python3 -m pip install --user meson==0.49.2
 
 meson \
-    -Dgtk_doc=true \
-    -Dman=true \
+    -Dinstalled_tests=true \
     -Dbroadway_backend=true \
+    -Dx11_backend=true \
+    -Dwayland_backend=true \
     -Dxinerama=yes \
     -Dprint_backends="file,lpr,test,cloudprint,cups" \
+    ${EXTRA_MESON_FLAGS:-} \
     _build
 
 cd _build
@@ -26,5 +28,3 @@ xvfb-run -a -s "-screen 0 1024x768x24" \
         --print-errorlogs \
         --suite=gtk+-3.0 \
         --no-suite=gtk+-3.0:a11y
-
-ninja gail-libgail-util3-doc gdk3-doc gtk3-doc

.gitlab-ci/test-msys2-meson.sh

@@ -28,8 +28,10 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-meson \
     mingw-w64-$MSYS2_ARCH-ninja \
-    mingw-w64-$MSYS2_ARCH-gtk-doc \
-    mingw-w64-$MSYS2_ARCH-sassc
+    mingw-w64-$MSYS2_ARCH-gtk-doc
+
+# https://github.com/msys2/MINGW-packages/pull/6465
+pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"

Makefile.am

@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros win32
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
@@ -16,6 +16,7 @@ EXTRA_DIST +=			\
 	NEWS.pre-1-0		\
 	README.commits		\
 	README.win32		\
+	check-version.py	\
 	config.h.win32		\
 	makefile.msc		\
 	gtk-zip.sh.in		\
@@ -28,7 +29,8 @@ EXTRA_DIST +=			\
 	po/meson.build	\
 	po-properties/meson.build	\
 	build-aux/meson/post-install.py	\
-	config.h.meson
+	config.h.meson		\
+	gtk.supp
 
 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -40,13 +42,17 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/ChangeLog
 
+if OS_UNIX
+valgrinddir = $(datadir)/gtk-3.0/valgrind
+valgrind_DATA = gtk.supp
+endif
 
 ## Copy .pc files to target-specific names
-gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc gtk+-mir-3.0.pc: gtk+-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
 	rm -f $@ && \
 	cp gtk+-3.0.pc $@
 
-gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc gdk-mir-3.0.pc: gdk-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
 	rm -f $@ && \
 	cp gdk-3.0.pc $@
 
@@ -67,17 +73,20 @@ DISTCLEANFILES = \
 	gtk+-quartz-3.0.pc		\
 	gtk+-broadway-3.0.pc		\
 	gtk+-wayland-3.0.pc		\
-	gtk+-mir-3.0.pc			\
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gdk-win32-3.0.pc		\
 	gdk-quartz-3.0.pc		\
 	gdk-broadway-3.0.pc		\
 	gdk-wayland-3.0.pc		\
-	gdk-mir-3.0.pc			\
 	gail-3.0.pc			\
 	config.lt
 
+dist-hook:
+	mkdir $(distdir)/subprojects
+	cp -p $(srcdir)/subprojects/*.wrap $(distdir)/subprojects
+	$(top_srcdir)/check-version.py $(top_srcdir)/configure.ac $(top_srcdir)/meson.build
+
 distclean-local:
 	if test "$(srcdir)" = "."; then :; else \
 		rm -f ChangeLog; \

NEWS

@@ -1,3 +1,385 @@
+Overview of Changes in GTK+ 3.24.23
+===================================
+
+* Adwaita:
+ - Support error states for labels and entries
+
+* Printing:
+ - Use the correct names for remote printers
+
+* File choser:
+ - Default to tracker2 for search to prevent
+   symbol clashes in tracker-using applications
+
+* Wayland:
+ - Support newer schemas for settings
+ - Fix DND hotspot handling
+ - Disconnect on display close
+
+* X11:
+ - Fix a possible crash with disabled devices
+
+* Translation updates:
+ Basque
+ Chinese (China)
+ Croatian
+ Dutch
+ Finnish
+ Friulian
+ Galician
+ Hungarian
+ Japanese
+ Korean
+ Portuguese
+ Serbian
+
+
+Overview of Changes in GTK+ 3.24.22
+===================================
+
+* GtkTextView:
+ - Fix some corner cases of pixelcache invalidation
+ - Make select-all work on touch
+
+* Fix print portal support
+
+* Adwaita:
+ - Tweak title style class
+ - Add a public color for text view background
+
+* Windows:
+ - Limit the size of the corner mask cache
+ - Use native API for keycode conversion
+ - Use GLES on arm64
+
+* Wayland: Add a way to change the application id
+
+* Quartz: Add axes to master devices
+
+* Add --enable-tracker3 option to configure
+
+* Translation updates:
+ Catalan
+ German
+ Indonesian
+ Italian
+ Kazakh
+ Spanish
+ Turkish
+
+
+Overview of Changes in GTK+ 3.24.21
+===================================
+
+* Wayland:
+ - Prevent crashes with offscreen windows
+ - Handle disorderly tablet/pad disconnects
+
+* GtkFileChooser:
+ - Translate the type column
+ - Add a tracker3 search engine
+ - Rate-limit trash monitoring
+ - Make get_filter work for native chooser
+
+* GtkGLArea:
+ - Fix a redraw problem
+
+* GtkScrolledWindow:
+ - Fix kinetic scrolling
+
+* Add a gtk-cursor-aspect-ratio setting
+
+* GDK:
+ - Improve frame clock smoothness
+ - Fix frame clock monotonicity
+
+* OS X:
+ - Support Pen / Eraser input
+ - Support openfiles in GtkApplication
+
+* Adwaita:
+ - Improve notebook tab legibility
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ Catalan
+ Chinese (Taiwan)
+ German
+ Indonesian
+ Italian
+ Japanese
+ Kazakh
+ Lithuanian
+ Polish
+ Romanian
+ Slovak
+ Slovenian
+ Swedish
+ Ukrainian
+
+
+Overview of Changes in GTK+ 3.24.20
+===================================
+
+* GtkFileChooser:
+ - Prevent selection changes after overwrite confirmation
+ - Don't grab focus to the sidebar on click
+ - Avoid a use-after-free in GtkFileSystemModel
+
+* GtkEmojiChooser:
+ - Remove blacklist
+
+* GtkAboutDialog:
+ - Add more licenses
+
+* Adwaita:
+ - Lower the contrast of checkboxes
+
+* HighContrast:
+ - Export the same public colors as Adwaita
+
+* OS X:
+ - Don't filter Escape in input methods
+
+* Windows:
+ - Infer font settings from system settings
+
+* Translation updates
+ Brazilian Portuguese
+ Chinese
+ Croatian
+ French
+ Japanese
+ Lithuanian
+ Polish
+ Spanish
+ Swedish
+ Turkish
+ Ukrainian
+
+
+Overview of Changes in GTK+ 3.24.18
+===================================
+
+* Wayland:
+ - Fix more sizing regressions in Epiphany and LibreOffice
+   menus, and popups in general
+
+* Build:
+ - Make resource build reproducible
+
+* Translation updates
+ Basque
+ Latvian
+
+
+Overview of Changes in GTK+ 3.24.17
+===================================
+
+* GtkFileChooser: Fix some keynav issues
+
+* GtkMenuButton: disable focus-on-click
+
+* Derive the HighContrast and HighContrastInverse themes from Adwaita
+
+* Wayland:
+ - Fix firefox sizing problems
+ - Prevent Alt lingering after Alt-Tab
+ - Load compose sequences from ~/.Compose
+ - Fix a crash in the Wayland input method
+
+* Translation updates
+ Finnish
+ Hebrew
+
+
+Overview of Changes in GTK+ 3.24.16
+===================================
+
+* Fix the build
+
+
+Overview of Changes in GTK+ 3.24.15
+===================================
+
+* filechooser:
+ - Fix a crash
+ - Support selecting directories with a new enough
+   file chooser portal
+
+* textview:
+ - Speed up tag handling
+
+* wayland:
+ - Fix problems with clipboard handling
+ - Fix a crash in the Wayland input method
+ - Support cursor scale of 400%
+ - Fix a crash in glade
+
+* css: Support font-feature-settings
+
+* Adwaita:
+ - Use tabular figures where appropriate
+ - Color tweaks for dark mode
+ - Improve rendering of rounded corners
+
+* Translation updates
+ Dutch
+ German
+ Japanese
+ Korean
+ Lithuanian
+ Norwegian Bokmål
+ Persian
+ Ukrainian
+
+
+Overview of Changes in GTK+ 3.24.14
+===================================
+
+* Fix the opaque region for windows on X11
+
+* theme:
+ - Fix flat buttons in backdrop
+ - Make popovers look more similar to menus
+ - Tweak checkbox & radiobutton appearance
+ - Add general typography classes (heading, title-1, etc)
+
+* language bindings:
+ - Fix annotations for gtk_tree_model_sort_new_with_model
+
+* switch: Fix touch support
+
+* infobar: Make clickable for default action
+
+* emojichooser:
+ - respect a no-emoji input hint
+
+* fontchooser:
+ - Fix an oversight with hiding the size label
+
+* filechooser:
+ - Disable recursive search without a system indexer
+
+* modelbutton:
+ - Fix a11y support to reflect button state
+
+* input:
+ - Fix touchpad gesture center calculation
+
+* x11:
+ - Fix root window scaling
+ - Support _GTK_WORKAREAS_Dn property
+
+* wayland:
+ - Support a terminal purpose in input methods
+ - Fix preedit cursor positioning
+ - Fix enabling/disabling of text inputs
+ - Support simultaneous selection requests
+ - Require Wayland 1.14.91
+
+* OS X:
+ - Fix fullscreen state
+ - Fix an Inkscape crash at startup
+ - Fix OpenGL extension detection
+
+* Printing:
+ - Fix a crash with Avahi
+
+* Translation updates:
+ Basque
+ British English
+ Catalan
+ Finnish
+ French 
+ Galician
+ Japanese
+ Kurdish Sorani
+ Malay
+ Russian
+ Slovak
+ Spanish
+ Turkish
+
+
+Overview of Changes in GTK+ 3.24.13
+===================================
+
+* listbox: Fix header row reuse
+
+* wayland: Fix handling of tablets
+
+* theme:
+ - Adwaita: Fix menu rounding
+ - Adwaita: Various improvements for the Emoji chooser
+ - Adwaita: Refresh check and radio buttons
+ - HighContrast: Fix entry colors
+
+* input:
+ - Properly handle bubbling of scroll events
+ - Handle modifier key events properly
+ - Run key controllers in the bubble phase
+ - Do not use VIQR for Vietnamese by default 
+
+* statusicons: Render sharply on hi-dpi
+
+* wayland: Fix handling of selection ownership
+
+* win32:
+ - Set WS_BORDER for fullscreen GL windows if requested
+ - Fix clipboard handling
+
+* quartz:
+ - Handle titlebar events properly
+ - Handle page up/down key events properly
+
+* broadway: Fix (lack of) clipboard handling
+
+* Translation updates:
+ Catalan
+ Chinese (Taiwan)
+ Croatian
+ Danish
+ French
+ German
+ Hungarian
+ Indonesian
+ Russian
+ Swedish
+
+
+Overview of Changes in GTK+ 3.24.12
+===================================
+
+* file chooser: allow sorting by file type
+
+* dnd: fix pointer offsets under X11 and Wayland
+
+* broadway: Fix a font problem
+
+* mir Drop this backend
+
+* printing: Get PPD from original host if needed
+
+* a11y: Fix interference with clutter a11y impl
+
+* Translation updates:
+ Brazilian Portuguese
+ Czech
+ Danish
+ Dutch
+ Italian
+ Greek
+ Lithuanian
+ Norwegian Bokmål
+ Polish
+ Romanian
+ Slovenian
+ Spanish
+ Turkish
+
+
 Overview of Changes in GTK+ 3.24.11
 ===================================
 

README.win32

@@ -10,15 +10,13 @@ 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
+For people compiling GTK+ with Visual C++ 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. Currently
+building with Visual Studio 2008 or later is supported, either via Visual Studio
+project files or via the Meson build system, as described in the below sections.
+Interchanging between Visual Studio 2015, 2017 and 2019 builds should be fine
+as they use the same CRT (UCRT) DLLs.
 
 After installing the dependencies, there are two ways to build GTK+
 for win32.
@@ -152,16 +150,12 @@ 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~2017 solution and project files to build GTK+, which
+There are VS 2008~2019 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 also refer to the
-README file(s) that reside in build/win32 on how to enable additional features
+README file(s) that reside in win32 on how to enable additional features
 that are not enabled by default, such as EGL support via libANGLE, which
 emulate the GL/EGL calls using Direct3D 9/11.
 

build-aux/meson/post-install.py

@@ -27,7 +27,13 @@ if 'DESTDIR' not in os.environ:
                 shutil.copyfile(installed_lib, installed_lib_dst)
 
     print('Compiling GSettings schemas...')
-    subprocess.call(['glib-compile-schemas',
+    glib_compile_schemas = subprocess.check_output(['pkg-config',
+                                                   '--variable=glib_compile_schemas',
+                                                   'gio-2.0']).strip()
+    if not os.path.exists(glib_compile_schemas):
+        # pkg-config variables only available since GLib 2.62.0.
+        glib_compile_schemas = 'glib-compile-schemas'
+    subprocess.call([glib_compile_schemas,
                     os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
 
     print('Updating icon cache...')
@@ -43,4 +49,10 @@ if 'DESTDIR' not in os.environ:
     # Untested!
     print('Updating module cache for print backends...')
     os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    subprocess.call(['gio-querymodules', gtk_printmodule_dir])
+    gio_querymodules = subprocess.check_output(['pkg-config',
+                                                '--variable=gio_querymodules',
+                                                'gio-2.0']).strip()
+    if not os.path.exists(gio_querymodules):
+        # pkg-config variables only available since GLib 2.62.0.
+        gio_querymodules = 'gio-querymodules'
+    subprocess.call([gio_querymodules, gtk_printmodule_dir])

build/Makefile-newvs.am

@@ -1,53 +0,0 @@
-# Centralized autotools file
-# Create the Visual Studio 2012/2013/2015 project files
-# from the Visual Studio 2010 project files
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support, and is copied into
-# $(srcroot)/build/.
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-
-if MSVC_BASE_NO_TOOLSET_SET
-MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-endif
-
-if MSVC_NO_TOOLSET_SET
-MSVC_TOOLSET = $(MSVC_VER)0
-endif
-
-%.sln: $(top_builddir)/build/win32/vs10/Makefile
-	sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-
-%.txt: $(top_builddir)/build/win32/vs10/Makefile
-	sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-
-%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
-	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.props: $(top_builddir)/build/win32/vs10/Makefile
-	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
-	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	fi

build/Makefile.am

@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = win32
-
--include $(top_srcdir)/git.mk

build/win32/generate-msvc.mak

@@ -1,222 +0,0 @@
-# NMake Makefile portion for code generation and
-# intermediate build directory creation
-# Items in here should not need to be edited unless
-# one is maintaining the NMake build files.
-
-!include config-msvc.mak
-!include create-lists-msvc.mak
-
-# Copy the pre-defined gdkconfig.h.[win32|win32_broadway]
-!if "$(CFG)" == "release" || "$(CFG)" == "Release"
-GDK_OLD_CFG = debug
-!else
-GDK_OLD_CFG = release
-!endif
-
-!ifdef BROADWAY
-GDK_CONFIG = broadway
-GDK_DEL_CONFIG = win32
-GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32_broadway
-!else
-GDK_CONFIG = win32
-GDK_DEL_CONFIG = broadway
-GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32
-!endif
-
-GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers
-GDK_RESOURCES_ARGS = ..\..\gdk\gdk.gresource.xml --target=$@ --sourcedir=..\..\gdk --c-name _gdk --manual-register
-GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers
-GTK_RESOURCES_ARGS = ..\..\gtk\gtk.gresource.xml --target=$@ --sourcedir=..\..\gtk --c-name _gtk --manual-register
-
-all:	\
-	..\..\config.h	\
-	..\..\gdk\gdkconfig.h	\
-	..\..\gdk\gdkversionmacros.h	\
-	..\..\gdk\gdkmarshalers.h	\
-	..\..\gdk\gdkmarshalers.c	\
-	..\..\gdk\gdkresources.h	\
-	..\..\gdk\gdkresources.c	\
-	..\..\gtk\gtk-win32.rc	\
-	..\..\gtk\libgtk3.manifest	\
-	..\..\gtk\gtkdbusgenerated.h	\
-	..\..\gtk\gtkdbusgenerated.c	\
-	..\..\gtk\gtktypefuncs.inc	\
-	..\..\gtk\gtk.gresource.xml	\
-	..\..\gtk\gtkmarshalers.h	\
-	..\..\gtk\gtkmarshalers.c	\
-	..\..\gtk\gtkresources.h	\
-	..\..\gtk\gtkresources.c	\
-	..\..\demos\gtk-demo\demos.h	\
-	..\..\demos\gtk-demo\demo_resources.c	\
-	..\..\demos\icon-browser\resources.c
-
-# Copy the pre-defined config.h.win32 and demos.h.win32
-..\..\config.h: ..\..\config.h.win32
-..\..\demos\gtk-demo\demos.h: ..\..\demos\gtk-demo\demos.h.win32
-..\..\gtk\gtk-win32.rc: ..\..\gtk\gtk-win32.rc.body
-
-..\..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE)
-	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build
-	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build
-	@if exist ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build
-	@copy $** $@
-	
-..\..\gdk\gdkconfig.h: ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build
-
-..\..\config.h	\
-..\..\gdk\gdkconfig.h	\
-..\..\gtk\gtk-win32.rc	\
-..\..\demos\gtk-demo\demos.h:
-	@echo Copying $@...
-	@copy $** $@
-
-..\..\gdk\gdkversionmacros.h: ..\..\gdk\gdkversionmacros.h.in
-	@echo Generating $@...
-	@$(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION)
-
-..\..\gdk\gdkmarshalers.h: ..\..\gdk\gdkmarshalers.list
-	@echo Generating $@...
-	@$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp
-	@move $@.tmp $@
-
-..\..\gdk\gdkmarshalers.c: ..\..\gdk\gdkmarshalers.list
-	@echo Generating $@...
-	@$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp
-	@move $@.tmp $@
-
-..\..\gdk\gdk.gresource.xml: $(GDK_RESOURCES)
-	@echo Generating $@...
-	@echo ^<?xml version='1.0' encoding='UTF-8'?^> >$@
-	@echo ^<gresources^> >> $@
-	@echo  ^<gresource prefix='/org/gtk/libgdk'^> >> $@
-	@for %%f in (..\..\gdk\resources\glsl\*.glsl) do @echo     ^<file alias='glsl/%%~nxf'^>resources/glsl/%%~nxf^</file^> >> $@
-	@echo   ^</gresource^> >> $@
-	@echo ^</gresources^> >> $@
-
-..\..\gdk\gdkresources.h: ..\..\gdk\gdk.gresource.xml
-	@echo Generating $@...
-	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
-	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
-	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
-	@$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header
-
-..\..\gdk\gdkresources.c: ..\..\gdk\gdk.gresource.xml $(GDK_RESOURCES)
-	@echo Generating $@...
-	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
-	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
-	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
-	@$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source
-
-..\..\gtk\libgtk3.manifest: ..\..\gtk\libgtk3.manifest.in
-	@echo Generating $@...
-	@$(PYTHON) replace.py	\
-	--action=replace-var	\
-	--input=$**	--output=$@	\
-	--var=EXE_MANIFEST_ARCHITECTURE	\
-	--outstring=*
-
-..\..\gtk\gtkdbusgenerated.h ..\..\gtk\gtkdbusgenerated.c: ..\..\gtk\gtkdbusinterfaces.xml
-	@echo Generating GTK DBus sources...
-	@$(PYTHON) $(PREFIX)\bin\gdbus-codegen	\
-	--interface-prefix org.Gtk. --c-namespace _Gtk	\
-	--generate-c-code gtkdbusgenerated $**	\
-	--output-directory $(@D)
-
-..\..\gtk\gtktypefuncs.inc: ..\..\gtk\gentypefuncs.py
-	@echo Generating $@...
-	@echo #undef GTK_COMPILATION > $(@R).preproc.c
-	@echo #include "gtkx.h" >> $(@R).preproc.c
-	@cl /EP $(GTK_PREPROCESSOR_FLAGS) $(@R).preproc.c > $(@R).combined.c
-	@$(PYTHON) $** $@ $(@R).combined.c
-	@del $(@R).preproc.c $(@R).combined.c
-
-..\..\gtk\gtk.gresource.xml: $(GTK_RESOURCES)
-	@echo Generating $@...
-	@echo ^<?xml version='1.0' encoding='UTF-8'?^>> $@
-	@echo ^<gresources^>>> $@
-	@echo   ^<gresource prefix='/org/gtk/libgtk'^>>> $@
-	@echo     ^<file^>theme/Adwaita/gtk.css^</file^>>> $@
-	@echo     ^<file^>theme/Adwaita/gtk-dark.css^</file^>>> $@
-	@echo     ^<file^>theme/Adwaita/gtk-contained.css^</file^>>> $@
-	@echo     ^<file^>theme/Adwaita/gtk-contained-dark.css^</file^>>> $@
-	@for %%f in (..\..\gtk\theme\Adwaita\assets\*.png) do @echo     ^<file preprocess='to-pixdata'^>theme/Adwaita/assets/%%~nxf^</file^>>> $@
-	@for %%f in (..\..\gtk\theme\Adwaita\assets\*.svg) do @echo     ^<file^>theme/Adwaita/assets/%%~nxf^</file^>>> $@
-	@echo     ^<file^>theme/HighContrast/gtk.css^</file^>>> $@
-	@echo     ^<file alias='theme/HighContrastInverse/gtk.css'^>theme/HighContrast/gtk-inverse.css^</file^>>> $@
-	@echo     ^<file^>theme/HighContrast/gtk-contained.css^</file^>>> $@
-	@echo     ^<file^>theme/HighContrast/gtk-contained-inverse.css^</file^>>> $@
-	@for %%f in (..\..\gtk\theme\HighContrast\assets\*.png) do @echo     ^<file preprocess='to-pixdata'^>theme/HighContrast/assets/%%~nxf^</file^>>> $@
-	@for %%f in (..\..\gtk\theme\HighContrast\assets\*.svg) do @echo     ^<file^>theme/HighContrast/assets/%%~nxf^</file^>>> $@
-	@echo     ^<file^>theme/win32/gtk-win32-base.css^</file^>>> $@
-	@echo     ^<file^>theme/win32/gtk.css^</file^>>> $@
-	@for %%f in (..\..\gtk\cursor\*.png) do @echo     ^<file^>cursor/%%~nxf^</file^>>> $@
-	@for %%f in (..\..\gtk\gesture\*.symbolic.png) do @echo     ^<file alias='icons/64x64/actions/%%~nxf'^>gesture/%%~nxf^</file^>>> $@
-	@for %%f in (..\..\gtk\ui\*.ui) do @echo     ^<file preprocess='xml-stripblanks'^>ui/%%~nxf^</file^>>> $@
-	@for %%s in (16 22 24 32 48) do @(for %%c in (actions status categories) do @(for %%f in (..\..\gtk\icons\%%sx%%s\%%c\*.png) do @echo     ^<file^>icons/%%sx%%s/%%c/%%~nxf^</file^>>> $@))
-	@for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\..\gtk\icons\%%s\%%c\*.svg) do @echo     ^<file^>icons/%%s/%%c/%%~nxf^</file^>>> $@))
-	@for %%f in (..\..\gtk\inspector\*.ui) do @echo     ^<file compressed='true' preprocess='xml-stripblanks'^>inspector/%%~nxf^</file^>>> $@
-	@echo     ^<file^>inspector/logo.png^</file^>>> $@
-	@echo     ^<file^>emoji/emoji.data^</file^>>> $@
-	@echo   ^</gresource^>>> $@
-	@echo ^</gresources^>>> $@
-
-..\..\gtk\gtkresources.h: ..\..\gtk\gtk.gresource.xml
-	@echo Generating $@...
-	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
-	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
-	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
-	@$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-header
-
-..\..\gtk\gtkresources.c: ..\..\gtk\gtk.gresource.xml $(GTK_RESOURCES)
-	@echo Generating $@...
-	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
-	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
-	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
-	@$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source
-
-..\..\gtk\gtkmarshalers.h: ..\..\gtk\gtkmarshalers.list
-	@echo Generating $@...
-	@$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp
-	@move $@.tmp $@
-
-..\..\gtk\gtkmarshalers.c: ..\..\gtk\gtkmarshalers.list
-	@echo Generating $@...
-	@echo #undef G_ENABLE_DEBUG> $@.tmp
-	@$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp
-	@move $@.tmp $@
-
-..\..\demos\gtk-demo\demo_resources.c: ..\..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES)
-	@echo Generating $@...
-	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\demo.gresource.xml
-
-..\..\demos\icon-browser\resources.c: ..\..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES)
-	@echo Generating $@...
-	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml
-
-# Remove the generated files
-clean:
-	@-del /f /q ..\..\demos\icon-browser\resources.c
-	@-del /f /q ..\..\demos\gtk-demo\demo_resources.c
-	@-del /f /q ..\..\demos\gtk-demo\demos.h
-	@-del /f /q ..\..\gtk\gtkresources.c
-	@-del /f /q ..\..\gtk\gtkresources.h
-	@-del /f /q ..\..\gtk\gtkmarshalers.c
-	@-del /f /q ..\..\gtk\gtkmarshalers.h
-	@-del /f /q ..\..\gtk\gtk.gresource.xml
-	@-del /f /q ..\..\gtk\gtktypefuncs.inc
-	@-del /f /q ..\..\gtk\gtkdbusgenerated.c
-	@-del /f /q ..\..\gtk\gtkdbusgenerated.h
-	@-del /f /q ..\..\gtk\libgtk3.manifest
-	@-del /f /q ..\..\gtk\gtk-win32.rc
-	@-del /f /q ..\..\gdk\gdkresources.c
-	@-del /f /q ..\..\gdk\gdkresources.h
-	@-del /f /q ..\..\gdk\gdk.gresource.xml
-	@-del /f /q ..\..\gdk\gdkmarshalers.c
-	@-del /f /q ..\..\gdk\gdkmarshalers.h
-	@-del /f /q ..\..\gdk\gdkversionmacros.h
-	@-del /f /q ..\..\gdk\gdkconfig.h
-	@if exist ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build
-	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build
-	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build
-	@if exist ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build
-	@-del /f /q ..\..\config.h

build/win32/vs10/gtk-3.vcxproj.filtersin

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-#include "gtk-3.vs10.sourcefiles.filters"
-    <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imam-et.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imcedilla.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imime.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\iminuktitut.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imipa.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\immultipress.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imthai.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imti-er.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imti-et.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="..\..\..\gtk\libgtk3.manifest"><Filter>Resource Files</Filter></Manifest>
-  </ItemGroup>
-</Project>

check-version.py

@@ -0,0 +1,200 @@
+#!/usr/bin/env python3
+
+import re
+import sys
+
+try:
+    configure_ac = sys.argv[1]
+except Exception:
+    configure_ac = 'configure.ac'
+
+try:
+    meson_build = sys.argv[2]
+except Exception:
+    meson_build = 'meson.build'
+
+CONFIGURE_MAJOR_VERSION_RE = re.compile(
+    r'''
+    ^
+    \s*
+    m4_define\(
+    \s*
+    \[gtk_major_version\]
+    \s*
+    ,
+    \s*
+    \[
+    (?P<version>[0-9]+)
+    \]
+    \s*
+    \)
+    $
+    ''',
+    re.UNICODE | re.VERBOSE
+)
+
+CONFIGURE_MINOR_VERSION_RE = re.compile(
+    r'''
+    ^
+    \s*
+    m4_define\(
+    \s*
+    \[gtk_minor_version\]
+    \s*
+    ,
+    \s*
+    \[
+    (?P<version>[0-9]+)
+    \]
+    \s*
+    \)
+    $
+    ''',
+    re.UNICODE | re.VERBOSE
+)
+
+CONFIGURE_MICRO_VERSION_RE = re.compile(
+    r'''
+    ^
+    \s*
+    m4_define\(
+    \s*
+    \[gtk_micro_version\]
+    \s*
+    ,
+    \s*
+    \[
+    (?P<version>[0-9]+)
+    \]
+    \s*
+    \)
+    $
+    ''',
+    re.UNICODE | re.VERBOSE
+)
+
+CONFIGURE_INTERFACE_AGE_RE = re.compile(
+    r'''
+    ^
+    \s*
+    m4_define\(
+    \s*
+    \[gtk_interface_age\]
+    \s*
+    ,
+    \s*
+    \[
+    (?P<age>[0-9]+)
+    \]
+    \s*
+    \)
+    $
+    ''',
+    re.UNICODE | re.VERBOSE
+)
+
+MESON_VERSION_RE = re.compile(
+    r'''
+    ^
+    \s*
+    version
+    \s*
+    :{1}
+    \s*
+    \'{1}
+    (?P<major>[0-9]+)
+    \.{1}
+    (?P<minor>[0-9]+)
+    \.{1}
+    (?P<micro>[0-9]+)
+    \'{1}
+    \s*
+    ,?
+    $
+    ''',
+    re.UNICODE | re.VERBOSE
+)
+
+MESON_INTERFACE_AGE_RE = re.compile(
+    r'''
+    ^\s*gtk_interface_age\s*={1}\s*(?P<age>[0-9]+)\s*$
+    ''',
+    re.UNICODE | re.VERBOSE
+)
+
+version = {}
+
+with open(configure_ac, 'r') as f:
+    line = f.readline()
+    while line:
+        res = CONFIGURE_MAJOR_VERSION_RE.match(line)
+        if res:
+            if 'major' in version:
+                print(f'Redefinition of major version; version is already set to {version["major"]}')
+                sys.exit(1)
+            version['major'] = res.group('version')
+            line = f.readline()
+            continue
+        res = CONFIGURE_MINOR_VERSION_RE.match(line)
+        if res:
+            if 'minor' in version:
+                print(f'Redefinition of minor version; version is already set to {version["minor"]}')
+                sys.exit(1)
+            version['minor'] = res.group('version')
+            line = f.readline()
+            continue
+        res = CONFIGURE_MICRO_VERSION_RE.match(line)
+        if res:
+            if 'micro' in version:
+                print(f'Redefinition of micro version; version is already set to {version["micro"]}')
+                sys.exit(1)
+            version['micro'] = res.group('version')
+            line = f.readline()
+            continue
+        res = CONFIGURE_INTERFACE_AGE_RE.match(line)
+        if res:
+            if 'age' in version:
+                print(f'Redefinition of interface age; age is already set to {version["age"]}')
+                sys.exit(1)
+            version['age'] = res.group('age')
+            line = f.readline()
+            continue
+        if ('major', 'minor', 'micro', 'age') in version:
+            break
+        line = f.readline()
+
+print(f'GTK version defined in {configure_ac}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})')
+
+configure_version = version
+version = {}
+
+with open(meson_build, 'r') as f:
+    line = f.readline()
+    inside_project = False
+    while line:
+        if line.startswith('project('):
+            inside_project = True
+        if inside_project:
+            res = MESON_VERSION_RE.match(line)
+            if res:
+                version['major'] = res.group('major')
+                version['minor'] = res.group('minor')
+                version['micro'] = res.group('micro')
+        if inside_project and line.endswith(')'):
+            inside_project = False
+        res = MESON_INTERFACE_AGE_RE.match(line)
+        if res:
+            version['age'] = res.group('age')
+        if ('major', 'minor', 'micro', 'age') in version:
+            break
+        line = f.readline()
+
+print(f'GTK version defined in {meson_build}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})')
+
+meson_version = version
+
+if configure_version != meson_version:
+    print('Version mismatch between Autotools and Meson builds')
+    sys.exit(1)
+
+sys.exit(0)

config.h.meson

@@ -116,6 +116,9 @@
 /* Define to 1 if you have the `round' function. */
 #mesondefine HAVE_ROUND
 
+/* Define to 1 if SetupDiGetDevicePropertyW() is available */
+#mesondefine HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W
+
 /* Define to 1 if you have the `sincos' function. */
 #mesondefine HAVE_SINCOS
 
@@ -278,3 +281,6 @@
 #mesondefine GTK_LOCALEDIR
 
 #mesondefine ISO_CODES_PREFIX
+
+/* Define if tracker3 is available */
+#mesondefine HAVE_TRACKER3

configure.ac

@@ -10,8 +10,8 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [11])
-m4_define([gtk_interface_age], [7])
+m4_define([gtk_micro_version], [23])
+m4_define([gtk_interface_age], [19])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -56,14 +56,12 @@ GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=glib_min_required_version -DGLI
 
 m4_define([pango_required_version], [1.41.0])
 m4_define([fribidi_required_version], [0.19.7])
-m4_define([atk_required_version], [2.15.1])
+m4_define([atk_required_version], [2.32.0])
 m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
-m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.14])
-m4_define([mirclient_required_version], [0.22.0])
-m4_define([mircookie_required_version], [0.17.0])
+m4_define([wayland_required_version], [1.14.91])
+m4_define([wayland_protocols_required_version], [1.17])
 m4_define([epoxy_required_version], [1.4])
 m4_define([cloudproviders_required_version], [0.2.5])
 m4_define([sysprof_required_version], [3.33.2])
@@ -344,11 +342,6 @@ AC_ARG_ENABLE(wayland-backend,
               [AS_HELP_STRING([--enable-wayland-backend],
                               [enable the wayland gdk backend])],
 			      [backend_set=yes])
-AC_ARG_ENABLE(mir-backend,
-              [AS_HELP_STRING([--enable-mir-backend],
-                              [enable the Mir gdk backend])],
-			      [backend_set=yes])
-
 AC_ARG_ENABLE(cloudproviders,
               [AS_HELP_STRING([--enable-cloudproviders],
                               [enable libcloudproviders integration])],
@@ -366,7 +359,6 @@ if test -z "$backend_set"; then
   else
     enable_x11_backend=yes
     enable_wayland_backend=maybe
-    enable_mir_backend=no
   fi
 fi
 
@@ -479,30 +471,6 @@ else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
 
-MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version libcontent-hub-glib"
-if test "$enable_mir_backend" = "maybe" ; then
-  PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
-  AC_MSG_CHECKING([for MIR_DEPENDENCIES])
-  if test "$have_mir_deps" = "no" ; then
-    enable_mir_backend=no
-  else
-    enable_mir_backend=yes
-  fi
-  AC_MSG_RESULT($enable_mir_backend)
-fi
-
-if test "$enable_mir_backend" = "yes"; then
-  cairo_backends="$cairo_backends cairo"
-  GDK_BACKENDS="$GDK_BACKENDS mir"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_MIR"
-  MIR_PACKAGES="$MIR_DEPENDENCIES"
-
-  AM_CONDITIONAL(USE_MIR, true)
-else
-  AM_CONDITIONAL(USE_MIR, false)
-fi
-
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
 
@@ -758,6 +726,32 @@ AS_CASE([$host_os],
       [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])],
       [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])]
     )
+    AC_MSG_CHECKING([for SetupDiGetDevicePropertyW])
+    gtk_save_LIBS="$LIBS"
+    LIBS="-lsetupapi $LIBS"
+    AC_TRY_LINK(
+      [
+#define _WIN32_WINNT 0x0600
+#include <windows.h>
+#include <devpropdef.h>
+#include <setupapi.h>
+      ],
+      [return SetupDiGetDevicePropertyW(NULL, NULL, NULL, NULL, NULL, 0, NULL, 0);],
+      [have_SetupDiGetDevicePropertyW=yes],
+      [have_SetupDiGetDevicePropertyW=no]
+    )
+    AS_IF(
+      [test x$have_SetupDiGetDevicePropertyW = xyes],
+      [
+       AC_DEFINE(
+         [HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W],
+         [1],
+         [Define to 1 if SetupDiGetDevicePropertyW() is available]
+       )
+      ]
+    )
+    AC_MSG_RESULT([$have_SetupDiGetDevicePropertyW])
+    LIBS="$gtk_save_LIBS"
   ],
   []
 )
@@ -1345,7 +1339,7 @@ CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
 
 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
@@ -1379,7 +1373,7 @@ fi
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
 
 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
 if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1558,6 +1552,30 @@ else
   fi
 fi
 
+# Checks to see if we should compile with tracker3 search engine
+#
+
+AC_ARG_ENABLE(tracker3,
+              [AS_HELP_STRING([--enable-tracker3],
+                              [enable tracker3 search engine])],
+              [enable_tracker3=yes],
+              [enable_tracker3=no])
+
+if test "x$enable_tracker3" = "xyes"; then
+  PKG_CHECK_MODULES(TRACKER3, [tracker-sparql-3.0], have_tracker3=yes, have_tracker3=no)
+  GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $TRACKER3_CFLAGS"
+  GTK_DEP_LIBS="$GTK_DEP_LIBS $TRACKER3_LIBS"
+  if test "x$have_tracker3" = "xyes"; then
+    AC_DEFINE([HAVE_TRACKER3], [], [Define if tracker3 is available])
+  else
+    AC_MSG_ERROR([
+*** tracker3 not found.
+])
+  fi
+fi
+
+AM_CONDITIONAL(HAVE_TRACKER3, test "x$have_tracker3" = "xyes")
+
 # Checks to see if we should compile with cloudprint backend for GTK+
 #
 
@@ -1946,18 +1964,17 @@ docs/reference/gtk/getting_started.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/config-msvc.mak
-build/win32/vs9/Makefile
-build/win32/vs9/gtk3-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/gtk3-version-paths.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
-build/win32/vs14/Makefile
-build/win32/vs15/Makefile
-build/win32/vs16/Makefile
+win32/Makefile
+win32/config-msvc.mak
+win32/vs9/Makefile
+win32/vs9/gtk3-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/gtk3-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
+win32/vs15/Makefile
+win32/vs16/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -1966,7 +1983,6 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
-gdk/mir/Makefile
 gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc

demos/Makefile.am

@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gtk-demo widget-factory icon-browser
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	meson.build
 
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -116,6 +116,7 @@ EXTRA_DIST += 				\
 	data/symbolic-source.svg	\
 	demo.gresource.xml		\
 	$(resource_files)		\
+	makefile.msc.in			\
 	org.gtk.Demo.gschema.xml	\
 	demos.h.win32	\
 	meson.build	\
@@ -195,11 +196,11 @@ gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
 gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
 gtk3_demo_application_EXCLUDES = dummy
 
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gtk3-demo.vcproj	\
-	$(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj
+	$(top_builddir)/win32/vs9/gtk3-demo.vcproj	\
+	$(top_builddir)/win32/vs9/gtk3-demo-application.vcproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 

demos/gtk-demo/gestures.c

@@ -96,11 +96,12 @@ drawing_area_draw (GtkWidget *widget,
       cairo_pattern_t *pat;
       cairo_matrix_t matrix;
       gdouble angle, scale;
+      gdouble x_center, y_center;
+
+      gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center);
 
       cairo_get_matrix (cr, &matrix);
-      cairo_matrix_translate (&matrix,
-                              allocation.width / 2,
-                              allocation.height / 2);
+      cairo_matrix_translate (&matrix, x_center, y_center);
 
       cairo_save (cr);
 

demos/gtk-demo/infobar.c

@@ -97,6 +97,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
+      gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);
 
       button = gtk_toggle_button_new_with_label ("Question");
       g_object_bind_property (button, "active", bar, "visible", G_BINDING_BIDIRECTIONAL);

demos/icon-browser/Makefile.am

@@ -43,8 +43,8 @@ MSVCPROJS = gtk3-icon-browser
 gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES)
 gtk3_icon_browser_EXCLUDES = dummy
 
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
 
-dist-hook: $(top_builddir)/build/win32/vs9/gtk3-icon-browser.vcproj
+dist-hook: $(top_builddir)/win32/vs9/gtk3-icon-browser.vcproj
 
 -include $(top_srcdir)/git.mk

demos/widget-factory/widget-factory.c

@@ -1655,6 +1655,66 @@ adjustment3_value_changed (GtkAdjustment *adj, GtkProgressBar *pbar)
   gtk_progress_bar_set_fraction (pbar, fraction);
 }
 
+static void
+validate_more_details (GtkEntry   *entry,
+                       GParamSpec *pspec,
+                       GtkEntry   *details)
+{
+  if (strlen (gtk_entry_get_text (entry)) > 0 &&
+      strlen (gtk_entry_get_text (details)) == 0)
+    {
+      gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "Must have details first");
+      gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (entry)), "error");
+    }
+  else
+    {
+      gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "");
+      gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (entry)), "error");
+    }
+}
+
+static gboolean
+mode_switch_state_set (GtkSwitch *sw, gboolean state)
+{
+  GtkWidget *dialog = gtk_widget_get_ancestor (GTK_WIDGET (sw), GTK_TYPE_DIALOG);
+  GtkWidget *scale = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "level_scale"));
+  GtkWidget *label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "error_label"));
+
+  if (!state ||
+      (gtk_range_get_value (GTK_RANGE (scale)) > 50))
+    {
+      gtk_widget_hide (label);
+      gtk_switch_set_state (sw, state);
+    }
+  else
+    {
+      gtk_widget_show (label);
+    }
+
+  return TRUE;
+}
+
+static void
+level_scale_value_changed (GtkRange *range)
+{
+  GtkWidget *dialog = gtk_widget_get_ancestor (GTK_WIDGET (range), GTK_TYPE_DIALOG);
+  GtkWidget *sw = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "mode_switch"));
+  GtkWidget *label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "error_label"));
+
+  if (gtk_switch_get_active (GTK_SWITCH (sw)) &&
+      !gtk_switch_get_state (GTK_SWITCH (sw)) &&
+      (gtk_range_get_value (range) > 50))
+    {
+      gtk_widget_hide (label);
+      gtk_switch_set_state (GTK_SWITCH (sw), TRUE);
+    }
+  else if (gtk_switch_get_state (GTK_SWITCH (sw)) &&
+          (gtk_range_get_value (range) <= 50))
+    {
+      gtk_switch_set_state (GTK_SWITCH (sw), FALSE);
+    }
+}
+
 static void
 activate (GApplication *app)
 {
@@ -1722,6 +1782,9 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
   gtk_builder_add_callback_symbol (builder, "scale_format_value", (GCallback)scale_format_value);
   gtk_builder_add_callback_symbol (builder, "scale_format_value_blank", (GCallback)scale_format_value_blank);
+  gtk_builder_add_callback_symbol (builder, "validate_more_details", (GCallback)validate_more_details);
+  gtk_builder_add_callback_symbol (builder, "mode_switch_state_set", (GCallback)mode_switch_state_set);
+  gtk_builder_add_callback_symbol (builder, "level_scale_value_changed", (GCallback)level_scale_value_changed);
 
   gtk_builder_connect_signals (builder, NULL);
 
@@ -1820,6 +1883,13 @@ activate (GApplication *app)
   widget = (GtkWidget *)gtk_builder_get_object (builder, "circular_button");
   g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
 
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "level_scale");
+  g_object_set_data (G_OBJECT (dialog), "level_scale", widget);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "mode_switch");
+  g_object_set_data (G_OBJECT (dialog), "mode_switch", widget);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "error_label");
+  g_object_set_data (G_OBJECT (dialog), "error_label", widget);
+
   dialog = (GtkWidget *)gtk_builder_get_object (builder, "selection_dialog");
   g_object_set_data (G_OBJECT (window), "selection_dialog", dialog);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "text3");

demos/widget-factory/widget-factory.ui

@@ -3989,6 +3989,7 @@ bad things might happen.</property>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -4012,10 +4013,12 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="visible">1</property>
                 <property name="valign">baseline</property>
+                <signal name="notify::text" handler="validate_more_details" object="details_entry" swapped="no"/>
               </object>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">1</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -4041,10 +4044,12 @@ bad things might happen.</property>
                 <property name="valign">baseline</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
+                <signal name="value-changed" handler="level_scale_value_changed"/>
               </object>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">2</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -4069,12 +4074,28 @@ bad things might happen.</property>
                 <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
+                <signal name="state-set" handler="mode_switch_state_set"/>
               </object>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="error_label">
+                <property name="visible">0</property>
+                <property name="halign">start</property>
+                <property name="valign">baseline</property>
+                <property name="label">Level too low</property>
+                <style>
+                  <class name="error"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">3</property>
+              </packing>
+            </child>
           </object>
         </child>
       </object>

docs/Makefile.am

@@ -8,6 +8,7 @@ EXTRA_DIST += \
 	developers.txt			\
 	dnd_internals.txt		\
 	focus_tracking.txt		\
+	iconcache.txt			\
 	RELEASE-HOWTO			\
 	sizing-test.txt			\
 	styles.txt			\

docs/reference/gtk/Makefile.am

@@ -307,7 +307,6 @@ content_files =					\
 	migrating-GtkStyleContext.xml		\
 	migrating-smclient-GtkApplication.xml	\
 	migrating-unique-GtkApplication.xml	\
-	mir.xml					\
 	osx.sgml				\
 	overview.xml 				\
 	question_index.sgml			\
@@ -349,7 +348,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/box-packing.png				\
 	$(srcdir)/images/box-expand.png					\
 	$(srcdir)/images/button.png					\
-	$(srcdir)/images/calendar.png					\
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
 	$(srcdir)/images/colorchooser.png				\
@@ -387,6 +385,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/pagesetupdialog.png				\
 	$(srcdir)/images/placessidebar.png				\
 	$(srcdir)/images/popup-anchors.png				\
+	$(srcdir)/images/popup-at.svg					\
 	$(srcdir)/images/popup-flip.png					\
 	$(srcdir)/images/popup-slide.png				\
 	$(srcdir)/images/printdialog.png				\

docs/reference/gtk/building.sgml

@@ -407,11 +407,6 @@ How to compile GTK+ itself
             <arg choice="plain">--disable-wayland-backend</arg>
           </group>
           <sbr/>
-          <group>
-            <arg choice="plain">--enable-mir-backend</arg>
-            <arg choice="plain">--disable-mir-backend</arg>
-          </group>
-          <sbr/>
           <group>
             <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
           </group>
@@ -609,9 +604,7 @@ How to compile GTK+ itself
           <systemitem>--enable-broadway-backend</systemitem>,
           <systemitem>--disable-broadway-backend</systemitem>,
           <systemitem>--enable-wayland-backend</systemitem>,
-          <systemitem>--disable-wayland-backend</systemitem>
-          <systemitem>--enable-mir-backend</systemitem>, and
-          <systemitem>--disable-mir-backend</systemitem></title>
+          <systemitem>--disable-wayland-backend</systemitem></title>
 
         <para>
           Enables specific backends for GDK.  If none of these options

docs/reference/gtk/css-properties.xml

@@ -229,6 +229,15 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry></entry>
               <entry></entry>
             </row>
+            <row>
+              <entry><phrase role="nowrap">font-feature-settings</phrase></entry>
+              <entry><code>〈feature-tag-value〉&num; </code></entry>
+              <entry>""</entry>
+              <entry>✓</entry>
+              <entry>></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-fonts/#font-feature-settings-prop">CSS3</ulink></entry>
+              <entry></entry>
+            </row>
           </tbody>
         </tgroup>
         <tgroup cols="5">

docs/reference/gtk/gtk-docs.sgml

@@ -437,7 +437,6 @@
     <xi:include href="osx.sgml" />
     <xi:include href="broadway.xml" />
     <xi:include href="wayland.xml" />
-    <xi:include href="mir.xml" />
   </part>
 
   <xi:include href="glossary.xml" />

docs/reference/gtk/meson.build

@@ -245,7 +245,6 @@ images = [
   'images/box-packing.png',
   'images/box-expand.png',
   'images/button.png',
-  'images/calendar.png',
   'images/check-button.png',
   'images/color-button.png',
   'images/colorchooser.png',
@@ -396,7 +395,6 @@ content_files = [
   'gtk-query-immodules-3.0.xml',
   'gtk-query-settings.xml',
   'gtk-update-icon-cache.xml',
-  'mir.xml',
   'osx.sgml',
   'overview.xml',
   'resources.sgml',

docs/reference/gtk/mir.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk-mir">
-<refmeta>
-<refentrytitle>Using GTK+ with Mir</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GTK Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Using GTK+ with Mir</refname>
-<refpurpose>
-Mir-specific aspects of using GTK+
-</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Using GTK+ with Mir</title>
-
-<para>
-The GDK Mir backend provides support for running GTK+ applications
-under Mir based display servers. To run your application in this way,
-select the Mir backend by setting <literal>GDK_BACKEND=mir</literal>.
-</para>
-
-<para>
-Currently, the Mir backend does not use any additional commandline
-options or environment variables.
-</para>
-
-</refsect1>
-
-</refentry>

docs/reference/gtk/question_index.sgml

@@ -36,7 +36,7 @@ How do I get started with GTK+?
 
 <answer><para>
 The GTK+ <ulink url="https://www.gtk.org">website</ulink> offers some
-<ulink url="https://www.gtk.org/documentation.php">tutorials</ulink> and other
+<ulink url="https://www.gtk.org/docs/">tutorials</ulink> and other
 documentation (most of it about GTK+ 2.x, but mostly still applicable).
 More documentation ranging from whitepapers to online books can be found at
 the <ulink url="https://developer.gnome.org">GNOME developer's site</ulink>.
@@ -77,7 +77,7 @@ specific widgets and functions.
 <para>
 If you have a question not covered in the manual, feel free to
 ask on the mailing lists and please <ulink
-url="https://bugzilla.gnome.org">file a bug report</ulink> against the
+url="https://gitlab.gnome.org/GNOME/gtk/issues/new">file a bug report</ulink> against the
 documentation.
 </para>
 
@@ -105,8 +105,8 @@ state (explained in its documentation).
 For strings returned from functions, they will be declared "const"
 if they should not be freed. Non-const strings should be
 freed with g_free(). Arrays follow the same rule. If you find an
-undocumented exception to the rules, please report a bug to <ulink
-url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
+undocumented exception to the rules, please report a bug on <ulink
+url="https://gitlab.gnome.org/GNOME/gtk/issues/new">GitLab</ulink>.
 </para>
 
 </answer>
@@ -415,7 +415,7 @@ How do I use GTK+ with other non-C languages?
 
 <answer>
 <para>
-See the <ulink url="https://www.gtk.org/language-bindings.php">list of language
+See the <ulink url="https://www.gtk.org/docs/language-bindings/">list of language
 bindings</ulink> on <ulink
 url="https://www.gtk.org">https://www.gtk.org</ulink>.
 </para>

docs/reference/gtk/running.sgml

@@ -508,11 +508,6 @@ nevertheless.
         <listitem><para>Selects the Wayland backend for connecting to Wayland display servers</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>mir</term>
-        <listitem><para>Selects the Mir backend for connecting to Mir display servers</para></listitem>
-      </varlistentry>
-
     </variablelist>
     Since 3.10, this environment variable can contain a comma-separated list
     of backend names, which are tried in order. The list may also contain

docs/reference/gtk/visual_index.xml

@@ -45,9 +45,6 @@
     <link linkend="GtkGLArea">
       <inlinegraphic fileref="glarea.png" format="PNG"></inlinegraphic>
     </link>
-    <link linkend="GtkCalendar">
-      <inlinegraphic fileref="calendar.png" format="PNG"></inlinegraphic>
-    </link>
   </para>
 </section>
 

docs/tools/widgets.c

@@ -756,16 +756,6 @@ create_frame (void)
   return new_widget_info ("frame", widget, MEDIUM);
 }
 
-static WidgetInfo *
-create_caledar (void)
-{
-  GtkWidget *widget;
-
-  widget = gtk_calendar_new ();
-
-  return new_widget_info ("calendar", widget, MEDIUM);
-}
-
 static WidgetInfo *
 create_window (void)
 {
@@ -1562,7 +1552,6 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_about_dialog ());
   retval = g_list_prepend (retval, create_accel_label ());
   retval = g_list_prepend (retval, create_button ());
-  retval = g_list_prepend (retval, create_caledar ());
   retval = g_list_prepend (retval, create_check_button ());
   retval = g_list_prepend (retval, create_color_button ());
   retval = g_list_prepend (retval, create_combo_box ());

examples/application1/Makefile.am

@@ -18,6 +18,7 @@ exampleapp_SOURCES = 				\
 	exampleappwin.c exampleappwin.h
 
 EXTRA_DIST = \
+	exampleapp.desktop \
 	meson.build
 
 -include $(top_srcdir)/git.mk

examples/listbox-dnd.c

@@ -14,6 +14,7 @@ drag_begin (GtkWidget      *widget,
   cairo_surface_t *surface;
   cairo_t *cr;
   int x, y;
+  double sx, sy;
 
   row = gtk_widget_get_ancestor (widget, GTK_TYPE_LIST_BOX_ROW);
   gtk_widget_get_allocation (row, &alloc);
@@ -25,7 +26,8 @@ drag_begin (GtkWidget      *widget,
   gtk_style_context_remove_class (gtk_widget_get_style_context (row), "drag-icon");
 
   gtk_widget_translate_coordinates (widget, row, 0, 0, &x, &y);
-  cairo_surface_set_device_offset (surface, -x, -y);
+  cairo_surface_get_device_scale (surface, &sx, &sy);
+  cairo_surface_set_device_offset (surface, -x * sx, -y * sy);
   gtk_drag_set_icon_surface (context, surface);
 
   cairo_destroy (cr);

gdk/Makefile.am

@@ -13,7 +13,7 @@ INTROSPECTION_COMPILER_ARGS = \
 
 SUBDIRS = $(GDK_BACKENDS) .
 
-DIST_SUBDIRS = win32 x11 quartz broadway wayland mir
+DIST_SUBDIRS = win32 x11 quartz broadway wayland
 
 CLEANFILES =
 
@@ -222,7 +222,6 @@ libgdk_3_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
-libgdk_3_la_CFLAGS += -xobjective-c
 libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
@@ -240,10 +239,6 @@ if USE_WAYLAND
 libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
 endif
 
-if USE_MIR
-libgdk_3_la_LIBADD += mir/libgdk-mir.la
-endif
-
 if HAVE_INTROSPECTION
 
 introspection_files = 		\
@@ -476,7 +471,7 @@ stamp-gc-h: $(top_builddir)/config.status
 # Resources
 #
 
-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
+glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl))
 
 gdk.gresource.xml: Makefile.am
 	$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
@@ -496,10 +491,10 @@ resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --gener
 
 gdkresources.h: gdk.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \
-		--sourcedir=$(srcdir) --c-name _gdk --generate-header --manual-register
+		--sourcedir=$(srcdir) --c-name _gdk --generate-header --manual-register --internal
 gdkresources.c: gdk.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \
-		--sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register
+		--sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register --internal
 
 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gdk-3
@@ -515,7 +510,7 @@ gdk_3_HEADERS_INST = \
 
 gdk_3_HEADERS_EXCLUDES = dummy
 
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 # Introspection Items for MSVC
@@ -523,13 +518,13 @@ MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir
 
 BASE_MSVC_GIR_CFLAGS =			\
 	$(GDK_CFLAGS_DEFINES)		\
-	-I../.. -I../../gdk -I.../../gdk/win32
+	-I.. -I../gdk -I../gdk/win32
 
 INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/build/win32/Gdk-3.0.gir.msvc.introspect	\
-	$(top_builddir)/build/win32/Gdk_3_0_gir_list			\
-	$(top_builddir)/build/win32/GdkWin32-3.0.gir.msvc.introspect	\
-	$(top_builddir)/build/win32/GdkWin32_3_0_gir_list
+	$(top_builddir)/win32/Gdk-3.0.gir.msvc.introspect	\
+	$(top_builddir)/win32/Gdk_3_0_gir_list			\
+	$(top_builddir)/win32/GdkWin32-3.0.gir.msvc.introspect	\
+	$(top_builddir)/win32/GdkWin32_3_0_gir_list
 
 Gdk_3_0_gir_MSVC_FILES = $(introspection_files)
 Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES)
@@ -547,15 +542,15 @@ GdkWin32_3_0_gir_MSVC_SCANNERFLAGS =	\
 	--c-include="gdk/gdkwin32.h"	\
 	--include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir'
 
-include $(top_srcdir)/build/Makefile.msvc-introspection
+include $(top_srcdir)/win32/Makefile.msvc-introspection
 
 else
 INTROSPECTION_INTERMEDIATE_ITEMS =
 endif
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gdk-3.vcproj	\
-	$(top_builddir)/build/win32/vs9/gdk-3.headers	\
+	$(top_builddir)/win32/vs9/gdk-3.vcproj	\
+	$(top_builddir)/win32/vs9/gdk-3.headers	\
 	$(INTROSPECTION_INTERMEDIATE_ITEMS)
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h

gdk/broadway/Makefile.am

@@ -126,11 +126,11 @@ gdk3_broadway_HEADERS_EXCLUDES = dummy
 broadwayd_FILES = $(broadwayd_SOURCES)
 broadwayd_EXCLUDES = dummy
 
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gdk3-broadway.vcproj		\
-	$(top_builddir)/build/win32/vs9/broadwayd.vcproj		\
-	$(top_builddir)/build/win32/vs9/gdk3-broadway.headers
+	$(top_builddir)/win32/vs9/gdk3-broadway.vcproj		\
+	$(top_builddir)/win32/vs9/broadwayd.vcproj		\
+	$(top_builddir)/win32/vs9/gdk3-broadway.headers
 
 -include $(top_srcdir)/git.mk

gdk/gdk.c

@@ -104,14 +104,6 @@
  * Use this macro to guard code that is specific to the Wayland backend.
  */
 
-/**
- * GDK_DISABLE_DEPRECATION_WARNINGS:
- *
- * A macro that should be defined before including the gdk.h header.
- * If it is defined, no compiler warnings will be produced for uses
- * of deprecated GDK APIs.
- */
-
 typedef struct _GdkPredicate  GdkPredicate;
 
 struct _GdkPredicate

gdk/gdkcursor.c

@@ -226,7 +226,7 @@ gdk_cursor_get_cursor_type (GdkCursor *cursor)
  *
  * Creates a new cursor from the set of builtin cursors.
  *
- * Returns: a new #GdkCursor
+ * Returns: (nullable) (transfer full): a new #GdkCursor, or %NULL on failure
  *
  * Since: 2.2
  **/

gdk/gdkdisplay.c

@@ -278,6 +278,7 @@ free_pointer_info (GdkPointerWindowInfo *info)
 {
   if (info->toplevel_under_pointer)
     g_object_unref (info->toplevel_under_pointer);
+  g_clear_object (&info->last_slave);
   g_slice_free (GdkPointerWindowInfo, info);
 }
 

gdk/gdkdisplaymanager.c

@@ -38,12 +38,6 @@
 #endif
 
 #ifdef GDK_WINDOWING_QUARTZ
-/* When the gdk_quartz_display_open function is removed We can
- * immediately include gdkquartzdisplaymanager.h here instead of
- * gdkprivate-quartz.h so that we won’t have to enable -xobjective-c
- * for the “generic” GDK source code.
- * #include "quartz/gdkquartzdisplaymanager.h"
- */
 #include "quartz/gdkprivate-quartz.h"
 #endif
 
@@ -60,10 +54,6 @@
 #include "wayland/gdkprivate-wayland.h"
 #endif
 
-#ifdef GDK_WINDOWING_MIR
-#include "mir/gdkmir-private.h"
-#endif
-
 /**
  * SECTION:gdkdisplaymanager
  * @Short_description: Maintains a list of all open GdkDisplays
@@ -276,9 +266,6 @@ static GdkBackend gdk_backends[] = {
 #ifdef GDK_WINDOWING_WAYLAND
   { "wayland",  _gdk_wayland_display_open },
 #endif
-#ifdef GDK_WINDOWING_MIR
-  { "mir",      _gdk_mir_display_open },
-#endif
 #ifdef GDK_WINDOWING_X11
   { "x11",      _gdk_x11_display_open },
 #endif

gdk/gdkevents.c

@@ -585,7 +585,7 @@ gdk_event_new (GdkEventType type)
   return new_event;
 }
 
-static gboolean
+gboolean
 gdk_event_is_allocated (const GdkEvent *event)
 {
   if (event_hash)
@@ -663,6 +663,11 @@ gdk_event_copy (const GdkEvent *event)
       new_private->source_device = private->source_device ? g_object_ref (private->source_device) : NULL;
       new_private->seat = private->seat;
       new_private->tool = private->tool;
+
+#ifdef GDK_WINDOWING_WIN32
+      new_private->translation_len = private->translation_len;
+      new_private->translation = g_memdup (private->translation, private->translation_len * sizeof (private->translation[0]));
+#endif
     }
 
   switch (event->any.type)
@@ -767,6 +772,9 @@ gdk_event_free (GdkEvent *event)
       private = (GdkEventPrivate *) event;
       g_clear_object (&private->device);
       g_clear_object (&private->source_device);
+#ifdef GDK_WINDOWING_WIN32
+      g_free (private->translation);
+#endif
     }
 
   switch (event->any.type)
@@ -1363,7 +1371,45 @@ gdk_event_get_keycode (const GdkEvent *event,
  *
  * Extracts the scroll direction from an event.
  *
+ * If @event is not of type %GDK_SCROLL, the contents of @direction
+ * are undefined.
+ *
+ * If you wish to handle both discrete and smooth scrolling, you
+ * should check the return value of this function, or of
+ * gdk_event_get_scroll_deltas(); for instance:
+ *
+ * |[<!-- language="C" -->
+ *   GdkScrollDirection direction;
+ *   double vscroll_factor = 0.0;
+ *   double x_scroll, y_scroll;
+ *
+ *   if (gdk_event_get_scroll_direction (event, &direction))
+ *     {
+ *       // Handle discrete scrolling with a known constant delta;
+ *       const double delta = 12.0;
+ *
+ *       switch (direction)
+ *         {
+ *         case GDK_SCROLL_UP:
+ *           vscroll_factor = -delta;
+ *           break;
+ *         case GDK_SCROLL_DOWN:
+ *           vscroll_factor = delta;
+ *           break;
+ *         default:
+ *           // no scrolling
+ *           break;
+ *         }
+ *     }
+ *   else if (gdk_event_get_scroll_deltas (event, &x_scroll, &y_scroll))
+ *     {
+ *       // Handle smooth scrolling directly
+ *       vscroll_factor = y_scroll;
+ *     }
+ * ]|
+ *
  * Returns: %TRUE if the event delivered a scroll direction
+ *   and %FALSE otherwise
  *
  * Since: 3.2
  */
@@ -1401,7 +1447,10 @@ gdk_event_get_scroll_direction (const GdkEvent *event,
  *
  * Retrieves the scroll deltas from a #GdkEvent
  *
+ * See also: gdk_event_get_scroll_direction()
+ *
  * Returns: %TRUE if the event contains smooth scroll information
+ *   and %FALSE otherwise
  *
  * Since: 3.4
  **/
@@ -2523,4 +2572,4 @@ gdk_event_get_scancode (GdkEvent *event)
 
   private = (GdkEventPrivate *) event;
   return private->key_scancode;
-}
+}

gdk/gdkframeclock.c

@@ -505,11 +505,15 @@ _gdk_frame_clock_debug_print_timings (GdkFrameClock   *clock,
   GString *str;
 
   gint64 previous_frame_time = 0;
+  gint64 previous_smoothed_frame_time = 0;
   GdkFrameTimings *previous_timings = gdk_frame_clock_get_timings (clock,
                                                                    timings->frame_counter - 1);
 
   if (previous_timings != NULL)
-    previous_frame_time = previous_timings->frame_time;
+    {
+      previous_frame_time = previous_timings->frame_time;
+      previous_smoothed_frame_time = previous_timings->smoothed_frame_time;
+    }
 
   str = g_string_new ("");
 
@@ -518,6 +522,9 @@ _gdk_frame_clock_debug_print_timings (GdkFrameClock   *clock,
     {
       g_string_append_printf (str, " interval=%-4.1f", (timings->frame_time - previous_frame_time) / 1000.);
       g_string_append_printf (str, timings->slept_before ?  " (sleep)" : "        ");
+      g_string_append_printf (str, " smoothed=%4.1f / %-4.1f",
+                              (timings->smoothed_frame_time - timings->frame_time) / 1000.,
+                              (timings->smoothed_frame_time - previous_smoothed_frame_time) / 1000.);
     }
   if (timings->layout_start_time != 0)
     g_string_append_printf (str, " layout_start=%-4.1f", (timings->layout_start_time - timings->frame_time) / 1000.);
@@ -525,6 +532,8 @@ _gdk_frame_clock_debug_print_timings (GdkFrameClock   *clock,
     g_string_append_printf (str, " paint_start=%-4.1f", (timings->paint_start_time - timings->frame_time) / 1000.);
   if (timings->frame_end_time != 0)
     g_string_append_printf (str, " frame_end=%-4.1f", (timings->frame_end_time - timings->frame_time) / 1000.);
+  if (timings->drawn_time != 0)
+    g_string_append_printf (str, " drawn=%-4.1f", (timings->drawn_time - timings->frame_time) / 1000.);
   if (timings->presentation_time != 0)
     g_string_append_printf (str, " present=%-4.1f", (timings->presentation_time - timings->frame_time) / 1000.);
   if (timings->predicted_presentation_time != 0)
@@ -566,16 +575,12 @@ gdk_frame_clock_get_refresh_info (GdkFrameClock *frame_clock,
                                   gint64        *presentation_time_return)
 {
   gint64 frame_counter;
+  gint64 default_refresh_interval = DEFAULT_REFRESH_INTERVAL;
 
   g_return_if_fail (GDK_IS_FRAME_CLOCK (frame_clock));
 
   frame_counter = gdk_frame_clock_get_frame_counter (frame_clock);
 
-  if (presentation_time_return)
-    *presentation_time_return = 0;
-  if (refresh_interval_return)
-    *refresh_interval_return = DEFAULT_REFRESH_INTERVAL;
-
   while (TRUE)
     {
       GdkFrameTimings *timings = gdk_frame_clock_get_timings (frame_clock, frame_counter);
@@ -583,19 +588,21 @@ gdk_frame_clock_get_refresh_info (GdkFrameClock *frame_clock,
       gint64 refresh_interval;
 
       if (timings == NULL)
-        return;
+        break;
 
       refresh_interval = timings->refresh_interval;
       presentation_time = timings->presentation_time;
 
+      if (refresh_interval == 0)
+        refresh_interval = default_refresh_interval;
+      else
+        default_refresh_interval = refresh_interval;
+
       if (presentation_time != 0)
         {
           if (presentation_time > base_time - MAX_HISTORY_AGE &&
               presentation_time_return)
             {
-              if (refresh_interval == 0)
-                refresh_interval = DEFAULT_REFRESH_INTERVAL;
-
               if (refresh_interval_return)
                 *refresh_interval_return = refresh_interval;
 
@@ -604,13 +611,20 @@ gdk_frame_clock_get_refresh_info (GdkFrameClock *frame_clock,
 
               if (presentation_time_return)
                 *presentation_time_return = presentation_time;
+
+              return;
             }
 
-          return;
+          break;
         }
 
       frame_counter--;
     }
+
+  if (presentation_time_return)
+    *presentation_time_return = 0;
+  if (refresh_interval_return)
+    *refresh_interval_return = default_refresh_interval;
 }
 
 void

gdk/gdkframeclockidle.c

@@ -36,10 +36,25 @@
 
 #define FRAME_INTERVAL 16667 /* microseconds */
 
+typedef enum {
+  SMOOTH_PHASE_STATE_VALID = 0,    /* explicit, since we count on zero-init */
+  SMOOTH_PHASE_STATE_AWAIT_FIRST,
+  SMOOTH_PHASE_STATE_AWAIT_DRAWN,
+} SmoothDeltaState;
+
 struct _GdkFrameClockIdlePrivate
 {
-  gint64 frame_time;
-  gint64 min_next_frame_time;
+  gint64 frame_time;                   /* The exact time we last ran the clock cycle, or 0 if never */
+  gint64 smoothed_frame_time_base;     /* A grid-aligned version of frame_time (grid size == refresh period), never more than half a grid from frame_time */
+  gint64 smoothed_frame_time_period;   /* The grid size that smoothed_frame_time_base is aligned to */
+  gint64 smoothed_frame_time_reported; /* Ensures we are always monotonic */
+  gint64 smoothed_frame_time_phase;    /* The offset of the first reported frame time, in the current animation sequence, from the preceding vsync */
+  gint64 min_next_frame_time;          /* We're not synced to vblank, so wait at least until this before next cycle to avoid busy looping */
+  SmoothDeltaState smooth_phase_state; /* The state of smoothed_frame_time_phase - is it valid, awaiting vsync etc. Thanks to zero-init, the initial value
+                                          of smoothed_frame_time_phase is `0`. This is valid, since we didn't get a "frame drawn" event yet. Accordingly,
+                                          the initial value of smooth_phase_state is SMOOTH_PHASE_STATE_VALID. See the comment in gdk_frame_clock_paint_idle()
+                                          for details. */
+
   gint64 sleep_serial;
 #ifdef G_ENABLE_DEBUG
   gint64 freeze_time;
@@ -54,6 +69,7 @@ struct _GdkFrameClockIdlePrivate
   GdkFrameClockPhase phase;
 
   guint in_paint_idle : 1;
+  guint paint_is_thaw : 1;
 #ifdef G_OS_WIN32
   guint begin_period : 1;
 #endif
@@ -124,8 +140,8 @@ gdk_frame_clock_idle_init (GdkFrameClockIdle *frame_clock_idle)
   frame_clock_idle->priv = priv =
     gdk_frame_clock_idle_get_instance_private (frame_clock_idle);
 
-  priv->frame_time = g_get_monotonic_time (); /* more sane than zero */
   priv->freeze_count = 0;
+  priv->smoothed_frame_time_period = FRAME_INTERVAL;
 }
 
 static void
@@ -156,44 +172,107 @@ gdk_frame_clock_idle_dispose (GObject *object)
   G_OBJECT_CLASS (gdk_frame_clock_idle_parent_class)->dispose (object);
 }
 
+/* Note: This is never called on first frame, so
+ * smoothed_frame_time_base != 0 and we have a valid frame_interval. */
 static gint64
-compute_frame_time (GdkFrameClockIdle *idle)
+compute_smooth_frame_time (GdkFrameClock *clock,
+                           gint64 new_frame_time,
+                           gboolean new_frame_time_is_vsync_related,
+                           gint64 smoothed_frame_time_base,
+                           gint64 frame_interval)
 {
-  GdkFrameClockIdlePrivate *priv = idle->priv;
-  gint64 computed_frame_time;
+  GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (clock)->priv;
+  int frames_passed;
+  gint64 new_smoothed_time;
+  gint64 current_error;
+  gint64 correction_magnitude;
 
-  computed_frame_time = g_get_monotonic_time ();
+  /* Consecutive frame, assume it is an integer number of frames later, so round to nearest such */
+  /* NOTE:  This is >= 0, because smoothed_frame_time_base is < frame_interval/2 from old_frame_time
+   *        and new_frame_time >= old_frame_time. */
+  frames_passed = (new_frame_time - smoothed_frame_time_base + frame_interval / 2) / frame_interval;
 
-  /* ensure monotonicity of frame time */
-  if (computed_frame_time <= priv->frame_time)
-      computed_frame_time = priv->frame_time + 1;
+  /* We use an approximately whole number of frames in the future from
+   * last smoothed frame time. This way we avoid minor jitter in the
+   * frame times making the animation speed uneven, but still animate
+   * evenly in case of whole frame skips. */
+  new_smoothed_time = smoothed_frame_time_base + frames_passed * frame_interval;
 
-  return computed_frame_time;
+  /* However, sometimes the smoothed time is too much off from the
+   * real time. For example, if the first frame clock cycle happened
+   * not due to a frame rendering but an input event, then
+   * new_frame_time could happen to be near the middle between two
+   * frames. If that happens and we then start regularly animating at
+   * the refresh_rate, then the jitter in the real time may cause us
+   * to randomly sometimes round up, and sometimes down.
+   *
+   * To combat this we converge the smooth time towards the real time
+   * in a way that is slow when they are near and fast when they are
+   * far from each other.
+   *
+   * This is done by using the square of the error as the correction
+   * magnitude. I.e. if the error is 0.5 frame, we correct by
+   * 0.5*0.5=0.25 frame, if the error is 0.25 we correct by 0.125, if
+   * the error is 0.1, frame we correct by 0.01 frame, etc.
+   *
+   * The actual computation is:
+   *   (current_error/frame_interval)*(current_error/frame_interval)*frame_interval
+   * But this can be simplified as below.
+   *
+   * Note: We only do this correction if the new frame is caused by a
+   * thaw of the frame clock, so that we know the time is actually
+   * related to the physical vblank. For frameclock cycles triggered
+   * by other events we always step up in whole frames from the last
+   * reported time.
+   */
+  if (new_frame_time_is_vsync_related)
+    {
+      current_error = new_smoothed_time - new_frame_time;
+      correction_magnitude = current_error * current_error / frame_interval; /* Note, this is always > 0 due to the square */
+      if (current_error > 0)
+        new_smoothed_time -= correction_magnitude;
+      else
+        new_smoothed_time += correction_magnitude;
+    }
+
+  /* Ensure we're always monotonic  */
+  if (new_smoothed_time <= priv->smoothed_frame_time_reported)
+    new_smoothed_time = priv->smoothed_frame_time_reported;
+
+  return new_smoothed_time;
 }
 
 static gint64
 gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock)
 {
   GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (clock)->priv;
-  gint64 computed_frame_time;
+  gint64 now;
+  gint64 new_smoothed_time;
 
   /* can't change frame time during a paint */
   if (priv->phase != GDK_FRAME_CLOCK_PHASE_NONE &&
-      priv->phase != GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS)
-    return priv->frame_time;
+      priv->phase != GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS &&
+      (priv->phase != GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT || priv->in_paint_idle))
+    return priv->smoothed_frame_time_base;
 
-  /* Outside a paint, pick something close to "now" */
-  computed_frame_time = compute_frame_time (GDK_FRAME_CLOCK_IDLE (clock));
+  /* Outside a paint, pick something smoothed close to now */
+  now = g_get_monotonic_time ();
 
-  /* 16ms is 60fps. We only update frame time that often because we'd
-   * like to try to keep animations on the same start times.
-   * get_frame_time() would normally be used outside of a paint to
-   * record an animation start time for example.
-   */
-  if ((computed_frame_time - priv->frame_time) > FRAME_INTERVAL)
-    priv->frame_time = computed_frame_time;
+  /* First time frame, just return something */
+  if (priv->smoothed_frame_time_base == 0)
+    {
+      priv->smoothed_frame_time_reported = now;
+      return now;
+    }
 
-  return priv->frame_time;
+  /* Since time is monotonic this is <= what we will pick for the next cycle, but
+     more likely than not it will be equal if we're doing a constant animation. */
+  new_smoothed_time = compute_smooth_frame_time (clock, now, FALSE,
+                                                 priv->smoothed_frame_time_base,
+                                                 priv->smoothed_frame_time_period);
+
+  priv->smoothed_frame_time_reported = new_smoothed_time;
+  return new_smoothed_time;
 }
 
 #define RUN_FLUSH_IDLE(priv)                                            \
@@ -211,7 +290,8 @@ gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock)
     (priv)->updating_count > 0))
 
 static void
-maybe_start_idle (GdkFrameClockIdle *clock_idle)
+maybe_start_idle (GdkFrameClockIdle *clock_idle,
+                  gboolean caused_by_thaw)
 {
   GdkFrameClockIdlePrivate *priv = clock_idle->priv;
 
@@ -221,7 +301,7 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
 
       if (priv->min_next_frame_time != 0)
         {
-          gint64 now = compute_frame_time (clock_idle);
+          gint64 now = g_get_monotonic_time ();
           gint64 min_interval_us = MAX (priv->min_next_frame_time, now) - now;
           min_interval = (min_interval_us + 500) / 1000;
         }
@@ -239,6 +319,7 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
       if (!priv->in_paint_idle &&
 	  priv->paint_idle_id == 0 && RUN_PAINT_IDLE (priv))
         {
+          priv->paint_is_thaw = caused_by_thaw;
           priv->paint_idle_id = gdk_threads_add_timeout_full (GDK_PRIORITY_REDRAW,
                                                               min_interval,
                                                               gdk_frame_clock_paint_idle,
@@ -267,23 +348,6 @@ maybe_stop_idle (GdkFrameClockIdle *clock_idle)
     }
 }
 
-static gint64
-compute_min_next_frame_time (GdkFrameClockIdle *clock_idle,
-                             gint64             last_frame_time)
-{
-  gint64 presentation_time;
-  gint64 refresh_interval;
-
-  gdk_frame_clock_get_refresh_info (GDK_FRAME_CLOCK (clock_idle),
-                                    last_frame_time,
-                                    &refresh_interval, &presentation_time);
-
-  if (presentation_time == 0)
-    return last_frame_time + refresh_interval;
-  else
-    return presentation_time + refresh_interval / 2;
-}
-
 static gboolean
 gdk_frame_clock_flush_idle (void *data)
 {
@@ -310,6 +374,25 @@ gdk_frame_clock_flush_idle (void *data)
   return FALSE;
 }
 
+/*
+ * Returns the positive remainder.
+ *
+ * As an example, lets consider (-5) % 16:
+ *
+ *   (-5) % 16 = (0 * 16) + (-5) = -5
+ *
+ * If we only want positive remainders, we can instead calculate
+ *
+ *   (-5) % 16 = (1 * 16) + (-5) = 11
+ *
+ * The built-in `%` operator returns the former, positive_modulo() returns the latter.
+ */
+static int
+positive_modulo (int i, int n)
+{
+  return (i % n + n) % n;
+}
+
 static gboolean
 gdk_frame_clock_paint_idle (void *data)
 {
@@ -343,39 +426,103 @@ gdk_frame_clock_paint_idle (void *data)
           if (priv->freeze_count == 0)
             {
               gint64 frame_interval = FRAME_INTERVAL;
-              gint64 reset_frame_time;
-              gint64 smoothest_frame_time;
-              gint64 frame_time_error;
-              GdkFrameTimings *prev_timings =
-                gdk_frame_clock_get_current_timings (clock);
+              GdkFrameTimings *prev_timings = gdk_frame_clock_get_current_timings (clock);
 
               if (prev_timings && prev_timings->refresh_interval)
                 frame_interval = prev_timings->refresh_interval;
 
-              /* We are likely not getting precisely even callbacks in real
-               * time, particularly if the event loop is busy.
-               * This is a documented limitation in the precision of
-               * gdk_threads_add_timeout_full and g_timeout_add_full.
+              priv->frame_time = g_get_monotonic_time ();
+
+              /*
+               * The first clock cycle of an animation might have been triggered by some external event. An external
+               * event can be an input event, an expired timer, data arriving over the network etc. This can happen at
+               * any time, so the cycle could have been scheduled at some random time rather then immediately after a
+               * frame completion. The offset between the start of the first animation cycle and the preceding vsync is
+               * called the "phase" of the clock cycle start time (not to be confused with the phase of the frame
+               * clock).
                *
-               * In order to avoid this imprecision from compounding between
-               * frames and affecting visual smoothness, we correct frame_time
-               * to more precisely match the even refresh interval of the
-               * physical display. This also means we proactively avoid (most)
-               * missed frames before they occur.
+               * In this first clock cycle, the "smooth" frame time is simply the time when the cycle was started. This
+               * could be followed by several cycles which are not vsync-related. As long as we don't get a "frame
+               * drawn" signal from the compositor, the clock cycles will occur every about frame_interval. Once we do
+               * get a "frame drawn" signal, from this point on the frame clock cycles will start shortly after the
+               * corresponding vsync signals, again every about frame_interval. The first vsync-related clock cycle
+               * might occur less than a refresh interval away from the last non-vsync-related cycle. See the diagram
+               * below for details. So while the cadence stays the same - a frame clock cycle every about frame_interval
+               * - the phase of the cycles start time has changed.
+               *
+               * Since we might have already reported the frame time to the application in the previous clock cycles, we
+               * have to adjust future reported frame times. We want the first vsync-related smooth time to be separated
+               * by exactly 1 frame_interval from the previous one, in order to maintain the regularity of the reported
+               * frame times. To achieve that, from this point on we add the phase of the first clock cycle start time to
+               * the smooth time. In order to compute that phase, accounting for possible skipped frames (e.g. due to
+               * compositor stalls), we want the following to be true:
+               *
+               *   first_vsync_smooth_time = last_non_vsync_smooth_time + frame_interval * (1 + frames_skipped)
+               *
+               * We can assign the following known/desired values to the above equation:
+               *
+               *   last_non_vsync_smooth_time = smoothed_frame_time_base
+               *   first_vsync_smooth_time = frame_time + smoothed_frame_time_phase
+               *
+               * That leads us to the following, from which we can extract smoothed_frame_time_phase:
+               *
+               *   frame_time + smoothed_frame_time_phase = smoothed_frame_time_base +
+               *                                            frame_interval * (1 + frames_skipped)
+               *
+               * In the following diagram, '|' mark a vsync, '*' mark the start of a clock cycle, '+' is the adjusted
+               * frame time, '!' marks the reception of "frame drawn" events from the compositor. Note that the clock
+               * cycle cadence changed after the first vsync-related cycle. This cadence is kept even if we don't
+               * receive a 'frame drawn' signal in a subsequent frame, since then we schedule the clock at intervals of
+               * refresh_interval.
+               *
+               * vsync             |           |           |           |           |           |...
+               * frame drawn       |           |           |!          |!          |           |...
+               * cycle start       |       *   |       *   |*          |*          |*          |...
+               * adjusted times    |       *   |       *   |       +   |       +   |       +   |...
+               * phase                                      ^------^
                */
-              smoothest_frame_time = priv->frame_time + frame_interval;
-              reset_frame_time = compute_frame_time (clock_idle);
-              frame_time_error = ABS (reset_frame_time - smoothest_frame_time);
-              if (frame_time_error >= frame_interval)
-                priv->frame_time = reset_frame_time;
+              if (priv->smooth_phase_state == SMOOTH_PHASE_STATE_AWAIT_FIRST)
+                {
+                  /* First animation cycle - usually unrelated to vsync */
+                  priv->smoothed_frame_time_base = 0;
+                  priv->smoothed_frame_time_phase = 0;
+                  priv->smooth_phase_state = SMOOTH_PHASE_STATE_AWAIT_DRAWN;
+                }
+              else if (priv->smooth_phase_state == SMOOTH_PHASE_STATE_AWAIT_DRAWN &&
+                       priv->paint_is_thaw)
+                {
+                  /* First vsync-related animation cycle, we can now compute the phase. We want the phase to satisfy
+                     0 <= phase < frame_interval */
+                  priv->smoothed_frame_time_phase =
+                      positive_modulo (priv->smoothed_frame_time_base - priv->frame_time,
+                                       frame_interval);
+                  priv->smooth_phase_state = SMOOTH_PHASE_STATE_VALID;
+                }
+
+              if (priv->smoothed_frame_time_base == 0)
+                {
+                  /* First frame ever, or first cycle in a new animation sequence. Ensure monotonicity */
+                  priv->smoothed_frame_time_base = MAX (priv->frame_time, priv->smoothed_frame_time_reported);
+                }
               else
-                priv->frame_time = smoothest_frame_time;
+                {
+                  /* compute_smooth_frame_time() ensures monotonicity */
+                  priv->smoothed_frame_time_base =
+                      compute_smooth_frame_time (clock, priv->frame_time + priv->smoothed_frame_time_phase,
+                                                 priv->paint_is_thaw,
+                                                 priv->smoothed_frame_time_base,
+                                                 priv->smoothed_frame_time_period);
+                }
+
+              priv->smoothed_frame_time_period = frame_interval;
+              priv->smoothed_frame_time_reported = priv->smoothed_frame_time_base;
 
               _gdk_frame_clock_begin_frame (clock);
               /* Note "current" is different now so timings != prev_timings */
               timings = gdk_frame_clock_get_current_timings (clock);
 
               timings->frame_time = priv->frame_time;
+              timings->smoothed_frame_time = priv->smoothed_frame_time_base;
               timings->slept_before = priv->sleep_serial != get_sleep_serial ();
 
               priv->phase = GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT;
@@ -496,9 +643,20 @@ gdk_frame_clock_paint_idle (void *data)
    */
   if (priv->freeze_count == 0)
     {
-      priv->min_next_frame_time = compute_min_next_frame_time (clock_idle,
-                                                               priv->frame_time);
-      maybe_start_idle (clock_idle);
+      /*
+       * If we don't receive "frame drawn" events, smooth_cycle_start will simply be advanced in constant increments of
+       * the refresh interval. That way we get absolute target times for the next cycles, which should prevent skewing
+       * in the scheduling of the frame clock.
+       *
+       * Once we do receive "frame drawn" events, smooth_cycle_start will track the vsync, and do so in a more stable
+       * way compared to frame_time. If we then no longer receive "frame drawn" events, smooth_cycle_start will again be
+       * simply advanced in increments of the refresh interval, but this time we are in sync with the vsync. If we start
+       * receiving "frame drawn" events shortly after loosing them, then we should still be in sync.
+       */
+      gint64 smooth_cycle_start = priv->smoothed_frame_time_base - priv->smoothed_frame_time_phase;
+      priv->min_next_frame_time = smooth_cycle_start + priv->smoothed_frame_time_period;
+
+      maybe_start_idle (clock_idle, FALSE);
     }
 
   if (priv->freeze_count == 0)
@@ -515,7 +673,7 @@ gdk_frame_clock_idle_request_phase (GdkFrameClock      *clock,
   GdkFrameClockIdlePrivate *priv = clock_idle->priv;
 
   priv->requested |= phase;
-  maybe_start_idle (clock_idle);
+  maybe_start_idle (clock_idle, FALSE);
 }
 
 static void
@@ -533,8 +691,13 @@ gdk_frame_clock_idle_begin_updating (GdkFrameClock *clock)
     }
 #endif
 
+  if (priv->updating_count == 0)
+    {
+      priv->smooth_phase_state = SMOOTH_PHASE_STATE_AWAIT_FIRST;
+    }
+
   priv->updating_count++;
-  maybe_start_idle (clock_idle);
+  maybe_start_idle (clock_idle, FALSE);
 }
 
 static void
@@ -548,6 +711,11 @@ gdk_frame_clock_idle_end_updating (GdkFrameClock *clock)
   priv->updating_count--;
   maybe_stop_idle (clock_idle);
 
+  if (priv->updating_count == 0)
+    {
+      priv->smooth_phase_state = SMOOTH_PHASE_STATE_VALID;
+    }
+
 #ifdef G_OS_WIN32
   if (priv->updating_count == 0 && priv->begin_period)
     {
@@ -586,7 +754,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
   priv->freeze_count--;
   if (priv->freeze_count == 0)
     {
-      maybe_start_idle (clock_idle);
+      maybe_start_idle (clock_idle, TRUE);
       /* If nothing is requested so we didn't start an idle, we need
        * to skip to the end of the state chain, since the idle won't
        * run and do it for us.

gdk/gdkframeclockprivate.h

@@ -89,6 +89,7 @@ struct _GdkFrameTimings
   gint64 frame_counter;
   guint64 cookie;
   gint64 frame_time;
+  gint64 smoothed_frame_time;
   gint64 drawn_time;
   gint64 presentation_time;
   gint64 refresh_interval;

gdk/gdkglcontext.c

@@ -812,10 +812,10 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
     }
   else
     {
-      has_npot = epoxy_has_gl_extension ("GL_ARB_texture_non_power_of_two");
-      has_texture_rectangle = epoxy_has_gl_extension ("GL_ARB_texture_rectangle");
+      has_npot = priv->gl_version >= 20 || epoxy_has_gl_extension ("GL_ARB_texture_non_power_of_two");
+      has_texture_rectangle = priv->gl_version >= 31 || epoxy_has_gl_extension ("GL_ARB_texture_rectangle");
 
-      priv->has_gl_framebuffer_blit = epoxy_has_gl_extension ("GL_EXT_framebuffer_blit");
+      priv->has_gl_framebuffer_blit = priv->gl_version >= 30 || epoxy_has_gl_extension ("GL_EXT_framebuffer_blit");
       priv->has_frame_terminator = epoxy_has_gl_extension ("GL_GREMEDY_frame_terminator");
       priv->has_unpack_subimage = TRUE;
 

gdk/gdkinternals.h

@@ -192,6 +192,11 @@ struct _GdkEventPrivate
   GdkSeat   *seat;
   GdkDeviceTool *tool;
   guint16    key_scancode;
+
+#ifdef GDK_WINDOWING_WIN32
+  gunichar2 *translation;
+  guint      translation_len;
+#endif
 };
 
 typedef struct _GdkWindowPaint GdkWindowPaint;
@@ -413,6 +418,10 @@ void     gdk_event_set_scancode        (GdkEvent *event,
 void     gdk_event_set_seat              (GdkEvent *event,
                                           GdkSeat  *seat);
 
+/* The IME IM module needs this symbol exported. */
+_GDK_EXTERN
+gboolean gdk_event_is_allocated      (const GdkEvent *event);
+
 void   _gdk_event_emit               (GdkEvent   *event);
 GList* _gdk_event_queue_find_first   (GdkDisplay *display);
 void   _gdk_event_queue_remove_link  (GdkDisplay *display,

gdk/gdkkeysyms-compat.h

@@ -274,6 +274,10 @@
 #define GDK_dead_invertedbreve 0xfe6d
 #define GDK_dead_belowcomma 0xfe6e
 #define GDK_dead_currency 0xfe6f
+#define GDK_dead_lowline 0xfe90
+#define GDK_dead_aboveverticalline 0xfe91
+#define GDK_dead_belowverticalline 0xfe92
+#define GDK_dead_longsolidusoverlay 0xfe93
 #define GDK_dead_a 0xfe80
 #define GDK_dead_A 0xfe81
 #define GDK_dead_e 0xfe82
@@ -2279,6 +2283,10 @@
 #define GDK_TouchpadOn 0x1008ffb0
 #define GDK_TouchpadOff 0x1008ffb1
 #define GDK_AudioMicMute 0x1008ffb2
+#define GDK_Keyboard 0x1008ffb3
+#define GDK_WWAN 0x1008ffb4
+#define GDK_RFKill 0x1008ffb5
+#define GDK_AudioPreset 0x1008ffb6
 #define GDK_Switch_VT_1 0x1008fe01
 #define GDK_Switch_VT_2 0x1008fe02
 #define GDK_Switch_VT_3 0x1008fe03

gdk/gdkkeysyms.h

@@ -283,6 +283,10 @@
 #define GDK_KEY_dead_invertedbreve 0xfe6d
 #define GDK_KEY_dead_belowcomma 0xfe6e
 #define GDK_KEY_dead_currency 0xfe6f
+#define GDK_KEY_dead_lowline 0xfe90
+#define GDK_KEY_dead_aboveverticalline 0xfe91
+#define GDK_KEY_dead_belowverticalline 0xfe92
+#define GDK_KEY_dead_longsolidusoverlay 0xfe93
 #define GDK_KEY_dead_a 0xfe80
 #define GDK_KEY_dead_A 0xfe81
 #define GDK_KEY_dead_e 0xfe82
@@ -2288,6 +2292,10 @@
 #define GDK_KEY_TouchpadOn 0x1008ffb0
 #define GDK_KEY_TouchpadOff 0x1008ffb1
 #define GDK_KEY_AudioMicMute 0x1008ffb2
+#define GDK_KEY_Keyboard 0x1008ffb3
+#define GDK_KEY_WWAN 0x1008ffb4
+#define GDK_KEY_RFKill 0x1008ffb5
+#define GDK_KEY_AudioPreset 0x1008ffb6
 #define GDK_KEY_Switch_VT_1 0x1008fe01
 #define GDK_KEY_Switch_VT_2 0x1008fe02
 #define GDK_KEY_Switch_VT_3 0x1008fe03

gdk/gdkoffscreenwindow.c

@@ -644,6 +644,16 @@ gdk_offscreen_window_set_wmfunctions (GdkWindow	    *window,
 {
 }
 
+static void
+gdk_offscreen_window_begin_move_drag (GdkWindow *window,
+                                      GdkDevice *device,
+                                      gint       button,
+                                      gint       root_x,
+                                      gint       root_y,
+                                      guint32    timestamp)
+{
+}
+
 static void
 gdk_offscreen_window_set_transient_for (GdkWindow *window,
 					GdkWindow *another)
@@ -754,7 +764,7 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
   impl_class->get_decorations = NULL;
   impl_class->set_functions = gdk_offscreen_window_set_wmfunctions;
   impl_class->begin_resize_drag = NULL;
-  impl_class->begin_move_drag = NULL;
+  impl_class->begin_move_drag = gdk_offscreen_window_begin_move_drag;
   impl_class->enable_synchronized_configure = gdk_offscreen_window_do_nothing;
   impl_class->configure_finished = NULL;
   impl_class->set_opacity = gdk_offscreen_window_set_opacity;

gdk/gdkseatdefault.c

@@ -396,6 +396,7 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat,
         priv->capabilities |= device_get_capability (GDK_DEVICE (l->data));
 
       gdk_seat_device_removed (GDK_SEAT (seat), device);
+      g_object_unref (device);
     }
   else if (g_list_find (priv->slave_keyboards, device))
     {
@@ -405,6 +406,7 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat,
         priv->capabilities &= ~GDK_SEAT_CAPABILITY_KEYBOARD;
 
       gdk_seat_device_removed (GDK_SEAT (seat), device);
+      g_object_unref (device);
     }
 }
 

gdk/gdkwindow.c

@@ -2664,6 +2664,7 @@ gdk_window_add_filter (GdkWindow     *window,
       if ((filter->function == function) && (filter->data == data))
         {
           filter->ref_count++;
+          filter->flags = 0;
           return;
         }
       tmp_list = tmp_list->next;
@@ -9930,7 +9931,7 @@ _gdk_windowing_got_event (GdkDisplay *display,
 
           if (source_device != pointer_info->last_slave &&
               gdk_device_get_device_type (source_device) == GDK_DEVICE_TYPE_SLAVE)
-            pointer_info->last_slave = source_device;
+            g_set_object (&pointer_info->last_slave, source_device);
           else if (pointer_info->last_slave)
             source_device = pointer_info->last_slave;
         }

gdk/meson.build

@@ -258,7 +258,7 @@ endif
 
 gdk_backends = []
 gdk_backends_gen_headers = []  # non-public generated headers
-foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11', 'mir']
+foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11']
   if get_variable('@0@_enabled'.format(backend))
     subdir(backend)
     gdk_deps += get_variable('gdk_@0@_deps'.format(backend))
@@ -286,20 +286,20 @@ if cc.get_id() == 'msvc'
   gdk_link_args += [ '-export:gdk_win32_display_manager_get_type' ]
 endif
 
-libgdk = shared_library('gdk-3',
-                        soversion: gtk_soversion,
-                        version: gtk_library_version,
-                        sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
-                        dependencies: gdk_deps,
-                        include_directories: [confinc, gdkx11_inc, wlinc],
-                        c_args: [
-                          '-DGDK_COMPILATION',
-                          '-DG_LOG_DOMAIN="Gdk"',
-                        ] + common_cflags,
-                        link_whole: gdk_backends,
-                        link_args: gdk_link_args,
-                        darwin_versions : gtk_osxversions,
-                        install: true)
+libgdk = library('gdk-3',
+                 soversion: gtk_soversion,
+                 version: gtk_library_version,
+                 sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
+                 dependencies: gdk_deps,
+                 include_directories: [confinc, gdkx11_inc, wlinc],
+                 c_args: [
+                   '-DGDK_COMPILATION',
+                   '-DG_LOG_DOMAIN="Gdk"',
+                 ] + common_cflags,
+                 link_whole: gdk_backends,
+                 link_args: gdk_link_args,
+                 darwin_versions : gtk_osxversions,
+                 install: true)
 
 gdk_dep_sources = [gdkconfig, gdkenum_h]
 # Introspection

gdk/mir/Makefile.am

@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-3.0/gdk/mir
-
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gdk\" \
-	-DG_LOG_USE_STRUCTURED=1	\
-	-DGDK_COMPILATION \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/gdk \
-	-I$(top_builddir)/gdk \
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEBUG_FLAGS) \
-	$(GDK_DEP_CFLAGS)
-
-LDADDS = $(GDK_DEP_LIBS)
-
-noinst_LTLIBRARIES = \
-	libgdk-mir.la
-
-libgdk_mir_la_SOURCES =	\
-	gdkmircursor.c \
-	gdkmirdevicemanager.c \
-	gdkmirdisplay.c \
-	gdkmireventsource.c	\
-	gdkmirglcontext.c \
-	gdkmirkeyboard.c \
-	gdkmirkeymap.c \
-	gdkmirpointer.c \
-	gdkmirscreen.c	\
-	gdkmirwindow.c	\
-	gdkmirwindowimpl.c	\
-	gdkmir-debug.c	\
-	gdkmir-private.h \
-	gdkmir.h
-
-libgdkinclude_HEADERS = \
-	gdkmir.h
-
-EXTRA_DIST += \
-	meson.build
-
--include $(top_srcdir)/git.mk

gdk/mir/gdkmir-debug.c

@@ -1,548 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * 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 "gdkmir-private.h"
-
-#include <mir_toolkit/events/window_placement.h>
-
-static void
-_gdk_mir_print_modifiers (unsigned int modifiers)
-{
-  g_printerr (" Modifiers");
-  if ((modifiers & mir_input_event_modifier_alt) != 0)
-    g_printerr (" alt");
-  if ((modifiers & mir_input_event_modifier_alt_left) != 0)
-    g_printerr (" alt-left");
-  if ((modifiers & mir_input_event_modifier_alt_right) != 0)
-    g_printerr (" alt-right");
-  if ((modifiers & mir_input_event_modifier_shift) != 0)
-    g_printerr (" shift");
-  if ((modifiers & mir_input_event_modifier_shift_left) != 0)
-    g_printerr (" shift-left");
-  if ((modifiers & mir_input_event_modifier_shift_right) != 0)
-    g_printerr (" shift-right");
-  if ((modifiers & mir_input_event_modifier_sym) != 0)
-    g_printerr (" sym");
-  if ((modifiers & mir_input_event_modifier_function) != 0)
-    g_printerr (" function");
-  if ((modifiers & mir_input_event_modifier_ctrl) != 0)
-    g_printerr (" ctrl");
-  if ((modifiers & mir_input_event_modifier_ctrl_left) != 0)
-    g_printerr (" ctrl-left");
-  if ((modifiers & mir_input_event_modifier_ctrl_right) != 0)
-    g_printerr (" ctrl-right");
-  if ((modifiers & mir_input_event_modifier_meta) != 0)
-    g_printerr (" meta");
-  if ((modifiers & mir_input_event_modifier_meta_left) != 0)
-    g_printerr (" meta-left");
-  if ((modifiers & mir_input_event_modifier_meta_right) != 0)
-    g_printerr (" meta-right");
-  if ((modifiers & mir_input_event_modifier_caps_lock) != 0)
-    g_printerr (" caps-lock");
-  if ((modifiers & mir_input_event_modifier_num_lock) != 0)
-    g_printerr (" num-lock");
-  if ((modifiers & mir_input_event_modifier_scroll_lock) != 0)
-    g_printerr (" scroll-lock");
-  g_printerr ("\n");
-}
-
-static void
-_gdk_mir_print_key_event (const MirInputEvent *event)
-{
-  const MirKeyboardEvent *keyboard_event = mir_input_event_get_keyboard_event (event);
-
-  if (!keyboard_event)
-    return;
-
-  g_printerr ("KEY\n");
-  g_printerr (" Device %lld\n", (long long int) mir_input_event_get_device_id (event));
-  g_printerr (" Action ");
-  switch (mir_keyboard_event_action (keyboard_event))
-    {
-    case mir_keyboard_action_down:
-      g_printerr ("down");
-      break;
-    case mir_keyboard_action_up:
-      g_printerr ("up");
-      break;
-    case mir_keyboard_action_repeat:
-      g_printerr ("repeat");
-      break;
-    default:
-      g_printerr ("%u", mir_keyboard_event_action (keyboard_event));
-      break;
-    }
-  g_printerr ("\n");
-  _gdk_mir_print_modifiers (mir_keyboard_event_modifiers (keyboard_event));
-  g_printerr (" Key Code %i\n", mir_keyboard_event_key_code (keyboard_event));
-  g_printerr (" Scan Code %i\n", mir_keyboard_event_scan_code (keyboard_event));
-  g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
-}
-
-static void
-_gdk_mir_print_touch_event (const MirInputEvent *event)
-{
-  const MirTouchEvent *touch_event = mir_input_event_get_touch_event (event);
-  guint i;
-  guint n;
-
-  if (!touch_event)
-    return;
-
-  g_printerr ("TOUCH\n");
-  g_printerr (" Device %lld\n", (long long int) mir_input_event_get_device_id (event));
-  g_printerr (" Event Time %lld\n", (long long int) mir_input_event_get_event_time (event));
-  _gdk_mir_print_modifiers (mir_touch_event_modifiers (touch_event));
-  n = mir_touch_event_point_count (touch_event);
-
-  for (i = 0; i < n; i++)
-    {
-      g_printerr (" [%u] (%u/%u) ", mir_touch_event_id (touch_event, i), i + 1, n);
-      switch (mir_touch_event_action (touch_event, i))
-        {
-        case mir_touch_action_down:
-          g_printerr ("Down");
-          break;
-        case mir_touch_action_up:
-          g_printerr ("Up");
-          break;
-        case mir_touch_action_change:
-          g_printerr ("Change");
-          break;
-        default:
-          g_printerr ("%u", mir_touch_event_action (touch_event, i));
-          break;
-        }
-      switch (mir_touch_event_tooltype (touch_event, i))
-        {
-        default:
-        case mir_touch_tooltype_unknown:
-          g_printerr (" ? ");
-          break;
-        case mir_touch_tooltype_finger:
-          g_printerr (" finger ");
-          break;
-        case mir_touch_tooltype_stylus:
-          g_printerr (" stylus ");
-          break;
-        }
-      g_printerr ("\n  x: %f y: %f P: %f A: %f B: %f d: %f\n",
-                  mir_touch_event_axis_value (touch_event, i, mir_touch_axis_x),
-                  mir_touch_event_axis_value (touch_event, i, mir_touch_axis_y),
-                  mir_touch_event_axis_value (touch_event, i, mir_touch_axis_pressure),
-                  mir_touch_event_axis_value (touch_event, i, mir_touch_axis_touch_major),
-                  mir_touch_event_axis_value (touch_event, i, mir_touch_axis_touch_minor),
-                  mir_touch_event_axis_value (touch_event, i, mir_touch_axis_size));
-    }
-}
-
-static void
-_gdk_mir_print_motion_event (const MirInputEvent *event)
-{
-  const MirPointerEvent *pointer_event = mir_input_event_get_pointer_event (event);
-
-  if (!pointer_event)
-    return;
-
-  g_printerr ("MOTION\n");
-  g_printerr (" Device %lld\n", (long long int) mir_input_event_get_device_id (event));
-  g_printerr (" Action ");
-  switch (mir_pointer_event_action (pointer_event))
-    {
-    case mir_pointer_action_button_down:
-      g_printerr ("down");
-      break;
-    case mir_pointer_action_button_up:
-      g_printerr ("up");
-      break;
-    case mir_pointer_action_enter:
-      g_printerr ("enter");
-      break;
-    case mir_pointer_action_leave:
-      g_printerr ("leave");
-      break;
-    case mir_pointer_action_motion:
-      g_printerr ("motion");
-      break;
-    default:
-      g_printerr ("%u", mir_pointer_event_action (pointer_event));
-    }
-  g_printerr ("\n");
-  _gdk_mir_print_modifiers (mir_pointer_event_modifiers (pointer_event));
-  g_printerr (" Button State");
-  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_primary))
-    g_printerr (" primary");
-  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_secondary))
-    g_printerr (" secondary");
-  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_tertiary))
-    g_printerr (" tertiary");
-  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_back))
-    g_printerr (" back");
-  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_forward))
-    g_printerr (" forward");
-  g_printerr ("\n");
-  g_printerr (" Offset (%f, %f)\n", mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_x),
-                                    mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_y));
-  g_printerr (" Scroll (%f, %f)\n", mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_hscroll),
-                                    mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_vscroll));
-  g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
-}
-
-static void
-_gdk_mir_print_input_event (const MirInputEvent *event)
-{
-  g_printerr ("INPUT\n");
-}
-
-static void
-_gdk_mir_print_window_event (const MirWindowEvent *event)
-{
-  g_printerr ("WINDOW\n");
-  g_printerr (" Attribute ");
-  switch (mir_window_event_get_attribute (event))
-    {
-    case mir_window_attrib_type:
-      g_printerr ("type");
-      break;
-    case mir_window_attrib_state:
-      g_printerr ("state");
-      break;
-    case mir_window_attrib_swapinterval:
-      g_printerr ("swapinterval");
-      break;
-    case mir_window_attrib_focus:
-      g_printerr ("focus");
-      break;
-    case mir_window_attrib_dpi:
-      g_printerr ("dpi");
-      break;
-    case mir_window_attrib_visibility:
-      g_printerr ("visibility");
-      break;
-    case mir_window_attrib_preferred_orientation:
-      g_printerr ("preferred_orientation");
-      break;
-    default:
-      g_printerr ("%u", mir_window_event_get_attribute (event));
-      break;
-    }
-  g_printerr ("\n");
-  g_printerr (" Value %i\n", mir_window_event_get_attribute_value (event));
-}
-
-static void
-_gdk_mir_print_resize_event (const MirResizeEvent *event)
-{
-  g_printerr ("RESIZE\n");
-  g_printerr (" Size (%i, %i)\n", mir_resize_event_get_width (event), mir_resize_event_get_height (event));
-}
-
-static void
-_gdk_mir_print_prompt_session_state_change_event (const MirPromptSessionEvent *event)
-{
-  g_printerr ("PROMPT_SESSION_STATE_CHANGE\n");
-  g_printerr (" State ");
-
-  switch (mir_prompt_session_event_get_state (event))
-    {
-    case mir_prompt_session_state_stopped:
-      g_printerr ("stopped");
-      break;
-    case mir_prompt_session_state_started:
-      g_printerr ("started");
-      break;
-    case mir_prompt_session_state_suspended:
-      g_printerr ("suspended");
-      break;
-    default:
-      g_printerr ("%u", mir_prompt_session_event_get_state (event));
-      break;
-    }
-
-  g_printerr ("\n");
-}
-
-static void
-_gdk_mir_print_orientation_event (const MirOrientationEvent *event)
-{
-  g_printerr ("ORIENTATION\n");
-  g_printerr (" Direction ");
-
-  switch (mir_orientation_event_get_direction (event))
-    {
-    case mir_orientation_normal:
-      g_printerr ("normal");
-      break;
-    case mir_orientation_left:
-      g_printerr ("left");
-      break;
-    case mir_orientation_inverted:
-      g_printerr ("inverted");
-      break;
-    case mir_orientation_right:
-      g_printerr ("right");
-      break;
-    default:
-      g_printerr ("%u", mir_orientation_event_get_direction (event));
-      break;
-    }
-
-  g_printerr ("\n");
-}
-
-static void
-_gdk_mir_print_close_event (void)
-{
-  g_printerr ("CLOSED\n");
-}
-
-static void
-_gdk_mir_print_keymap_event (const MirKeymapEvent *event)
-{
-  g_printerr ("KEYMAP\n");
-}
-
-static void
-_gdk_mir_print_window_output_event (const MirWindowOutputEvent *event)
-{
-  g_printerr ("WINDOW_OUTPUT\n");
-  g_printerr (" DPI %d\n", mir_window_output_event_get_dpi (event));
-  g_printerr (" Form Factor ");
-
-  switch (mir_window_output_event_get_form_factor (event))
-    {
-    case mir_form_factor_unknown:
-      g_printerr ("unknown");
-      break;
-    case mir_form_factor_phone:
-      g_printerr ("phone");
-      break;
-    case mir_form_factor_tablet:
-      g_printerr ("tablet");
-      break;
-    case mir_form_factor_monitor:
-      g_printerr ("monitor");
-      break;
-    case mir_form_factor_tv:
-      g_printerr ("tv");
-      break;
-    case mir_form_factor_projector:
-      g_printerr ("projector");
-      break;
-    default:
-      g_printerr ("%u", mir_window_output_event_get_form_factor (event));
-      break;
-    }
-
-  g_printerr ("\n");
-  g_printerr (" Scale %f\n", mir_window_output_event_get_scale (event));
-  g_printerr (" Refresh Rate %lf\n", mir_window_output_event_get_refresh_rate (event));
-  g_printerr (" Output ID %u\n", mir_window_output_event_get_output_id (event));
-}
-
-static void
-_gdk_mir_print_input_device_state_event (const MirInputDeviceStateEvent *event)
-{
-  MirPointerButtons buttons;
-  MirInputEventModifiers modifiers;
-  gint i;
-  gint j;
-
-  g_printerr ("INPUT_DEVICE_STATE\n");
-  g_printerr (" Pointer Buttons\n");
-  buttons = mir_input_device_state_event_pointer_buttons (event);
-
-  if (buttons == 0)
-    g_printerr ("  none\n");
-  else
-    {
-      if (buttons & mir_pointer_button_primary)
-        g_printerr ("  primary\n");
-      if (buttons & mir_pointer_button_secondary)
-        g_printerr ("  secondary\n");
-      if (buttons & mir_pointer_button_tertiary)
-        g_printerr ("  tertiary\n");
-      if (buttons & mir_pointer_button_back)
-        g_printerr ("  back\n");
-      if (buttons & mir_pointer_button_forward)
-        g_printerr ("  forward\n");
-      if (buttons & mir_pointer_button_side)
-        g_printerr ("  side\n");
-      if (buttons & mir_pointer_button_extra)
-        g_printerr ("  extra\n");
-      if (buttons & mir_pointer_button_task)
-        g_printerr ("  task\n");
-    }
-
-  g_printerr (" Pointer Axis\n");
-  g_printerr ("  X %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_x));
-  g_printerr ("  Y %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_y));
-  g_printerr ("  V Scroll %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_vscroll));
-  g_printerr ("  H Scroll %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_hscroll));
-  g_printerr ("  Relative X %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_relative_x));
-  g_printerr ("  Relative Y %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_relative_y));
-  g_printerr (" Time %ld\n", mir_input_device_state_event_time (event));
-  g_printerr (" Event Modifiers\n");
-  modifiers = mir_input_device_state_event_modifiers (event);
-
-  if (modifiers & mir_input_event_modifier_none)
-    g_printerr ("  none\n");
-  if (modifiers & mir_input_event_modifier_alt)
-    g_printerr ("  alt\n");
-  if (modifiers & mir_input_event_modifier_alt_left)
-    g_printerr ("  alt_left\n");
-  if (modifiers & mir_input_event_modifier_alt_right)
-    g_printerr ("  alt_right\n");
-  if (modifiers & mir_input_event_modifier_shift)
-    g_printerr ("  shift\n");
-  if (modifiers & mir_input_event_modifier_shift_left)
-    g_printerr ("  shift_left\n");
-  if (modifiers & mir_input_event_modifier_shift_right)
-    g_printerr ("  shift_right\n");
-  if (modifiers & mir_input_event_modifier_sym)
-    g_printerr ("  sym\n");
-  if (modifiers & mir_input_event_modifier_function)
-    g_printerr ("  function\n");
-  if (modifiers & mir_input_event_modifier_ctrl)
-    g_printerr ("  ctrl\n");
-  if (modifiers & mir_input_event_modifier_ctrl_left)
-    g_printerr ("  ctrl_left\n");
-  if (modifiers & mir_input_event_modifier_ctrl_right)
-    g_printerr ("  ctrl_right\n");
-  if (modifiers & mir_input_event_modifier_meta)
-    g_printerr ("  meta\n");
-  if (modifiers & mir_input_event_modifier_meta_left)
-    g_printerr ("  meta_left\n");
-  if (modifiers & mir_input_event_modifier_meta_right)
-    g_printerr ("  meta_right\n");
-  if (modifiers & mir_input_event_modifier_caps_lock)
-    g_printerr ("  caps_lock\n");
-  if (modifiers & mir_input_event_modifier_num_lock)
-    g_printerr ("  num_lock\n");
-  if (modifiers & mir_input_event_modifier_scroll_lock)
-    g_printerr ("  scroll_lock\n");
-
-  for (i = 0; i < mir_input_device_state_event_device_count (event); i++)
-    {
-      g_printerr (" Device %ld\n", mir_input_device_state_event_device_id (event, i));
-
-      for (j = 0; j < mir_input_device_state_event_device_pressed_keys_count (event, i); j++)
-        g_printerr ("  Pressed %u\n", mir_input_device_state_event_device_pressed_keys_for_index (event, i, j));
-
-      g_printerr ("  Pointer Buttons\n");
-      buttons = mir_input_device_state_event_device_pointer_buttons (event, i);
-
-      if (buttons == 0)
-        g_printerr ("   none\n");
-      else
-        {
-          if (buttons & mir_pointer_button_primary)
-            g_printerr ("   primary\n");
-          if (buttons & mir_pointer_button_secondary)
-            g_printerr ("   secondary\n");
-          if (buttons & mir_pointer_button_tertiary)
-            g_printerr ("   tertiary\n");
-          if (buttons & mir_pointer_button_back)
-            g_printerr ("   back\n");
-          if (buttons & mir_pointer_button_forward)
-            g_printerr ("   forward\n");
-          if (buttons & mir_pointer_button_side)
-            g_printerr ("   side\n");
-          if (buttons & mir_pointer_button_extra)
-            g_printerr ("   extra\n");
-          if (buttons & mir_pointer_button_task)
-            g_printerr ("   task\n");
-        }
-    }
-}
-
-static void
-_gdk_mir_print_window_placement_event (const MirWindowPlacementEvent *event)
-{
-  MirRectangle rect = mir_window_placement_get_relative_position (event);
-
-  g_printerr ("WINDOW_PLACEMENT\n");
-  g_printerr (" X %d\n", rect.left);
-  g_printerr (" Y %d\n", rect.top);
-  g_printerr (" Width %u\n", rect.width);
-  g_printerr (" Height %u\n", rect.height);
-}
-
-void
-_gdk_mir_print_event (const MirEvent *event)
-{
-  const MirInputEvent *input_event;
-
-  switch (mir_event_get_type (event))
-    {
-    case mir_event_type_input:
-      input_event = mir_event_get_input_event (event);
-
-      switch (mir_input_event_get_type (input_event))
-        {
-          case mir_input_event_type_key:
-            _gdk_mir_print_key_event (mir_event_get_input_event (event));
-            break;
-          case mir_input_event_type_touch:
-            _gdk_mir_print_touch_event (mir_event_get_input_event (event));
-            break;
-          case mir_input_event_type_pointer:
-            _gdk_mir_print_motion_event (mir_event_get_input_event (event));
-            break;
-          default:
-            _gdk_mir_print_input_event (mir_event_get_input_event (event));
-            break;
-        }
-      break;
-    case mir_event_type_key:
-      _gdk_mir_print_key_event (mir_event_get_input_event (event));
-      break;
-    case mir_event_type_motion:
-      _gdk_mir_print_motion_event (mir_event_get_input_event (event));
-      break;
-    case mir_event_type_window:
-      _gdk_mir_print_window_event (mir_event_get_window_event (event));
-      break;
-    case mir_event_type_resize:
-      _gdk_mir_print_resize_event (mir_event_get_resize_event (event));
-      break;
-    case mir_event_type_prompt_session_state_change:
-      _gdk_mir_print_prompt_session_state_change_event (mir_event_get_prompt_session_event (event));
-      break;
-    case mir_event_type_orientation:
-      _gdk_mir_print_orientation_event (mir_event_get_orientation_event (event));
-      break;
-    case mir_event_type_close_window:
-      _gdk_mir_print_close_event ();
-      break;
-    case mir_event_type_keymap:
-      _gdk_mir_print_keymap_event (mir_event_get_keymap_event (event));
-      break;
-    case mir_event_type_window_output:
-      _gdk_mir_print_window_output_event (mir_event_get_window_output_event (event));
-      break;
-    case mir_event_type_input_device_state:
-      _gdk_mir_print_input_device_state_event (mir_event_get_input_device_state_event (event));
-      break;
-    case mir_event_type_window_placement:
-      _gdk_mir_print_window_placement_event (mir_event_get_window_placement_event (event));
-      break;
-    default:
-      g_printerr ("EVENT %u\n", mir_event_get_type (event));
-      break;
-    }
-}

gdk/mir/gdkmir-private.h

@@ -1,141 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * 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 __GDK_PRIVATE_MIR_H__
-#define __GDK_PRIVATE_MIR_H__
-
-#include <epoxy/egl.h>
-
-#include "gdkmir.h"
-#include "gdkdisplay.h"
-#include "gdkscreen.h"
-#include "gdkdevicemanager.h"
-#include "gdkglcontextprivate.h"
-#include "gdkkeys.h"
-#include "gdkwindowimpl.h"
-
-typedef struct _GdkMirWindowImpl GdkMirWindowImpl;
-typedef struct _GdkMirWindowReference GdkMirWindowReference;
-typedef struct _GdkMirEventSource GdkMirEventSource;
-
-#define GDK_TYPE_MIR_WINDOW_IMPL              (gdk_mir_window_impl_get_type ())
-#define GDK_MIR_WINDOW_IMPL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_WINDOW_IMPL, GdkMirWindowImpl))
-#define GDK_IS_WINDOW_IMPL_MIR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_WINDOW_IMPL))
-
-GType gdk_mir_window_impl_get_type (void);
-
-
-struct _GdkMirGLContext
-{
-  GdkGLContext parent_instance;
-
-  EGLContext egl_context;
-  EGLConfig egl_config;
-  gboolean is_attached;
-};
-
-struct _GdkMirGLContextClass
-{
-  GdkGLContextClass parent_class;
-};
-
-typedef struct _GdkMirGLContext GdkMirGLContext;
-typedef struct _GdkMirGLContextClass GdkMirGLContextClass;
-
-#define GDK_MIR_GL_CONTEXT(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_MIR_GL_CONTEXT, GdkMirGLContext))
-
-
-GdkDisplay *_gdk_mir_display_open (const gchar *display_name);
-
-GdkScreen *_gdk_mir_screen_new (GdkDisplay *display);
-
-GdkDeviceManager *_gdk_mir_device_manager_new (GdkDisplay *display);
-
-GdkDevice *_gdk_mir_device_manager_get_keyboard (GdkDeviceManager *device_manager);
-
-GdkKeymap *_gdk_mir_keymap_new (void);
-
-gboolean _gdk_mir_keymap_key_is_modifier (GdkKeymap *keymap, guint keycode);
-
-GdkDevice *_gdk_mir_keyboard_new (GdkDeviceManager *device_manager, const gchar *name);
-
-GdkDevice *_gdk_mir_pointer_new (GdkDeviceManager *device_manager, const gchar *name);
-
-void _gdk_mir_pointer_set_location (GdkDevice *pointer, gdouble x, gdouble y, GdkWindow *window, GdkModifierType mask);
-
-GdkCursor *_gdk_mir_cursor_new_for_type (GdkDisplay *display, GdkCursorType type);
-
-GdkCursor *_gdk_mir_cursor_new_for_name (GdkDisplay *display, const gchar *name);
-
-const gchar *_gdk_mir_cursor_get_name (GdkCursor *cursor);
-
-MirWindow *_gdk_mir_window_get_mir_window (GdkWindow *window);
-
-GdkWindowImpl *_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window, GdkWindowAttr *attributes, gint attributes_mask);
-
-void _gdk_mir_window_impl_set_window_state (GdkMirWindowImpl *impl, MirWindowState state);
-
-void _gdk_mir_window_impl_set_window_type (GdkMirWindowImpl *impl, MirWindowType type);
-
-void _gdk_mir_window_set_scale (GdkWindow *window, gdouble scale);
-
-void _gdk_mir_window_set_final_rect (GdkWindow *window, MirRectangle rect);
-
-void _gdk_mir_window_impl_set_cursor_state (GdkMirWindowImpl *impl, gdouble x, gdouble y, gboolean cursor_inside, guint button_state);
-
-void _gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl, gdouble *x, gdouble *y, gboolean *cursor_inside, guint *button_state);
-
-GdkMirEventSource *_gdk_mir_display_get_event_source (GdkDisplay *display);
-
-GdkMirEventSource *_gdk_mir_event_source_new (GdkDisplay *display);
-
-GdkMirWindowReference *_gdk_mir_event_source_get_window_reference (GdkWindow *window);
-
-void _gdk_mir_window_reference_unref (GdkMirWindowReference *ref);
-
-void _gdk_mir_event_source_queue (GdkMirWindowReference *window_ref, const MirEvent *event);
-
-MirPixelFormat _gdk_mir_display_get_pixel_format (GdkDisplay *display, MirBufferUsage usage);
-
-void _gdk_mir_display_focus_window (GdkDisplay *display, GdkWindow *window);
-
-void _gdk_mir_display_unfocus_window (GdkDisplay *display, GdkWindow *window);
-
-void _gdk_mir_display_create_paste (GdkDisplay          *display,
-                                    const gchar * const *paste_formats,
-                                    gconstpointer        paste_data,
-                                    gsize                paste_size);
-
-gboolean _gdk_mir_display_init_egl_display (GdkDisplay *display);
-
-EGLDisplay _gdk_mir_display_get_egl_display (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_khr_create_context (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_buffer_age (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_swap_buffers_with_damage (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_surfaceless_context (GdkDisplay *display);
-
-EGLSurface _gdk_mir_window_get_egl_surface (GdkWindow *window, EGLConfig config);
-
-EGLSurface _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window, EGLConfig config);
-
-void _gdk_mir_print_event (const MirEvent *event);
-
-#endif /* __GDK_PRIVATE_MIR_H__ */

gdk/mir/gdkmir.h

@@ -1,52 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * 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 __GDK_MIR_H__
-#define __GDK_MIR_H__
-
-#include <gdk/gdk.h>
-#include <mir_toolkit/mir_client_library.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_MIR_DISPLAY              (gdk_mir_display_get_type ())
-#define GDK_IS_MIR_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_DISPLAY))
-
-#define GDK_TYPE_MIR_GL_CONTEXT           (gdk_mir_gl_context_get_type ())
-#define GDK_MIR_IS_GL_CONTEXT(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_MIR_GL_CONTEXT))
-
-#define GDK_TYPE_MIR_WINDOW               (gdk_mir_window_get_type ())
-#define GDK_IS_MIR_WINDOW(object)         (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_WINDOW))
-
-GDK_AVAILABLE_IN_3_16
-GType gdk_mir_display_get_type (void);
-
-GDK_AVAILABLE_IN_3_16
-MirConnection *gdk_mir_display_get_mir_connection (GdkDisplay *display);
-
-GDK_AVAILABLE_IN_3_16
-GType gdk_mir_window_get_type (void);
-
-GDK_DEPRECATED_IN_3_22
-MirSurface *gdk_mir_window_get_mir_surface (GdkWindow *window);
-
-GDK_AVAILABLE_IN_3_16
-GType gdk_mir_gl_context_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GDK_MIR_H__ */

gdk/mir/gdkmircursor.c

@@ -1,176 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * 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 "gdkcursorprivate.h"
-
-#include "gdkmir.h"
-#include "gdkmir-private.h"
-
-typedef struct GdkMirCursor      GdkMirCursor;
-typedef struct GdkMirCursorClass GdkMirCursorClass;
-
-#define GDK_TYPE_MIR_CURSOR              (gdk_mir_cursor_get_type ())
-#define GDK_MIR_CURSOR(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_CURSOR, GdkMirCursor))
-#define GDK_MIR_CURSOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_CURSOR, GdkMirCursorClass))
-#define GDK_IS_MIR_CURSOR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_CURSOR))
-#define GDK_IS_MIR_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_CURSOR))
-#define GDK_MIR_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_CURSOR, GdkMirCursorClass))
-
-struct GdkMirCursor
-{
-  GdkCursor parent_instance;
-
-  gchar *name;
-};
-
-struct GdkMirCursorClass
-{
-  GdkCursorClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirCursor, gdk_mir_cursor, GDK_TYPE_CURSOR)
-
-static const gchar *
-get_cursor_name_for_cursor_type (GdkCursorType cursor_type)
-{
-  switch (cursor_type)
-    {
-    case GDK_BLANK_CURSOR:
-      return mir_disabled_cursor_name;
-    case GDK_X_CURSOR:
-    case GDK_ARROW:
-    case GDK_CENTER_PTR:
-    case GDK_DRAFT_LARGE:
-    case GDK_DRAFT_SMALL:
-    case GDK_LEFT_PTR:
-    case GDK_RIGHT_PTR:
-    case GDK_TOP_LEFT_ARROW:
-      return mir_arrow_cursor_name;
-    case GDK_CLOCK:
-    case GDK_WATCH:
-      return mir_busy_cursor_name;
-    case GDK_XTERM:
-      return mir_caret_cursor_name;
-    case GDK_HAND1:
-    case GDK_HAND2:
-      return mir_pointing_hand_cursor_name;
-      return mir_open_hand_cursor_name;
-    case GDK_FLEUR:
-      return mir_closed_hand_cursor_name;
-    case GDK_LEFT_SIDE:
-    case GDK_LEFT_TEE:
-    case GDK_RIGHT_SIDE:
-    case GDK_RIGHT_TEE:
-    case GDK_SB_LEFT_ARROW:
-    case GDK_SB_RIGHT_ARROW:
-      return mir_horizontal_resize_cursor_name;
-    case GDK_BASED_ARROW_DOWN:
-    case GDK_BASED_ARROW_UP:
-    case GDK_BOTTOM_SIDE:
-    case GDK_BOTTOM_TEE:
-    case GDK_DOUBLE_ARROW:
-    case GDK_SB_DOWN_ARROW:
-    case GDK_SB_UP_ARROW:
-    case GDK_TOP_SIDE:
-    case GDK_TOP_TEE:
-      return mir_vertical_resize_cursor_name;
-    case GDK_BOTTOM_LEFT_CORNER:
-    case GDK_LL_ANGLE:
-    case GDK_TOP_RIGHT_CORNER:
-    case GDK_UR_ANGLE:
-      return mir_diagonal_resize_bottom_to_top_cursor_name;
-    case GDK_BOTTOM_RIGHT_CORNER:
-    case GDK_LR_ANGLE:
-    case GDK_SIZING:
-    case GDK_TOP_LEFT_CORNER:
-    case GDK_UL_ANGLE:
-      return mir_diagonal_resize_top_to_bottom_cursor_name;
-      return mir_omnidirectional_resize_cursor_name;
-    case GDK_SB_V_DOUBLE_ARROW:
-      return mir_vsplit_resize_cursor_name;
-    case GDK_SB_H_DOUBLE_ARROW:
-      return mir_hsplit_resize_cursor_name;
-    default:
-      return mir_default_cursor_name;
-    }
-}
-
-
-GdkCursor *
-_gdk_mir_cursor_new_for_name (GdkDisplay *display, const gchar *name)
-{
-  GdkMirCursor *cursor;
-
-  cursor = g_object_new (GDK_TYPE_MIR_CURSOR, "display", display, "cursor-type", GDK_CURSOR_IS_PIXMAP, NULL);
-  cursor->name = g_strdup (name);
-
-  return GDK_CURSOR (cursor);
-}
-
-GdkCursor *
-_gdk_mir_cursor_new_for_type (GdkDisplay *display, GdkCursorType type)
-{
-  GdkMirCursor *cursor;
-
-  cursor = g_object_new (GDK_TYPE_MIR_CURSOR, "display", display, "cursor-type", type, NULL);
-  cursor->name = g_strdup (get_cursor_name_for_cursor_type (type));
-
-  return GDK_CURSOR (cursor);
-}
-
-const gchar *
-_gdk_mir_cursor_get_name (GdkCursor *cursor)
-{
-  GdkMirCursor *mir_cursor = GDK_MIR_CURSOR (cursor);
-
-  return mir_cursor->name;
-}
-
-cairo_surface_t *
-gdk_mir_cursor_get_surface (GdkCursor *cursor,
-                            gdouble   *x_hot,
-                            gdouble   *y_hot)
-{
-  return NULL;
-}
-
-static void
-gdk_mir_cursor_init (GdkMirCursor *cursor)
-{
-}
-
-static void
-gdk_mir_cursor_finalize (GObject *object)
-{
-  GdkMirCursor *mir_cursor = GDK_MIR_CURSOR (object);
-
-  g_free (mir_cursor->name);
-
-  G_OBJECT_CLASS (gdk_mir_cursor_parent_class)->finalize (object);
-}
-
-static void
-gdk_mir_cursor_class_init (GdkMirCursorClass *klass)
-{
-  GdkCursorClass *cursor_class = GDK_CURSOR_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  cursor_class->get_surface = gdk_mir_cursor_get_surface;
-  object_class->finalize = gdk_mir_cursor_finalize;
-}