wayland: Emit wp_tablet_pad_group.buttons after focus changes

The buttons grabbed by the compositor might have changed in between,
so just broadcast the button array again.

.gitignore

@@ -41,14 +41,8 @@ stamp-h1
 *~
 stamp-it
 .intltool-merge-cache
-ABOUT-NLS
 POTFILES
-Makevars.template
-po/*.header
 po/*.pot
-po/*.sed
-po/*.sin
-Rules-quot
 libmutter.pc
 mutter
 mutter-restart-helper
@@ -83,10 +77,7 @@ src/relative-pointer-unstable-v*-protocol.c
 src/relative-pointer-unstable-v*-server-protocol.h
 src/pointer-constraints-unstable-v*-protocol.c
 src/pointer-constraints-unstable-v*-server-protocol.h
-src/xdg-foreign-unstable-v*-protocol.c
-src/xdg-foreign-unstable-v*-server-protocol.h
 src/meta/meta-version.h
-src/libmutter-*.pc
 doc/reference/*.args
 doc/reference/*.bak
 doc/reference/*.hierarchy

NEWS

@@ -1,259 +1,3 @@
-3.25.1
-======
-* Always sync window geometry on state changes [Jonas; #780292]
-* Use EGL instead of GLX when drawing using GLES [Jonas; #771636]
-* Fix HiDPI detection on vertical monitor layouts [Carlos; #777687]
-* Get double-click timing from desktop mouse settings [Armin; #771576]
-* Scale relative motion deltas with monitor scale [Jonas, Carlos; #778119]
-* Use texture fallback when setting hardware cursor fails [Jente; #770020]
-* Fix lock-up when using additional theme variants [Shantanu; #780254]
-* Rework low-level monitor configuration [Jonas; #777732]
-* Fix building with GLES2 instead of GL [Mario; #781398]
-* Misc. bug fixes [Jonas, Piotr, Philip; #780304, #772218, #781242, #781391]
-
-Contributors:
-  Jonas Ådahl, Philip Chimento, Piotr Drąg, Carlos Garnacho, Shantanu Goel,
-  Jente Hidskes, Armin Krezović, Rui Matos, Florian Müllner, Mario Sanchez Prada
-
-Translations:
-  Yuras Shumovich [be], Yosef Or Boczko [he], Tom Tryfonidis [el],
-  Fabio Tomat [fur], Kukuh Syafaat [id]
-
-3.24.0
-======
-
-Translations:
-  Yuri Myasoedov [ru], Rūdolfs Mazurs [lv], Jordi Mas [ca]
-
-3.23.92
-=======
-* Properly handle EGLOutput acquire errors [Jonas, Miguel; #779112]
-* Fix crash when a window closes during Alt+Tab [Rui; #779483]
-* Implement DnD handling code in wayland [Hyungwon; #765003]
-* Fix fallout from pixel conversion optimization in 3.23.91 [Carlos; #779234]
-* Fix mouse input stopping to work in applications [Carlos; #763246]
-* Fix DnD between QT5 and GTK3 applications on wayland [Carlos; #779757]
-* Make EDID reading less fragile [Jonas; #779837]
-* Add support for tablet grouping [Carlos; #779986]
-* Misc. bug fixes and cleanups [Rui, Jonas; #779436, #779001, #779745]
-
-Contributors:
-  Jonas Ådahl, Miguel A. Vico, Olivier Fourdan, Carlos Garnacho,
-  Hyungwon Hwang, Rui Matos
-
-Translations:
-  Chao-Hsiung Liao [zh_TW], Sveinn í Felli [is], Ask Hjorth Larsen [da],
-  Changwoo Ryu [ko], Aurimas Černius [lt], GNOME Translation Robot [gd],
-  Marek Černocký [cs], Fran Dieguez [gl], Dušan Kazik [sk]
-
-3.23.91
-=======
-* Give libinput read-only access to /sys [Carlos; #778472]
-* Allow edge-scrolling without 2-finger-scroll capable devices [Rui; #778554]
-* Fullscreen windows on the requested monitor on wayland [Rui; #772525]
-* Implement threaded swap_event fallback for NVIDIA driver [Owen; #779039]
-* Avoid pixel conversions when storing textures from cairo [Carlos; #779234]
-* Misc. bug fixes [Piotr, Rui, Florian; #772218, #776919, #778831, #642652]
-
-Contributors:
-  Piotr Drąg, Carlos Garnacho, Rui Matos, Florian Müllner, Owen W. Taylor
-
-Translations:
-  Inaki Larranaga Murgoitio [eu], Daniel Mustieles [es], Claude Paroz [fr],
-  Mario Blättermann [de], Kjartan Maraas [nb], Piotr Drąg [pl],
-  Andika Triwidada [id], Anders Jonsson [sv], Milo Casagrande [it],
-  Fabio Tomat [fur], Rafael Fontenelle [pt_BR],
-  Мирослав Николић [sr, sr@latin], Balázs Meskó [hu], Chao-Hsiung Liao [zh_TW]
-
-3.23.90
-=======
-* Fix window menu placement with HiDPI [Jonas; #776055]
-* Improve EGLStream support [Jonas; #773629]
-* Start moving low-level monitor configuration into mutter [Jonas; #777732]
-* Fix erroneous key event repeats [Rui; #774989]
-* Don't hardcode seat ID in ClutterDeviceManager [Carlos; #778092]
-* Fix "ghost" cursors in multi-monitor setups [Jonas; #771056]
-* Use eglGetPlatformDisplay [Adam; #772422]
-* Fix erratic raise_or_lower behavior [Jose; #705200]
-* Fix coordinate mapping of absolute devices [Carlos; #774115]
-* Show OSD on tablet mode switches [Carlos; #771098]
-* Make mutter libs parallel installable [Jonas; #777317]
-* Only apply keymap when not running nested [Jonas; #777800]
-* Set right scale for tablet tool cursors on HiDPI [Carlos; #778474]
-* Adjust server-side shadows to match Adwaita [Juraj; #744667]
-* Misc. bug fixes [Jonas, Bastien, Carlos, Peter, Lionel, Jeremy, Florian;
-  #774891, #777389, #777691, #778262, #776543, #778684, #778699, #744667]
-
-Contributors:
-  Jonas Ådahl, Jeremy Bicha, Piotr Drąg, Juraj Fiala, Carlos Garnacho,
-  Peter Hutterer, Adam Jackson, Lionel Landwerlin, Jose Marino, Rui Matos,
-  Florian Müllner, Bastien Nocera
-
-Translations:
-  Kjartan Maraas [nb], Mandy Wang [zh_CN], Marek Černocký [cs],
-  Anders Jonsson [sv], Dušan Kazik [sk], Piotr Drąg [pl], Matej Urbančič [sl]
-
-3.23.3
-======
-* Fix frequent freezes in multihead setups on wayland [Rui; #774557]
-* Preserve root window mask on XSelectionRequest [Olivier; #776128]
-* Misc. bug fixes [Carlos, Florian, Rui, Olivier; #775478, #774891, #775986,
-  #776036]
-
-Contributors:
-  Olivier Fourdan, Carlos Garnacho, Rui Matos, Florian Müllner
-
-3.23.2
-======
-* Stack docks below other windows on fullscreen monitors [Rui; #772937]
-* Fix popup grabs blocking screen lock on wayland [Rui; #771235]
-* Handle touchpad pinch gestures with more than two fingers [Carlos; #765937]
-* Implement drawing tablet support on X11 [Carlos; #773779]
-* Fix some Wine games starting minimized [Carlos; #774333]
-* Fix switching between two finger- and edge scrolling on wayland [Rui; #771744]
-* Implement support for EGLStream/EGLDevice [Jonas; #773629]
-* Add size_changed vfunc to handle async client size changes [Rui; #770345]
-* Change focus window on clicks with any modifiers [Rui; #746642]
-* Misc. bug fixes and cleanups [Carlos, Daniel, Jonas, Rui; #771067, #774330, #774613,
-  #771297, #774135, #774827, #774923]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner, Daniel Stone
-
-Translations:
-  Kjartan Maraas [nb]
-
-3.23.1
-======
-* Fix handling of Escape shortcut in force-quit dialog [Landry; #737109]
-* Improve pointer constraints support [Jonas; #771859]
-* Really fix framebuffer capture origin offset [Rui; #771502]
-* Fix session going into idle mode immediately on startup [Rui; #772839]
-* Fix mirror mode with stage views [Rui; #773115]
-* Fall back to X with connectors spread across multiple GPUs [Ray; #771442]
-* Fix various crashes on wayland [Jonas, Carlos; #771646, #771858, #772929]
-* Fix various placement issues on wayland [Olivier, Jonas, Sjoerd; #772729,
-  #768039, #771841, #771841, #773141]
-* Misc. bug fixes [Rui, Jonas, Olivier; #771019, #773116, #772914, #773210]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos, Landry MINOZA,
-  Sjoerd Simons, Ray Strode
-
-Translations:
-  Theppitak Karoonboonyanan [th], Kjartan Maraas [nb], Hannie Dumoleyn [nl],
-  liushuyu [zh_CN]
-
-3.22.1
-======
-* Fix feedback loop between StClipboard and X11 bridge [Carlos; #760745]
-* Fall back gracefully if DRM plane rotation fails [Carlos; #772512]
-* Approximate native monitor backend behavior to X [Rui; #772176]
-* Fix crash on VT switch on wayland [Jonas; #771646]
-* Expose Flatpak ID for application matching [Florian; #772613, #772614]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner, Olav Vitters
-
-Translations:
-  Inaki Larranaga Murgoitio [eu], Milo Casagrande [it]
-
-3.22.0
-======
-* Fix wayland crashes [Jonas; #771305, #771345, #770940, #771495]
-* Fix display rotation on wayland [Jonas; #770672]
-* Fix framebuffer capture origin offset [Rui; #771502]
-* Misc. bug fixes [Jonas, Florian, Carlos; #770937, #771536, #771628, #771549]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner
-
-Translations:
-  Ask Hjorth Larsen [da], Charles Monzat [fr], Stas Solovey [ru],
-  Tom Tryfonidis [el], David King [en_GB]
-
-3.21.92
-=======
-* Fix absolute pointer motion events on wayland [Jonas; #770557]
-* Default to using stage views [Jonas; #770366]
-* Fix animated cursors on wayland [Rui; #749913]
-* Fix various crashes on wayland [Jonas; #757568, #770727, #770992]
-* Fix screen capture for stage views not at (0, 0) [Jonas; #770127]
-* Compress motion events instead of discarding them [Jonas; #771049]
-* Fix XWayland pointer warp emulation [Jonas; #771050]
-* Add common monitor modes in KMS backend [Rui; #744544]
-* Temporarily use g-s-d schemas for tablet configuration [Carlos; #771315]
-* Misc. bug fixes [Jonas, Carlos; #770402, #770647, #770991, #770994, #770929]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos, Florian Müllner
-
-Translations:
-  Changwoo Ryu [ko], Baurzhan Muftakhidinov [kk], Anders Jonsson [sv],
-  Tiago Santos [pt], Rafael Fontenelle [pt_BR], Mario Blättermann [de],
-  Alexander Shopov [bg], Rūdolfs Mazurs [lv], Fran Dieguez [gl],
-  Trần Ngọc Quân [vi], Piotr Drąg [pl], Мирослав Николић [sr, sr@latin]
-
-3.21.91
-=======
-* Add support for xdg-foreign protocol [Jonas; #769786]
-* Support monitor rotation on wayland [Carlos; #745079]
-* Port xdg-shell implementation to unstable v6 [Jonas; #769936]
-* Handle unsupported buffer sizes more gracefully [Olivier; #770387]
-* Use the same output naming logic as the X server on wayland [Rui; #770338]
-* Fix replies in gnome-shell's chat notifications on wayland [Florian; #758167]
-* Misc. bug fixes and cleanups [Bastien, Sjoerd, Jonas; #769276, #769636,
-  #770131, #770324, #769731]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos, Florian Müllner,
-  Bastien Nocera, Sjoerd Simons
-
-Translations:
-  Piotr Drąg [pl], Mario Blättermann [de], Andika Triwidada [id],
-  Enrico Nicoletto [pt_BR], Мирослав Николић [sr, sr@latin]
-
-3.21.90
-=======
-* Consider XDG_SESSION_TYPE when determining session type [Jouke; #759388]
-* Re-add support for edge scrolling on some touchpads [Bastien; #768245]
-* Support mouse and trackball acceleration profile [Jonas; #769179]
-* Draw monitor contentn to individual framebuffer [Jonas; #768976]
-* Support virtual input devices [Jonas, Carlos; #765009]
-* Set correct output scale on hotplug [Jonas; #769505]
-* Misc. bug fixes and cleanups [Florian, Jonas, Thomas, Bastien, Carlos;
-  #769014, #769024, #769054, #769070, #769036, #769305, #769578, #769800,
-  #769073]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Thomas Hindoe Paaboel Andersen, Simon McVittie,
-  Alberts Muktupāvels, Florian Müllner, Bastien Nocera, Jouke Witteveen
-
-Translations:
-  Daniel Mustieles [es], Aurimas Černius [lt], Dušan Kazik [sk],
-  Fabio Tomat [fur], Balázs Úr [hu], Yosef Or Boczko [he], Marek Černocký [cs],
-  Matej Urbančič [sl]
-
-3.21.4
-======
-* Fix missing frame border around GTK+ dialogs [Florian; #745060]
-* Improve X11 <-> wayland copy and paste interaction [Carlos; #768007]
-* Add support for NV_robustness_video_memory_purge extension [Rui; #739178]
-* Fix restoring the old focused window on restart [Owen; #766243]
-* Fix fullscreen windows on other monitors stealing focus after closing
-  a window [Rui; #768221]
-* Draw monitor content to individual framebuffer [Jonas; #768976]
-* Provide screen capture API [Jonas; #768978]
-* Misc. bug fixes and cleanups [Rui, Owen, Luca, Olivier, Jonas, Carlos;
-  #767969, #768243, #762407, #767997, #768039, #768977, #768977]
-
-Contributors:
-  Jonas Ådahl, Luca Bruno, Olivier Fourdan, Carlos Garnacho, Rui Matos,
-  Florian Müllner, Owen W. Taylor
-
-Translations:
-  Andika Triwidada [id]
-
 3.21.3
 ======
 * Don't create invalid UTF-8 window description strings [Rui; #765535]

autogen.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname $0`
@@ -6,21 +6,16 @@ test -z "$srcdir" && srcdir=.
 
 REQUIRED_AUTOMAKE_VERSION=1.11
 
-pushd $srcdir
+(test -f $srcdir/configure.ac \
-
+  && test -d $srcdir/src) || {
-(test -f configure.ac \
-  && test -d src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level mutter directory"
+    echo " top-level metacity directory"
     exit 1
 }
 
-aclocal --install || exit 1
+which gnome-autogen.sh || {
-intltoolize --force --copy --automake || exit 1
+    echo "You need to install gnome-common from GNOME Subversion (or from"
-autoreconf --verbose --force --install || exit 1
+    echo "your distribution's package manager)."
-
+    exit 1
-popd
+}
-
+. gnome-autogen.sh
-if [ "$NOCONFIGURE" = "" ]; then
-    $srcdir/configure "$@" || exit 1
-fi

clutter/clutter/Makefile.am

@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/clutter		\
 	-I$(top_srcdir)/../cogl			\
 	-I$(top_builddir)/../cogl		\
-	-I$(top_builddir)/../cogl/cogl		\
 	$(CLUTTER_DEPRECATED_CFLAGS)		\
 	$(CLUTTER_DEBUG_CFLAGS)			\
 	$(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)	\
@@ -37,7 +36,7 @@ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 INTROSPECTION_GIRS =
 
 # the base include path for headers
-clutter_base_includedir = $(includedir)/mutter/clutter-$(LIBMUTTER_API_VERSION)
+clutter_base_includedir = $(includedir)/mutter/clutter-$(CLUTTER_API_VERSION)
 clutter_includedir = $(clutter_base_includedir)/clutter
 clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated
 
@@ -113,6 +112,7 @@ source_h =					\
 	clutter-snap-constraint.h	\
 	clutter-stage.h 		\
 	clutter-stage-manager.h	\
+	clutter-stage-view.h		\
 	clutter-tap-action.h		\
 	clutter-test-utils.h		\
 	clutter-texture.h 		\
@@ -123,7 +123,6 @@ source_h =					\
 	clutter-transition.h		\
 	clutter-types.h		\
 	clutter-units.h 		\
-	clutter-virtual-input-device.h	\
 	clutter-zoom-action.h		\
 	$(NULL)
 
@@ -169,7 +168,6 @@ source_c = \
 	clutter-image.c		\
 	clutter-input-device.c	\
 	clutter-input-device-tool.c	\
-	clutter-virtual-input-device.c	\
 	clutter-interval.c            \
 	clutter-keyframe-transition.c	\
 	clutter-keysyms-table.c	\
@@ -198,6 +196,7 @@ source_c = \
 	clutter-snap-constraint.c	\
 	clutter-stage.c		\
 	clutter-stage-manager.c	\
+	clutter-stage-view.c	\
 	clutter-stage-window.c	\
 	clutter-tap-action.c		\
 	clutter-test-utils.c		\
@@ -239,7 +238,6 @@ source_h_priv = \
 	clutter-settings-private.h		\
 	clutter-stage-manager-private.h		\
 	clutter-stage-private.h			\
-	clutter-stage-view.h			\
 	clutter-stage-window.h			\
 	$(NULL)
 
@@ -248,7 +246,6 @@ source_c_priv = \
 	clutter-easing.c		\
 	clutter-event-translator.c	\
 	clutter-id-pool.c 		\
-	clutter-stage-view.c		\
 	$(NULL)
 
 # deprecated installed headers
@@ -356,7 +353,7 @@ EXTRA_DIST += clutter-version.h.in clutter-version.h
 # key symbol update script
 EXTRA_DIST += clutter-keysyms-update.pl
 
-pc_files += mutter-clutter-$(LIBMUTTER_API_VERSION).pc
+pc_files += mutter-clutter-$(CLUTTER_API_VERSION).pc
 
 # in order to be compatible with Clutter < 1.10, when we shipped a single
 # shared library whose name was determined by the single backend it
@@ -414,21 +411,11 @@ x11_source_c_priv = \
 x11_source_c += \
 	x11/clutter-device-manager-xi2.c	\
 	x11/clutter-input-device-xi2.c	\
-	x11/clutter-input-device-tool-xi2.c \
 	$(NULL)
 
 x11_source_h_priv += \
 	x11/clutter-device-manager-xi2.h	\
 	x11/clutter-input-device-xi2.h	\
-	x11/clutter-input-device-tool-xi2.h \
-	$(NULL)
-
-x11_source_c += \
-	x11/clutter-virtual-input-device-x11.c	\
-	$(NULL)
-
-x11_source_h_priv += \
-	x11/clutter-virtual-input-device-x11.h	\
 	$(NULL)
 
 backend_source_h += $(x11_source_h)
@@ -442,10 +429,10 @@ x11_introspection = $(x11_source_c) $(x11_source_h)
 clutterx11_includedir = $(clutter_includedir)/x11
 clutterx11_include_HEADERS = $(x11_source_h)
 
-mutter-clutter-x11-@LIBMUTTER_API_VERSION@.pc: mutter-clutter-$(LIBMUTTER_API_VERSION).pc
+mutter-clutter-x11-$(CLUTTER_API_VERSION).pc: mutter-clutter-$(CLUTTER_API_VERSION).pc
 	$(QUIET_GEN)cp -f $< $(@F)
 
-pc_files += mutter-clutter-x11-$(LIBMUTTER_API_VERSION).pc
+pc_files += mutter-clutter-x11-$(CLUTTER_API_VERSION).pc
 
 # Shared cogl backend files
 cogl_source_h =
@@ -471,17 +458,13 @@ backend_source_c += $(glx_source_c)
 evdev_c_priv = \
 	evdev/clutter-device-manager-evdev.c	\
 	evdev/clutter-input-device-evdev.c	\
-	evdev/clutter-seat-evdev.c		\
-	evdev/clutter-virtual-input-device-evdev.c	\
 	evdev/clutter-event-evdev.c		\
 	evdev/clutter-input-device-tool-evdev.c	\
 	$(NULL)
 evdev_h_priv = \
 	evdev/clutter-device-manager-evdev.h	\
 	evdev/clutter-input-device-evdev.h	\
-	evdev/clutter-seat-evdev.h		\
 	evdev/clutter-input-device-tool-evdev.h	\
-	evdev/clutter-virtual-input-device-evdev.h	\
 	$(NULL)
 evdev_h = evdev/clutter-evdev.h
 
@@ -583,17 +566,17 @@ nodist_clutter_include_HEADERS = clutter-config.h $(built_source_h)
 clutter_deprecated_HEADERS = $(deprecated_h)
 
 mutterlibdir = $(libdir)/mutter
-mutterlib_LTLIBRARIES = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
+mutterlib_LTLIBRARIES = libmutter-clutter-@CLUTTER_API_VERSION@.la
 
-libmutter_clutter_@LIBMUTTER_API_VERSION@_la_LIBADD = \
+libmutter_clutter_@CLUTTER_API_VERSION@_la_LIBADD = \
 	$(LIBM) \
 	$(CLUTTER_LIBS) \
-	$(top_builddir)/../cogl/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/../cogl/cogl/libmutter-cogl.la \
-	$(top_builddir)/../cogl/cogl-pango/libmutter-cogl-pango-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/../cogl/cogl-pango/libmutter-cogl-pango.la \
-	$(top_builddir)/../cogl/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/../cogl/cogl-path/libmutter-cogl-path.la \
 	$(NULL)
 
-libmutter_clutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
+libmutter_clutter_@CLUTTER_API_VERSION@_la_SOURCES = \
 	$(backend_source_c) \
 	$(backend_source_h) \
 	$(backend_source_c_priv) \
@@ -611,12 +594,12 @@ libmutter_clutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
 	$(cally_sources_private) \
 	$(NULL)
 
-nodist_libmutter_clutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
+nodist_libmutter_clutter_@CLUTTER_API_VERSION@_la_SOURCES = \
 	$(backend_source_built) \
 	$(built_source_c) \
 	$(built_source_h)
 
-libmutter_clutter_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_clutter_@CLUTTER_API_VERSION@_la_LDFLAGS = \
 	$(CLUTTER_LINK_FLAGS) \
 	$(CLUTTER_LT_LDFLAGS) \
 	-export-dynamic \
@@ -630,13 +613,13 @@ install-exec-local:
 	    rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
 	  ) ; \
 	  (cd $(DESTDIR)$(mutterlibdir) && \
-	    { ln -s -f libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
+	    { ln -s -f libmutter-clutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
-	      { rm -f $$lib.0 && ln -s libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
+	      { rm -f $$lib.0 && ln -s libmutter-clutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
 	    } \
 	  ) ; \
 	  (cd $(DESTDIR)$(mutterlibdir) && \
-	    { ln -s -f libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
+	    { ln -s -f libmutter-clutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
-	      { rm -f $$lib && ln -s libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
+	      { rm -f $$lib && ln -s libmutter-clutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
 	    } \
 	  ) ; \
 	done
@@ -644,65 +627,59 @@ install-exec-local:
 # gobject-introspection rules
 -include $(INTROSPECTION_MAKEFILE)
 
-INTROSPECTION_SCANNER_ARGS = \
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/../cogl/cogl --add-include-path=$(top_builddir)/../cogl/cogl-pango
-	--add-include-path=$(top_builddir)/../cogl/cogl \
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/../cogl/cogl --includedir=$(top_builddir)/../cogl/cogl-pango
-	--add-include-path=$(top_builddir)/../cogl/cogl-pango
-INTROSPECTION_COMPILER_ARGS = \
-	--includedir=$(top_builddir)/../cogl/cogl \
-	--includedir=$(top_builddir)/../cogl/cogl-pango
-INTROSPECTION_SCANNER_ENV = \
-	PKG_CONFIG_PATH=$(top_builddir)/../cogl/cogl/:$(top_builddir)/../cogl/cogl-pango/:$${PKG_CONFIG_PATH}
 
-Clutter-@LIBMUTTER_API_VERSION@.gir: libmutter-clutter-@LIBMUTTER_API_VERSION@.la Makefile
+Clutter-@CLUTTER_API_VERSION@.gir: libmutter-clutter-@CLUTTER_API_VERSION@.la Makefile
 
-Clutter_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = Clutter
+Clutter_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Clutter
-Clutter_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
+Clutter_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
-Clutter_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
+Clutter_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
-Clutter_@LIBMUTTER_API_VERSION@_gir_FILES = \
+Clutter_@CLUTTER_API_VERSION_AM@_gir_FILES = \
 	$(clutter_include_HEADERS) \
 	$(clutter_deprecated_HEADERS) \
 	$(nodist_clutter_include_HEADERS) \
 	$(source_c) \
 	$(deprecated_c) \
 	$(built_source_c)
-Clutter_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-Clutter_@LIBMUTTER_API_VERSION@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-@LIBMUTTER_API_VERSION@ CoglPango-@LIBMUTTER_API_VERSION@ Atk-1.0 Json-1.0
+Clutter_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-1.0 CoglPango-1.0 Atk-1.0 Json-1.0
-Clutter_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+Clutter_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='clutter/clutter.h' \
-	--pkg-export=mutter-clutter-@LIBMUTTER_API_VERSION@
+	--pkg-export=mutter-clutter-@CLUTTER_API_VERSION@
 
-INTROSPECTION_GIRS += Clutter-@LIBMUTTER_API_VERSION@.gir
+INTROSPECTION_GIRS += Clutter-@CLUTTER_API_VERSION@.gir
 
-Cally-@LIBMUTTER_API_VERSION@.gir: Makefile Clutter-@LIBMUTTER_API_VERSION@.gir
+Cally-@CLUTTER_API_VERSION@.gir: Makefile Clutter-@CLUTTER_API_VERSION@.gir
 
-Cally_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = Cally
+Cally_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally
-Cally_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
+Cally_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
-Cally_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
+Cally_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
-Cally_@LIBMUTTER_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
+Cally_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
-Cally_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-Cally_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+Cally_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='cally/cally.h' \
-	--pkg-export=mutter-cally-@LIBMUTTER_API_VERSION@ \
+	--pkg-export=mutter-cally-@CLUTTER_API_VERSION@ \
-	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir
+	--include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir
 
-INTROSPECTION_GIRS += Cally-@LIBMUTTER_API_VERSION@.gir
+INTROSPECTION_GIRS += Cally-@CLUTTER_API_VERSION@.gir
 
-ClutterX11-@LIBMUTTER_API_VERSION@.gir: Makefile Clutter-@LIBMUTTER_API_VERSION@.gir
+ClutterX11-@CLUTTER_API_VERSION@.gir: Makefile Clutter-@CLUTTER_API_VERSION@.gir
 
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = ClutterX11
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = ClutterX11
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_INCLUDES = xlib-2.0
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = xlib-2.0
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_FILES = $(x11_introspection)
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_FILES = $(x11_introspection)
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='clutter/x11/clutter-x11.h' \
-	--pkg-export=mutter-clutter-x11-@LIBMUTTER_API_VERSION@ \
+	--pkg-export=mutter-clutter-x11-@CLUTTER_API_VERSION@ \
-	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir
+	--include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir
 
-INTROSPECTION_GIRS += ClutterX11-@LIBMUTTER_API_VERSION@.gir
+INTROSPECTION_GIRS += ClutterX11-@CLUTTER_API_VERSION@.gir
 
 # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
 # install anything - we need to install inside our prefix.

clutter/clutter/clutter-canvas.c

@@ -76,6 +76,9 @@ struct _ClutterCanvasPrivate
   gboolean dirty;
 
   CoglBitmap *buffer;
+
+  int scale_factor;
+  guint scale_factor_set : 1;
 };
 
 enum
@@ -84,6 +87,8 @@ enum
 
   PROP_WIDTH,
   PROP_HEIGHT,
+  PROP_SCALE_FACTOR,
+  PROP_SCALE_FACTOR_SET,
 
   LAST_PROP
 };
@@ -180,6 +185,11 @@ clutter_canvas_set_property (GObject      *gobject,
       }
       break;
 
+    case PROP_SCALE_FACTOR:
+      clutter_canvas_set_scale_factor (CLUTTER_CANVAS (gobject),
+                                       g_value_get_int (value));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -204,6 +214,17 @@ clutter_canvas_get_property (GObject    *gobject,
       g_value_set_int (value, priv->height);
       break;
 
+    case PROP_SCALE_FACTOR:
+      if (priv->scale_factor_set)
+        g_value_set_int (value, priv->scale_factor);
+      else
+        g_value_set_int (value, -1);
+      break;
+
+    case PROP_SCALE_FACTOR_SET:
+      g_value_set_boolean (value, priv->scale_factor_set);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -247,6 +268,46 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
                       G_PARAM_READWRITE |
                       G_PARAM_STATIC_STRINGS);
 
+  /**
+   * ClutterCanvas:scale-factor-set:
+   *
+   * Whether the #ClutterCanvas:scale-factor property is set.
+   *
+   * If the #ClutterCanvas:scale-factor-set property is %FALSE
+   * then #ClutterCanvas will use the #ClutterSettings:window-scaling-factor
+   * property.
+   *
+   * Since: 1.18
+   */
+  obj_props[PROP_SCALE_FACTOR_SET] =
+    g_param_spec_boolean ("scale-factor-set",
+                          P_("Scale Factor Set"),
+                          P_("Whether the scale-factor property is set"),
+                          FALSE,
+                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * ClutterCanvas:scale-factor:
+   *
+   * The scaling factor to be applied to the Cairo surface used for
+   * drawing.
+   *
+   * If #ClutterCanvas:scale-factor is set to a negative value, the
+   * value of the #ClutterSettings:window-scaling-factor property is
+   * used instead.
+   *
+   * Use #ClutterCanvas:scale-factor-set to check if the scale factor
+   * is set.
+   *
+   * Since: 1.18
+   */
+  obj_props[PROP_SCALE_FACTOR] =
+    g_param_spec_int ("scale-factor",
+                      P_("Scale Factor"),
+                      P_("The scaling factor for the surface"),
+                      -1, 1000,
+                      -1,
+                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   /**
    * ClutterCanvas::draw:
@@ -293,6 +354,7 @@ clutter_canvas_init (ClutterCanvas *self)
 
   self->priv->width = -1;
   self->priv->height = -1;
+  self->priv->scale_factor = -1;
 }
 
 static void
@@ -335,18 +397,28 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
   gboolean mapped_buffer;
   unsigned char *data;
   CoglBuffer *buffer;
+  int window_scale = 1;
   gboolean res;
   cairo_t *cr;
 
-  g_assert (priv->height > 0 && priv->width > 0);
+  g_assert (priv->width > 0 && priv->width > 0);
 
   priv->dirty = TRUE;
 
-  real_width = priv->width;
+  if (priv->scale_factor_set)
-  real_height = priv->height;
+    window_scale = priv->scale_factor;
+  else
+    g_object_get (clutter_settings_get_default (),
+                  "window-scaling-factor", &window_scale,
+                  NULL);
 
-  CLUTTER_NOTE (MISC, "Creating Cairo surface with size %d x %d",
+  real_width = priv->width * window_scale;
-                priv->width, priv->height);
+  real_height = priv->height * window_scale;
+
+  CLUTTER_NOTE (MISC, "Creating Cairo surface with size %d x %d (real: %d x %d, scale: %d)",
+                priv->width, priv->height,
+                real_width, real_height,
+                window_scale);
 
   if (priv->buffer == NULL)
     {
@@ -389,6 +461,8 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
       mapped_buffer = FALSE;
     }
 
+  cairo_surface_set_device_scale (surface, window_scale, window_scale);
+
   self->priv->cr = cr = cairo_create (surface);
 
   g_signal_emit (self, canvas_signals[DRAW], 0,
@@ -562,3 +636,81 @@ clutter_canvas_set_size (ClutterCanvas *canvas,
 
   return clutter_canvas_invalidate_internal (canvas, width, height);
 }
+
+/**
+ * clutter_canvas_set_scale_factor:
+ * @canvas: a #ClutterCanvas
+ * @scale: the scale factor, or -1 for the default
+ *
+ * Sets the scaling factor for the Cairo surface used by @canvas.
+ *
+ * This function should rarely be used.
+ *
+ * The default scaling factor of a #ClutterCanvas content uses the
+ * #ClutterSettings:window-scaling-factor property, which is set by
+ * the windowing system. By using this function it is possible to
+ * override that setting.
+ *
+ * Changing the scale factor will invalidate the @canvas.
+ *
+ * Since: 1.18
+ */
+void
+clutter_canvas_set_scale_factor (ClutterCanvas *canvas,
+                                 int            scale)
+{
+  ClutterCanvasPrivate *priv;
+  GObject *obj;
+
+  g_return_if_fail (CLUTTER_IS_CANVAS (canvas));
+  g_return_if_fail (scale != 0);
+
+  priv = canvas->priv;
+
+  if (scale < 0)
+    {
+      if (!priv->scale_factor_set)
+        return;
+
+      priv->scale_factor_set = FALSE;
+      priv->scale_factor = -1;
+    }
+  else
+    {
+      if (priv->scale_factor_set && priv->scale_factor == scale)
+        return;
+
+      priv->scale_factor_set = TRUE;
+      priv->scale_factor = scale;
+    }
+
+  clutter_content_invalidate (CLUTTER_CONTENT (canvas));
+
+  obj = G_OBJECT (canvas);
+
+  g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_FACTOR]);
+  g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_FACTOR_SET]);
+}
+
+/**
+ * clutter_canvas_get_scale_factor:
+ * @canvas: a #ClutterCanvas
+ *
+ * Retrieves the scaling factor of @canvas, as set using
+ * clutter_canvas_set_scale_factor().
+ *
+ * Return value: the scaling factor, or -1 if the @canvas
+ *   uses the default from #ClutterSettings
+ *
+ * Since: 1.18
+ */
+int
+clutter_canvas_get_scale_factor (ClutterCanvas *canvas)
+{
+  g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), -1);
+
+  if (!canvas->priv->scale_factor_set)
+    return -1;
+
+  return canvas->priv->scale_factor;
+}

