meson/MSVC builds: Use -utf-8 where available

This avoids the build from erroring out on C4819 (Unicode handling issue in
Visual Studio compiler), notably when running on CHinese, Japanese and
Korean locales.

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2
+image: registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v3
 
 stages:
   - build
@@ -12,7 +12,15 @@ fedora-autotools:
   script:
    - bash -x ./.gitlab-ci/test-docker-autotools.sh
 
-fedora-meson:
+fedora-distcheck:
+  variables:
+    DO_DISTCHECK: "yes"
+  when: manual
+  stage: build
+  script:
+   - bash -x ./.gitlab-ci/test-docker-autotools.sh
+
+fedora-meson: &fedora-meson-defaults
   stage: build
   script:
    - bash -x ./.gitlab-ci/test-docker-meson.sh
@@ -21,6 +29,12 @@ fedora-meson:
     name: "gtk3-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     paths:
       - "_build/meson-logs"
+      - "_build/testsuite/reftests/output"
+
+fedora-meson-staticlibs:
+  variables:
+    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
+  <<: *fedora-meson-defaults
 
 msys2-mingw32-meson:
   variables:

.gitlab-ci/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/test-docker-autotools.sh

@@ -11,6 +11,13 @@ cd _build
 ../autogen.sh \
     --enable-cloudproviders \
     --enable-broadway-backend \
+    --enable-wayland-backend \
+    --enable-x11-backend \
     --enable-xinerama \
     --enable-gtk-doc
 make -j8
+
+if [ -n "${DO_DISTCHECK-}" ]; then
+  make -j8 check SKIP_GDKTARGET="echo Not actually running tests for now"
+  make -j8 distcheck SKIP_GDKTARGET="echo Not actually running tests for now"
+fi

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

@@ -12,9 +12,11 @@ python3 -m pip install --user meson==0.49.2
 meson \
     -Dgtk_doc=true \
     -Dman=true \
+    -Dinstalled_tests=true \
     -Dbroadway_backend=true \
     -Dxinerama=yes \
     -Dprint_backends="file,lpr,test,cloudprint,cups" \
+    ${EXTRA_MESON_FLAGS:-} \
     _build
 
 cd _build
@@ -25,5 +27,6 @@ xvfb-run -a -s "-screen 0 1024x768x24" \
         --timeout-multiplier 4 \
         --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,7 @@ 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
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"

Makefile.am

@@ -42,11 +42,11 @@ MAINTAINERCLEANFILES = \
 
 
 ## 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 +67,19 @@ 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
+
 distclean-local:
 	if test "$(srcdir)" = "."; then :; else \
 		rm -f ChangeLog; \

NEWS

@@ -1,9 +1,219 @@
+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
+===================================
+
+* Adwaita:
+ - Add drop shadow to icons
+ - Small color fixes
+ - Make title buttons round
+
+* OS X: Fix the monitors-changed signal
+
+* Win32:
+ - Build fixes
+ - Support choices in the native file chooser
+ - Fix icon cache freshness checks on 64bit
+
+* Wayland:
+ - Support xdg-output v3
+ - Fix clipboard ownership handling
+
+* X11: Improve monitor metadata
+
+* Build: Require GLib 2.57.2
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ British English
+ Catalan
+ Croatian
+ French
+ Friulian
+ Galician
+ German
+ Greek
+ Hungarian
+ Indonesian
+ Japanese
+ Korean
+ Latvian
+ Lithuanian
+ Polish
+ Punjabi
+ Romanian
+ Serbian
+ Slovenian
+ Spanish
+ Swedish
+
+
+Overview of Changes in GTK+ 3.24.10
+===================================
+
+* Make gtk_widget_get_action_group behave as documented
+
+* Make gdk_screen_get_monitor_plug_name works as before
+
+* Adwaita:
+  - Update infobar look
+  - Fix some issues with submenus and popovers
+
+* Wayland: Use the xdg-output protocol
+
+* Fix build issues around cups
+
+* Quartz: Build fixes
+
+* treeview: Bring the pixel cache back, since its removal
+  was causing problems in some applications
+
+* Various documentation improvements
+
+* Translation updates:
+ Slovenian
+ Croatian
+ Spanish
+
+
+Overview of Changes in GTK+ 3.24.9
+==================================
+
+* GTK can now be built with the meson build system
+
+* Quartz:
+ - Build fixes
+ - Fix a crash with DND
+
+* Win32:
+ - Enable GLES via libANGLE
+ - Fix preedit window placement on hi-dpi screens
+
+* Wayland:
+ - Support the xdg-output protocol for correct
+   monitor sizes with scaled displays
+ - Fix handling of cursor hotspots that was reading
+   uninitialized memory
+ - Update tablet cursors when scale changes
+
+* CSS:
+ - Use multiple font-family values
+
+* Emoji:
+ - Populate the Emoji chooser incrementally
+
+* Printing:
+ - Require CUPS 1.7
+
+* Scrolling:
+ - Add a gtk-overlay-scrolling setting that can be
+   used to force traditional (non-overlay) scrollbars
+
+* GtkTreeView:
+ - Update rubberband rectangles more often
+ - Remove the pixel cache, to avoid the redraw
+   issues that it causes
+
+* Tooling:
+ - Support sysprof profiling
+
+* Themes:
+ - Adwaita: Small tweaks to the theme refresh
+ - Adwaita: Update treeview progress bars
+ - HighContrast: Improve notebook tabs
+
+* Translation updates:
+ Brazilian Portuguese
+ Friulian
+ Hungarian
+ Indonesian
+ Italian
+ Lithuanian
+
+
 Overview of Changes in GTK+ 3.24.8
 ==================================
 
 * Color editor: don't warn if editing is cancelled
 
 * Always redraw on allocate - not doing so is
+
   not safe when any widget can have a background
 
 * Use GLSL 3.30 for shaders

build-aux/meson/post-install.py

@@ -12,6 +12,7 @@ if 'DESTDIR' not in os.environ:
     gtk_libdir = sys.argv[4]
     gtk_datadir = sys.argv[5]
     gtk_query_immodules = os.path.join(gtk_bindir, 'gtk-query-immodules-' + gtk_api_version)
+    gtk_update_icon_cache = os.path.join(gtk_bindir, 'gtk-update-icon-cache')
 
     gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
     gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
@@ -30,7 +31,7 @@ if 'DESTDIR' not in os.environ:
                     os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
 
     print('Updating icon cache...')
-    subprocess.call(['gtk-update-icon-cache', '-q', '-t' ,'-f',
+    subprocess.call([gtk_update_icon_cache, '-q', '-t' ,'-f',
                     os.path.join(gtk_datadir, 'icons', 'hicolor')])
 
     print('Updating module cache for input methods...')

build/Makefile-newvs.am

@@ -21,17 +21,17 @@ if MSVC_NO_TOOLSET_SET
 MSVC_TOOLSET = $(MSVC_VER)0
 endif
 
-%.sln:
+%.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:
+%.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:
+%.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 \
@@ -45,7 +45,7 @@ endif
 		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:
+%.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 \

build/Makefile.msvc-introspection

@@ -80,6 +80,7 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
     $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
 
 $(top_builddir)/build/win32/$(_gir_name)_list: Makefile
+	rm -f $(top_builddir)/build/win32/$(_gir_name)_list
 	for F in $(_gir_files_msvc); do \
 		case $$$$F in \
 		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \

build/win32/Makefile.am

@@ -32,11 +32,17 @@ SUBDIRS =	\
 	vs11	\
 	vs12	\
 	vs14	\
-	vs15
+	vs15	\
+	vs16
 
 EXTRA_DIST +=	\
+	config-msvc.mak		\
+	config-msvc.mak.in		\
+	create-lists.bat	\
+	create-lists-msvc.mak		\
 	detectenv-msvc.mak		\
-	gentypefuncs.py			\
+	gen-gdkversionmacros-h.py	\
+	generate-msvc.mak	\
 	gtk-introspection-msvc.mak	\
 	introspection-msvc.mak		\
 	replace.py			\

build/win32/config-msvc.mak.in

@@ -0,0 +1,95 @@
+# NMake Makefile portion for enabling features for Windows builds
+
+!include detectenv-msvc.mak
+
+# Default prefix if not defined
+!ifndef PREFIX
+PREFIX=..\..\..\vs$(VSVER)\$(PLAT)
+!endif
+
+# Configurable paths to the various interpreters we need
+!ifndef PERL
+PERL = perl
+!endif
+
+!ifndef PYTHON
+PYTHON=python
+!endif
+
+# Path to the pkg-config tool, if not already in the PATH
+!if "$(PKG_CONFIG)" == ""
+PKG_CONFIG=pkg-config
+!endif
+
+# Configurable paths to the various scripts and tools that we are using
+!ifndef GLIB_MKENUMS
+GLIB_MKENUMS = $(PREFIX)\bin\glib-mkenums
+!endif
+
+!ifndef GLIB_GENMARSHAL
+GLIB_GENMARSHAL = $(PREFIX)\bin\glib-genmarshal
+!endif
+
+!ifndef GLIB_COMPILE_RESOURCES
+GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe
+!endif
+
+!ifndef GDBUS_CODEGEN
+GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
+!endif
+
+# Please do not change anything beneath this line unless maintaining the NMake Makefiles
+GTK_VERSION = @GTK_VERSION@
+
+GDK_PREPROCESSOR_FLAGS =	\
+	/DG_LOG_USE_STRUCTURED=1	\
+	/DGDK_COMPILATION	\
+	/I..\..	\
+	/I..\..\gdk	\
+	/I..\..\gdk\win32
+
+GTK_PREPROCESSOR_FLAGS =	\
+	 /I..\..\gtk	\
+	 /I..\..\gdk	\
+	 /I..\..\gdk\win32	\
+	 /I..\..	\
+	 /I$(PREFIX)\include\gdk-pixbuf-2.0	\
+	 /I$(PREFIX)\include\pango-1.0	\
+	 /I$(PREFIX)\include\atk-1.0	\
+	 /I$(PREFIX)\include\cairo	\
+	 /I$(PREFIX)\include\gio-win32-2.0	\
+	 /I$(PREFIX)\include\glib-2.0	\
+	 /I$(PREFIX)\lib\glib-2.0\include	\
+	 /I$(PREFIX)\include	\
+	 /DHAVE_CONFIG_H	\
+	 /DG_DISABLE_SINGLE_INCLUDES	\
+	 /DATK_DISABLE_SINGLE_INCLUDES	\
+	 /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES	\
+	 /DGTK_DISABLE_SINGLE_INCLUDES	\
+	 /D_USE_MATH_DEFINES	\
+	 /DGTK_COMPILATION	\
+	 /DG_LOG_DOMAIN=\"Gtk\"	\
+	 /DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
+	 /DGTK_PRINT_BACKENDS=\"file\"	\
+	 /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED	\
+	 /DINCLUDE_IM_am_et	\
+	 /DINCLUDE_IM_cedilla	\
+	 /DINCLUDE_IM_cyrillic_translit	\
+	 /DINCLUDE_IM_ime	\
+	 /DINCLUDE_IM_inuktitut	\
+	 /DINCLUDE_IM_ipa	\
+	 /DINCLUDE_IM_multipress	\
+	 /DINCLUDE_IM_thai	\
+	 /DINCLUDE_IM_ti_er	\
+	 /DINCLUDE_IM_ti_et	\
+	 /DINCLUDE_IM_viqr	\
+	 /DGTK_LIBDIR=\"$(PREFIX:\=/)/lib\"	\
+	 /DGTK_DATADIR=\"$(PREFIX:\=/)/share\"	\
+	 /DGTK_DATA_PREFIX=\"$(PREFIX:\=/)\"	\
+	 /DGTK_SYSCONFDIR=\"$(PREFIX:\=/)/etc\"	\
+	 /DMULTIPRESS_CONFDIR=\"$(PREFIX:\=/)/etc/gtk-3.0\"	\
+	 /DMULTIPRESS_LOCALEDIR=\"$(PREFIX:\=/)/share/locale\"	\
+	 /DGTK_VERSION=\"$(GTK_VERSION)\"	\
+	 /DGTK_BINARY_VERSION=\"3.0.0\"	\
+	 /DGDK_DISABLE_DEPRECATED	\
+	 /DISOLATION_AWARE_ENABLED

build/win32/create-lists-msvc.mak

@@ -0,0 +1,101 @@
+# Convert the source listing to object (.obj) listing in
+# another NMake Makefile module, include it, and clean it up.
+# This is a "fact-of-life" regarding NMake Makefiles...
+# This file does not need to be changed unless one is maintaining the NMake Makefiles
+
+# For those wanting to add things here:
+# To add a list, do the following:
+# # $(description_of_list)
+# if [call create-lists.bat header $(makefile_snippet_file) $(variable_name)]
+# endif
+#
+# if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]
+# endif
+#
+# if [call create-lists.bat footer $(makefile_snippet_file)]
+# endif
+# ... (repeat the if [call ...] lines in the above order if needed)
+# !include $(makefile_snippet_file)
+#
+# (add the following after checking the entries in $(makefile_snippet_file) is correct)
+# (the batch script appends to $(makefile_snippet_file), you will need to clear the file unless the following line is added)
+#!if [del /f /q $(makefile_snippet_file)]
+#!endif
+
+# In order to obtain the .obj filename that is needed for NMake Makefiles to build DLLs/static LIBs or EXEs, do the following
+# instead when doing 'if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]'
+# (repeat if there are multiple $(srcext)'s in $(source_list), ignore any headers):
+# !if [for %c in ($(source_list)) do @if "%~xc" == ".$(srcext)" @call create-lists.bat file $(makefile_snippet_file) $(intdir)\%~nc.obj]
+#
+# $(intdir)\%~nc.obj needs to correspond to the rules added in build-rules-msvc.mak
+# %~xc gives the file extension of a given file, %c in this case, so if %c is a.cc, %~xc means .cc
+# %~nc gives the file name of a given file without extension, %c in this case, so if %c is a.cc, %~nc means a
+
+NULL=
+
+# For GDK resources
+
+!if [call create-lists.bat header resources_sources.mak GDK_RESOURCES]
+!endif
+
+!if [for %f in (..\..\gdk\resources\glsl\*.glsl) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak GTK_RESOURCES]
+!endif
+
+!if [for %f in (..\..\gtk\theme\Adwaita\gtk.css ..\..\gtk\theme\Adwaita\gtk-dark.css ..\..\gtk\theme\Adwaita\gtk-contained.css ..\..\gtk\theme\Adwaita\gtk-contained-dark.css) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [for %x in (png svg) do @(for %f in (..\..\gtk\theme\Adwaita\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)]
+!endif
+
+!if [for %f in (..\..\gtk\theme\HighContrast\gtk.css ..\..\gtk\theme\HighContrast\gtk-inverse.css ..\..\gtk\theme\HighContrast\gtk-contained.css ..\..\gtk\theme\HighContrast\gtk-contained-inverse.css) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [for %x in (png svg) do @(for %f in (..\..\gtk\theme\HighContrast\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)]
+!endif
+
+!if [for %f in (..\..\gtk\theme\win32\gtk-win32-base.css ..\..\gtk\theme\win32\gtk.css) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [for %f in (..\..\gtk\cursor\*.png ..\..\gtk\gesture\*.symbolic.png ..\..\gtk\ui\*.ui) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [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 @call create-lists.bat file resources_sources.mak %f))]
+!endif
+
+!if [for %s in (scalable) do @(for %c in (status) do @(for %f in (..\..\gtk\icons\%s\%c\*.svg) do @call create-lists.bat file resources_sources.mak %f))]
+!endif
+
+!if [for %f in (..\..\gtk\inspector\*.ui ..\..\gtk\inspector\logo.png ..\..\gtk\emoji\emoji.data) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak GTK_DEMO_RESOURCES]
+!endif
+
+!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=..\..\demos\gtk-demo ..\..\demos\gtk-demo\demo.gresource.xml') do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak ICON_BROWSER_RESOURCES]
+!endif
+
+!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\..\demos\icon-browser --generate-dependencies ..\..\demos\icon-browser\iconbrowser.gresource.xml') do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!include resources_sources.mak
+
+!if [del /f /q resources_sources.mak]
+!endif

build/win32/create-lists.bat

@@ -0,0 +1,42 @@
+@echo off
+rem Simple .bat script for creating the NMake Makefile snippets.
+
+if not "%1" == "header" if not "%1" == "file" if not "%1" == "footer" goto :error_cmd
+if "%2" == "" goto error_no_destfile
+
+if "%1" == "header" goto :header
+if "%1" == "file" goto :addfile
+if "%1" == "footer" goto :footer
+
+:header
+if "%3" == "" goto error_var
+echo %3 =	\>>%2
+goto done
+
+:addfile
+if "%3" == "" goto error_file
+echo.	%3	\>>%2
+goto done
+
+:footer
+echo.	$(NULL)>>%2
+echo.>>%2
+goto done
+
+:error_cmd
+echo Specified command '%1' was invalid.  Valid commands are: header file footer.
+goto done
+
+:error_no_destfile
+echo Destination NMake snippet file must be specified
+goto done
+
+:error_var
+echo A name must be specified for using '%1'.
+goto done
+
+:error_file
+echo A file must be specified for using '%1'.
+goto done
+
+:done

build/win32/detectenv-msvc.mak

@@ -42,8 +42,10 @@ VSVER = 11
 VSVER = 12
 !elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
 VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920
 VSVER = 15
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+VSVER = 16
 !else
 VSVER = 0
 !endif
@@ -51,7 +53,7 @@ VSVER = 0
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^
-9 (2008) through 14 (2015).  Your Visual Studio^
+9 (2008) through 16 (2019).  Your Visual Studio^
 version is not supported.
 !error $(MSG)
 !endif

build/win32/gen-gdkversionmacros-h.py

@@ -0,0 +1,33 @@
+#!/usr/bin/python3
+
+# Generate gdk/gdkversionmacros.h
+
+# Author: Fan, Chun-wei
+# Date: July 25, 2019
+
+import os
+import sys
+import argparse
+
+from replace import replace_multi, replace
+
+def main(argv):
+    srcdir = os.path.dirname(__file__)
+    top_srcdir = os.path.join(srcdir, os.pardir, os.pardir)
+    parser = argparse.ArgumentParser(description='Generate gdkversionmacros.h')
+    parser.add_argument('--version', help='Version of the package',
+                        required=True)
+    args = parser.parse_args()
+    gdk_sourcedir = os.path.join(top_srcdir, 'gdk')
+    version_parts = args.version.split('.')
+
+    gdkversionmacro_replace_items = {'@GTK_MAJOR_VERSION@': version_parts[0],
+                                     '@GTK_MINOR_VERSION@': version_parts[1],
+                                     '@GTK_MICRO_VERSION@': version_parts[2]}
+
+    replace_multi(os.path.join(gdk_sourcedir, 'gdkversionmacros.h.in'),
+                  os.path.join(gdk_sourcedir, 'gdkversionmacros.h'),
+                  gdkversionmacro_replace_items)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

build/win32/generate-msvc.mak

@@ -0,0 +1,222 @@
+# 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/gentypefuncs.py

@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import sys
-import re
-import os
-
-debug = os.getenv('GTK_GENTYPEFUNCS_DEBUG') is not None
-
-out_file = sys.argv[1]
-in_file = sys.argv[2]
-
-funcs = []
-
-
-if debug: print ('Output file: ', out_file)
-
-# if debug: print (len(in_files), 'input files')
-
-def open_file(filename, mode):
-    if sys.version_info[0] < 3:
-        return open(filename, mode=mode)
-    else:
-        return open(filename, mode=mode, encoding='utf-8')
-
-with open(in_file, 'r') as f:
-  for line in f:
-    line = line.rstrip('\n').rstrip('\r')
-    # print line
-    match = re.search(r'\bg[td]k_[a-zA-Z0-9_]*_get_type\b', line)
-    if match:
-      func = match.group(0)
-      if not func in funcs:
-        funcs.append(func)
-        if debug: print ('Found ', func)
-
-file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
-
-funcs = sorted(funcs)
-
-for f in funcs:
-  if f.startswith('gdk_x11') or f.startswith('gtk_socket') or f.startswith('gtk_plug'):
-    file_output += '#ifdef GDK_WINDOWING_X11\n'
-    file_output += '*tp++ = {0}();\n'.format(f)
-    file_output += '#endif\n'
-  else:
-    file_output += '*tp++ = {0}();\n'.format(f)
-
-if debug: print (len(funcs), 'functions')
-
-ofile = open(out_file, "w")
-ofile.write(file_output)
-ofile.close()

build/win32/vs10/Makefile.am

@@ -33,7 +33,6 @@ EXTRA_DIST += \
 	README.txt				\
 	gtk+.sln				\
 	gtk3-prebuild.vcxproj			\
-	gtk3-prebuild.vcxproj.filters		\
 	gdk3-win32.vcxprojin			\
 	gdk3-win32.vcxproj.filtersin		\
 	gdk3-broadway.vcxprojin			\

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

@@ -17,12 +17,6 @@
   <ItemGroup>
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gentypefuncs.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
   <ItemGroup>
 #include "gtk-3.vs10.sourcefiles.filters"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>

build/win32/vs10/gtk-3.vcxprojin

@@ -162,28 +162,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml">
-      <Message>Generating GTK+ DBus Sources...</Message>
-      <Command>$(GenerateGtkDbusBuiltSources)</Command>
-      <Outputs>..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">
-      <Message>Copying GTK+ Win32 Version Resource...</Message>
-      <Command>$(CopyGtkWin32RC)</Command>
-      <Outputs>..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in">
-      <Message>Generating GTK+ Win32 Manifest...</Message>
-      <Command>$(GenerateGtkWin32Manifest)</Command>
-      <Outputs>..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gentypefuncs.py">
-      <Message>Generating ..\..\..\gtk\gtktypefuncs.c</Message>
-      <Command>$(GenerateTypeFuncs)</Command>
-      <Outputs>..\..\..\gtk\gtktypefuncs.c</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
   </ItemGroup>

build/win32/vs10/gtk3-build-defines.props

@@ -39,6 +39,7 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
       <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='16.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

build/win32/vs10/gtk3-gen-srcs.props

@@ -4,83 +4,28 @@
     <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
-    <GenGdkConfigHWin32>
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-    </GenGdkConfigHWin32>
-    <GenGdkConfigHBroadway>
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-    </GenGdkConfigHBroadway>
-    <GDbusCodeGenCmd>$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
-    <GenerateGtkDbusBuiltSources>cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSources>
-    <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
-    <GenerateGtkWin32Manifest>$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
-    <CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
-    <GenerateTypeFuncs>
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-    </GenerateTypeFuncs>
+    <GenerateRequiredSourcesBase>cd ..
+set VCInstallDir=$(VCInstallDir)
+nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
+    <GeneratedGdkSources>..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c</GeneratedGdkSources>
+    <GeneratedGtkSources>..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c</GeneratedGtkSources>
+    <GeneratedDemoSources>..\..\..\demos\gtk-demo\demos.h</GeneratedDemoSources>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3gensrcsprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
-    <BuildMacro Include="GenConfigH">
-      <Value>$(GenConfigH)</Value>
+    <BuildMacro Include="GenerateRequiredSourcesBase">
+      <Value>$(GenerateRequiredSourcesBase)</Value>
     </BuildMacro>
-    <BuildMacro Include="GenGdkConfigHWin32">
-      <Value>$(GenGdkConfigHWin32)</Value>
+    <BuildMacro Include="GeneratedGdkSources">
+      <Value>$(GeneratedGdkSources)</Value>
     </BuildMacro>
-    <BuildMacro Include="GenGdkConfigHBroadway">
-      <Value>$(GenGdkConfigHBroadway)</Value>
+    <BuildMacro Include="GeneratedGtkSources">
+      <Value>$(GeneratedGtkSources)</Value>
     </BuildMacro>
-    <BuildMacro Include="GDbusCodeGenCmd">
-      <Value>$(GDbusCodeGenCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkDbusBuiltSources">
-      <Value>$(GenerateGtkDbusBuiltSources)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyGtkWin32RC">
-      <Value>$(CopyGtkWin32RC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkWin32Manifest">
-      <Value>$(GenerateGtkWin32Manifest)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDemosH">
-      <Value>$(CopyDemosH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateTypeFuncs">
-      <Value>$(GenerateTypeFuncs)</Value>
+    <BuildMacro Include="GeneratedDemoSources">
+      <Value>$(GeneratedDemoSources)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-prebuild.vcxproj

@@ -41,46 +41,46 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
@@ -121,121 +121,19 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32_broadway">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\demos\gtk-demo\demos.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

build/win32/vs10/gtk3-prebuild.vcxproj.filters

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <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;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32_broadway"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\demos\gtk-demo\demos.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>

build/win32/vs10/gtk3-version-paths.props.in

@@ -17,11 +17,13 @@
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|Win32'">c:\python34</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|Win32'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|Win32'">c:\python36</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|Win32'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|x64'">c:\python36.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|x64'">c:\python36.x64</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|x64'">c:\python36.x64</PythonDir>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
   </PropertyGroup>
   <PropertyGroup>

build/win32/vs11/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs12/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs14/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs15/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs16/Makefile.am

@@ -0,0 +1,52 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk3-prebuild.vcxproj	\
+	gdk3-win32.vcxproj	\
+	gdk3-win32.vcxproj.filters	\
+	gdk-3.vcxproj	\
+	gdk-3.vcxproj.filters	\
+	gtk-3.vcxproj	\
+	gtk-3.vcxproj.filters	\
+	gtk-builder-tool.vcxproj		\
+	gtk-builder-tool.vcxproj.filters	\
+	gtk-encode-symbolic-svg.vcxproj	\
+	gtk-encode-symbolic-svg.vcxproj.filters	\
+	gtk-query-settings.vcxproj		\
+	gtk-query-settings.vcxproj.filters	\
+	gtk-update-icon-cache.vcxproj		\
+	gtk-update-icon-cache.vcxproj.filters	\
+	gtk3-demo.vcxproj	\
+	gtk3-demo.vcxproj.filters	\
+	gtk3-demo-application.vcxproj	\
+	gtk3-demo-application.vcxproj.filters	\
+	gtk3-icon-browser.vcxproj	\
+	gtk3-icon-browser.vcxproj.filters	\
+	gailutil-3.vcxproj	\
+	gailutil-3.vcxproj.filters	\
+	gtk3-install.vcxproj	\
+	gtk3-install.vcxproj.filters	\
+	gtk3-introspect.vcxproj		\
+	broadwayd.vcxproj	\
+	broadwayd.vcxproj.filters	\
+	gdk3-broadway.vcxproj	\
+	gdk3-broadway.vcxproj.filters	\
+	gtk3-build-defines.props	\
+	gtk3-copy-gdk-broadway.props	\
+	gtk3-gen-srcs.props	\
+	gtk3-ignore-broadway.props	\
+	gtk3-install.props	\
+	gtk3-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 16
+MSVC_VER_LONG = 16
+MSVC_TOOLSET = 142
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk

build/win32/vs9/gtk-3.vcprojin

@@ -162,126 +162,6 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File RelativePath="..\..\..\gtk\gtkdbusinterfaces.xml">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSources)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSources)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\gtk-win32.rc.body">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\libgtk3.manifest.in">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\gentypefuncs.py">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncs)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncs)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncsX64)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncsX64)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-			</File>
 			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
 			<File RelativePath="..\..\..\gtk\libgtk3.manifest" />
 		</Filter>

build/win32/vs9/gtk3-gen-srcs.vsprops

@@ -6,96 +6,19 @@
 	InheritedPropertySheets=".\gtk3-build-defines.vsprops"
 	>
 	<UserMacro
-		Name="GenConfigH"
-		Value="
-copy ..\..\..\config.h.win32 ..\..\..\config.h
-		      "
+		Name="GenerateRequiredSourcesBase"
+		Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)"
 	/>
 	<UserMacro
-		Name="GenGdkConfigHWin32"
-		Value="
-if exist ..\..\..\MSVC_$(ConfigurationName) goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD&#x0D;&#x0A;
-if exist ..\..\..\MSVC_$(ConfigurationName)_Broadway del ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;&#x0A;
-
-if exist $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib del $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; del ..\..\..\MSVC_Debug&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; del ..\..\..\MSVC_Release&#x0D;&#x0A;
-
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD&#x0D;&#x0A;
-
-echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-		      "
+		Name="GeneratedGdkSources"
+		Value="..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c"
 	/>
 	<UserMacro
-		Name="GenGdkConfigHBroadway"
-		Value="
-if exist ..\..\..\MSVC_$(ConfigurationName)_Broadway goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD&#x0D;&#x0A;
-
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release&#x0D;&#x0A;
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; del ..\..\..\MSVC_Debug_Broadway&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; del ..\..\..\MSVC_Release_Broadway&#x0D;&#x0A;
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD&#x0D;&#x0A;
-
-echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-		      "
+		Name="GeneratedGtkSources"
+		Value="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c"
 	/>
 	<UserMacro
-		Name="GDbusCodeGenCmd"
-		Value="$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml"
-	/>
-	<UserMacro
-		Name="GenerateGtkDbusBuiltSources"
-		Value="cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
-	/>
-	<UserMacro
-		Name="GenerateGtkDbusBuiltSourcesX64"
-		Value="cd ..\..\..\gtk &amp; $(PythonDirX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
-	/>
-	<UserMacro
-		Name="CopyGtkWin32RC"
-		Value="copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc"
-	/>
-	<UserMacro
-		Name="GenerateGtkWin32Manifest"
-		Value="$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
-	/>
-	<UserMacro
-		Name="CopyDemosH"
-		Value="copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h"
-	/>
-	<UserMacro
-		Name="GenerateTypeFuncs"
-		Value="
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-echo #include &quot;gtkx.h&quot; &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\&quot;Gtk\&quot; /DGTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot; /DGTK_PRINT_BACKENDS=\&quot;file\&quot; /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot; /DGTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot; /DGTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot; /DGTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot; /DMULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot; /DMULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot; /DGTK_VERSION=\&quot;$(GtkVersion)\&quot; /DGTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot; /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-$(PythonDir)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenerateTypeFuncsX64"
-		Value="
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-echo #include &quot;gtkx.h&quot; &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\&quot;Gtk\&quot; /DGTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot; /DGTK_PRINT_BACKENDS=\&quot;file\&quot; /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot; /DGTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot; /DGTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot; /DGTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot; /DMULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot; /DMULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot; /DGTK_VERSION=\&quot;$(GtkVersion)\&quot; /DGTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot; /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-$(PythonDirX64)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-		      "
+		Name="GeneratedDemoSources"
+		Value="..\..\..\demos\gtk-demo\demos.h"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk3-prebuild.vcproj

@@ -21,262 +21,127 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug_Broadway|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug_Broadway|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release_Broadway|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release_Broadway|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\..\config.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gdk\gdkconfig.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gdk\gdkconfig.h.win32_broadway">
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\demos\gtk-demo\demos.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

config.h.meson

@@ -20,9 +20,6 @@
 /* define if we have colord */
 #mesondefine HAVE_COLORD
 
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#mesondefine HAVE_CRT_EXTERNS_H
-
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #mesondefine HAVE_DCGETTEXT
@@ -62,12 +59,6 @@
 /* defines whether we have HarfBuzz */
 #mesondefine HAVE_HARFBUZZ
 
-/* Define to 1 if you have the `httpGetAuthString' function. */
-#mesondefine HAVE_HTTPGETAUTHSTRING
-
-/* Define if cups http_t authstring field is accessible */
-#mesondefine HAVE_HTTP_AUTHSTRING
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #mesondefine HAVE_INTTYPES_H
 
@@ -125,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
 
@@ -149,6 +143,9 @@
 /* Define to 1 if you have the <sys/param.h> header file. */
 #mesondefine HAVE_SYS_PARAM_H
 
+/* Have the sysprof-capture library */
+#mesondefine HAVE_SYSPROF_CAPTURE
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #mesondefine HAVE_SYS_STAT_H
 
@@ -212,12 +209,6 @@
 /* Define if _NL_TIME_FIRST_WEEKDAY is available */
 #mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
 
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-#mesondefine HAVE__NSGETENVIRON
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-#mesondefine NEED_XIPROTO_H_FOR_XREPLY
-
 /* Define to the address where bug reports for this package should be sent. */
 #mesondefine PACKAGE_BUGREPORT
 

config.h.win32.in

@@ -26,9 +26,6 @@
 /* define if we have colord */
 /* #undef HAVE_COLORD */
 
-/* Define to 1 if you have the <crt_externs.h> header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
@@ -74,12 +71,6 @@
 /* Define if gio-unix is available */
 /* #undef HAVE_GIO_UNIX */
 
-/* Define to 1 if you have the `httpGetAuthString' function. */
-/* #undef HAVE_HTTPGETAUTHSTRING */
-
-/* Define if cups http_t authstring field is accessible */
-/* #undef HAVE_HTTP_AUTHSTRING */
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #if !defined (_MSC_VER) || (_MSC_VER >= 1800)
 #define HAVE_INTTYPES_H 1
@@ -254,16 +245,10 @@
 /* Define if _NL_TIME_FIRST_WEEKDAY is available */
 /* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
 
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #define LT_OBJDIR ".libs/"
 
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #ifndef _MSC_VER
 /* #undef NO_MINUS_C_MINUS_O */

configure.ac

@@ -10,8 +10,8 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [8])
-m4_define([gtk_interface_age], [4])
+m4_define([gtk_micro_version], [13])
+m4_define([gtk_interface_age], [9])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
 m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [53])
-m4_define([glib_required_micro], [4])
+m4_define([glib_required_minor], [57])
+m4_define([glib_required_micro], [2])
 m4_define([glib_required_version],
           [glib_required_major.glib_required_minor.glib_required_micro])
 m4_define([glib_min_required_minor],
@@ -61,11 +61,10 @@ 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.12])
-m4_define([mirclient_required_version], [0.22.0])
-m4_define([mircookie_required_version], [0.17.0])
+m4_define([wayland_protocols_required_version], [1.14])
 m4_define([epoxy_required_version], [1.4])
 m4_define([cloudproviders_required_version], [0.2.5])
+m4_define([sysprof_required_version], [3.33.2])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -343,23 +342,23 @@ 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])],
                               [cloudproviders_set=yes])
 
+AC_ARG_ENABLE(profiler,
+              [AS_HELP_STRING([--enable-profiler],
+                              [enable profiler integration])],
+              [enable_profiler=$enableval],
+              [enable_profiler=no])
+
 if test -z "$backend_set"; then
   if test "$platform_win32" = yes; then
     enable_win32_backend=yes
   else
     enable_x11_backend=yes
     enable_wayland_backend=maybe
-    enable_mir_backend=no
   fi
 fi
 
@@ -472,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#* }
 
@@ -751,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"
   ],
   []
 )
@@ -845,10 +846,6 @@ AC_CHECK_LIB(m,round,,)
 AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
 