clutter/clutter/clutter-clone.c

@@ -54,7 +54,6 @@
 struct _ClutterClonePrivate
 {
   ClutterActor *clone_source;
-  gulong source_destroy_id;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (ClutterClone, clutter_clone, CLUTTER_TYPE_ACTOR)
@@ -377,13 +376,6 @@ clutter_clone_new (ClutterActor *source)
   return g_object_new (CLUTTER_TYPE_CLONE, "source", source,  NULL);
 }
 
-static void
-on_source_destroyed (ClutterActor *source,
-                     ClutterClone *self)
-{
-  clutter_clone_set_source_internal (self, NULL);
-}
-
 static void
 clutter_clone_set_source_internal (ClutterClone *self,
 				   ClutterActor *source)
@@ -395,8 +387,6 @@ clutter_clone_set_source_internal (ClutterClone *self,
 
   if (priv->clone_source != NULL)
     {
-      g_signal_handler_disconnect (priv->clone_source, priv->source_destroy_id);
-      priv->source_destroy_id = 0;
       _clutter_actor_detach_clone (priv->clone_source, CLUTTER_ACTOR (self));
       g_object_unref (priv->clone_source);
       priv->clone_source = NULL;
@@ -406,8 +396,6 @@ clutter_clone_set_source_internal (ClutterClone *self,
     {
       priv->clone_source = g_object_ref (source);
       _clutter_actor_attach_clone (priv->clone_source, CLUTTER_ACTOR (self));
-      priv->source_destroy_id = g_signal_connect (priv->clone_source, "destroy",
-                                                  G_CALLBACK (on_source_destroyed), self);
     }
 
   g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SOURCE]);

clutter/clutter/clutter-color.c

@@ -48,7 +48,7 @@
 #include "clutter-debug.h"
 
 /* XXX - keep in sync with the ClutterStaticColor enumeration order */
-static const ClutterColor static_colors[] = {
+static const ClutterColor const static_colors[] = {
   /* CGA/EGA color palette */
   { 0xff, 0xff, 0xff, 0xff },   /* white */
   { 0x00, 0x00, 0x00, 0xff },   /* black */

clutter/clutter/clutter-device-manager-private.h

@@ -154,15 +154,6 @@ struct _ClutterInputDeviceClass
                                  guint              *evdev_keycode);
   void (* update_from_tool) (ClutterInputDevice     *device,
                              ClutterInputDeviceTool *tool);
-
-  gboolean (* is_mode_switch_button) (ClutterInputDevice *device,
-                                      guint               group,
-                                      guint               button);
-  gint (* get_group_n_modes) (ClutterInputDevice *device,
-                              gint                group);
-
-  gboolean (* is_grouped) (ClutterInputDevice *device,
-                           ClutterInputDevice *other_device);
 };
 
 /* Platform-dependent interface */
@@ -197,10 +188,6 @@ void            _clutter_device_manager_select_stage_events     (ClutterDeviceMa
                                                                  ClutterStage         *stage);
 ClutterBackend *_clutter_device_manager_get_backend             (ClutterDeviceManager *device_manager);
 
-void            _clutter_device_manager_compress_motion         (ClutterDeviceManager *device_manger,
-                                                                 ClutterEvent         *event,
-                                                                 const ClutterEvent   *to_discard);
-
 /* input device */
 gboolean        _clutter_input_device_has_sequence              (ClutterInputDevice   *device,
                                                                  ClutterEventSequence *sequence);

clutter/clutter/clutter-device-manager.c

@@ -47,8 +47,6 @@
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 #include "clutter-stage-private.h"
-#include "clutter-virtual-input-device.h"
-#include "clutter-input-device-tool.h"
 
 struct _ClutterDeviceManagerPrivate
 {
@@ -71,7 +69,6 @@ enum
 {
   DEVICE_ADDED,
   DEVICE_REMOVED,
-  TOOL_CHANGED,
 
   LAST_SIGNAL
 };
@@ -186,16 +183,6 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
                   _clutter_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1,
                   CLUTTER_TYPE_INPUT_DEVICE);
-
-  manager_signals[TOOL_CHANGED] =
-    g_signal_new (I_("tool-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  _clutter_marshal_VOID__OBJECT_OBJECT,
-                  G_TYPE_NONE, 2,
-                  CLUTTER_TYPE_INPUT_DEVICE,
-                  CLUTTER_TYPE_INPUT_DEVICE_TOOL);
 }
 
 static void
@@ -448,42 +435,3 @@ _clutter_device_manager_get_backend (ClutterDeviceManager *manager)
 
   return manager->priv->backend;
 }
-
-/**
- * clutter_device_manager_create_virtual_device:
- * @device_manager: a #ClutterDeviceManager
- * @device_type: the type of the virtual device
- *
- * Creates a virtual input device.
- *
- * Returns: (transfer full): a newly created virtual device
- **/
-ClutterVirtualInputDevice *
-clutter_device_manager_create_virtual_device (ClutterDeviceManager   *device_manager,
-                                              ClutterInputDeviceType  device_type)
-{
-  ClutterDeviceManagerClass *manager_class;
-
-  g_return_val_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager), NULL);
-
-  manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  return manager_class->create_virtual_device (device_manager,
-                                               device_type);
-}
-
-void
-_clutter_device_manager_compress_motion (ClutterDeviceManager *device_manager,
-                                         ClutterEvent         *event,
-                                         const ClutterEvent   *to_discard)
-{
-  ClutterDeviceManagerClass *manager_class;
-
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-
-  manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  if (!manager_class->compress_motion)
-    return;
-
-  manager_class->compress_motion (device_manager, event, to_discard);
-}

clutter/clutter/clutter-device-manager.h

@@ -83,14 +83,9 @@ struct _ClutterDeviceManagerClass
                                            ClutterInputDevice     *device);
   void                (* select_stage_events) (ClutterDeviceManager *manager,
                                                ClutterStage       *stage);
-  ClutterVirtualInputDevice *(* create_virtual_device) (ClutterDeviceManager  *device_manager,
-                                                        ClutterInputDeviceType device_type);
-  void                (* compress_motion) (ClutterDeviceManager *device_manger,
-                                           ClutterEvent         *event,
-                                           const ClutterEvent   *to_discard);
 
   /* padding */
-  gpointer _padding[6];
+  gpointer _padding[7];
 };
 
 CLUTTER_AVAILABLE_IN_1_2
@@ -110,10 +105,6 @@ CLUTTER_AVAILABLE_IN_1_2
 ClutterInputDevice *  clutter_device_manager_get_core_device (ClutterDeviceManager   *device_manager,
                                                               ClutterInputDeviceType  device_type);
 
-CLUTTER_AVAILABLE_IN_ALL
-ClutterVirtualInputDevice *clutter_device_manager_create_virtual_device (ClutterDeviceManager  *device_manager,
-                                                                         ClutterInputDeviceType device_type);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_DEVICE_MANAGER_H__ */

clutter/clutter/clutter-event.c

@@ -1990,28 +1990,22 @@ clutter_event_remove_filter (guint id)
 }
 
 /**
- * clutter_event_get_touchpad_gesture_finger_count:
+ * clutter_event_get_gesture_swipe_finger_count:
- * @event: a touchpad swipe/pinch event
+ * @event: a touchpad swipe event
  *
  * Returns the number of fingers that is triggering the touchpad gesture.
  *
- * Returns: the number of fingers in the gesture.
+ * Returns: the number of fingers swiping.
  *
  * Since: 1.24
  **/
 guint
-clutter_event_get_touchpad_gesture_finger_count (const ClutterEvent *event)
+clutter_event_get_gesture_swipe_finger_count (const ClutterEvent *event)
 {
   g_return_val_if_fail (event != NULL, 0);
-  g_return_val_if_fail (event->type == CLUTTER_TOUCHPAD_SWIPE ||
+  g_return_val_if_fail (event->type == CLUTTER_TOUCHPAD_SWIPE, 0);
-                        event->type == CLUTTER_TOUCHPAD_PINCH, 0);
 
-  if (event->type == CLUTTER_TOUCHPAD_SWIPE)
+  return event->touchpad_swipe.n_fingers;
-    return event->touchpad_swipe.n_fingers;
-  else if (event->type == CLUTTER_TOUCHPAD_PINCH)
-    return event->touchpad_pinch.n_fingers;
-
-  return 0;
 }
 
 /**

clutter/clutter/clutter-event.h

@@ -459,7 +459,6 @@ struct _ClutterTouchpadPinchEvent
   gfloat dy;
   gfloat angle_delta;
   gfloat scale;
-  guint n_fingers;
 };
 
 /**
@@ -508,7 +507,6 @@ struct _ClutterPadButtonEvent
   guint32 button;
   guint32 group;
   ClutterInputDevice *device;
-  guint32 mode;
 };
 
 struct _ClutterPadStripEvent
@@ -524,7 +522,6 @@ struct _ClutterPadStripEvent
   guint32 strip_number;
   guint32 group;
   gdouble value;
-  guint32 mode;
 };
 
 struct _ClutterPadRingEvent
@@ -540,7 +537,6 @@ struct _ClutterPadRingEvent
   guint32 ring_number;
   guint32 group;
   gdouble angle;
-  guint32 mode;
 };
 
 /**
@@ -756,7 +752,7 @@ CLUTTER_AVAILABLE_IN_1_2
 const ClutterEvent *    clutter_get_current_event               (void);
 
 CLUTTER_AVAILABLE_IN_1_24
-guint                   clutter_event_get_touchpad_gesture_finger_count (const ClutterEvent  *event);
+guint                   clutter_event_get_gesture_swipe_finger_count (const ClutterEvent     *event);
 
 CLUTTER_AVAILABLE_IN_1_24
 gdouble                 clutter_event_get_gesture_pinch_angle_delta  (const ClutterEvent     *event);

clutter/clutter/clutter-input-device.c

@@ -2175,63 +2175,6 @@ clutter_input_device_get_n_mode_groups (ClutterInputDevice *device)
   return device->n_mode_groups;
 }
 
-gint
-clutter_input_device_get_group_n_modes (ClutterInputDevice *device,
-                                        gint                group)
-{
-  ClutterInputDeviceClass *device_class;
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), 0);
-  g_return_val_if_fail (clutter_input_device_get_device_type (device) ==
-                        CLUTTER_PAD_DEVICE, 0);
-  g_return_val_if_fail (group >= 0, 0);
-
-  device_class = CLUTTER_INPUT_DEVICE_GET_CLASS (device);
-
-  if (device_class->get_group_n_modes)
-    return device_class->get_group_n_modes (device, group);
-
-  return 0;
-}
-
-gboolean
-clutter_input_device_is_mode_switch_button (ClutterInputDevice *device,
-                                            guint               group,
-                                            guint               button)
-{
-  ClutterInputDeviceClass *device_class;
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), FALSE);
-  g_return_val_if_fail (clutter_input_device_get_device_type (device) ==
-                        CLUTTER_PAD_DEVICE, FALSE);
-
-  device_class = CLUTTER_INPUT_DEVICE_GET_CLASS (device);
-
-  if (device_class->is_mode_switch_button)
-    return device_class->is_mode_switch_button (device, group, button);
-
-  return FALSE;
-}
-
-gint
-clutter_input_device_get_mode_switch_button_group (ClutterInputDevice *device,
-                                                   guint               button)
-{
-  gint group;
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), -1);
-  g_return_val_if_fail (clutter_input_device_get_device_type (device) ==
-                        CLUTTER_PAD_DEVICE, -1);
-
-  for (group = 0; group < device->n_mode_groups; group++)
-    {
-      if (clutter_input_device_is_mode_switch_button (device, group, button))
-        return group;
-    }
-
-  return -1;
-}
-
 const gchar *
 clutter_input_device_get_device_node (ClutterInputDevice *device)
 {
@@ -2266,13 +2209,3 @@ clutter_input_device_set_mapping_mode (ClutterInputDevice        *device,
   device->mapping_mode = mapping;
   g_object_notify (G_OBJECT (device), "mapping-mode");
 }
-
-gboolean
-clutter_input_device_is_grouped (ClutterInputDevice *device,
-                                 ClutterInputDevice *other_device)
-{
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), FALSE);
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (other_device), FALSE);
-
-  return CLUTTER_INPUT_DEVICE_GET_CLASS (device)->is_grouped (device, other_device);
-}

clutter/clutter/clutter-input-device.h

@@ -147,18 +147,6 @@ gint                    clutter_input_device_get_n_strips       (ClutterInputDev
 CLUTTER_AVAILABLE_IN_ALL
 gint                    clutter_input_device_get_n_mode_groups  (ClutterInputDevice *device);
 
-CLUTTER_AVAILABLE_IN_ALL
-gint                    clutter_input_device_get_group_n_modes  (ClutterInputDevice *device,
-                                                                 gint                group);
-
-CLUTTER_AVAILABLE_IN_ALL
-gboolean                clutter_input_device_is_mode_switch_button (ClutterInputDevice *device,
-                                                                    guint               group,
-								    guint               button);
-CLUTTER_AVAILABLE_IN_ALL
-gint                    clutter_input_device_get_mode_switch_button_group (ClutterInputDevice *device,
-                                                                           guint               button);
-
 CLUTTER_AVAILABLE_IN_ALL
 const gchar *           clutter_input_device_get_device_node    (ClutterInputDevice *device);
 
@@ -168,9 +156,6 @@ ClutterInputDeviceMapping clutter_input_device_get_mapping_mode (ClutterInputDev
 CLUTTER_AVAILABLE_IN_ALL
 void                      clutter_input_device_set_mapping_mode (ClutterInputDevice        *device,
                                                                  ClutterInputDeviceMapping  mapping);
-CLUTTER_AVAILABLE_IN_ALL
-gboolean                  clutter_input_device_is_grouped       (ClutterInputDevice *device,
-                                                                 ClutterInputDevice *other_device);
 
 G_END_DECLS
 

clutter/clutter/clutter-main.c

@@ -719,8 +719,14 @@ clutter_get_text_direction (void)
     }
   else
     {
-      /* Re-use GTK+'s LTR/RTL handling */
+      /* Translators: Leave this UNTRANSLATED if your language is
-      const char *e = g_dgettext ("gtk30", "default:LTR");
+       * left-to-right.  If your language is right-to-left
+       * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+       *
+       * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+       * it isn't default:LTR or default:RTL it will not work.
+       */
+      char *e = _("default:LTR");
 
       if (strcmp (e, "default:RTL") == 0)
         dir = CLUTTER_TEXT_DIRECTION_RTL;

clutter/clutter/clutter-marshal.list

@@ -23,7 +23,6 @@ VOID:OBJECT
 VOID:OBJECT,FLAGS
 VOID:OBJECT,FLOAT,FLOAT
 VOID:OBJECT,FLOAT,FLOAT,FLAGS
-VOID:OBJECT,OBJECT
 VOID:OBJECT,PARAM
 VOID:OBJECT,POINTER
 VOID:OBJECT,UINT

clutter/clutter/clutter-settings.c

@@ -77,7 +77,9 @@ struct _ClutterSettings
 
   guint password_hint_time;
 
+  gint window_scaling_factor;
   gint unscaled_font_dpi;
+  guint fixed_scaling_factor : 1;
 };
 
 struct _ClutterSettingsClass
@@ -110,6 +112,7 @@ enum
 
   PROP_PASSWORD_HINT_TIME,
 
+  PROP_WINDOW_SCALING_FACTOR,
   PROP_UNSCALED_FONT_DPI,
 
   PROP_LAST
@@ -352,6 +355,14 @@ clutter_settings_set_property (GObject      *gobject,
       self->password_hint_time = g_value_get_uint (value);
       break;
 
+    case PROP_WINDOW_SCALING_FACTOR:
+      if (!self->fixed_scaling_factor)
+        {
+          self->window_scaling_factor = g_value_get_int (value);
+          self->fixed_scaling_factor = TRUE;
+        }
+      break;
+
     case PROP_UNSCALED_FONT_DPI:
       self->font_dpi = g_value_get_int (value);
       settings_update_resolution (self);
@@ -371,7 +382,14 @@ clutter_settings_set_property_internal (ClutterSettings *self,
 
   property = g_intern_string (property);
 
+  if (property == I_("window-scaling-factor") &&
+      self->fixed_scaling_factor)
+    return;
+
   g_object_set_property (G_OBJECT (self), property, value);
+
+  if (property == I_("window-scaling-factor"))
+    self->fixed_scaling_factor = FALSE;
 }
 
 static void
@@ -428,6 +446,10 @@ clutter_settings_get_property (GObject    *gobject,
       g_value_set_uint (value, self->password_hint_time);
       break;
 
+    case PROP_WINDOW_SCALING_FACTOR:
+      g_value_set_int (value, self->window_scaling_factor);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -655,6 +677,14 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
                       500,
                       CLUTTER_PARAM_READWRITE);
 
+  obj_props[PROP_WINDOW_SCALING_FACTOR] =
+    g_param_spec_int ("window-scaling-factor",
+                      P_("Window Scaling Factor"),
+                      P_("The scaling factor to be applied to windows"),
+                      1, G_MAXINT,
+                      1,
+                      CLUTTER_PARAM_READWRITE);
+
   obj_props[PROP_FONTCONFIG_TIMESTAMP] =
     g_param_spec_uint ("fontconfig-timestamp",
                        P_("Fontconfig configuration timestamp"),
@@ -692,6 +722,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
 static void
 clutter_settings_init (ClutterSettings *self)
 {
+  const char *scale_str;
+
   self->resolution = -1.0;
 
   self->font_dpi = -1;
@@ -710,6 +742,18 @@ clutter_settings_init (ClutterSettings *self)
   self->xft_rgba = NULL;
 
   self->long_press_duration = 500;
+
+  /* if the scaling factor was set by the environment we ignore
+   * any explicit setting
+   */
+  scale_str = g_getenv ("CLUTTER_SCALE");
+  if (scale_str != NULL)
+    {
+      self->window_scaling_factor = atol (scale_str);
+      self->fixed_scaling_factor = TRUE;
+    }
+  else
+    self->window_scaling_factor = 1;
 }
 
 /**

clutter/clutter/clutter-stage-view.c

@@ -27,8 +27,6 @@ enum
 
   PROP_LAYOUT,
   PROP_FRAMEBUFFER,
-  PROP_OFFSCREEN,
-  PROP_SCALE,
 
   PROP_LAST
 };
@@ -38,12 +36,7 @@ static GParamSpec *obj_props[PROP_LAST];
 typedef struct _ClutterStageViewPrivate
 {
   cairo_rectangle_int_t layout;
-  int scale;
   CoglFramebuffer *framebuffer;
-
-  CoglOffscreen *offscreen;
-  CoglPipeline *pipeline;
-
   guint dirty_viewport   : 1;
   guint dirty_projection : 1;
 } ClutterStageViewPrivate;
@@ -62,18 +55,6 @@ clutter_stage_view_get_layout (ClutterStageView      *view,
 
 CoglFramebuffer *
 clutter_stage_view_get_framebuffer (ClutterStageView *view)
-{
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-
-  if (priv->offscreen)
-    return priv->offscreen;
-  else
-    return priv->framebuffer;
-}
-
-CoglFramebuffer *
-clutter_stage_view_get_onscreen (ClutterStageView *view)
 {
   ClutterStageViewPrivate *priv =
     clutter_stage_view_get_instance_private (view);
@@ -81,77 +62,6 @@ clutter_stage_view_get_onscreen (ClutterStageView *view)
   return priv->framebuffer;
 }
 
-static void
-clutter_stage_view_ensure_offscreen_blit_pipeline (ClutterStageView *view)
-{
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-  ClutterStageViewClass *view_class =
-    CLUTTER_STAGE_VIEW_GET_CLASS (view);
-
-  g_assert (priv->offscreen != NULL);
-
-  if (priv->pipeline)
-    return;
-
-  priv->pipeline =
-    cogl_pipeline_new (cogl_framebuffer_get_context (priv->offscreen));
-  cogl_pipeline_set_layer_filters (priv->pipeline, 0,
-                                   COGL_PIPELINE_FILTER_NEAREST,
-                                   COGL_PIPELINE_FILTER_NEAREST);
-  cogl_pipeline_set_layer_texture (priv->pipeline, 0,
-                                   cogl_offscreen_get_texture (priv->offscreen));
-  cogl_pipeline_set_layer_wrap_mode (priv->pipeline, 0,
-                                     COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE);
-
-  if (view_class->setup_offscreen_blit_pipeline)
-    view_class->setup_offscreen_blit_pipeline (view, priv->pipeline);
-}
-
-void
-clutter_stage_view_invalidate_offscreen_blit_pipeline (ClutterStageView *view)
-{
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-
-  g_clear_pointer (&priv->pipeline, cogl_object_unref);
-}
-
-void
-clutter_stage_view_blit_offscreen (ClutterStageView            *view,
-                                   const cairo_rectangle_int_t *rect)
-{
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-  CoglMatrix matrix;
-
-  clutter_stage_view_ensure_offscreen_blit_pipeline (view);
-  cogl_framebuffer_push_matrix (priv->framebuffer);
-
-  /* Set transform so 0,0 is on the top left corner and 1,1 on
-   * the bottom right corner.
-   */
-  cogl_matrix_init_identity (&matrix);
-  cogl_matrix_translate (&matrix, -1, 1, 0);
-  cogl_matrix_scale (&matrix, 2, -2, 0);
-  cogl_framebuffer_set_projection_matrix (priv->framebuffer, &matrix);
-
-  cogl_framebuffer_draw_rectangle (priv->framebuffer,
-                                   priv->pipeline,
-                                   0, 0, 1, 1);
-
-  cogl_framebuffer_pop_matrix (priv->framebuffer);
-}
-
-int
-clutter_stage_view_get_scale (ClutterStageView *view)
-{
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-
-  return priv->scale;
-}
-
 gboolean
 clutter_stage_view_is_dirty_viewport (ClutterStageView *view)
 {
@@ -190,35 +100,6 @@ clutter_stage_view_set_dirty_projection (ClutterStageView *view,
   priv->dirty_projection = dirty;
 }
 
-void
-clutter_stage_view_get_offscreen_transformation_matrix (ClutterStageView *view,
-                                                        CoglMatrix       *matrix)
-{
-  ClutterStageViewClass *view_class = CLUTTER_STAGE_VIEW_GET_CLASS (view);
-
-  view_class->get_offscreen_transformation_matrix (view, matrix);
-}
-
-void
-clutter_stage_view_transform_to_onscreen (ClutterStageView *view,
-                                          gfloat           *x,
-                                          gfloat           *y)
-{
-  gfloat z = 0, w = 1;
-  CoglMatrix matrix;
-
-  clutter_stage_view_get_offscreen_transformation_matrix (view, &matrix);
-  cogl_matrix_get_inverse (&matrix, &matrix);
-  cogl_matrix_transform_point (&matrix, x, y, &z, &w);
-}
-
-static void
-clutter_stage_default_get_offscreen_transformation_matrix (ClutterStageView *view,
-                                                           CoglMatrix       *matrix)
-{
-  cogl_matrix_init_identity (matrix);
-}
-
 static void
 clutter_stage_view_get_property (GObject    *object,
                                  guint       prop_id,
@@ -237,14 +118,6 @@ clutter_stage_view_get_property (GObject    *object,
     case PROP_FRAMEBUFFER:
       g_value_set_boxed (value, priv->framebuffer);
       break;
-    case PROP_OFFSCREEN:
-      g_value_set_boxed (value, priv->offscreen);
-      break;
-    case PROP_SCALE:
-      g_value_set_int (value, priv->scale);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
@@ -266,16 +139,8 @@ clutter_stage_view_set_property (GObject      *object,
       priv->layout = *layout;
       break;
     case PROP_FRAMEBUFFER:
-      priv->framebuffer = g_value_dup_boxed (value);
+      priv->framebuffer = g_value_get_boxed (value);
       break;
-    case PROP_OFFSCREEN:
-      priv->offscreen = g_value_dup_boxed (value);
-      break;
-    case PROP_SCALE:
-      priv->scale = g_value_get_int (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
@@ -287,21 +152,11 @@ clutter_stage_view_dispose (GObject *object)
     clutter_stage_view_get_instance_private (view);
 
   g_clear_pointer (&priv->framebuffer, cogl_object_unref);
-  g_clear_pointer (&priv->offscreen, cogl_object_unref);
-  g_clear_pointer (&priv->pipeline, cogl_object_unref);
-
-  G_OBJECT_CLASS (clutter_stage_view_parent_class)->dispose (object);
 }
 
 static void
 clutter_stage_view_init (ClutterStageView *view)
 {
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-
-  priv->dirty_viewport = TRUE;
-  priv->dirty_projection = TRUE;
-  priv->scale = 1;
 }
 
 static void
@@ -309,9 +164,6 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  klass->get_offscreen_transformation_matrix =
-    clutter_stage_default_get_offscreen_transformation_matrix;
-
   object_class->get_property = clutter_stage_view_get_property;
   object_class->set_property = clutter_stage_view_set_property;
   object_class->dispose = clutter_stage_view_dispose;
@@ -327,27 +179,10 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
   obj_props[PROP_FRAMEBUFFER] =
     g_param_spec_boxed ("framebuffer",
                         "View framebuffer",
-                        "The front buffer of the view",
+                        "The framebuffer of the view",
                         COGL_TYPE_HANDLE,
                         G_PARAM_READWRITE |
                         G_PARAM_STATIC_STRINGS);
 
-  obj_props[PROP_OFFSCREEN] =
-    g_param_spec_boxed ("offscreen",
-                        "Offscreen buffer",
-                        "Framebuffer used as intermediate buffer",
-                        COGL_TYPE_HANDLE,
-                        G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY |
-                        G_PARAM_STATIC_STRINGS);
-
-  obj_props[PROP_SCALE] =
-    g_param_spec_int ("scale",
-                      "View scale",
-                      "The view scale",
-                      1, G_MAXINT, 1,
-                      G_PARAM_READWRITE |
-                      G_PARAM_STATIC_STRINGS);
-
   g_object_class_install_properties (object_class, PROP_LAST, obj_props);
 }

clutter/clutter/clutter-stage-view.h

@@ -33,12 +33,6 @@ G_DECLARE_DERIVABLE_TYPE (ClutterStageView, clutter_stage_view,
 struct _ClutterStageViewClass
 {
   GObjectClass parent_class;
-
-  void (* setup_offscreen_blit_pipeline) (ClutterStageView *view,
-                                          CoglPipeline     *pipeline);
-
-  void (* get_offscreen_transformation_matrix) (ClutterStageView *view,
-                                                CoglMatrix       *matrix);
 };
 
 CLUTTER_AVAILABLE_IN_MUTTER
@@ -47,21 +41,6 @@ void clutter_stage_view_get_layout (ClutterStageView      *view,
 
 CLUTTER_AVAILABLE_IN_MUTTER
 CoglFramebuffer *clutter_stage_view_get_framebuffer (ClutterStageView *view);
-CLUTTER_AVAILABLE_IN_MUTTER
-CoglFramebuffer *clutter_stage_view_get_onscreen (ClutterStageView *view);
-CLUTTER_AVAILABLE_IN_MUTTER
-void             clutter_stage_view_invalidate_offscreen_blit_pipeline (ClutterStageView *view);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void             clutter_stage_view_transform_to_onscreen (ClutterStageView *view,
-                                                           gfloat           *x,
-                                                           gfloat           *y);
-
-void clutter_stage_view_blit_offscreen (ClutterStageView            *view,
-					const cairo_rectangle_int_t *clip);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-int clutter_stage_view_get_scale (ClutterStageView *view);
 
 gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);
 
@@ -73,8 +52,4 @@ gboolean clutter_stage_view_is_dirty_projection (ClutterStageView *view);
 void clutter_stage_view_set_dirty_projection (ClutterStageView *view,
                                               gboolean          dirty);
 
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_stage_view_get_offscreen_transformation_matrix (ClutterStageView *view,
-                                                             CoglMatrix       *matrix);
-
 #endif /* __CLUTTER_STAGE_VIEW_H__ */

clutter/clutter/clutter-stage-window.c

@@ -303,6 +303,33 @@ _clutter_stage_window_can_clip_redraws (ClutterStageWindow *window)
   return FALSE;
 }
 
+void
+_clutter_stage_window_set_scale_factor (ClutterStageWindow *window,
+                                        int                 factor)
+{
+  ClutterStageWindowIface *iface;
+
+  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));
+
+  iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  if (iface->set_scale_factor != NULL)
+    iface->set_scale_factor (window, factor);
+}
+
+int
+_clutter_stage_window_get_scale_factor (ClutterStageWindow *window)
+{
+  ClutterStageWindowIface *iface;
+
+  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), 1);
+
+  iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  if (iface->get_scale_factor != NULL)
+    return iface->get_scale_factor (window);
+
+  return 1;
+}
+
 GList *
 _clutter_stage_window_get_views (ClutterStageWindow *window)
 {

clutter/clutter/clutter-stage-window.h

@@ -83,6 +83,9 @@ struct _ClutterStageWindowIface
 
   gboolean          (* can_clip_redraws)        (ClutterStageWindow *stage_window);
 
+  void              (* set_scale_factor)        (ClutterStageWindow *stage_window,
+                                                 int                 factor);
+  int               (* get_scale_factor)        (ClutterStageWindow *stage_window);
   GList            *(* get_views)               (ClutterStageWindow *stage_window);
   int64_t           (* get_frame_counter)       (ClutterStageWindow *stage_window);
   void              (* finish_frame)            (ClutterStageWindow *stage_window);
@@ -137,6 +140,10 @@ void              _clutter_stage_window_get_dirty_pixel         (ClutterStageWin
 
 gboolean          _clutter_stage_window_can_clip_redraws        (ClutterStageWindow *window);
 
+void              _clutter_stage_window_set_scale_factor        (ClutterStageWindow *window,
+                                                                 int                 factor);
+int               _clutter_stage_window_get_scale_factor        (ClutterStageWindow *window);
+
 GList *           _clutter_stage_window_get_views               (ClutterStageWindow *window);
 
 void              _clutter_stage_window_finish_frame            (ClutterStageWindow *window);

clutter/clutter/clutter-stage.c

@@ -364,6 +364,7 @@ clutter_stage_allocate (ClutterActor           *self,
   float new_width, new_height;
   float width, height;
   cairo_rectangle_int_t window_size;
+  int scale_factor;
 
   if (priv->impl == NULL)
     return;
@@ -464,6 +465,11 @@ clutter_stage_allocate (ClutterActor           *self,
    */
   _clutter_stage_window_get_geometry (priv->impl, &window_size);
 
+  scale_factor = _clutter_stage_window_get_scale_factor (priv->impl);
+
+  window_size.width *= scale_factor;
+  window_size.height *= scale_factor;
+
   cogl_onscreen_clutter_backend_set_size (window_size.width,
                                           window_size.height);
 
@@ -624,13 +630,15 @@ clutter_stage_do_paint_view (ClutterStage                *stage,
   float clip_poly[8];
   float viewport[4];
   cairo_rectangle_int_t geom;
+  int window_scale;
 
   _clutter_stage_window_get_geometry (priv->impl, &geom);
+  window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
 
-  viewport[0] = priv->viewport[0];
+  viewport[0] = priv->viewport[0] * window_scale;
-  viewport[1] = priv->viewport[1];
+  viewport[1] = priv->viewport[1] * window_scale;
-  viewport[2] = priv->viewport[2];
+  viewport[2] = priv->viewport[2] * window_scale;
-  viewport[3] = priv->viewport[3];
+  viewport[3] = priv->viewport[3] * window_scale;
 
   if (!clip)
     {
@@ -638,14 +646,16 @@ clutter_stage_do_paint_view (ClutterStage                *stage,
       clip = &view_layout;
     }
 
-  clip_poly[0] = MAX (clip->x, 0);
+  clip_poly[0] = MAX (clip->x * window_scale, 0);
-  clip_poly[1] = MAX (clip->y, 0);
+  clip_poly[1] = MAX (clip->y * window_scale, 0);
 
-  clip_poly[2] = MIN (clip->x + clip->width, geom.width);
+  clip_poly[2] = MIN ((clip->x + clip->width) * window_scale,
+                      geom.width * window_scale);
   clip_poly[3] = clip_poly[1];
 
   clip_poly[4] = clip_poly[2];
-  clip_poly[5] = MIN (clip->y + clip->height, geom.height);
+  clip_poly[5] = MIN ((clip->y + clip->height) * window_scale,
+                      geom.height * window_scale);
 
   clip_poly[6] = clip_poly[0];
   clip_poly[7] = clip_poly[5];
@@ -988,16 +998,6 @@ _clutter_stage_process_queued_events (ClutterStage *stage)
                             "Omitting motion event at %d, %d",
                             (int) event->motion.x,
                             (int) event->motion.y);
-
-              if (next_event->type == CLUTTER_MOTION)
-                {
-                  ClutterDeviceManager *device_manager =
-                    clutter_device_manager_get_default ();
-
-                  _clutter_device_manager_compress_motion (device_manager,
-                                                           next_event, event);
-                }
-
               goto next_event;
             }
           else if (event->type == CLUTTER_TOUCH_UPDATE &&
@@ -1368,19 +1368,19 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
   gint dirty_y;
   gint read_x;
   gint read_y;
+  int window_scale;
   float fb_width, fb_height;
-  int fb_scale;
   int viewport_offset_x;
   int viewport_offset_y;
 
   priv = stage->priv;
 
   context = _clutter_context_get_default ();
-  fb_scale = clutter_stage_view_get_scale (view);
+  window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
   clutter_stage_view_get_layout (view, &view_layout);
 
-  fb_width = view_layout.width * fb_scale;
+  fb_width = view_layout.width;
-  fb_height = view_layout.height * fb_scale;
+  fb_height = view_layout.height;
   cogl_push_framebuffer (fb);
 
   /* needed for when a context switch happens */
@@ -1390,38 +1390,40 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
    * picking to not work at all, so setting it the whole framebuffer content
    * for now. */
   cogl_framebuffer_push_scissor_clip (fb, 0, 0,
-                                      view_layout.width * fb_scale,
+                                      view_layout.width,
-                                      view_layout.height * fb_scale);
+                                      view_layout.height);
 
   _clutter_stage_window_get_dirty_pixel (priv->impl, view, &dirty_x, &dirty_y);
+  dirty_x -= view_layout.x;
+  dirty_y -= view_layout.y;
 
   if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
     {
       CLUTTER_NOTE (PICK, "Pushing pick scissor clip x: %d, y: %d, 1x1",
-                    dirty_x * fb_scale,
+                    dirty_x * window_scale,
-                    dirty_y * fb_scale);
+                    dirty_y * window_scale);
-      cogl_framebuffer_push_scissor_clip (fb, dirty_x * fb_scale, dirty_y * fb_scale, 1, 1);
+      cogl_framebuffer_push_scissor_clip (fb, dirty_x * window_scale, dirty_y * window_scale, 1, 1);
     }
 
-  viewport_offset_x = x * fb_scale - dirty_x * fb_scale;
+  viewport_offset_x = x * window_scale - dirty_x * window_scale;
-  viewport_offset_y = y * fb_scale - dirty_y * fb_scale;
+  viewport_offset_y = y * window_scale - dirty_y * window_scale;
   CLUTTER_NOTE (PICK, "Setting viewport to %f, %f, %f, %f",
-                priv->viewport[0] * fb_scale - viewport_offset_x,
+                priv->viewport[0] * window_scale - viewport_offset_x,
-                priv->viewport[1] * fb_scale - viewport_offset_y,
+                priv->viewport[1] * window_scale - viewport_offset_y,
-                priv->viewport[2] * fb_scale,
+                priv->viewport[2] * window_scale,
-                priv->viewport[3] * fb_scale);
+                priv->viewport[3] * window_scale);
-  cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x,
+  cogl_set_viewport (priv->viewport[0] * window_scale - viewport_offset_x,
-                     priv->viewport[1] * fb_scale - viewport_offset_y,
+                     priv->viewport[1] * window_scale - viewport_offset_y,
-                     priv->viewport[2] * fb_scale,
+                     priv->viewport[2] * window_scale,
-                     priv->viewport[3] * fb_scale);
+                     priv->viewport[3] * window_scale);
 
-  read_x = dirty_x * fb_scale;
+  read_x = dirty_x * window_scale;
-  read_y = dirty_y * fb_scale;
+  read_y = dirty_y * window_scale;
 
-  CLUTTER_NOTE (PICK, "Performing pick at %i,%i on view %dx%d+%d+%d s: %d",
+  CLUTTER_NOTE (PICK, "Performing pick at %i,%i on view %dx%d+%d+%d",
                 x, y,
                 view_layout.width, view_layout.height,
-                view_layout.x, view_layout.y, fb_scale);
+                view_layout.x, view_layout.y);
 
   cogl_color_init_from_4ub (&stage_pick_id, 255, 255, 255, 255);
   cogl_clear (&stage_pick_id, COGL_BUFFER_BIT_COLOR | COGL_BUFFER_BIT_DEPTH);
@@ -1444,10 +1446,10 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
      used. The format is requested as pre-multiplied because Cogl
      assumes that all pixels in the framebuffer are premultiplied so
      it avoids a conversion. */
-  cogl_framebuffer_read_pixels (fb,
+  cogl_read_pixels (read_x, read_y, 1, 1,
-                                read_x, read_y, 1, 1,
+                    COGL_READ_PIXELS_COLOR_BUFFER,
-                                COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                                pixel);
+                    pixel);
 
   if (G_UNLIKELY (clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS))
     {
@@ -2200,6 +2202,7 @@ clutter_stage_init (ClutterStage *self)
   ClutterStagePrivate *priv;
   ClutterStageWindow *impl;
   ClutterBackend *backend;
+  int window_scale = 1;
   GError *error;
 
   /* a stage is a top-level object */
@@ -2217,6 +2220,7 @@ clutter_stage_init (ClutterStage *self)
     {
       _clutter_stage_set_window (self, impl);
       _clutter_stage_window_get_geometry (priv->impl, &geom);
+      window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
     }
   else
     {
@@ -2270,8 +2274,8 @@ clutter_stage_init (ClutterStage *self)
                                       priv->perspective.aspect,
                                       priv->perspective.z_near,
                                       50, /* distance to 2d plane */
-                                      geom.width,
+                                      geom.width * window_scale,
-                                      geom.height);
+                                      geom.height * window_scale);
 
 
   /* FIXME - remove for 2.0 */
@@ -3400,6 +3404,16 @@ clutter_stage_ensure_viewport (ClutterStage *stage)
   clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
 }
 
+static void
+clutter_stage_apply_scale (ClutterStage *stage)
+{
+  int factor;
+
+  factor = _clutter_stage_window_get_scale_factor (stage->priv->impl);
+  if (factor != 1)
+    cogl_matrix_scale (&stage->priv->view, factor, factor, 1.f);
+}
+
 # define _DEG_TO_RAD(d)         ((d) * ((float) G_PI / 180.0f))
 
 /* This calculates a distance into the view frustum to position the
@@ -3546,7 +3560,7 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,
     {
       cairo_rectangle_int_t view_layout;
       ClutterPerspective perspective;
-      int fb_scale;
+      int window_scale;
       int viewport_offset_x;
       int viewport_offset_y;
       float z_2d;
@@ -3556,15 +3570,15 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,
                     priv->viewport[2],
                     priv->viewport[3]);
 
-      fb_scale = clutter_stage_view_get_scale (view);
+      window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
       clutter_stage_view_get_layout (view, &view_layout);
 
-      viewport_offset_x = view_layout.x * fb_scale;
+      viewport_offset_x = view_layout.x * window_scale;
-      viewport_offset_y = view_layout.y * fb_scale;
+      viewport_offset_y = view_layout.y * window_scale;
-      cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x,
+      cogl_set_viewport (priv->viewport[0] * window_scale - viewport_offset_x,
-                         priv->viewport[1] * fb_scale - viewport_offset_y,
+                         priv->viewport[1] * window_scale - viewport_offset_y,
-                         priv->viewport[2] * fb_scale,
+                         priv->viewport[2] * window_scale,
-                         priv->viewport[3] * fb_scale);
+                         priv->viewport[3] * window_scale);
 
       perspective = priv->perspective;
 
@@ -3595,8 +3609,10 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,
                                           perspective.aspect,
                                           perspective.z_near,
                                           z_2d,
-                                          priv->viewport[2],
+                                          priv->viewport[2] * window_scale,
-                                          priv->viewport[3]);
+                                          priv->viewport[3] * window_scale);
+
+      clutter_stage_apply_scale (stage);
 
       clutter_stage_view_set_dirty_viewport (view, FALSE);
     }
@@ -4611,6 +4627,23 @@ clutter_stage_skip_sync_delay (ClutterStage *stage)
     _clutter_stage_window_schedule_update (stage_window, -1);
 }
 
+void
+_clutter_stage_set_scale_factor (ClutterStage *stage,
+                                 int           factor)
+{
+  ClutterStagePrivate *priv = stage->priv;
+
+  if (CLUTTER_ACTOR_IN_DESTRUCTION (stage))
+    return;
+
+  if (priv->impl == NULL)
+    return;
+
+  _clutter_stage_window_set_scale_factor (priv->impl, factor);
+
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
+}
+
 int64_t
 clutter_stage_get_frame_counter (ClutterStage          *stage)
 {
@@ -4643,7 +4676,6 @@ capture_view (ClutterStage          *stage,
   uint8_t *data;
   int stride;
   CoglBitmap *bitmap;
-  cairo_rectangle_int_t view_layout;
 
   framebuffer = clutter_stage_view_get_framebuffer (view);
 
@@ -4668,11 +4700,8 @@ capture_view (ClutterStage          *stage,
                                      stride,
                                      data);
 
-  clutter_stage_view_get_layout (view, &view_layout);
-
   cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
-                                            rect->x - view_layout.x,
+                                            rect->x, rect->y,
-                                            rect->y - view_layout.y,
                                             COGL_READ_PIXELS_COLOR_BUFFER,
                                             bitmap);
 

clutter/clutter/clutter-types.h

@@ -95,7 +95,6 @@ typedef struct _ClutterState            	ClutterState;
 
 typedef struct _ClutterInputDeviceTool          ClutterInputDeviceTool;
 typedef struct _ClutterInputDevice              ClutterInputDevice;
-typedef struct _ClutterVirtualInputDevice       ClutterVirtualInputDevice;
 
 typedef CoglMatrix                              ClutterMatrix;
 

clutter/clutter/clutter-version.h.in

@@ -312,7 +312,7 @@ G_BEGIN_DECLS
  *
  * Since: 1.2
  */
-extern const guint clutter_major_version;
+const guint clutter_major_version;
 
 /**
  * clutter_minor_version:
@@ -326,7 +326,7 @@ extern const guint clutter_major_version;
  *
  * Since: 1.2
  */
-extern const guint clutter_minor_version;
+const guint clutter_minor_version;
 
 /**
  * clutter_micro_version:
@@ -340,7 +340,7 @@ extern const guint clutter_minor_version;
  *
  * Since: 1.2
  */
-extern const guint clutter_micro_version;
+const guint clutter_micro_version;
 
 G_END_DECLS
 

clutter/clutter/clutter-virtual-input-device.c

@@ -1,222 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2016  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/>.
- *
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "clutter-build-config.h"
-#endif
-
-#include <glib-object.h>
-
-#include "clutter-virtual-input-device.h"
-
-#include "clutter-device-manager.h"
-#include "clutter-private.h"
-#include "clutter-enum-types.h"
-
-enum
-{
-  PROP_0,
-
-  PROP_DEVICE_MANAGER,
-  PROP_DEVICE_TYPE,
-
-  PROP_LAST
-};
-
-static GParamSpec *obj_props[PROP_LAST];
-
-typedef struct _ClutterVirtualInputDevicePrivate
-{
-  ClutterDeviceManager *manager;
-  ClutterInputDeviceType device_type;
-} ClutterVirtualInputDevicePrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (ClutterVirtualInputDevice,
-                            clutter_virtual_input_device,
-                            G_TYPE_OBJECT)
-
-void
-clutter_virtual_input_device_notify_relative_motion (ClutterVirtualInputDevice *virtual_device,
-                                                     uint64_t                   time_us,
-                                                     double                     dx,
-                                                     double                     dy)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_relative_motion (virtual_device, time_us, dx, dy);
-}
-
-void
-clutter_virtual_input_device_notify_absolute_motion (ClutterVirtualInputDevice *virtual_device,
-                                                     uint64_t                   time_us,
-                                                     double                     x,
-                                                     double                     y)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_absolute_motion (virtual_device, time_us, x, y);
-}
-
-void
-clutter_virtual_input_device_notify_button (ClutterVirtualInputDevice *virtual_device,
-                                            uint64_t                   time_us,
-                                            uint32_t                   button,
-                                            ClutterButtonState         button_state)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_button (virtual_device, time_us, button, button_state);
-}
-
-void
-clutter_virtual_input_device_notify_key (ClutterVirtualInputDevice *virtual_device,
-                                         uint64_t                   time_us,
-                                         uint32_t                   key,
-                                         ClutterKeyState            key_state)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_key (virtual_device, time_us, key, key_state);
-}
-
-void
-clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virtual_device,
-                                            uint64_t                   time_us,
-                                            uint32_t                   keyval,
-                                            ClutterKeyState            key_state)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_keyval (virtual_device, time_us, keyval, key_state);
-}
-
-/**
- * clutter_virtual_input_device_get_manager:
- * @virtual_device: a virtual device
- *
- * Gets the device manager of this virtual device.
- *
- * Returns: (transfer none): The #ClutterDeviceManager of this virtual device
- **/
-ClutterDeviceManager *
-clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device)
-{
-  ClutterVirtualInputDevicePrivate *priv =
-    clutter_virtual_input_device_get_instance_private (virtual_device);
-
-  return priv->manager;
-}
-
-int
-clutter_virtual_input_device_get_device_type (ClutterVirtualInputDevice *virtual_device)
-{
-  ClutterVirtualInputDevicePrivate *priv =
-    clutter_virtual_input_device_get_instance_private (virtual_device);
-
-  return priv->device_type;
-}
-
-static void
-clutter_virtual_input_device_get_property (GObject    *object,
-                                           guint       prop_id,
-                                           GValue     *value,
-                                           GParamSpec *pspec)
-{
-  ClutterVirtualInputDevice *virtual_device =
-    CLUTTER_VIRTUAL_INPUT_DEVICE (object);
-  ClutterVirtualInputDevicePrivate *priv =
-    clutter_virtual_input_device_get_instance_private (virtual_device);
-
-  switch (prop_id)
-    {
-    case PROP_DEVICE_MANAGER:
-      g_value_set_object (value, priv->manager);
-      break;
-    case PROP_DEVICE_TYPE:
-      g_value_set_enum (value, priv->device_type);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_virtual_input_device_set_property (GObject      *object,
-                                           guint         prop_id,
-                                           const GValue *value,
-                                           GParamSpec   *pspec)
-{
-  ClutterVirtualInputDevice *virtual_device =
-    CLUTTER_VIRTUAL_INPUT_DEVICE (object);
-  ClutterVirtualInputDevicePrivate *priv =
-    clutter_virtual_input_device_get_instance_private (virtual_device);
-
-  switch (prop_id)
-    {
-    case PROP_DEVICE_MANAGER:
-      priv->manager = g_value_get_object (value);
-      break;
-    case PROP_DEVICE_TYPE:
-      priv->device_type = g_value_get_enum (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_virtual_input_device_init (ClutterVirtualInputDevice *virtual_device)
-{
-}
-
-static void
-clutter_virtual_input_device_class_init (ClutterVirtualInputDeviceClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = clutter_virtual_input_device_get_property;
-  object_class->set_property = clutter_virtual_input_device_set_property;
-
-  obj_props[PROP_DEVICE_MANAGER] =
-    g_param_spec_object ("device-manager",
-                         P_("Device Manager"),
-                         P_("The device manager instance"),
-                         CLUTTER_TYPE_DEVICE_MANAGER,
-                         CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  obj_props[PROP_DEVICE_TYPE] =
-    g_param_spec_enum ("device-type",
-                       P_("Device type"),
-                       P_("Device type"),
-                       CLUTTER_TYPE_INPUT_DEVICE_TYPE,
-                       CLUTTER_POINTER_DEVICE,
-                       CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (object_class, PROP_LAST, obj_props);
-}

clutter/clutter/clutter-virtual-input-device.h

@@ -1,116 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2016  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/>.
- *
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef __CLUTTER_VIRTUAL_INPUT_DEVICE_H__
-#define __CLUTTER_VIRTUAL_INPUT_DEVICE_H__
-
-#include <glib-object.h>
-#include <stdint.h>
-
-#include "clutter-device-manager.h"
-
-#define CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE (clutter_virtual_input_device_get_type ())
-
-CLUTTER_AVAILABLE_IN_ALL
-G_DECLARE_DERIVABLE_TYPE (ClutterVirtualInputDevice,
-                          clutter_virtual_input_device,
-                          CLUTTER, VIRTUAL_INPUT_DEVICE,
-                          GObject)
-
-typedef enum _ClutterButtonState
-{
-  CLUTTER_BUTTON_STATE_RELEASED,
-  CLUTTER_BUTTON_STATE_PRESSED
-} ClutterButtonState;
-
-typedef enum _ClutterKeyState
-{
-  CLUTTER_KEY_STATE_RELEASED,
-  CLUTTER_KEY_STATE_PRESSED
-} ClutterKeyState;
-
-struct _ClutterVirtualInputDeviceClass
-{
-  GObjectClass parent_class;
-
-  void (*notify_relative_motion) (ClutterVirtualInputDevice *virtual_device,
-                                  uint64_t                   time_us,
-                                  double                     dx,
-                                  double                     dy);
-
-  void (*notify_absolute_motion) (ClutterVirtualInputDevice *virtual_device,
-                                  uint64_t                   time_us,
-                                  double                     x,
-                                  double                     y);
-
-  void (*notify_button) (ClutterVirtualInputDevice *virtual_device,
-                         uint64_t                   time_us,
-                         uint32_t                   button,
-                         ClutterButtonState         button_state);
-
-  void (*notify_key) (ClutterVirtualInputDevice *virtual_device,
-                      uint64_t                   time_us,
-                      uint32_t                   key,
-                      ClutterKeyState            key_state);
-  void (*notify_keyval) (ClutterVirtualInputDevice *virtual_device,
-                         uint64_t                   time_us,
-                         uint32_t                   keyval,
-                         ClutterKeyState            key_state);
-};
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_relative_motion (ClutterVirtualInputDevice *virtual_device,
-                                                          uint64_t                   time_us,
-                                                          double                     dx,
-                                                          double                     dy);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_absolute_motion (ClutterVirtualInputDevice *virtual_device,
-                                                          uint64_t                   time_us,
-                                                          double                     x,
-                                                          double                     y);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_button (ClutterVirtualInputDevice *virtual_device,
-                                                 uint64_t                   time_us,
-                                                 uint32_t                   button,
-                                                 ClutterButtonState         button_state);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_key (ClutterVirtualInputDevice *virtual_device,
-                                              uint64_t                   time_us,
-                                              uint32_t                   key,
-                                              ClutterKeyState            key_state);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virtual_device,
-                                                 uint64_t                   time_us,
-                                                 uint32_t                   keyval,
-                                                 ClutterKeyState            key_state);
-
-CLUTTER_AVAILABLE_IN_ALL
-ClutterDeviceManager * clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device);
-
-int clutter_virtual_input_device_get_device_type (ClutterVirtualInputDevice *virtual_device);
-
-#endif /* __CLUTTER_VIRTUAL_INPUT_DEVICE_H__ */

clutter/clutter/clutter.h

@@ -107,7 +107,6 @@
 #include "clutter-transition.h"
 #include "clutter-units.h"
 #include "clutter-version.h"
-#include "clutter-virtual-input-device.h"
 #include "clutter-zoom-action.h"
 
 #include "clutter-deprecated.h"

clutter/clutter/cogl/clutter-stage-cogl.c

@@ -37,7 +37,6 @@
 #include "clutter-stage-cogl.h"
 
 #include <stdlib.h>
-#include <math.h>
 
 #include "clutter-actor-private.h"
 #include "clutter-backend-private.h"
@@ -358,7 +357,7 @@ swap_framebuffer (ClutterStageWindow    *stage_window,
                   cairo_rectangle_int_t *swap_region,
                   gboolean               swap_with_damage)
 {
-  CoglFramebuffer *framebuffer = clutter_stage_view_get_onscreen (view);
+  CoglFramebuffer *framebuffer = clutter_stage_view_get_framebuffer (view);
   int damage[4], ndamage;
 
   damage[0] = swap_region->x;
@@ -420,12 +419,6 @@ paint_stage (ClutterStageCogl            *stage_cogl,
 
   _clutter_stage_maybe_setup_viewport (stage, view);
   _clutter_stage_paint_view (stage, view, clip);
-
-  if (clutter_stage_view_get_onscreen (view) !=
-      clutter_stage_view_get_framebuffer (view))
-    {
-      clutter_stage_view_blit_offscreen (view, clip);
-    }
 }
 
 static void
@@ -445,42 +438,6 @@ fill_current_damage_history_and_step (ClutterStageView *view)
   view_priv->damage_index++;
 }
 
-static void
-transform_swap_region_to_onscreen (ClutterStageView      *view,
-                                   cairo_rectangle_int_t *swap_region)
-{
-  CoglFramebuffer *framebuffer;
-  cairo_rectangle_int_t layout;
-  gfloat x1, y1, x2, y2;
-  gint width, height;
-
-  framebuffer = clutter_stage_view_get_onscreen (view);
-  clutter_stage_view_get_layout (view, &layout);
-
-  x1 = (float) swap_region->x / layout.width;
-  y1 = (float) swap_region->y / layout.height;
-  x2 = (float) (swap_region->x + swap_region->width) / layout.width;
-  y2 = (float) (swap_region->y + swap_region->height) / layout.height;
-
-  clutter_stage_view_transform_to_onscreen (view, &x1, &y1);
-  clutter_stage_view_transform_to_onscreen (view, &x2, &y2);
-
-  width = cogl_framebuffer_get_width (framebuffer);
-  height = cogl_framebuffer_get_height (framebuffer);
-
-  x1 = floor (x1 * width);
-  y1 = floor (height - (y1 * height));
-  x2 = ceil (x2 * width);
-  y2 = ceil (height - (y2 * height));
-
-  *swap_region = (cairo_rectangle_int_t) {
-    .x = x1,
-    .y = y1,
-    .width = x2 - x1,
-    .height = y2 - y1
-  };
-}
-
 static gboolean
 clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                                 ClutterStageView   *view)
@@ -503,7 +460,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
   cairo_rectangle_int_t swap_region;
   cairo_rectangle_int_t clip_region;
   gboolean clip_region_empty;
-  int fb_scale;
+  int window_scale;
 
   wrapper = CLUTTER_ACTOR (stage_cogl->wrapper);
 
@@ -557,7 +514,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
 
   clip_region_empty = may_use_clipped_redraw && clip_region.width == 0;
 
-  fb_scale = clutter_stage_view_get_scale (view);
+  window_scale = _clutter_stage_window_get_scale_factor (stage_window);
 
   swap_with_damage = FALSE;
   if (has_buffer_age)
@@ -628,13 +585,13 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
 
       stage_cogl->using_clipped_redraw = TRUE;
 
-      scissor_x = (clip_region.x - view_rect.x) * fb_scale;
+      scissor_x = (clip_region.x - view_rect.x) * window_scale;
-      scissor_y = (clip_region.y - view_rect.y) * fb_scale;
+      scissor_y = (clip_region.y - view_rect.y) * window_scale;
       cogl_framebuffer_push_scissor_clip (fb,
                                           scissor_x,
                                           scissor_y,
-                                          clip_region.width * fb_scale,
+                                          clip_region.width * window_scale,
-                                          clip_region.height * fb_scale);
+                                          clip_region.height * window_scale);
       paint_stage (stage_cogl, view, &clip_region);
       cogl_framebuffer_pop_clip (fb);
 
@@ -653,13 +610,13 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
           int scissor_x;
           int scissor_y;
 
-          scissor_x = (clip_region.x - view_rect.x) * fb_scale;;
+          scissor_x = (clip_region.x - view_rect.x) * window_scale;;
-          scissor_y = (clip_region.y - view_rect.y) * fb_scale;
+          scissor_y = (clip_region.y - view_rect.y) * window_scale;
           cogl_framebuffer_push_scissor_clip (fb,
                                               scissor_x,
                                               scissor_y,
-                                              clip_region.width * fb_scale,
+                                              clip_region.width * window_scale,
-                                              clip_region.height * fb_scale);
+                                              clip_region.height * window_scale);
           paint_stage (stage_cogl, view, &clip_region);
           cogl_framebuffer_pop_clip (fb);
         }
@@ -724,10 +681,10 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
       else if (use_clipped_redraw)
         {
           swap_region = (cairo_rectangle_int_t) {
-            .x = (clip_region.x - view_rect.x) * fb_scale,
+            .x = (clip_region.x - view_rect.x) * window_scale,
-            .y = (clip_region.y - view_rect.y) * fb_scale,
+            .y = (clip_region.y - view_rect.y) * window_scale,
-            .width = clip_region.width * fb_scale,
+            .width = clip_region.width * window_scale,
-            .height = clip_region.height * fb_scale,
+            .height = clip_region.height * window_scale,
           };
           g_assert (swap_region.width > 0);
           do_swap_buffer = TRUE;
@@ -737,8 +694,8 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
           swap_region = (cairo_rectangle_int_t) {
             .x = 0,
             .y = 0,
-            .width = view_rect.width * fb_scale,
+            .width = view_rect.width * window_scale,
-            .height = view_rect.height * fb_scale,
+            .height = view_rect.height * window_scale,
           };
           do_swap_buffer = TRUE;
         }
@@ -751,12 +708,6 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
 
   if (do_swap_buffer)
     {
-      if (clutter_stage_view_get_onscreen (view) !=
-          clutter_stage_view_get_framebuffer (view))
-        {
-          transform_swap_region_to_onscreen (view, &swap_region);
-        }
-
       return swap_framebuffer (stage_window,
                                view,
                                &swap_region,
@@ -806,9 +757,7 @@ clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
                                     int                *x,
                                     int                *y)
 {
-  CoglFramebuffer *framebuffer = clutter_stage_view_get_framebuffer (view);
   gboolean has_buffer_age =
-    cogl_is_onscreen (framebuffer) &&
     cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);
   cairo_rectangle_int_t *rect;
 
@@ -822,13 +771,10 @@ clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
       ClutterStageViewCogl *view_cogl = CLUTTER_STAGE_VIEW_COGL (view);
       ClutterStageViewCoglPrivate *view_priv =
         clutter_stage_view_cogl_get_instance_private (view_cogl);
-      cairo_rectangle_int_t view_layout;
-
-      clutter_stage_view_get_layout (view, &view_layout);
 
       rect = &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - 1)];
-      *x = rect->x - view_layout.x;
+      *x = rect->x;
-      *y = rect->y - view_layout.y;
+      *y = rect->y;
     }
 }
 

clutter/clutter/evdev/clutter-device-manager-evdev.h

@@ -24,7 +24,6 @@
 #ifndef __CLUTTER_DEVICE_MANAGER_EVDEV_H__
 #define __CLUTTER_DEVICE_MANAGER_EVDEV_H__
 
-#include <clutter/clutter-backend.h>
 #include <clutter/clutter-device-manager.h>
 
 G_BEGIN_DECLS
@@ -40,8 +39,6 @@ typedef struct _ClutterDeviceManagerEvdev         ClutterDeviceManagerEvdev;
 typedef struct _ClutterDeviceManagerEvdevClass    ClutterDeviceManagerEvdevClass;
 typedef struct _ClutterDeviceManagerEvdevPrivate  ClutterDeviceManagerEvdevPrivate;
 