-# Checks for gdkspawn
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNCS(_NSGetEnviron)
-
 AC_MSG_CHECKING(whether to build dynamic modules)
 
 AC_ARG_ENABLE(modules,
@@ -1048,17 +1045,6 @@ if test "x$enable_x11_backend" = xyes; then
   AC_CHECK_FUNC(XextFindDisplay, :,
                 AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
 
-  # Check if <X11/extensions/XIproto.h> is needed for xReply.
-
-  AC_CHECK_TYPE([xReply], ,
-                [AC_CHECK_TYPE([xReply],
-                               [AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
-                                          [Define if <X11/extensions/XIproto.h> needed for xReply])],
-                               [AC_MSG_ERROR([xReply type unavailable. X11 is too old])],
-                               [[#include <X11/extensions/XIproto.h>
-                                 #include <X11/Xlibint.h>]])],
-                [[#include <X11/Xlibint.h>]])
-
   # Check for XKB support.
 
   if test "x$enable_xkb" = "xyes"; then
@@ -1334,11 +1320,26 @@ if test "x$cloudproviders_set" = "xyes"; then
   fi
 fi
 
+# Check for profiler support
+
+PROFILER_PACKAGES=""
+if test "x$enable_profiler" = "xyes"; then
+  PROFILER_PACKAGES="sysprof-capture-3 >= sysprof_required_version"
+  if $PKG_CONFIG --exists $PROFILER_PACKAGES; then
+    AC_DEFINE(HAVE_SYSPROF_CAPTURE, [1],
+              [Define if sysprof-capture-3 is available]
+              )
+  else
+    AC_MSG_ERROR([
+*** sysprof-capture-3 not found.])
+  fi
+fi
+
 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 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"
@@ -1372,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
@@ -1504,12 +1505,13 @@ else
     CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
     CUPS_LIBS=`$CUPS_CONFIG --libs`
 
-    CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
+    CUPS_API_VERSION=`$CUPS_CONFIG --version`
     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 
-    if test $CUPS_API_MAJOR -lt 2; then
-      AC_MSG_ERROR([CUPS >= 2.0 not found])
+    if test $CUPS_API_MAJOR -lt 1 -o \
+            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 7; then
+      AC_MSG_ERROR([CUPS >= 1.7 not found])
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1522,22 +1524,6 @@ else
     PRINT_BACKENDS="$PRINT_BACKENDS cups"
     AM_CONDITIONAL(HAVE_CUPS, true)
     have_cups=yes
-
-    gtk_save_cflags="$CFLAGS"
-    CFLAGS="$CUPS_CFLAGS"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cups/http.h>]],
-                                       [[http_t http; char *s = http.authstring;]])],
-                      [AC_DEFINE([HAVE_HTTP_AUTHSTRING], [],
-                                 [Define if cups http_t authstring field is accessible])],
-                      [])
-    CFLAGS="$gtk_save_cflags"
-
-    AC_SUBST(HAVE_HTTP_AUTHSTRING)
-
-    gtk_save_libs="$LIBS"
-    LIBS="$CUPS_LIBS"
-    AC_CHECK_FUNCS(httpGetAuthString)
-    LIBS="$gtk_save_libs"
   fi
 fi
 
@@ -1956,6 +1942,7 @@ 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
@@ -1964,6 +1951,7 @@ build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile
 build/win32/vs15/Makefile
+build/win32/vs16/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -1972,7 +1960,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
@@ -2012,3 +1999,4 @@ echo "        colord support:       $have_colord"
 echo "        Introspection:        $found_introspection"
 echo "        Debugging:            $enable_debug"
 echo "        Documentation:        $enable_gtk_doc"
+echo "        Profiler:             $enable_profiler"

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/geninclude.py

@@ -33,7 +33,7 @@ demos = []
 for demo_file in in_files:
     filename =  demo_file[demo_file.rfind('/')+1:]
     demo_name = filename.replace(".c", "")
-    with open(demo_file, 'r') as f:
+    with open(demo_file, 'r', encoding='utf-8') as f:
         title = f.readline().replace("/*", "").strip()
 
 
@@ -103,6 +103,6 @@ for demo in demos:
 
 file_output += "  { NULL }\n};\n"
 
-ofile = open(out_file, "w")
+ofile = open(out_file, "w", encoding="utf-8")
 ofile.write(file_output)
 ofile.close()

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/widget-factory/widget-factory.c

@@ -1704,7 +1704,7 @@ activate (GApplication *app)
   gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css");
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
-                                             GTK_STYLE_PROVIDER_PRIORITY_USER);
+                                             GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   g_object_unref (provider);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui");

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			\

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/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/gtk3-sections.txt

@@ -1402,6 +1402,10 @@ gtk_file_chooser_get_preview_filename
 gtk_file_chooser_get_preview_uri
 gtk_file_chooser_set_extra_widget
 gtk_file_chooser_get_extra_widget
+gtk_file_chooser_add_choice
+gtk_file_chooser_remove_choice
+gtk_file_chooser_set_choice
+gtk_file_chooser_get_choice
 gtk_file_chooser_add_filter
 gtk_file_chooser_remove_filter
 gtk_file_chooser_list_filters

docs/reference/gtk/meson.build

@@ -395,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/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

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 =
 
@@ -129,6 +129,7 @@ gdk_private_headers = 				\
 	gdkframeclockprivate.h			\
 	gdkglcontextprivate.h			\
 	gdkmonitorprivate.h			\
+	gdkprofilerprivate.h			\
 	gdkscreenprivate.h			\
 	gdkseatprivate.h			\
 	gdkseatdefaultprivate.h			\
@@ -170,6 +171,7 @@ gdk_c_sources = 				\
 	gdkframeclockidle.c			\
 	gdkpango.c				\
 	gdkpixbuf-drawable.c			\
+	gdkprofiler.c				\
 	gdkproperty.c				\
 	gdkrectangle.c				\
 	gdkrgba.c				\
@@ -220,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
 
@@ -238,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 = 		\
@@ -449,6 +446,7 @@ gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
 gdkmarshalers.h: gdkmarshalers.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
 		--prefix=_gdk_marshal \
+		--valist-marshallers \
 		--header \
 		$(srcdir)/gdkmarshalers.list > gdkmarshalers-h.tmp \
 	&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
@@ -456,6 +454,7 @@ gdkmarshalers.h: gdkmarshalers.list
 gdkmarshalers.c: gdkmarshalers.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
 		--prefix=_gdk_marshal \
+		--valist-marshallers \
 		--body \
 		$(srcdir)/gdkmarshalers.list > gdkmarshalers-c.tmp	\
 	&& mv gdkmarshalers-c.tmp gdkmarshalers.c \

gdk/gdk-private.c

@@ -1,5 +1,6 @@
 #include "config.h"
 #include "gdk-private.h"
+#include "gdkprofilerprivate.h"
 
 GdkPrivateVTable *
 gdk__private__ (void)
@@ -19,6 +20,9 @@ gdk__private__ (void)
     gdk_display_set_debug_updates,
     gdk_get_desktop_startup_id,
     gdk_get_desktop_autostart_id,
+    gdk_profiler_is_running,
+    gdk_profiler_start,
+    gdk_profiler_stop
   };
 
   return &table;

gdk/gdk-private.h

@@ -62,6 +62,10 @@ typedef struct {
 
   const gchar * (* gdk_get_desktop_startup_id)   (void);
   const gchar * (* gdk_get_desktop_autostart_id) (void);
+
+  gboolean (* gdk_profiler_is_running) (void);
+  void     (* gdk_profiler_start)      (int fd);
+  void     (* gdk_profiler_stop)       (void);
 } GdkPrivateVTable;
 
 GDK_AVAILABLE_IN_ALL

gdk/gdk.c

@@ -27,6 +27,7 @@
 #include "gdkversionmacros.h"
 #include "gdkmain.h"
 
+#include "gdkprofilerprivate.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
 
@@ -315,6 +316,10 @@ gdk_pre_parse (void)
       _gdk_debug_flags = g_parse_debug_string (debug_string,
                                               (GDebugKey *) gdk_debug_keys,
                                               G_N_ELEMENTS (gdk_debug_keys));
+    if (g_getenv ("GTK_TRACE_FD"))
+      gdk_profiler_start (atoi (g_getenv ("GTK_TRACE_FD")));
+    else if (g_getenv ("GTK_TRACE"))
+      gdk_profiler_start (-1);
   }
 #endif  /* G_ENABLE_DEBUG */
 

gdk/gdkconfig.h.meson

@@ -14,6 +14,7 @@ G_BEGIN_DECLS
 #mesondefine GDK_WINDOWING_BROADWAY
 #mesondefine GDK_WINDOWING_WAYLAND
 #mesondefine GDK_WINDOWING_WIN32
+#mesondefine GDK_WINDOWING_QUARTZ
 
 G_END_DECLS
 

gdk/gdkdevice.c

@@ -367,7 +367,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1, GDK_TYPE_DEVICE_TOOL);
 }
 

gdk/gdkdevicemanager.c

@@ -203,7 +203,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDeviceManagerClass, device_added),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -222,7 +222,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDeviceManagerClass, device_removed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -248,7 +248,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDeviceManagerClass, device_changed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 }

gdk/gdkdisplay.c

@@ -196,6 +196,9 @@ gdk_display_class_init (GdkDisplayClass *class)
 		  G_TYPE_NONE,
 		  1,
 		  G_TYPE_BOOLEAN);
+  g_signal_set_va_marshaller (signals[CLOSED],
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              _gdk_marshal_VOID__BOOLEANv);
 
   /**
    * GdkDisplay::seat-added:
@@ -212,7 +215,7 @@ gdk_display_class_init (GdkDisplayClass *class)
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
 		  G_TYPE_NONE, 1, GDK_TYPE_SEAT);
 
   /**
@@ -230,7 +233,7 @@ gdk_display_class_init (GdkDisplayClass *class)
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
 		  G_TYPE_NONE, 1, GDK_TYPE_SEAT);
 
   /**
@@ -248,7 +251,7 @@ gdk_display_class_init (GdkDisplayClass *class)
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
 		  G_TYPE_NONE, 1, GDK_TYPE_MONITOR);
 
   /**
@@ -266,7 +269,7 @@ gdk_display_class_init (GdkDisplayClass *class)
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
 		  G_TYPE_NONE, 1, GDK_TYPE_MONITOR);
 }
 

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
@@ -162,6 +152,9 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
                   G_TYPE_NONE,
                   1,
                   GDK_TYPE_DISPLAY);
+  g_signal_set_va_marshaller (signals[DISPLAY_OPENED],
+                              G_TYPE_FROM_CLASS (klass),
+                              _gdk_marshal_VOID__OBJECTv);
 
   g_object_class_install_property (object_class,
                                    PROP_DEFAULT_DISPLAY,
@@ -273,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/gdkdnd.c

@@ -289,7 +289,7 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDragContextClass, cancel),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__ENUM,
+                  NULL,
                   G_TYPE_NONE, 1, GDK_TYPE_DRAG_CANCEL_REASON);
 
   /**
@@ -311,7 +311,7 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDragContextClass, drop_performed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__INT,
+                  NULL,
                   G_TYPE_NONE, 1, G_TYPE_INT);
 
   /**
@@ -356,7 +356,7 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDragContextClass, action_changed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__FLAGS,
+                  NULL,
                   G_TYPE_NONE, 1, GDK_TYPE_DRAG_ACTION);
 }
 

gdk/gdkevents.c

@@ -1363,7 +1363,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 +1439,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
  **/

gdk/gdkframeclock.c

@@ -26,6 +26,7 @@
 
 #include "gdkframeclockprivate.h"
 #include "gdkinternals.h"
+#include "gdkprofilerprivate.h"
 
 /**
  * SECTION:gdkframeclock
@@ -80,6 +81,10 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
+#ifdef G_ENABLE_DEBUG
+static guint fps_counter;
+#endif
+
 #define FRAME_HISTORY_MAX_LENGTH 16
 
 struct _GdkFrameClockPrivate
@@ -238,6 +243,11 @@ gdk_frame_clock_init (GdkFrameClock *clock)
 
   priv->frame_counter = -1;
   priv->current = FRAME_HISTORY_MAX_LENGTH - 1;
+
+#ifdef G_ENABLE_DEBUG
+  if (fps_counter == 0)
+    fps_counter = gdk_profiler_define_counter ("fps", "Frames per Second");
+#endif
 }
 
 /**
@@ -644,3 +654,105 @@ _gdk_frame_clock_emit_resume_events (GdkFrameClock *frame_clock)
 {
   g_signal_emit (frame_clock, signals[RESUME_EVENTS], 0);
 }
+
+#ifdef G_ENABLE_DEBUG
+static gint64
+guess_refresh_interval (GdkFrameClock *frame_clock)
+{
+  gint64 interval;
+  gint64 i;
+
+  interval = G_MAXINT64;
+
+  for (i = gdk_frame_clock_get_history_start (frame_clock);
+       i < gdk_frame_clock_get_frame_counter (frame_clock);
+       i++)
+    {
+      GdkFrameTimings *t, *before;
+      gint64 ts, before_ts;
+
+      t = gdk_frame_clock_get_timings (frame_clock, i);
+      before = gdk_frame_clock_get_timings (frame_clock, i - 1);
+      if (t == NULL || before == NULL)
+        continue;
+
+      ts = gdk_frame_timings_get_frame_time (t);
+      before_ts = gdk_frame_timings_get_frame_time (before);
+      if (ts == 0 || before_ts == 0)
+        continue;
+
+      interval = MIN (interval, ts - before_ts);
+    }
+
+  if (interval == G_MAXINT64)
+    return 0;
+
+  return interval;
+}
+
+static double
+frame_clock_get_fps (GdkFrameClock *frame_clock)
+{
+  GdkFrameTimings *start, *end;
+  gint64 start_counter, end_counter;
+  gint64 start_timestamp, end_timestamp;
+  gint64 interval;
+
+  start_counter = gdk_frame_clock_get_history_start (frame_clock);
+  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
+  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
+  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
+       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
+       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
+    end_counter--;
+  if (end_counter - start_counter < 4)
+    return 0.0;
+
+  start_timestamp = gdk_frame_timings_get_presentation_time (start);
+  end_timestamp = gdk_frame_timings_get_presentation_time (end);
+  if (start_timestamp == 0 || end_timestamp == 0)
+    {
+      start_timestamp = gdk_frame_timings_get_frame_time (start);
+      end_timestamp = gdk_frame_timings_get_frame_time (end);
+    }
+  interval = gdk_frame_timings_get_refresh_interval (end);
+  if (interval == 0)
+    {
+      interval = guess_refresh_interval (frame_clock);
+      if (interval == 0)
+        return 0.0;
+    }   
+    
+  return ((double) end_counter - start_counter) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
+}
+#endif
+
+void
+_gdk_frame_clock_add_timings_to_profiler (GdkFrameClock   *clock,
+                                          GdkFrameTimings *timings)
+{
+#ifdef G_ENABLE_DEBUG
+  gdk_profiler_add_mark (timings->frame_time * 1000,
+                         (timings->frame_end_time - timings->frame_time) * 1000,
+                         "frame", "");
+
+  if (timings->layout_start_time != 0)
+    gdk_profiler_add_mark (timings->layout_start_time * 1000,
+                           (timings->paint_start_time - timings->layout_start_time) * 1000,
+                            "layout", "");
+
+  if (timings->paint_start_time != 0)
+    gdk_profiler_add_mark (timings->paint_start_time * 1000,
+                           (timings->frame_end_time - timings->paint_start_time) * 1000,
+                            "paint", "");
+
+  if (timings->presentation_time != 0)
+    gdk_profiler_add_mark (timings->presentation_time * 1000,
+                           0,
+                           "presentation", "");
+
+  gdk_profiler_set_counter (fps_counter,
+                            timings->frame_end_time * 1000,
+                            frame_clock_get_fps (clock));
+#endif
+}

gdk/gdkframeclockidle.c

@@ -27,6 +27,7 @@
 #include "gdkinternals.h"
 #include "gdkframeclockprivate.h"
 #include "gdkframeclockidle.h"
+#include "gdkprofilerprivate.h"
 #include "gdk.h"
 
 #ifdef G_OS_WIN32
@@ -40,6 +41,9 @@ struct _GdkFrameClockIdlePrivate
   gint64 frame_time;
   gint64 min_next_frame_time;
   gint64 sleep_serial;
+#ifdef G_ENABLE_DEBUG
+  gint64 freeze_time;
+#endif
 
   guint flush_idle_id;
   guint paint_idle_id;
@@ -402,7 +406,7 @@ gdk_frame_clock_paint_idle (void *data)
             {
 	      int iter;
 #ifdef G_ENABLE_DEBUG
-              if (GDK_DEBUG_CHECK (FRAMES))
+              if (GDK_DEBUG_CHECK (FRAMES) || gdk_profiler_is_running ())
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_LAYOUT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT))
@@ -431,7 +435,7 @@ gdk_frame_clock_paint_idle (void *data)
           if (priv->freeze_count == 0)
             {
 #ifdef G_ENABLE_DEBUG
-              if (GDK_DEBUG_CHECK (FRAMES))
+              if (GDK_DEBUG_CHECK (FRAMES) || gdk_profiler_is_running ())
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_PAINT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT))
@@ -457,7 +461,7 @@ gdk_frame_clock_paint_idle (void *data)
               priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
 
 #ifdef G_ENABLE_DEBUG
-              if (GDK_DEBUG_CHECK (FRAMES))
+              if (GDK_DEBUG_CHECK (FRAMES) || gdk_profiler_is_running ())
                 timings->frame_end_time = g_get_monotonic_time ();
 #endif /* G_ENABLE_DEBUG */
             }
@@ -559,6 +563,14 @@ gdk_frame_clock_idle_freeze (GdkFrameClock *clock)
   GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
   GdkFrameClockIdlePrivate *priv = clock_idle->priv;
 
+#ifdef G_ENABLE_DEBUG
+  if (priv->freeze_count == 0)
+    {
+      if (gdk_profiler_is_running ())
+        priv->freeze_time = g_get_monotonic_time ();
+    }
+#endif
+
   priv->freeze_count++;
   maybe_stop_idle (clock_idle);
 }
@@ -583,6 +595,20 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
         priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
 
       priv->sleep_serial = get_sleep_serial ();
+
+#ifdef G_ENABLE_DEBUG
+      if (gdk_profiler_is_running ())
+        {
+          if (priv->freeze_time != 0)
+            {
+              gint64 thaw_time = g_get_monotonic_time ();
+              gdk_profiler_add_mark (priv->freeze_time * 1000,
+                                     (thaw_time - priv->freeze_time) * 1000,
+                                     "freeze", "");
+              priv->freeze_time = 0;
+            }
+        }
+#endif
     }
 }
 