-typedef struct _ClutterSeatEvdev ClutterSeatEvdev;
-
 struct _ClutterDeviceManagerEvdev
 {
   ClutterDeviceManager parent_instance;
@@ -64,45 +61,6 @@ gint  _clutter_device_manager_evdev_acquire_device_id (ClutterDeviceManagerEvdev
 void  _clutter_device_manager_evdev_release_device_id (ClutterDeviceManagerEvdev *manager_evdev,
                                                        ClutterInputDevice        *device);
 
-struct xkb_keymap * _clutter_device_manager_evdev_get_keymap (ClutterDeviceManagerEvdev *manager_evdev);
-
-ClutterStage * _clutter_device_manager_evdev_get_stage (ClutterDeviceManagerEvdev *manager_evdev);
-
-void _clutter_device_manager_evdev_constrain_pointer (ClutterDeviceManagerEvdev *manager_evdev,
-                                                      ClutterInputDevice        *core_pointer,
-                                                      uint64_t                   time_us,
-                                                      float                      x,
-                                                      float                      y,
-                                                      float                     *new_x,
-                                                      float                     *new_y);
-
-void _clutter_device_manager_evdev_filter_relative_motion (ClutterDeviceManagerEvdev *manager_evdev,
-                                                           ClutterInputDevice        *device,
-                                                           float                      x,
-                                                           float                      y,
-                                                           float                     *dx,
-                                                           float                     *dy);
-
-void _clutter_device_manager_evdev_dispatch (ClutterDeviceManagerEvdev *manager_evdev);
-
-static inline guint64
-us (guint64 us)
-{
-  return us;
-}
-
-static inline guint64
-ms2us (guint64 ms)
-{
-  return us (ms * 1000);
-}
-
-static inline guint32
-us2ms (guint64 us)
-{
-  return (guint32) (us / 1000);
-}
-
 G_END_DECLS
 
 #endif /* __CLUTTER_DEVICE_MANAGER_EVDEV_H__ */

clutter/clutter/evdev/clutter-evdev.h

@@ -57,9 +57,6 @@ void  clutter_evdev_set_device_callbacks (ClutterOpenDeviceCallback  open_callba
                                           ClutterCloseDeviceCallback close_callback,
                                           gpointer                   user_data);
 
-CLUTTER_AVAILABLE_IN_ALL
-void  clutter_evdev_set_seat_id (const gchar *seat_id);
-
 CLUTTER_AVAILABLE_IN_1_10
 void  clutter_evdev_release_devices (void);
 CLUTTER_AVAILABLE_IN_1_10
@@ -97,18 +94,6 @@ void  clutter_evdev_set_pointer_constrain_callback (ClutterDeviceManager
 						    gpointer                         user_data,
 						    GDestroyNotify                   user_data_notify);
 
-typedef void (*ClutterRelativeMotionFilter) (ClutterInputDevice *device,
-                                             float               x,
-                                             float               y,
-                                             float              *dx,
-                                             float              *dy,
-                                             gpointer            user_data);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_evdev_set_relative_motion_filter (ClutterDeviceManager       *evdev,
-                                               ClutterRelativeMotionFilter filter,
-                                               gpointer                    user_data);
-
 CLUTTER_AVAILABLE_IN_1_16
 void               clutter_evdev_set_keyboard_map   (ClutterDeviceManager *evdev,
 						     struct xkb_keymap    *keymap);
@@ -120,10 +105,6 @@ CLUTTER_AVAILABLE_IN_1_20
 void clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
                                               xkb_layout_index_t    idx);
 
-CLUTTER_AVAILABLE_IN_1_26
-void clutter_evdev_set_keyboard_numlock (ClutterDeviceManager *evdev,
-                                         gboolean              numlock_state);
-
 CLUTTER_AVAILABLE_IN_1_18
 void clutter_evdev_set_keyboard_repeat (ClutterDeviceManager *evdev,
                                         gboolean              repeat,
@@ -165,14 +146,6 @@ gboolean clutter_evdev_event_get_relative_motion (const ClutterEvent *event,
                                                   double             *dx_unaccel,
                                                   double             *dy_unaccel);
 
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_evdev_input_device_tool_set_pressure_curve (ClutterInputDeviceTool *tool,
-                                                         gdouble                 curve[4]);
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_evdev_input_device_tool_set_button_code    (ClutterInputDeviceTool *tool,
-                                                         guint                   button,
-                                                         guint                   evcode);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_EVDEV_H__ */

clutter/clutter/evdev/clutter-input-device-evdev.c

@@ -35,8 +35,6 @@
 #include "clutter-input-device-evdev.h"
 #include "clutter-device-manager-evdev.h"
 
-#include "cairo-gobject.h"
-
 typedef struct _ClutterInputDeviceClass        ClutterInputDeviceEvdevClass;
 
 #define clutter_input_device_evdev_get_type _clutter_input_device_evdev_get_type
@@ -45,15 +43,6 @@ G_DEFINE_TYPE (ClutterInputDeviceEvdev,
                clutter_input_device_evdev,
                CLUTTER_TYPE_INPUT_DEVICE)
 
-enum {
-  PROP_0,
-  PROP_DEVICE_MATRIX,
-  PROP_OUTPUT_ASPECT_RATIO,
-  N_PROPS
-};
-
-static GParamSpec *obj_props[N_PROPS] = { 0 };
-
 static void
 clutter_input_device_evdev_finalize (GObject *object)
 {
@@ -70,53 +59,6 @@ clutter_input_device_evdev_finalize (GObject *object)
   G_OBJECT_CLASS (clutter_input_device_evdev_parent_class)->finalize (object);
 }
 
-static void
-clutter_input_device_evdev_set_property (GObject      *object,
-                                         guint         prop_id,
-                                         const GValue *value,
-                                         GParamSpec   *pspec)
-{
-  ClutterInputDeviceEvdev *device = CLUTTER_INPUT_DEVICE_EVDEV (object);
-
-  switch (prop_id)
-    {
-    case PROP_DEVICE_MATRIX:
-      {
-        const cairo_matrix_t *matrix = g_value_get_boxed (value);
-        cairo_matrix_init_identity (&device->device_matrix);
-        cairo_matrix_multiply (&device->device_matrix,
-                               &device->device_matrix, matrix);
-        break;
-      }
-    case PROP_OUTPUT_ASPECT_RATIO:
-      device->output_ratio = g_value_get_double (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-clutter_input_device_evdev_get_property (GObject    *object,
-                                         guint       prop_id,
-                                         GValue     *value,
-                                         GParamSpec *pspec)
-{
-  ClutterInputDeviceEvdev *device = CLUTTER_INPUT_DEVICE_EVDEV (object);
-
-  switch (prop_id)
-    {
-    case PROP_DEVICE_MATRIX:
-      g_value_set_boxed (value, &device->device_matrix);
-      break;
-    case PROP_OUTPUT_ASPECT_RATIO:
-      g_value_set_double (value, device->output_ratio);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
 static gboolean
 clutter_input_device_evdev_keycode_to_evdev (ClutterInputDevice *device,
                                              guint hardware_keycode,
@@ -166,83 +108,19 @@ clutter_input_device_evdev_update_from_tool (ClutterInputDevice     *device,
   g_object_thaw_notify (G_OBJECT (device));
 }
 
-static gboolean
-clutter_input_device_evdev_is_mode_switch_button (ClutterInputDevice *device,
-                                                  guint               group,
-                                                  guint               button)
-{
-  struct libinput_device *libinput_device;
-  struct libinput_tablet_pad_mode_group *mode_group;
-
-  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
-  mode_group = libinput_device_tablet_pad_get_mode_group (libinput_device, group);
-
-  return libinput_tablet_pad_mode_group_button_is_toggle (mode_group, button) != 0;
-}
-
-static gint
-clutter_input_device_evdev_get_group_n_modes (ClutterInputDevice *device,
-                                              gint                group)
-{
-  struct libinput_device *libinput_device;
-  struct libinput_tablet_pad_mode_group *mode_group;
-
-  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
-  mode_group = libinput_device_tablet_pad_get_mode_group (libinput_device, group);
-
-  return libinput_tablet_pad_mode_group_get_num_modes (mode_group);
-}
-
-static gboolean
-clutter_input_device_evdev_is_grouped (ClutterInputDevice *device,
-                                       ClutterInputDevice *other_device)
-{
-  struct libinput_device *libinput_device, *other_libinput_device;
-
-  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
-  other_libinput_device = clutter_evdev_input_device_get_libinput_device (other_device);
-
-  return libinput_device_get_device_group (libinput_device) ==
-    libinput_device_get_device_group (other_libinput_device);
-}
-
 static void
 clutter_input_device_evdev_class_init (ClutterInputDeviceEvdevClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = clutter_input_device_evdev_finalize;
-  object_class->set_property = clutter_input_device_evdev_set_property;
-  object_class->get_property = clutter_input_device_evdev_get_property;
-
   klass->keycode_to_evdev = clutter_input_device_evdev_keycode_to_evdev;
   klass->update_from_tool = clutter_input_device_evdev_update_from_tool;
-  klass->is_mode_switch_button = clutter_input_device_evdev_is_mode_switch_button;
-  klass->get_group_n_modes = clutter_input_device_evdev_get_group_n_modes;
-  klass->is_grouped = clutter_input_device_evdev_is_grouped;
-
-  obj_props[PROP_DEVICE_MATRIX] =
-    g_param_spec_boxed ("device-matrix",
-			P_("Device input matrix"),
-			P_("Device input matrix"),
-			CAIRO_GOBJECT_TYPE_MATRIX,
-			CLUTTER_PARAM_READWRITE);
-  obj_props[PROP_OUTPUT_ASPECT_RATIO] =
-    g_param_spec_double ("output-aspect-ratio",
-                         P_("Output aspect ratio"),
-                         P_("Output aspect ratio"),
-                         0, G_MAXDOUBLE, 0,
-                         CLUTTER_PARAM_READWRITE);
-
-  g_object_class_install_properties (object_class, N_PROPS, obj_props);
 }
 
 static void
 clutter_input_device_evdev_init (ClutterInputDeviceEvdev *self)
 {
-  cairo_matrix_init_identity (&self->device_matrix);
-  self->device_aspect_ratio = 0;
-  self->output_ratio = 0;
 }
 
 /*
@@ -265,7 +143,6 @@ _clutter_input_device_evdev_new (ClutterDeviceManager *manager,
   gchar *vendor, *product;
   gint device_id, n_rings = 0, n_strips = 0, n_groups = 1;
   gchar *node_path;
-  gdouble width, height;
 
   type = _clutter_input_device_evdev_determine_type (libinput_device);
   vendor = g_strdup_printf ("%.4x", libinput_device_get_id_vendor (libinput_device));
@@ -305,9 +182,6 @@ _clutter_input_device_evdev_new (ClutterDeviceManager *manager,
   g_free (vendor);
   g_free (product);
 
-  if (libinput_device_get_size (libinput_device, &width, &height) == 0)
-    device->device_aspect_ratio = width / height;
-
   return CLUTTER_INPUT_DEVICE (device);
 }
 
@@ -322,8 +196,7 @@ _clutter_input_device_evdev_new (ClutterDeviceManager *manager,
 ClutterInputDevice *
 _clutter_input_device_evdev_new_virtual (ClutterDeviceManager *manager,
                                          ClutterSeatEvdev *seat,
-                                         ClutterInputDeviceType type,
+                                         ClutterInputDeviceType type)
-                                         ClutterInputMode mode)
 {
   ClutterInputDeviceEvdev *device;
   ClutterDeviceManagerEvdev *manager_evdev;
@@ -350,7 +223,7 @@ _clutter_input_device_evdev_new_virtual (ClutterDeviceManager *manager,
                          "name", name,
                          "device-manager", manager,
                          "device-type", type,
-                         "device-mode", mode,
+                         "device-mode", CLUTTER_INPUT_MODE_MASTER,
                          "enabled", TRUE,
                          NULL);
 
@@ -439,39 +312,3 @@ clutter_evdev_event_sequence_get_slot (const ClutterEventSequence *sequence)
 
   return GPOINTER_TO_INT (sequence) - 1;
 }
-
-void
-clutter_input_device_evdev_translate_coordinates (ClutterInputDevice *device,
-                                                  ClutterStage       *stage,
-                                                  gfloat             *x,
-                                                  gfloat             *y)
-{
-  ClutterInputDeviceEvdev *device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
-  double min_x = 0, min_y = 0, max_x = 1, max_y = 1;
-  gdouble stage_width, stage_height;
-  double x_d, y_d;
-
-  stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
-  stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
-  x_d = *x / stage_width;
-  y_d = *y / stage_height;
-
-  /* Apply aspect ratio */
-  if (device_evdev->output_ratio > 0 &&
-      device_evdev->device_aspect_ratio > 0)
-    {
-      gdouble ratio = device_evdev->device_aspect_ratio / device_evdev->output_ratio;
-
-      if (ratio > 1)
-        x_d *= ratio;
-      else if (ratio < 1)
-        y_d *= 1 / ratio;
-    }
-
-  cairo_matrix_transform_point (&device_evdev->device_matrix, &min_x, &min_y);
-  cairo_matrix_transform_point (&device_evdev->device_matrix, &max_x, &max_y);
-  cairo_matrix_transform_point (&device_evdev->device_matrix, &x_d, &y_d);
-
-  *x = CLAMP (x_d, MIN (min_x, max_x), MAX (min_x, max_x)) * stage_width;
-  *y = CLAMP (y_d, MIN (min_y, max_y), MAX (min_y, max_y)) * stage_height;
-}

clutter/clutter/evdev/clutter-input-device-evdev.h

@@ -29,8 +29,7 @@
 #include <glib-object.h>
 #include <libinput.h>
 
-#include "clutter/clutter-device-manager-private.h"
+#include <clutter/clutter-input-device.h>
-#include "evdev/clutter-seat-evdev.h"
 
 G_BEGIN_DECLS
 
@@ -57,6 +56,7 @@ G_BEGIN_DECLS
   CLUTTER_TYPE_INPUT_DEVICE_EVDEV, ClutterInputDeviceEvdevClass))
 
 typedef struct _ClutterInputDeviceEvdev ClutterInputDeviceEvdev;
+typedef struct _ClutterSeatEvdev ClutterSeatEvdev;
 typedef struct _ClutterEventEvdev ClutterEventEvdev;
 
 struct _ClutterInputDeviceEvdev
@@ -66,10 +66,6 @@ struct _ClutterInputDeviceEvdev
   struct libinput_device *libinput_device;
   ClutterSeatEvdev *seat;
   ClutterInputDeviceTool *last_tool;
-
-  cairo_matrix_t device_matrix;
-  gdouble device_aspect_ratio; /* w:h */
-  gdouble output_ratio;        /* w:h */
 };
 
 GType                     _clutter_input_device_evdev_get_type        (void) G_GNUC_CONST;
@@ -80,8 +76,7 @@ ClutterInputDevice *      _clutter_input_device_evdev_new             (ClutterDe
 
 ClutterInputDevice *      _clutter_input_device_evdev_new_virtual     (ClutterDeviceManager    *manager,
                                                                        ClutterSeatEvdev        *seat,
-                                                                       ClutterInputDeviceType   type,
+                                                                       ClutterInputDeviceType   type);
-                                                                       ClutterInputMode         mode);
 
 ClutterSeatEvdev *        _clutter_input_device_evdev_get_seat        (ClutterInputDeviceEvdev *device);
 
@@ -106,11 +101,6 @@ void  			  _clutter_evdev_event_set_relative_motion (ClutterEvent *event,
 								    double        dx_unaccel,
 								    double        dy_unaccel);
 
-void                      clutter_input_device_evdev_translate_coordinates (ClutterInputDevice *device,
-                                                                            ClutterStage       *stage,
-                                                                            gfloat             *x,
-                                                                            gfloat             *y);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_INPUT_DEVICE_EVDEV_H__ */

clutter/clutter/evdev/clutter-input-device-tool-evdev.c

@@ -26,7 +26,6 @@
 #endif
 
 #include "clutter-input-device-tool-evdev.h"
-#include "clutter-evdev.h"
 
 G_DEFINE_TYPE (ClutterInputDeviceToolEvdev, clutter_input_device_tool_evdev,
                CLUTTER_TYPE_INPUT_DEVICE_TOOL)
@@ -36,7 +35,6 @@ clutter_input_device_tool_evdev_finalize (GObject *object)
 {
   ClutterInputDeviceToolEvdev *tool = CLUTTER_INPUT_DEVICE_TOOL_EVDEV (object);
 
-  g_hash_table_unref (tool->button_map);
   libinput_tablet_tool_unref (tool->tool);
 
   G_OBJECT_CLASS (clutter_input_device_tool_evdev_parent_class)->finalize (object);
@@ -53,7 +51,6 @@ clutter_input_device_tool_evdev_class_init (ClutterInputDeviceToolEvdevClass *kl
 static void
 clutter_input_device_tool_evdev_init (ClutterInputDeviceToolEvdev *tool)
 {
-  tool->button_map = g_hash_table_new (NULL, NULL);
 }
 
 ClutterInputDeviceTool *
@@ -73,96 +70,3 @@ clutter_input_device_tool_evdev_new (struct libinput_tablet_tool *tool,
 
   return CLUTTER_INPUT_DEVICE_TOOL (evdev_tool);
 }
-
-void
-clutter_evdev_input_device_tool_set_pressure_curve (ClutterInputDeviceTool *tool,
-                                                    gdouble                 curve[4])
-{
-  ClutterInputDeviceToolEvdev *evdev_tool;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_DEVICE_TOOL_EVDEV (tool));
-  g_return_if_fail (curve[0] >= 0 && curve[0] <= 1 &&
-                    curve[1] >= 0 && curve[1] <= 1 &&
-                    curve[2] >= 0 && curve[2] <= 1 &&
-                    curve[3] >= 0 && curve[3] <= 1);
-
-  evdev_tool = CLUTTER_INPUT_DEVICE_TOOL_EVDEV (tool);
-  evdev_tool->pressure_curve[0] = curve[0];
-  evdev_tool->pressure_curve[1] = curve[1];
-  evdev_tool->pressure_curve[2] = curve[2];
-  evdev_tool->pressure_curve[3] = curve[3];
-}
-
-void
-clutter_evdev_input_device_tool_set_button_code (ClutterInputDeviceTool *tool,
-                                                 guint                   button,
-                                                 guint                   evcode)
-{
-  ClutterInputDeviceToolEvdev *evdev_tool;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_DEVICE_TOOL_EVDEV (tool));
-
-  evdev_tool = CLUTTER_INPUT_DEVICE_TOOL_EVDEV (tool);
-
-  if (evcode == 0)
-    {
-      g_hash_table_remove (evdev_tool->button_map, GUINT_TO_POINTER (button));
-    }
-  else
-    {
-      g_hash_table_insert (evdev_tool->button_map, GUINT_TO_POINTER (button),
-                           GUINT_TO_POINTER (evcode));
-    }
-}
-
-static gdouble
-calculate_bezier_position (gdouble pos,
-                           gdouble x1,
-                           gdouble y1,
-                           gdouble x2,
-                           gdouble y2)
-{
-  gdouble int1_y, int2_y;
-
-  pos = CLAMP (pos, 0, 1);
-
-  /* Intersection between 0,0 and x1,y1 */
-  int1_y = pos * y1;
-
-  /* Intersection between x2,y2 and 1,1 */
-  int2_y = (pos * (1 - y2)) + y2;
-
-  /* Find the new position in the line traced by the previous points */
-  return (pos * (int2_y - int1_y)) + int1_y;
-}
-
-gdouble
-clutter_input_device_tool_evdev_translate_pressure (ClutterInputDeviceTool *tool,
-                                                    gdouble                 pressure)
-{
-  ClutterInputDeviceToolEvdev *evdev_tool;
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE_TOOL (tool), pressure);
-
-  evdev_tool = CLUTTER_INPUT_DEVICE_TOOL_EVDEV (tool);
-
-  return calculate_bezier_position (CLAMP (pressure, 0, 1),
-                                    evdev_tool->pressure_curve[0],
-                                    evdev_tool->pressure_curve[1],
-                                    evdev_tool->pressure_curve[2],
-                                    evdev_tool->pressure_curve[3]);
-}
-
-guint
-clutter_input_device_tool_evdev_get_button_code (ClutterInputDeviceTool *tool,
-                                                 guint                   button)
-{
-  ClutterInputDeviceToolEvdev *evdev_tool;
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE_TOOL (tool), 0);
-
-  evdev_tool = CLUTTER_INPUT_DEVICE_TOOL_EVDEV (tool);
-
-  return GPOINTER_TO_UINT (g_hash_table_lookup (evdev_tool->button_map,
-                                                GUINT_TO_POINTER (button)));
-}

clutter/clutter/evdev/clutter-input-device-tool-evdev.h

@@ -59,8 +59,6 @@ struct _ClutterInputDeviceToolEvdev
 {
   ClutterInputDeviceTool parent_instance;
   struct libinput_tablet_tool *tool;
-  GHashTable *button_map;
-  gdouble pressure_curve[4];
 };
 
 struct _ClutterInputDeviceToolEvdevClass
@@ -74,11 +72,6 @@ ClutterInputDeviceTool * clutter_input_device_tool_evdev_new      (struct libinp
                                                                    guint64                      serial,
                                                                    ClutterInputDeviceToolType   type);
 
-gdouble                  clutter_input_device_tool_evdev_translate_pressure (ClutterInputDeviceTool *tool,
-                                                                             gdouble                 pressure);
-guint                    clutter_input_device_tool_evdev_get_button_code    (ClutterInputDeviceTool *tool,
-                                                                             guint                   button);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_INPUT_DEVICE_EVDEV_TOOL_H__ */

clutter/clutter/evdev/clutter-seat-evdev.c

@@ -1,611 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2010  Intel Corp.
- * Copyright (C) 2014  Jonas Ådahl
- * Copyright (C) 2016  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/>.
- *
- * Author: Damien Lespiau <damien.lespiau@intel.com>
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-seat-evdev.h"
-
-#include <linux/input.h>
-
-#include "clutter-event-private.h"
-#include "clutter-input-device-evdev.h"
-#include "clutter-input-device-tool-evdev.h"
-#include "clutter-main.h"
-
-/* Try to keep the pointer inside the stage. Hopefully no one is using
- * this backend with stages smaller than this. */
-#define INITIAL_POINTER_X 16
-#define INITIAL_POINTER_Y 16
-
-#define AUTOREPEAT_VALUE 2
-
-void
-clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
-                                      struct libinput_seat *libinput_seat)
-{
-  g_assert (seat->libinput_seat == NULL);
-
-  libinput_seat_ref (libinput_seat);
-  libinput_seat_set_user_data (libinput_seat, seat);
-  seat->libinput_seat = libinput_seat;
-}
-
-void
-clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat)
-{
-  GSList *iter;
-  ClutterInputDeviceEvdev *device_evdev;
-  int caps_lock, num_lock, scroll_lock;
-  enum libinput_led leds = 0;
-
-  caps_lock = xkb_state_led_index_is_active (seat->xkb, seat->caps_lock_led);
-  num_lock = xkb_state_led_index_is_active (seat->xkb, seat->num_lock_led);
-  scroll_lock = xkb_state_led_index_is_active (seat->xkb, seat->scroll_lock_led);
-
-  if (caps_lock)
-    leds |= LIBINPUT_LED_CAPS_LOCK;
-  if (num_lock)
-    leds |= LIBINPUT_LED_NUM_LOCK;
-  if (scroll_lock)
-    leds |= LIBINPUT_LED_SCROLL_LOCK;
-
-  for (iter = seat->devices; iter; iter = iter->next)
-    {
-      device_evdev = iter->data;
-      _clutter_input_device_evdev_update_leds (device_evdev, leds);
-    }
-}
-
-static void
-clutter_touch_state_free (ClutterTouchState *touch_state)
-{
-  g_slice_free (ClutterTouchState, touch_state);
-}
-
-ClutterTouchState *
-clutter_seat_evdev_add_touch (ClutterSeatEvdev *seat,
-                              guint32           id)
-{
-  ClutterTouchState *touch;
-
-  touch = g_slice_new0 (ClutterTouchState);
-  touch->id = id;
-
-  g_hash_table_insert (seat->touches, GUINT_TO_POINTER (id), touch);
-
-  return touch;
-}
-
-void
-clutter_seat_evdev_remove_touch (ClutterSeatEvdev *seat,
-                                 guint32           id)
-{
-  g_hash_table_remove (seat->touches, GUINT_TO_POINTER (id));
-}
-
-ClutterTouchState *
-clutter_seat_evdev_get_touch (ClutterSeatEvdev *seat,
-                              guint32           id)
-{
-  return g_hash_table_lookup (seat->touches, GUINT_TO_POINTER (id));
-}
-
-ClutterSeatEvdev *
-clutter_seat_evdev_new (ClutterDeviceManagerEvdev *manager_evdev)
-{
-  ClutterDeviceManager *manager = CLUTTER_DEVICE_MANAGER (manager_evdev);
-  ClutterSeatEvdev *seat;
-  ClutterInputDevice *device;
-  ClutterStage *stage;
-  struct xkb_keymap *keymap;
-
-  seat = g_new0 (ClutterSeatEvdev, 1);
-  if (!seat)
-    return NULL;
-
-  seat->manager_evdev = manager_evdev;
-  device = _clutter_input_device_evdev_new_virtual (
-      manager, seat, CLUTTER_POINTER_DEVICE,
-      CLUTTER_INPUT_MODE_MASTER);
-  stage = _clutter_device_manager_evdev_get_stage (manager_evdev);
-  _clutter_input_device_set_stage (device, stage);
-  seat->pointer_x = INITIAL_POINTER_X;
-  seat->pointer_y = INITIAL_POINTER_Y;
-  _clutter_input_device_set_coords (device, NULL,
-                                    seat->pointer_x, seat->pointer_y,
-                                    NULL);
-  _clutter_device_manager_add_device (manager, device);
-  seat->core_pointer = device;
-
-  device = _clutter_input_device_evdev_new_virtual (
-      manager, seat, CLUTTER_KEYBOARD_DEVICE,
-      CLUTTER_INPUT_MODE_MASTER);
-  _clutter_input_device_set_stage (device, stage);
-  _clutter_device_manager_add_device (manager, device);
-  seat->core_keyboard = device;
-
-  seat->touches = g_hash_table_new_full (NULL, NULL, NULL,
-                                         (GDestroyNotify) clutter_touch_state_free);
-
-  seat->repeat = TRUE;
-  seat->repeat_delay = 250;     /* ms */
-  seat->repeat_interval = 33;   /* ms */
-
-  keymap = _clutter_device_manager_evdev_get_keymap (manager_evdev);
-  if (keymap)
-    {
-      seat->xkb = xkb_state_new (keymap);
-
-      seat->caps_lock_led =
-        xkb_keymap_led_get_index (keymap, XKB_LED_NAME_CAPS);
-      seat->num_lock_led =
-        xkb_keymap_led_get_index (keymap, XKB_LED_NAME_NUM);
-      seat->scroll_lock_led =
-        xkb_keymap_led_get_index (keymap, XKB_LED_NAME_SCROLL);
-    }
-
-  return seat;
-}
-
-void
-clutter_seat_evdev_clear_repeat_timer (ClutterSeatEvdev *seat)
-{
-  if (seat->repeat_timer)
-    {
-      g_source_remove (seat->repeat_timer);
-      seat->repeat_timer = 0;
-      g_clear_object (&seat->repeat_device);
-    }
-}
-
-static gboolean
-keyboard_repeat (gpointer data)
-{
-  ClutterSeatEvdev *seat = data;
-  GSource *source;
-
-  /* There might be events queued in libinput that could cancel the
-     repeat timer. */
-  _clutter_device_manager_evdev_dispatch (seat->manager_evdev);
-  if (!seat->repeat_timer)
-    return G_SOURCE_REMOVE;
-
-  g_return_val_if_fail (seat->repeat_device != NULL, G_SOURCE_REMOVE);
-  source = g_main_context_find_source_by_id (NULL, seat->repeat_timer);
-
-  clutter_seat_evdev_notify_key (seat,
-                                 seat->repeat_device,
-                                 g_source_get_time (source),
-                                 seat->repeat_key,
-                                 AUTOREPEAT_VALUE,
-                                 FALSE);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-queue_event (ClutterEvent *event)
-{
-  _clutter_event_push (event, FALSE);
-}
-
-static int
-update_button_count (ClutterSeatEvdev *seat,
-                     uint32_t          button,
-                     uint32_t          state)
-{
-  if (state)
-    {
-      return ++seat->button_count[button];
-    }
-  else
-    {
-      /* Handle cases where we newer saw the initial pressed event. */
-      if (seat->button_count[button] == 0)
-        return 0;
-
-      return --seat->button_count[button];
-    }
-}
-
-void
-clutter_seat_evdev_notify_key (ClutterSeatEvdev   *seat,
-                               ClutterInputDevice *device,
-                               uint64_t            time_us,
-                               uint32_t            key,
-                               uint32_t            state,
-                               gboolean            update_keys)
-{
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-  enum xkb_state_component changed_state;
-
-  if (state != AUTOREPEAT_VALUE)
-    {
-      /* Drop any repeated button press (for example from virtual devices. */
-      int count = update_button_count (seat, key, state);
-      if (state && count > 1)
-        return;
-      if (!state && count != 0)
-        return;
-    }
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (device);
-  if (stage == NULL)
-    {
-      clutter_seat_evdev_clear_repeat_timer (seat);
-      return;
-    }
-
-  event = _clutter_key_event_new_from_evdev (device,
-					     seat->core_keyboard,
-					     stage,
-					     seat->xkb,
-					     seat->button_state,
-					     us2ms (time_us), key, state);
-  _clutter_evdev_event_set_event_code (event, key);
-
-  /* We must be careful and not pass multiple releases to xkb, otherwise it gets
-     confused and locks the modifiers */
-  if (state != AUTOREPEAT_VALUE)
-    {
-      changed_state = xkb_state_update_key (seat->xkb,
-                                            event->key.hardware_keycode,
-                                            state ? XKB_KEY_DOWN : XKB_KEY_UP);
-    }
-  else
-    {
-      changed_state = 0;
-      clutter_event_set_flags (event, CLUTTER_EVENT_FLAG_SYNTHETIC);
-    }
-
-  queue_event (event);
-
-  if (update_keys && (changed_state & XKB_STATE_LEDS))
-    clutter_seat_evdev_sync_leds (seat);
-
-  if (state == 0 ||             /* key release */
-      !seat->repeat ||
-      !xkb_keymap_key_repeats (xkb_state_get_keymap (seat->xkb),
-                               event->key.hardware_keycode))
-    {
-      clutter_seat_evdev_clear_repeat_timer (seat);
-      return;
-    }
-
-  if (state == 1)               /* key press */
-    seat->repeat_count = 0;
-
-  seat->repeat_count += 1;
-  seat->repeat_key = key;
-
-  switch (seat->repeat_count)
-    {
-    case 1:
-    case 2:
-      {
-        guint32 interval;
-
-        clutter_seat_evdev_clear_repeat_timer (seat);
-        seat->repeat_device = g_object_ref (device);
-
-        if (seat->repeat_count == 1)
-          interval = seat->repeat_delay;
-        else
-          interval = seat->repeat_interval;
-
-        seat->repeat_timer =
-          clutter_threads_add_timeout_full (CLUTTER_PRIORITY_EVENTS,
-                                            interval,
-                                            keyboard_repeat,
-                                            seat,
-                                            NULL);
-        return;
-      }
-    default:
-      return;
-    }
-}
-
-static ClutterEvent *
-new_absolute_motion_event (ClutterSeatEvdev   *seat,
-                           ClutterInputDevice *input_device,
-                           guint64             time_us,
-                           gfloat              x,
-                           gfloat              y,
-                           gdouble            *axes)
-{
-  ClutterStage *stage = _clutter_input_device_get_stage (input_device);
-  ClutterEvent *event;
-
-  event = clutter_event_new (CLUTTER_MOTION);
-
-  if (clutter_input_device_get_device_type (input_device) != CLUTTER_TABLET_DEVICE)
-    _clutter_device_manager_evdev_constrain_pointer (seat->manager_evdev,
-                                                     seat->core_pointer,
-                                                     time_us,
-                                                     seat->pointer_x,
-                                                     seat->pointer_y,
-                                                     &x, &y);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->motion.time = us2ms (time_us);
-  event->motion.stage = stage;
-  event->motion.device = seat->core_pointer;
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-  event->motion.x = x;
-  event->motion.y = y;
-  event->motion.axes = axes;
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-
-  if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
-    {
-      ClutterInputDeviceEvdev *device_evdev =
-        CLUTTER_INPUT_DEVICE_EVDEV (input_device);
-
-      clutter_event_set_device_tool (event, device_evdev->last_tool);
-      clutter_event_set_device (event, input_device);
-    }
-  else
-    {
-      clutter_event_set_device (event, seat->core_pointer);
-    }
-
-  _clutter_input_device_set_stage (seat->core_pointer, stage);
-
-  if (clutter_input_device_get_device_type (input_device) != CLUTTER_TABLET_DEVICE)
-    {
-      seat->pointer_x = x;
-      seat->pointer_y = y;
-    }
-
-  return event;
-}
-
-void
-clutter_seat_evdev_notify_relative_motion (ClutterSeatEvdev   *seat,
-                                           ClutterInputDevice *input_device,
-                                           uint64_t            time_us,
-                                           float               dx,
-                                           float               dy,
-                                           float               dx_unaccel,
-                                           float               dy_unaccel)
-{
-  gfloat new_x, new_y;
-  ClutterEvent *event;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  if (!_clutter_input_device_get_stage (input_device))
-    return;
-
-  _clutter_device_manager_evdev_filter_relative_motion (seat->manager_evdev,
-                                                        input_device,
-                                                        seat->pointer_x,
-                                                        seat->pointer_y,
-                                                        &dx,
-                                                        &dy);
-
-  new_x = seat->pointer_x + dx;
-  new_y = seat->pointer_y + dy;
-  event = new_absolute_motion_event (seat, input_device,
-                                     time_us, new_x, new_y, NULL);
-
-  _clutter_evdev_event_set_relative_motion (event,
-                                            dx, dy,
-                                            dx_unaccel, dy_unaccel);
-
-  queue_event (event);
-}
-
-void clutter_seat_evdev_notify_absolute_motion (ClutterSeatEvdev   *seat,
-                                                ClutterInputDevice *input_device,
-                                                uint64_t            time_us,
-                                                float               x,
-                                                float               y,
-                                                double             *axes)
-{
-  ClutterEvent *event;
-
-  event = new_absolute_motion_event (seat, input_device, time_us, x, y, axes);
-
-  queue_event (event);
-}
-
-void
-clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
-                                  ClutterInputDevice *input_device,
-                                  uint64_t            time_us,
-                                  uint32_t            button,
-                                  uint32_t            state)
-{
-  ClutterInputDeviceEvdev *device_evdev = (ClutterInputDeviceEvdev *) input_device;
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-  gint button_nr;
-  static gint maskmap[8] =
-    {
-      CLUTTER_BUTTON1_MASK, CLUTTER_BUTTON3_MASK, CLUTTER_BUTTON2_MASK,
-      CLUTTER_BUTTON4_MASK, CLUTTER_BUTTON5_MASK, 0, 0, 0
-    };
-  int button_count;
-
-  /* Drop any repeated button press (for example from virtual devices. */
-  button_count = update_button_count (seat, button, state);
-  if (state && button_count > 1)
-    return;
-  if (!state && button_count != 0)
-    return;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (input_device);
-  if (stage == NULL)
-    return;
-
-  /* The evdev button numbers don't map sequentially to clutter button
-   * numbers (the right and middle mouse buttons are in the opposite
-   * order) so we'll map them directly with a switch statement */
-  switch (button)
-    {
-    case BTN_LEFT:
-    case BTN_TOUCH:
-      button_nr = CLUTTER_BUTTON_PRIMARY;
-      break;
-
-    case BTN_RIGHT:
-    case BTN_STYLUS:
-      button_nr = CLUTTER_BUTTON_SECONDARY;
-      break;
-
-    case BTN_MIDDLE:
-    case BTN_STYLUS2:
-      button_nr = CLUTTER_BUTTON_MIDDLE;
-      break;
-
-    default:
-      /* For compatibility reasons, all additional buttons go after the old 4-7 scroll ones */
-      if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
-        button_nr = button - BTN_TOOL_PEN + 4;
-      else
-        button_nr = button - (BTN_LEFT - 1) + 4;
-      break;
-    }
-
-  if (button_nr < 1 || button_nr > 12)
-    {
-      g_warning ("Unhandled button event 0x%x", button);
-      return;
-    }
-
-  if (state)
-    event = clutter_event_new (CLUTTER_BUTTON_PRESS);
-  else
-    event = clutter_event_new (CLUTTER_BUTTON_RELEASE);
-
-  if (button_nr < G_N_ELEMENTS (maskmap))
-    {
-      /* Update the modifiers */
-      if (state)
-        seat->button_state |= maskmap[button_nr - 1];
-      else
-        seat->button_state &= ~maskmap[button_nr - 1];
-    }
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->button.time = us2ms (time_us);
-  event->button.stage = CLUTTER_STAGE (stage);
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-  event->button.button = button_nr;
-
-  if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
-    {
-      ClutterPoint point;
-
-      clutter_input_device_get_coords (input_device, NULL, &point);
-      event->button.x = point.x;
-      event->button.y = point.y;
-    }
-  else
-    {
-      event->button.x = seat->pointer_x;
-      event->button.y = seat->pointer_y;
-    }
-
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-
-  if (device_evdev->last_tool)
-    {
-      /* Apply the button event code as per the tool mapping */
-      guint mapped_button;
-
-      mapped_button = clutter_input_device_tool_evdev_get_button_code (device_evdev->last_tool,
-                                                                       button_nr);
-      if (mapped_button != 0)
-        button = mapped_button;
-    }
-
-  _clutter_evdev_event_set_event_code (event, button);
-
-  if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
-    {
-      clutter_event_set_device_tool (event, device_evdev->last_tool);
-      clutter_event_set_device (event, input_device);
-    }
-  else
-    {
-      clutter_event_set_device (event, seat->core_pointer);
-    }
-
-  _clutter_input_device_set_stage (seat->core_pointer, stage);
-
-  queue_event (event);
-}
-
-void
-clutter_seat_evdev_free (ClutterSeatEvdev *seat)
-{
-  GSList *iter;
-
-  for (iter = seat->devices; iter; iter = g_slist_next (iter))
-    {
-      ClutterInputDevice *device = iter->data;
-
-      g_object_unref (device);
-    }
-  g_slist_free (seat->devices);
-  g_hash_table_unref (seat->touches);
-
-  xkb_state_unref (seat->xkb);
-
-  clutter_seat_evdev_clear_repeat_timer (seat);
-
-  if (seat->libinput_seat)
-    libinput_seat_unref (seat->libinput_seat);
-
-  g_free (seat);
-}
-
-void
-clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat,
-                              ClutterStage     *stage)
-{
-  GSList *l;
-
-  _clutter_input_device_set_stage (seat->core_pointer, stage);
-  _clutter_input_device_set_stage (seat->core_keyboard, stage);
-
-  for (l = seat->devices; l; l = l->next)
-    {
-      ClutterInputDevice *device = l->data;
-
-      _clutter_input_device_set_stage (device, stage);
-    }
-}