gdk/gdkframeclockprivate.h

@@ -110,6 +110,8 @@ void _gdk_frame_clock_thaw   (GdkFrameClock *clock);
 void _gdk_frame_clock_begin_frame         (GdkFrameClock   *clock);
 void _gdk_frame_clock_debug_print_timings (GdkFrameClock   *clock,
                                            GdkFrameTimings *timings);
+void _gdk_frame_clock_add_timings_to_profiler (GdkFrameClock *frame_clock,
+                                               GdkFrameTimings *timings);
 
 GdkFrameTimings *_gdk_frame_timings_new   (gint64           frame_counter);
 gboolean         _gdk_frame_timings_steal (GdkFrameTimings *timings,

gdk/gdkinternals.h

@@ -322,6 +322,8 @@ struct _GdkWindow
   GdkWindowState old_state;
   GdkWindowState state;
 
+  guint synthesized_crossing_event_id;
+
   guint8 alpha;
   guint8 fullscreen_mode;
 
@@ -337,7 +339,6 @@ struct _GdkWindow
   guint focus_on_map : 1;
   guint shaped : 1;
   guint support_multidevice : 1;
-  guint synthesize_crossing_event_queued : 1;
   guint effective_visibility : 2;
   guint visibility : 2; /* The visibility wrt the toplevel (i.e. based on clip_region) */
   guint native_visibility : 2; /* the native visibility of a impl windows */

gdk/gdkmonitor.c

@@ -155,6 +155,7 @@ gdk_monitor_finalize (GObject *object)
 {
   GdkMonitor *monitor = GDK_MONITOR (object);
 
+  g_free (monitor->connector);
   g_free (monitor->manufacturer);
   g_free (monitor->model);
 
@@ -354,11 +355,32 @@ gdk_monitor_get_height_mm (GdkMonitor *monitor)
   return monitor->height_mm;
 }
 
+/*< private >
+ * gdk_monitor_get_connector:
+ * @monitor: a #GdkMonitor
+ *
+ * Gets the name of the monitor's connector, if available.
+ *
+ * Returns: (transfer none) (nullable): the name of the connector
+ */
+const char *
+gdk_monitor_get_connector (GdkMonitor *monitor)
+{
+  g_return_val_if_fail (GDK_IS_MONITOR (monitor), NULL);
+
+  return monitor->connector;
+}
+
 /**
  * gdk_monitor_get_manufacturer:
  * @monitor: a #GdkMonitor
  *
- * Gets the name of the monitor's manufacturer, if available.
+ * Gets the name or PNP ID of the monitor's manufacturer, if available.
+ *
+ * Note that this value might also vary depending on actual
+ * display backend.
+ *
+ * PNP ID registry is located at https://uefi.org/pnp_id_list
  *
  * Returns: (transfer none) (nullable): the name of the manufacturer, or %NULL
  */
@@ -493,6 +515,16 @@ gdk_monitor_set_model (GdkMonitor *monitor,
   g_object_notify (G_OBJECT (monitor), "model");
 }
 
+void
+gdk_monitor_set_connector (GdkMonitor *monitor,
+                           const char *connector)
+{
+  g_free (monitor->connector);
+  monitor->connector = g_strdup (connector);
+
+  /* g_object_notify (G_OBJECT (monitor), "connector"); */
+}
+
 void
 gdk_monitor_set_position (GdkMonitor *monitor,
                           int         x,

gdk/gdkmonitorprivate.h

@@ -36,6 +36,7 @@ struct _GdkMonitor {
   GdkDisplay *display;
   char *manufacturer;
   char *model;
+  char *connector;
   GdkRectangle geometry;
   int width_mm;
   int height_mm;
@@ -57,6 +58,9 @@ void            gdk_monitor_set_manufacturer    (GdkMonitor *monitor,
                                                  const char *manufacturer);
 void            gdk_monitor_set_model           (GdkMonitor *monitor,
                                                  const char *model);
+void            gdk_monitor_set_connector       (GdkMonitor *monitor,
+                                                 const char *connector);
+const char *    gdk_monitor_get_connector       (GdkMonitor *monitor);
 void            gdk_monitor_set_position        (GdkMonitor *monitor,
                                                  int         x,
                                                  int         y);

gdk/gdkprofiler.c

@@ -0,0 +1,230 @@
+/* GDK - The GIMP Drawing Kit
+ *
+ * gdkprofiler.c: A simple profiler
+ *
+ * Copyright © 2018 Matthias Clasen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "gdkversionmacros.h"
+#include "gdkprofilerprivate.h"
+#include "gdkframeclockprivate.h"
+
+#ifdef HAVE_SYSPROF_CAPTURE
+
+#include <sysprof-capture.h>
+
+static SysprofCaptureWriter *writer = NULL;
+static gboolean running = FALSE;
+
+static void
+profiler_stop (void)
+{
+  if (writer)
+    sysprof_capture_writer_unref (writer);
+}
+
+void
+gdk_profiler_start (int fd)
+{
+  if (writer)
+    return;
+
+  sysprof_clock_init ();
+
+  if (fd == -1)
+    {
+      gchar *filename;
+
+      filename = g_strdup_printf ("gtk.%d.syscap", getpid ());
+      g_print ("Writing profiling data to %s\n", filename);
+      writer = sysprof_capture_writer_new (filename, 16*1024);
+      g_free (filename);
+    }
+  else if (fd > 2)
+    writer = sysprof_capture_writer_new_from_fd (fd, 16*1024);
+
+  if (writer)
+    running = TRUE;
+
+  atexit (profiler_stop);
+}
+
+void
+gdk_profiler_stop (void)
+{
+  running = FALSE;
+}
+
+gboolean
+gdk_profiler_is_running (void)
+{
+  return running;
+}
+
+void
+gdk_profiler_add_mark (gint64      start,
+                       guint64     duration,
+                       const char *name,
+                       const char *message)
+{
+  if (!running)
+    return;
+
+  sysprof_capture_writer_add_mark (writer,
+                                   start,
+                                   -1, getpid (),
+                                   duration,
+                                   "gtk", name, message);
+}
+
+static guint
+define_counter (const char *name,
+                const char *description,
+                int         type)
+{
+  SysprofCaptureCounter counter;
+
+  if (!writer)
+    return 0;
+
+  counter.id = (guint) sysprof_capture_writer_request_counter (writer, 1);
+  counter.type = type;
+  counter.value.vdbl = 0;
+  g_strlcpy (counter.category, "gtk", sizeof counter.category);
+  g_strlcpy (counter.name, name, sizeof counter.name);
+  g_strlcpy (counter.description, description, sizeof counter.name);
+
+  sysprof_capture_writer_define_counters (writer,
+                                          SYSPROF_CAPTURE_CURRENT_TIME,
+                                          -1,
+                                          getpid (),
+                                          &counter,
+                                          1);
+
+  return counter.id;
+}
+
+guint
+gdk_profiler_define_counter (const char *name,
+                             const char *description)
+{
+  return define_counter (name, description, SYSPROF_CAPTURE_COUNTER_DOUBLE);
+}
+
+guint
+gdk_profiler_define_int_counter (const char *name,
+                                 const char *description)
+{
+  return define_counter (name, description, SYSPROF_CAPTURE_COUNTER_INT64);
+}
+
+void
+gdk_profiler_set_counter (guint  id,
+                          gint64 time,
+                          double val)
+{
+  SysprofCaptureCounterValue value;
+
+  if (!running)
+    return;
+
+  value.vdbl = val;
+  sysprof_capture_writer_set_counters (writer,
+                                       time,
+                                       -1, getpid (),
+                                       &id, &value, 1);
+}
+
+void
+gdk_profiler_set_int_counter (guint  id,
+                              gint64 time,
+                              gint64 val)
+{
+  SysprofCaptureCounterValue value;
+
+  if (!running)
+    return;
+
+  value.v64 = val;
+  sysprof_capture_writer_set_counters (writer,
+                                       time,
+                                       -1, getpid (),
+                                       &id, &value, 1);
+}
+
+#else
+
+void
+gdk_profiler_start (int fd)
+{
+}
+
+void
+gdk_profiler_stop (void)
+{
+}
+
+gboolean
+gdk_profiler_is_running (void)
+{
+  return FALSE;
+}
+
+void
+gdk_profiler_add_mark (gint64      start,
+                       guint64     duration,
+                       const char *name,
+                       const char *message)
+{
+}
+
+guint
+gdk_profiler_define_counter (const char *name,
+                             const char *description)
+{
+ return 0;
+}
+
+void
+gdk_profiler_set_counter (guint  id,
+                          gint64 time,
+                          double value)
+{
+}
+
+guint
+gdk_profiler_define_int_counter (const char *name,
+                                 const char *description)
+{
+  return 0;
+}
+
+void
+gdk_profiler_set_int_counter (guint  id,
+                              gint64 time,
+                              gint64 value)
+{
+}
+
+#endif /* G_OS_WIN32 */

gdk/gdkprofilerprivate.h

@@ -0,0 +1,46 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GDK_PROFILER_PRIVATE_H__
+#define __GDK_PROFILER_PRIVATE_H__
+
+#include "gdk/gdkframeclock.h"
+#include "gdk/gdkdisplay.h"
+
+G_BEGIN_DECLS
+
+void     gdk_profiler_start              (int         fd);
+void     gdk_profiler_stop               (void);
+gboolean gdk_profiler_is_running         (void);
+void     gdk_profiler_add_mark           (gint64      start,
+                                          guint64     duration,
+                                          const char *name,
+                                          const char *message);
+guint    gdk_profiler_define_counter     (const char *name,
+                                          const char *description);
+void     gdk_profiler_set_counter        (guint       id,
+                                          gint64      time,
+                                          double      value);
+guint    gdk_profiler_define_int_counter (const char *name,
+                                          const char *description);
+void     gdk_profiler_set_int_counter    (guint       id,
+                                          gint64      time,
+                                          gint64      value);
+
+G_END_DECLS
+
+#endif  /* __GDK_PROFILER_PRIVATE_H__ */

gdk/gdkscreen.c

@@ -21,8 +21,10 @@
 
 #include "config.h"
 
-#include "gdkinternals.h"
 #include "gdkscreenprivate.h"
+
+#include "gdkinternals.h"
+#include "gdkmonitorprivate.h"
 #include "gdkrectangle.h"
 #include "gdkwindow.h"
 #include "gdkintl.h"
@@ -821,7 +823,7 @@ gdk_screen_get_monitor_plug_name (GdkScreen *screen,
 
   g_return_val_if_fail (monitor != NULL, NULL);
 
-  return g_strdup (gdk_monitor_get_model (monitor));
+  return g_strdup (gdk_monitor_get_connector (monitor));
 }
 
 /**

gdk/gdkseat.c

@@ -124,7 +124,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkSeatClass, device_added),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -144,7 +144,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkSeatClass, device_removed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -167,7 +167,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__BOXED,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE_TOOL);
 
@@ -186,7 +186,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__BOXED,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE_TOOL);
 

gdk/gdkwindow.c

@@ -382,6 +382,9 @@ gdk_window_class_init (GdkWindowClass *klass)
 		  2,
 		  G_TYPE_DOUBLE,
 		  G_TYPE_DOUBLE);
+  g_signal_set_va_marshaller (signals[PICK_EMBEDDED_CHILD],
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              _gdk_marshal_OBJECT__DOUBLE_DOUBLEv);
 
   /**
    * GdkWindow::to-embedder:
@@ -413,6 +416,9 @@ gdk_window_class_init (GdkWindowClass *klass)
 		  G_TYPE_DOUBLE,
 		  G_TYPE_POINTER,
 		  G_TYPE_POINTER);
+  g_signal_set_va_marshaller (signals[TO_EMBEDDER],
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTERv);
 
   /**
    * GdkWindow::from-embedder:
@@ -444,6 +450,9 @@ gdk_window_class_init (GdkWindowClass *klass)
 		  G_TYPE_DOUBLE,
 		  G_TYPE_POINTER,
 		  G_TYPE_POINTER);
+  g_signal_set_va_marshaller (signals[FROM_EMBEDDER],
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTERv);
 
   /**
    * GdkWindow::create-surface:
@@ -477,6 +486,9 @@ gdk_window_class_init (GdkWindowClass *klass)
                   2,
                   G_TYPE_INT,
                   G_TYPE_INT);
+  g_signal_set_va_marshaller (signals[CREATE_SURFACE],
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              _gdk_marshal_BOXED__INT_INTv);
 
   /**
    * GdkWindow::moved-to-rect:
@@ -517,6 +529,9 @@ gdk_window_class_init (GdkWindowClass *klass)
                   G_TYPE_POINTER,
                   G_TYPE_BOOLEAN,
                   G_TYPE_BOOLEAN);
+  g_signal_set_va_marshaller (signals[MOVED_TO_RECT],
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              _gdk_marshal_VOID__POINTER_POINTER_BOOLEAN_BOOLEANv);
 }
 
 static void
@@ -555,6 +570,12 @@ gdk_window_finalize (GObject *object)
 	_gdk_window_destroy (window, TRUE);
     }
 
+  if (window->synthesized_crossing_event_id)
+    {
+      g_source_remove (window->synthesized_crossing_event_id);
+      window->synthesized_crossing_event_id = 0;
+    }
+
   if (window->impl)
     {
       g_object_unref (window->impl);
@@ -2643,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;
@@ -8962,7 +8984,7 @@ do_synthesize_crossing_event (gpointer data)
 
   changed_toplevel = data;
 
-  changed_toplevel->synthesize_crossing_event_queued = FALSE;
+  changed_toplevel->synthesized_crossing_event_id = 0;
 
   if (GDK_WINDOW_DESTROYED (changed_toplevel))
     return FALSE;
@@ -9021,17 +9043,14 @@ _gdk_synthesize_crossing_events_for_geometry_change (GdkWindow *changed_window)
 
   toplevel = get_event_toplevel (changed_window);
 
-  if (!toplevel->synthesize_crossing_event_queued)
+  if (toplevel->synthesized_crossing_event_id == 0)
     {
-      guint id;
-
-      toplevel->synthesize_crossing_event_queued = TRUE;
-
-      id = gdk_threads_add_idle_full (GDK_PRIORITY_EVENTS - 1,
-                                      do_synthesize_crossing_event,
-                                      g_object_ref (toplevel),
-                                      g_object_unref);
-      g_source_set_name_by_id (id, "[gtk+] do_synthesize_crossing_event");
+      toplevel->synthesized_crossing_event_id =
+        gdk_threads_add_idle_full (GDK_PRIORITY_EVENTS - 1,
+                                   do_synthesize_crossing_event,
+                                   toplevel, NULL);
+      g_source_set_name_by_id (toplevel->synthesized_crossing_event_id,
+                               "[gtk+] do_synthesize_crossing_event");
     }
 }
 

gdk/gen-gdk-gresources-xml.py

@@ -26,7 +26,7 @@ xml += '''
 
 if len(sys.argv) > 2:
   outfile = sys.argv[2]
-  f = open(outfile, 'w')
+  f = open(outfile, 'w', encoding='utf-8')
   f.write(xml)
   f.close()
 else:

gdk/meson.build

@@ -24,6 +24,7 @@ gdk_sources = files(
   'gdkframeclockidle.c',
   'gdkpango.c',
   'gdkpixbuf-drawable.c',
+  'gdkprofiler.c',
   'gdkproperty.c',
   'gdkrectangle.c',
   'gdkrgba.c',
@@ -164,6 +165,7 @@ gdkconfig_cdata.set('GDK_WINDOWING_X11', x11_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled)
+gdkconfig_cdata.set('GDK_WINDOWING_QUARTZ', quartz_enabled)
 
 gdkconfig = configure_file(
   input  : 'gdkconfig.h.meson',
@@ -226,6 +228,12 @@ if win32_enabled
   gdk_sources += gdk_res
 endif
 
+if profiler_enabled
+  if profiler_dep.found()
+    gdk_deps += [profiler_dep]
+  endif
+endif
+
 gdk_sources = [
   # Generated
   gdkconfig,
@@ -261,7 +269,7 @@ foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11']
       gdk_backends_gen_headers += get_variable('gdk_@0@_gen_headers'.format(backend))
     endif
     if backend == 'quartz'
-      common_cflags += ['-DGDK_WINDOWING_QUARTZ', '-xobjective-c']
+      common_cflags += ['-xobjective-c']
     endif
   endif
 endforeach
@@ -278,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,42 +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
-
--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;
-}

gdk/mir/gdkmirdevicemanager.c

@@ -1,125 +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 "gdkdevicemanagerprivate.h"
-#include "gdkdisplayprivate.h"
-#include "gdkdeviceprivate.h"
-#include "gdkseatdefaultprivate.h"
-
-#include "gdkmir.h"
-#include "gdkmir-private.h"
-
-typedef struct GdkMirDeviceManager      GdkMirDeviceManager;
-typedef struct GdkMirDeviceManagerClass GdkMirDeviceManagerClass;
-
-#define GDK_TYPE_MIR_DEVICE_MANAGER              (gdk_mir_device_manager_get_type ())
-#define GDK_MIR_DEVICE_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_DEVICE_MANAGER, GdkMirDeviceManager))
-#define GDK_MIR_DEVICE_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_DEVICE_MANAGER, GdkMirDeviceManagerClass))
-#define GDK_IS_MIR_DEVICE_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_DEVICE_MANAGER))
-#define GDK_IS_MIR_DEVICE_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_DEVICE_MANAGER))
-#define GDK_MIR_DEVICE_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_DEVICE_MANAGER, GdkMirDeviceManagerClass))
-
-struct GdkMirDeviceManager
-{
-  GdkDeviceManager parent_instance;
-
-  GdkDevice *pointer;
-  GdkDevice *keyboard;
-};
-
-struct GdkMirDeviceManagerClass
-{
-  GdkDeviceManagerClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirDeviceManager, gdk_mir_device_manager, GDK_TYPE_DEVICE_MANAGER)
-
-GdkDeviceManager *
-_gdk_mir_device_manager_new (GdkDisplay *display)
-{
-  return g_object_new (GDK_TYPE_MIR_DEVICE_MANAGER, "display", display, NULL);
-}
-
-static GList *
-gdk_mir_device_manager_list_devices (GdkDeviceManager *device_manager,
-                                     GdkDeviceType     type)
-{
-  GdkMirDeviceManager *dm = GDK_MIR_DEVICE_MANAGER (device_manager);
-
-  if (type == GDK_DEVICE_TYPE_MASTER)
-    {
-      GList *devices;
-
-      devices = g_list_append (NULL, dm->keyboard);
-      devices = g_list_append (devices, dm->pointer);
-
-      return devices;
-    }
-
-  return NULL;
-}
-
-static GdkDevice *
-gdk_mir_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  return GDK_MIR_DEVICE_MANAGER (device_manager)->pointer;
-}
-
-GdkDevice *
-_gdk_mir_device_manager_get_keyboard (GdkDeviceManager *device_manager)
-{
-  return GDK_MIR_DEVICE_MANAGER (device_manager)->keyboard;
-}
-
-static void
-gdk_mir_device_manager_init (GdkMirDeviceManager *device_manager)
-{
-}
-
-static void
-gdk_mir_device_manager_constructed (GObject *object)
-{
-  GdkMirDeviceManager *device_manager = GDK_MIR_DEVICE_MANAGER (object);
-  GdkDisplay *display;
-  GdkSeat *seat;
-
-  device_manager->keyboard = _gdk_mir_keyboard_new (GDK_DEVICE_MANAGER (device_manager), "Mir Keyboard");
-  device_manager->pointer = _gdk_mir_pointer_new (GDK_DEVICE_MANAGER (device_manager), "Mir Pointer");
-  _gdk_device_set_associated_device (device_manager->keyboard, device_manager->pointer);
-  _gdk_device_set_associated_device (device_manager->pointer, device_manager->keyboard);
-
-  display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager));
-
-  seat = gdk_seat_default_new_for_master_pair (device_manager->pointer, device_manager->keyboard);
-  gdk_display_add_seat (display, seat);
-  g_object_unref (seat);
-
-  G_OBJECT_CLASS (gdk_mir_device_manager_parent_class)->constructed (object);
-}
-
-static void
-gdk_mir_device_manager_class_init (GdkMirDeviceManagerClass *klass)
-{
-  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  device_manager_class->list_devices = gdk_mir_device_manager_list_devices;
-  device_manager_class->get_client_pointer = gdk_mir_device_manager_get_client_pointer;
-  object_class->constructed = gdk_mir_device_manager_constructed;
-}

gdk/mir/gdkmireventsource.c

@@ -1,838 +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 "gdkinternals.h"
-#include "gdkdisplayprivate.h"
-#include "gdkmir.h"
-#include "gdkmir-private.h"
-
-#include <mir_toolkit/events/window_placement.h>
-
-#define NANO_TO_MILLI(x) ((x) / 1000000)
-
-struct _GdkMirWindowReference {
-  GdkMirEventSource *source;
-  GdkWindow         *window;
-  gint               ref_count;
-};
-
-typedef struct {
-  GdkMirWindowReference *window_ref;
-  const MirEvent        *event;
-} GdkMirQueuedEvent;
-
-struct _GdkMirEventSource
-{
-  GSource parent_instance;
-
-  GMutex mir_event_lock;
-  GQueue mir_events;
-  gboolean log_events;
-
-  GdkDisplay *display;
-};
-
-static void
-send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event)
-{
-  GdkDisplay *display;
-  GList *node;
-
-  gdk_event_set_device (event, device);
-  gdk_event_set_source_device (event, device);
-  gdk_event_set_screen (event, gdk_display_get_default_screen (gdk_window_get_display (window)));
-  event->any.window = g_object_ref (window);
-
-  display = gdk_window_get_display (window);
-  node = _gdk_event_queue_append (display, event);
-  _gdk_windowing_got_event (display, node, event, _gdk_display_get_next_serial (display));
-}
-
-static void
-set_key_event_string (GdkEventKey *event)
-{
-  gunichar c = 0;
-
-  if (event->keyval != GDK_KEY_VoidSymbol)
-    c = gdk_keyval_to_unicode (event->keyval);
-
-  if (c)
-    {
-      gchar buf[7];
-      gint len;
-      gsize bytes_written;
-
-      /* Apply the control key - Taken from Xlib
-       */
-      if (event->state & GDK_CONTROL_MASK)
-        {
-          if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
-          else if (c == '2')
-            {
-              event->string = g_memdup ("\0\0", 2);
-              event->length = 1;
-              buf[0] = '\0';
-              return;
-            }
-          else if (c >= '3' && c <= '7') c -= ('3' - '\033');
-          else if (c == '8') c = '\177';
-          else if (c == '/') c = '_' & 0x1F;
-        }
-
-      len = g_unichar_to_utf8 (c, buf);
-      buf[len] = '\0';
-
-      event->string = g_locale_from_utf8 (buf, len,
-                                          NULL, &bytes_written,
-                                          NULL);
-      if (event->string)
-        event->length = bytes_written;
-    }
-  else if (event->keyval == GDK_KEY_Escape)
-    {
-      event->length = 1;
-      event->string = g_strdup ("\033");
-    }
-  else if (event->keyval == GDK_KEY_Return ||
-           event->keyval == GDK_KEY_KP_Enter)
-    {
-      event->length = 1;
-      event->string = g_strdup ("\r");
-    }
-
-  if (!event->string)
-    {
-      event->length = 0;
-      event->string = g_strdup ("");
-    }
-}
-
-static void
-generate_key_event (GdkWindow *window, GdkEventType type, guint state, guint keyval, guint16 keycode, gboolean is_modifier, guint32 event_time)
-{
-  GdkEvent *event;
-  GdkDisplay *display;
-  GdkSeat *seat;
-  GdkDevice *keyboard;
-
-  event = gdk_event_new (type);
-  event->key.state = state;
-  event->key.keyval = keyval;
-  event->key.hardware_keycode = keycode + 8;
-  gdk_event_set_scancode (event, keycode + 8);
-  event->key.is_modifier = is_modifier;
-  event->key.time = event_time;
-  set_key_event_string (&event->key);
-
-  display = gdk_window_get_display (window);
-  seat = gdk_display_get_default_seat (display);
-  keyboard = gdk_seat_get_keyboard (seat);
-
-  send_event (window, keyboard, event);
-}
-
-static GdkDevice *
-get_pointer (GdkWindow *window)
-{
-  GdkDisplay *display;
-  GdkSeat *seat;
-  GdkDevice *pointer;
-
-  display = gdk_window_get_display (window);
-  seat = gdk_display_get_default_seat (display);
-  pointer = gdk_seat_get_pointer (seat);
-
-  return pointer;
-}
-
-static void
-generate_button_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y, guint button, guint state, guint32 event_time)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (type);
-  event->button.x = x;
-  event->button.y = y;
-  event->button.state = state;
-  event->button.button = button;
-  event->button.time = event_time;
-
-  send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_scroll_event (GdkWindow *window, gdouble x, gdouble y, gdouble delta_x, gdouble delta_y, guint state, guint32 event_time)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (GDK_SCROLL);
-  event->scroll.x = x;
-  event->scroll.y = y;
-  event->scroll.state = state;
-  event->scroll.time = event_time;
-
-  if (ABS (delta_x) == 1 && delta_y == 0)
-    {
-      event->scroll.direction = (delta_x < 0) ? GDK_SCROLL_LEFT : GDK_SCROLL_RIGHT;
-    }
-  else if (ABS (delta_y) == 1 && delta_x == 0)
-    {
-      event->scroll.direction = (delta_y < 0) ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
-    }
-  else
-    {
-      event->scroll.direction = GDK_SCROLL_SMOOTH;
-      event->scroll.delta_x = delta_x;
-      event->scroll.delta_y = -delta_y;
-    }
-
-  send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_motion_event (GdkWindow *window, gdouble x, gdouble y, guint state, guint32 event_time)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (GDK_MOTION_NOTIFY);
-  event->motion.x = x;
-  event->motion.y = y;
-  event->motion.state = state;
-  event->motion.is_hint = FALSE;
-  event->motion.time = event_time;
-
-  send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_crossing_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y, guint32 event_time)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (type);
-  event->crossing.x = x;
-  event->crossing.y = y;
-  event->crossing.mode = GDK_CROSSING_NORMAL;
-  event->crossing.detail = GDK_NOTIFY_ANCESTOR;
-  event->crossing.focus = TRUE;
-  event->crossing.time = event_time;
-
-  send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_focus_event (GdkWindow *window, gboolean focused)
-{
-  GdkEvent *event;
-
-  if (focused)
-    {
-      gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FOCUSED);
-      _gdk_mir_display_focus_window (gdk_window_get_display (window), window);
-    }
-  else
-    {
-      gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FOCUSED, 0);
-      _gdk_mir_display_unfocus_window (gdk_window_get_display (window), window);
-    }
-
-  event = gdk_event_new (GDK_FOCUS_CHANGE);
-  event->focus_change.send_event = FALSE;
-  event->focus_change.in = focused;
-
-  send_event (window, get_pointer (window), event);
-}
-
-static guint
-get_modifier_state (unsigned int modifiers, guint button_state)
-{
-  guint modifier_state = button_state;
-
-  if ((modifiers & (mir_input_event_modifier_alt |
-                    mir_input_event_modifier_alt_left |
-                    mir_input_event_modifier_alt_right)) != 0)
-    modifier_state |= GDK_MOD1_MASK;
-  if ((modifiers & (mir_input_event_modifier_shift |
-                    mir_input_event_modifier_shift_left |
-                    mir_input_event_modifier_shift_right)) != 0)
-    modifier_state |= GDK_SHIFT_MASK;
-  if ((modifiers & (mir_input_event_modifier_ctrl |
-                    mir_input_event_modifier_ctrl_left |
-                    mir_input_event_modifier_ctrl_right)) != 0)
-    modifier_state |= GDK_CONTROL_MASK;
-  if ((modifiers & (mir_input_event_modifier_meta |
-                    mir_input_event_modifier_meta_left |
-                    mir_input_event_modifier_meta_right)) != 0)
-    modifier_state |= GDK_META_MASK;
-  if ((modifiers & mir_input_event_modifier_caps_lock) != 0)
-    modifier_state |= GDK_LOCK_MASK;
-
-  return modifier_state;
-}
-
-static void
-handle_key_event (GdkWindow *window, const MirInputEvent *event)
-{
-  const MirKeyboardEvent *keyboard_event = mir_input_event_get_keyboard_event (event);
-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-  GdkKeymap *keymap;
-  guint modifier_state;
-  guint button_state;
-
-  if (!keyboard_event)
-    return;
-
-  _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, NULL, &button_state);
-  modifier_state = get_modifier_state (mir_keyboard_event_modifiers (keyboard_event), button_state);
-  keymap = gdk_keymap_get_for_display (gdk_window_get_display (window));
-
-  generate_key_event (window,
-                      mir_keyboard_event_action (keyboard_event) == mir_keyboard_action_up ? GDK_KEY_RELEASE : GDK_KEY_PRESS,
-                      modifier_state,
-                      mir_keyboard_event_key_code (keyboard_event),
-                      mir_keyboard_event_scan_code (keyboard_event),
-                      _gdk_mir_keymap_key_is_modifier (keymap, mir_keyboard_event_key_code (keyboard_event)),
-                      NANO_TO_MILLI (mir_input_event_get_event_time (event)));
-}
-
-static void
-handle_touch_event (GdkWindow           *window,
-                    const MirTouchEvent *mir_touch_event)
-{
-  const MirInputEvent *mir_input_event = mir_touch_event_input_event (mir_touch_event);
-  guint n = mir_touch_event_point_count (mir_touch_event);
-  GdkEvent *gdk_event;
-  guint i;
-
-  for (i = 0; i < n; i++)
-    {
-      MirTouchAction action = mir_touch_event_action (mir_touch_event, i);
-      if (action == mir_touch_action_up)
-        gdk_event = gdk_event_new (GDK_TOUCH_END);
-      else if (action == mir_touch_action_down)
-        gdk_event = gdk_event_new (GDK_TOUCH_BEGIN);
-      else
-        gdk_event = gdk_event_new (GDK_TOUCH_UPDATE);
-
-      gdk_event->touch.window = window;
-      gdk_event->touch.sequence = GINT_TO_POINTER (mir_touch_event_id (mir_touch_event, i));
-      gdk_event->touch.time = mir_input_event_get_event_time (mir_input_event);
-      gdk_event->touch.state = get_modifier_state (mir_touch_event_modifiers (mir_touch_event), 0);
-      gdk_event->touch.x = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_x);
-      gdk_event->touch.y = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_y);
-      gdk_event->touch.x_root = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_x);
-      gdk_event->touch.y_root = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_y);
-      gdk_event->touch.emulating_pointer = TRUE;
-      gdk_event_set_pointer_emulated (gdk_event, TRUE);
-
-      send_event (window, get_pointer (window), gdk_event);
-    }
-}
-
-static guint
-get_button_state (const MirPointerEvent *event)
-{
-  guint state = 0;
-
-  if (mir_pointer_event_button_state (event, mir_pointer_button_primary)) /* left */
-    state |= GDK_BUTTON1_MASK;
-  if (mir_pointer_event_button_state (event, mir_pointer_button_secondary)) /* right */
-    state |= GDK_BUTTON3_MASK;
-  if (mir_pointer_event_button_state (event, mir_pointer_button_tertiary)) /* middle */
-    state |= GDK_BUTTON2_MASK;
-
-  return state;
-}
-
-static void
-handle_motion_event (GdkWindow *window, const MirInputEvent *event)
-{
-  const MirPointerEvent *pointer_event = mir_input_event_get_pointer_event (event);
-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-  gdouble x, y;
-  gboolean cursor_inside;
-  guint button_state;
-  guint new_button_state;
-  guint modifier_state;
-  guint32 event_time;
-  GdkEventType event_type;
-  guint changed_button_state;
-
-  if (!pointer_event)
-    return;
-
-  _gdk_mir_window_impl_get_cursor_state (impl, &x, &y, &cursor_inside, &button_state);
-  new_button_state = get_button_state (pointer_event);
-  modifier_state = get_modifier_state (mir_pointer_event_modifiers (pointer_event), new_button_state);
-  event_time = NANO_TO_MILLI (mir_input_event_get_event_time (event));
-
-  if (window)
-    {
-      gdouble new_x;
-      gdouble new_y;
-      gdouble hscroll;
-      gdouble vscroll;
-
-      /* Update which window has focus */
-      _gdk_mir_pointer_set_location (get_pointer (window), x, y, window, modifier_state);
-      switch (mir_pointer_event_action (pointer_event))
-        {
-        case mir_pointer_action_button_up:
-        case mir_pointer_action_button_down:
-          event_type = mir_pointer_event_action (pointer_event) == mir_pointer_action_button_down ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE;
-          changed_button_state = button_state ^ new_button_state;
-          if (changed_button_state == 0 || (changed_button_state & GDK_BUTTON1_MASK) != 0)
-            generate_button_event (window, event_type, x, y, GDK_BUTTON_PRIMARY, modifier_state, event_time);
-          if ((changed_button_state & GDK_BUTTON2_MASK) != 0)
-            generate_button_event (window, event_type, x, y, GDK_BUTTON_MIDDLE, modifier_state, event_time);
-          if ((changed_button_state & GDK_BUTTON3_MASK) != 0)
-            generate_button_event (window, event_type, x, y, GDK_BUTTON_SECONDARY, modifier_state, event_time);
-          button_state = new_button_state;
-          break;
-        case mir_pointer_action_motion:
-          new_x = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_x);
-          new_y = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_y);
-          hscroll = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_hscroll);
-          vscroll = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_vscroll);
-
-          if (hscroll != 0.0 || vscroll != 0.0)
-            generate_scroll_event (window, x, y, hscroll, vscroll, modifier_state, event_time);
-          if (ABS (new_x - x) > 0.5 || ABS (new_y - y) > 0.5)
-            {
-              generate_motion_event (window, new_x, new_y, modifier_state, event_time);
-              x = new_x;
-              y = new_y;
-            }
-
-          break;
-        case mir_pointer_action_enter:
-          if (!cursor_inside)
-            {
-              cursor_inside = TRUE;
-              generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y, event_time);
-            }
-          break;
-        case mir_pointer_action_leave:
-          if (cursor_inside)
-            {
-              cursor_inside = FALSE;
-              generate_crossing_event (window, GDK_LEAVE_NOTIFY, x, y, event_time);
-            }
-          break;
-        default:
-          break;
-        }
-
-      _gdk_mir_window_impl_set_cursor_state (impl, x, y, cursor_inside, button_state);
-    }
-}
-
-static void
-handle_window_event (GdkWindow            *window,
-                     const MirWindowEvent *event)
-{
-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-  MirWindowState state;
-
-  switch (mir_window_event_get_attribute (event))
-    {
-    case mir_window_attrib_type:
-      _gdk_mir_window_impl_set_window_type (impl, mir_window_event_get_attribute_value (event));
-      break;
-    case mir_window_attrib_state:
-      state = mir_window_event_get_attribute_value (event);
-      _gdk_mir_window_impl_set_window_state (impl, state);
-
-      switch (state)
-        {
-        case mir_window_state_restored:
-        case mir_window_state_hidden:
-          gdk_synthesize_window_state (window,
-                                       GDK_WINDOW_STATE_ICONIFIED |
-                                       GDK_WINDOW_STATE_MAXIMIZED |
-                                       GDK_WINDOW_STATE_FULLSCREEN,
-                                       0);
-          break;
-        case mir_window_state_minimized:
-          gdk_synthesize_window_state (window,
-                                       GDK_WINDOW_STATE_MAXIMIZED |
-                                       GDK_WINDOW_STATE_FULLSCREEN,
-                                       GDK_WINDOW_STATE_ICONIFIED);
-          break;
-        case mir_window_state_maximized:
-        case mir_window_state_vertmaximized:
-        case mir_window_state_horizmaximized:
-          gdk_synthesize_window_state (window,
-                                       GDK_WINDOW_STATE_ICONIFIED |
-                                       GDK_WINDOW_STATE_FULLSCREEN,
-                                       GDK_WINDOW_STATE_MAXIMIZED);
-          break;
-        case mir_window_state_fullscreen:
-          gdk_synthesize_window_state (window,
-                                       GDK_WINDOW_STATE_ICONIFIED |
-                                       GDK_WINDOW_STATE_MAXIMIZED,
-                                       GDK_WINDOW_STATE_FULLSCREEN);
-          break;
-        default:
-          break;
-        }
-
-      break;
-    case mir_window_attrib_swapinterval:
-      break;
-    case mir_window_attrib_focus:
-      generate_focus_event (window, mir_window_event_get_attribute_value (event) != 0);
-      break;
-    default:
-      break;
-    }
-}
-
-static void
-generate_configure_event (GdkWindow *window,
-                          gint       width,
-                          gint       height)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (GDK_CONFIGURE);
-  event->configure.send_event = FALSE;
-  event->configure.width = width;
-  event->configure.height = height;
-
-  send_event (window, get_pointer (window), event);
-}
-
-static void
-handle_resize_event (GdkWindow            *window,
-                     const MirResizeEvent *event)
-{
-  window->width = mir_resize_event_get_width (event);
-  window->height = mir_resize_event_get_height (event);
-  _gdk_window_update_size (window);
-
-  generate_configure_event (window, mir_resize_event_get_width (event), mir_resize_event_get_height (event));
-}
-
-static void
-handle_close_event (GdkWindow *window)
-{
-  send_event (window, get_pointer (window), gdk_event_new (GDK_DESTROY));
-  gdk_window_destroy_notify (window);
-}
-
-static void
-handle_window_output_event (GdkWindow                  *window,
-                            const MirWindowOutputEvent *event)
-{
-  _gdk_mir_window_set_scale (window, mir_window_output_event_get_scale (event));
-}
-
-static void
-handle_window_placement_event (GdkWindow                     *window,
-                               const MirWindowPlacementEvent *event)
-{
-  _gdk_mir_window_set_final_rect (window, mir_window_placement_get_relative_position (event));
-}
-
-typedef struct
-{
-  GdkWindow *window;
-  MirEvent *event;
-} EventData;
-
-static void
-gdk_mir_event_source_queue_event (GdkDisplay     *display,
-                                  GdkWindow      *window,
-                                  const MirEvent *event)
-{
-  const MirInputEvent *input_event;
-
-  // FIXME: Only generate events if the window wanted them?
-  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:
-          handle_key_event (window, input_event);
-          break;
-        case mir_input_event_type_touch:
-          handle_touch_event (window, mir_input_event_get_touch_event (input_event));
-          break;
-        case mir_input_event_type_pointer:
-          handle_motion_event (window, input_event);
-          break;
-        default:
-          break;
-        }
-
-      break;
-    case mir_event_type_key:
-      handle_key_event (window, mir_event_get_input_event (event));
-      break;
-    case mir_event_type_motion:
-      handle_motion_event (window, mir_event_get_input_event (event));
-      break;
-    case mir_event_type_window:
-      handle_window_event (window, mir_event_get_window_event (event));
-      break;
-    case mir_event_type_resize:
-      handle_resize_event (window, mir_event_get_resize_event (event));
-      break;
-    case mir_event_type_prompt_session_state_change:
-      break;
-    case mir_event_type_orientation:
-      break;
-    case mir_event_type_close_window:
-      handle_close_event (window);
-      break;
-    case mir_event_type_keymap:
-      break;
-    case mir_event_type_window_output:
-      handle_window_output_event (window, mir_event_get_window_output_event (event));
-      break;
-    case mir_event_type_input_device_state:
-      break;
-    case mir_event_type_window_placement:
-      handle_window_placement_event (window, mir_event_get_window_placement_event (event));
-      break;
-    default:
-      g_warning ("Ignoring unknown Mir event %d", mir_event_get_type (event));
-      break;
-    }
-}
-
-static GdkMirQueuedEvent *
-gdk_mir_event_source_take_queued_event (GdkMirEventSource *source)
-{
-  GdkMirQueuedEvent *queued_event;
-
-  g_mutex_lock (&source->mir_event_lock);
-  queued_event = g_queue_pop_head (&source->mir_events);
-  g_mutex_unlock (&source->mir_event_lock);
-
-  return queued_event;
-}
-
-static void
-gdk_mir_queued_event_free (GdkMirQueuedEvent *event)
-{
-  _gdk_mir_window_reference_unref (event->window_ref);
-  mir_event_unref (event->event);
-  g_slice_free (GdkMirQueuedEvent, event);
-}
-
-static void
-gdk_mir_event_source_convert_events (GdkMirEventSource *source)
-{
-  GdkMirQueuedEvent *event;
-
-  while ((event = gdk_mir_event_source_take_queued_event (source)))
-    {
-      GdkWindow *window = event->window_ref->window;
-
-      /* The window may have been destroyed in the main thread while the
-       * event was being dispatched...
-       */
-      if (window != NULL)
-        {
-          if (source->log_events)
-            _gdk_mir_print_event (event->event);
-
-          gdk_mir_event_source_queue_event (source->display, window, event->event);
-        }
-      else
-        g_warning ("window was destroyed before event arrived...");
-
-      gdk_mir_queued_event_free (event);
-    }
-}
-
-static gboolean
-gdk_mir_event_source_prepare (GSource *g_source,
-                              gint    *timeout)
-{
-  GdkMirEventSource *source = (GdkMirEventSource *) g_source;
-  gboolean mir_events_in_queue;
-
-  if (_gdk_event_queue_find_first (source->display))
-   return TRUE;
-
-  g_mutex_lock (&source->mir_event_lock);
-  mir_events_in_queue = g_queue_get_length (&source->mir_events) > 0;
-  g_mutex_unlock (&source->mir_event_lock);
-
-  return mir_events_in_queue;
-}
-
-static gboolean
-gdk_mir_event_source_check (GSource *g_source)
-{
-  return gdk_mir_event_source_prepare (g_source, NULL);
-}
-
-static gboolean
-gdk_mir_event_source_dispatch (GSource     *g_source,
-                               GSourceFunc  callback,
-                               gpointer     user_data)
-{
-  GdkMirEventSource *source = (GdkMirEventSource *) g_source;
-  GdkEvent *event;
-
-  /* First, run the queue of events from the thread */
-  gdk_mir_event_source_convert_events (source);
-
-  /* Next, dispatch one single event from the display's queue.
-   *
-   * If there is more than one event then we will soon find ourselves
-   * back here again.
-   */
-
-  gdk_threads_enter ();
-
-  event = gdk_display_get_event (source->display);
-
-  if (event)
-    {
-      _gdk_event_emit (event);
-
-      gdk_event_free (event);
-    }
-
-  gdk_threads_leave ();
-
-  return TRUE;
-}
-
-static void
-gdk_mir_event_source_finalize (GSource *g_source)
-{
-  GdkMirEventSource *source = (GdkMirEventSource *) g_source;
-  GdkMirQueuedEvent *event;
-
-  while ((event = gdk_mir_event_source_take_queued_event (source)))
-    gdk_mir_queued_event_free (event);
-
-  g_mutex_clear (&source->mir_event_lock);
-}
-
-static GSourceFuncs gdk_mir_event_source_funcs = {
-  gdk_mir_event_source_prepare,
-  gdk_mir_event_source_check,
-  gdk_mir_event_source_dispatch,
-  gdk_mir_event_source_finalize
-};
-
-GdkMirEventSource *
-_gdk_mir_event_source_new (GdkDisplay *display)
-{
-  GdkMirEventSource *source;
-  GSource *g_source;
-  char *name;
-
-  g_source = g_source_new (&gdk_mir_event_source_funcs, sizeof (GdkMirEventSource));
-  name = g_strdup_printf ("GDK Mir Event source (%s)", gdk_display_get_name (display));
-  g_source_set_name (g_source, name);
-  g_free (name);
-  g_source_set_priority (g_source, GDK_PRIORITY_EVENTS);
-  g_source_set_can_recurse (g_source, TRUE);
-  g_source_attach (g_source, NULL);
-
-  source = (GdkMirEventSource *) g_source;
-  g_mutex_init (&source->mir_event_lock);
-  source->display = display;
-  source->log_events = (g_getenv ("GDK_MIR_LOG_EVENTS") != NULL);
-
-  return source;
-}
-
-GdkMirWindowReference *
-_gdk_mir_event_source_get_window_reference (GdkWindow *window)
-{
-  static GQuark win_ref_quark;
-  GdkMirWindowReference *ref;
-
-  if G_UNLIKELY (!win_ref_quark)
-    win_ref_quark = g_quark_from_string ("GdkMirEventSource window reference");
-
-  ref = g_object_get_qdata (G_OBJECT (window), win_ref_quark);
-
-  if (!ref)
-    {
-      GdkMirEventSource *source;
-
-      source = _gdk_mir_display_get_event_source (gdk_window_get_display (window));
-      g_source_ref ((GSource *) source);
-
-      ref = g_slice_new (GdkMirWindowReference);
-      ref->window = window;
-      ref->source = source;
-      ref->ref_count = 0;
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &ref->window);
-
-      g_object_set_qdata_full (G_OBJECT (window), win_ref_quark,
-                               ref, (GDestroyNotify) _gdk_mir_window_reference_unref);
-    }
-
-  g_atomic_int_inc (&ref->ref_count);
-
-  return ref;
-}
-
-void
-_gdk_mir_window_reference_unref (GdkMirWindowReference *ref)
-{
-  if (g_atomic_int_dec_and_test (&ref->ref_count))
-    {
-      if (ref->window)
-        g_object_remove_weak_pointer (G_OBJECT (ref->window), (gpointer *) &ref->window);
-
-      g_source_unref ((GSource *) ref->source);
-
-      g_slice_free (GdkMirWindowReference, ref);
-    }
-}
-
-void
-_gdk_mir_event_source_queue (GdkMirWindowReference *window_ref,
-                             const MirEvent        *event)
-{
-  GdkMirEventSource *source = window_ref->source;
-  GdkMirQueuedEvent *queued_event;
-
-  /* We are in the wrong thread right now.  We absolutely cannot touch
-   * the window.
-   *
-   * We can do pretty much anything we want with the source, though...
-   */
-
-  queued_event = g_slice_new (GdkMirQueuedEvent);
-  g_atomic_int_inc (&window_ref->ref_count);
-  queued_event->window_ref = window_ref;
-  queued_event->event = mir_event_ref (event);
-
-  g_mutex_lock (&source->mir_event_lock);
-  g_queue_push_tail (&source->mir_events, queued_event);
-  g_mutex_unlock (&source->mir_event_lock);
-
-  g_main_context_wakeup (NULL);
-}