clutter/clutter/evdev/clutter-seat-evdev.h

@@ -1,132 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2010  Intel Corp.
- * Copyright (C) 2014  Jonas Ådahl
- * Copyright (C) 2016  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/>.
- *
- * Author: Damien Lespiau <damien.lespiau@intel.com>
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef __CLUTTER_SEAT_EVDEV_H__
-#define __CLUTTER_SEAT_EVDEV_H__
-
-#include <libinput.h>
-#include <linux/input.h>
-
-#include "clutter-input-device.h"
-#include "clutter-device-manager-evdev.h"
-#include "clutter-xkb-utils.h"
-
-typedef struct _ClutterTouchState ClutterTouchState;
-
-struct _ClutterTouchState
-{
-  guint32 id;
-  ClutterPoint coords;
-};
-
-struct _ClutterSeatEvdev
-{
-  struct libinput_seat *libinput_seat;
-  ClutterDeviceManagerEvdev *manager_evdev;
-
-  GSList *devices;
-
-  ClutterInputDevice *core_pointer;
-  ClutterInputDevice *core_keyboard;
-
-  GHashTable *touches;
-
-  struct xkb_state *xkb;
-  xkb_led_index_t caps_lock_led;
-  xkb_led_index_t num_lock_led;
-  xkb_led_index_t scroll_lock_led;
-  uint32_t button_state;
-  int button_count[KEY_CNT];
-
-  /* keyboard repeat */
-  gboolean repeat;
-  guint32 repeat_delay;
-  guint32 repeat_interval;
-  guint32 repeat_key;
-  guint32 repeat_count;
-  guint32 repeat_timer;
-  ClutterInputDevice *repeat_device;
-
-  gfloat pointer_x;
-  gfloat pointer_y;
-
-  /* Emulation of discrete scroll events out of smooth ones */
-  gfloat accum_scroll_dx;
-  gfloat accum_scroll_dy;
-};
-
-void clutter_seat_evdev_notify_key (ClutterSeatEvdev   *seat,
-                                    ClutterInputDevice *device,
-                                    uint64_t            time_us,
-                                    uint32_t            key,
-                                    uint32_t            state,
-                                    gboolean            update_keys);
-
-void clutter_seat_evdev_notify_relative_motion (ClutterSeatEvdev   *seat_evdev,
-                                                ClutterInputDevice *input_device,
-                                                uint64_t            time_us,
-                                                float               dx,
-                                                float               dy,
-                                                float               dx_unaccel,
-                                                float               dy_unaccel);
-
-void clutter_seat_evdev_notify_absolute_motion (ClutterSeatEvdev   *seat_evdev,
-                                                ClutterInputDevice *input_device,
-                                                uint64_t            time_us,
-                                                float               x,
-                                                float               y,
-                                                double             *axes);
-
-void clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
-                                       ClutterInputDevice *input_device,
-                                       uint64_t            time_us,
-                                       uint32_t            button,
-                                       uint32_t            state);
-
-void clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
-                                           struct libinput_seat *libinput_seat);
-
-void clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat);
-
-ClutterTouchState * clutter_seat_evdev_add_touch (ClutterSeatEvdev *seat,
-                                                  guint32           id);
-
-void clutter_seat_evdev_remove_touch (ClutterSeatEvdev *seat,
-                                      guint32           id);
-
-ClutterTouchState * clutter_seat_evdev_get_touch (ClutterSeatEvdev *seat,
-                                                  guint32           id);
-
-void clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat,
-                                   ClutterStage     *stage);
-
-void clutter_seat_evdev_clear_repeat_timer (ClutterSeatEvdev *seat);
-
-ClutterSeatEvdev * clutter_seat_evdev_new (ClutterDeviceManagerEvdev *manager_evdev);
-
-void clutter_seat_evdev_free (ClutterSeatEvdev *seat);
-
-#endif /* __CLUTTER_SEAT_EVDEV_H__ */

clutter/clutter/evdev/clutter-virtual-input-device-evdev.c

@@ -1,495 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2016  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/>.
- *
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "clutter-build-config.h"
-#endif
-
-#include <glib-object.h>
-#include <linux/input.h>
-
-#include "clutter-private.h"
-#include "clutter-virtual-input-device.h"
-#include "evdev/clutter-input-device-evdev.h"
-#include "evdev/clutter-seat-evdev.h"
-#include "evdev/clutter-virtual-input-device-evdev.h"
-
-enum
-{
-  PROP_0,
-
-  PROP_SEAT,
-
-  PROP_LAST
-};
-
-static GParamSpec *obj_props[PROP_LAST];
-
-struct _ClutterVirtualInputDeviceEvdev
-{
-  ClutterVirtualInputDevice parent;
-
-  ClutterInputDevice *device;
-  ClutterSeatEvdev *seat;
-  int button_count[KEY_CNT];
-};
-
-G_DEFINE_TYPE (ClutterVirtualInputDeviceEvdev,
-               clutter_virtual_input_device_evdev,
-               CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE)
-
-typedef enum _EvdevButtonType
-{
-  EVDEV_BUTTON_TYPE_NONE,
-  EVDEV_BUTTON_TYPE_KEY,
-  EVDEV_BUTTON_TYPE_BUTTON,
-} EvdevButtonType;
-
-static int
-update_button_count (ClutterVirtualInputDeviceEvdev *virtual_evdev,
-                     uint32_t                        button,
-                     uint32_t                        state)
-{
-  if (state)
-    return ++virtual_evdev->button_count[button];
-  else
-    return --virtual_evdev->button_count[button];
-}
-
-static EvdevButtonType
-get_button_type (uint16_t code)
-{
-  switch (code)
-    {
-    case BTN_TOOL_PEN:
-    case BTN_TOOL_RUBBER:
-    case BTN_TOOL_BRUSH:
-    case BTN_TOOL_PENCIL:
-    case BTN_TOOL_AIRBRUSH:
-    case BTN_TOOL_MOUSE:
-    case BTN_TOOL_LENS:
-    case BTN_TOOL_QUINTTAP:
-    case BTN_TOOL_DOUBLETAP:
-    case BTN_TOOL_TRIPLETAP:
-    case BTN_TOOL_QUADTAP:
-    case BTN_TOOL_FINGER:
-    case BTN_TOUCH:
-      return EVDEV_BUTTON_TYPE_NONE;
-    }
-
-  if (code >= KEY_ESC && code <= KEY_MICMUTE)
-    return EVDEV_BUTTON_TYPE_KEY;
-  if (code >= BTN_MISC && code <= BTN_GEAR_UP)
-    return EVDEV_BUTTON_TYPE_BUTTON;
-  if (code >= KEY_OK && code <= KEY_LIGHTS_TOGGLE)
-    return EVDEV_BUTTON_TYPE_KEY;
-  if (code >= BTN_DPAD_UP && code <= BTN_DPAD_RIGHT)
-    return EVDEV_BUTTON_TYPE_BUTTON;
-  if (code >= KEY_ALS_TOGGLE && code <= KEY_KBDINPUTASSIST_CANCEL)
-    return EVDEV_BUTTON_TYPE_KEY;
-  if (code >= BTN_TRIGGER_HAPPY && code <= BTN_TRIGGER_HAPPY40)
-    return EVDEV_BUTTON_TYPE_BUTTON;
-  return EVDEV_BUTTON_TYPE_NONE;
-}
-
-static void
-release_pressed_buttons (ClutterVirtualInputDevice *virtual_device)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  int code;
-  uint64_t time_us;
-
-  time_us = g_get_monotonic_time ();
-
-  for (code = 0; code < G_N_ELEMENTS (virtual_evdev->button_count); code++)
-    {
-      if (virtual_evdev->button_count[code] == 0)
-        continue;
-
-      switch (get_button_type (code))
-        {
-        case EVDEV_BUTTON_TYPE_KEY:
-          clutter_virtual_input_device_notify_key (virtual_device,
-                                                   time_us,
-                                                   code,
-                                                   CLUTTER_KEY_STATE_RELEASED);
-          break;
-        case EVDEV_BUTTON_TYPE_BUTTON:
-          clutter_virtual_input_device_notify_button (virtual_device,
-                                                      time_us,
-                                                      code,
-                                                      CLUTTER_BUTTON_STATE_RELEASED);
-          break;
-        case EVDEV_BUTTON_TYPE_NONE:
-          g_assert_not_reached ();
-        }
-    }
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_relative_motion (ClutterVirtualInputDevice *virtual_device,
-                                                           uint64_t                   time_us,
-                                                           double                     dx,
-                                                           double                     dy)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-
-  clutter_seat_evdev_notify_relative_motion (virtual_evdev->seat,
-                                             virtual_evdev->device,
-                                             time_us,
-                                             dx, dy,
-                                             dx, dy);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_absolute_motion (ClutterVirtualInputDevice *virtual_device,
-                                                           uint64_t                   time_us,
-                                                           double                     x,
-                                                           double                     y)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-
-  clutter_seat_evdev_notify_absolute_motion (virtual_evdev->seat,
-                                             virtual_evdev->device,
-                                             time_us,
-                                             x, y,
-                                             NULL);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_button (ClutterVirtualInputDevice *virtual_device,
-                                                  uint64_t                   time_us,
-                                                  uint32_t                   button,
-                                                  ClutterButtonState         button_state)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  int button_count;
-
-  if (get_button_type (button) != EVDEV_BUTTON_TYPE_BUTTON)
-    {
-      g_warning ("Unknown/invalid virtual device button 0x%x pressed",
-                 button);
-      return;
-    }
-
-  button_count = update_button_count (virtual_evdev, button, button_state);
-  if (button_count < 0 || button_count > 1)
-    {
-      g_warning ("Received multiple virtual 0x%x button %s (ignoring)", button,
-                 button_state == CLUTTER_BUTTON_STATE_PRESSED ? "presses" : "releases");
-      update_button_count (virtual_evdev, button, 1 - button_state);
-      return;
-    }
-
-  clutter_seat_evdev_notify_button (virtual_evdev->seat,
-                                    virtual_evdev->device,
-                                    time_us,
-                                    button,
-                                    button_state);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_key (ClutterVirtualInputDevice *virtual_device,
-                                               uint64_t                   time_us,
-                                               uint32_t                   key,
-                                               ClutterKeyState            key_state)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  int key_count;
-
-  if (get_button_type (key) != EVDEV_BUTTON_TYPE_KEY)
-    {
-      g_warning ("Unknown/invalid virtual device key 0x%x pressed\n", key);
-      return;
-    }
-
-  key_count = update_button_count (virtual_evdev, key, key_state);
-  if (key_count < 0 || key_count > 1)
-    {
-      g_warning ("Received multiple virtual 0x%x key %s (ignoring)", key,
-		 key_state == CLUTTER_KEY_STATE_PRESSED ? "presses" : "releases");
-      update_button_count (virtual_evdev, key, 1 - key_state);
-      return;
-    }
-
-  clutter_seat_evdev_notify_key (virtual_evdev->seat,
-                                 virtual_evdev->device,
-                                 time_us,
-                                 key,
-                                 key_state,
-                                 TRUE);
-}
-
-static gboolean
-pick_keycode_for_keyval_in_current_group (ClutterVirtualInputDevice *virtual_device,
-                                          guint                      keyval,
-                                          guint                     *keycode_out,
-                                          guint                     *level_out)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  ClutterDeviceManager *manager;
-  struct xkb_keymap *xkb_keymap;
-  struct xkb_state  *state;
-  guint keycode, layout;
-  xkb_keycode_t min_keycode, max_keycode;
-
-  manager = clutter_virtual_input_device_get_manager (virtual_device);
-  xkb_keymap = _clutter_device_manager_evdev_get_keymap (CLUTTER_DEVICE_MANAGER_EVDEV (manager));
-  state = virtual_evdev->seat->xkb;
-
-  layout = xkb_state_serialize_layout (state, XKB_STATE_LAYOUT_EFFECTIVE);
-  min_keycode = xkb_keymap_min_keycode (xkb_keymap);
-  max_keycode = xkb_keymap_max_keycode (xkb_keymap);
-  for (keycode = min_keycode; keycode < max_keycode; keycode++)
-    {
-      gint num_levels, level;
-      num_levels = xkb_keymap_num_levels_for_key (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 (xkb_keymap, keycode, layout, level, &syms);
-          for (sym = 0; sym < num_syms; sym++)
-            {
-              if (syms[sym] == keyval)
-                {
-                  *keycode_out = keycode;
-                  if (level_out)
-                    *level_out = level;
-                  return TRUE;
-                }
-            }
-        }
-    }
-
-  return FALSE;
-}
-
-static void
-apply_level_modifiers (ClutterVirtualInputDevice *virtual_device,
-                       uint64_t                   time_us,
-                       uint32_t                   level,
-                       uint32_t                   key_state)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  guint keysym, keycode, evcode;
-
-  if (level == 0)
-    return;
-
-  if (level == 1)
-    {
-      keysym = XKB_KEY_Shift_L;
-    }
-  else if (level == 2)
-    {
-      keysym = XKB_KEY_ISO_Level3_Shift;
-    }
-  else
-    {
-      g_warning ("Unhandled level: %d\n", level);
-      return;
-    }
-
-  if (!pick_keycode_for_keyval_in_current_group (virtual_device, keysym,
-                                                 &keycode, NULL))
-    return;
-
-  clutter_input_device_keycode_to_evdev (virtual_evdev->device,
-                                         keycode, &evcode);
-  clutter_seat_evdev_notify_key (virtual_evdev->seat,
-                                 virtual_evdev->device,
-                                 time_us,
-                                 evcode,
-                                 key_state,
-                                 TRUE);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_keyval (ClutterVirtualInputDevice *virtual_device,
-                                                  uint64_t                   time_us,
-                                                  uint32_t                   keyval,
-                                                  ClutterKeyState            key_state)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  int key_count;
-  guint keycode = 0, level = 0, evcode = 0;
-
-  if (!pick_keycode_for_keyval_in_current_group (virtual_device,
-                                                 keyval, &keycode, &level))
-    {
-      g_warning ("No keycode found for keyval %x in current group", keyval);
-      return;
-    }
-
-  clutter_input_device_keycode_to_evdev (virtual_evdev->device,
-                                         keycode, &evcode);
-
-  if (get_button_type (evcode) != EVDEV_BUTTON_TYPE_KEY)
-    {
-      g_warning ("Unknown/invalid virtual device key 0x%x pressed\n", evcode);
-      return;
-    }
-
-  key_count = update_button_count (virtual_evdev, evcode, key_state);
-  if (key_count < 0 || key_count > 1)
-    {
-      g_warning ("Received multiple virtual 0x%x key %s (ignoring)", keycode,
-		 key_state == CLUTTER_KEY_STATE_PRESSED ? "presses" : "releases");
-      update_button_count (virtual_evdev, evcode, 1 - key_state);
-      return;
-    }
-
-  if (key_state)
-    apply_level_modifiers (virtual_device, time_us, level, key_state);
-
-  clutter_seat_evdev_notify_key (virtual_evdev->seat,
-                                 virtual_evdev->device,
-                                 time_us,
-                                 evcode,
-                                 key_state,
-                                 TRUE);
-
-  if (!key_state)
-    apply_level_modifiers (virtual_device, time_us, level, key_state);
-}
-
-static void
-clutter_virtual_input_device_evdev_get_property (GObject    *object,
-                                                 guint       prop_id,
-                                                 GValue     *value,
-                                                 GParamSpec *pspec)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (object);
-
-  switch (prop_id)
-    {
-    case PROP_SEAT:
-      g_value_set_pointer (value, virtual_evdev->seat);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_virtual_input_device_evdev_set_property (GObject      *object,
-                                                 guint         prop_id,
-                                                 const GValue *value,
-                                                 GParamSpec   *pspec)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (object);
-
-  switch (prop_id)
-    {
-    case PROP_SEAT:
-      virtual_evdev->seat = g_value_get_pointer (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_virtual_input_device_evdev_constructed (GObject *object)
-{
-  ClutterVirtualInputDevice *virtual_device =
-    CLUTTER_VIRTUAL_INPUT_DEVICE (object);
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (object);
-  ClutterDeviceManager *manager;
-  ClutterInputDeviceType device_type;
-  ClutterStage *stage;
-
-  manager = clutter_virtual_input_device_get_manager (virtual_device);
-  device_type = clutter_virtual_input_device_get_device_type (virtual_device);
-
-  virtual_evdev->device =
-    _clutter_input_device_evdev_new_virtual (manager,
-                                             virtual_evdev->seat,
-                                             device_type,
-                                             CLUTTER_INPUT_MODE_SLAVE);
-
-  stage = _clutter_device_manager_evdev_get_stage (CLUTTER_DEVICE_MANAGER_EVDEV (manager));
-  _clutter_input_device_set_stage (virtual_evdev->device, stage);
-}
-
-static void
-clutter_virtual_input_device_evdev_finalize (GObject *object)
-{
-  ClutterVirtualInputDevice *virtual_device =
-    CLUTTER_VIRTUAL_INPUT_DEVICE (object);
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (object);
-  GObjectClass *object_class;
-
-  release_pressed_buttons (virtual_device);
-  g_clear_object (&virtual_evdev->device);
-
-  object_class =
-    G_OBJECT_CLASS (clutter_virtual_input_device_evdev_parent_class);
-  object_class->finalize (object);
-}
-
-static void
-clutter_virtual_input_device_evdev_init (ClutterVirtualInputDeviceEvdev *virtual_device_evdev)
-{
-}
-
-static void
-clutter_virtual_input_device_evdev_class_init (ClutterVirtualInputDeviceEvdevClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  ClutterVirtualInputDeviceClass *virtual_input_device_class =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_CLASS (klass);
-
-  object_class->get_property = clutter_virtual_input_device_evdev_get_property;
-  object_class->set_property = clutter_virtual_input_device_evdev_set_property;
-  object_class->constructed = clutter_virtual_input_device_evdev_constructed;
-  object_class->finalize = clutter_virtual_input_device_evdev_finalize;
-
-  virtual_input_device_class->notify_relative_motion = clutter_virtual_input_device_evdev_notify_relative_motion;
-  virtual_input_device_class->notify_absolute_motion = clutter_virtual_input_device_evdev_notify_absolute_motion;
-  virtual_input_device_class->notify_button = clutter_virtual_input_device_evdev_notify_button;
-  virtual_input_device_class->notify_key = clutter_virtual_input_device_evdev_notify_key;
-  virtual_input_device_class->notify_keyval = clutter_virtual_input_device_evdev_notify_keyval;
-
-  obj_props[PROP_SEAT] = g_param_spec_pointer ("seat",
-                                               P_("ClutterSeatEvdev"),
-                                               P_("ClutterSeatEvdev"),
-                                               CLUTTER_PARAM_READWRITE |
-                                               G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_properties (object_class, PROP_LAST, obj_props);
-}

clutter/clutter/evdev/clutter-virtual-input-device-evdev.h

@@ -1,35 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2016  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/>.
- *
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef __CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV_H__
-#define __CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV_H__
-
-#include "clutter-virtual-input-device.h"
-
-#define CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE_EVDEV (clutter_virtual_input_device_evdev_get_type ())
-G_DECLARE_FINAL_TYPE (ClutterVirtualInputDeviceEvdev,
-                      clutter_virtual_input_device_evdev,
-                      CLUTTER, VIRTUAL_INPUT_DEVICE_EVDEV,
-                      ClutterVirtualInputDevice)
-
-#endif /* __CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV_H__ */

clutter/clutter/mutter-clutter.pc.in

@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@/mutter
 includedir=@includedir@/mutter
 
-apiversion=@LIBMUTTER_API_VERSION@
+apiversion=@CLUTTER_API_VERSION@
-requires=@CLUTTER_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@CLUTTER_REQUIRES@ mutter-cogl-1.0
 requires_private=@CLUTTER_REQUIRES_PRIVATE@
 backends=@CLUTTER_BACKENDS@
 
@@ -17,7 +17,7 @@ cogl_driver=deprecated
 
 Name: Mutter Clutter
 Description: Mutter's Clutter Private Library
-Version: @MUTTER_VERSION@
+Version: @VERSION@
 Libs: -L${libdir} -lmutter-clutter-${apiversion}
 Cflags: -I${includedir}/clutter-${apiversion}
 Requires: ${requires}

clutter/clutter/x11/clutter-device-manager-core-x11.c

@@ -28,7 +28,6 @@
 #include "clutter-backend-x11.h"
 #include "clutter-input-device-core-x11.h"
 #include "clutter-stage-x11.h"
-#include "clutter-virtual-input-device-x11.h"
 
 #include "clutter-backend.h"
 #include "clutter-debug.h"
@@ -136,6 +135,7 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
   ClutterTranslateReturn res;
   ClutterStage *stage;
   XEvent *xevent;
+  int window_scale;
 
   manager_x11 = CLUTTER_DEVICE_MANAGER_X11 (translator);
   backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
@@ -151,6 +151,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
   stage_x11 = CLUTTER_STAGE_X11 (_clutter_stage_get_window (stage));
 
+  window_scale = stage_x11->scale_factor;
+
   event->any.stage = stage;
 
   res = CLUTTER_TRANSLATE_CONTINUE;
@@ -223,8 +225,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
             event->scroll.direction = CLUTTER_SCROLL_RIGHT;
 
           event->scroll.time = xevent->xbutton.time;
-          event->scroll.x = xevent->xbutton.x;
+          event->scroll.x = xevent->xbutton.x / window_scale;
-          event->scroll.y = xevent->xbutton.y;
+          event->scroll.y = xevent->xbutton.y / window_scale;
           event->scroll.modifier_state = xevent->xbutton.state;
           event->scroll.axes = NULL;
           break;
@@ -232,8 +234,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
         default:
           event->button.type = event->type = CLUTTER_BUTTON_PRESS;
           event->button.time = xevent->xbutton.time;
-          event->button.x = xevent->xbutton.x;
+          event->button.x = xevent->xbutton.x / window_scale;
-          event->button.y = xevent->xbutton.y;
+          event->button.y = xevent->xbutton.y / window_scale;
           event->button.modifier_state = xevent->xbutton.state;
           event->button.button = xevent->xbutton.button;
           event->button.axes = NULL;
@@ -266,8 +268,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->button.type = event->type = CLUTTER_BUTTON_RELEASE;
       event->button.time = xevent->xbutton.time;
-      event->button.x = xevent->xbutton.x;
+      event->button.x = xevent->xbutton.x / window_scale;
-      event->button.y = xevent->xbutton.y;
+      event->button.y = xevent->xbutton.y / window_scale;
       event->button.modifier_state = xevent->xbutton.state;
       event->button.button = xevent->xbutton.button;
       event->button.axes = NULL;
@@ -284,8 +286,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->motion.type = event->type = CLUTTER_MOTION;
       event->motion.time = xevent->xmotion.time;
-      event->motion.x = xevent->xmotion.x;
+      event->motion.x = xevent->xmotion.x / window_scale;
-      event->motion.y = xevent->xmotion.y;
+      event->motion.y = xevent->xmotion.y / window_scale;
       event->motion.modifier_state = xevent->xmotion.state;
       event->motion.axes = NULL;
       clutter_event_set_device (event, manager_x11->core_pointer);
@@ -298,8 +300,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->crossing.type = CLUTTER_ENTER;
       event->crossing.time = xevent->xcrossing.time;
-      event->crossing.x = xevent->xcrossing.x;
+      event->crossing.x = xevent->xcrossing.x / window_scale;
-      event->crossing.y = xevent->xcrossing.y;
+      event->crossing.y = xevent->xcrossing.y / window_scale;
       event->crossing.source = CLUTTER_ACTOR (stage);
       event->crossing.related = NULL;
       clutter_event_set_device (event, manager_x11->core_pointer);
@@ -324,8 +326,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->crossing.type = CLUTTER_LEAVE;
       event->crossing.time = xevent->xcrossing.time;
-      event->crossing.x = xevent->xcrossing.x;
+      event->crossing.x = xevent->xcrossing.x / window_scale;
-      event->crossing.y = xevent->xcrossing.y;
+      event->crossing.y = xevent->xcrossing.y / window_scale;
       event->crossing.source = CLUTTER_ACTOR (stage);
       event->crossing.related = NULL;
       clutter_event_set_device (event, manager_x11->core_pointer);
@@ -478,13 +480,6 @@ clutter_device_manager_x11_get_device (ClutterDeviceManager *manager,
                               GINT_TO_POINTER (id));
 }
 
-static ClutterVirtualInputDevice *
-clutter_device_manager_x11_create_virtual_device (ClutterDeviceManager  *device_manager,
-                                                  ClutterInputDeviceType device_type)
-{
-  return g_object_new (CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE_X11, NULL);
-}
-
 static void
 clutter_device_manager_x11_set_property (GObject      *gobject,
                                          guint         prop_id,
@@ -531,7 +526,6 @@ clutter_device_manager_x11_class_init (ClutterDeviceManagerX11Class *klass)
   manager_class->get_devices = clutter_device_manager_x11_get_devices;
   manager_class->get_core_device = clutter_device_manager_x11_get_core_device;
   manager_class->get_device = clutter_device_manager_x11_get_device;
-  manager_class->create_virtual_device = clutter_device_manager_x11_create_virtual_device;
 }
 
 static void

clutter/clutter/x11/clutter-device-manager-xi2.c

@@ -29,8 +29,6 @@
 
 #include "clutter-backend-x11.h"
 #include "clutter-input-device-xi2.h"
-#include "clutter-input-device-tool-xi2.h"
-#include "clutter-virtual-input-device-x11.h"
 #include "clutter-stage-x11.h"
 
 #include "clutter-backend.h"
@@ -396,8 +394,6 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
         source = CLUTTER_ERASER_DEVICE;
       else if (strstr (name, "cursor") != NULL)
         source = CLUTTER_CURSOR_DEVICE;
-      else if (strstr (name, " pad") != NULL)
-        source = CLUTTER_PAD_DEVICE;
       else if (strstr (name, "wacom") != NULL || strstr (name, "pen") != NULL)
         source = CLUTTER_PEN_DEVICE;
       else if (strstr (name, "touchpad") != NULL)
@@ -464,46 +460,6 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
   return retval;
 }
 
-static void
-pad_passive_button_grab (ClutterInputDevice *device)
-{
-  XIGrabModifiers xi_grab_mods = { XIAnyModifier, };
-  XIEventMask xi_event_mask;
-  gint device_id, rc;
-
-  device_id = clutter_input_device_get_device_id (device);
-
-  xi_event_mask.deviceid = device_id;
-  xi_event_mask.mask_len = XIMaskLen (XI_LASTEVENT);
-  xi_event_mask.mask = g_new0 (unsigned char, xi_event_mask.mask_len);
-
-  XISetMask (xi_event_mask.mask, XI_Motion);
-  XISetMask (xi_event_mask.mask, XI_ButtonPress);
-  XISetMask (xi_event_mask.mask, XI_ButtonRelease);
-
-  clutter_x11_trap_x_errors ();
-  rc = XIGrabButton (clutter_x11_get_default_display (),
-                     device_id, XIAnyButton,
-                     clutter_x11_get_root_window (), None,
-                     XIGrabModeSync, XIGrabModeSync,
-                     True, &xi_event_mask, 1, &xi_grab_mods);
-  if (rc != 0)
-    {
-      g_warning ("Could not passively grab pad device: %s",
-                 clutter_input_device_get_device_name (device));
-    }
-  else
-    {
-      XIAllowEvents (clutter_x11_get_default_display (),
-                     device_id, XIAsyncDevice,
-                     CLUTTER_CURRENT_TIME);
-    }
-
-  clutter_x11_untrap_x_errors ();
-
-  g_free (xi_event_mask.mask);
-}
-
 static ClutterInputDevice *
 add_device (ClutterDeviceManagerXI2 *manager_xi2,
             ClutterBackendX11       *backend_x11,
@@ -538,9 +494,6 @@ add_device (ClutterDeviceManagerXI2 *manager_xi2,
     g_warning ("Unhandled device: %s",
                clutter_input_device_get_device_name (device));
 
-  if (clutter_input_device_get_device_type (device) == CLUTTER_PAD_DEVICE)
-    pad_passive_button_grab (device);
-
   /* relationships between devices and signal emissions are not
    * necessary while we're constructing the device manager instance
    */
@@ -861,8 +814,8 @@ translate_coords (ClutterStageX11 *stage_x11,
 
   clutter_actor_get_size (stage, &stage_width, &stage_height);
 
-  *x_out = CLAMP (event_x, 0, stage_width);
+  *x_out = CLAMP (event_x / stage_x11->scale_factor, 0, stage_width);
-  *y_out = CLAMP (event_y, 0, stage_height);
+  *y_out = CLAMP (event_y / stage_x11->scale_factor, 0, stage_height);
 }
 
 static gdouble
@@ -953,78 +906,6 @@ clutter_device_manager_xi2_select_stage_events (ClutterDeviceManager *manager,
   g_free (mask);
 }
 
-static guint
-device_get_tool_serial (ClutterBackendX11  *backend_x11,
-                        ClutterInputDevice *device)
-{
-  gulong nitems, bytes_after;
-  guint32 *data = NULL;
-  guint serial_id = 0;
-  int rc, format;
-  Atom type;
-  Atom prop;
-
-  prop = XInternAtom (backend_x11->xdpy, "Wacom Serial IDs", True);
-  if (prop == None)
-    return 0;
-
-  clutter_x11_trap_x_errors ();
-  rc = XIGetProperty (backend_x11->xdpy,
-                      clutter_input_device_get_device_id (device),
-                      prop, 0, 4, FALSE, XA_INTEGER, &type, &format, &nitems, &bytes_after,
-                      (guchar **) &data);
-  clutter_x11_untrap_x_errors ();
-
-  if (rc == Success && type == XA_INTEGER && format == 32 && nitems >= 4)
-    serial_id = data[3];
-
-  XFree (data);
-
-  return serial_id;
-}
-
-static void
-handle_property_event (ClutterDeviceManagerXI2 *manager_xi2,
-                       XIEvent                 *event)
-{
-  XIPropertyEvent *xev = (XIPropertyEvent *) event;
-  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
-  Atom serial_ids_prop = XInternAtom (backend_x11->xdpy, "Wacom Serial IDs", True);
-  ClutterInputDevice *device;
-
-  device = g_hash_table_lookup (manager_xi2->devices_by_id,
-                                GINT_TO_POINTER (xev->deviceid));
-  if (!device)
-    return;
-
-  if (xev->property == serial_ids_prop)
-    {
-      ClutterInputDeviceTool *tool = NULL;
-      ClutterInputDeviceToolType type;
-      guint serial_id;
-
-      serial_id = device_get_tool_serial (backend_x11, device);
-
-      if (serial_id != 0)
-        {
-          tool = g_hash_table_lookup (manager_xi2->tools_by_serial,
-                                      GUINT_TO_POINTER (serial_id));
-          if (!tool)
-            {
-              type = clutter_input_device_get_device_type (device) == CLUTTER_ERASER_DEVICE ?
-                CLUTTER_INPUT_DEVICE_TOOL_ERASER : CLUTTER_INPUT_DEVICE_TOOL_PEN;
-              tool = clutter_input_device_tool_xi2_new (serial_id, type);
-              g_hash_table_insert (manager_xi2->tools_by_serial,
-                                   GUINT_TO_POINTER (serial_id),
-                                   tool);
-            }
-        }
-
-      clutter_input_device_xi2_update_tool (device, tool);
-      g_signal_emit_by_name (manager_xi2, "tool-changed", device, tool);
-    }
-}
-
 static ClutterTranslateReturn
 clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                                             gpointer                native,
@@ -1056,8 +937,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
     return CLUTTER_TRANSLATE_REMOVE;
 
   if (!(xi_event->evtype == XI_HierarchyChanged ||
-        xi_event->evtype == XI_DeviceChanged ||
+        xi_event->evtype == XI_DeviceChanged))
-        xi_event->evtype == XI_PropertyEvent))
     {
       stage = get_event_stage (translator, xi_event);
       if (stage == NULL || CLUTTER_ACTOR_IN_DESTRUCTION (stage))
@@ -1198,50 +1078,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
             stage != NULL)
           _clutter_input_device_set_stage (device, stage);
 
-	if (clutter_input_device_get_device_type (source_device) == CLUTTER_PAD_DEVICE)
-          {
-            /* We got these events because of the passive button grab */
-            XIAllowEvents (clutter_x11_get_default_display (),
-                           xev->sourceid,
-                           XIAsyncDevice,
-                           xev->time);
-
-	    /* Ignore 4-7 buttons */
-            if (xev->detail >= 4 && xev->detail <= 7)
-              return CLUTTER_TRANSLATE_REMOVE;
-
-            event->pad_button.type =
-              (xi_event->evtype == XI_ButtonPress) ? CLUTTER_PAD_BUTTON_PRESS
-                                                   : CLUTTER_PAD_BUTTON_RELEASE;
-            event->pad_button.time = xev->time;
-            event->pad_button.stage = stage;
-
-            /* The 4-7 button range is taken as non-existent on pad devices,
-             * let the buttons above that take over this range.
-             */
-            if (xev->detail > 7)
-              xev->detail -= 4;
-
-            /* Pad buttons are 0-indexed */
-            event->pad_button.button = xev->detail - 1;
-            clutter_event_set_source_device (event, source_device);
-
-            CLUTTER_NOTE (EVENT,
-                          "%s: win:0x%x, device:%d '%s', time:%d "
-                          "(button:%d)",
-                          event->any.type == CLUTTER_BUTTON_PRESS
-                            ? "pad button press  "
-                            : "pad button release",
-                          (unsigned int) stage_x11->xwin,
-                          device->id,
-                          device->device_name,
-                          event->any.time,
-                          event->pad_button.button);
-
-            retval = CLUTTER_TRANSLATE_QUEUE;
-            break;
-          }
-
         switch (xev->detail)
           {
           case 4:
@@ -1321,8 +1157,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
 
             clutter_event_set_source_device (event, source_device);
             clutter_event_set_device (event, device);
-            clutter_event_set_device_tool (event,
-                                           clutter_input_device_xi2_get_current_tool (source_device));
 
             event->button.axes = translate_axes (event->button.device,
                                                  event->button.x,
@@ -1431,8 +1265,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
 
         clutter_event_set_source_device (event, source_device);
         clutter_event_set_device (event, device);
-        clutter_event_set_device_tool (event,
-                                       clutter_input_device_xi2_get_current_tool (source_device));
 
         event->motion.axes = translate_axes (event->motion.device,
                                              event->motion.x,
@@ -1634,10 +1466,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
     case XI_FocusOut:
       retval = CLUTTER_TRANSLATE_CONTINUE;
       break;
-    case XI_PropertyEvent:
-      handle_property_event (manager_xi2, xi_event);
-      retval = CLUTTER_TRANSLATE_CONTINUE;
-      break;
     }
 
   return retval;
@@ -1815,7 +1643,6 @@ clutter_device_manager_xi2_constructed (GObject *gobject)
 
   XISetMask (mask, XI_HierarchyChanged);
   XISetMask (mask, XI_DeviceChanged);
-  XISetMask (mask, XI_PropertyEvent);
 
   event_mask.deviceid = XIAllDevices;
   event_mask.mask_len = sizeof (mask);
@@ -1851,16 +1678,6 @@ clutter_device_manager_xi2_set_property (GObject      *gobject,
     }
 }
 
-static ClutterVirtualInputDevice *
-clutter_device_manager_xi2_create_virtual_device (ClutterDeviceManager   *manager,
-                                                  ClutterInputDeviceType  device_type)
-{
-  return g_object_new (CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE_X11,
-                       "device-manager", manager,
-                       "device-type", device_type,
-                       NULL);
-}
-
 static void
 clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
 {
@@ -1888,7 +1705,6 @@ clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
   manager_class->get_core_device = clutter_device_manager_xi2_get_core_device;
   manager_class->get_device = clutter_device_manager_xi2_get_device;
   manager_class->select_stage_events = clutter_device_manager_xi2_select_stage_events;
-  manager_class->create_virtual_device = clutter_device_manager_xi2_create_virtual_device;
 }
 
 static void
@@ -1897,6 +1713,4 @@ clutter_device_manager_xi2_init (ClutterDeviceManagerXI2 *self)
   self->devices_by_id = g_hash_table_new_full (NULL, NULL,
                                                NULL,
                                                (GDestroyNotify) g_object_unref);
-  self->tools_by_serial = g_hash_table_new_full (NULL, NULL, NULL,
-                                                 (GDestroyNotify) g_object_unref);
 }

clutter/clutter/x11/clutter-device-manager-xi2.h

@@ -43,7 +43,6 @@ struct _ClutterDeviceManagerXI2
   ClutterDeviceManager parent_instance;
 
   GHashTable *devices_by_id;
-  GHashTable *tools_by_serial;
 
   GSList *all_devices;
 

clutter/clutter/x11/clutter-input-device-tool-xi2.c

@@ -1,51 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright © 2016 Red Hat
- *
- * 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/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "clutter-build-config.h"
-#endif
-
-#include "clutter-input-device-tool-xi2.h"
-
-G_DEFINE_TYPE (ClutterInputDeviceToolXI2, clutter_input_device_tool_xi2,
-               CLUTTER_TYPE_INPUT_DEVICE_TOOL)
-
-static void
-clutter_input_device_tool_xi2_class_init (ClutterInputDeviceToolXI2Class *klass)
-{
-}
-
-static void
-clutter_input_device_tool_xi2_init (ClutterInputDeviceToolXI2 *tool)
-{
-}
-
-ClutterInputDeviceTool *
-clutter_input_device_tool_xi2_new (guint                        serial,
-                                   ClutterInputDeviceToolType   type)
-{
-  return g_object_new (CLUTTER_TYPE_INPUT_DEVICE_TOOL_XI2,
-                       "type", type,
-                       "serial", serial,
-                       NULL);
-}

clutter/clutter/x11/clutter-input-device-tool-xi2.h

@@ -1,74 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright © 2016 Red Hat
- *
- * 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/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_DEVICE_XI2_TOOL_H__
-#define __CLUTTER_INPUT_DEVICE_XI2_TOOL_H__
-
-#include <clutter/clutter-input-device-tool.h>
-
-G_BEGIN_DECLS
-
-#define CLUTTER_TYPE_INPUT_DEVICE_TOOL_XI2 (clutter_input_device_tool_xi2_get_type ())
-
-#define CLUTTER_INPUT_DEVICE_TOOL_XI2(o) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-  CLUTTER_TYPE_INPUT_DEVICE_TOOL_XI2, ClutterInputDeviceToolXI2))
-
-#define CLUTTER_IS_INPUT_DEVICE_TOOL_XI2(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-  CLUTTER_TYPE_INPUT_DEVICE_TOOL_XI2))
-
-#define CLUTTER_INPUT_DEVICE_TOOL_XI2_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_CAST ((c), \
-  CLUTTER_TYPE_INPUT_DEVICE_TOOL_XI2, ClutterInputDeviceToolXI2Class))
-
-#define CLUTTER_IS_INPUT_DEVICE_TOOL_XI2_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_TYPE ((c), \
-  CLUTTER_TYPE_INPUT_DEVICE_TOOL_XI2))
-
-#define CLUTTER_INPUT_DEVICE_TOOL_XI2_GET_CLASS(o) \
-  (G_TYPE_INSTANCE_GET_CLASS ((o), \
-  CLUTTER_TYPE_INPUT_DEVICE_TOOL_XI2, ClutterInputDeviceToolXI2Class))
-
-typedef struct _ClutterInputDeviceToolXI2 ClutterInputDeviceToolXI2;
-typedef struct _ClutterInputDeviceToolXI2Class ClutterInputDeviceToolXI2Class;
-
-struct _ClutterInputDeviceToolXI2
-{
-  ClutterInputDeviceTool parent_instance;
-  struct libinput_tablet_tool *tool;
-};
-
-struct _ClutterInputDeviceToolXI2Class
-{
-  ClutterInputDeviceToolClass parent_class;
-};
-
-GType                    clutter_input_device_tool_xi2_get_type  (void) G_GNUC_CONST;
-
-ClutterInputDeviceTool * clutter_input_device_tool_xi2_new       (guint                        serial,
-                                                                  ClutterInputDeviceToolType   type);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_INPUT_DEVICE_XI2_TOOL_H__ */