gdk/mir/gdkmirglcontext.c

@@ -1,178 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- *
- * gdkmirglcontext.c: Mir specific OpenGL wrappers
- *
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdkmir-private.h"
-#include "gdkinternals.h"
-#include "gdkintl.h"
-
-G_DEFINE_TYPE (GdkMirGLContext, gdk_mir_gl_context, GDK_TYPE_GL_CONTEXT)
-
-#define N_EGL_ATTRS 16
-
-static gboolean
-gdk_mir_gl_context_realize (GdkGLContext *context,
-                            GError      **error)
-{
-  GdkMirGLContext *context_mir = GDK_MIR_GL_CONTEXT (context);
-  GdkDisplay *display = gdk_gl_context_get_display (context);
-  GdkGLContext *share = gdk_gl_context_get_shared_context (context);
-  EGLContext ctx;
-  EGLint context_attribs[N_EGL_ATTRS];
-  int major, minor, flags;
-  gboolean debug_bit, forward_bit;
-  int i = 0;
-
-  if (!_gdk_mir_display_init_egl_display (display))
-    {
-      g_set_error_literal (error, GDK_GL_ERROR,
-                           GDK_GL_ERROR_NOT_AVAILABLE,
-                           _("No GL implementation is available"));
-      return FALSE;
-    }
-
-  gdk_gl_context_get_required_version (context, &major, &minor);
-  debug_bit = gdk_gl_context_get_debug_enabled (context);
-  forward_bit = gdk_gl_context_get_forward_compatible (context);
-
-  flags = 0;
-
-  if (debug_bit)
-    flags |= EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
-  if (forward_bit)
-    flags |= EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR;
-
-  /* We want a core profile */
-  context_attribs[i++] = EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR;
-  context_attribs[i++] = EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR;
-
-  /* Specify the version */
-  context_attribs[i++] = EGL_CONTEXT_MAJOR_VERSION_KHR;
-  context_attribs[i++] = major;
-  context_attribs[i++] = EGL_CONTEXT_MINOR_VERSION_KHR;
-  context_attribs[i++] = minor;
-
-  /* Specify the flags */
-  context_attribs[i++] = EGL_CONTEXT_FLAGS_KHR;
-  context_attribs[i++] = flags;
-
-  context_attribs[i++] = EGL_NONE;
-  g_assert (i < N_EGL_ATTRS);
-
-  ctx = eglCreateContext (_gdk_mir_display_get_egl_display (display),
-                          context_mir->egl_config,
-                          share != NULL ? GDK_MIR_GL_CONTEXT (share)->egl_context
-                                        : EGL_NO_CONTEXT,
-                          context_attribs);
-  if (ctx == NULL)
-    {
-      g_set_error_literal (error, GDK_GL_ERROR,
-                           GDK_GL_ERROR_NOT_AVAILABLE,
-                           _("Unable to create a GL context"));
-      return FALSE;
-    }
-
-  GDK_NOTE (OPENGL, g_print ("Created EGL context[%p]\n", ctx));
-
-  context_mir->egl_context = ctx;
-
-  return TRUE;
-}
-
-static void
-gdk_mir_gl_context_end_frame (GdkGLContext *context,
-                              cairo_region_t *painted,
-                              cairo_region_t *damage)
-{
-  GdkWindow *window = gdk_gl_context_get_window (context);
-  GdkDisplay *display = gdk_window_get_display (window);
-  GdkMirGLContext *context_mir = GDK_MIR_GL_CONTEXT (context);
-  EGLDisplay egl_display = _gdk_mir_display_get_egl_display (display);
-  EGLSurface egl_surface;
-
-  gdk_gl_context_make_current (context);
-
-  egl_surface = _gdk_mir_window_get_egl_surface (window,
-                                                 context_mir->egl_config);
-
-  if (_gdk_mir_display_have_egl_swap_buffers_with_damage (display))
-    {
-      int i, j, n_rects = cairo_region_num_rectangles (damage);
-      EGLint *rects = g_new (EGLint, n_rects * 4);
-      cairo_rectangle_int_t rect;
-      int window_height = gdk_window_get_height (window);
-
-      for (i = 0, j = 0; i < n_rects; i++)
-        {
-          cairo_region_get_rectangle (damage, i, &rect);
-          rects[j++] = rect.x;
-          rects[j++] = window_height - rect.height - rect.y;
-          rects[j++] = rect.width;
-          rects[j++] = rect.height;
-        }
-      eglSwapBuffersWithDamageEXT (egl_display, egl_surface, rects, n_rects);
-      g_free (rects);
-    }
-  else
-    {
-      eglSwapBuffers (egl_display, egl_surface);
-    }
-}
-
-static void
-gdk_mir_gl_context_dispose (GObject *gobject)
-{
-  GdkMirGLContext *context_mir = GDK_MIR_GL_CONTEXT (gobject);
-
-  if (context_mir->egl_context != NULL)
-    {
-      GdkGLContext *context = GDK_GL_CONTEXT (gobject);
-      GdkWindow *window = gdk_gl_context_get_window (context);
-      GdkDisplay *display = gdk_window_get_display (window);
-      EGLDisplay egl_display = _gdk_mir_display_get_egl_display (display);
-
-      if (eglGetCurrentContext () == context_mir->egl_context)
-        eglMakeCurrent (egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-
-      GDK_NOTE (OPENGL, g_print ("Destroying EGL context\n"));
-
-      eglDestroyContext (egl_display, context_mir->egl_context);
-      context_mir->egl_context = NULL;
-    }
-
-  G_OBJECT_CLASS (gdk_mir_gl_context_parent_class)->dispose (gobject);
-}
-
-static void
-gdk_mir_gl_context_class_init (GdkMirGLContextClass *klass)
-{
-  GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  context_class->realize = gdk_mir_gl_context_realize;
-  context_class->end_frame = gdk_mir_gl_context_end_frame;
-  gobject_class->dispose = gdk_mir_gl_context_dispose;
-}
-
-static void
-gdk_mir_gl_context_init (GdkMirGLContext *self)
-{
-}

gdk/mir/gdkmirkeyboard.c

@@ -1,164 +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 "gdkdeviceprivate.h"
-
-typedef struct GdkMirKeyboard      GdkMirKeyboard;
-typedef struct GdkMirKeyboardClass GdkMirKeyboardClass;
-
-#define GDK_TYPE_MIR_KEYBOARD              (gdk_mir_keyboard_get_type ())
-#define GDK_MIR_KEYBOARD(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_KEYBOARD, GdkMirKeyboard))
-#define GDK_MIR_KEYBOARD_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_KEYBOARD, GdkMirKeyboardClass))
-#define GDK_IS_MIR_KEYBOARD(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_KEYBOARD))
-#define GDK_IS_MIR_KEYBOARD_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_KEYBOARD))
-#define GDK_MIR_KEYBOARD_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_KEYBOARD, GdkMirKeyboardClass))
-
-struct GdkMirKeyboard
-{
-  GdkDevice parent_instance;
-};
-
-struct GdkMirKeyboardClass
-{
-  GdkDeviceClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirKeyboard, gdk_mir_keyboard, GDK_TYPE_DEVICE)
-
-GdkDevice *
-_gdk_mir_keyboard_new (GdkDeviceManager *device_manager, const gchar *name)
-{
-  return g_object_new (GDK_TYPE_MIR_KEYBOARD,
-                       "display", gdk_device_manager_get_display (device_manager),
-                       "device-manager", device_manager,
-                       "name", name,
-                       "type", GDK_DEVICE_TYPE_MASTER,
-                       "input-source", GDK_SOURCE_KEYBOARD,
-                       "input-mode", GDK_MODE_SCREEN,
-                       "has-cursor", FALSE,
-                       NULL);
-}
-
-static gboolean
-gdk_mir_keyboard_get_history (GdkDevice      *device,
-                              GdkWindow      *window,
-                              guint32         start,
-                              guint32         stop,
-                              GdkTimeCoord ***events,
-                              gint           *n_events)
-{
-  return FALSE;
-}
-
-static void
-gdk_mir_keyboard_get_state (GdkDevice      *device,
-                            GdkWindow       *window,
-                            gdouble         *axes,
-                            GdkModifierType *mask)
-{
-}
-
-static void
-gdk_mir_keyboard_set_window_cursor (GdkDevice *device,
-                                    GdkWindow *window,
-                                    GdkCursor *cursor)
-{
-  /* Keyboards don't have cursors... */
-}
-
-static void
-gdk_mir_keyboard_warp (GdkDevice *device,
-                       GdkScreen *screen,
-                       gdouble    x,
-                       gdouble    y)
-{
-  /* Can't warp a keyboard... */
-}
-
-static void
-gdk_mir_keyboard_query_state (GdkDevice        *device,
-                              GdkWindow        *window,
-                              GdkWindow       **root_window,
-                              GdkWindow       **child_window,
-                              gdouble          *root_x,
-                              gdouble          *root_y,
-                              gdouble          *win_x,
-                              gdouble          *win_y,
-                              GdkModifierType  *mask)
-{
-}
-
-static GdkGrabStatus
-gdk_mir_keyboard_grab (GdkDevice    *device,
-                       GdkWindow    *window,
-                       gboolean      owner_events,
-                       GdkEventMask  event_mask,
-                       GdkWindow    *confine_to,
-                       GdkCursor    *cursor,
-                       guint32       time_)
-{
-  /* Mir doesn't do grabs, so sure, you have the grab */
-  return GDK_GRAB_SUCCESS;
-}
-
-static void
-gdk_mir_keyboard_ungrab (GdkDevice *device,
-                         guint32    time_)
-{
-  /* Mir doesn't do grabs */
-}
-
-static GdkWindow *
-gdk_mir_keyboard_window_at_position (GdkDevice       *device,
-                                     gdouble         *win_x,
-                                     gdouble         *win_y,
-                                     GdkModifierType *mask,
-                                     gboolean         get_toplevel)
-{
-  /* Keyboard don't have locations... */
-  return NULL; // FIXME: Or the window with the keyboard focus?
-}
-
-static void
-gdk_mir_keyboard_select_window_events (GdkDevice    *device,
-                                       GdkWindow    *window,
-                                       GdkEventMask  event_mask)
-{
-}
-
-static void
-gdk_mir_keyboard_init (GdkMirKeyboard *device)
-{
-}
-
-static void
-gdk_mir_keyboard_class_init (GdkMirKeyboardClass *klass)
-{
-  GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
-
-  device_class->get_history = gdk_mir_keyboard_get_history;
-  device_class->get_state = gdk_mir_keyboard_get_state;
-  device_class->set_window_cursor = gdk_mir_keyboard_set_window_cursor;
-  device_class->warp = gdk_mir_keyboard_warp;
-  device_class->query_state = gdk_mir_keyboard_query_state;
-  device_class->grab = gdk_mir_keyboard_grab;
-  device_class->ungrab = gdk_mir_keyboard_ungrab;
-  device_class->window_at_position = gdk_mir_keyboard_window_at_position;
-  device_class->select_window_events = gdk_mir_keyboard_select_window_events;
-}

gdk/mir/gdkmirkeymap.c

@@ -1,476 +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 <xkbcommon/xkbcommon.h>
-
-#include "gdkkeysprivate.h"
-
-typedef struct GdkMirKeymap      GdkMirKeymap;
-typedef struct GdkMirKeymapClass GdkMirKeymapClass;
-
-#define GDK_TYPE_MIR_KEYMAP              (gdk_mir_keymap_get_type ())
-#define GDK_MIR_KEYMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_KEYMAP, GdkMirKeymap))
-#define GDK_MIR_KEYMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_KEYMAP, GdkMirKeymapClass))
-#define GDK_IS_MIR_KEYMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_KEYMAP))
-#define GDK_IS_MIR_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_KEYMAP))
-#define GDK_MIR_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_KEYMAP, GdkMirKeymapClass))
-
-#define IsModifierKey(keysym) \
-  (((keysym) >= XKB_KEY_Shift_L && (keysym) <= XKB_KEY_Hyper_R) || \
-   ((keysym) >= XKB_KEY_ISO_Lock && (keysym) <= XKB_KEY_ISO_Last_Group_Lock) || \
-   ((keysym) == XKB_KEY_Mode_switch) || \
-   ((keysym) == XKB_KEY_Num_Lock))
-
-struct GdkMirKeymap
-{
-  GdkKeymap parent_instance;
-
-  struct xkb_keymap *xkb_keymap;
-  struct xkb_state *xkb_state;
-
-  PangoDirection *direction;
-  gboolean bidi;
-};
-
-struct GdkMirKeymapClass
-{
-  GdkKeymapClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirKeymap, gdk_mir_keymap, GDK_TYPE_KEYMAP)
-
-GdkKeymap *
-_gdk_mir_keymap_new (void)
-{
-  return g_object_new (GDK_TYPE_MIR_KEYMAP, NULL);
-}
-
-static PangoDirection
-gdk_mir_keymap_get_direction (GdkKeymap *keymap)
-{
-  GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
-  gint i;
-
-  for (i = 0; i < xkb_keymap_num_layouts (mir_keymap->xkb_keymap); i++)
-    {
-      if (xkb_state_layout_index_is_active (mir_keymap->xkb_state, i, XKB_STATE_LAYOUT_EFFECTIVE))
-        return mir_keymap->direction[i];
-    }
-
-  return PANGO_DIRECTION_NEUTRAL;
-}
-
-static gboolean
-gdk_mir_keymap_have_bidi_layouts (GdkKeymap *keymap)
-{
-  return FALSE;
-}
-
-static gboolean
-gdk_mir_keymap_get_caps_lock_state (GdkKeymap *keymap)
-{
-  return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_CAPS);
-}
-
-static gboolean
-gdk_mir_keymap_get_num_lock_state (GdkKeymap *keymap)
-{
-  return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_NUM);
-}
-
-static gboolean
-gdk_mir_keymap_get_scroll_lock_state (GdkKeymap *keymap)
-{
-  return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_SCROLL);
-}
-
-static gboolean
-gdk_mir_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
-                                       guint          keyval,
-                                       GdkKeymapKey **keys,
-                                       gint          *n_keys)
-{
-  GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
-  GArray *key_array;
-  guint keycode;
-
-  key_array = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
-
-  for (keycode = 8; keycode < 255; keycode++) /* FIXME: min/max keycode */
-    {
-      gint num_layouts, layout;
-
-      num_layouts = xkb_keymap_num_layouts_for_key (mir_keymap->xkb_keymap, keycode);
-      for (layout = 0; layout < num_layouts; layout++)
-        {
-          gint num_levels, level;
-
-          num_levels = xkb_keymap_num_levels_for_key (mir_keymap->xkb_keymap, keycode, layout);
-          for (level = 0; level < num_levels; level++)
-            {
-              const xkb_keysym_t *syms;
-              gint num_syms, sym;
-
-              num_syms = xkb_keymap_key_get_syms_by_level (mir_keymap->xkb_keymap, keycode, layout, level, &syms);
-              for (sym = 0; sym < num_syms; sym++)
-                {
-                  if (syms[sym] == keyval)
-                    {
-                      GdkKeymapKey key;
-
-                      key.keycode = keycode;
-                      key.group = layout;
-                      key.level = level;
-
-                      g_array_append_val (key_array, key);
-                    }
-                }
-            }
-        }
-    }
-
-  *n_keys = key_array->len;
-  *keys = (GdkKeymapKey*) g_array_free (key_array, FALSE);
-
-  return TRUE;
-}
-
-static gboolean
-gdk_mir_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
-                                        guint          hardware_keycode,
-                                        GdkKeymapKey **keys,
-                                        guint        **keyvals,
-                                        gint          *n_entries)
-{
-  GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
-  gint num_layouts, layout;
-  gint num_entries;
-  gint i;
-
-  num_layouts = xkb_keymap_num_layouts_for_key (mir_keymap->xkb_keymap, hardware_keycode);
-
-  num_entries = 0;
-  for (layout = 0; layout < num_layouts; layout++)
-    num_entries += xkb_keymap_num_levels_for_key (mir_keymap->xkb_keymap, hardware_keycode,  layout);
-
- if (n_entries)
-    *n_entries = num_entries;
-  if (keys)
-    *keys = g_new0 (GdkKeymapKey, num_entries);
-  if (keyvals)
-    *keyvals = g_new0 (guint, num_entries);
-
-  i = 0;
-  for (layout = 0; layout < num_layouts; layout++)
-    {
-      gint num_levels, level;
-      num_levels = xkb_keymap_num_levels_for_key (mir_keymap->xkb_keymap, hardware_keycode, layout);
-      for (level = 0; level < num_levels; level++)
-        {
-          const xkb_keysym_t *syms;
-          int num_syms;
-
-          num_syms = xkb_keymap_key_get_syms_by_level (mir_keymap->xkb_keymap, hardware_keycode, layout, 0, &syms);
-          if (keys)
-            {
-              (*keys)[i].keycode = hardware_keycode;
-              (*keys)[i].group = layout;
-              (*keys)[i].level = level;
-            }
-          if (keyvals && num_syms > 0)
-            (*keyvals)[i] = syms[0];
-
-          i++;
-        }
-    }
-
-  return num_entries > 0;
-}
-
-static guint
-gdk_mir_keymap_lookup_key (GdkKeymap          *keymap,
-                           const GdkKeymapKey *key)
-{
-  GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
-  const xkb_keysym_t *syms;
-  int num_syms;
-
-  num_syms = xkb_keymap_key_get_syms_by_level (mir_keymap->xkb_keymap,
-                                               key->keycode,
-                                               key->group,
-                                               key->level,
-                                               &syms);
-  if (num_syms > 0)
-    return syms[0];
-  else
-    return XKB_KEY_NoSymbol;
-}
-
-static guint32
-get_xkb_modifiers (struct xkb_keymap *xkb_keymap,
-                   GdkModifierType    state)
-{
-  guint32 mods = 0;
-
-  if (state & GDK_SHIFT_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT);
-  if (state & GDK_LOCK_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS);
-  if (state & GDK_CONTROL_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL);
-  if (state & GDK_MOD1_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT);
-  if (state & GDK_MOD2_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2");
-  if (state & GDK_MOD3_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3");
-  if (state & GDK_MOD4_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO);
-  if (state & GDK_MOD5_MASK)
-    mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5");
-
-  return mods;
-}
-
-static GdkModifierType
-get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
-                   guint32            mods)
-{
-  GdkModifierType state = 0;
-
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT)))
-    state |= GDK_SHIFT_MASK;
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS)))
-    state |= GDK_LOCK_MASK;
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL)))
-    state |= GDK_CONTROL_MASK;
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT)))
-    state |= GDK_MOD1_MASK;
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2")))
-    state |= GDK_MOD2_MASK;
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3")))
-    state |= GDK_MOD3_MASK;
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO)))
-    state |= GDK_MOD4_MASK;
-  if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5")))
-    state |= GDK_MOD5_MASK;
-
-  return state;
-}
-
-static gboolean
-gdk_mir_keymap_translate_keyboard_state (GdkKeymap       *keymap,
-                                         guint            hardware_keycode,
-                                         GdkModifierType  state,
-                                         gint             group,
-                                         guint           *keyval,
-                                         gint            *effective_group,
-                                         gint            *effective_level,
-                                         GdkModifierType *consumed_modifiers)
-{
-  GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
-  struct xkb_state *xkb_state;
-  guint32 modifiers;
-  guint32 consumed;
-  xkb_layout_index_t layout;
-  xkb_level_index_t level;
-  xkb_keysym_t sym;
-
-  modifiers = get_xkb_modifiers (mir_keymap->xkb_keymap, state);
-
-  xkb_state = xkb_state_new (mir_keymap->xkb_keymap);
-
-  xkb_state_update_mask (xkb_state, modifiers, 0, 0, group, 0, 0);
-
-  layout = xkb_state_key_get_layout (xkb_state, hardware_keycode);
-  level = xkb_state_key_get_level (xkb_state, hardware_keycode, layout);
-  sym = xkb_state_key_get_one_sym (xkb_state, hardware_keycode);
-  consumed = modifiers & ~xkb_state_mod_mask_remove_consumed (xkb_state, hardware_keycode, modifiers);
-
-  xkb_state_unref (xkb_state);
-
-  if (keyval)
-    *keyval = sym;
-  if (effective_group)
-    *effective_group = layout;
-  if (effective_level)
-    *effective_level = level;
-  if (consumed_modifiers)
-    *consumed_modifiers = get_gdk_modifiers (mir_keymap->xkb_keymap, consumed);
-
-  return TRUE;
-}
-
-static void
-gdk_mir_keymap_add_virtual_modifiers (GdkKeymap       *keymap,
-                                      GdkModifierType *state)
-{
-  // FIXME: What is this?
-}
-
-static gboolean
-gdk_mir_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
-                                      GdkModifierType *state)
-{
-  // FIXME: What is this?
-  return TRUE;
-}
-
-static guint
-gdk_mir_keymap_get_modifier_state (GdkKeymap *keymap)
-{
-  GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
-  xkb_mod_mask_t mods;
-
-  mods = xkb_state_serialize_mods (mir_keymap->xkb_state, XKB_STATE_MODS_EFFECTIVE);
-
-  return get_gdk_modifiers (mir_keymap->xkb_keymap, mods);
-}
-
-gboolean
-_gdk_mir_keymap_key_is_modifier (GdkKeymap *keymap,
-                                 guint      keycode)
-{
-  // FIXME: use xkb_state
-  return IsModifierKey (keycode);
-}
-
-static void
-update_direction (GdkMirKeymap *keymap)
-{
-  gint num_layouts;
-  gint *rtl;
-  guint key;
-  gboolean have_rtl, have_ltr;
-  gint i;
-
-  num_layouts = xkb_keymap_num_layouts (keymap->xkb_keymap);
-
-  g_free (keymap->direction);
-  keymap->direction = g_new0 (PangoDirection, num_layouts);
-
-  rtl = g_new0 (gint, num_layouts);
-
-  for (key = 8; key < 255; key++) /* FIXME: min/max keycode */
-    {
-       gint layouts;
-       gint layout;
-
-       layouts = xkb_keymap_num_layouts_for_key (keymap->xkb_keymap, key);
-       for (layout = 0; layout < layouts; layout++)
-         {
-           const xkb_keysym_t *syms;
-           gint num_syms;
-           gint sym;
-
-           num_syms = xkb_keymap_key_get_syms_by_level (keymap->xkb_keymap, key, layout, 0, &syms);
-           for (sym = 0; sym < num_syms; sym++)
-             {
-               PangoDirection dir;
-               dir = pango_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
-               switch (dir)
-                 {
-                 case PANGO_DIRECTION_RTL:
-                   rtl[layout]++;
-                   break;
-                 case PANGO_DIRECTION_LTR:
-                   rtl[layout]--;
-                   break;
-                 default:
-                   break;
-                 }
-             }
-         }
-    }
-
-  have_rtl = have_ltr = FALSE;
-  for (i = 0; i < num_layouts; i++)
-    {
-      if (rtl[i] > 0)
-        {
-          keymap->direction[i] = PANGO_DIRECTION_RTL;
-          have_rtl = TRUE;
-        }
-      else
-        {
-          keymap->direction[i] = PANGO_DIRECTION_LTR;
-          have_ltr = TRUE;
-        }
-    }
-
-  if (have_rtl && have_ltr)
-    keymap->bidi = TRUE;
-
-  g_free (rtl);
-}
-
-static void
-gdk_mir_keymap_init (GdkMirKeymap *keymap)
-{
-  struct xkb_context *context;
-  struct xkb_rule_names names;
-
-  context = xkb_context_new (0);
-
-  names.rules = "evdev";
-  names.model = "pc105";
-  names.layout = "us";
-  names.variant = "";
-  names.options = "";
-  keymap->xkb_keymap = xkb_keymap_new_from_names (context, &names, 0);
-  keymap->xkb_state = xkb_state_new (keymap->xkb_keymap);
-
-  xkb_context_unref (context);
-
-  update_direction (keymap);
-}
-
-static void
-gdk_mir_keymap_finalize (GObject *object)
-{
-  GdkMirKeymap *keymap = GDK_MIR_KEYMAP (object);
-
-  xkb_keymap_unref (keymap->xkb_keymap);
-  xkb_state_unref (keymap->xkb_state);
-  g_free (keymap->direction);
-
-  G_OBJECT_CLASS (gdk_mir_keymap_parent_class)->finalize (object);
-}
-
-static void
-gdk_mir_keymap_class_init (GdkMirKeymapClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkKeymapClass *keymap_class = GDK_KEYMAP_CLASS (klass);
-
-  object_class->finalize = gdk_mir_keymap_finalize;
-
-  keymap_class->get_direction = gdk_mir_keymap_get_direction;
-  keymap_class->have_bidi_layouts = gdk_mir_keymap_have_bidi_layouts;
-  keymap_class->get_caps_lock_state = gdk_mir_keymap_get_caps_lock_state;
-  keymap_class->get_num_lock_state = gdk_mir_keymap_get_num_lock_state;
-  keymap_class->get_scroll_lock_state = gdk_mir_keymap_get_scroll_lock_state;
-  keymap_class->get_entries_for_keyval = gdk_mir_keymap_get_entries_for_keyval;
-  keymap_class->get_entries_for_keycode = gdk_mir_keymap_get_entries_for_keycode;
-  keymap_class->lookup_key = gdk_mir_keymap_lookup_key;
-  keymap_class->translate_keyboard_state = gdk_mir_keymap_translate_keyboard_state;
-  keymap_class->add_virtual_modifiers = gdk_mir_keymap_add_virtual_modifiers;
-  keymap_class->map_virtual_modifiers = gdk_mir_keymap_map_virtual_modifiers;
-  keymap_class->get_modifier_state = gdk_mir_keymap_get_modifier_state;
-}

gdk/mir/gdkmirpointer.c

@@ -1,247 +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 "gdkdisplayprivate.h"
-#include "gdkdeviceprivate.h"
-#include "gdkscreen.h"
-#include "gdkwindow.h"
-
-typedef struct GdkMirPointer      GdkMirPointer;
-typedef struct GdkMirPointerClass GdkMirPointerClass;
-
-#define GDK_TYPE_MIR_POINTER              (gdk_mir_pointer_get_type ())
-#define GDK_MIR_POINTER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_POINTER, GdkMirPointer))
-#define GDK_MIR_POINTER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_POINTER, GdkMirPointerClass))
-#define GDK_IS_MIR_POINTER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_POINTER))
-#define GDK_IS_MIR_POINTER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_POINTER))
-#define GDK_MIR_POINTER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_POINTER, GdkMirPointerClass))
-
-struct GdkMirPointer
-{
-  GdkDevice parent_instance;
-
-  /* Location of pointer */
-  gdouble x;
-  gdouble y;
-
-  /* Window this pointer is over */
-  GdkWindow *over_window;
-
-  /* Current modifier mask */
-  GdkModifierType modifier_mask;
-};
-
-struct GdkMirPointerClass
-{
-  GdkDeviceClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirPointer, gdk_mir_pointer, GDK_TYPE_DEVICE)
-
-GdkDevice *
-_gdk_mir_pointer_new (GdkDeviceManager *device_manager, const gchar *name)
-{
-  return g_object_new (GDK_TYPE_MIR_POINTER,
-                       "display", gdk_device_manager_get_display (device_manager),
-                       "device-manager", device_manager,
-                       "name", name,
-                       "type", GDK_DEVICE_TYPE_MASTER,
-                       "input-source", GDK_SOURCE_MOUSE,
-                       "input-mode", GDK_MODE_SCREEN,
-                       "has-cursor", TRUE,
-                       NULL);
-}
-
-void
-_gdk_mir_pointer_set_location (GdkDevice *pointer,
-                               gdouble x,
-                               gdouble y,
-                               GdkWindow *window,
-                               GdkModifierType mask)
-{
-  GdkMirPointer *p = GDK_MIR_POINTER (pointer);
-
-  p->x = x;
-  p->y = y;
-  if (p->over_window)
-    g_object_unref (p->over_window);
-  p->over_window = g_object_ref (window);
-  p->modifier_mask = mask;
-}
-
-static gboolean
-gdk_mir_pointer_get_history (GdkDevice      *device,
-                             GdkWindow      *window,
-                             guint32         start,
-                             guint32         stop,
-                             GdkTimeCoord ***events,
-                             gint           *n_events)
-{
-  return FALSE;
-}
-
-static void
-gdk_mir_pointer_get_state (GdkDevice       *device,
-                           GdkWindow       *window,
-                           gdouble         *axes,
-                           GdkModifierType *mask)
-{
-  GdkMirPointer *p = GDK_MIR_POINTER (device);
-  gdouble x, y;
-
-  gdk_window_get_device_position_double (window, device, &x, &y, mask);
-  if (axes)
-    {
-      axes[0] = p->x;
-      axes[1] = p->y;
-    }
-}
-
-static void
-gdk_mir_pointer_set_window_cursor (GdkDevice *device,
-                                   GdkWindow *window,
-                                   GdkCursor *cursor)
-{
-  /* Mir doesn't support cursors */
-}
-
-static void
-gdk_mir_pointer_warp (GdkDevice *device,
-                      GdkScreen *screen,
-                      gdouble    x,
-                      gdouble    y)
-{
-  /* Mir doesn't support warping */
-}
-
-static void
-gdk_mir_pointer_query_state (GdkDevice        *device,
-                             GdkWindow        *window,
-                             GdkWindow       **root_window,
-                             GdkWindow       **child_window,
-                             gdouble          *root_x,
-                             gdouble          *root_y,
-                             gdouble          *win_x,
-                             gdouble          *win_y,
-                             GdkModifierType  *mask)
-{
-  GdkMirPointer *p = GDK_MIR_POINTER (device);
-
-  if (root_window)
-    *root_window = gdk_screen_get_root_window (gdk_display_get_default_screen (gdk_device_get_display (device)));
-  if (child_window)
-    *child_window = p->over_window;
-  if (root_x)
-    *root_x = p->x;
-  if (root_y)
-    *root_y = p->y;
-  if (win_x)
-    *win_x = p->x; // FIXME
-  if (win_y)
-    *win_y = p->y;
-  if (mask)
-    *mask = p->modifier_mask;
-}
-
-static GdkGrabStatus
-gdk_mir_pointer_grab (GdkDevice    *device,
-                      GdkWindow    *window,
-                      gboolean      owner_events,
-                      GdkEventMask  event_mask,
-                      GdkWindow    *confine_to,
-                      GdkCursor    *cursor,
-                      guint32       time_)
-{
-  /* Mir doesn't do grabs, so sure, you have the grab */
-  return GDK_GRAB_SUCCESS;
-}
-
-static void
-gdk_mir_pointer_ungrab (GdkDevice *device,
-                        guint32    time_)
-{
-  /* Mir doesn't do grabs */
-
-  GdkDeviceGrabInfo *grab = _gdk_display_get_last_device_grab (gdk_device_get_display (device), device);
-
-  if (grab)
-    grab->serial_end = grab->serial_start;
-}
-
-static GdkWindow *
-gdk_mir_pointer_window_at_position (GdkDevice       *device,
-                                    gdouble         *win_x,
-                                    gdouble         *win_y,
-                                    GdkModifierType *mask,
-                                    gboolean         get_toplevel)
-{
-  GdkMirPointer *p = GDK_MIR_POINTER (device);
-
-  if (win_x)
-    *win_x = p->x;
-  if (win_y)
-    *win_y = p->y;
-  if (mask)
-    *mask = p->modifier_mask;
-
-  return p->over_window;
-}
-
-static void
-gdk_mir_pointer_select_window_events (GdkDevice    *device,
-                                      GdkWindow    *window,
-                                      GdkEventMask  event_mask)
-{
-  // FIXME?
-}
-
-static void
-gdk_mir_pointer_init (GdkMirPointer *device)
-{
-}
-
-static void
-gdk_mir_pointer_finalize (GObject *object)
-{
-  GdkMirPointer *p = GDK_MIR_POINTER (object);
-
-  if (p->over_window)
-    g_object_unref (p->over_window);
-
-  G_OBJECT_CLASS (gdk_mir_pointer_parent_class)->finalize (object);
-}
-
-static void
-gdk_mir_pointer_class_init (GdkMirPointerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
-
-  object_class->finalize = gdk_mir_pointer_finalize;
-
-  device_class->get_history = gdk_mir_pointer_get_history;
-  device_class->get_state = gdk_mir_pointer_get_state;
-  device_class->set_window_cursor = gdk_mir_pointer_set_window_cursor;
-  device_class->warp = gdk_mir_pointer_warp;
-  device_class->query_state = gdk_mir_pointer_query_state;
-  device_class->grab = gdk_mir_pointer_grab;
-  device_class->ungrab = gdk_mir_pointer_ungrab;
-  device_class->window_at_position = gdk_mir_pointer_window_at_position;
-  device_class->select_window_events = gdk_mir_pointer_select_window_events;
-}