clutter/clutter/x11/clutter-input-device-xi2.c

@@ -44,7 +44,6 @@ struct _ClutterInputDeviceXI2
   ClutterInputDevice device;
 
   gint device_id;
-  ClutterInputDeviceTool *current_tool;
 };
 
 #define N_BUTTONS       5
@@ -80,13 +79,6 @@ clutter_input_device_xi2_keycode_to_evdev (ClutterInputDevice *device,
   return TRUE;
 }
 
-static gboolean
-clutter_input_device_xi2_is_grouped (ClutterInputDevice *device,
-                                     ClutterInputDevice *other_device)
-{
-  return FALSE;
-}
-
 static void
 clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
 {
@@ -96,7 +88,6 @@ clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
   gobject_class->constructed = clutter_input_device_xi2_constructed;
 
   device_class->keycode_to_evdev = clutter_input_device_xi2_keycode_to_evdev;
-  device_class->is_grouped = clutter_input_device_xi2_is_grouped;
 }
 
 static void
@@ -181,18 +172,3 @@ _clutter_input_device_xi2_translate_state (ClutterEvent    *event,
 
   _clutter_event_set_state_full (event, button, base, latched, locked, effective);
 }
-
-void
-clutter_input_device_xi2_update_tool (ClutterInputDevice     *device,
-                                      ClutterInputDeviceTool *tool)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-  g_set_object (&device_xi2->current_tool, tool);
-}
-
-ClutterInputDeviceTool *
-clutter_input_device_xi2_get_current_tool (ClutterInputDevice *device)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-  return device_xi2->current_tool;
-}

clutter/clutter/x11/clutter-input-device-xi2.h

@@ -41,9 +41,6 @@ void  _clutter_input_device_xi2_translate_state (ClutterEvent    *event,
 						 XIModifierState *modifiers_state,
 						 XIButtonState   *buttons_state,
 						 XIGroupState    *group_state);
-void  clutter_input_device_xi2_update_tool      (ClutterInputDevice     *device,
-                                                 ClutterInputDeviceTool *tool);
-ClutterInputDeviceTool * clutter_input_device_xi2_get_current_tool (ClutterInputDevice *device);
 
 G_END_DECLS
 

clutter/clutter/x11/clutter-settings-x11.h

@@ -6,6 +6,7 @@ static const struct {
   const char *xsetting_name;
   const char *settings_property;
 } _clutter_settings_map[] = {
+  { "Net/DoubleClickTime",     "double-click-time" },
   { "Net/DoubleClickDistance", "double-click-distance" },
   { "Net/DndDragThreshold",    "dnd-drag-threshold" },
   { "Gtk/FontName",            "font-name" },
@@ -15,6 +16,7 @@ static const struct {
   { "Xft/HintStyle",           "font-hint-style" },
   { "Xft/RGBA",                "font-subpixel-order" },
   { "Fontconfig/Timestamp",    "fontconfig-timestamp" },
+  { "Gdk/WindowScalingFactor", "window-scaling-factor" },
   { "Gdk/UnscaledDPI",         "unscaled-font-dpi" },
 };
 

clutter/clutter/x11/clutter-stage-x11.c

@@ -162,10 +162,10 @@ clutter_stage_x11_fix_window_size (ClutterStageX11 *stage_x11,
                                       &min_height);
 
       if (new_width <= 0)
-        new_width = min_width;
+        new_width = min_width * stage_x11->scale_factor;
 
       if (new_height <= 0)
-        new_height = min_height;
+        new_height = min_height * stage_x11->scale_factor;
 
       size_hints->flags = 0;
 
@@ -175,8 +175,8 @@ clutter_stage_x11_fix_window_size (ClutterStageX11 *stage_x11,
         {
           if (resize)
             {
-              size_hints->min_width = min_width;
+              size_hints->min_width = min_width * stage_x11->scale_factor;
-              size_hints->min_height = min_height;
+              size_hints->min_height = min_height * stage_x11->scale_factor;
               size_hints->flags = PMinSize;
             }
           else
@@ -236,8 +236,8 @@ clutter_stage_x11_get_geometry (ClutterStageWindow    *stage_window,
       return;
     }
 
-  geometry->width = stage_x11->xwin_width;
+  geometry->width = stage_x11->xwin_width / stage_x11->scale_factor;
-  geometry->height = stage_x11->xwin_height;
+  geometry->height = stage_x11->xwin_height / stage_x11->scale_factor;
 }
 
 static void
@@ -255,8 +255,8 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
        * so we need to manually set the size and queue a relayout on the
        * stage here (as is normally done in response to ConfigureNotify).
        */
-      stage_x11->xwin_width = width;
+      stage_x11->xwin_width = width * stage_x11->scale_factor;
-      stage_x11->xwin_height = height;
+      stage_x11->xwin_height = height * stage_x11->scale_factor;
       clutter_actor_queue_relayout (CLUTTER_ACTOR (stage_cogl->wrapper));
       return;
     }
@@ -277,6 +277,9 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
 
   CLUTTER_NOTE (BACKEND, "New size received: (%d, %d)", width, height);
 
+  width *= stage_x11->scale_factor;
+  height *= stage_x11->scale_factor;
+
   if (stage_x11->xwin != None)
     {
       clutter_stage_x11_fix_window_size (stage_x11, width, height);
@@ -397,6 +400,20 @@ set_cursor_visible (ClutterStageX11 *stage_x11)
     }
 }
 
+static void
+on_window_scaling_factor_notify (GObject         *settings,
+                                 GParamSpec      *pspec,
+                                 ClutterStageX11 *stage_x11)
+{
+  g_object_get (settings,
+                "window-scaling-factor", &stage_x11->scale_factor,
+                NULL);
+
+  clutter_stage_x11_resize (CLUTTER_STAGE_WINDOW (stage_x11),
+                            stage_x11->xwin_width,
+                            stage_x11->xwin_height);
+}
+
 static void
 clutter_stage_x11_unrealize (ClutterStageWindow *stage_window)
 {
@@ -626,8 +643,12 @@ clutter_stage_x11_realize (ClutterStageWindow *stage_window)
 
   CLUTTER_NOTE (BACKEND, "Wrapper size: %.2f x %.2f", width, height);
 
-  CLUTTER_NOTE (BACKEND, "Creating a new Cogl onscreen surface: %.2f x %.2f",
+  width = width * (float) stage_x11->scale_factor;
-                width, height);
+  height = height * (float) stage_x11->scale_factor;
+
+  CLUTTER_NOTE (BACKEND, "Creating a new Cogl onscreen surface: %.2f x %.2f (factor: %d)",
+                width, height,
+                stage_x11->scale_factor);
 
   stage_x11->onscreen = cogl_onscreen_new (backend->cogl_context, width, height);
 
@@ -888,6 +909,28 @@ clutter_stage_x11_can_clip_redraws (ClutterStageWindow *stage_window)
   return stage_x11->clipped_redraws_cool_off == 0;
 }
 
+static void
+clutter_stage_x11_set_scale_factor (ClutterStageWindow *stage_window,
+                                    int                 factor)
+{
+  ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window);
+
+  if (stage_x11->scale_factor == factor)
+    return;
+
+  stage_x11->scale_factor = factor;
+
+  clutter_stage_x11_resize (stage_window, stage_x11->xwin_width, stage_x11->xwin_height);
+}
+
+static int
+clutter_stage_x11_get_scale_factor (ClutterStageWindow *stage_window)
+{
+  ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window);
+
+  return stage_x11->scale_factor;
+}
+
 static void
 ensure_legacy_view (ClutterStageWindow *stage_window)
 {
@@ -959,6 +1002,8 @@ clutter_stage_x11_class_init (ClutterStageX11Class *klass)
 static void
 clutter_stage_x11_init (ClutterStageX11 *stage)
 {
+  ClutterSettings *settings;
+
   stage->xwin = None;
   stage->xwin_width = 640;
   stage->xwin_height = 480;
@@ -971,6 +1016,12 @@ clutter_stage_x11_init (ClutterStageX11 *stage)
   stage->accept_focus = TRUE;
 
   stage->title = NULL;
+
+  settings = clutter_settings_get_default ();
+  g_signal_connect (settings, "notify::window-scaling-factor",
+                    G_CALLBACK (on_window_scaling_factor_notify),
+                    stage);
+  on_window_scaling_factor_notify (G_OBJECT (settings), NULL, stage);
 }
 
 static void
@@ -990,6 +1041,8 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
   iface->realize = clutter_stage_x11_realize;
   iface->unrealize = clutter_stage_x11_unrealize;
   iface->can_clip_redraws = clutter_stage_x11_can_clip_redraws;
+  iface->set_scale_factor = clutter_stage_x11_set_scale_factor;
+  iface->get_scale_factor = clutter_stage_x11_get_scale_factor;
   iface->get_views = clutter_stage_x11_get_views;
   iface->get_frame_counter = clutter_stage_x11_get_frame_counter;
 }
@@ -1114,8 +1167,8 @@ clutter_stage_x11_translate_event (ClutterEventTranslator *translator,
               stage_x11->xwin_height = xevent->xconfigure.height;
             }
 
-          stage_width = xevent->xconfigure.width;
+          stage_width = xevent->xconfigure.width / stage_x11->scale_factor;
-          stage_height = xevent->xconfigure.height;
+          stage_height = xevent->xconfigure.height / stage_x11->scale_factor;
           clutter_actor_set_size (CLUTTER_ACTOR (stage), stage_width, stage_height);
 
           if (size_changed)
@@ -1282,10 +1335,10 @@ clutter_stage_x11_translate_event (ClutterEventTranslator *translator,
                       expose->width,
                       expose->height);
 
-        clip.x = expose->x;
+        clip.x = expose->x / stage_x11->scale_factor;
-        clip.y = expose->y;
+        clip.y = expose->y / stage_x11->scale_factor;
-        clip.width = expose->width;
+        clip.width = expose->width / stage_x11->scale_factor;
-        clip.height = expose->height;
+        clip.height = expose->height / stage_x11->scale_factor;
         clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip);
       }
       break;
@@ -1451,8 +1504,8 @@ set_foreign_window_callback (ClutterActor *actor,
   fwd->stage_x11->xwin = fwd->xwindow;
   fwd->stage_x11->is_foreign_xwin = TRUE;
 
-  fwd->stage_x11->xwin_width = fwd->geom.width;
+  fwd->stage_x11->xwin_width = fwd->geom.width * fwd->stage_x11->scale_factor;
-  fwd->stage_x11->xwin_height = fwd->geom.height;
+  fwd->stage_x11->xwin_height = fwd->geom.height * fwd->stage_x11->scale_factor;
 
   clutter_actor_set_size (actor, fwd->geom.width, fwd->geom.height);
 
@@ -1546,8 +1599,8 @@ clutter_x11_set_stage_foreign (ClutterStage *stage,
 
   fwd.geom.x = x;
   fwd.geom.y = y;
-  fwd.geom.width = width;
+  fwd.geom.width = width / stage_x11->scale_factor;
-  fwd.geom.height = height;
+  fwd.geom.height = height / stage_x11->scale_factor;
 
   actor = CLUTTER_ACTOR (stage);
 

clutter/clutter/x11/clutter-stage-x11.h

@@ -69,6 +69,8 @@ struct _ClutterStageX11
 
   ClutterStageX11State wm_state;
 
+  int scale_factor;
+
   guint is_foreign_xwin       : 1;
   guint fullscreening         : 1;
   guint is_cursor_visible     : 1;

clutter/clutter/x11/clutter-virtual-input-device-x11.c

@@ -1,110 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2016  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/>.
- *
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "clutter-build-config.h"
-#endif
-
-#include <glib-object.h>
-
-#include "clutter-x11.h"
-#include "X11/extensions/XTest.h"
-
-#include "clutter-virtual-input-device.h"
-#include "x11/clutter-virtual-input-device-x11.h"
-
-struct _ClutterVirtualInputDeviceX11
-{
-  ClutterVirtualInputDevice parent;
-};
-
-G_DEFINE_TYPE (ClutterVirtualInputDeviceX11,
-               clutter_virtual_input_device_x11,
-               CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE)
-
-static void
-clutter_virtual_input_device_x11_notify_relative_motion (ClutterVirtualInputDevice *virtual_device,
-                                                         uint64_t                   time_us,
-                                                         double                     dx,
-                                                         double                     dy)
-{
-}
-
-static void
-clutter_virtual_input_device_x11_notify_absolute_motion (ClutterVirtualInputDevice *virtual_device,
-                                                         uint64_t                   time_us,
-                                                         double                     x,
-                                                         double                     y)
-{
-}
-
-static void
-clutter_virtual_input_device_x11_notify_button (ClutterVirtualInputDevice *virtual_device,
-                                                uint64_t                   time_us,
-                                                uint32_t                   button,
-                                                ClutterButtonState         button_state)
-{
-  XTestFakeButtonEvent (clutter_x11_get_default_display (),
-                        button, button_state == CLUTTER_BUTTON_STATE_PRESSED, 0);
-}
-
-static void
-clutter_virtual_input_device_x11_notify_key (ClutterVirtualInputDevice *virtual_device,
-                                             uint64_t                   time_us,
-                                             uint32_t                   key,
-                                             ClutterKeyState            key_state)
-{
-  XTestFakeKeyEvent (clutter_x11_get_default_display (),
-                     key, key_state == CLUTTER_KEY_STATE_PRESSED, 0);
-}
-
-static void
-clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtual_device,
-						uint64_t                   time_us,
-						uint32_t                   keyval,
-						ClutterKeyState            key_state)
-{
-  KeyCode keycode;
-
-  keycode = XKeysymToKeycode (clutter_x11_get_default_display (), keyval);
-  XTestFakeKeyEvent (clutter_x11_get_default_display (),
-                     keycode, key_state == CLUTTER_KEY_STATE_PRESSED, 0);
-}
-
-static void
-clutter_virtual_input_device_x11_init (ClutterVirtualInputDeviceX11 *virtual_device_x11)
-{
-}
-
-static void
-clutter_virtual_input_device_x11_class_init (ClutterVirtualInputDeviceX11Class *klass)
-{
-  ClutterVirtualInputDeviceClass *virtual_input_device_class =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_CLASS (klass);
-
-  virtual_input_device_class->notify_relative_motion = clutter_virtual_input_device_x11_notify_relative_motion;
-  virtual_input_device_class->notify_absolute_motion = clutter_virtual_input_device_x11_notify_absolute_motion;
-  virtual_input_device_class->notify_button = clutter_virtual_input_device_x11_notify_button;
-  virtual_input_device_class->notify_key = clutter_virtual_input_device_x11_notify_key;
-  virtual_input_device_class->notify_keyval = clutter_virtual_input_device_x11_notify_keyval;
-}

clutter/clutter/x11/clutter-virtual-input-device-x11.h

@@ -1,35 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2016  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/>.
- *
- * Author: Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef __CLUTTER_VIRTUAL_INPUT_DEVICE_X11_H__
-#define __CLUTTER_VIRTUAL_INPUT_DEVICE_X11_H__
-
-#include "clutter-virtual-input-device.h"
-
-#define CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE_X11 (clutter_virtual_input_device_x11_get_type ())
-G_DECLARE_FINAL_TYPE (ClutterVirtualInputDeviceX11,
-                      clutter_virtual_input_device_x11,
-                      CLUTTER, VIRTUAL_INPUT_DEVICE_X11,
-                      ClutterVirtualInputDevice)
-
-#endif /* __CLUTTER_VIRTUAL_INPUT_DEVICE_X11_H__ */

clutter/configure.ac

@@ -42,6 +42,9 @@ m4_define([clutter_release_status],
 
 m4_define([clutter_version], [clutter_major_version.clutter_minor_version.clutter_micro_version])
 
+# change this only when breaking the API
+m4_define([clutter_api_version], [1.0])
+
 AC_PREREQ([2.63])
 
 AC_INIT([clutter],
@@ -58,18 +61,12 @@ AC_CONFIG_MACRO_DIR([build/autotools])
 AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define no-dist-gzip dist-xz tar-ustar])
 AM_SILENT_RULES([yes])
 
-dnl = Check that we are configured by mutter ==============================
-
-AC_ARG_VAR([MUTTER_VERSION])
-AC_ARG_VAR([LIBMUTTER_API_VERSION])
-
-AS_IF([test "x$MUTTER_VERSION" = "x"],
-      [AC_MSG_ERROR([Clutter can only be configured by mutter])],)
-
 AC_SUBST([CLUTTER_MAJOR_VERSION],  [clutter_major_version])
 AC_SUBST([CLUTTER_MINOR_VERSION],  [clutter_minor_version])
 AC_SUBST([CLUTTER_MICRO_VERSION],  [clutter_micro_version])
 AC_SUBST([CLUTTER_VERSION],        [clutter_version])
+AC_SUBST([CLUTTER_API_VERSION],    [clutter_api_version])
+AC_SUBST([CLUTTER_API_VERSION_AM], [$CLUTTER_MAJOR_VERSION\_0])
 AC_SUBST([CLUTTER_RELEASE_STATUS], [clutter_release_status])
 
 m4_define([lt_current],  [m4_eval(100 * clutter_minor_version + clutter_micro_version - clutter_interface_age)])
@@ -119,7 +116,7 @@ m4_define([pango_req_version],          [1.30])
 m4_define([gi_req_version],             [1.39.0])
 m4_define([xcomposite_req_version],     [0.4])
 m4_define([gdk_req_version],            [3.3.18])
-m4_define([libinput_req_version],       [1.4.0])
+m4_define([libinput_req_version],       [0.19.0])
 m4_define([libudev_req_version],        [136])
 
 AC_SUBST([GLIB_REQ_VERSION],       [glib_req_version])
@@ -385,22 +382,6 @@ AS_IF([test "x$SUPPORT_X11" = "x1"],
               [AC_MSG_ERROR([not found])]
         )
 
-        # XTEST (required)
-        AC_MSG_CHECKING([for XTest extension])
-        PKG_CHECK_EXISTS([xtst], [have_xtest=yes], [have_xtest=no])
-        AS_IF([test "x$have_xtest" = "xyes"],
-              [
-                AC_DEFINE(HAVE_XTEST, [1], [Define to 1 if we have the XTest X extension])
-
-                X11_LIBS="$X11_LIBS -lXtst"
-                X11_PC_FILES="$X11_PC_FILES xtst"
-                X11_EXTS="$X11_EXTS xtst"
-
-                AC_MSG_RESULT([found])
-              ],
-              [AC_MSG_ERROR([Not found])]
-        )
-
         # X Generic Extensions (optional)
         clutter_save_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
@@ -784,7 +765,7 @@ AC_CONFIG_FILES([
 	clutter/Makefile
         clutter/clutter-config.h
 	clutter/clutter-version.h
-	clutter/mutter-clutter-$LIBMUTTER_API_VERSION.pc:clutter/mutter-clutter.pc.in
+	clutter/mutter-clutter-$CLUTTER_API_VERSION.pc:clutter/mutter-clutter.pc.in
 
 	tests/Makefile
 	tests/accessibility/Makefile

clutter/examples/Makefile.am

@@ -21,7 +21,7 @@ all_examples += \
 	image-content
 endif
 
-LDADD = $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(LIBM)
+LDADD = $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(LIBM)
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
 AM_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \

clutter/tests/accessibility/Makefile.am

@@ -1,5 +1,5 @@
 common_ldadd = \
-	$(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la
+	$(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
 
 common_sources = \
 	cally-examples-util.c	\
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
 	-I$(top_srcdir)/../cogl                 \
 	-I$(top_builddir)/../cogl               \
-	-I$(top_builddir)/../cogl/cogl          \
 	-I$(top_srcdir)	\
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \

clutter/tests/conform/Makefile.am

@@ -3,13 +3,12 @@ installed_testdir = $(libexecdir)/installed-tests/mutter-clutter
 include $(top_srcdir)/build/autotools/glib-tap.mk
 
 AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
-LDADD = $(top_builddir)/../cogl/cogl/libmutter-cogl-@LIBMUTTER_API_VERSION@.la $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la $(CLUTTER_LIBS) $(LIBM)
+LDADD = $(top_builddir)/../cogl/cogl/libmutter-cogl.la $(top_builddir)/clutter/libmutter-clutter-1.0.la $(CLUTTER_LIBS) $(LIBM)
 AM_LDFLAGS = -export-dynamic
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Clutter-Conform\"	\
 	-I$(top_srcdir)/../cogl                 \
 	-I$(top_builddir)/../cogl               \
-	-I$(top_builddir)/../cogl/cogl          \
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)			\
 	-DCOGL_DISABLE_DEPRECATION_WARNINGS	\
@@ -79,7 +78,7 @@ script_tests = \
 	test-script-timeline-markers.json \
 	test-state-1.json
 
-TESTS_ENVIRONMENT += G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 CLUTTER_SCALE=1
+TESTS_ENVIRONMENT += G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0
 
 # simple rules for generating a Git ignore file for the conformance test suite
 $(srcdir)/.gitignore: Makefile

clutter/tests/interactive/Makefile.am

@@ -15,13 +15,16 @@ UNIT_TESTS = \
 	test-state-animator.c \
 	test-fbo.c \
 	test-multistage.c \
+	test-cogl-primitives.c \
 	test-cogl-tex-tile.c \
 	test-cogl-tex-convert.c \
 	test-cogl-tex-foreign.c \
+	test-cogl-tex-getset.c \
 	test-cogl-offscreen.c \
 	test-cogl-tex-polygon.c \
 	test-cogl-multitexture.c \
 	test-stage-read-pixels.c \
+	test-clip.c \
 	test-paint-wrapper.c \
 	test-texture-quality.c \
 	test-layout.c \
@@ -109,9 +112,7 @@ clean-wrappers:
 
 .PHONY: wrappers clean-wrappers
 
-common_ldadd = \
+common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
-  $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la \
-  $(top_builddir)/../cogl/cogl/libmutter-cogl-@LIBMUTTER_API_VERSION@.la
 
 check_PROGRAMS = test-interactive
 check_SCRIPTS = wrappers
@@ -127,7 +128,6 @@ test_interactive_CPPFLAGS = \
 	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
 	-I$(top_srcdir)/../cogl                 \
 	-I$(top_builddir)/../cogl               \
-	-I$(top_builddir)/../cogl/cogl          \
 	-I$(top_srcdir)	\
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \

clutter/tests/interactive/test-clip.c

@@ -0,0 +1,396 @@
+#include <clutter/clutter.h>
+#include <gmodule.h>
+#include <math.h>
+
+typedef struct _CallbackData CallbackData;
+typedef struct _Clip Clip;
+
+typedef enum
+  {
+    CLIP_NONE,
+    CLIP_RECTANGLE,
+    CLIP_ROTATED_RECTANGLE,
+    CLIP_SHAPES
+  } ClipType;
+
+struct _Clip
+{
+  ClipType type;
+  gint x1, y1, x2, y2;
+};
+
+struct _CallbackData
+{
+  ClutterActor *stage;
+  CoglHandle hand;
+
+  Clip current_clip;
+
+  GSList *clips;
+};
+
+static const char
+instructions[] =
+  "Left button and drag to draw a rectangle, control+left to draw a rotated "
+  "rectangle or shift+left to draw a path. Press 'r' to reset or 'u' "
+  "to undo the last clip.";
+
+static void
+path_shapes (gint x, gint y, gint width, gint height)
+{
+  cogl_path_move_to (x, y);
+  cogl_path_line_to (x, (y + height * 4 / 5));
+  cogl_path_line_to ((x + width * 4 / 15), (y + height * 4 / 5));
+  cogl_path_close ();
+
+  cogl_path_rectangle (x + width / 3,
+                       y,
+                       x + width * 9 / 15,
+                       y + height * 4 / 5);
+
+  cogl_path_ellipse ((x + width * 4 / 5),
+                     (y + height * 2 / 5),
+                     (width * 2 / 15),
+                     (height * 2 / 5));
+}
+
+static void
+draw_shapes (gint x, gint y)
+{
+  path_shapes (x, y, 300, 100);
+  cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
+  cogl_path_fill_preserve ();
+  cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
+  cogl_path_stroke ();
+}
+
+static void
+make_clip_path (Clip *clip)
+{
+  switch (clip->type)
+    {
+    case CLIP_NONE:
+      break;
+
+    case CLIP_RECTANGLE:
+      cogl_path_rectangle (clip->x1,
+                           clip->y1,
+                           clip->x2,
+                           clip->y2);
+      break;
+
+    case CLIP_ROTATED_RECTANGLE:
+      {
+        int size = MIN (ABS (clip->x2 - clip->x1),
+                        ABS (clip->y2 - clip->y1));
+        int cx = (clip->x1 + clip->x2) / 2;
+        int cy = (clip->y1 + clip->y2) / 2;
+
+        cogl_path_move_to (cx - size / 2, cy);
+        cogl_path_line_to (cx, cy - size / 2);
+        cogl_path_line_to (cx + size / 2, cy);
+        cogl_path_line_to (cx, cy + size / 2);
+        cogl_path_close ();
+      }
+      break;
+
+    case CLIP_SHAPES:
+      {
+        int x, y, width, height;
+
+        if (clip->x1 < clip->x2)
+          {
+            x = clip->x1;
+            width = clip->x2 - x;
+          }
+        else
+          {
+            x = clip->x2;
+            width = clip->x1 - x;
+          }
+        if (clip->y1 < clip->y2)
+          {
+            y = clip->y1;
+            height = clip->y2 - y;
+          }
+        else
+          {
+            y = clip->y2;
+            height = clip->y1 - y;
+          }
+
+        path_shapes (x, y, width, height);
+      }
+      break;
+    }
+}
+
+static void
+on_paint (ClutterActor *actor, CallbackData *data)
+{
+  int i;
+  ClutterGeometry stage_size;
+  gint hand_width, hand_height;
+  GSList *node;
+
+  clutter_actor_get_allocation_geometry (data->stage, &stage_size);
+
+  hand_width = cogl_texture_get_width (data->hand);
+  hand_height = cogl_texture_get_height (data->hand);
+
+  /* Setup the clipping */
+  for (node = data->clips; node; node = node->next)
+    {
+      Clip *clip = (Clip *) node->data;
+
+      if (clip->type == CLIP_RECTANGLE)
+        cogl_clip_push_rectangle (clip->x1,
+                                  clip->y1,
+                                  clip->x2,
+                                  clip->y2);
+      else if (clip->type == CLIP_ROTATED_RECTANGLE)
+        {
+          float size = MIN (ABS (clip->x2 - clip->x1),
+                            ABS (clip->y2 - clip->y1));
+          int cx = (clip->x1 + clip->x2) / 2;
+          int cy = (clip->y1 + clip->y2) / 2;
+
+          size = sqrtf ((size / 2) * (size / 2) * 2);
+
+          cogl_push_matrix ();
+
+          /* Rotate 45° about the centre point */
+          cogl_translate (cx, cy, 0.0f);
+          cogl_rotate (45.0f, 0.0f, 0.0f, 1.0f);
+          cogl_clip_push_rectangle (-size / 2, -size / 2, size / 2, size / 2);
+
+          cogl_pop_matrix ();
+        }
+      else
+        {
+          make_clip_path (clip);
+          cogl_clip_push_from_path ();
+        }
+    }
+
+  /* Draw a rectangle filling the entire stage */
+  cogl_set_source_color4ub (0x80, 0x80, 0xff, 0xff);
+  cogl_rectangle (0, 0, stage_size.width, stage_size.height);
+
+  draw_shapes (10, 10);
+
+  /* Draw the hand at different rotations */
+  for (i = -2; i <= 2; i++)
+    {
+      cogl_push_matrix ();
+
+      cogl_translate (stage_size.width / 2 + stage_size.width / 6 * i,
+                      stage_size.height / 2, 0);
+
+      cogl_rotate (i * 40, 0, 1, 0);
+
+      cogl_set_source_color4ub (0xff, 0xff, 0xff, 0xff);
+
+      cogl_set_source_texture (data->hand);
+      cogl_rectangle_with_texture_coords ((-hand_width / 2),
+                                          (-hand_height / 2),
+                                          (hand_width / 2),
+                                          (hand_height / 2),
+                                          0, 0, 1, 1);
+
+      cogl_pop_matrix ();
+    }
+
+  draw_shapes (stage_size.width - 310, stage_size.height - 110);
+
+  /* Remove all of the clipping */
+  g_slist_foreach (data->clips, (GFunc) cogl_clip_pop, NULL);
+
+  /* Draw the bounding box for each of the clips */
+  for (node = data->clips; node; node = node->next)
+    {
+      Clip *clip = (Clip *) node->data;
+
+      make_clip_path (clip);
+      cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
+      cogl_path_stroke ();
+    }
+
+  /* Draw the bounding box for the pending new clip */
+  if (data->current_clip.type != CLIP_NONE)
+    {
+      make_clip_path (&data->current_clip);
+      cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
+      cogl_path_stroke ();
+    }
+}
+
+static gboolean
+on_button_press (ClutterActor *stage, ClutterButtonEvent *event,
+                 CallbackData *data)
+{
+  data->current_clip.x1 = data->current_clip.x2 = event->x;
+  data->current_clip.y1 = data->current_clip.y2 = event->y;
+
+  switch (event->button)
+    {
+    case CLUTTER_BUTTON_PRIMARY:
+      if (clutter_event_has_shift_modifier ((ClutterEvent *) event))
+        data->current_clip.type = CLIP_SHAPES;
+      else if (clutter_event_has_control_modifier ((ClutterEvent *) event))
+        data->current_clip.type = CLIP_ROTATED_RECTANGLE;
+      else
+        data->current_clip.type = CLIP_RECTANGLE;
+      break;
+
+    case CLUTTER_BUTTON_SECONDARY:
+      data->current_clip.type = CLIP_ROTATED_RECTANGLE;
+      break;
+
+    case CLUTTER_BUTTON_MIDDLE:
+      data->current_clip.type = CLIP_SHAPES;
+      break;
+
+    default:
+      data->current_clip.type = CLIP_NONE;
+      break;
+    }
+
+  clutter_actor_queue_redraw (stage);
+
+  return FALSE;
+}
+
+static gboolean
+on_button_release (ClutterActor *stage, ClutterButtonEvent *event,
+                   CallbackData *data)
+{
+  if (data->current_clip.type != CLIP_NONE)
+    {
+      data->clips = g_slist_prepend (data->clips,
+                                     g_slice_copy (sizeof (Clip),
+                                                   &data->current_clip));
+
+      data->current_clip.type = CLIP_NONE;
+    }
+
+  clutter_actor_queue_redraw (stage);
+
+  return FALSE;
+}
+
+static gboolean
+on_motion (ClutterActor *stage, ClutterMotionEvent *event,
+           CallbackData *data)
+{
+  if (data->current_clip.type != CLIP_NONE)
+    {
+      data->current_clip.x2 = event->x;
+      data->current_clip.y2 = event->y;
+
+      clutter_actor_queue_redraw (stage);
+    }
+
+  return FALSE;
+}
+
+static void
+free_clips (CallbackData *data)
+{
+  GSList *node;
+
+  for (node = data->clips; node; node = node->next)
+    g_slice_free (Clip, node->data);
+
+  g_slist_free (data->clips);
+
+  data->clips = NULL;
+}
+
+static gboolean
+on_key_press (ClutterActor *stage,
+              ClutterEvent *event,
+              CallbackData *data)
+{
+  switch (clutter_event_get_key_symbol (event))
+    {
+    case CLUTTER_KEY_r:
+      free_clips (data);
+      clutter_actor_queue_redraw (stage);
+      break;
+
+    case CLUTTER_KEY_u:
+      if (data->clips)
+        {
+          g_slice_free (Clip, data->clips->data);
+          data->clips = g_slist_delete_link (data->clips, data->clips);
+          clutter_actor_queue_redraw (stage);
+       }
+      break;
+    }
+
+  return FALSE;
+}
+
+G_MODULE_EXPORT int
+test_clip_main (int argc, char **argv)
+{
+  CallbackData data;
+  ClutterActor *stub_actor, *label;
+  gchar *file;
+
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
+
+  data.current_clip.type = CLIP_NONE;
+  data.clips = NULL;
+
+  data.stage = clutter_stage_new ();
+  clutter_stage_set_title (CLUTTER_STAGE (data.stage), "Clipping");
+  g_signal_connect (data.stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
+  stub_actor = clutter_rectangle_new ();
+  clutter_container_add (CLUTTER_CONTAINER (data.stage), stub_actor, NULL);
+
+  file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
+  data.hand = cogl_texture_new_from_file (file,
+                                          COGL_TEXTURE_NONE,
+                                          COGL_PIXEL_FORMAT_ANY,
+                                          NULL);
+  g_free (file);
+
+  label = clutter_text_new_with_text ("Sans 12px", instructions);
+  clutter_text_set_line_wrap (CLUTTER_TEXT (label), TRUE);
+  clutter_actor_set_width (label, clutter_actor_get_width (data.stage) - 310);
+  clutter_actor_set_y (label,
+                       clutter_actor_get_height (data.stage)
+                       - clutter_actor_get_height (label));
+  clutter_container_add (CLUTTER_CONTAINER (data.stage), label, NULL);
+
+  g_signal_connect (stub_actor, "paint", G_CALLBACK (on_paint), &data);
+
+  g_signal_connect (data.stage, "button-press-event",
+                    G_CALLBACK (on_button_press), &data);
+  g_signal_connect (data.stage, "button-release-event",
+                    G_CALLBACK (on_button_release), &data);
+  g_signal_connect (data.stage, "motion-event",
+                    G_CALLBACK (on_motion), &data);
+  g_signal_connect (data.stage, "key-press-event",
+                    G_CALLBACK (on_key_press), &data);
+
+  clutter_actor_show (data.stage);
+
+  clutter_main ();
+
+  cogl_handle_unref (data.hand);
+
+  free_clips (&data);
+
+  return 0;
+}
+
+G_MODULE_EXPORT const char *
+test_clip_describe (void)
+{
+  return "Actor clipping with various techniques";
+}

clutter/tests/interactive/test-cogl-primitives.c

@@ -0,0 +1,144 @@
+#include <glib.h>
+#include <gmodule.h>
+#include <stdlib.h>
+
+#include <cogl/cogl.h>
+#include <clutter/clutter.h>
+
+typedef void (*PaintFunc) (void);
+
+static void
+test_paint_line (void)
+{
+  cogl_path_line (-50, -25, 50, 25);
+}
+
+static void
+test_paint_rect (void)
+{
+  cogl_path_rectangle (-50, -25, 50, 25);
+}
+
+static void
+test_paint_rndrect(void)
+{
+  cogl_path_round_rectangle (-50, -25, 50, 25, 10, 5);
+}
+
+static void
+test_paint_polyl (void)
+{
+  gfloat poly_coords[] = {
+    -50, -50,
+    +50, -30,
+    +30, +30,
+    -30, +40
+  };
+
+  cogl_path_polyline (poly_coords, 4);
+}
+
+static void
+test_paint_polyg (void)
+{
+  gfloat poly_coords[] = {
+    -50, -50,
+    +50, -30,
+    +30, +30,
+    -30, +40
+  };
+
+  cogl_path_polygon (poly_coords, 4);
+}
+
+static void
+test_paint_elp (void)
+{
+  cogl_path_ellipse (0, 0, 60, 40);
+}
+
+static void
+test_paint_curve (void)
+{
+  cogl_path_move_to (-50, +50);
+
+  cogl_path_curve_to (+100, -50,
+                      -100, -50,
+                      +50,  +50);
+}
+
+static PaintFunc paint_func []=
+{
+  test_paint_line,
+  test_paint_rect,
+  test_paint_rndrect,
+  test_paint_polyl,
+  test_paint_polyg,
+  test_paint_elp,
+  test_paint_curve
+};
+
+static void
+paint_cb (ClutterActor *self, ClutterTimeline *tl)
+{
+  gint paint_index = (clutter_timeline_get_progress (tl)
+                      * G_N_ELEMENTS (paint_func));
+
+  cogl_push_matrix ();
+
+  paint_func[paint_index] ();
+
+  cogl_translate (100, 100, 0);
+  cogl_set_source_color4ub (0, 160, 0, 255);
+  cogl_path_stroke_preserve ();
+
+  cogl_translate (150, 0, 0);
+  cogl_set_source_color4ub (200, 0, 0, 255);
+  cogl_path_fill ();
+
+  cogl_pop_matrix();
+}
+
+G_MODULE_EXPORT int
+test_cogl_primitives_main (int argc, char *argv[])
+{
+  ClutterActor *stage;
+  ClutterActor *coglbox;
+  ClutterTimeline *tl;
+
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
+
+  tl = clutter_timeline_new (G_N_ELEMENTS (paint_func) * 1000);
+  clutter_timeline_set_loop (tl, TRUE);
+  clutter_timeline_start (tl);
+
+  stage = clutter_stage_new ();
+  clutter_actor_set_size (stage, 400, 400);
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Path Primitives");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
+  coglbox = clutter_group_new ();
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
+  g_signal_connect (coglbox, "paint", G_CALLBACK (paint_cb), tl);
+  /* Redraw every frame of the timeline */
+  g_signal_connect_swapped (tl, "new-frame",
+                            G_CALLBACK (clutter_actor_queue_redraw), coglbox);
+
+  clutter_actor_set_rotation (coglbox, CLUTTER_Y_AXIS, -30, 200, 0, 0);
+  clutter_actor_set_position (coglbox, 0, 100);
+
+  clutter_actor_show (stage);
+
+  clutter_main ();
+
+  g_object_unref (tl);
+
+  return 0;
+}
+
+G_MODULE_EXPORT const char *
+test_cogl_primitives (void)
+{
+  return "2D Path primitives support in Cogl.";
+}

clutter/tests/interactive/test-cogl-tex-getset.c

@@ -0,0 +1,270 @@
+#include <glib.h>
+#include <gmodule.h>
+#include <stdlib.h>
+#include <clutter/clutter.h>
+#include <cogl/cogl.h>
+
+/* Coglbox declaration
+ *--------------------------------------------------*/
+
+G_BEGIN_DECLS
+  
+#define TEST_TYPE_COGLBOX test_coglbox_get_type()
+
+#define TEST_COGLBOX(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+  TEST_TYPE_COGLBOX, TestCoglboxClass))
+
+#define TEST_COGLBOX_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+  TEST_TYPE_COGLBOX, TestCoglboxClass))
+
+#define TEST_IS_COGLBOX(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+  TEST_TYPE_COGLBOX))
+
+#define TEST_IS_COGLBOX_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+  TEST_TYPE_COGLBOX))
+
+#define TEST_COGLBOX_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+  TEST_TYPE_COGLBOX, TestCoglboxClass))
+
+typedef struct _TestCoglbox        TestCoglbox;
+typedef struct _TestCoglboxClass   TestCoglboxClass;
+typedef struct _TestCoglboxPrivate TestCoglboxPrivate;
+
+struct _TestCoglbox
+{
+  ClutterActor           parent;
+
+  /*< private >*/
+  TestCoglboxPrivate *priv;
+};
+
+struct _TestCoglboxClass 
+{
+  ClutterActorClass parent_class;
+
+  /* padding for future expansion */
+  void (*_test_coglbox1) (void);
+  void (*_test_coglbox2) (void);
+  void (*_test_coglbox3) (void);
+  void (*_test_coglbox4) (void);
+};
+
+static GType test_coglbox_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+/* Coglbox private declaration
+ *--------------------------------------------------*/
+
+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
+struct _TestCoglboxPrivate
+{
+  CoglHandle cogl_tex_id[4];
+};
+
+/* Coglbox implementation
+ *--------------------------------------------------*/
+
+static void
+test_coglbox_paint(ClutterActor *self)
+{
+  TestCoglboxPrivate *priv = TEST_COGLBOX_GET_PRIVATE (self);
+  gfloat texcoords[4] = { 0.0f, 0.0f, 1.0f, 1.0f };
+  
+  cogl_set_source_color4ub (0x66, 0x66, 0xdd, 0xff);
+  cogl_rectangle (0, 0, 400, 400);
+
+  cogl_push_matrix ();
+
+  cogl_translate (100, 100, 0);
+  cogl_set_source_texture (priv->cogl_tex_id[1]);
+  cogl_rectangle_with_texture_coords (0, 0, 200, 213,
+                                      texcoords[0], texcoords[1],
+                                      texcoords[2], texcoords[3]);
+  
+  cogl_pop_matrix();
+}
+
+static void
+test_coglbox_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (test_coglbox_parent_class)->finalize (object);
+}
+
+static void
+test_coglbox_dispose (GObject *object)
+{
+  TestCoglboxPrivate *priv;
+  
+  priv = TEST_COGLBOX_GET_PRIVATE (object);
+  cogl_handle_unref (priv->cogl_tex_id);
+  
+  G_OBJECT_CLASS (test_coglbox_parent_class)->dispose (object);
+}
+
+static void
+test_coglbox_init (TestCoglbox *self)
+{
+  TestCoglboxPrivate *priv;
+  guint            width;
+  guint            height;
+  guint            rowstride;
+  CoglPixelFormat  format;
+  gint             size;
+  guchar          *data;
+  gint             x,y,t;
+  guchar          *pixel;
+  gchar           *file;
+  
+  self->priv = priv = TEST_COGLBOX_GET_PRIVATE(self);
+  
+  /* Load image from file */
+  file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
+  priv->cogl_tex_id[0] =
+    cogl_texture_new_from_file (file,
+                                COGL_TEXTURE_NONE,
+                                COGL_PIXEL_FORMAT_ANY,
+                                NULL);
+  
+  if (priv->cogl_tex_id[0] == COGL_INVALID_HANDLE)
+    {
+      printf ("Failed loading redhand.png image!\n");
+      return;
+    }
+
+  g_free (file);
+
+  printf("Texture loaded from file.\n");
+  
+  /* Obtain pixel data */
+  
+  format = cogl_texture_get_format (priv->cogl_tex_id[0]);
+  g_assert(format == COGL_PIXEL_FORMAT_RGBA_8888_PRE ||
+           format == COGL_PIXEL_FORMAT_ARGB_8888_PRE);
+
+  width = cogl_texture_get_width (priv->cogl_tex_id[0]);
+  height = cogl_texture_get_height (priv->cogl_tex_id[0]);
+  size = cogl_texture_get_data (priv->cogl_tex_id[0],
+				format, 0, NULL);
+  
+  printf("size: %dx%d\n", width, height);
+  printf("format: 0x%x\n", format);
+  printf("bytesize: %d\n", size);
+  
+  data = (guchar*) g_malloc (sizeof(guchar) * size);
+  
+  cogl_texture_get_data (priv->cogl_tex_id[0],
+			 format, 0, data);
+  rowstride = cogl_texture_get_rowstride (priv->cogl_tex_id[0]);
+  
+  /* Create new texture from modified data */
+  
+  priv->cogl_tex_id[1] =
+    cogl_texture_new_from_data (width, height,
+                                COGL_TEXTURE_NONE,
+                                format, format,
+				rowstride, data);
+  
+  if (priv->cogl_tex_id[1] == COGL_INVALID_HANDLE)
+    {
+      printf ("Failed creating image from data!\n");
+      return;
+    }
+  
+  printf ("Texture created from data.\n");
+  
+  /* Modify data (swap red and green) */
+  
+  for (y=0; y<height; ++y)
+    {
+      for (x=0; x<width; ++x)
+	{
+	  pixel = data + y * rowstride + x * 4;
+	  if (format == COGL_PIXEL_FORMAT_RGBA_8888_PRE)
+	    {
+	      t = pixel[0];
+	      pixel[0] = pixel[1];
+	      pixel[1] = t;
+	    }
+	  else
+	    {
+	      t = pixel[1];
+	      pixel[1] = pixel[2];
+	      pixel[2] = t;
+	    }
+	}
+    }
+  
+  
+  cogl_texture_set_region (priv->cogl_tex_id[1],
+			   0, 0, 0, 0,
+			   100, 100, width, height,
+			   format, 0, data);
+  
+  cogl_texture_set_region (priv->cogl_tex_id[1],
+			   100, 100, 100, 100,
+			   100, 100, width, height,
+			   format, 0, data);
+  
+  printf ("Subregion data updated.\n");
+}
+
+static void
+test_coglbox_class_init (TestCoglboxClass *klass)
+{
+  GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
+  ClutterActorClass *actor_class   = CLUTTER_ACTOR_CLASS (klass);
+
+  gobject_class->finalize     = test_coglbox_finalize;
+  gobject_class->dispose      = test_coglbox_dispose;  
+  actor_class->paint          = test_coglbox_paint;
+  
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
+}
+
+static ClutterActor*
+test_coglbox_new (void)
+{
+  return g_object_new (TEST_TYPE_COGLBOX, NULL);
+}
+
+G_MODULE_EXPORT int
+test_cogl_tex_getset_main (int argc, char *argv[])
+{
+  ClutterActor     *stage;
+  ClutterActor     *coglbox;
+  
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
+  
+  /* Stage */
+  stage = clutter_stage_new ();
+  clutter_actor_set_size (stage, 400, 400);
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Texture Readback");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
+  /* Cogl Box */
+  coglbox = test_coglbox_new ();
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
+  
+  clutter_actor_show_all (stage);
+  
+  clutter_main ();
+  
+  return 0;
+}
+
+G_MODULE_EXPORT const char *
+test_cogl_tex_getset_describe (void)
+{
+  return "Texture region readback and update in Cogl.";
+}

clutter/tests/micro-bench/Makefile.am

@@ -1,7 +1,4 @@
-common_ldadd = \
+common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
-  $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la \
-  $(top_builddir)/../cogl/cogl/libmutter-cogl-@LIBMUTTER_API_VERSION@.la
-
 
 check_PROGRAMS = \
 	test-text \
@@ -20,7 +17,6 @@ AM_CPPFLAGS = \
 	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \
 	-I$(top_srcdir)/../cogl                 \
 	-I$(top_builddir)/../cogl               \
-	-I$(top_builddir)/../cogl/cogl          \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \

clutter/tests/micro-bench/test-cogl-perf.c

@@ -1,4 +1,4 @@
-#include <clutter-build-config.h>
+#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>

clutter/tests/performance/Makefile.am

@@ -7,7 +7,7 @@ check_PROGRAMS = \
 	test-state-mini \
 	test-state-pick
 
-common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la
+common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
 
 LDADD = $(common_ldadd) $(CLUTTER_LIBS) $(LIBM)
 
@@ -21,7 +21,6 @@ AM_CPPFLAGS = \
 	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \
 	-I$(top_srcdir)/../cogl                 \
 	-I$(top_builddir)/../cogl               \
-	-I$(top_builddir)/../cogl/cogl          \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \

cogl/cogl-gles2/Makefile.am

@@ -2,10 +2,8 @@
 
 NULL =
 
-DISTCLEANFILES =
-
 mutterlibdir = $(libdir)/mutter
-mutterlib_LTLIBRARIES = libmutter-cogl-gles2-@LIBMUTTER_API_VERSION@.la
+mutterlib_LTLIBRARIES = libmutter-cogl-gles2.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -13,8 +11,8 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
 
-libmutter_cogl_gles2_@LIBMUTTER_API_VERSION@_la_SOURCES = cogl-gles2-api.c
+libmutter_cogl_gles2_la_SOURCES = cogl-gles2-api.c
-libmutter_cogl_gles2_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_cogl_gles2_la_LDFLAGS = \
 	-no-undefined \
 	-rpath $(mutterlibdir) \
 	-avoid-version \
@@ -27,9 +25,7 @@ coglgles2include_HEADERS = \
 	GLES2/gl2ext.h \
 	GLES2/gl2platform.h
 
-pc_files = mutter-cogl-gles2-$(LIBMUTTER_API_VERSION).pc
+pc_files = mutter-cogl-gles2-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
-
-DISTCLEANFILES += $(pc_files)

cogl/cogl-gles2/mutter-cogl-gles2-1.0.pc.in

@@ -2,12 +2,12 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@/mutter
 includedir=@includedir@/mutter
-apiversion=@LIBMUTTER_API_VERSION@
+apiversion=1.0
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
-Version: @MUTTER_VERSION@
+Version: @COGL_1_VERSION@
-Libs: -L${libdir} -lmutter-cogl-gles2-@LIBMUTTER_API_VERSION@
+Libs: -L${libdir} -lmutter-cogl-gles2
 Cflags: -I${includedir}/cogl
 Requires: ${requires}

cogl/cogl-pango/Makefile.am

@@ -23,13 +23,13 @@ source_h_priv = \
 	$(NULL)
 
 mutterlibdir = $(libdir)/mutter
-mutterlib_LTLIBRARIES = libmutter-cogl-pango-@LIBMUTTER_API_VERSION@.la
+mutterlib_LTLIBRARIES = libmutter-cogl-pango.la
 
-libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
+libmutter_cogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
-libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+libmutter_cogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
-libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la
+libmutter_cogl_pango_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl.la
-libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
+libmutter_cogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_cogl_pango_la_LDFLAGS = \
 	-export-dynamic \
 	-rpath $(mutterlibdir) \
 	-export-symbols-regex "^cogl_pango_.*" \
@@ -49,7 +49,7 @@ cogl_base_includedir = $(includedir)/mutter
 cogl_pangoheadersdir = $(cogl_base_includedir)/cogl/cogl-pango
 cogl_pangoheaders_HEADERS = $(source_h)
 
-pc_files = mutter-cogl-pango-$(LIBMUTTER_API_VERSION).pc
+pc_files = mutter-cogl-pango-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
@@ -65,23 +65,23 @@ INTROSPECTION_GIRS =
 if HAVE_INTROSPECTION
 INTROSPECTION_COMPILER_ARGS=--includedir=$(top_builddir)/cogl
 
-CoglPango-@LIBMUTTER_API_VERSION@.gir: libmutter-cogl-pango-$(LIBMUTTER_API_VERSION).la Makefile
+CoglPango-1.0.gir: libmutter-cogl-pango.la Makefile
 
-CoglPango_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = CoglPango
+CoglPango_1_0_gir_NAMESPACE = CoglPango
-CoglPango_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
+CoglPango_1_0_gir_VERSION = 1.0
-CoglPango_@LIBMUTTER_API_VERSION@_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la libmutter-cogl-pango-$(LIBMUTTER_API_VERSION).la
+CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl.la libmutter-cogl-pango.la
-CoglPango_@LIBMUTTER_API_VERSION@_gir_FILES = $(source_h) $(source_c)
+CoglPango_1_0_gir_FILES = $(source_h) $(source_c)
-CoglPango_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
+CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
-CoglPango_@LIBMUTTER_API_VERSION@_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
+CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
-CoglPango_@LIBMUTTER_API_VERSION@_gir_EXPORT_PACKAGES = mutter-cogl-pango-@LIBMUTTER_API_VERSION@
+CoglPango_1_0_gir_EXPORT_PACKAGES = mutter-cogl-pango-1.0
-CoglPango_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+CoglPango_1_0_gir_SCANNERFLAGS = \
 	--warn-all \
 	--identifier-prefix=CoglPango \
 	--symbol-prefix=cogl_pango \
 	--c-include='cogl-pango/cogl-pango.h' \
-	--include-uninstalled=$(top_builddir)/cogl/Cogl-@LIBMUTTER_API_VERSION@.gir
+	--include-uninstalled=$(top_builddir)/cogl/Cogl-1.0.gir
 
-INTROSPECTION_GIRS += CoglPango-@LIBMUTTER_API_VERSION@.gir
+INTROSPECTION_GIRS += CoglPango-1.0.gir
 
 girdir = $(mutterlibdir)
 gir_DATA = $(INTROSPECTION_GIRS)

cogl/cogl-pango/mutter-cogl-pango-1.0.pc.in

@@ -2,12 +2,12 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@/mutter
 includedir=@includedir@/mutter
-apiversion=@LIBMUTTER_API_VERSION@
+apiversion=1.0
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
-Version: @MUTTER_VERSION@
+Version: @COGL_1_VERSION@
-Libs: -L${libdir} -lmutter-cogl-pango-@LIBMUTTER_API_VERSION@
+Libs: -L${libdir} -lmutter-cogl-pango
 Cflags: -I${includedir}/cogl
 Requires: ${requires}

cogl/cogl-path/Makefile.am

@@ -65,14 +65,14 @@ glib_enum_headers = $(source_1_x_h)
 include $(top_srcdir)/build/autotools/Makefile.am.enums
 
 mutterlibdir = $(libdir)/mutter
-mutterlib_LTLIBRARIES = libmutter-cogl-path-@LIBMUTTER_API_VERSION@.la
+mutterlib_LTLIBRARIES = libmutter-cogl-path.la
 
-libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_SOURCES = $(source_c) $(source_h)
+libmutter_cogl_path_la_SOURCES = $(source_c) $(source_h)
-nodist_libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
+nodist_libmutter_cogl_path_la_SOURCES = $(BUILT_SOURCES)
-libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+libmutter_cogl_path_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
-libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la
+libmutter_cogl_path_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl.la
-libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
+libmutter_cogl_path_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_cogl_path_la_LDFLAGS = \
 	-export-dynamic \
 	-export-symbols-regex "^(cogl|cogl2)_(framebuffer|path|is|clip|[sg]et)_.*" \
 	-no-undefined \
@@ -94,7 +94,7 @@ cogl_pathheadersdir = $(cogl_base_includedir)/cogl/cogl-path
 cogl_pathheaders_HEADERS = $(source_h)
 nodist_cogl_pathheaders_HEADERS = cogl-path-enum-types.h
 
-pc_files = mutter-cogl-path-$(LIBMUTTER_API_VERSION).pc
+pc_files = mutter-cogl-path-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)

cogl/cogl-path/mutter-cogl-path-1.0.pc.in

@@ -2,12 +2,12 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@/mutter
 includedir=@includedir@/mutter
-apiversion=@LIBMUTTER_API_VERSION@
+apiversion=1.0
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
 
 Name: Cogl
 Description: A 2D path drawing library for Cogl
-Version: @MUTTER_VERSION@
+Version: @COGL_1_VERSION@
-Libs: -L${libdir} -lmutter-cogl-path-@LIBMUTTER_API_VERSION@
+Libs: -L${libdir} -lmutter-cogl-path
 Cflags: -I${includedir}/cogl
 Requires: ${requires}

cogl/cogl/Makefile.am

@@ -41,7 +41,7 @@ BUILT_SOURCES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
 DISTCLEANFILES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
 EXTRA_DIST += cogl-defines.h.in cogl-egl-defines.h.in cogl-gl-header.h.in
 
-pc_files = mutter-cogl-$(LIBMUTTER_API_VERSION).pc
+pc_files = mutter-cogl-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
@@ -439,23 +439,23 @@ cogl_sources_c += \
 endif
 
 mutterlibdir = $(libdir)/mutter
-mutterlib_LTLIBRARIES = libmutter-cogl-@LIBMUTTER_API_VERSION@.la
+mutterlib_LTLIBRARIES = libmutter-cogl.la
 
-libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
+libmutter_cogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 if UNIT_TESTS
-libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LIBADD += $(top_builddir)/test-fixtures/libtest-fixtures.la
+libmutter_cogl_la_LIBADD += $(top_builddir)/test-fixtures/libtest-fixtures.la
 endif
 # XXX: The aim is to eventually get rid of all private API exports
 # for cogl-pango.
-libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_cogl_la_LDFLAGS = \
 	-no-undefined \
 	-avoid-version \
 	-export-dynamic \
 	-rpath $(mutterlibdir) \
-	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_texture_set_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current|_cogl_pixel_format_get_bytes_per_pixel).*"
+	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current).*"
 
-libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(cogl_sources_c)
+libmutter_cogl_la_SOURCES = $(cogl_sources_c)
-nodist_libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
+nodist_libmutter_cogl_la_SOURCES = $(BUILT_SOURCES)
 
 # Cogl installed headers
 cogl_headers = \
@@ -483,22 +483,22 @@ EXTRA_DIST += \
 INTROSPECTION_GIRS =
 
 if HAVE_INTROSPECTION
-Cogl-@LIBMUTTER_API_VERSION@.gir: libmutter-cogl-$(LIBMUTTER_API_VERSION).la Makefile
+Cogl-1.0.gir: libmutter-cogl.la Makefile
 
-Cogl_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = Cogl
+Cogl_1_0_gir_NAMESPACE = Cogl
-Cogl_@LIBMUTTER_API_VERSION@_gir_VERSION = $(LIBMUTTER_API_VERSION)
+Cogl_1_0_gir_VERSION = 1.0
-Cogl_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-cogl-$(LIBMUTTER_API_VERSION).la
+Cogl_1_0_gir_LIBS = libmutter-cogl.la
 if UNIT_TESTS
-Cogl_@LIBMUTTER_API_VERSION@_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
+Cogl_1_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
 endif
-Cogl_@LIBMUTTER_API_VERSION@_gir_FILES = $(cogl_1_public_h)
+Cogl_1_0_gir_FILES = $(cogl_1_public_h)
 
-Cogl_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -D__COGL_EGL_H_INSIDE__ -D__COGL_GLX_H_INSIDE__ -DCOGL_GIR_SCANNING
+Cogl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -D__COGL_EGL_H_INSIDE__ -D__COGL_GLX_H_INSIDE__ -DCOGL_GIR_SCANNING
-Cogl_@LIBMUTTER_API_VERSION@_gir_INCLUDES = GL-1.0 GObject-2.0
+Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
-Cogl_@LIBMUTTER_API_VERSION@_gir_EXPORT_PACKAGES = mutter-cogl-@LIBMUTTER_API_VERSION@
+Cogl_1_0_gir_EXPORT_PACKAGES = mutter-cogl-1.0
-Cogl_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
+Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
 
-INTROSPECTION_GIRS += Cogl-@LIBMUTTER_API_VERSION@.gir
+INTROSPECTION_GIRS += Cogl-1.0.gir
 
 girdir = $(mutterlibdir)
 gir_DATA = $(INTROSPECTION_GIRS)

cogl/cogl/cogl-context.c

@@ -81,19 +81,6 @@
 #define GL_PURGED_CONTEXT_RESET_NV 0x92BB
 #endif
 
-/* These aren't defined in the GLES2 headers */
-#ifndef GL_GUILTY_CONTEXT_RESET_ARB
-#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253
-#endif
-
-#ifndef GL_INNOCENT_CONTEXT_RESET_ARB
-#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254
-#endif
-
-#ifndef GL_UNKNOWN_CONTEXT_RESET_ARB
-#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255
-#endif
-
 static void _cogl_context_free (CoglContext *context);
 
 COGL_OBJECT_DEFINE (Context, context);

cogl/cogl/cogl-context.h

@@ -262,7 +262,6 @@ typedef enum _CoglFeatureID
   COGL_FEATURE_ID_PER_VERTEX_POINT_SIZE,
   COGL_FEATURE_ID_TEXTURE_RG,
   COGL_FEATURE_ID_BUFFER_AGE,
-  COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL,
 
   /*< private >*/
   _COGL_N_FEATURE_IDS   /*< skip >*/

cogl/cogl/cogl-driver.h

@@ -55,13 +55,6 @@ struct _CoglDriverVtable
                           GLenum *out_glintformat,
                           GLenum *out_glformat,
                           GLenum *out_gltype);
-  CoglPixelFormat
-  (* pixel_format_to_gl_with_target) (CoglContext *context,
-                                      CoglPixelFormat format,
-                                      CoglPixelFormat target_format,
-                                      GLenum *out_glintformat,
-                                      GLenum *out_glformat,
-                                      GLenum *out_gltype);
 
   CoglBool
   (* update_features) (CoglContext *context,

cogl/cogl/cogl-gles2-types.h

@@ -152,7 +152,6 @@ typedef long             GLsizeiptr;
 #define GL_POLYGON_OFFSET_FILL            0x8037
 #define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
 #define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_TEXTURE_EXTERNAL_OES           0x8D65
 
 /* ErrorCode */
 #define GL_NO_ERROR                       0

cogl/cogl/cogl-gles2.h

@@ -65,7 +65,7 @@
  * conflicts we only expose the minimal set of GLES 2.0 types and enums
  * publicly.
  */
-#if defined(COGL_COMPILATION) || defined(COGL_ENABLE_MUTTER_API)
+#ifdef COGL_COMPILATION
 #include "cogl-gl-header.h"
 #else
 #include <cogl/cogl-gles2-types.h>

cogl/cogl/cogl-glsl-shader.c

@@ -111,14 +111,6 @@ _cogl_glsl_shader_set_source_with_boilerplate (CoglContext *ctx,
       lengths[count++] = sizeof (texture_3d_extension) - 1;
     }
 
-  if (cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL))
-    {
-      static const char texture_3d_extension[] =
-        "#extension GL_OES_EGL_image_external : require\n";
-      strings[count] = texture_3d_extension;
-      lengths[count++] = sizeof (texture_3d_extension) - 1;
-    }
-
   if (shader_gl_type == GL_VERTEX_SHADER)
     {
       strings[count] = vertex_boilerplate;

cogl/cogl/cogl-glx-display-private.h

@@ -51,9 +51,6 @@ typedef struct _CoglGLXDisplay
 
   CoglBool found_fbconfig;
   CoglBool fbconfig_has_rgba_visual;
-  CoglBool is_direct;
-  CoglBool have_vblank_counter;
-  CoglBool can_vblank_wait;
   GLXFBConfig fbconfig;
 
   /* Single context for all wins */

cogl/cogl/cogl-glx-renderer-private.h

@@ -43,6 +43,8 @@ typedef struct _CoglGLXRenderer
   int glx_error_base;
   int glx_event_base;
 
+  CoglBool is_direct;
+
   /* Vblank stuff */
   int dri_fd;
 

cogl/cogl/cogl-gpu-info.c

@@ -169,8 +169,7 @@ check_qualcomm_vendor (const CoglGpuInfoStrings *strings)
 static CoglBool
 check_nvidia_vendor (const CoglGpuInfoStrings *strings)
 {
-  if (strcmp (strings->vendor_string, "NVIDIA") != 0 &&
+  if (strcmp (strings->vendor_string, "NVIDIA") != 0)
-      strcmp (strings->vendor_string, "NVIDIA Corporation") != 0)
     return FALSE;
 
   return TRUE;

cogl/cogl/cogl-mutter.h

@@ -42,7 +42,7 @@
 #include <cogl/winsys/cogl-winsys-egl-private.h>
 #include <cogl/winsys/cogl-winsys-private.h>
 
-void cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
+void cogl_renderer_set_custom_winsys (CoglRenderer          *renderer,
-                                      CoglCustomWinsysVtableGetter winsys_vtable_getter);
+                                      CoglWinsysVtableGetter winsys_vtable_getter);
 
 #endif /* __COGL_MUTTER_H___ */

cogl/cogl/cogl-object.h

@@ -44,7 +44,7 @@ typedef struct _CoglObject      CoglObject;
 /**
  * CoglObject: (ref-func cogl_object_ref) (unref-func cogl_object_unref)
  *     (set-value-func cogl_object_value_set_object)
- *     (get-value-func cogl_object_value_get_object)
+ *     (get-value-func cogl_object_get_object)
  */
 
 /**

cogl/cogl/cogl-pipeline-layer.c

@@ -936,7 +936,7 @@ _cogl_pipeline_layer_needs_combine_separate
         }
     }
 
-  return FALSE;
+   return FALSE;
 }
 
 

cogl/cogl/cogl-primitive.h

@@ -62,7 +62,7 @@ COGL_BEGIN_DECLS
 /**
  * CoglPrimitive: (ref-func cogl_object_ref) (unref-func cogl_object_unref)
  *     (set-value-func cogl_object_value_set_object)
- *     (get-value-func cogl_object_value_get_object)
+ *     (get-value-func cogl_object_get_object)
  */
 
 /**

cogl/cogl/cogl-private.h

@@ -77,9 +77,6 @@ typedef enum
   COGL_PRIVATE_FEATURE_GL_PROGRAMMABLE,
   COGL_PRIVATE_FEATURE_GL_EMBEDDED,
   COGL_PRIVATE_FEATURE_GL_WEB,
-  /* This is currently only implemented for GLX, but isn't actually
-   * that winsys dependent */
-  COGL_PRIVATE_FEATURE_THREADED_SWAP_WAIT,
 
   COGL_N_PRIVATE_FEATURES
 } CoglPrivateFeature;

cogl/cogl/cogl-renderer-private.h

@@ -39,13 +39,12 @@
 #include "cogl-texture-driver.h"
 #include "cogl-context.h"
 #include "cogl-closure-list-private.h"
+#include "cogl-mutter.h"
 
 #ifdef COGL_HAS_XLIB_SUPPORT
 #include <X11/Xlib.h>
 #endif
 
-typedef const CoglWinsysVtable *(*CoglCustomWinsysVtableGetter) (CoglRenderer *renderer);
-
 struct _CoglRenderer
 {
   CoglObject _parent;
@@ -54,7 +53,7 @@ struct _CoglRenderer
   const CoglDriverVtable *driver_vtable;
   const CoglTextureDriver *texture_driver;
   const CoglWinsysVtable *winsys_vtable;
-  CoglCustomWinsysVtableGetter custom_winsys_vtable_getter;
+  CoglWinsysVtableGetter custom_winsys_vtable_getter;
   CoglWinsysID winsys_id_override;
   GList *constraints;
 
@@ -70,7 +69,6 @@ struct _CoglRenderer
   Display *foreign_xdpy;
   CoglBool xlib_enable_event_retrieval;
   CoglBool xlib_want_reset_on_video_memory_purge;
-  CoglBool xlib_enable_threaded_swap_wait;
 #endif
 
   CoglDriver driver;

cogl/cogl/cogl-renderer.c

@@ -285,17 +285,6 @@ cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
 
   renderer->xlib_want_reset_on_video_memory_purge = enable;
 }
-
-void
-cogl_xlib_renderer_set_threaded_swap_wait_enabled (CoglRenderer *renderer,
-						   CoglBool enable)
-{
-  _COGL_RETURN_IF_FAIL (cogl_is_renderer (renderer));
-  /* NB: Renderers are considered immutable once connected */
-  _COGL_RETURN_IF_FAIL (!renderer->connected);
-
-  renderer->xlib_enable_threaded_swap_wait = enable;
-}
 #endif /* COGL_HAS_XLIB_SUPPORT */
 
 CoglBool
@@ -565,8 +554,8 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
 /* Final connection API */
 
 void
-cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
+cogl_renderer_set_custom_winsys (CoglRenderer          *renderer,
-                                 CoglCustomWinsysVtableGetter winsys_vtable_getter)
+                                 CoglWinsysVtableGetter winsys_vtable_getter)
 {
   renderer->custom_winsys_vtable_getter = winsys_vtable_getter;
 }