gdk/mir/gdkmirwindow.c

@@ -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/>.
- */
-
-#include "config.h"
-
-#include "gdkinternals.h"
-
-#include "gdkmir.h"
-
-#define GDK_MIR_WINDOW(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW_MIR, GdkMirWindow))
-#define GDK_MIR_WINDOW_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW_MIR, GdkMirWindowClass))
-#define GDK_IS_WINDOW_MIR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW_MIR))
-#define GDK_MIR_WINDOW_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW_MIR, GdkMirWindowClass))
-
-typedef struct _GdkMirWindow GdkMirWindow;
-typedef struct _GdkMirWindowClass GdkMirWindowClass;
-
-struct _GdkMirWindow
-{
-  GdkWindow parent_instance;
-};
-
-struct _GdkMirWindowClass
-{
-  GdkWindowClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirWindow, gdk_mir_window, GDK_TYPE_WINDOW)
-
-static void
-gdk_mir_window_init (GdkMirWindow *impl)
-{
-}
-
-static void
-gdk_mir_window_class_init (GdkMirWindowClass *klass)
-{
-}

gdk/quartz/GdkQuartzNSWindow.c

@@ -21,6 +21,8 @@
 #include "gdkquartzwindow.h"
 #include "gdkdnd-quartz.h"
 #include "gdkprivate-quartz.h"