@@ -575,11 +564,10 @@ static CoglBool
 connect_custom_winsys (CoglRenderer *renderer,
                        CoglError   **error)
 {
-  const CoglWinsysVtable *winsys;
+  const CoglWinsysVtable *winsys = renderer->custom_winsys_vtable_getter();
   CoglError *tmp_error = NULL;
   GString *error_message;
 
-  winsys = renderer->custom_winsys_vtable_getter (renderer);
   renderer->winsys_vtable = winsys;
 
   error_message = g_string_new ("");

cogl/cogl/cogl-texture-2d-private.h

@@ -36,6 +36,10 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-2d.h"
 
+#ifdef COGL_HAS_EGL_SUPPORT
+#include "cogl-egl-defines.h"
+#endif
+
 struct _CoglTexture2D
 {
   CoglTexture _parent;
@@ -55,23 +59,30 @@ struct _CoglTexture2D
   GLenum gl_internal_format;
   /* The texture object number */
   GLuint gl_texture;
-  GLenum gl_target;
   GLenum gl_legacy_texobj_min_filter;
   GLenum gl_legacy_texobj_mag_filter;
   GLint gl_legacy_texobj_wrap_mode_s;
   GLint gl_legacy_texobj_wrap_mode_t;
   CoglTexturePixel first_pixel;
-
-  struct {
-    void *user_data;
-    GDestroyNotify destroy;
-  } egl_image_external;
 };
 
 CoglTexture2D *
 _cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp,
                                   CoglBool can_convert_in_place);
 
+#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
+/* NB: The reason we require the width, height and format to be passed
+ * even though they may seem redundant is because GLES 1/2 don't
+ * provide a way to query these properties. */
+CoglTexture2D *
+_cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
+                                     int width,
+                                     int height,
+                                     CoglPixelFormat format,
+                                     EGLImageKHR image,
+                                     CoglError **error);
+#endif
+
 CoglTexture2D *
 _cogl_texture_2d_create_base (CoglContext *ctx,
                               int width,

cogl/cogl/cogl-texture-2d.c

@@ -110,8 +110,6 @@ _cogl_texture_2d_create_base (CoglContext *ctx,
   tex_2d->mipmaps_dirty = TRUE;
   tex_2d->auto_mipmap = TRUE;
 
-  tex_2d->gl_target = GL_TEXTURE_2D;
-
   tex_2d->is_foreign = FALSE;
 
   ctx->driver_vtable->texture_2d_init (tex_2d);
@@ -238,12 +236,12 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
  * even though they may seem redundant is because GLES 1/2 don't
  * provide a way to query these properties. */
 CoglTexture2D *
-cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
+_cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
-                                    int width,
+                                     int width,
-                                    int height,
+                                     int height,
-                                    CoglPixelFormat format,
+                                     CoglPixelFormat format,
-                                    EGLImageKHR image,
+                                     EGLImageKHR image,
-                                    CoglError **error)
+                                     CoglError **error)
 {
   CoglTextureLoader *loader;
   CoglTexture2D *tex;
@@ -432,11 +430,11 @@ cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
                                           EGL_WAYLAND_BUFFER_WL,
                                           buffer,
                                           NULL);
-          tex = cogl_egl_texture_2d_new_from_image (ctx,
+          tex = _cogl_egl_texture_2d_new_from_image (ctx,
-                                                    width, height,
+                                                     width, height,
-                                                    internal_format,
+                                                     internal_format,
-                                                    image,
+                                                     image,
-                                                    error);
+                                                     error);
           _cogl_egl_destroy_image (ctx, image);
           return tex;
         }
@@ -559,7 +557,7 @@ _cogl_texture_2d_get_gl_texture (CoglTexture *tex,
       GLuint handle;
 
       if (out_gl_target)
-        *out_gl_target = tex_2d->gl_target;
+        *out_gl_target = GL_TEXTURE_2D;
 
       handle = ctx->driver_vtable->texture_2d_get_gl_handle (tex_2d);
 

cogl/cogl/cogl-texture-2d.h

@@ -40,10 +40,6 @@
 #include "cogl-context.h"
 #include "cogl-bitmap.h"
 
-#ifdef COGL_HAS_EGL_SUPPORT
-#include "cogl-egl-defines.h"
-#endif
-
 COGL_BEGIN_DECLS
 
 /**
@@ -231,40 +227,6 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
 CoglTexture2D *
 cogl_texture_2d_new_from_bitmap (CoglBitmap *bitmap);
 
-#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
-/* NB: The reason we require the width, height and format to be passed
- * even though they may seem redundant is because GLES 1/2 don't
- * provide a way to query these properties. */
-CoglTexture2D *
-cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
-                                    int width,
-                                    int height,
-                                    CoglPixelFormat format,
-                                    EGLImageKHR image,
-                                    CoglError **error);
-
-typedef gboolean (*CoglTexture2DEGLImageExternalAlloc) (CoglTexture2D *tex_2d,
-                                                        gpointer user_data,
-                                                        GError **error);
-
-CoglTexture2D *
-cogl_texture_2d_new_from_egl_image_external (CoglContext *ctx,
-                                             int width,
-                                             int height,
-                                             CoglTexture2DEGLImageExternalAlloc alloc,
-                                             gpointer user_data,
-                                             GDestroyNotify destroy,
-                                             CoglError **error);
-
-void
-cogl_texture_2d_egl_image_external_bind (CoglTexture2D *tex_2d);
-
-void
-cogl_texture_2d_egl_image_external_alloc_finish (CoglTexture2D *tex_2d,
-						 void *user_data,
-						 GDestroyNotify destroy);
-#endif
-
 COGL_END_DECLS
 
 #endif /* __COGL_TEXTURE_2D_H */

cogl/cogl/cogl-texture-private.h

@@ -37,7 +37,6 @@
 #include "cogl-spans.h"
 #include "cogl-meta-texture.h"
 #include "cogl-framebuffer.h"
-#include "cogl-texture-2d.h"
 
 #ifdef COGL_HAS_EGL_SUPPORT
 #include "cogl-egl-defines.h"
@@ -155,8 +154,7 @@ typedef enum _CoglTextureSoureType {
   COGL_TEXTURE_SOURCE_TYPE_SIZED = 1,
   COGL_TEXTURE_SOURCE_TYPE_BITMAP,
   COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE,
-  COGL_TEXTURE_SOURCE_TYPE_GL_FOREIGN,
+  COGL_TEXTURE_SOURCE_TYPE_GL_FOREIGN
-  COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE_EXTERNAL
 } CoglTextureSourceType;
 
 typedef struct _CoglTextureLoader
@@ -181,14 +179,6 @@ typedef struct _CoglTextureLoader
       int height;
       CoglPixelFormat format;
     } egl_image;
-#endif
-#if defined (COGL_HAS_EGL_SUPPORT)
-    struct {
-      int width;
-      int height;
-      CoglTexture2DEGLImageExternalAlloc alloc;
-      CoglPixelFormat format;
-    } egl_image_external;
 #endif
     struct {
       int width;

cogl/cogl/cogl-texture.c

@@ -160,7 +160,6 @@ _cogl_texture_free_loader (CoglTexture *texture)
         case COGL_TEXTURE_SOURCE_TYPE_SIZED:
         case COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE:
         case COGL_TEXTURE_SOURCE_TYPE_GL_FOREIGN:
-        case COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE_EXTERNAL:
           break;
         case COGL_TEXTURE_SOURCE_TYPE_BITMAP:
           cogl_object_unref (loader->src.bitmap.bitmap);

cogl/cogl/cogl-xlib-renderer.h

@@ -167,36 +167,6 @@ void
 cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
                                                 CoglBool enable);
 
-/**
- * cogl_xlib_renderer_set_threaded_swap_wait_enabled:
- * @renderer: a #CoglRenderer
- * @enable: The new value
- *
- * Sets whether Cogl is allowed to use a separate threaded to wait for the
- * completion of glXSwapBuffers() and call the frame callback for the
- * corresponding #CoglOnscreen. This is a way of emulating the
- * INTEL_swap_event extension, and will only ever be used if
- * INTEL_swap_event is not present; it will also only be used for
- * specific white-listed drivers that are known to work correctly with
- * multiple contexts sharing state between threads.
- *
- * The advantage of enabling this is that it will allow your main loop
- * to do other work while waiting for the system to be ready to draw
- * the next frame, instead of blocking in glXSwapBuffers(). A disadvantage
- * is that the driver will be prevented from buffering up multiple frames
- * even if it thinks that it would be advantageous. In general, this
- * will work best for something like a system compositor that is doing
- * simple drawing but handling lots of other complex tasks.
- * 
- * If you enable this, you must call XInitThreads() before any other
- * X11 calls in your program. (See the documentation for XInitThreads())
- *
- * Stability: unstable
- */
-void
-cogl_xlib_renderer_set_threaded_swap_wait_enabled (CoglRenderer *renderer,
-						   CoglBool enable);
-
 /**
  * cogl_xlib_renderer_get_display: (skip)
  */
@@ -210,7 +180,7 @@ XVisualInfo *
 cogl_xlib_renderer_get_visual_info (CoglRenderer *renderer);
 
 /**
- * cogl_xlib_renderer_request_reset_on_video_memory_purge: (skip)
+ * cogl_xlib_renderer_request_reset_on_video_memory_purge:
  * @renderer: a #CoglRenderer
  * @enable: The new value
  *

cogl/cogl/deprecated/cogl-material-compat.h

@@ -1307,7 +1307,7 @@ CoglMaterialWrapMode
 cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer);
 
 /**
- * cogl_material_set_depth_state: (skip)
+ * cogl_material_set_depth_state:
  * @material: A #CoglMaterial object
  * @state: A #CoglDepthState struct
  * @error: A #CoglError to report failures to setup the given @state.
@@ -1334,7 +1334,7 @@ cogl_material_set_depth_state (CoglMaterial *material,
                                CoglError **error);
 
 /**
- * cogl_material_get_depth_state: (skip)
+ * cogl_material_get_depth_state:
  * @material: A #CoglMaterial object
  * @state_out: A destination #CoglDepthState struct
  *
@@ -1370,8 +1370,8 @@ typedef CoglBool (*CoglMaterialLayerCallback) (CoglMaterial *material,
 /**
  * cogl_material_foreach_layer:
  * @material: A #CoglMaterial object
- * @callback: (scope call): A #CoglMaterialLayerCallback to be called for each
+ * @callback: A #CoglMaterialLayerCallback to be called for each layer
- *            layer index
+ *            index
  * @user_data: Private data that will be passed to the callback
  *
  * Iterates all the layer indices of the given @material.

cogl/cogl/driver/gl/cogl-framebuffer-gl.c

@@ -1418,15 +1418,6 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
                                                             &gl_format,
                                                             &gl_type);
 
-  /* As we are reading pixels, we want to consider the bitmap according to
-   * its real pixel format, not the swizzled channels we pretend face to the
-   * pipeline.
-   */
-  if ((format == COGL_PIXEL_FORMAT_BGRA_8888 ||
-       format == COGL_PIXEL_FORMAT_BGRA_8888_PRE) &&
-      _cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE))
-    gl_format = GL_BGRA;
-
   /* NB: All offscreen rendering is done upside down so there is no need
    * to flip in this case... */
   if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_MESA_PACK_INVERT) &&

cogl/cogl/driver/gl/cogl-texture-2d-gl.c

@@ -46,31 +46,11 @@
 #include "cogl-error-private.h"
 #include "cogl-util-gl-private.h"
 
-#if defined (COGL_HAS_EGL_SUPPORT)
-
-/* We need this define from GLES2, but can't include the header
-   as its type definitions may conflict with the GL ones
- */
-#ifndef GL_OES_EGL_image_external
-#define GL_OES_EGL_image_external 1
-#define GL_TEXTURE_EXTERNAL_OES           0x8D65
-#define GL_TEXTURE_BINDING_EXTERNAL_OES   0x8D67
-#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68
-#define GL_SAMPLER_EXTERNAL_OES           0x8D66
-#endif /* GL_OES_EGL_image_external */
-
-#endif /* defined (COGL_HAS_EGL_SUPPORT) */
-
 void
 _cogl_texture_2d_gl_free (CoglTexture2D *tex_2d)
 {
   if (!tex_2d->is_foreign && tex_2d->gl_texture)
     _cogl_delete_gl_texture (tex_2d->gl_texture);
-
-#if defined (COGL_HAS_EGL_SUPPORT)
-  g_clear_pointer (&tex_2d->egl_image_external.user_data,
-                   tex_2d->egl_image_external.destroy);
-#endif
 }
 
 CoglBool
@@ -121,9 +101,6 @@ _cogl_texture_2d_gl_init (CoglTexture2D *tex_2d)
   /* Wrap mode not yet set */
   tex_2d->gl_legacy_texobj_wrap_mode_s = GL_FALSE;
   tex_2d->gl_legacy_texobj_wrap_mode_t = GL_FALSE;
-
-  tex_2d->egl_image_external.user_data = NULL;
-  tex_2d->egl_image_external.destroy = NULL;
 }
 
 static CoglBool
@@ -462,96 +439,6 @@ allocate_from_gl_foreign (CoglTexture2D *tex_2d,
   return TRUE;
 }
 
-#if defined (COGL_HAS_EGL_SUPPORT)
-static CoglBool
-allocate_custom_egl_image_external (CoglTexture2D *tex_2d,
-                                    CoglTextureLoader *loader,
-                                    CoglError **error)
-{
-  CoglTexture *tex = COGL_TEXTURE (tex_2d);
-  CoglContext *ctx = tex->context;
-  CoglPixelFormat internal_format = loader->src.egl_image_external.format;
-
-  _cogl_gl_util_clear_gl_errors (ctx);
-
-  GE (ctx, glActiveTexture (GL_TEXTURE0));
-  GE (ctx, glGenTextures (1, &tex_2d->gl_texture));
-
-  GE (ctx, glBindTexture (GL_TEXTURE_EXTERNAL_OES,
-                          tex_2d->gl_texture));
-
-  if (_cogl_gl_util_get_error (ctx) != GL_NO_ERROR)
-    {
-      _cogl_set_error (error,
-                       COGL_TEXTURE_ERROR,
-                       COGL_TEXTURE_ERROR_BAD_PARAMETER,
-                       "Could not create a CoglTexture2D from a given "
-                       "EGLImage");
-      GE( ctx, glDeleteTextures (1, &tex_2d->gl_texture) );
-      return FALSE;
-    }
-
-  GE (ctx, glTexParameteri(GL_TEXTURE_EXTERNAL_OES,
-                           GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
-  GE (ctx, glTexParameteri(GL_TEXTURE_EXTERNAL_OES,
-                           GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
-
-  if (!loader->src.egl_image_external.alloc (tex_2d,
-                                             tex_2d->egl_image_external.user_data,
-                                             error))
-    {
-      GE (ctx, glBindTexture (GL_TEXTURE_EXTERNAL_OES, 0));
-      GE (ctx, glDeleteTextures (1, &tex_2d->gl_texture));
-      return FALSE;
-    }
-
-  GE (ctx, glBindTexture (GL_TEXTURE_EXTERNAL_OES, 0));
-
-  tex_2d->internal_format = internal_format;
-  tex_2d->gl_target = GL_TEXTURE_EXTERNAL_OES;
-
-  return TRUE;
-}
-
-CoglTexture2D *
-cogl_texture_2d_new_from_egl_image_external (CoglContext *ctx,
-                                             int width,
-                                             int height,
-                                             CoglTexture2DEGLImageExternalAlloc alloc,
-                                             gpointer user_data,
-                                             GDestroyNotify destroy,
-                                             CoglError **error)
-{
-  CoglTextureLoader *loader;
-  CoglTexture2D *tex_2d;
-  CoglPixelFormat internal_format = COGL_PIXEL_FORMAT_ANY;
-
-  _COGL_RETURN_VAL_IF_FAIL (_cogl_context_get_winsys (ctx)->constraints &
-                            COGL_RENDERER_CONSTRAINT_USES_EGL,
-                            NULL);
-
-  _COGL_RETURN_VAL_IF_FAIL (cogl_has_feature (ctx,
-                                              COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL),
-                            NULL);
-
-  loader = _cogl_texture_create_loader ();
-  loader->src_type = COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE_EXTERNAL;
-  loader->src.egl_image_external.width = width;
-  loader->src.egl_image_external.height = height;
-  loader->src.egl_image_external.alloc = alloc;
-  loader->src.egl_image_external.format = internal_format;
-
-  tex_2d = _cogl_texture_2d_create_base (ctx, width, height,
-                                         internal_format, loader);
-
-
-  tex_2d->egl_image_external.user_data = user_data;
-  tex_2d->egl_image_external.destroy = destroy;
-
-  return tex_2d;
-}
-#endif /* defined (COGL_HAS_EGL_SUPPORT) */
-
 CoglBool
 _cogl_texture_2d_gl_allocate (CoglTexture *tex,
                               CoglError **error)
@@ -575,8 +462,6 @@ _cogl_texture_2d_gl_allocate (CoglTexture *tex,
 #endif
     case COGL_TEXTURE_SOURCE_TYPE_GL_FOREIGN:
       return allocate_from_gl_foreign (tex_2d, loader, error);
-    case COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE_EXTERNAL:
-      return allocate_custom_egl_image_external (tex_2d, loader, error);
     }
 
   g_return_val_if_reached (FALSE);
@@ -772,12 +657,11 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
 
   upload_format = cogl_bitmap_get_format (upload_bmp);
 
-  ctx->driver_vtable->pixel_format_to_gl_with_target (ctx,
+  ctx->driver_vtable->pixel_format_to_gl (ctx,
-                                                      upload_format,
+                                          upload_format,
-                                                      _cogl_texture_get_format (tex),
+                                          NULL, /* internal format */
-                                                      NULL, /* internal gl format */
+                                          &gl_format,
-                                                      &gl_format,
+                                          &gl_type);
-                                                      &gl_type);
 
   /* If this touches the first pixel then we'll update our copy */
   if (dst_x == 0 && dst_y == 0 &&

cogl/cogl/driver/gl/cogl-util-gl-private.h

@@ -37,11 +37,6 @@
 #include "cogl-gl-header.h"
 #include "cogl-texture.h"
 
-/* In OpenGL ES context, GL_CONTEXT_LOST has a _KHR prefix */
-#ifndef GL_CONTEXT_LOST
-#define GL_CONTEXT_LOST GL_CONTEXT_LOST_KHR
-#endif
-
 #ifdef COGL_GL_DEBUG
 
 const char *

cogl/cogl/driver/gl/gl/cogl-driver-gl.c

@@ -96,12 +96,11 @@ _cogl_driver_pixel_format_from_gl_internal (CoglContext *context,
 }
 
 static CoglPixelFormat
-_cogl_driver_pixel_format_to_gl_with_target (CoglContext *context,
+_cogl_driver_pixel_format_to_gl (CoglContext *context,
-                                             CoglPixelFormat format,
+                                 CoglPixelFormat  format,
-                                             CoglPixelFormat target_format,
+                                 GLenum *out_glintformat,
-                                             GLenum *out_glintformat,
+                                 GLenum *out_glformat,
-                                             GLenum *out_glformat,
+                                 GLenum *out_gltype)
-                                             GLenum *out_gltype)
 {
   CoglPixelFormat required_format;
   GLenum glintformat = 0;
@@ -175,16 +174,7 @@ _cogl_driver_pixel_format_to_gl_with_target (CoglContext *context,
     case COGL_PIXEL_FORMAT_BGRA_8888:
     case COGL_PIXEL_FORMAT_BGRA_8888_PRE:
       glintformat = GL_RGBA;
-      /* If the driver has texture_swizzle, pretend internal
+      glformat = GL_BGRA;
-       * and buffer format are the same here, the pixels
-       * will be flipped through this extension.
-       */
-      if (target_format == format &&
-          _cogl_has_private_feature
-          (context, COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE))
-        glformat = GL_RGBA;
-      else
-        glformat = GL_BGRA;
       gltype = GL_UNSIGNED_BYTE;
       break;
 
@@ -299,20 +289,6 @@ _cogl_driver_pixel_format_to_gl_with_target (CoglContext *context,
   return required_format;
 }
 
-static CoglPixelFormat
-_cogl_driver_pixel_format_to_gl (CoglContext *context,
-                                 CoglPixelFormat  format,
-                                 GLenum *out_glintformat,
-                                 GLenum *out_glformat,
-                                 GLenum *out_gltype)
-{
-  return _cogl_driver_pixel_format_to_gl_with_target (context,
-                                                      format, format,
-                                                      out_glintformat,
-                                                      out_glformat,
-                                                      out_gltype);
-}
-
 static CoglBool
 _cogl_get_gl_version (CoglContext *ctx,
                       int *major_out,
@@ -693,7 +669,6 @@ _cogl_driver_gl =
   {
     _cogl_driver_pixel_format_from_gl_internal,
     _cogl_driver_pixel_format_to_gl,
-    _cogl_driver_pixel_format_to_gl_with_target,
     _cogl_driver_update_features,
     _cogl_offscreen_gl_allocate,
     _cogl_offscreen_gl_free,

cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c

@@ -114,18 +114,6 @@ _cogl_texture_driver_gen (CoglContext *ctx,
                                  red_swizzle) );
     }
 
-  /* If swizzle extension is available, prefer it to flip bgra buffers to rgba */
-  if ((internal_format == COGL_PIXEL_FORMAT_BGRA_8888 ||
-       internal_format == COGL_PIXEL_FORMAT_BGRA_8888_PRE) &&
-      _cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE))
-    {
-      static const GLint bgra_swizzle[] = { GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA };
-
-      GE( ctx, glTexParameteriv (gl_target,
-                                 GL_TEXTURE_SWIZZLE_RGBA,
-                                 bgra_swizzle) );
-    }
-
   return tex;
 }
 

cogl/cogl/driver/gl/gles/cogl-driver-gles.c

@@ -67,12 +67,11 @@ _cogl_driver_pixel_format_from_gl_internal (CoglContext *context,
 }
 
 static CoglPixelFormat
-_cogl_driver_pixel_format_to_gl_with_target (CoglContext *context,
+_cogl_driver_pixel_format_to_gl (CoglContext *context,
-                                             CoglPixelFormat format,
+                                 CoglPixelFormat  format,
-                                             CoglPixelFormat target_format,
+                                 GLenum *out_glintformat,
-                                             GLenum *out_glintformat,
+                                 GLenum *out_glformat,
-                                             GLenum *out_glformat,
+                                 GLenum *out_gltype)
-                                             GLenum *out_gltype)
 {
   CoglPixelFormat required_format;
   GLenum glintformat;
@@ -220,20 +219,6 @@ _cogl_driver_pixel_format_to_gl_with_target (CoglContext *context,
   return required_format;
 }
 
-static CoglPixelFormat
-_cogl_driver_pixel_format_to_gl (CoglContext *context,
-                                 CoglPixelFormat  format,
-                                 GLenum *out_glintformat,
-                                 GLenum *out_glformat,
-                                 GLenum *out_gltype)
-{
-  return _cogl_driver_pixel_format_to_gl_with_target (context,
-                                                      format, format,
-                                                      out_glintformat,
-                                                      out_glformat,
-                                                      out_gltype);
-}
-
 static CoglBool
 _cogl_get_gl_version (CoglContext *ctx,
                       int *major_out,
@@ -472,7 +457,6 @@ _cogl_driver_gles =
   {
     _cogl_driver_pixel_format_from_gl_internal,
     _cogl_driver_pixel_format_to_gl,
-    _cogl_driver_pixel_format_to_gl_with_target,
     _cogl_driver_update_features,
     _cogl_offscreen_gl_allocate,
     _cogl_offscreen_gl_free,

cogl/cogl/driver/nop/cogl-driver-nop.c

@@ -61,7 +61,6 @@ _cogl_driver_nop =
   {
     NULL, /* pixel_format_from_gl_internal */
     NULL, /* pixel_format_to_gl */
-    NULL, /* pixel_format_to_gl_with_target */
     _cogl_driver_update_features,
     _cogl_offscreen_nop_allocate,
     _cogl_offscreen_nop_free,