+#include "gdkinternal-quartz.h"
+#include "gdkquartzdnd.h"
 
 @implementation GdkQuartzNSWindow
 

gdk/quartz/GdkQuartzView.c

@@ -23,6 +23,7 @@
 #include "gdkquartzwindow.h"
 #include "gdkprivate-quartz.h"
 #include "gdkquartz.h"
+#include "gdkinternal-quartz.h"
 
 @implementation GdkQuartzView
 
@@ -532,6 +533,20 @@
 		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
 }
 
+-(void)scrollPageDown: (id)sender
+{
+  GDK_NOTE (EVENTS, g_message ("scrollPageDown"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)scrollPageUp: (id)sender
+{
+  GDK_NOTE (EVENTS, g_message ("scrollPageUp"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
 -(void)selectAll: (id)sender
 {
   GDK_NOTE (EVENTS, g_message ("selectAll"));

gdk/quartz/Makefile.am

@@ -38,7 +38,9 @@ libgdk_quartz_la_SOURCES =    	\
 	gdkglcontext-quartz.c	\
 	gdkglcontext-quartz.h	\
 	gdkglobals-quartz.c	\
+	gdkinternal-quartz.h	\
 	gdkkeys-quartz.c	\
+	gdkkeys-quartz.h	\
 	gdkmonitor-quartz.c     \
 	gdkmonitor-quartz.h     \
 	gdkprivate-quartz.h	\
@@ -58,6 +60,7 @@ libgdkinclude_HEADERS = 	\
 	gdkquartz.h
 
 libgdkquartzinclude_HEADERS =		\
+	gdkquartz-gtk-only.h            \
 	gdkquartzcursor.h		\
 	gdkquartzdevice-core.h		\
 	gdkquartzdevicemanager-core.h	\

gdk/quartz/gdkcursor-quartz.c

@@ -23,6 +23,7 @@
 #include "gdkcursorprivate.h"
 #include "gdkquartzcursor.h"
 #include "gdkprivate-quartz.h"
+#include "gdkinternal-quartz.h"
 
 #include "xcursors.h"
 

gdk/quartz/gdkdevice-core-quartz.c

@@ -26,6 +26,7 @@
 #include "gdkquartzcursor.h"
 #include "gdkprivate-quartz.h"
 #include "gdkquartzdevice-core.h"
+#include "gdkinternal-quartz.h"
 
 struct _GdkQuartzDeviceCore
 {

gdk/quartz/gdkdisplay-quartz.c

@@ -88,9 +88,6 @@ _gdk_quartz_display_open (const gchar *display_name)
   if (_gdk_display != NULL)
     return NULL;
 
-  /* Initialize application */
-  [NSApplication sharedApplication];
-
   _gdk_display = g_object_new (gdk_quartz_display_get_type (), NULL);
   _gdk_display->device_manager = _gdk_device_manager_new (_gdk_display);
 
@@ -101,6 +98,8 @@ _gdk_quartz_display_open (const gchar *display_name)
 
   _gdk_quartz_events_init ();
 
+  /* Initialize application */
+  [NSApplication sharedApplication];
 #if 0
   /* FIXME: Remove the #if 0 when we have these functions */
   _gdk_quartz_dnd_init ();
@@ -365,8 +364,8 @@ display_reconfiguration_callback (CGDirectDisplayID            cg_display,
       return;
 
   if (flags & (kCGDisplayMovedFlag | kCGDisplayAddFlag | kCGDisplayEnabledFlag |
-               kCGDisplaySetMainFlag | kCGDisplayDesktopShapeChangedFlag |
-               kCGDisplayMirrorFlag | kCGDisplayUnMirrorFlag))
+               kCGDisplaySetMainFlag | kCGDisplayMirrorFlag |
+               kCGDisplayUnMirrorFlag))
     {
       GdkQuartzMonitor *monitor = NULL;
       guint index;

gdk/quartz/gdkdisplay-quartz.h

@@ -25,6 +25,7 @@
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdkmain.h"
+#include "gdkinternal-quartz.h"
 
 G_BEGIN_DECLS
 

gdk/quartz/gdkdnd-quartz.c

@@ -20,7 +20,8 @@
 #include "gdkdnd.h"
 #include "gdkquartzdnd.h"
 #include "gdkprivate-quartz.h"
-
+#include "gdkinternal-quartz.h"
+#include "gdkquartz-gtk-only.h"
 
 G_DEFINE_TYPE (GdkQuartzDragContext, gdk_quartz_drag_context, GDK_TYPE_DRAG_CONTEXT)
 

gdk/quartz/gdkdnd-quartz.h

@@ -21,7 +21,6 @@
 #define __GDK_QUARTZ_DND__
 
 #include <gdkdndprivate.h>
-#include "gdkquartzdnd.h"
 
 #include <AppKit/AppKit.h>
 

gdk/quartz/gdkeventloop-quartz.c

@@ -7,6 +7,7 @@
 #include <unistd.h>
 
 #include "gdkprivate-quartz.h"
+#include "gdkinternal-quartz.h"
 #include <gdk/gdkdisplayprivate.h>
 
 /* 
@@ -152,6 +153,18 @@ static const char *const state_names[]  = {
 };
 #endif
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+typedef enum
+  {
+   GDK_QUARTZ_EVENT_MASK_ANY = NSAnyEventMask,
+  } GdkQuartzEventMask;
+#else
+typedef enum
+  {
+   GDK_QUARTZ_EVENT_MASK_ANY = NSEventMaskAny,
+  } GdkQuartzEventMask;
+#endif
+
 static SelectThreadState select_thread_state = BEFORE_START;
 
 static pthread_t select_thread;

gdk/quartz/gdkevents-quartz.c

@@ -34,18 +34,26 @@
 #include "gdkquartz.h"
 #include "gdkquartzdisplay.h"
 #include "gdkprivate-quartz.h"
+#include "gdkinternal-quartz.h"
 #include "gdkquartzdevicemanager-core.h"
 #include "gdkquartzkeys.h"
+#include "gdkkeys-quartz.h"
 
 #define GRIP_WIDTH 15
 #define GRIP_HEIGHT 15
 #define GDK_LION_RESIZE 5
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#define NSEventTypeRotate 13
+#define NSEventTypeMagnify 30
+#endif
+
 #define WINDOW_IS_TOPLEVEL(window)		     \
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN)
 
+
 /* This is the window corresponding to the key window */
 static GdkWindow   *current_keyboard_window;
 
@@ -452,6 +460,29 @@ get_toplevel_from_ns_event (NSEvent *nsevent,
            * here, not very nice.
            */
           _gdk_quartz_events_break_all_grabs (get_time_from_ns_event (nsevent));
+
+          /* Check if the event occurred on the titlebar. If it did,
+           * explicitly return NULL to prevent going through the
+           * fallback path, which could match the window that is
+           * directly under the titlebar.
+           */
+          if (view_point.y < 0 &&
+              view_point.x >= view_frame.origin.x &&
+              view_point.x < view_frame.origin.x + view_frame.size.width)
+            {
+              NSView *superview = [view superview];
+              if (superview)
+                {
+                  NSRect superview_frame = [superview frame];
+                  int titlebar_height = superview_frame.size.height -
+                                        view_frame.size.height;
+
+                  if (titlebar_height > 0 && view_point.y >= -titlebar_height)
+                    {
+                      return NULL;
+                    }
+                }
+            }
         }
       else
         {
@@ -1312,14 +1343,16 @@ _gdk_quartz_events_get_current_keyboard_modifiers (void)
 GdkModifierType
 _gdk_quartz_events_get_current_mouse_modifiers (void)
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
   if (gdk_quartz_osx_version () >= GDK_OSX_SNOW_LEOPARD)
-    {
-      return get_mouse_button_modifiers_from_ns_buttons ([NSClassFromString(@"NSEvent") pressedMouseButtons]);
-    }
+    return get_mouse_button_modifiers_from_ns_buttons ([NSClassFromString(@"NSEvent") pressedMouseButtons]);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
   else
-    {
-      return get_mouse_button_modifiers_from_ns_buttons (GetCurrentButtonState ());
-    }
+#endif
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+    return get_mouse_button_modifiers_from_ns_buttons (GetCurrentButtonState ());
+#endif
 }
 
 /* Detect window resizing */

gdk/quartz/gdkglobals-quartz.c

@@ -20,6 +20,7 @@
 #include "gdktypes.h"
 #include "gdkprivate.h"
 #include "gdkquartz.h"
+#include "gdkinternal-quartz.h"
 
 GdkDisplay *_gdk_display = NULL;
 GdkScreen *_gdk_screen = NULL;