Bump version to 3.22.3

Update NEWS.

.gitignore

@@ -86,7 +86,6 @@ 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,81 +1,47 @@
-3.23.90
-=======
+3.22.3
+======
+* Fix switching between two finger- and edge scrolling on wayland [Rui; #771744]
+* Fix frequent freezes in multihead setups on wayland [Rui; #774557]
+* Preserve root window mask on XSelectionRequest [Olivier; #776128]
 * Fix window menu placement with HiDPI [Jonas; #776055]
-* Improve EGLStream support [Jonas; #773629]
-* Start moving low-level monitor configuration into mutter [Jonas; #777732]
+* Fix HiDPI detection on vertical monitor layouts [Carlos; #777687]
 * 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]
+* Extend tablet device checks [Carlos; #773779]
 * 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]
+* Allow edge-scrolling without 2fg-scroll capable devices [Rui; #778554]
+* Misc. bug fixes [Jonas, Rui, Carlos, Peter; #771297, #774135, #775986,
+  #777691, #777470, #778262, #776919]
 
 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
+  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Peter Hutterer, Adam Jackson,
+  Jose Marino, Rui Matos
 
 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]
+  Mandy Wang [zh_CN]
 
-3.23.3
+3.22.2
 ======
-* 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]
+* Improve pointer constraints support [Jonas; #771859]
+* Stack docks below other windows on fullscreen monitors [Rui; #772937]
+* Fix switching between two finger- and edge scrolling on wayland [Rui; #771744]
+* Fix popup grabs blocking screen lock on wayland [Rui; #771235]
+* Fix various crashes on wayland [Jonas; #771646, #771858]
+* Fix various placement issues on wayland [Jonas, Sjoerd, Olivier; #768039,
+  #771841, #773141, #772729]
 * 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
+  Jonas Ådahl, Olivier Fourdan, Rui Matos, Sjoerd Simons
 
 Translations:
-  Theppitak Karoonboonyanan [th], Kjartan Maraas [nb], Hannie Dumoleyn [nl],
-  liushuyu [zh_CN]
+  Theppitak Karoonboonyanan [th], Kjartan Maraas [nb], liushuyu [zh_CN],
+  YunQiang Su [zh_CN]
 
 3.22.1
 ======

autogen.sh

@@ -6,21 +6,16 @@ test -z "$srcdir" && srcdir=.
 
 REQUIRED_AUTOMAKE_VERSION=1.11
 
-pushd $srcdir
-
-(test -f configure.ac \
-  && test -d src) || {
+(test -f $srcdir/configure.ac \
+  && test -d $srcdir/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
-intltoolize --force --copy --automake || exit 1
-autoreconf --verbose --force --install || exit 1
-
-popd
-
-if [ "$NOCONFIGURE" = "" ]; then
-    $srcdir/configure "$@" || exit 1
-fi
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from GNOME Subversion (or from"
+    echo "your distribution's package manager)."
+    exit 1
+}
+. gnome-autogen.sh

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 		\
@@ -198,6 +198,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 +240,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 +248,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 +355,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,13 +413,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 += \
@@ -442,10 +439,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 =
@@ -583,17 +580,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-pango/libmutter-cogl-pango-$(LIBMUTTER_API_VERSION).la \
-	$(top_builddir)/../cogl/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/../cogl/cogl/libmutter-cogl.la \
+	$(top_builddir)/../cogl/cogl-pango/libmutter-cogl-pango.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 +608,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 +627,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 || \
-	      { rm -f $$lib.0 && ln -s 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-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 || \
-	      { rm -f $$lib && ln -s 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-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
 	    } \
 	  ) ; \
 	done
@@ -644,65 +641,59 @@ install-exec-local:
 # gobject-introspection rules
 -include $(INTROSPECTION_MAKEFILE)
 
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(top_builddir)/../cogl/cogl \
-	--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}
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/../cogl/cogl --add-include-path=$(top_builddir)/../cogl/cogl-pango
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/../cogl/cogl --includedir=$(top_builddir)/../cogl/cogl-pango
 
-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_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
-Clutter_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
-Clutter_@LIBMUTTER_API_VERSION@_gir_FILES = \
+Clutter_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Clutter
+Clutter_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
+Clutter_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
+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_@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_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+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_@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_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
-Cally_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
-Cally_@LIBMUTTER_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
-Cally_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-Cally_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+Cally_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally
+Cally_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
+Cally_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
+Cally_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
+Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+Cally_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='cally/cally.h' \
-	--pkg-export=mutter-cally-@LIBMUTTER_API_VERSION@ \
-	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir
+	--pkg-export=mutter-cally-@CLUTTER_API_VERSION@ \
+	--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_@LIBMUTTER_API_VERSION@_gir_INCLUDES = xlib-2.0
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_FILES = $(x11_introspection)
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-ClutterX11_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = ClutterX11
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = xlib-2.0
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_FILES = $(x11_introspection)
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='clutter/x11/clutter-x11.h' \
-	--pkg-export=mutter-clutter-x11-@LIBMUTTER_API_VERSION@ \
-	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir
+	--pkg-export=mutter-clutter-x11-@CLUTTER_API_VERSION@ \
+	--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-device-manager-private.h

@@ -154,12 +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);
 };
 
 /* Platform-dependent interface */

clutter/clutter/clutter-device-manager.c

@@ -48,7 +48,6 @@
 #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 +70,6 @@ enum
 {
   DEVICE_ADDED,
   DEVICE_REMOVED,
-  TOOL_CHANGED,
 
   LAST_SIGNAL
 };
@@ -186,16 +184,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

clutter/clutter/clutter-device-manager.h

@@ -83,7 +83,7 @@ struct _ClutterDeviceManagerClass
                                            ClutterInputDevice     *device);
   void                (* select_stage_events) (ClutterDeviceManager *manager,
                                                ClutterStage       *stage);
-  ClutterVirtualInputDevice *(* create_virtual_device) (ClutterDeviceManager  *device_manager,
+  ClutterVirtualInputDevice *(* create_virtual_device) (ClutterDeviceManager  *manager,
                                                         ClutterInputDeviceType device_type);
   void                (* compress_motion) (ClutterDeviceManager *device_manger,
                                            ClutterEvent         *event,

clutter/clutter/clutter-event.c

@@ -1990,28 +1990,22 @@ clutter_event_remove_filter (guint id)
 }
 
 /**
- * clutter_event_get_touchpad_gesture_finger_count:
- * @event: a touchpad swipe/pinch event
+ * clutter_event_get_gesture_swipe_finger_count:
+ * @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 ||
-                        event->type == CLUTTER_TOUCHPAD_PINCH, 0);
+  g_return_val_if_fail (event->type == CLUTTER_TOUCHPAD_SWIPE, 0);
 
-  if (event->type == CLUTTER_TOUCHPAD_SWIPE)
-    return event->touchpad_swipe.n_fingers;
-  else if (event->type == CLUTTER_TOUCHPAD_PINCH)
-    return event->touchpad_pinch.n_fingers;
-
-  return 0;
+  return event->touchpad_swipe.n_fingers;
 }
 
 /**

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)
 {

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

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/evdev/clutter-device-manager-evdev.c

@@ -124,7 +124,6 @@ G_DEFINE_TYPE_WITH_CODE (ClutterDeviceManagerEvdev,
 static ClutterOpenDeviceCallback  device_open_callback;
 static ClutterCloseDeviceCallback device_close_callback;
 static gpointer                   device_callback_data;
-static gchar *                    evdev_seat_id;
 
 #ifdef CLUTTER_ENABLE_DEBUG
 static const char *device_type_str[] = {
@@ -312,9 +311,6 @@ new_absolute_motion_event (ClutterInputDevice *input_device,
   _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
   event->motion.x = x;
   event->motion.y = y;
-  clutter_input_device_evdev_translate_coordinates (input_device, stage,
-                                                    &event->motion.x,
-                                                    &event->motion.y);
   event->motion.axes = axes;
   clutter_event_set_source_device (event, input_device);
 
@@ -513,10 +509,6 @@ notify_touch_event (ClutterInputDevice *input_device,
   event->touch.device = seat->core_pointer;
   event->touch.x = x;
   event->touch.y = y;
-  clutter_input_device_evdev_translate_coordinates (input_device, stage,
-                                                    &event->touch.x,
-                                                    &event->touch.y);
-
   /* "NULL" sequences are special cased in clutter */
   event->touch.sequence = GINT_TO_POINTER (slot + 1);
   _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
@@ -538,8 +530,7 @@ notify_pinch_gesture_event (ClutterInputDevice          *input_device,
                             gdouble                      dx,
                             gdouble                      dy,
                             gdouble                      angle_delta,
-                            gdouble                      scale,
-                            guint                        n_fingers)
+                            gdouble                      scale)
 {
   ClutterInputDeviceEvdev *device_evdev;
   ClutterSeatEvdev *seat;
@@ -570,7 +561,6 @@ notify_pinch_gesture_event (ClutterInputDevice          *input_device,
   event->touchpad_pinch.dy = dy;
   event->touchpad_pinch.angle_delta = angle_delta;
   event->touchpad_pinch.scale = scale;
-  event->touchpad_pinch.n_fingers = n_fingers;
 
   _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
 
@@ -668,7 +658,6 @@ notify_pad_button (ClutterInputDevice *input_device,
                    guint64             time_us,
                    guint32             button,
                    guint32             mode_group,
-                   guint32             mode,
                    guint32             pressed)
 {
   ClutterInputDeviceEvdev *device_evdev;
@@ -694,7 +683,6 @@ notify_pad_button (ClutterInputDevice *input_device,
   event->pad_button.stage = stage;
   event->pad_button.button = button;
   event->pad_button.group = mode_group;
-  event->pad_button.mode = mode;
   clutter_event_set_device (event, input_device);
   clutter_event_set_source_device (event, input_device);
   clutter_event_set_time (event, us2ms (time_us));
@@ -710,7 +698,6 @@ notify_pad_strip (ClutterInputDevice *input_device,
                   guint32             strip_number,
                   guint32             strip_source,
                   guint32             mode_group,
-                  guint32             mode,
                   gdouble             value)
 {
   ClutterInputDeviceEvdev *device_evdev;
@@ -740,7 +727,6 @@ notify_pad_strip (ClutterInputDevice *input_device,
   event->pad_strip.strip_number = strip_number;
   event->pad_strip.value = value;
   event->pad_strip.group = mode_group;
-  event->pad_strip.mode = mode;
   clutter_event_set_device (event, input_device);
   clutter_event_set_source_device (event, input_device);
   clutter_event_set_time (event, us2ms (time_us));
@@ -756,7 +742,6 @@ notify_pad_ring (ClutterInputDevice *input_device,
                  guint32             ring_number,
                  guint32             ring_source,
                  guint32             mode_group,
-                 guint32             mode,
                  gdouble             angle)
 {
   ClutterInputDeviceEvdev *device_evdev;
@@ -786,7 +771,6 @@ notify_pad_ring (ClutterInputDevice *input_device,
   event->pad_ring.ring_number = ring_number;
   event->pad_ring.angle = angle;
   event->pad_ring.group = mode_group;
-  event->pad_ring.mode = mode;
   clutter_event_set_device (event, input_device);
   clutter_event_set_source_device (event, input_device);
   clutter_event_set_time (event, us2ms (time_us));
@@ -1224,17 +1208,11 @@ input_device_update_tool (ClutterInputDevice          *input_device,
         }
     }
 
-  if (evdev_device->last_tool != tool)
-    {
-      evdev_device->last_tool = tool;
-      g_signal_emit_by_name (clutter_device_manager_get_default (),
-                             "tool-changed", input_device, tool);
-    }
+  evdev_device->last_tool = tool;
 }
 
 static gdouble *
-translate_tablet_axes (struct libinput_event_tablet_tool *tablet_event,
-                       ClutterInputDeviceTool            *tool)
+translate_tablet_axes (struct libinput_event_tablet_tool *tablet_event)
 {
   GArray *axes = g_array_new (FALSE, FALSE, sizeof (gdouble));
   struct libinput_tablet_tool *libinput_tool;
@@ -1256,7 +1234,6 @@ translate_tablet_axes (struct libinput_event_tablet_tool *tablet_event,
   if (libinput_tablet_tool_has_pressure (libinput_tool))
     {
       value = libinput_event_tablet_tool_get_pressure (tablet_event);
-      value = clutter_input_device_tool_evdev_translate_pressure (tool, value);
       g_array_append_val (axes, value);
     }
 
@@ -1640,7 +1617,6 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
         struct libinput_event_gesture *gesture_event =
           libinput_event_get_gesture_event (event);
         ClutterTouchpadGesturePhase phase;
-        guint n_fingers;
         guint64 time_us;
 
         if (libinput_event_get_type (event) == LIBINPUT_EVENT_GESTURE_PINCH_BEGIN)
@@ -1649,10 +1625,9 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
           phase = libinput_event_gesture_get_cancelled (gesture_event) ?
             CLUTTER_TOUCHPAD_GESTURE_PHASE_CANCEL : CLUTTER_TOUCHPAD_GESTURE_PHASE_END;
 
-        n_fingers = libinput_event_gesture_get_finger_count (gesture_event);
         device = libinput_device_get_user_data (libinput_device);
         time_us = libinput_event_gesture_get_time_usec (gesture_event);
-        notify_pinch_gesture_event (device, phase, time_us, 0, 0, 0, 0, n_fingers);
+        notify_pinch_gesture_event (device, phase, time_us, 0, 0, 0, 0);
         break;
       }
     case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE:
@@ -1660,10 +1635,8 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
         struct libinput_event_gesture *gesture_event =
           libinput_event_get_gesture_event (event);
         gdouble angle_delta, scale, dx, dy;
-        guint n_fingers;
         guint64 time_us;
 
-        n_fingers = libinput_event_gesture_get_finger_count (gesture_event);
         device = libinput_device_get_user_data (libinput_device);
         time_us = libinput_event_gesture_get_time_usec (gesture_event);
         angle_delta = libinput_event_gesture_get_angle_delta (gesture_event);
@@ -1673,7 +1646,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
 
         notify_pinch_gesture_event (device,
                                     CLUTTER_TOUCHPAD_GESTURE_PHASE_UPDATE,
-                                    time_us, dx, dy, angle_delta, scale, n_fingers);
+                                    time_us, dx, dy, angle_delta, scale);
         break;
       }
     case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
@@ -1734,8 +1707,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
         if (!stage)
           break;
 
-        axes = translate_tablet_axes (tablet_event,
-                                      evdev_device->last_tool);
+        axes = translate_tablet_axes (tablet_event);
         if (!axes)
           break;
 
@@ -1775,11 +1747,8 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
 
         libinput_tool = libinput_event_tablet_tool_get_tool (tablet_event);
 
-        if (state == LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN)
-          input_device_update_tool (device, libinput_tool);
+        input_device_update_tool (device, libinput_tool);
         notify_proximity (device, time, state == LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN);
-        if (state == LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT)
-          input_device_update_tool (device, NULL);
         break;
       }
     case LIBINPUT_EVENT_TABLET_TOOL_BUTTON:
@@ -1821,7 +1790,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
     case LIBINPUT_EVENT_TABLET_PAD_BUTTON:
       {
         guint64 time;
-        guint32 button_state, button, group, mode;
+        guint32 button_state, button, group;
         struct libinput_tablet_pad_mode_group *mode_group;
         struct libinput_event_tablet_pad *pad_event =
           libinput_event_get_tablet_pad_event (event);
@@ -1831,18 +1800,17 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
 
         mode_group = libinput_event_tablet_pad_get_mode_group (pad_event);
         group = libinput_tablet_pad_mode_group_get_index (mode_group);
-        mode = libinput_event_tablet_pad_get_mode (pad_event);
 
         button = libinput_event_tablet_pad_get_button_number (pad_event);
         button_state = libinput_event_tablet_pad_get_button_state (pad_event) ==
                        LIBINPUT_BUTTON_STATE_PRESSED;
-        notify_pad_button (device, time, button, group, mode, button_state);
+        notify_pad_button (device, time, button, group, button_state);
         break;
       }
     case LIBINPUT_EVENT_TABLET_PAD_STRIP:
       {
         guint64 time;
-        guint32 number, source, group, mode;
+        guint32 number, source, group;
         struct libinput_tablet_pad_mode_group *mode_group;
         struct libinput_event_tablet_pad *pad_event =
           libinput_event_get_tablet_pad_event (event);
@@ -1856,15 +1824,14 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
 
         mode_group = libinput_event_tablet_pad_get_mode_group (pad_event);
         group = libinput_tablet_pad_mode_group_get_index (mode_group);
-        mode = libinput_event_tablet_pad_get_mode (pad_event);
 
-        notify_pad_strip (device, time, number, source, group, mode, value);
+        notify_pad_strip (device, time, number, source, group, value);
         break;
       }
     case LIBINPUT_EVENT_TABLET_PAD_RING:
       {
         guint64 time;
-        guint32 number, source, group, mode;
+        guint32 number, source, group;
         struct libinput_tablet_pad_mode_group *mode_group;
         struct libinput_event_tablet_pad *pad_event =
           libinput_event_get_tablet_pad_event (event);
@@ -1878,9 +1845,8 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
 
         mode_group = libinput_event_tablet_pad_get_mode_group (pad_event);
         group = libinput_tablet_pad_mode_group_get_index (mode_group);
-        mode = libinput_event_tablet_pad_get_mode (pad_event);
 
-        notify_pad_ring (device, time, number, source, group, mode, angle);
+        notify_pad_ring (device, time, number, source, group, angle);
         break;
       }
     default:
@@ -2062,8 +2028,7 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
       return;
     }
 
-  if (libinput_udev_assign_seat (priv->libinput,
-                                 evdev_seat_id ? evdev_seat_id : "seat0") == -1)
+  if (libinput_udev_assign_seat (priv->libinput, "seat0") == -1)
     {
       g_critical ("Failed to assign a seat to the libinput object.");
       libinput_unref (priv->libinput);
@@ -2812,18 +2777,3 @@ clutter_evdev_warp_pointer (ClutterInputDevice   *pointer_device,
 {
   notify_absolute_motion (pointer_device, ms2us(time_), x, y, NULL);
 }
-
-/**
- * clutter_evdev_set_seat_id:
- * @seat_id: The seat ID
- *
- * Sets the seat to assign to the libinput context.
- *
- * For reliable effects, this function must be called before clutter_init().
- */
-void
-clutter_evdev_set_seat_id (const gchar *seat_id)
-{
-  g_free (evdev_seat_id);
-  evdev_seat_id = g_strdup (seat_id);
-}

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
@@ -153,14 +150,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,69 +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 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;
-
-  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;
 }
 
 /*
@@ -251,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));
@@ -291,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);
 }
 
@@ -425,39 +313,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

@@ -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;
@@ -106,11 +102,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

@@ -32,7 +32,6 @@
 
 #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
@@ -438,7 +437,6 @@ clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
                                   uint32_t            button,
                                   uint32_t            state)
 {
-  ClutterInputDeviceEvdev *device_evdev = (ClutterInputDeviceEvdev *) input_device;
   ClutterStage *stage;
   ClutterEvent *event = NULL;
   gint button_nr;
@@ -534,21 +532,13 @@ clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
   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)
     {
+      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);
     }

clutter/clutter/mutter-clutter.pc.in

@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@/mutter
 includedir=@includedir@/mutter
 
-apiversion=@LIBMUTTER_API_VERSION@
-requires=@CLUTTER_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+apiversion=@CLUTTER_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-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
    */
@@ -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_PropertyEvent))
+        xi_event->evtype == XI_DeviceChanged))
     {
       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
@@ -173,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-virtual-input-device-x11.c

@@ -27,9 +27,6 @@
 
 #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"
 
@@ -64,8 +61,6 @@ clutter_virtual_input_device_x11_notify_button (ClutterVirtualInputDevice *virtu
                                                 uint32_t                   button,
                                                 ClutterButtonState         button_state)
 {
-  XTestFakeButtonEvent (clutter_x11_get_default_display (),
-                        button, button_state == CLUTTER_BUTTON_STATE_PRESSED, 0);
 }
 
 static void
@@ -74,21 +69,6 @@ clutter_virtual_input_device_x11_notify_key (ClutterVirtualInputDevice *virtual_
                                              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
@@ -106,5 +86,4 @@ clutter_virtual_input_device_x11_class_init (ClutterVirtualInputDeviceX11Class *
   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/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)])
@@ -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

@@ -110,8 +110,8 @@ clean-wrappers:
 .PHONY: wrappers clean-wrappers
 
 common_ldadd = \
-  $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la \
-  $(top_builddir)/../cogl/cogl/libmutter-cogl-@LIBMUTTER_API_VERSION@.la
+  $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la \
+  $(top_builddir)/../cogl/cogl/libmutter-cogl.la
 
 check_PROGRAMS = test-interactive
 check_SCRIPTS = wrappers
@@ -127,7 +127,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/micro-bench/Makefile.am

@@ -1,6 +1,6 @@
 common_ldadd = \
-  $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la \
-  $(top_builddir)/../cogl/cogl/libmutter-cogl-@LIBMUTTER_API_VERSION@.la
+  $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la \
+  $(top_builddir)/../cogl/cogl/libmutter-cogl.la
 
 
 check_PROGRAMS = \
@@ -20,7 +20,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/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_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_cogl_gles2_la_SOURCES = cogl-gles2-api.c
+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@
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+apiversion=1.0
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
-Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-gles2-@LIBMUTTER_API_VERSION@
+Version: @COGL_1_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_@LIBMUTTER_API_VERSION@_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_@LIBMUTTER_API_VERSION@_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_cogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
+libmutter_cogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+libmutter_cogl_pango_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl.la
+libmutter_cogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_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_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
-CoglPango_@LIBMUTTER_API_VERSION@_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la libmutter-cogl-pango-$(LIBMUTTER_API_VERSION).la
-CoglPango_@LIBMUTTER_API_VERSION@_gir_FILES = $(source_h) $(source_c)
-CoglPango_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
-CoglPango_@LIBMUTTER_API_VERSION@_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
-CoglPango_@LIBMUTTER_API_VERSION@_gir_EXPORT_PACKAGES = mutter-cogl-pango-@LIBMUTTER_API_VERSION@
-CoglPango_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+CoglPango_1_0_gir_NAMESPACE = CoglPango
+CoglPango_1_0_gir_VERSION = 1.0
+CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl.la libmutter-cogl-pango.la
+CoglPango_1_0_gir_FILES = $(source_h) $(source_c)
+CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
+CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
+CoglPango_1_0_gir_EXPORT_PACKAGES = mutter-cogl-pango-1.0
+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@
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+apiversion=1.0
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
-Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-pango-@LIBMUTTER_API_VERSION@
+Version: @COGL_1_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)
-nodist_libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
-libmutter_cogl_path_@LIBMUTTER_API_VERSION@_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_@LIBMUTTER_API_VERSION@_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
+libmutter_cogl_path_la_SOURCES = $(source_c) $(source_h)
+nodist_libmutter_cogl_path_la_SOURCES = $(BUILT_SOURCES)
+libmutter_cogl_path_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+libmutter_cogl_path_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl.la
+libmutter_cogl_path_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_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@
-requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
+apiversion=1.0
+requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
 
 Name: Cogl
 Description: A 2D path drawing library for Cogl
-Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-path-@LIBMUTTER_API_VERSION@
+Version: @COGL_1_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)
-nodist_libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
+libmutter_cogl_la_SOURCES = $(cogl_sources_c)
+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_@LIBMUTTER_API_VERSION@_gir_VERSION = $(LIBMUTTER_API_VERSION)
-Cogl_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-cogl-$(LIBMUTTER_API_VERSION).la
+Cogl_1_0_gir_NAMESPACE = Cogl
+Cogl_1_0_gir_VERSION = 1.0
+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_@LIBMUTTER_API_VERSION@_gir_INCLUDES = GL-1.0 GObject-2.0
-Cogl_@LIBMUTTER_API_VERSION@_gir_EXPORT_PACKAGES = mutter-cogl-@LIBMUTTER_API_VERSION@
-Cogl_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
+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_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
+Cogl_1_0_gir_EXPORT_PACKAGES = mutter-cogl-1.0
+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.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-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-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 &&
-      strcmp (strings->vendor_string, "NVIDIA Corporation") != 0)
+  if (strcmp (strings->vendor_string, "NVIDIA") != 0)
     return FALSE;
 
   return TRUE;

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

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

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,
-                                    int width,
-                                    int height,
-                                    CoglPixelFormat format,
-                                    EGLImageKHR image,
-                                    CoglError **error)
+_cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
+                                     int width,
+                                     int height,
+                                     CoglPixelFormat format,
+                                     EGLImageKHR image,
+                                     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,
-                                                    width, height,
-                                                    internal_format,
-                                                    image,
-                                                    error);
+          tex = _cogl_egl_texture_2d_new_from_image (ctx,
+                                                     width, height,
+                                                     internal_format,
+                                                     image,
+                                                     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_EGL_IMAGE_EXTERNAL
+  COGL_TEXTURE_SOURCE_TYPE_GL_FOREIGN
 } 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)
  */

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

cogl/cogl/mutter-cogl-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@
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
-Version: @MUTTER_VERSION@
-Libs: -L${libdir} -lmutter-cogl-@LIBMUTTER_API_VERSION@
+Version: @COGL_1_VERSION@
+Libs: -L${libdir} -lmutter-cogl
 Cflags: -I${includedir}/cogl
 Requires: ${requires}

cogl/cogl/winsys/cogl-winsys-egl-x11.c

@@ -48,7 +48,6 @@
 
 #include "cogl-texture-pixmap-x11-private.h"
 #include "cogl-texture-2d-private.h"
-#include "cogl-texture-2d.h"
 #include "cogl-error-private.h"
 #include "cogl-poll-private.h"
 
@@ -323,19 +322,6 @@ error:
   return FALSE;
 }
 
-static int
-_cogl_winsys_egl_add_config_attributes (CoglDisplay *display,
-                                        CoglFramebufferConfig *config,
-                                        EGLint *attributes)
-{
-  int i = 0;
-
-  attributes[i++] = EGL_SURFACE_TYPE;
-  attributes[i++] = EGL_WINDOW_BIT;
-
-  return i;
-}
-
 static CoglBool
 _cogl_winsys_egl_display_setup (CoglDisplay *display,
                                 CoglError **error)
@@ -774,12 +760,12 @@ _cogl_winsys_texture_pixmap_x11_create (CoglTexturePixmapX11 *tex_pixmap)
                     COGL_PIXEL_FORMAT_RGB_888);
 
   egl_tex_pixmap->texture = COGL_TEXTURE (
-    cogl_egl_texture_2d_new_from_image (ctx,
-                                        tex->width,
-                                        tex->height,
-                                        texture_format,
-                                        egl_tex_pixmap->image,
-                                        NULL));
+    _cogl_egl_texture_2d_new_from_image (ctx,
+                                         tex->width,
+                                         tex->height,
+                                         texture_format,
+                                         egl_tex_pixmap->image,
+                                         NULL));
 
   tex_pixmap->winsys = egl_tex_pixmap;
 
@@ -840,7 +826,6 @@ _cogl_winsys_texture_pixmap_x11_get_texture (CoglTexturePixmapX11 *tex_pixmap,
 static const CoglWinsysEGLVtable
 _cogl_winsys_egl_vtable =
   {
-    .add_config_attributes = _cogl_winsys_egl_add_config_attributes,
     .display_setup = _cogl_winsys_egl_display_setup,
     .display_destroy = _cogl_winsys_egl_display_destroy,
     .context_created = _cogl_winsys_egl_context_created,

cogl/cogl/winsys/cogl-winsys-egl.c

@@ -233,11 +233,11 @@ egl_attributes_from_framebuffer_config (CoglDisplay *display,
   CoglRendererEGL *egl_renderer = renderer->winsys;
   int i = 0;
 
-  /* Let the platform add attributes first, including setting the
-   * EGL_SURFACE_TYPE */
-  i = egl_renderer->platform_vtable->add_config_attributes (display,
-                                                            config,
-                                                            attributes);
+  /* Let the platform add attributes first */
+  if (egl_renderer->platform_vtable->add_config_attributes)
+    i = egl_renderer->platform_vtable->add_config_attributes (display,
+                                                              config,
+                                                              attributes);
 
   if (config->need_stencil)
     {
@@ -269,6 +269,9 @@ egl_attributes_from_framebuffer_config (CoglDisplay *display,
                      EGL_OPENGL_ES_BIT :
                      EGL_OPENGL_ES2_BIT);
 
+  attributes[i++] = EGL_SURFACE_TYPE;
+  attributes[i++] = EGL_WINDOW_BIT;
+
   if (config->samples_per_pixel)
     {
        attributes[i++] = EGL_SAMPLE_BUFFERS;

cogl/cogl/winsys/cogl-winsys-glx.c

@@ -65,16 +65,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <time.h>
-#include <unistd.h>
 
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 
-#include <glib.h>
-
 /* This is a relatively new extension */
 #ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV
 #define GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x20F7
@@ -104,14 +100,6 @@ typedef struct _CoglOnscreenGLX
   CoglBool pending_sync_notify;
   CoglBool pending_complete_notify;
   CoglBool pending_resize_notify;
-
-  GThread *swap_wait_thread;
-  GQueue *swap_wait_queue;
-  GCond swap_wait_cond;
-  GMutex swap_wait_mutex;
-  int swap_wait_pipe[2];
-  GLXContext swap_wait_context;
-  CoglBool closing_down;
 } CoglOnscreenGLX;
 
 typedef struct _CoglPixmapTextureEyeGLX
@@ -204,15 +192,6 @@ find_onscreen_for_xid (CoglContext *context, uint32_t xid)
   return NULL;
 }
 
-static int64_t
-get_monotonic_time_ns (void)
-{
-  struct timespec ts;
-
-  clock_gettime (CLOCK_MONOTONIC, &ts);
-  return ts.tv_sec * G_GINT64_CONSTANT (1000000000) + ts.tv_nsec;
-}
-
 static void
 ensure_ust_type (CoglRenderer *renderer,
                  GLXDrawable drawable)
@@ -223,6 +202,7 @@ ensure_ust_type (CoglRenderer *renderer,
   int64_t msc;
   int64_t sbc;
   struct timeval tv;
+  struct timespec ts;
   int64_t current_system_time;
   int64_t current_monotonic_time;
 
@@ -252,7 +232,9 @@ ensure_ust_type (CoglRenderer *renderer,
 
   /* This is the time source that the newer (fixed) linux drm
    * drivers use (Linux >= 3.8) */
-  current_monotonic_time = get_monotonic_time_ns () / 1000;
+  clock_gettime (CLOCK_MONOTONIC, &ts);
+  current_monotonic_time = (ts.tv_sec * G_GINT64_CONSTANT (1000000)) +
+    (ts.tv_nsec / G_GINT64_CONSTANT (1000));
 
   if (current_monotonic_time > ust - 1000000 &&
       current_monotonic_time < ust + 1000000)
@@ -308,9 +290,6 @@ _cogl_winsys_get_clock_time (CoglContext *context)
 {
   CoglGLXRenderer *glx_renderer = context->display->renderer->winsys;
 
-  if (!glx_renderer->glXWaitForMsc)
-    return get_monotonic_time_ns ();
-
   /* We don't call ensure_ust_type() because we don't have a drawable
    * to work with. cogl_get_clock_time() is documented to only work
    * once a valid, non-zero, timestamp has been retrieved from Cogl.
@@ -331,7 +310,10 @@ _cogl_winsys_get_clock_time (CoglContext *context)
       }
     case COGL_GLX_UST_IS_MONOTONIC_TIME:
       {
-        return get_monotonic_time_ns ();
+        struct timespec ts;
+
+        clock_gettime (CLOCK_MONOTONIC, &ts);
+        return ts.tv_sec * G_GINT64_CONSTANT (1000000000) + ts.tv_nsec;
       }
     }
 
@@ -730,25 +712,23 @@ update_base_winsys_features (CoglRenderer *renderer)
 
   g_strfreev (split_extensions);
 
-  /* The GLX_SGI_video_sync spec explicitly states this extension
-   * only works for direct contexts; we don't know per-renderer
-   * if the context is direct or not, so we turn off the feature
-   * flag; we still use the extension within this file looking
-   * instead at glx_display->have_vblank_counter.
-   */
-  COGL_FLAGS_SET (glx_renderer->base_winsys_features,
-                  COGL_WINSYS_FEATURE_VBLANK_COUNTER,
-                  FALSE);
-
+  /* Note: the GLX_SGI_video_sync spec explicitly states this extension
+   * only works for direct contexts. */
+  if (!glx_renderer->is_direct)
+    {
+      glx_renderer->glXGetVideoSync = NULL;
+      glx_renderer->glXWaitVideoSync = NULL;
+      COGL_FLAGS_SET (glx_renderer->base_winsys_features,
+                      COGL_WINSYS_FEATURE_VBLANK_COUNTER,
+                      FALSE);
+    }
 
   COGL_FLAGS_SET (glx_renderer->base_winsys_features,
                   COGL_WINSYS_FEATURE_MULTIPLE_ONSCREEN,
                   TRUE);
 
-  /* Because of the direct-context dependency, the VBLANK_WAIT feature
-   * doesn't reflect the presence of GLX_SGI_video_sync.
-   */
-  if (glx_renderer->glXWaitForMsc)
+  if (glx_renderer->glXWaitVideoSync ||
+      glx_renderer->glXWaitForMsc)
     COGL_FLAGS_SET (glx_renderer->base_winsys_features,
                     COGL_WINSYS_FEATURE_VBLANK_WAIT,
                     TRUE);
@@ -881,7 +861,7 @@ update_winsys_features (CoglContext *context, CoglError **error)
    * by the SwapInterval so we have to throttle swap_region requests
    * manually... */
   if (_cogl_winsys_has_feature (COGL_WINSYS_FEATURE_SWAP_REGION) &&
-      (glx_display->have_vblank_counter || glx_display->can_vblank_wait))
+      _cogl_winsys_has_feature (COGL_WINSYS_FEATURE_VBLANK_WAIT))
     COGL_FLAGS_SET (context->winsys_features,
                     COGL_WINSYS_FEATURE_SWAP_REGION_THROTTLE, TRUE);
 
@@ -897,29 +877,6 @@ update_winsys_features (CoglContext *context, CoglError **error)
                       COGL_FEATURE_ID_PRESENTATION_TIME,
                       TRUE);
     }
-  else
-    {
-      CoglGpuInfo *info = &context->gpu;
-      if (glx_display->have_vblank_counter &&
-	  context->display->renderer->xlib_enable_threaded_swap_wait &&
-	  info->vendor == COGL_GPU_INFO_VENDOR_NVIDIA)
-        {
-          COGL_FLAGS_SET (context->winsys_features,
-                          COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT, TRUE);
-          COGL_FLAGS_SET (context->winsys_features,
-                          COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT, TRUE);
-          /* TODO: remove this deprecated feature */
-          COGL_FLAGS_SET (context->features,
-                          COGL_FEATURE_ID_SWAP_BUFFERS_EVENT,
-                          TRUE);
-          COGL_FLAGS_SET (context->features,
-                          COGL_FEATURE_ID_PRESENTATION_TIME,
-                          TRUE);
-          COGL_FLAGS_SET (context->private_features,
-                          COGL_PRIVATE_FEATURE_THREADED_SWAP_WAIT,
-                          TRUE);
-        }
-    }
 
   /* We'll manually handle queueing dirty events in response to
    * Expose events from X */
@@ -1182,13 +1139,11 @@ create_context (CoglDisplay *display, CoglError **error)
       return FALSE;
     }
 
-  glx_display->is_direct =
+  glx_renderer->is_direct =
     glx_renderer->glXIsDirect (xlib_renderer->xdpy, glx_display->glx_context);
-  glx_display->have_vblank_counter = glx_display->is_direct && glx_renderer->glXWaitVideoSync;
-  glx_display->can_vblank_wait = glx_renderer->glXWaitForMsc || glx_display->have_vblank_counter;
 
   COGL_NOTE (WINSYS, "Setting %s context",
-             glx_display->is_direct ? "direct" : "indirect");
+             glx_renderer->is_direct ? "direct" : "indirect");
 
   /* XXX: GLX doesn't let us make a context current without a window
    * so we create a dummy window that we can use while no CoglOnscreen
@@ -1516,8 +1471,7 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
     }
 
 #ifdef GLX_INTEL_swap_event
-  if (_cogl_winsys_has_feature (COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT) &&
-      !_cogl_has_private_feature (context, COGL_PRIVATE_FEATURE_THREADED_SWAP_WAIT))
+  if (_cogl_winsys_has_feature (COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT))
     {
       GLXDrawable drawable =
         glx_onscreen->glxwin ? glx_onscreen->glxwin : xlib_onscreen->xwin;
@@ -1560,31 +1514,6 @@ _cogl_winsys_onscreen_deinit (CoglOnscreen *onscreen)
       xlib_onscreen->output = NULL;
     }
 
-  if (glx_onscreen->swap_wait_thread)
-    {
-      g_mutex_lock (&glx_onscreen->swap_wait_mutex);
-      glx_onscreen->closing_down = TRUE;
-      g_cond_signal (&glx_onscreen->swap_wait_cond);
-      g_mutex_unlock (&glx_onscreen->swap_wait_mutex);
-      g_thread_join (glx_onscreen->swap_wait_thread);
-      glx_onscreen->swap_wait_thread = NULL;
-
-      g_cond_clear (&glx_onscreen->swap_wait_cond);
-      g_mutex_clear (&glx_onscreen->swap_wait_mutex);
-
-      g_queue_free (glx_onscreen->swap_wait_queue);
-      glx_onscreen->swap_wait_queue = NULL;
-
-      _cogl_poll_renderer_remove_fd (context->display->renderer,
-                                     glx_onscreen->swap_wait_pipe[0]);
-      
-      close (glx_onscreen->swap_wait_pipe[0]);
-      close (glx_onscreen->swap_wait_pipe[1]);
-
-      glx_renderer->glXDestroyContext (xlib_renderer->xdpy,
-                                       glx_onscreen->swap_wait_context);
-    }
-
   _cogl_xlib_renderer_trap_errors (context->display->renderer, &old_state);
 
   drawable =
@@ -1726,13 +1655,12 @@ _cogl_winsys_wait_for_vblank (CoglOnscreen *onscreen)
   CoglContext *ctx = framebuffer->context;
   CoglGLXRenderer *glx_renderer;
   CoglXlibRenderer *xlib_renderer;
-  CoglGLXDisplay *glx_display;
 
   glx_renderer = ctx->display->renderer->winsys;
   xlib_renderer = _cogl_xlib_renderer_get_data (ctx->display->renderer);
-  glx_display = ctx->display->winsys;
 
-  if (glx_display->can_vblank_wait)
+  if (glx_renderer->glXWaitForMsc ||
+      glx_renderer->glXGetVideoSync)
     {
       CoglFrameInfo *info = g_queue_peek_tail (&onscreen->pending_frame_infos);
 
@@ -1754,13 +1682,16 @@ _cogl_winsys_wait_for_vblank (CoglOnscreen *onscreen)
       else
         {
           uint32_t current_count;
+          struct timespec ts;
 
           glx_renderer->glXGetVideoSync (&current_count);
           glx_renderer->glXWaitVideoSync (2,
                                           (current_count + 1) % 2,
                                           &current_count);
 
-          info->presentation_time = get_monotonic_time_ns ();
+          clock_gettime (CLOCK_MONOTONIC, &ts);
+          info->presentation_time =
+            ts.tv_sec * G_GINT64_CONSTANT (1000000000) + ts.tv_nsec;
         }
     }
 }
@@ -1818,199 +1749,6 @@ set_frame_info_output (CoglOnscreen *onscreen,
     }
 }
 
-static gpointer
-threaded_swap_wait (gpointer data)
-{
-  CoglOnscreen *onscreen = data;
-
-  CoglOnscreenGLX *glx_onscreen = onscreen->winsys;
-
-  CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
-  CoglContext *context = framebuffer->context;
-  CoglDisplay *display = context->display;
-  CoglXlibRenderer *xlib_renderer = _cogl_xlib_renderer_get_data (display->renderer);
-  CoglGLXDisplay *glx_display = display->winsys;
-  CoglGLXRenderer *glx_renderer = display->renderer->winsys;
-  GLXDrawable dummy_drawable;
-
-  if (glx_display->dummy_glxwin)
-    dummy_drawable = glx_display->dummy_glxwin;
-  else
-    dummy_drawable = glx_display->dummy_xwin;
-
-  glx_renderer->glXMakeContextCurrent (xlib_renderer->xdpy,
-                                       dummy_drawable,
-                                       dummy_drawable,
-                                       glx_onscreen->swap_wait_context);
-
-  g_mutex_lock (&glx_onscreen->swap_wait_mutex);
-
-  while (TRUE)
-    {
-      gpointer queue_element;
-      uint32_t vblank_counter;
-
-      while (!glx_onscreen->closing_down && glx_onscreen->swap_wait_queue->length == 0)
-         g_cond_wait (&glx_onscreen->swap_wait_cond, &glx_onscreen->swap_wait_mutex);
-
-      if (glx_onscreen->closing_down)
-         break;
-
-      queue_element = g_queue_pop_tail (glx_onscreen->swap_wait_queue);
-      vblank_counter = GPOINTER_TO_UINT(queue_element);
-
-      g_mutex_unlock (&glx_onscreen->swap_wait_mutex);
-      glx_renderer->glXWaitVideoSync (2,
-                                      (vblank_counter + 1) % 2,
-                                      &vblank_counter);
-      g_mutex_lock (&glx_onscreen->swap_wait_mutex);
-
-      if (!glx_onscreen->closing_down)
-         {
-           int bytes_written = 0;
-
-           union {
-             char bytes[8];
-             int64_t presentation_time;
-           } u;
-
-           u.presentation_time = get_monotonic_time_ns ();
-
-           while (bytes_written < 8)
-             {
-               int res = write (glx_onscreen->swap_wait_pipe[1], u.bytes + bytes_written, 8 - bytes_written);
-               if (res == -1)
-                 {
-                   if (errno != EINTR)
-                     g_error ("Error writing to swap notification pipe: %s\n",
-                              g_strerror (errno));
-                 }
-               else
-                 {
-                   bytes_written += res;
-                 }
-             }
-         }
-    }
-
-  g_mutex_unlock (&glx_onscreen->swap_wait_mutex);
-
-  glx_renderer->glXMakeContextCurrent (xlib_renderer->xdpy,
-                                       None,
-                                       None,
-                                       NULL);
-
-  return NULL;
-}
-
-static int64_t
-threaded_swap_wait_pipe_prepare (void *user_data)
-{
-  return -1;
-}
-
-static void
-threaded_swap_wait_pipe_dispatch (void *user_data, int revents)
-{
-  CoglOnscreen *onscreen = user_data;
-  CoglOnscreenGLX *glx_onscreen = onscreen->winsys;
-
-  CoglFrameInfo *info;
-
-  if ((revents & COGL_POLL_FD_EVENT_IN))
-    {
-      int bytes_read = 0;
-
-      union {
-         char bytes[8];
-         int64_t presentation_time;
-      } u;
-
-      while (bytes_read < 8)
-         {
-           int res = read (glx_onscreen->swap_wait_pipe[0], u.bytes + bytes_read, 8 - bytes_read);
-           if (res == -1)
-             {
-               if (errno != EINTR)
-                 g_error ("Error reading from swap notification pipe: %s\n",
-                          g_strerror (errno));
-             }
-           else
-             {
-               bytes_read += res;
-             }
-         }
-
-      set_sync_pending (onscreen);
-      set_complete_pending (onscreen);
-
-      info = g_queue_peek_head (&onscreen->pending_frame_infos);
-      info->presentation_time = u.presentation_time;
-    }
-}
-
-static void
-start_threaded_swap_wait (CoglOnscreen *onscreen,
-                           uint32_t      vblank_counter)
-{
-  CoglOnscreenGLX *glx_onscreen = onscreen->winsys;
-  CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
-  CoglContext *context = framebuffer->context;
-
-  if (glx_onscreen->swap_wait_thread == NULL)
-    {
-      CoglDisplay *display = context->display;
-      CoglGLXRenderer *glx_renderer = display->renderer->winsys;
-      CoglGLXDisplay *glx_display = display->winsys;
-      CoglOnscreenXlib *xlib_onscreen = onscreen->winsys;
-      CoglXlibRenderer *xlib_renderer =
-        _cogl_xlib_renderer_get_data (display->renderer);
-
-      GLXDrawable drawable =
-        glx_onscreen->glxwin ? glx_onscreen->glxwin : xlib_onscreen->xwin;
-      int i;
-
-      ensure_ust_type (display->renderer, drawable);
-      
-      if ((pipe (glx_onscreen->swap_wait_pipe) == -1))
-        g_error ("Couldn't create pipe for swap notification: %s\n",
-                 g_strerror (errno));
-
-      for (i = 0; i < 2; i++)
-	{
-	  if (fcntl(glx_onscreen->swap_wait_pipe[i], F_SETFD,
-		    fcntl(glx_onscreen->swap_wait_pipe[i], F_GETFD, 0) | FD_CLOEXEC) == -1)
-	    g_error ("Couldn't set swap notification pipe CLOEXEC: %s\n",
-		     g_strerror (errno));
-	}
-
-      _cogl_poll_renderer_add_fd (display->renderer,
-                                  glx_onscreen->swap_wait_pipe[0],
-                                  COGL_POLL_FD_EVENT_IN,
-                                  threaded_swap_wait_pipe_prepare,
-                                  threaded_swap_wait_pipe_dispatch,
-                                  onscreen);
-
-      glx_onscreen->swap_wait_queue = g_queue_new ();
-      g_mutex_init (&glx_onscreen->swap_wait_mutex);
-      g_cond_init (&glx_onscreen->swap_wait_cond);
-      glx_onscreen->swap_wait_context =
-         glx_renderer->glXCreateNewContext (xlib_renderer->xdpy,
-                                            glx_display->fbconfig,
-                                            GLX_RGBA_TYPE,
-                                            glx_display->glx_context,
-                                            True);
-      glx_onscreen->swap_wait_thread = g_thread_new ("cogl_glx_swap_wait",
-                                                     threaded_swap_wait,
-                                                     onscreen);
-    }
-
-  g_mutex_lock (&glx_onscreen->swap_wait_mutex);
-  g_queue_push_head (glx_onscreen->swap_wait_queue, GUINT_TO_POINTER(vblank_counter));
-  g_cond_signal (&glx_onscreen->swap_wait_cond);
-  g_mutex_unlock (&glx_onscreen->swap_wait_mutex);
-}
-
 static void
 _cogl_winsys_onscreen_swap_region (CoglOnscreen *onscreen,
                                    const int *user_rectangles,
@@ -2021,7 +1759,6 @@ _cogl_winsys_onscreen_swap_region (CoglOnscreen *onscreen,
   CoglXlibRenderer *xlib_renderer =
     _cogl_xlib_renderer_get_data (context->display->renderer);
   CoglGLXRenderer *glx_renderer = context->display->renderer->winsys;
-  CoglGLXDisplay *glx_display = context->display->winsys;
   CoglOnscreenXlib *xlib_onscreen = onscreen->winsys;
   CoglOnscreenGLX *glx_onscreen = onscreen->winsys;
   GLXDrawable drawable =
@@ -2078,8 +1815,9 @@ _cogl_winsys_onscreen_swap_region (CoglOnscreen *onscreen,
 
   if (framebuffer->config.swap_throttled)
     {
-      have_counter = glx_display->have_vblank_counter;
-      can_wait = glx_display->can_vblank_wait;
+      have_counter =
+        _cogl_winsys_has_feature (COGL_WINSYS_FEATURE_VBLANK_COUNTER);
+      can_wait = _cogl_winsys_has_feature (COGL_WINSYS_FEATURE_VBLANK_WAIT);
     }
   else
     {
@@ -2236,7 +1974,6 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
   CoglXlibRenderer *xlib_renderer =
     _cogl_xlib_renderer_get_data (context->display->renderer);
   CoglGLXRenderer *glx_renderer = context->display->renderer->winsys;
-  CoglGLXDisplay *glx_display = context->display->winsys;
   CoglOnscreenXlib *xlib_onscreen = onscreen->winsys;
   CoglOnscreenGLX *glx_onscreen = onscreen->winsys;
   CoglBool have_counter;
@@ -2254,38 +1991,21 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
 
   if (framebuffer->config.swap_throttled)
     {
-      have_counter = glx_display->have_vblank_counter;
+      uint32_t end_frame_vsync_counter = 0;
 
-      if (glx_renderer->glXSwapInterval)
+      have_counter =
+        _cogl_winsys_has_feature (COGL_WINSYS_FEATURE_VBLANK_COUNTER);
+
+      /* If the swap_region API is also being used then we need to track
+       * the vsync counter for each swap request so we can manually
+       * throttle swap_region requests. */
+      if (have_counter)
+        end_frame_vsync_counter = _cogl_winsys_get_vsync_counter (context);
+
+      if (!glx_renderer->glXSwapInterval)
         {
-          if (_cogl_has_private_feature (context, COGL_PRIVATE_FEATURE_THREADED_SWAP_WAIT))
-            {
-	      /* If we didn't wait for the GPU here, then it's easy to get the case
-	       * where there is a VBlank between the point where we get the vsync counter
-	       * and the point where the GPU is ready to actually perform the glXSwapBuffers(),
-	       * and the swap wait terminates at the first VBlank rather than the one
-	       * where the swap buffers happens. Calling glFinish() here makes this a
-	       * rare race since the GPU is already ready to swap when we call glXSwapBuffers().
-	       * The glFinish() also prevents any serious damage if the rare race happens,
-	       * since it will wait for the preceding glXSwapBuffers() and prevent us from
-	       * getting premanently ahead. (For NVIDIA drivers, glFinish() after glXSwapBuffers()
-	       * waits for the buffer swap to happen.)
-	       */
-              _cogl_winsys_wait_for_gpu (onscreen);
-              start_threaded_swap_wait (onscreen, _cogl_winsys_get_vsync_counter (context));
-            }
-        }
-      else
-        {
-          CoglBool can_wait = have_counter || glx_display->can_vblank_wait;
-
-          uint32_t end_frame_vsync_counter = 0;
-
-          /* If the swap_region API is also being used then we need to track
-           * the vsync counter for each swap request so we can manually
-           * throttle swap_region requests. */
-          if (have_counter)
-            end_frame_vsync_counter = _cogl_winsys_get_vsync_counter (context);
+          CoglBool can_wait =
+            _cogl_winsys_has_feature (COGL_WINSYS_FEATURE_VBLANK_WAIT);
 
           /* If we are going to wait for VBLANK manually, we not only
            * need to flush out pending drawing to the GPU before we

cogl/configure.ac

@@ -83,16 +83,6 @@ AC_CONFIG_HEADERS(cogl-config.h)
 AC_CONFIG_HEADERS(cogl-mutter-config.h)
 AC_GNU_SOURCE
 
-dnl ================================================================
-dnl Check that we are configured by mutter
-dnl ================================================================
-
-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])],)
-
 dnl ================================================================
 dnl Required versions for dependencies
 dnl ================================================================
@@ -955,16 +945,16 @@ AC_OUTPUT(
 Makefile
 test-fixtures/Makefile
 cogl/Makefile
-cogl/mutter-cogl-$LIBMUTTER_API_VERSION.pc:cogl/mutter-cogl.pc.in
+cogl/mutter-cogl-1.0.pc
 cogl/cogl-defines.h
 cogl/cogl-gl-header.h
 cogl/cogl-egl-defines.h
 cogl-pango/Makefile
-cogl-pango/mutter-cogl-pango-$LIBMUTTER_API_VERSION.pc:cogl-pango/mutter-cogl-pango.pc.in
+cogl-pango/mutter-cogl-pango-1.0.pc
 cogl-path/Makefile
-cogl-path/mutter-cogl-path-$LIBMUTTER_API_VERSION.pc:cogl-path/mutter-cogl-path.pc.in
+cogl-path/mutter-cogl-path-1.0.pc
 cogl-gles2/Makefile
-cogl-gles2/mutter-cogl-gles2-$LIBMUTTER_API_VERSION.pc:cogl-gles2/mutter-cogl-gles2.pc.in
+cogl-gles2/mutter-cogl-gles2-1.0.pc
 tests/Makefile
 tests/config.env
 tests/conform/Makefile

cogl/tests/conform/Makefile.am

@@ -131,10 +131,10 @@ AM_CPPFLAGS += \
 test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) -Wno-error=maybe-uninitialized -Wno-error=nested-externs -Wno-error=missing-prototypes
 test_conformance_LDADD = \
 	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/cogl/libmutter-cogl.la \
 	$(LIBM)
 if BUILD_COGL_PATH
-test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la
+test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path.la
 endif
 test_conformance_LDFLAGS = -export-dynamic
 

cogl/tests/micro-perf/Makefile.am

@@ -2,7 +2,6 @@ NULL =
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-I$(top_builddir)/cogl \
 	-DCOGL_DISABLE_DEPRECATED
 
 test_conformance_CPPFLAGS = \
@@ -17,7 +16,7 @@ AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
 
 common_ldadd = \
 	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/cogl/libmutter-cogl.la \
 	$(LIBM)
 
 test_journal_SOURCES = test-journal.c

cogl/tests/unit/Makefile.am

@@ -13,7 +13,7 @@ wrappers: stamp-test-unit
 	@true
 stamp-test-unit: Makefile test-unit$(EXEEXT)
 	@mkdir -p wrappers
-	. $(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la ; \
+	. $(top_builddir)/cogl/libmutter-cogl.la ; \
 	  $(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \
 	  grep '[DR] _\?unit_test_'|sed 's/.\+ [DR] _\?//' > unit-tests
 	@chmod +x $(top_srcdir)/tests/test-launcher.sh
@@ -62,7 +62,7 @@ AM_CPPFLAGS += \
 test_unit_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
 test_unit_LDADD = \
 	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/cogl/libmutter-cogl.la \
 	$(LIBM)
 test_unit_LDFLAGS = -export-dynamic
 

configure.ac

@@ -1,16 +1,14 @@
 AC_PREREQ(2.62)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [23])
-m4_define([mutter_micro_version], [90])
+m4_define([mutter_minor_version], [22])
+m4_define([mutter_micro_version], [3])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
 
 m4_define([mutter_plugin_api_version], [3])
 
-m4_define([libmutter_api_version], [0])
-
 AC_INIT([mutter], [mutter_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
 
@@ -29,18 +27,11 @@ AC_GNU_SOURCE
 MUTTER_MAJOR_VERSION=mutter_major_version
 MUTTER_MINOR_VERSION=mutter_minor_version
 MUTTER_MICRO_VERSION=mutter_micro_version
-MUTTER_VERSION=mutter_version
 MUTTER_PLUGIN_API_VERSION=mutter_plugin_api_version
-LIBMUTTER_API_VERSION=libmutter_api_version
 AC_SUBST(MUTTER_MAJOR_VERSION)
 AC_SUBST(MUTTER_MINOR_VERSION)
 AC_SUBST(MUTTER_MICRO_VERSION)
 AC_SUBST(MUTTER_PLUGIN_API_VERSION)
-AC_SUBST(MUTTER_VERSION)
-AC_SUBST(LIBMUTTER_API_VERSION)
-
-# Make the mutter versions visible to the cogl and clutter subdirs
-export LIBMUTTER_API_VERSION MUTTER_VERSION
 
 MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins"
 AC_SUBST(MUTTER_PLUGIN_DIR)
@@ -73,7 +64,6 @@ CANBERRA_GTK_VERSION=0.26
 LIBWACOM_VERSION=0.13
 
 MUTTER_PC_MODULES="
-   egl
    gtk+-3.0 >= 3.19.8
    gio-unix-2.0 >= 2.35.1
    pango >= 1.2.0
@@ -237,6 +227,13 @@ GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
 if test x$found_introspection != xno; then
   AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
   MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
+  # Since we don't make any guarantees about stability and we don't support
+  # parallel install, there's no real reason to change directories, filenames,
+  # etc. as we change the Mutter tarball version. Note that this must match
+  # api_version in src/Makefile.am
+  META_GIR=Meta_3_0_gir
+  # META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
+  AC_SUBST(META_GIR)
 fi
 
 AC_SUBST(XWAYLAND_PATH)
@@ -259,15 +256,6 @@ AS_IF([test "$have_native_backend" = "yes"], [
 ])
 AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])
 
-AC_ARG_ENABLE(egl-device,
-  AS_HELP_STRING([--enable-egl-device], [enable support for EGLDevice on top of KMS]),
-  enable_egl_device=yes,
-  enable_egl_device=no
-)
-AS_IF([test "$enable_egl_device" = "yes"], [
-  AC_DEFINE([HAVE_EGL_DEVICE],[1], [Defined if EGLDevice support is enabled])
-])
-
 MUTTER_WAYLAND_MODULES="wayland-server >= 1.6.90"
 
 AC_ARG_ENABLE(wayland,
@@ -463,7 +451,7 @@ data/Makefile
 doc/Makefile
 doc/man/Makefile
 src/Makefile
-src/libmutter-$LIBMUTTER_API_VERSION.pc:src/libmutter.pc.in
+src/libmutter.pc
 src/compositor/plugins/Makefile
 src/meta/meta-version.h
 po/Makefile.in
@@ -471,16 +459,6 @@ po/Makefile.in
 
 AC_OUTPUT
 
-# Check that cogl and clutter have their .pc files regenerated with the correct version
-
-COGL_PC_VERSION=$(grep Version: cogl/cogl/mutter-cogl-$LIBMUTTER_API_VERSION.pc|awk '{ print $2; }')
-AS_IF([test "x$COGL_PC_VERSION" != "x$MUTTER_VERSION"],
-      [AC_MSG_ERROR([mutter-cogl pkg-config file not updated, rerun ./configure])])
-
-CLUTTER_PC_VERSION=$(grep Version: clutter/clutter/mutter-clutter-$LIBMUTTER_API_VERSION.pc|awk '{ print $2; }')
-AS_IF([test "x$CLUTTER_PC_VERSION" != "x$MUTTER_VERSION"],
-      [AC_MSG_ERROR([mutter-clutter pkg-config file not updated, rerun ./configure])])
-
 if test x$enable_verbose_mode = xno; then
         echo "*** WARNING WARNING WARNING WARNING WARNING"
         echo "*** Building without verbose mode"
@@ -505,7 +483,6 @@ mutter-$VERSION
 	Session management:       ${found_sm}
 	Wayland:                  ${have_wayland}
 	Native (KMS) backend:     ${have_native_backend}
-	EGLDevice:                ${enable_egl_device}
 "
 
 

data/org.gnome.mutter.gschema.xml.in

@@ -6,11 +6,11 @@
       <default>'Super_L'</default>
       <summary>Modifier to use for extended window management operations</summary>
       <description>
-        This key will initiate the “overlay”, which is a combination window
+        This key will initiate the "overlay", which is a combination window
         overview and application launching system.  The default is intended
-        to be the “Windows key” on PC hardware.
+        to be the "Windows key" on PC hardware.
 
-        It’s expected that this binding either the default or set to
+        It's expected that this binding either the default or set to
         the empty string.
       </description>
     </key>
@@ -40,7 +40,7 @@
       <summary>Workspaces are managed dynamically</summary>
       <description>
         Determines whether workspaces are managed dynamically or
-        whether there’s a static number of workspaces (determined
+        whether there's a static number of workspaces (determined
         by the num-workspaces key in org.gnome.desktop.wm.preferences).
       </description>
     </key>
@@ -67,7 +67,7 @@
       <default>false</default>
       <summary>Delay focus changes until the pointer stops moving</summary>
       <description>
-        If set to true, and the focus mode is either “sloppy” or “mouse”
+        If set to true, and the focus mode is either "sloppy" or "mouse"
         then the focus will not be changed immediately when entering a
         window, but only after the pointer stops moving.
       </description>
@@ -78,7 +78,7 @@
       <range min="0" max="64"/>
       <summary>Draggable border width</summary>
       <description>
-          The amount of total draggable borders. If the theme’s visible
+          The amount of total draggable borders. If the theme's visible
           borders are not enough, invisible borders will be added to meet
           this value.
       </description>

po/POTFILES.skip

@@ -72,7 +72,6 @@ clutter/clutter/deprecated/clutter-shader.c
 clutter/clutter/deprecated/clutter-state.c
 clutter/clutter/deprecated/clutter-table-layout.c
 clutter/clutter/deprecated/clutter-texture.c
-clutter/clutter/evdev/clutter-input-device-evdev.c
 clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
 clutter/clutter/wayland/clutter-wayland-surface.c
 clutter/clutter/x11/clutter-backend-x11.c

po/cs.po

@@ -6,15 +6,15 @@
 # Petr Tomeš <ptomes@gmail.com>, 2006.
 # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007.
 # Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
-# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2016, 2017.
+# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-10 22:51+0000\n"
-"PO-Revision-Date: 2017-02-11 15:30+0100\n"
+"POT-Creation-Date: 2016-08-16 12:01+0000\n"
+"PO-Revision-Date: 2016-08-17 13:15+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -25,255 +25,255 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 
-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Navigace"
 
-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Přesunout okno na pracovní plochu 1"
 
-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Přesunout okno na pracovní plochu 2"
 
-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Přesunout okno na pracovní plochu 3"
 
-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Přesunout okno na pracovní plochu 4"
 
-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Přesunout okno na poslední pracovní plochu"
 
-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Přesunout okno o jednu pracovní plochu doleva"
 
-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace to the right"
 msgstr "Přesunout okno o jednu pracovní plochu doprava"
 
-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Přesunout okno o jednu pracovní plochu nahoru"
 
-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Přesunout okno o jednu pracovní plochu dolů"
 
-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Přesunout okno o jeden monitor doleva"
 
-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Přesunout okno o jeden monitor doprava"
 
-#: data/50-mutter-navigation.xml:42
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Přesunout okno o jeden monitor nahoru"
 
-#: data/50-mutter-navigation.xml:45
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Přesunout okno o jeden monitor dolů"
 
-#: data/50-mutter-navigation.xml:49
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Přepnout do jiné aplikace"
 
-#: data/50-mutter-navigation.xml:54
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Přepnout do předchozí aplikaci"
 
-#: data/50-mutter-navigation.xml:58
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Přepnout do jiného okna"
 
-#: data/50-mutter-navigation.xml:63
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Přepnout do minulého okna"
 
-#: data/50-mutter-navigation.xml:67
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Přepnout do jiného okna aplikace"
 
-#: data/50-mutter-navigation.xml:72
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Přepnout do předchozího okna aplikace"
 
-#: data/50-mutter-navigation.xml:76
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Přepnout na systémový ovládací prvek"
 
-#: data/50-mutter-navigation.xml:81
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Přepnout na minulý systémový ovládací prvek"
 
-#: data/50-mutter-navigation.xml:85
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Přepnout do minulého okna"
 
-#: data/50-mutter-navigation.xml:90
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Přepnout přímo na předchozí okno"
 
-#: data/50-mutter-navigation.xml:94
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Přepnout do jiného okna aplikace"
 
-#: data/50-mutter-navigation.xml:99
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Přepnout do předchozího okna aplikace"
 
-#: data/50-mutter-navigation.xml:103
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Přepnout na minulý systémový ovládací prvek"
 
-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Přepnout přímo na předchozí systémové ovládací prvky"
 
-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Skrýt všechna běžná okna"
 
-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Přepnout na plochu 1"
 
-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Přepnout na plochu 2"
 
-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Přepnout na plochu 3"
 
-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Přepnout na plochu 4"
 
-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Přepnout na poslední plochu"
 
-#: data/50-mutter-navigation.xml:129
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Přesunout na plochu vlevo"
 
-#: data/50-mutter-navigation.xml:132
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Přesunout na plochu vpravo"
 
-#: data/50-mutter-navigation.xml:135
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Přesunout na plochu nad"
 
-#: data/50-mutter-navigation.xml:138
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Přesunout na plochu pod"
 
-#: data/50-mutter-system.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Systém"
 
-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr "Zobrazit řádek ke spuštění příkazu"
 
-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr "Zobrazit přehled činností"
 
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Okna"
 
-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Aktivovat nabídku okna"
 
-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Přepnout režim celé obrazovky"
 
-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr "Přepnout stav maximalizace"
 
-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Maximalizovat okno"
 
-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Obnovit velikost okna"
 
-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
 msgid "Toggle shaded state"
 msgstr "Přepnout stav svinutí"
 
-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Zavřít okno"
 
-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Skrýt okno"
 
-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Přesunout okno"
 
-#: data/50-mutter-windows.xml:26
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Změnit velikost okna"
 
-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr "Přepnout okno na všechny/jednu pracovní plochu"
 
-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Když je okno zakryté vynést jej do popředí, jinak odsunout do pozadí"
 
-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr "Vynést okno do popředí nad ostatní okna"
 
-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr "Odsunout okno do pozadí za ostatní okna"
 
-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Maximalizovat okno svisle"
 
-#: data/50-mutter-windows.xml:39
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Maximalizovat okno vodorovně"
 
-#: data/50-mutter-windows.xml:43
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Rozdělit okno přes levou půlku obrazovky"
 
-#: data/50-mutter-windows.xml:47
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "Rozdělit okno přes pravou půlku obrazovky"
 
-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutter"
 
-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr "Modifikátor, který se má použít u operací rozšířené správy oken"
 
-#: data/org.gnome.mutter.gschema.xml.in:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -285,11 +285,11 @@ msgstr ""
 "Windows“. Předpokládá se, že tato zkratka bude výchozí, nebo nastavena na "
 "prázdný řetězec."
 
-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Připojit modální dialogová okna"
 
-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -299,11 +299,11 @@ msgstr ""
 "zobrazují jako připojené k záhlaví okna rodiče a jsou přesunovány společně s "
 "oknem rodiče."
 
-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Zapnout dlaždice na okrajích při upuštění oken na okrajích obrazovky"
 
-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
@@ -314,11 +314,11 @@ msgstr ""
 "dostupného prostoru. Upuštění oken na horním okraji obrazovky je "
 "maximalizuje úplně."
 
-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "Pracovní plochy jsou spravovány dynamicky"
 
-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -327,11 +327,11 @@ msgstr ""
 "Určuje, zda jsou pracovní plochy spravovány dynamicky nebo jich je pevný "
 "počet (daný klíčem num-workspaces v org.gnome.desktop.wm.preferences)."
 
-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "Pracovní plochy pouze na primárním"
 
-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -339,11 +339,11 @@ msgstr ""
 "Určuje, zda by se měly pracovní plochy přepínat u všech oken na všech "
 "monitorech, nebo pouze u oken na primárním monitoru."
 
-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr "Bez překryvné nabídky tabulátoru"
 
-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -351,11 +351,11 @@ msgstr ""
 "Určuje, zda by se mělo používání překryvné nabídky se zvýrazněním vypnout "
 "při procházení okny."
 
-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr "Se změnou zaměření čekat na zastavení pohybu ukazatele"
 
-#: data/org.gnome.mutter.gschema.xml.in:69
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
 "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
 "the focus will not be changed immediately when entering a window, but only "
@@ -365,11 +365,11 @@ msgstr ""
 "zaměření nezmění hned, když vstoupíte do kona, ale až se přestane pohybovat "
 "ukazatel."
 
-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Šířka přetažitelného okraje"
 
-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
 "The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
@@ -377,11 +377,11 @@ msgstr ""
 "Počet všech přetažitelných okrajů. Nestačí-li viditelné okraje motivu, budou "
 "přidány neviditelné okraje, aby bylo docíleno zadané hodnoty."
 
-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr "Automaticky maximalizovat okna téměř o velikosti monitoru"
 
-#: data/org.gnome.mutter.gschema.xml.in:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@@ -389,11 +389,11 @@ msgstr ""
 "Je-li povoleno, budou automaticky maximalizována okna, která mají počáteční "
 "velikost shodnou s velikostí monitoru."
 
-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr "Umístit nová okna do středu"
 
-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
@@ -401,125 +401,114 @@ msgstr ""
 "Je-li zapnuto, nová okna budou vždy umístěna ve středu aktivní obrazovky "
 "monitoru."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr "Vybrat okno z překryvné nabídky tabulátoru"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr "Zrušit překryvné okno tabulátoru"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 msgid "Switch to VT 1"
 msgstr "Přepnout na VT 1"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
 msgid "Switch to VT 2"
 msgstr "Přepnout na VT 2"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
 msgid "Switch to VT 3"
 msgstr "Přepnout na VT 3"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
 msgid "Switch to VT 4"
 msgstr "Přepnout na VT 4"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
 msgid "Switch to VT 5"
 msgstr "Přepnout na VT 5"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
 msgid "Switch to VT 6"
 msgstr "Přepnout na VT 6"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
 msgid "Switch to VT 7"
 msgstr "Přepnout na VT 7"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
 msgid "Switch to VT 8"
 msgstr "Přepnout na VT 8"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
 msgid "Switch to VT 9"
 msgstr "Přepnout na VT 9"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
 msgid "Switch to VT 10"
 msgstr "Přepnout na VT 10"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
 msgid "Switch to VT 11"
 msgstr "Přepnout na VT 11"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
 msgid "Switch to VT 12"
 msgstr "Přepnout na VT 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Přepínač režimu (skupina %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1781
+#: ../src/backends/meta-input-settings.c:1707
+#| msgid "Switch system controls"
 msgid "Switch monitor"
 msgstr "Přepnout monitor"
 
-#: src/backends/meta-input-settings.c:1783
+#: ../src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Zobrazit nápovědu na obrazovce"
 
-#: src/backends/meta-monitor-manager.c:675
+#: ../src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Vestavěný displej"
 
-#: src/backends/meta-monitor-manager.c:698
+#: ../src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: src/backends/meta-monitor-manager.c:700
+#: ../src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Neznámý displej"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: ../src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: ../src/compositor/compositor.c:463
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "Jiný kompozitní správce již běží na obrazovce %i displeje „%s“."
 
-#: src/core/bell.c:194
+#: ../src/core/bell.c:194
 msgid "Bell event"
 msgstr "Událost zvonku"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "„%s“ nereaguje."
 
-#: src/core/delete.c:129
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Aplikace nereaguje."
 
-#: src/core/delete.c:134
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -527,56 +516,56 @@ msgstr ""
 "Je možné chvíli počkat, aby aplikace mohla pokračovat, nebo si vynutit úplné "
 "ukončení aplikace."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Vynutit ukončení"
-
-#: src/core/delete.c:141
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Počkat"
 
-#: src/core/display.c:608
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Vynutit ukončení"
+
+#: ../src/core/display.c:590
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nelze otevřít displej X Window System „%s“\n"
 
-#: src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Zakáže připojení ke správci sezení"
 
-#: src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Nahradí běžícího správce oken"
 
-#: src/core/main.c:199
+#: ../src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Určení ID správy sezení"
 
-#: src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "X Display to use"
 msgstr "Displej X, který použije"
 
-#: src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Spustí sezení z uloženého souboru"
 
-#: src/core/main.c:216
+#: ../src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Provede volání X synchronně"
 
-#: src/core/main.c:223
+#: ../src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Spustit jako kompozitor protokolu Wayland"
 
-#: src/core/main.c:229
+#: ../src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Spustit jako podkladový kompozitor"
 
-#: src/core/main.c:237
+#: ../src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustit jako plnohodnotný server displeje, nikoliv vnořeně"
 
-#: src/core/mutter.c:39
+#: ../src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -592,20 +581,20 @@ msgstr ""
 "Tento software je BEZ JAKÉKOLIV ZÁRUKY; neposkytují se ani záruky "
 "PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL.\n"
 
-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Vypsat verzi"
 
-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Zásuvný modul Mutter, který se má použít"
 
-#: src/core/prefs.c:1997
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Plocha %d"
 
-#: src/core/screen.c:580
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -614,21 +603,21 @@ msgstr ""
 "Displej „%s“ již správce oken má; zkuste prosím nahradit aktuálního správce "
 "oken pomocí přepínače --replace."
 
-#: src/core/screen.c:665
+#: ../src/core/screen.c:606
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"
 
-#: src/core/util.c:120
+#: ../src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bylo přeloženo bez podpory podrobného režimu\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: ../src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Přepínač režimu: režim %d"
 
-#: src/x11/session.c:1815
+#: ../src/x11/session.c:1815
 msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
@@ -636,7 +625,7 @@ msgstr ""
 "Tato okna nepodporují &quot;ukládání aktuálního nastavení&quot; a po vašem "
 "příštím přihlášení je budete muset spustit ručně."
 
-#: src/x11/window-props.c:559
+#: ../src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

po/de.po

@@ -3,7 +3,7 @@
 # Matthias Warkus <mawarkus@gnome.org>, 2002.
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
 # Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007, 2008.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2017.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de> 2011.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-17 21:22+0100\n"
+"POT-Creation-Date: 2016-09-07 09:27+0000\n"
+"PO-Revision-Date: 2016-09-07 18:55+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.9\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -276,10 +276,10 @@ msgstr "Zusatztaste für erweiterte Aktionen der Fensterverwaltung"
 # bzw- die Apfel-Taste auf Mac-Computern
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Dieser Schlüssel wird die »Überlagerung« auslösen, d.h. eine kombinierte "
 "Fensterübersicht und ein System zum Starten von Anwendungen. Als "
@@ -323,7 +323,7 @@ msgstr "Arbeitsflächen sollen dynamisch verwaltet werden "
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -361,9 +361,9 @@ msgstr "Fokus-Änderungen verzögern, bis der Zeiger aufhört sich zu bewegen"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "Falls dieser Schlüssel gesetzt ist und der Fokusmodus entweder »sloppy« oder "
 "»mouse« ist, wird der Fokus nicht sofort beim Erreichen eines Fensters "
@@ -376,7 +376,7 @@ msgstr "Breite der ziehbaren Ränder"
 # Lange Beschreibung von »Draggable border width«
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Die Gesamtbreite ziehbarer Ränder. Falls die im Thema sichtbaren Ränder "
@@ -463,51 +463,41 @@ msgstr "Zum virtuellen Terminal 11 wechseln"
 msgid "Switch to VT 12"
 msgstr "Zum virtuellen Terminal 12 wechseln"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Moduswechsel (Gruppe %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:1707
 msgid "Switch monitor"
 msgstr "Bildschirm wechseln"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Bildschirmhilfe anzeigen"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Unbekannte Anzeige"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:463
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
 "Ein weiterer Compositing-Verwalter läuft bereits auf Bildschirm %i der "
 "Anzeige »%s«."
@@ -516,7 +506,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Klangereignis"
 
-#. Translators: %s is a window title
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
@@ -534,52 +523,52 @@ msgstr ""
 "Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
 "erzwingen."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Beenden erzwingen"
-
 #: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Warten"
 
-#: src/core/display.c:608
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Beenden erzwingen"
+
+#: src/core/display.c:590
 #, c-format
-msgid "Failed to open X Window System display “%s”\n"
+msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
 
-#: src/core/main.c:189
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"
 
-#: src/core/main.c:195
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Den aktuellen Fensterverwalter ersetzen"
 
-#: src/core/main.c:201
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"
 
-#: src/core/main.c:206
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Zu verwendende X-Anzeige"
 
-#: src/core/main.c:212
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Sitzung anhand gespeicherter Datei starten"
 
-#: src/core/main.c:218
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe abgleichen"
 
-#: src/core/main.c:225
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Als Wayland-Compositor ausführen"
 
-#: src/core/main.c:231
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Als eingebetteten Compositor ausführen"
 
-#: src/core/main.c:239
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
 
@@ -589,7 +578,7 @@ msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -614,38 +603,38 @@ msgstr "Zu benutzendes Mutter-Plugin"
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
 "»--replace«, um den aktuellen Fensterverwalter zu ersetzen."
 
-#: src/core/screen.c:665
+#: src/core/screen.c:606
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
+msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Moduswechsel: Modus %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
 "Diese Fenster unterstützen das Speichern der aktuellen Einstellungen nicht "
 "und müssen bei der nächsten Anmeldung manuell neu gestartet werden."
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (auf %s)"

po/es.po

@@ -7,17 +7,17 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2002,2003.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-17 11:38+0100\n"
+"POT-Creation-Date: 2016-07-24 19:39+0000\n"
+"PO-Revision-Date: 2016-07-26 13:00+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: es <gnome-es-list@gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,266 +25,261 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Navegación"
 
-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Mover la ventana al área de trabajo 1"
 
-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Mover la ventana al área de trabajo 2"
 
-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Mover la ventana al área de trabajo 3"
 
-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Mover la ventana al área de trabajo 4"
 
-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Mover la ventana a la última área de trabajo"
 
-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Mover la ventana un área de trabajo a la izquierda"
 
-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace to the right"
 msgstr "Mover la ventana un área de trabajo a la derecha"
 
-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Subir la ventana un área de trabajo"
 
-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Bajar la ventana un área de trabajo"
 
-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Mover la ventana una pantalla a la izquierda"
 
-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Mover la ventana una pantalla a la derecha"
 
-#: data/50-mutter-navigation.xml:42
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Subir la ventana una pantalla"
 
-#: data/50-mutter-navigation.xml:45
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Bajar la ventana una pantalla"
 
-#: data/50-mutter-navigation.xml:49
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Cambiar entre aplicaciones"
 
-#: data/50-mutter-navigation.xml:54
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Cambiar a la aplicación anterior"
 
-#: data/50-mutter-navigation.xml:58
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Cambiar entre ventanas"
 
-#: data/50-mutter-navigation.xml:63
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Cambiar a la ventana anterior"
 
-#: data/50-mutter-navigation.xml:67
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Cambiar entre ventanas de una aplicación"
 
-#: data/50-mutter-navigation.xml:72
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Cambiar a la ventana anterior de una aplicación"
 
-#: data/50-mutter-navigation.xml:76
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Cambiar entre controles del sistema"
 
-#: data/50-mutter-navigation.xml:81
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Cambiar al control del sistema anterior"
 
-#: data/50-mutter-navigation.xml:85
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Cambiar entre ventanas directamente"
 
-#: data/50-mutter-navigation.xml:90
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Cambiar directamente a la ventana anterior"
 
-#: data/50-mutter-navigation.xml:94
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Cambiar entre ventanas de una aplicación directamente"
 
-#: data/50-mutter-navigation.xml:99
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Cambiar directamente a la ventana anterior de una aplicación"
 
-#: data/50-mutter-navigation.xml:103
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Cambiar entre controles del sistema directamente"
 
-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Cambiar directamente al control del sistema anterior"
 
-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Ocultar todas las ventanas normales"
 
-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Cambiar al área de trabajo 1"
 
-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Cambiar al área de trabajo 2"
 
-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Cambiar al área de trabajo 3"
 
-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Cambiar al área de trabajo 4"
 
-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Cambiar a la útima área de trabajo"
 
-#: data/50-mutter-navigation.xml:129
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Mover al área de trabajo de la izquierda"
 
-#: data/50-mutter-navigation.xml:132
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Mover al área de trabajo de la derecha"
 
-#: data/50-mutter-navigation.xml:135
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Mover al área de trabajo de la arriba"
 
-#: data/50-mutter-navigation.xml:138
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Mover al área de trabajo de abajo"
 
-#: data/50-mutter-system.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr "Mostrar el elemento «ejecutar comando»"
 
-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr "Mostrar la vista de actividades"
 
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Ventanas"
 
-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Activar el menú de la ventana"
 
-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Cambiar el modo a pantalla completa"
 
-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr "Cambiar el estado de maximización"
 
-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Maximizar la ventana"
 
-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Restaurar la ventana"
 
-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
 msgid "Toggle shaded state"
 msgstr "Cambiar el estado de enrollado"
 
-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Cerrar la ventana"
 
-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Ocultar la ventana"
 
-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Mover la ventana"
 
-#: data/50-mutter-windows.xml:26
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Redimensionar la ventana"
 
-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr "Conmutar la ventana en todas las áreas de trabajo o sólo en una"
 
-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Elevar la ventana si está cubierta, de lo contrario, bajarla"
 
-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr "Elevar la ventana sobre las otras ventanas"
 
-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr "Bajar la ventana por debajo de otras ventanas"
 
-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Maximizar la ventana verticalmente"
 
-#: data/50-mutter-windows.xml:39
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Maximizar la ventana horizontalmente"
 
-#: data/50-mutter-windows.xml:43
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Ver división a la izquierda"
 
-#: data/50-mutter-windows.xml:47
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "Ver división a la derecha"
 
-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutter"
 
-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr ""
 "Modificador que usar para extender las operaciones de gestión sobre ventanas"
 
-#: data/org.gnome.mutter.gschema.xml.in:8
-#| msgid ""
-#| "This key will initiate the \"overlay\", which is a combination window "
-#| "overview and application launching system. The default is intended to be "
-#| "the \"Windows key\" on PC hardware. It's expected that this binding "
-#| "either the default or set to the empty string."
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Esta clave iniciará el «revestimiento» («overlay»), que es una combinación "
 "de vista general de la ventana y el sistema de lanzamiento de aplicaciones. "
@@ -292,11 +287,11 @@ msgstr ""
 "esta combinación de tecla sea la predeterminada o se establezca a una cadena "
 "vacía."
 
-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Adjuntar diálogos modales"
 
-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -306,13 +301,13 @@ msgstr ""
 "aparecen diálogos modales adjuntos a la barra de título de la ventana padre "
 "y se mueven junto con la ventana padre."
 
-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Activar el mosaico en los bordes al arrastrar ventanas a los bordes de la "
 "ventana"
 
-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
@@ -323,17 +318,13 @@ msgstr ""
 "mitad del área disponible. Arrastrar ventanas al borde superior de la "
 "pantalla las maximiza por completo."
 
-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "Las áreas de trabajo se gestionan dinámicamente"
 
-#: data/org.gnome.mutter.gschema.xml.in:41
-#| msgid ""
-#| "Determines whether workspaces are managed dynamically or whether there's "
-#| "a static number of workspaces (determined by the num-workspaces key in "
-#| "org.gnome.desktop.wm.preferences)."
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -341,11 +332,11 @@ msgstr ""
 "número estático de áreas de trabajo (determinado por la clave «num-"
 "workspaces» en «org.gnome.desktop.wm.preferences»)."
 
-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "Áreas de trabajo sólo en el primario"
 
-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -353,11 +344,11 @@ msgstr ""
 "Determina si el cambio entre áreas de trabajo debería suceder para las "
 "ventanas en todos los monitores o sólo para ventanas en el monitor primario."
 
-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr "No hay pestaña emergente"
 
-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -365,47 +356,39 @@ msgstr ""
 "Determina si el uso de ventanas emergentes y marcos resaltados se debe "
 "desactivar al cambiar entre ventanas."
 
-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr "Retrasar el cambio de foco hasta detener el puntero"
 
-#: data/org.gnome.mutter.gschema.xml.in:69
-#| msgid ""
-#| "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
-#| "the focus will not be changed immediately when entering a window, but "
-#| "only after the pointer stops moving."
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "Si está establecido a «true» y el modo del foco es «sloppy» o «mouse» "
 "entonces el foco no se cambiará inmediatamente al entrar en una ventana, "
 "pero sí después de dejar quieto el puntero."
 
-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Anchura arrastrable del borde"
 
-#: data/org.gnome.mutter.gschema.xml.in:80
-#| msgid ""
-#| "The amount of total draggable borders. If the theme's visible borders are "
-#| "not enough, invisible borders will be added to meet this value."
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
-"La cantidad total de borde que se puede arrastrar. Si los bordes visibles "
-"del tema no son suficientes, se añadirán bordes invisibles para satisfacer "
-"este valor."
+"La cantidad total de borde arrastrable. Si los bordes visibles del tema no "
+"son suficientes, se añadirán bordes invisibles para satisfacer este valor."
 
-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""
 "Maximizar automáticamente las ventanas que casi tengan el tamaño de la "
 "pantalla"
 
-#: data/org.gnome.mutter.gschema.xml.in:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@@ -413,11 +396,11 @@ msgstr ""
 "Si está activada, las ventanas nuevas que inicialmente tienen el tamaño de "
 "la pantalla, se maximizan."
 
-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr "Colocar las ventanas nuevas en el centro"
 
-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
@@ -425,130 +408,116 @@ msgstr ""
 "Cuando es cierto, las ventanas nuevas se colocarán siempre en el centro de "
 "la pantalla activa del monitor."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr "Seleccionar ventana de la pestaña emergente"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr "Cancelar pestaña emergente"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 msgid "Switch to VT 1"
 msgstr "Cambiar al VT 1"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
 msgid "Switch to VT 2"
 msgstr "Cambiar al VT 2"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
 msgid "Switch to VT 3"
 msgstr "Cambiar al VT 3"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
 msgid "Switch to VT 4"
 msgstr "Cambiar al VT 4"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
 msgid "Switch to VT 5"
 msgstr "Cambiar al VT 5"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
 msgid "Switch to VT 6"
 msgstr "Cambiar al VT 6"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
 msgid "Switch to VT 7"
 msgstr "Cambiar al VT 7"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
 msgid "Switch to VT 8"
 msgstr "Cambiar al VT 8"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
 msgid "Switch to VT 9"
 msgstr "Cambiar al VT 9"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
 msgid "Switch to VT 10"
 msgstr "Cambiar al VT 10"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
 msgid "Switch to VT 11"
 msgstr "Cambiar al VT 11"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
 msgid "Switch to VT 12"
 msgstr "Cambiar al VT 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-#| msgid "Mode Switch: Mode %d"
-msgid "Mode Switch (Group %d)"
-msgstr "Cambiar modo (grupo %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1781
+#: ../src/backends/meta-input-settings.c:1605
+#| msgid "Switch system controls"
 msgid "Switch monitor"
 msgstr "Cambiar monitor"
 
-#: src/backends/meta-input-settings.c:1783
+#: ../src/backends/meta-input-settings.c:1607
 msgid "Show on-screen help"
 msgstr "Mostrar la ayuda en pantalla"
 
-#: src/backends/meta-monitor-manager.c:675
+#: ../src/backends/meta-monitor-manager.c:515
 msgid "Built-in display"
 msgstr "Pantalla integrada"
 
-#: src/backends/meta-monitor-manager.c:698
+#: ../src/backends/meta-monitor-manager.c:538
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/backends/meta-monitor-manager.c:700
+#: ../src/backends/meta-monitor-manager.c:540
 msgid "Unknown Display"
 msgstr "Pantalla desconocida"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: ../src/backends/meta-monitor-manager.c:548
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: ../src/compositor/compositor.c:463
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
 "Ya existe un gestor de composición ejecutándose en la monitor %i, pantalla "
 "«%s»."
 
-#: src/core/bell.c:194
+#: ../src/core/bell.c:194
 msgid "Bell event"
 msgstr "Evento de campana"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "«%s» no está respondiendo."
 
-#: src/core/delete.c:129
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "La aplicación no está respondiendo."
 
-#: src/core/delete.c:134
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -556,130 +525,115 @@ msgstr ""
 "Puede elegir esperar un rato para ver si continua o forzar la aplicación "
 "para cerrarla completamente."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forzar la salida"
-
-#: src/core/delete.c:141
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Esperar"
 
-#: src/core/display.c:608
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Forzar la salida"
+
+#: ../src/core/display.c:590
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
-msgid "Failed to open X Window System display “%s”\n"
+msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
 
-#: src/core/main.c:189
+#: ../src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Desactivar conexión al gestor de sesión"
 
-#: src/core/main.c:195
+#: ../src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Reemplazar el gestor de ventanas en ejecución"
 
-#: src/core/main.c:201
+#: ../src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Especificar el ID se gestión de sesión"
 
-#: src/core/main.c:206
+#: ../src/core/main.c:199
 msgid "X Display to use"
 msgstr "Pantalla X que usar"
 
-#: src/core/main.c:212
+#: ../src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde el archivo de salvaguarda"
 
-#: src/core/main.c:218
+#: ../src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Hacer que las llamadas a las X sean síncronas"
 
-#: src/core/main.c:225
+#: ../src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Ejecutar como compositor Wayland"
 
-#: src/core/main.c:231
+#: ../src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Ejecutar como compositor anidado"
 
-#: src/core/main.c:239
+#: ../src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Ejecutar como servidor completo, en lugar de anidado"
 
-#: src/core/mutter.c:39
+#: ../src/core/mutter.c:39
 #, c-format
-#| msgid ""
-#| "mutter %s\n"
-#| "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
-#| "This is free software; see the source for copying conditions.\n"
-#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-#| "PARTICULAR PURPOSE.\n"
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "muttery %s\n"
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., y otros\n"
-"Este programa es software libre; vea el código fuente para obtener las "
-"condiciones de copia.\n"
-"NO se proporciona ninguna garantía; ni de MERCANTILIDAD O DE IDONEIDAD PARA "
-"UN PROPÓSITO PARTICULAR.\n"
+"Este programa es software libre; vea el código fuente para obtener las\n"
+"condiciones de copia. NO se proporciona ninguna garantía; ni de\n"
+"MERCANTILIDAD O DE IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\n"
 
-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Imprimir versión"
 
-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Complemento de mutter que usar"
 
-#: src/core/prefs.c:1997
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"
 
-#: src/core/screen.c:580
+#: ../src/core/screen.c:521
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "La pantalla «%s» ya tiene un gestor de ventanas; pruebe a usar la opción «--"
 "replace» para reemplazar el gestor de ventanas activo."
 
-#: src/core/screen.c:665
+#: ../src/core/screen.c:606
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
-msgid "Screen %d on display “%s” is invalid\n"
+msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"
 
-#: src/core/util.c:120
+#: ../src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter fue compilado sin soporte para modo prolijo\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: ../src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Cambiar modo: modo %d"
 
-#: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
+#: ../src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
 "Estas ventanas no soportan «guardar la configuración actual» y tendrán que "
 "reiniciarse manualmente la próxima vez que inicie una sesión."
 
-#: src/x11/window-props.c:559
+#: ../src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (on %s)"

po/eu.po

@@ -2,23 +2,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
+#
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2012, 2013, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-16 22:07+0100\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
-"Language-Team: Basque <librezale@librezale.eus>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
+"&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-09-07 09:27+0000\n"
+"PO-Revision-Date: 2016-09-18 19:02+0100\n"
+"Last-Translator: dooteo <dooteo@zundan.com>\n"
+"Language-Team: Basque <librezale@librezale.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/50-mutter-navigation.xml:6
@@ -270,21 +271,16 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Aldatzailea leihoak kudeatzeko eragiketa hedatuetan erabiltzeko"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
-#| msgid ""
-#| "This key will initiate the \"overlay\", which is a combination window "
-#| "overview and application launching system. The default is intended to be "
-#| "the \"Windows key\" on PC hardware. It's expected that this binding "
-#| "either the default or set to the empty string."
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
-"Gako honek “overlay“ (gainjarria) hasieratuko du: hau leihoaren ikuspegi "
+"Gako honek \"overlay\" (gainjarria) hasieratuko du: hau leihoaren ikuspegi "
 "orokorraren eta aplikazioa abiarazteko sistemaren arteko konbinazioa da. "
-"Lehenetsi gisa, PC ordenagailuko “Windows tekla“ da. Tekla konbinazio hau "
-"lehenetsia izatea edo kate huts gisa ezartzea da."
+"Lehenetsi gisa, PC ordenagailuko \"Windows tekla\" da. Tekla konbinazio hau "
+"lehenetsia izatea edo kate hutz gisa ezartzea da."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
@@ -320,17 +316,13 @@ msgid "Workspaces are managed dynamically"
 msgstr "Laneko areak dinamikoki kudeatzen dira"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
-#| msgid ""
-#| "Determines whether workspaces are managed dynamically or whether there's "
-#| "a static number of workspaces (determined by the num-workspaces key in "
-#| "org.gnome.desktop.wm.preferences)."
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
 "Laneko areak dinamikoki kudeatzen diren edo laneko areak kopuru estatikoa "
-"(“org.gnome.desktop.wm.preferences“-eko “num-workspaces“ gakoak zehazten du) "
+"('org.gnome.desktop.wm.preferences'-eko 'num-workspaces' gakoak zehazten du) "
 "daukan zehazten du ."
 
 #: data/org.gnome.mutter.gschema.xml.in:50
@@ -362,16 +354,12 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Atzeratu fokuaren aldaketa erakuslea mugitzeari utzi arte"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
-#| msgid ""
-#| "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
-#| "the focus will not be changed immediately when entering a window, but "
-#| "only after the pointer stops moving."
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
-"TRUE (egia) gisa ezartzen bada, eta fokuaren modua “sloppy“ edo “mouse“ "
+"TRUE (egia) gisa ezartzen bada, eta fokuaren modua 'sloppy' edo 'mouse' "
 "bada, fokua ez da berehala aldatuko leiho batean sartzean baizik eta soilik "
 "erakuslea gelditzean."
 
@@ -380,11 +368,8 @@ msgid "Draggable border width"
 msgstr "Ertz arrastragarriaren zabalera"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
-#| msgid ""
-#| "The amount of total draggable borders. If the theme's visible borders are "
-#| "not enough, invisible borders will be added to meet this value."
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Ertz arrastragarri guztien kopurua. Gaiaren ertz ikusgaiak ez badira "
@@ -470,64 +455,50 @@ msgstr "Aldatu 11. TBra"
 msgid "Switch to VT 12"
 msgstr "Aldatu 12. TBra"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-#| msgid "Mode Switch: Mode %d"
-msgid "Mode Switch (Group %d)"
-msgstr "Modu aldaketa (%d taldea)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:1707
+#| msgid "Switch system controls"
 msgid "Switch monitor"
 msgstr "Aldatu monitorea"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Erakutsi pantailako laguntza"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Bertako pantaila"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Pantaila ezezaguna"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:463
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
-"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen “%2$s“ "
-"pantailako %1$i. monitorean."
+"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen \"%2$s\" "
+"pantailako %1$i. monitorean \"."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Soinuaren gertaera"
 
-#. Translators: %s is a window title
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
@@ -545,73 +516,66 @@ msgstr ""
 "Aukeratu piskatean zai egotea aplikazioak jarraitzeko edo derrigortu "
 "aplikazioa erabat ixtea."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Behartu ixtera"
-
 #: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Itxaron"
 
-#: src/core/display.c:608
-#, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Huts egin du X Window sistemaren “%s“ pantaila irekitzean\n"
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Behartu ixtera"
 
-#: src/core/main.c:189
+#: src/core/display.c:590
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Huts egin du X Window sistemaren '%s' pantaila irekitzean\n"
+
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Desgaitu saio-kudeatzailearen konexioa"
 
-#: src/core/main.c:195
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Ordeztu exekutatzen dagoen leiho-kudeatzailea"
 
-#: src/core/main.c:201
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Zehaztu saio-kudeatzailearen IDa"
 
-#: src/core/main.c:206
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "X pantaila erabiltzeko"
 
-#: src/core/main.c:212
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Hasieratu saioa babes-fitxategitik"
 
-#: src/core/main.c:218
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Egin X deiak sinkronoak izatea"
 
-#: src/core/main.c:225
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Exekutatu wayland konposatzaile gisa"
 
-#: src/core/main.c:231
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Exekutatu habiaratutako konposatzaile gisa"
 
-#: src/core/main.c:239
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Exekutatu pantaila-zerbitzari oso bezala, habiaratuta baino"
 
 #: src/core/mutter.c:39
 #, c-format
-#| msgid ""
-#| "mutter %s\n"
-#| "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
-#| "This is free software; see the source for copying conditions.\n"
-#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-#| "PARTICULAR PURPOSE.\n"
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Copyright-a © 2001-%d Havoc Pennington, Red Hat, Inc., eta beste batzuk\n"
+"Copyright-a (C) 2001-%d Havoc Pennington, Red Hat, Inc., eta beste batzuk\n"
 "Hau software librea da; ikus kopiatzeko baldintzak iturburu-kodean.\n"
 "EZ du bermerik; ezta MERKATURATZEKO edo XEDE JAKIN BATERAKO EGOKITASUNAREN "
 "BERMERIK ERE.\n"
@@ -629,45 +593,38 @@ msgstr "Mutter-en osagaia erabiltzeko"
 msgid "Workspace %d"
 msgstr "%d. laneko area"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:521
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
-"“%s“ pantailak badu leiho-kudeatzailea; erabili --replace aukera uneko leiho-"
+"'%s' pantailak badu leiho-kudeatzailea; erabili --replace aukera uneko leiho-"
 "kudeatzailea ordezteko."
 
-#: src/core/screen.c:665
+#: src/core/screen.c:606
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "“%2$s“ bistaratzeko %1$d pantaila ez da baliozkoa\n"
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "'%2$s' bistaratzeko %1$d pantaila ez da baliozkoa\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter modu xehatuaren euskarririk gabe konpilatu da\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Modu aldaketa: %d modua"
 
 #: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
-"Leiho hauek ez dute onartzen “gorde uneko konfigurazioa“; eta eskuz "
+"Leiho hauek ez dute onartzen &quot;gorde uneko konfigurazioa&quot; eta eskuz "
 "berrabiarazi beharko dituzu hurrengo saioa hasten duzunean."
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s)"

po/fr.po

@@ -1,5 +1,5 @@
 # French translation of mutter.
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the metacity package.
 #
 # Christophe Fergeau <teuf@users.sourceforge.net>, 2002.
@@ -11,7 +11,7 @@
 # Cyprien Le Pannérer <cyplp@free.fr>, 2006.
 # Robert-André Mauchin <zebob.m@gmail.com>, 2007.
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
-# Claude Paroz <claude@2xlibre.net>, 2008-2017.
+# Claude Paroz <claude@2xlibre.net>, 2008-2016.
 # Bruno Brouard <annoa.b@gmail.com>, 2011-12.
 # Charles Monzat <superboa@hotmail.fr>, 2016.
 msgid ""
@@ -19,14 +19,15 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-17 21:09+0100\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
+"POT-Creation-Date: 2016-09-12 23:59+0000\n"
+"PO-Revision-Date: 2016-09-13 12:13+0200\n"
+"Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.9\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -279,10 +280,10 @@ msgstr "Touche à utiliser pour les opérations étendues de gestion des fenêtr
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Cette touche initie l'« overlay », une combinaison d'aperçu des fenêtres et "
 "d'un système de lancement d'applications. La touche par défaut sur le "
@@ -324,7 +325,7 @@ msgstr "Les espaces de travail sont gérés de manière dynamique"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -363,9 +364,9 @@ msgstr "Attend l'arrêt du pointeur avant le changement de focus"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "Si défini à true et que le mode de focus est soit « sloppy » ou « souris », "
 "alors le focus ne sera pas changé immédiatement en passant sur une fenêtre, "
@@ -377,7 +378,7 @@ msgstr "Largeur de bordure ajustable"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "La taille totale des bordures que l'on peut déplacer. Si les bordures "
@@ -468,51 +469,44 @@ msgstr "Passer à l'émulateur de terminal 11"
 msgid "Switch to VT 12"
 msgstr "Passer à l'émulateur de terminal 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Changement de mode (groupe %d)"
-
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:1845
 msgid "Switch monitor"
 msgstr "Changer de moniteur"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:1847
 msgid "Show on-screen help"
 msgstr "Afficher l'aide à l'écran"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Affichage intégré"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Affichage inconnu"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:463
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
 "Un autre gestionnaire de composition est déjà lancé sur l'écran %i de "
 "l'affichage « %s »."
@@ -521,7 +515,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Évènement sonore"
 
-#. Translators: %s is a window title
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
@@ -539,52 +532,52 @@ msgstr ""
 "Vous pouvez patienter un instant pour continuer ou forcer l'application à "
 "quitter définitivement."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forcer à quitter"
-
 #: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Attendre"
 
-#: src/core/display.c:608
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Forcer à quitter"
+
+#: src/core/display.c:590
 #, c-format
-msgid "Failed to open X Window System display “%s”\n"
+msgid "Failed to open X Window System display '%s'\n"
 msgstr "Impossible d'ouvrir l'affichage « %s » du système X Window\n"
 
-#: src/core/main.c:189
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Désactiver la connexion au gestionnaire de sessions"
 
-#: src/core/main.c:195
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Remplacer le gestionnaire de fenêtres en cours de fonctionnement"
 
-#: src/core/main.c:201
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Indiquer l'ID de gestion de sessions"
 
-#: src/core/main.c:206
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Affichage X à utiliser"
 
-#: src/core/main.c:212
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Initialiser la session depuis le fichier de sauvegarde"
 
-#: src/core/main.c:218
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Rendre synchrones les appels à X"
 
-#: src/core/main.c:225
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Lancer comme un compositeur wayland"
 
-#: src/core/main.c:231
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Lancer comme un compositeur imbriqué"
 
-#: src/core/main.c:239
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Lancer comme un serveur d'affichage complet, plutôt qu'imbriqué"
 
@@ -592,7 +585,7 @@ msgstr "Lancer comme un serveur d'affichage complet, plutôt qu'imbriqué"
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -617,39 +610,39 @@ msgstr "Greffon de Mutter à utiliser"
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "L'affichage « %s » a déjà un gestionnaire de fenêtres ; essayez d'utiliser "
 "l'option --replace pour remplacer le gestionnaire de fenêtres actuel."
 
-#: src/core/screen.c:665
+#: src/core/screen.c:606
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
+msgid "Screen %d on display '%s' is invalid\n"
 msgstr "L'écran %d sur l'affichage « %s » n'est pas valide\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter a été compilé sans la prise en charge du mode bavard\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Changement de mode : mode %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
 "Ces fenêtres ne prennent pas en charge « l'enregistrement de la "
 "configuration actuelle » et devront être redémarrées manuellement à la "
 "prochaine connexion."
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (sur %s)"

po/id.po

@@ -11,257 +11,17 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-20 13:44+0700\n"
+"POT-Creation-Date: 2016-08-19 21:04+0000\n"
+"PO-Revision-Date: 2016-08-22 17:38+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: data/50-mutter-navigation.xml:6
-msgid "Navigation"
-msgstr "Navigasi"
-
-#: data/50-mutter-navigation.xml:9
-msgid "Move window to workspace 1"
-msgstr "Pindahkan jendela ke ruang kerja 1"
-
-#: data/50-mutter-navigation.xml:12
-msgid "Move window to workspace 2"
-msgstr "Pindahkan jendela ke ruang kerja 2"
-
-#: data/50-mutter-navigation.xml:15
-msgid "Move window to workspace 3"
-msgstr "Pindahkan jendela ke ruang kerja 3"
-
-#: data/50-mutter-navigation.xml:18
-msgid "Move window to workspace 4"
-msgstr "Pindahkan jendela ke ruang kerja 4"
-
-#: data/50-mutter-navigation.xml:21
-msgid "Move window to last workspace"
-msgstr "Pindahkan jendela ke ruang kerja terakhir"
-
-#: data/50-mutter-navigation.xml:24
-msgid "Move window one workspace to the left"
-msgstr "Pindahkan jendela satu ruang kerja ke kiri"
-
-#: data/50-mutter-navigation.xml:27
-msgid "Move window one workspace to the right"
-msgstr "Pindahkan jendela satu ruang kerja ke kanan"
-
-#: data/50-mutter-navigation.xml:30
-msgid "Move window one workspace up"
-msgstr "Pindahkan jendela satu ruang kerja ke atas"
-
-#: data/50-mutter-navigation.xml:33
-msgid "Move window one workspace down"
-msgstr "Pindahkan jendela satu ruang kerja ke bawah"
-
-#: data/50-mutter-navigation.xml:36
-msgid "Move window one monitor to the left"
-msgstr "Pindahkan jendela satu monitor ke kiri"
-
-#: data/50-mutter-navigation.xml:39
-msgid "Move window one monitor to the right"
-msgstr "Pindahkan jendela satu monitor ke kanan"
-
-#: data/50-mutter-navigation.xml:42
-msgid "Move window one monitor up"
-msgstr "Pindahkan jendela satu monitor ke atas"
-
-#: data/50-mutter-navigation.xml:45
-msgid "Move window one monitor down"
-msgstr "Pindahkan jendela satu monitor ke bawah"
-
-#: data/50-mutter-navigation.xml:49
-msgid "Switch applications"
-msgstr "Bertukar aplikasi"
-
-#: data/50-mutter-navigation.xml:54
-msgid "Switch to previous application"
-msgstr "Bertukar ke aplikasi sebelumnya"
-
-#: data/50-mutter-navigation.xml:58
-msgid "Switch windows"
-msgstr "Bertukar jendela"
-
-#: data/50-mutter-navigation.xml:63
-msgid "Switch to previous window"
-msgstr "Bertukar ke jendela sebelumnya"
-
-#: data/50-mutter-navigation.xml:67
-msgid "Switch windows of an application"
-msgstr "Bertukar jendela dari suatu aplikasi"
-
-#: data/50-mutter-navigation.xml:72
-msgid "Switch to previous window of an application"
-msgstr "Bertukar ke jendela aplikasi sebelumnya"
-
-#: data/50-mutter-navigation.xml:76
-msgid "Switch system controls"
-msgstr "Bertukar kendali sistem"
-
-#: data/50-mutter-navigation.xml:81
-msgid "Switch to previous system control"
-msgstr "Bertukar ke kendali sistem sebelumnya"
-
-#: data/50-mutter-navigation.xml:85
-msgid "Switch windows directly"
-msgstr "Bertukar jendela secara langsung"
-
-#: data/50-mutter-navigation.xml:90
-msgid "Switch directly to previous window"
-msgstr "Bertukar secara langsung ke jendela sebelumnya"
-
-#: data/50-mutter-navigation.xml:94
-msgid "Switch windows of an app directly"
-msgstr "Bertukar jendela dari suatu app secara langsung"
-
-#: data/50-mutter-navigation.xml:99
-msgid "Switch directly to previous window of an app"
-msgstr "Bertukar secara langsung ke jendela sebelumnya dari suatu app"
-
-#: data/50-mutter-navigation.xml:103
-msgid "Switch system controls directly"
-msgstr "Bertukar kendali sistem secara langsung"
-
-#: data/50-mutter-navigation.xml:108
-msgid "Switch directly to previous system control"
-msgstr "Bertukar secara langsung ke kendali sistem sebelumnya"
-
-#: data/50-mutter-navigation.xml:111
-msgid "Hide all normal windows"
-msgstr "Sembunyikan semua jendela normal"
-
-#: data/50-mutter-navigation.xml:114
-msgid "Switch to workspace 1"
-msgstr "Bertukar ke ruang kerja 1"
-
-#: data/50-mutter-navigation.xml:117
-msgid "Switch to workspace 2"
-msgstr "Bertukar ke ruang kerja 2"
-
-#: data/50-mutter-navigation.xml:120
-msgid "Switch to workspace 3"
-msgstr "Bertukar ke ruang kerja 3"
-
-#: data/50-mutter-navigation.xml:123
-msgid "Switch to workspace 4"
-msgstr "Bertukar ke ruang kerja 4"
-
-#: data/50-mutter-navigation.xml:126
-msgid "Switch to last workspace"
-msgstr "Bertukar ke ruang kerja terakhir"
-
-#: data/50-mutter-navigation.xml:129
-msgid "Move to workspace left"
-msgstr "Pindahkan ke ruang kerja kiri"
-
-#: data/50-mutter-navigation.xml:132
-msgid "Move to workspace right"
-msgstr "Pindahkan ke ruang kerja kanan"
-
-#: data/50-mutter-navigation.xml:135
-msgid "Move to workspace above"
-msgstr "Pindahkan ke ruang kerja di atas"
-
-#: data/50-mutter-navigation.xml:138
-msgid "Move to workspace below"
-msgstr "Pindahkan ke ruang kerja di bawah"
-
-#: data/50-mutter-system.xml:6
-msgid "System"
-msgstr "Sistem"
-
-#: data/50-mutter-system.xml:8
-msgid "Show the run command prompt"
-msgstr "Tampilkan sapaan jalankan perintah"
-
-#: data/50-mutter-system.xml:10
-msgid "Show the activities overview"
-msgstr "Tampilkan ringkasan aktivitas"
-
-#: data/50-mutter-windows.xml:6
-msgid "Windows"
-msgstr "Jendela"
-
-#: data/50-mutter-windows.xml:8
-msgid "Activate the window menu"
-msgstr "Mengaktifkan menu jendela"
-
-#: data/50-mutter-windows.xml:10
-msgid "Toggle fullscreen mode"
-msgstr "Jungkitkan mode layar penuh"
-
-#: data/50-mutter-windows.xml:12
-msgid "Toggle maximization state"
-msgstr "Jungkitkan keadaan termaksimalkan"
-
-#: data/50-mutter-windows.xml:14
-msgid "Maximize window"
-msgstr "Maksimalkan jendela"
-
-#: data/50-mutter-windows.xml:16
-msgid "Restore window"
-msgstr "Pulihkan jendela"
-
-#: data/50-mutter-windows.xml:18
-msgid "Toggle shaded state"
-msgstr "Jungkitkan keadaan berbayang"
-
-#: data/50-mutter-windows.xml:20
-msgid "Close window"
-msgstr "Tutup jendela"
-
-#: data/50-mutter-windows.xml:22
-msgid "Hide window"
-msgstr "Sembunyikan jendela"
-
-#: data/50-mutter-windows.xml:24
-msgid "Move window"
-msgstr "Pindahkan jendela"
-
-#: data/50-mutter-windows.xml:26
-msgid "Resize window"
-msgstr "Ubah ukuran jendela"
-
-#: data/50-mutter-windows.xml:29
-msgid "Toggle window on all workspaces or one"
-msgstr "Jungkitkan jendela pada semua atau satu area kerja"
-
-#: data/50-mutter-windows.xml:31
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Naikkan jendela bila tertutup jendela lain, sebaliknya turunkan"
-
-#: data/50-mutter-windows.xml:33
-msgid "Raise window above other windows"
-msgstr "Naikkan jendela di atas jendela-jendela lain"
-
-#: data/50-mutter-windows.xml:35
-msgid "Lower window below other windows"
-msgstr "Turunkan jendela di bawah jendela-jendela lain"
-
-#: data/50-mutter-windows.xml:37
-msgid "Maximize window vertically"
-msgstr "Maksimalkan ukuran jendela secara vertikal"
-
-#: data/50-mutter-windows.xml:39
-msgid "Maximize window horizontally"
-msgstr "Maksimalkan ukuran jendela secara horisontal"
-
-#: data/50-mutter-windows.xml:43
-msgid "View split on left"
-msgstr "Tilik belah di kiri"
-
-#: data/50-mutter-windows.xml:47
-msgid "View split on right"
-msgstr "Tilik belah di kanan"
-
 #: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "Mutter"
@@ -272,14 +32,14 @@ msgstr "Tombol yang digunakan untuk memperluas operasi manajemen jendela"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Kunci ini akan mengawali \"overlay\", yang merupakan kombinasi ringkasan "
 "jendela dan sistem peluncuran aplikasi. Nilai baku ditujukan agar menjadi "
-"\"tombol Windows\" pada perangkat keras PC. Diharapkan agar pengikatan ini "
+"\"Windows key\" pada perangkat keras PC. Diharapkan agar pengikatan ini "
 "berupa baku atau diisi dengan kalimat kosong."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
@@ -316,7 +76,7 @@ msgstr "Ruang kerja dikelola secara dinamis"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -354,9 +114,9 @@ msgstr "Tunda perubahan fokus sampai penunjuk berhenti bergerak"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "Bila diisi dengan true, dan mode fokus adalah \"sloppy\" atau \"mouse\" maka "
 "fokus tak akan berubah seketika saat memasuki suatu jendela, tapi hanya "
@@ -368,7 +128,7 @@ msgstr "Lebar batas yang dapat diseret"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Total banyaknya tepi yang dapat diseret. Bila tepi tema yang nampak tak "
@@ -408,97 +168,87 @@ msgstr "Batalkan popup tab"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
-msgstr "Bertukar ke VT 1"
+msgstr "Pindah ke VT 1"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
-msgstr "Bertukar ke VT 2"
+msgstr "Pindah ke VT 2"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
-msgstr "Bertukar ke VT 3"
+msgstr "Pindah ke VT 3"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
-msgstr "Bertukar ke VT 4"
+msgstr "Pindah ke VT 4"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
-msgstr "Bertukar ke VT 5"
+msgstr "Pindah ke VT 5"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
-msgstr "Bertukar ke VT 6"
+msgstr "Pindah ke VT 6"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
-msgstr "Bertukar ke VT 7"
+msgstr "Pindah ke VT 7"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
-msgstr "Bertukar ke VT 8"
+msgstr "Pindah ke VT 8"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
-msgstr "Bertukar ke VT 9"
+msgstr "Pindah ke VT 9"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
-msgstr "Bertukar ke VT 10"
+msgstr "Pindah ke VT 10"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
-msgstr "Bertukar ke VT 11"
+msgstr "Pindah ke VT 11"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
-msgstr "Bertukar ke VT 12"
+msgstr "Pindah ke VT 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Tukar Mode: (Grup %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:1707
 msgid "Switch monitor"
 msgstr "Berpindah monitor"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Tampilkan bantuan pada layar"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Tampilan bawaan"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Tak Dikenal"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Tampilan Tak Dikenal"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:463
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
 "Manajer komposit lain telah berjalan pada layar %i pada tampilan \"%s\"."
 
@@ -506,7 +256,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Bel peristiwa"
 
-#. Translators: %s is a window title
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
@@ -523,52 +272,52 @@ msgid ""
 msgstr ""
 "Anda bisa memilih untuk menunggu sebentar atau memaksa aplikasi keluar."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Matikan Paksa"
-
 #: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Tunggu"
 
-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Gagal membuka tampilan X Window System \"%s\"\n"
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Matikan Paksa"
 
-#: src/core/main.c:189
+#: src/core/display.c:590
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Gagal membuka tampilan X Window System '%s'\n"
+
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Menonaktifkan koneksi ke manajer sesi"
 
-#: src/core/main.c:195
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Mengganti manajer jendela yang tengah berjalan"
 
-#: src/core/main.c:201
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Tentukan kode pengaturan sesi"
 
-#: src/core/main.c:206
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Tampilan X yang digunakna"
 
-#: src/core/main.c:212
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Aktifkan sesi dari berkas simpanan"
 
-#: src/core/main.c:218
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Buat panggilan X selaras"
 
-#: src/core/main.c:225
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Jalankan sebagai kompositor wayland"
 
-#: src/core/main.c:231
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Jalankan sebagai kompositor bersarang"
 
-#: src/core/main.c:239
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Jalankan sebagai server tampilan penuh, ketimbang tampilan bersarang"
 
@@ -576,14 +325,14 @@ msgstr "Jalankan sebagai server tampilan penuh, ketimbang tampilan bersarang"
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Hak Cipta (C) 2001-%d Havoc Pennington, Red Hat, Inc., dan lain-lain.\n"
-"Ini adalah perangkat lunak bebas; lihat kode asalnya untuk kondisi "
+"Hak cipta (C) 2001-%d Havoc Pennington, Red Hat, Inc., dan lain-lain.\n"
+"Ini adalah perangkat lunak bebas; lihatlah kode sumbernya untuk kondisi "
 "penyalinan.\n"
 "TIDAK ADA jaminan, bahkan untuk KELAYAKAN JUAL atau KELAYAKAN UNTUK KEGUNAAN "
 "TERTENTU.\n"
@@ -601,38 +350,38 @@ msgstr "Pengaya Mutter yang dipakai"
 msgid "Workspace %d"
 msgstr "Area kerja %d"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "Tampilan \"%s\" sudah memiliki manajer jendela; cobalah gunakan pilihan --"
 "replace untuk mengganti manajer jendela saat ini."
 
-#: src/core/screen.c:665
+#: src/core/screen.c:606
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Layar %d pada tampilan \"%s\" tidak valid\n"
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Layar %d pada tampilan '%s' tidak benar\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Muter dikompilasi tanpa dukungan mode riuh\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Tukar Mode: Mode %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
-"Jendela ini tidak mendukung \"menyimpan setelan aktif saat ini\" dan mesti "
-"dijalankan ulang secara manual kala berikut Anda log masuk."
+"Jendela ini tidak bisa &quot;menyimpan setelan aktif saat ini&quot; dan bila "
+"log masuk kali lain Anda harus menjalankannya ulang."
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (pada %s)"

po/it.po

@@ -1,19 +1,19 @@
 # Italian translation for Mutter.
 # Based on Italian translation for Metacity
 # This file is distributed under the same license as metacity package
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
 # Pier Luigi Fiorini <plfiorini@libero.it>, 2002.
 # Lapo Calamandrei <lapo.calamandrei@virgilio.it>, 2003.
 # Luca Ferretti <lferrett@gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 15:52+0000\n"
-"PO-Revision-Date: 2017-02-17 22:11+0100\n"
+"POT-Creation-Date: 2016-09-07 09:27+0000\n"
+"PO-Revision-Date: 2016-10-03 11:50+0200\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 2.0beta3\n"
+"X-Generator: Poedit 1.8.9\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -277,10 +277,10 @@ msgstr "Modificatore da utilizzare per le azioni di gestione finestre estese"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Questa chiave pone inizio alla \"overlay\", cioè una combinazione tra la "
 "panoramica delle finestre e il sistema di lancio delle applicazioni. Il "
@@ -325,7 +325,7 @@ msgstr "Spazi di lavoro gestiti dinamicamente"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -365,9 +365,9 @@ msgstr "Ritarda il cambio del focus fino a quando il puntatore si ferma"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "Se impostato a VERO, e la modalità di focus è impostata a \"sloppy\" o "
 "\"mouse\", il focus non viene spostato immediatamente quando si passa su una "
@@ -379,7 +379,7 @@ msgstr "Larghezza bordo trascinabile"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Lo spessore effettivo totale per i bordi trascinabili. Se i bordi visibili "
@@ -466,51 +466,41 @@ msgstr "Passa al VT 11"
 msgid "Switch to VT 12"
 msgstr "Passa al VT 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1800
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Cambio modalità (gruppo %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:1707
 msgid "Switch monitor"
 msgstr "Cambia monitor"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Mostra aiuto sullo schermo"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Display integrato"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Display sconosciuto"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:463
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
 "Un altro compositing manager è già in esecuzione sullo schermo %i sul "
 "display «%s»."
@@ -519,7 +509,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Evento campanella"
 
-#. Translators: %s is a window title
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
@@ -537,52 +526,52 @@ msgstr ""
 "È possibile scegliere di attendere un po' lasciando che l'applicazione "
 "continui, oppure forzare la terminazione dell'applicazione."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forza uscita"
-
 #: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Attendi"
 
-#: src/core/display.c:608
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Forza uscita"
+
+#: src/core/display.c:590
 #, c-format
-msgid "Failed to open X Window System display “%s”\n"
+msgid "Failed to open X Window System display '%s'\n"
 msgstr "Apertura del display «%s» di X Window System non riuscita\n"
 
-#: src/core/main.c:189
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Disabilita la connessione al gestore di sessione"
 
-#: src/core/main.c:195
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Sostituisce il window manager in esecuzione"
 
-#: src/core/main.c:201
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Specifica l'ID di gestione sessione"
 
-#: src/core/main.c:206
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Display X da usare"
 
-#: src/core/main.c:212
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Inizializza la sessione da file salvato"
 
-#: src/core/main.c:218
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Rende le chiamate X sincrone"
 
-#: src/core/main.c:225
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Esegui come compositor Wayland"
 
-#: src/core/main.c:231
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Esegui come compositor annidato"
 
-#: src/core/main.c:239
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Esegui come display server invece che annidato"
 
@@ -590,7 +579,7 @@ msgstr "Esegui come display server invece che annidato"
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -614,39 +603,39 @@ msgstr "Plugin Mutter da usare"
 msgid "Workspace %d"
 msgstr "Spazio di lavoro %d"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "Il display «%s» ha già un window manager; provare a utilizzare l'opzione --"
 "replace per sostituirlo."
 
-#: src/core/screen.c:665
+#: src/core/screen.c:606
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Lo schermo %d sul display «%s» non è valido\n"
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Lo schermo %d nel display «%s» non è valido\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Mutter è stato compilato escludendo il supporto per la modalità prolissa\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Cambio modalità: modalità %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
-"Queste finestre non supportano la funzione «salva impostazioni attuali» e "
-"dovranno essere riavviate manualmente al prossimo accesso."
+"Queste finestre non supportano la funzione &quot;salva impostazioni "
+"attuali&quot; e dovranno essere riavviate manualmente al prossimo accesso."
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (su %s)"

po/nl.po

@@ -4,14 +4,13 @@
 # Reinout van Schouwen <reinouts@gnome.org>, 2003–2007, 2013, 2016 (nalezen).
 # Michiel Sikkes <michiels@gnome.org>, 2005.
 # Wouter Bolsterlee <wbolster@gnome.org>, 2006–2012.
-# Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-03-23 22:41+0100\n"
-"PO-Revision-Date: 2016-10-17 18:24+0200\n"
-"Last-Translator: Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
+"PO-Revision-Date: 2015-06-20 14:14+0100\n"
+"Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Poedit 1.8.1\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -43,7 +42,7 @@ msgstr "Venster verplaatsen naar werkblad 4"
 
 #: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
-msgstr "Venster verplaatsen naar laatste werkblad"
+msgstr "Venster verplaatsen naar laatst gebruikte werkblad"
 
 #: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
@@ -155,7 +154,7 @@ msgstr "Schakelen naar werkblad 4"
 
 #: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
-msgstr "Overschakelen naar laatste werkblad"
+msgstr "Schakelen naar laatst gebruikte werkblad"
 
 #: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"

po/pl.po

@@ -1,21 +1,20 @@
 # Polish translation for mutter.
-# Copyright © 2002-2017 the mutter authors.
+# Copyright © 2002-2016 the mutter authors.
 # This file is distributed under the same license as the mutter package.
 # Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 2002-2003.
 # Artur Flinta <aflinta@at.kernel.pl>, 2003-2005.
 # Marek Stępień <marcoos@aviary.pl>, 2007.
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2009.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2017.
-# Aviary.pl <community-poland@mozilla.org>, 2007-2017.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2016.
+# Aviary.pl <community-poland@mozilla.org>, 2007-2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 21:09+0000\n"
-"PO-Revision-Date: 2017-02-19 21:52+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-07 09:27+0000\n"
+"PO-Revision-Date: 2016-09-09 23:58+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -277,10 +276,10 @@ msgstr "Modyfikator używany do rozszerzonych działań menedżera okien"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Ten klawisz inicjuje tryb „overlay” (nakładki), który jest połączeniem "
 "podglądu okien i systemu uruchamiania programów. Domyślnie jest przeznaczony "
@@ -298,8 +297,8 @@ msgid ""
 "the parent window."
 msgstr ""
 "Jeśli wynosi wartość „true”, to modalne okna dialogowe pojawiają się "
-"dołączone do paska tytułowego okna nadrzędnego, zamiast mieć oddzielne paski "
-"tytułowe, i są przenoszone razem z nim."
+"dołączone do paska tytułowego okna nadrzędnego, zamiast mieć oddzielne "
+"paski tytułowe, i są przenoszone razem z nim."
 
 #: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -324,7 +323,7 @@ msgstr "Dynamiczne zarządzanie obszarami roboczymi"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -362,9 +361,9 @@ msgstr "Opóźnienie zmian aktywności do zatrzymania ruchu kursora"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, a tryb aktywności to „sloppy” lub "
 "„mouse”, to aktywność nie będzie zmieniana od razu po przejściu do okna, ale "
@@ -376,7 +375,7 @@ msgstr "Szerokość krawędzi możliwej do przenoszenia"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Suma całkowitych krawędzi możliwych do przenoszenia. Jeśli widoczne "
@@ -465,51 +464,41 @@ msgstr "Przełączenie na 11. konsolę wirtualną"
 msgid "Switch to VT 12"
 msgstr "Przełączenie na 12. konsolę wirtualną"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1800
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Przełącznik trybu (%d. grupa)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:1707
 msgid "Switch monitor"
 msgstr "Przełączenie monitora"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Wyświetlenie pomocy na ekranie"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Wbudowany ekran"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Nieznany ekran"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:463
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
 "Inny menedżer składania jest już uruchomiony na podekranie %i ekranu „%s”."
 
@@ -517,7 +506,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Zdarzenie sygnału dźwiękowego"
 
-#. Translators: %s is a window title
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
@@ -533,52 +521,52 @@ msgid ""
 "application to quit entirely."
 msgstr "Można poczekać chwilę dłużej lub wymusić zakończenie programu."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Zakończ"
-
 #: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Czekaj"
 
-#: src/core/display.c:608
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Zakończ"
+
+#: src/core/display.c:590
 #, c-format
-msgid "Failed to open X Window System display “%s”\n"
+msgid "Failed to open X Window System display '%s'\n"
 msgstr "Otwarcie połączenia z ekranem „%s” systemu X Window się nie powiodło\n"
 
-#: src/core/main.c:189
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Rozłącza połączenie z menedżerem sesji"
 
-#: src/core/main.c:195
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Zastępuje uruchomionego menedżera okien"
 
-#: src/core/main.c:201
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Podaje identyfikator zarządzania sesją"
 
-#: src/core/main.c:206
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Używany ekran X"
 
-#: src/core/main.c:212
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Inicjuje sesję z zapisanego pliku"
 
-#: src/core/main.c:218
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"
 
-#: src/core/main.c:225
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Uruchamia jako menedżer składania Wayland"
 
-#: src/core/main.c:231
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Uruchamia jako osadzony menedżer składania"
 
-#: src/core/main.c:239
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Uruchamia jako pełny serwer wyświetlania zamiast osadzonego"
 
@@ -586,13 +574,13 @@ msgstr "Uruchamia jako pełny serwer wyświetlania zamiast osadzonego"
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., oraz inni\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., oraz inni\n"
 "Niniejszy program jest wolnym oprogramowaniem, aby poznać warunki, pod\n"
 "jakimi dopuszczalne jest kopiowanie programu, zajrzyj do jego źródeł.\n"
 "Na program nie udziela się ŻADNYCH GWARANCJI, nawet domyślnej gwarancji\n"
@@ -611,18 +599,18 @@ msgstr "Używana wtyczka menedżera Mutter"
 msgid "Workspace %d"
 msgstr "%d. obszar roboczy"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "Na ekranie „%s” działa już menedżer okien. Aby zastąpić działającego "
 "menedżera okien, należy użyć opcji „--replace”."
 
-#: src/core/screen.c:665
+#: src/core/screen.c:606
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
+msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Podekran %d ekranu „%s” jest nieprawidłowy\n"
 
 #: src/core/util.c:120
@@ -630,20 +618,20 @@ msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Menedżer Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
-msgstr "Przełącznik trybu: %d. tryb"
+msgstr "Przełącznik trybu: tryb %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
 "Te okna nie obsługują opcji zapisu obecnego stanu („save current setup”), "
 "więc przy następnym zalogowaniu będą musiały zostać uruchomione ręcznie."
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

po/sk.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-10 22:51+0000\n"
-"PO-Revision-Date: 2017-02-12 14:37+0100\n"
+"POT-Creation-Date: 2016-07-22 13:03+0000\n"
+"PO-Revision-Date: 2016-08-04 15:28+0200\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -23,318 +23,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.8\n"
 
-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Navigácia"
 
 # description
-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Presunúť okno na pracovný priestor č. 1"
 
 # description
-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Presunúť okno na pracovný priestor č. 2"
 
 # description
-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Presunúť okno na pracovný priestor č. 3"
 
 # description
-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Presunúť okno na pracovný priestor č. 4"
 
 # description
-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Presunúť okno na posledný pracovný priestor"
 
 # description
-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Presunúť okno o jeden pracovný priestor vľavo"
 
 # description
-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace to the right"
 msgstr "Presunúť okno o jeden pracovný priestor vpravo"
 
 # description
-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Presunúť okno o jeden pracovný priestor hore"
 
 # description
-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Presunúť okno o jeden pracovný priestor dolu"
 
 # description
-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Presunúť okno o jeden monitor vľavo"
 
 # description
-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Presunúť okno o jeden monitor vpravo"
 
 # description
-#: data/50-mutter-navigation.xml:42
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Presunúť okno o jeden monitor hore"
 
 # description
-#: data/50-mutter-navigation.xml:45
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Presunúť okno o jeden monitor dolu"
 
 # description
-#: data/50-mutter-navigation.xml:49
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Prepnúť aplikácie"
 
 # description
-#: data/50-mutter-navigation.xml:54
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Prepnúť na predchádzajúcu aplikáciu"
 
 # description
-#: data/50-mutter-navigation.xml:58
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Prepnúť okná"
 
 # description
-#: data/50-mutter-navigation.xml:63
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Prepnúť na predchádzajúce okno"
 
 # description
-#: data/50-mutter-navigation.xml:67
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Prepnúť okná aplikácie"
 
 # description
-#: data/50-mutter-navigation.xml:72
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Prepnúť na predchádzajúce okno aplikácie"
 
 # PK: predpokladam ze to prepisane medzi tlacidlami
 # description
-#: data/50-mutter-navigation.xml:76
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Prepnúť medzi ovládacími prvkami systému"
 
 # PK: predpokladam ze to prepisane medzi tlacidlami
 # description
-#: data/50-mutter-navigation.xml:81
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Prepnúť na predchádzajúci ovládací prvok systému"
 
 # description
-#: data/50-mutter-navigation.xml:85
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Prepnúť okná priamo"
 
-#: data/50-mutter-navigation.xml:90
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Priamo prepnúť na predchádzajúce okno"
 
 # description
-#: data/50-mutter-navigation.xml:94
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Prepnúť okná aplikácie priamo"
 
 # description
-#: data/50-mutter-navigation.xml:99
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Priamo prepnúť na predchádzajúce okno aplikácie"
 
 # description
-#: data/50-mutter-navigation.xml:103
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Prepnúť medzi ovládacími prvkami systému priamo"
 
 # PK: predpokladam ze to prepisane medzi tlacidlami
 # description
-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Priamo prepnúť na predchádzajúci ovládací prvok systému"
 
 # description
-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Skryť všetky normálne okná"
 
 # description
-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Prepnúť na pracovný priestor č. 1"
 
 # description
-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Prepnúť na pracovný priestor č. 2"
 
 # description
-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Prepnúť na pracovný priestor č. 3"
 
 # description
-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Prepnúť na pracovný priestor č. 4"
 
 # description
-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Prepnúť na posledný pracovný priestor"
 
 # description
-#: data/50-mutter-navigation.xml:129
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Presunúť na pracovný priestor vľavo"
 
 # description
-#: data/50-mutter-navigation.xml:132
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Presunúť na pracovný priestor vpravo"
 
 # description
-#: data/50-mutter-navigation.xml:135
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Presunúť na pracovný priestor hore"
 
 # description
-#: data/50-mutter-navigation.xml:138
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Presunúť na pracovný priestor dole"
 
-#: data/50-mutter-system.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Systém"
 
 # description
-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr "Zobraziť riadok pre spustenie príkazu"
 
 # description
-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr "Zobraziť prehľad aktivít"
 
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Okná"
 
 # description
-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Aktivovať ponuku okna"
 
 # description
-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Prepnúť režim na celú obrazovku"
 
 # description
-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr "Prepnúť stav maximalizácie"
 
 # description
-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Maximalizovať okno"
 
 # description
-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Obnoviť okno"
 
 # description
-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
 msgid "Toggle shaded state"
 msgstr "Prepnúť stav zatienenia"
 
 # description
-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Zatvoriť okno"
 
 # description
-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Skryť okno"
 
 # description
-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Presunúť okno"
 
 # description
-#: data/50-mutter-windows.xml:26
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Zmeniť veľkosť okna"
 
 # description
-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr "Prepnúť okno na všetky pracovné priestory alebo len na jeden"
 
 # description
-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Presunúť okno dopredu ak je zakryté, inak presunúť dozadu"
 
 # description
-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr "Presunúť okno nad ostatné okná"
 
 # description
-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr "Presunúť okno pod ostatné okná"
 
 # description
-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Maximalizovať okno zvisle"
 
 # description
-#: data/50-mutter-windows.xml:39
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Maximalizovať okno vodorovne"
 
 # Description
-#: data/50-mutter-windows.xml:43
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Zobraziť rozdelenie naľavo"
 
 # Description
-#: data/50-mutter-windows.xml:47
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "Zobraziť rozdelenie napravo"
 
-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutter"
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr "Modifikátor pre rozšírené operácie správcu okien"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -347,12 +347,12 @@ msgstr ""
 "nastavenie na prázdny reťazec."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Pripojiť modálne dialógové okná"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -363,12 +363,12 @@ msgstr ""
 "spolu s oknom rodiča."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Povoliť natiahnutie k okraju pri pustení okien na okrajoch obrazovky"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
@@ -379,12 +379,12 @@ msgstr ""
 "Upustenie okien pri vrchnom okraji obrazovky ich maximalizuje úplne."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "Pracovné priestory sú spravované dynamicky"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -394,12 +394,12 @@ msgstr ""
 "pevný (určený kľúčom num-workspaces v org.gnome.desktop.wm.preferences)."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "Pracovné priestory len na hlavnom monitore"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -408,12 +408,12 @@ msgstr ""
 "monitoroch alebo iba medzi oknami na hlavnom monitore."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr "Bez vyvolávania tabulátorom"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -422,12 +422,12 @@ msgstr ""
 "vypnúť pri prepínaní okien."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr "Odložiť zmeny zamerania až po zastavení pohybu ukazovateľa"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:69
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
 "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
 "the focus will not be changed immediately when entering a window, but only "
@@ -438,12 +438,12 @@ msgstr ""
 "okna a zastavení ukazovateľa."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Šírka posúvateľného okraja"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
 "The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
@@ -452,12 +452,12 @@ msgstr ""
 "nastavené témou, budú pridané neviditeľné okraje až do požadovanej hodnoty."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr "Automaticky maximalizovať okná podobnej veľkosti ako je monitor"
 
 # description
-#: data/org.gnome.mutter.gschema.xml.in:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@@ -465,11 +465,11 @@ msgstr ""
 "Ak je povolené, nové okná inicializované na veľkosť monitora budú "
 "automaticky maximalizované."
 
-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr "Umiestniť nové okná do stredu"
 
-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
@@ -478,114 +478,103 @@ msgstr ""
 "obrazovky monitoru."
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr "Vybrať okno z rozbaľovacej ponuky tabulátora"
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr "Zrušit rozbaľovaciu ponuku tabulátora"
 
 # description
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 msgid "Switch to VT 1"
 msgstr "Prepnúť na VT č. 1"
 
 # description
-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
 msgid "Switch to VT 2"
 msgstr "Prepnúť na VT č. 2"
 
 # description
-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
 msgid "Switch to VT 3"
 msgstr "Prepnúť na VT č. 3"
 
 # description
-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
 msgid "Switch to VT 4"
 msgstr "Prepnúť na VT č. 4"
 
 # description
-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
 msgid "Switch to VT 5"
 msgstr "Prepnúť na VT č. 5"
 
 # description
-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
 msgid "Switch to VT 6"
 msgstr "Prepnúť na VT č. 6"
 
 # description
-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
 msgid "Switch to VT 7"
 msgstr "Prepnúť na VT č. 7"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
 msgid "Switch to VT 8"
 msgstr "Prepnúť na VT č. 8"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
 msgid "Switch to VT 9"
 msgstr "Prepnúť na VT č. 9"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
 msgid "Switch to VT 10"
 msgstr "Prepnúť na VT č. 10"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
 msgid "Switch to VT 11"
 msgstr "Prepnúť na VT č. 11"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
 msgid "Switch to VT 12"
 msgstr "Prepnúť na VT č. 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Prepínač režimu (skupina č. %d)"
-
 # PK: predpokladam ze to prepisane medzi tlacidlami
 # description
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1781
+#: ../src/backends/meta-input-settings.c:1601
 msgid "Switch monitor"
 msgstr "Prepnúť monitor"
 
-#: src/backends/meta-input-settings.c:1783
+#: ../src/backends/meta-input-settings.c:1603
 msgid "Show on-screen help"
 msgstr "Zobraziť pomocníka na obrazovke"
 
-#: src/backends/meta-monitor-manager.c:675
+#: ../src/backends/meta-monitor-manager.c:515
 msgid "Built-in display"
 msgstr "Vstavaný displej"
 
-#: src/backends/meta-monitor-manager.c:698
+#: ../src/backends/meta-monitor-manager.c:538
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: src/backends/meta-monitor-manager.c:700
+#: ../src/backends/meta-monitor-manager.c:540
 msgid "Unknown Display"
 msgstr "Neznámy displej"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: ../src/backends/meta-monitor-manager.c:548
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: ../src/compositor/compositor.c:463
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -593,86 +582,85 @@ msgid ""
 msgstr ""
 "Pre obrazovku č. %i na displeji „%s“ je spustený už iný správca rozloženia."
 
-#: src/core/bell.c:194
+#: ../src/core/bell.c:194
 msgid "Bell event"
 msgstr "Udalosť zvončeka"
 
 # %s is a window title
-#. Translators: %s is a window title
-#: src/core/delete.c:127
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "„%s“ neodpovedá."
 
-#: src/core/delete.c:129
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Aplikácia neodpovedá."
 
-#: src/core/delete.c:134
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr ""
 "Môžete chvíľu počkať na pokračovanie aplikácie, alebo ju môžete ukončiť."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Vynútiť ukončenie"
-
-#: src/core/delete.c:141
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Počkať"
 
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Vynútiť ukončenie"
+
 # X window system preloz, napr. system na spravu okien X
-#: src/core/display.c:608
+#: ../src/core/display.c:590
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Zlyhalo otvorenie displeja systému na správu okien X „%s“\n"
 
 # cmd desc
-#: src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Zakáže pripojenia k správcovi relácií"
 
 # cmd desc
-#: src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Nahradí bežiaceho správcu okien"
 
 # cmd desc
-#: src/core/main.c:199
+#: ../src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Zadá identifikátor správy relácií"
 
-#: src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "X Display to use"
 msgstr "X displej, ktorý bude použitý"
 
 # cmd desc
-#: src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Inicializuje reláciu z uloženého súboru"
 
 # cmd desc
-#: src/core/main.c:216
+#: ../src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Použije synchrónne volania X"
 
 # cmd desc
-#: src/core/main.c:223
+#: ../src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Spustí ako kompozitor protokolu wayland"
 
 # cmd desc
-#: src/core/main.c:229
+#: ../src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Spustí ako kompozitor s vnoreným režimom"
 
-#: src/core/main.c:237
+#: ../src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustí ako plnohodnotný zobrazovací server, namiesto vnoreného režimu"
 
-#: src/core/mutter.c:39
+#: ../src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -688,21 +676,21 @@ msgstr ""
 "Záruka sa NEPOSKYTUJE; ani na PREDAJNOSŤ alebo VHODNOSŤ PRE URČITÝ ÚČEL.\n"
 
 # cmd desc
-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Zobrazí verziu"
 
 # cmd desc
-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Použije zásuvný modul Mutter"
 
-#: src/core/prefs.c:1997
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Pracovný priestor č. %d"
 
-#: src/core/screen.c:580
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -711,21 +699,21 @@ msgstr ""
 "Displej „%s“ už má správcu okien. Skúste použiť prepínač --replace, aby sa "
 "aktuálny správca nahradil."
 
-#: src/core/screen.c:665
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka č. %d na displeji „%s“ nie je platná\n"
 
-#: src/core/util.c:120
+#: ../src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bol skompilovaný bez výpisu podrobností pri behu\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: ../src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Prepínač režimu: Režim č. %d"
 
-#: src/x11/session.c:1815
+#: ../src/x11/session.c:1815
 msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
@@ -734,7 +722,7 @@ msgstr ""
 "prihlásení ich budete musieť znovu spustiť ručne."
 
 # window title; wm_client_machine
-#: src/x11/window-props.c:559
+#: ../src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

po/sl.po

@@ -4,275 +4,276 @@
 #
 # Andraž Tori <andraz.tori1@guest.arnes.si>, 2000.
 # Matjaž Horvat <m@owca.info>, 2006.
-# Matej Urbančič <mateju@svn.gnome.org>, 2007–2017.
+# Matej Urbančič <mateju@svn.gnome.org>, 2007-2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-14 08:48+0100\n"
-"PO-Revision-Date: 2017-02-14 08:48+0100\n"
+"POT-Creation-Date: 2016-08-18 22:38+0200\n"
+"PO-Revision-Date: 2016-08-18 22:39+0200\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Krmarjenje"
 
-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Premakni okno na delovno površino 1"
 
-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Premakni okno na delovno površino 2"
 
-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Premakni okno na delovno površino 3"
 
-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Premakni okno na delovno površino 4"
 
-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Premakni okno na zadnjo delovno površino"
 
-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Premakni okno eno delovno površino levo"
 
-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace to the right"
 msgstr "Premakni okno eno delovno površino desno"
 
-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Premakni okno eno delovno površino navzgor"
 
-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Prestavi okno eno delovno površino navzdol"
 
-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Premakni okno en zaslon levo"
 
-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Premakni okno en zaslon desno"
 
-#: data/50-mutter-navigation.xml:42
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Premakni okno en zaslon navzgor"
 
-#: data/50-mutter-navigation.xml:45
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Prestavi okno en zaslon navzdol"
 
-#: data/50-mutter-navigation.xml:49
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Preklopi programe"
 
-#: data/50-mutter-navigation.xml:54
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Preklopi na prejšnji program"
 
-#: data/50-mutter-navigation.xml:58
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Preklopi okna"
 
-#: data/50-mutter-navigation.xml:63
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Preklopi na prejšnje okno"
 
-#: data/50-mutter-navigation.xml:67
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Preklopi okna programa"
 
-#: data/50-mutter-navigation.xml:72
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Preklopi na predhodno okno programa"
 
-#: data/50-mutter-navigation.xml:76
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Preklopi tipkovne bližnjice"
 
-#: data/50-mutter-navigation.xml:81
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Preklopi na predhodno sistemsko okno"
 
-#: data/50-mutter-navigation.xml:85
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Preklopi okna neposredno"
 
-#: data/50-mutter-navigation.xml:90
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Preklopi na predhodno okno"
 
-#: data/50-mutter-navigation.xml:94
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Preklopi okna programa neposredno"
 
-#: data/50-mutter-navigation.xml:99
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Preklopi na predhodno okno programa"
 
-#: data/50-mutter-navigation.xml:103
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Preklopi tipkovne bližnjice neposredno"
 
-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Preklopi na predhodno sistemsko okno"
 
-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Skrij vsa običajna okna"
 
-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Preklopi na delovno površino 1"
 
-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Preklopi na delovno površino 2"
 
-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Preklopi na delovno površino 3"
 
-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Preklopi na delovno površino 4"
 
-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Preklopi na zadnjo delovno površino"
 
-#: data/50-mutter-navigation.xml:129
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Premakni na levo delovno površino"
 
-#: data/50-mutter-navigation.xml:132
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Premakni na desno delovno površino"
 
-#: data/50-mutter-navigation.xml:135
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Premakni na zgornjo delovno površino"
 
-#: data/50-mutter-navigation.xml:138
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Premakni na spodnjo delovno površino"
 
-#: data/50-mutter-system.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Sistem"
 
-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr "Pokaži možnost zagona ukazne vrstice"
 
-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr "Pokaži okno pregleda dejavnosti"
 
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Okna"
 
-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Omogoči meni okna"
 
-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Preklopi celozaslonski način"
 
-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr "Preklopi stanje razpetosti"
 
 # G:1 K:0 O:0
-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Razpni okno"
 
-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Obnovi okno"
 
-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
 msgid "Toggle shaded state"
 msgstr "Preklopi stanje senčenja"
 
-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Zapri okno"
 
-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Skrij okno"
 
-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Premakni okno"
 
-#: data/50-mutter-windows.xml:26
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Spremeni velikost okna"
 
-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr "Preklopi okno na vse delovne površine oziroma le na eno"
 
-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Dvigni okno, če ga prekriva drugo okno, sicer ga spusti"
 
-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr "Dvigni okno nad druga okna"
 
-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr "Spusti okno pod druga"
 
-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Razpni okno navpično"
 
-#: data/50-mutter-windows.xml:39
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Razpni okno vodoravno"
 
-#: data/50-mutter-windows.xml:43
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Poglej razdelek na levi"
 
-#: data/50-mutter-windows.xml:47
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "Poglej razdelek na desni"
 
-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutter"
 
-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr "Spremenilnik, ki naj se uporabi za upravljanje oken"
 
-#: data/org.gnome.mutter.gschema.xml.in:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -284,11 +285,11 @@ msgstr ""
 "računalnika. Pričakovano je, da je vrednost določena privzeto ali pa ni "
 "določena."
 
-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Pripni modalna pogovorna okna"
 
-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -297,11 +298,11 @@ msgstr ""
 "Izbrana možnost omogoči, da je namesto samostojnih nazivnih vrstic, na to "
 "mesto pripeto modalno pogovorno okno, ki se premika z nadrejenim oknom."
 
-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Omogoči prilagajanje velikosti okna ob dotiku robov zaslona"
 
-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
@@ -311,11 +312,11 @@ msgstr ""
 "razpeta po navpični osi in razširjena na polovično širino. Dotik vrhnjega "
 "roba razpne okno čez cel zaslon."
 
-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "Število delovnih površin je spremenljivo"
 
-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -325,11 +326,11 @@ msgstr ""
 "število stalno (določenih s ključem števila delovnih površin med možnostmi v "
 "org.gnome.desktop.wm.preferences)."
 
-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "Delovne površine le na prvem zaslonu"
 
-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -337,11 +338,11 @@ msgstr ""
 "Določa ali naj se delovne površine preklapljajo na vseh zaslonih ali le na "
 "prvem, glavnem zaslonu."
 
-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr "Brez pojavnih zavihkov"
 
-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -349,11 +350,11 @@ msgstr ""
 "Določa ali naj bo uporaba pojavnih zavihkov in poudarjanja onemogočena med "
 "kroženjem oken."
 
-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr "Zamakni spremembe žarišča, dokler se kazalnik še premika"
 
-#: data/org.gnome.mutter.gschema.xml.in:69
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
 "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
 "the focus will not be changed immediately when entering a window, but only "
@@ -363,11 +364,11 @@ msgstr ""
 "ali \"miška\", ne spremeni takoj ob izbiri okna. Žarišče se spremeni, ko se "
 "kazalnik preneha premikati."
 
-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Prilagodljiva obroba pravokotnika"
 
-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
 "The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
@@ -375,11 +376,11 @@ msgstr ""
 "Delež skupne prilagodljive obrobe. V kolikor vidni robovi teme niso dovolj, "
 "so dodane nevidne obrobe, za dodatno prilagajanje."
 
-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr "Samodejno razpni okna, ki so skoraj enaka velikosti zaslona"
 
-#: data/org.gnome.mutter.gschema.xml.in:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@@ -387,115 +388,104 @@ msgstr ""
 "Izbrana možnost omogoča, da bodo okna, ki so skoraj tako velika, kot je "
 "velik zaslon, med preslikavo samodejno razpeta."
 
-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr "Postavi novo okno v središče"
 
-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""
 "Izbrana možnost določa, da bo novo okno vedno v središču dejavnega zaslona."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr "Izbor okna iz pojavnega zavihka"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr "Prekliči pojavni zavihek"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 msgid "Switch to VT 1"
 msgstr "Preklopi na VT 1"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
 msgid "Switch to VT 2"
 msgstr "Preklopi na VT 2"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
 msgid "Switch to VT 3"
 msgstr "Preklopi na VT 3"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
 msgid "Switch to VT 4"
 msgstr "Preklopi na VT 4"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
 msgid "Switch to VT 5"
 msgstr "Preklopi na VT 5"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
 msgid "Switch to VT 6"
 msgstr "Preklopi na VT 6"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
 msgid "Switch to VT 7"
 msgstr "Preklopi na VT 7"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
 msgid "Switch to VT 8"
 msgstr "Preklopi na VT 8"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
 msgid "Switch to VT 9"
 msgstr "Preklopi na VT 9"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
 msgid "Switch to VT 10"
 msgstr "Preklopi na VT 10"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
 msgid "Switch to VT 11"
 msgstr "Preklopi na VT 11"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
 msgid "Switch to VT 12"
 msgstr "Preklopi na VT 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1759
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Preklop načina (skupina %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1781
+#: ../src/backends/meta-input-settings.c:1707
 msgid "Switch monitor"
 msgstr "Nadzornik preklopa"
 
-#: src/backends/meta-input-settings.c:1783
+#: ../src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Pokaži zaslonsko pomoč"
 
-#: src/backends/meta-monitor-manager.c:675
+#: ../src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Vgrajen zaslon"
 
-#: src/backends/meta-monitor-manager.c:698
+#: ../src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/backends/meta-monitor-manager.c:700
+#: ../src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Neznan zaslon"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: ../src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: ../src/compositor/compositor.c:463
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -503,21 +493,20 @@ msgid ""
 msgstr ""
 "Drug upravljalnik sestavljanja je že zagnan na zaslonu %i prikaza \"%s\"."
 
-#: src/core/bell.c:194
+#: ../src/core/bell.c:194
 msgid "Bell event"
 msgstr "Dogodek zvonjenja"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” se ne odziva."
 
-#: src/core/delete.c:129
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Program se ne odziva."
 
-#: src/core/delete.c:134
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -525,56 +514,56 @@ msgstr ""
 "Lahko še malo počakate, če program morda spet začne delovati, ali pa vsilite "
 "končanje delovanja."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Vsili konec"
-
-#: src/core/delete.c:141
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Počakaj"
 
-#: src/core/display.c:608
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Vsili konec"
+
+#: ../src/core/display.c:590
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"
 
-#: src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Onemogoči povezavo z upravljalnikom sej"
 
-#: src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Zamenjaj trenutni upravljalnik oken"
 
-#: src/core/main.c:199
+#: ../src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Navedite ID upravljanja seje"
 
-#: src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "X Display to use"
 msgstr "Zaslon X za uporabo"
 
-#: src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Začni sejo iz shranjene datoteke"
 
-#: src/core/main.c:216
+#: ../src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Uskladi klice X"
 
-#: src/core/main.c:223
+#: ../src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Zaženi izbirnik wayland"
 
-#: src/core/main.c:229
+#: ../src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Zaženi kot gnezden vpisovalnik"
 
-#: src/core/main.c:237
+#: ../src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"
 
-#: src/core/mutter.c:39
+#: ../src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -589,21 +578,21 @@ msgstr ""
 "kodo.\n"
 "Program je na voljo BREZ KAKRŠNIHKOLI ZAGOTOVIL.\n"
 
-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Izpiši različico"
 
-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Vstavek Mutter za uporabo"
 
 # G:1 K:0 O:0
-#: src/core/prefs.c:1997
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"
 
-#: src/core/screen.c:580
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -612,23 +601,23 @@ msgstr ""
 "Zaslon \"%s\" že ima določen upravljalnik oken; poskušajte uporabiti možnost "
 "--replace za zamenjavo trenutnega upravljalnika zaslona."
 
-#: src/core/screen.c:665
+#: ../src/core/screen.c:606
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"
 
-#: src/core/util.c:120
+#: ../src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Program Mutter je kodno preveden brez podpore za podrobni način izpisovanja\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: ../src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Način preklopa: način %d"
 
 # G:2 K:6 O:0
-#: src/x11/session.c:1815
+#: ../src/x11/session.c:1815
 msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
@@ -636,7 +625,7 @@ msgstr ""
 "Ta okna ne podpirajo možnosti &quot;shranjevanja trenutnih nastavitev&quot;, "
 "zato jih bo treba ob naslednji prijavi zagnati ročno."
 
-#: src/x11/window-props.c:559
+#: ../src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

po/sv.po

@@ -1,9 +1,9 @@
 # Swedish messages for mutter.
-# Copyright © 2001-2017 Free Software Foundation, Inc.
+# Copyright © 2001-2016 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Mattias Eriksson <snaggen@gmail.com>, 2014.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016, 2017.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016.
 # Sebastian Rasmussen <sebras@gmail.com>, 2016.
 #
 msgid ""
@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 21:09+0000\n"
-"PO-Revision-Date: 2017-02-21 01:20+0100\n"
+"POT-Creation-Date: 2016-09-07 09:27+0000\n"
+"PO-Revision-Date: 2016-09-07 11:54+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -271,15 +271,15 @@ msgstr "Modifierare att använda för utökade fönsterhanteringsåtgärder"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
-"Denna nyckel kommer att initiera ”overlay”, som är en kombinerad "
-"fönsteröversikt och programstartare. Standard är tänkt att vara ”Windows-"
-"tangenten” på PC-maskinvara. Det är förväntat att denna bindning antingen är "
-"standard eller inställd till en tom sträng."
+"Denna nyckel kommer att initiera \"overlay\", som är en kombinerad "
+"fönsteröversikt och programstartare. Standard är tänkt att vara \"Windows-"
+"tangenten\" på PC-maskinvara. Det är förväntat att denna bindning antingen "
+"är standard eller inställd till en tom sträng."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
@@ -315,7 +315,7 @@ msgstr "Arbetsytor hanteras dynamiskt"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -353,11 +353,11 @@ msgstr "Fördröj fokusändringar till muspekaren hålls still"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
-"Om satt till true (sant), och fokusläget är antingen ”sloppy” eller ”mouse” "
+"Om satt till \"true\", och fokusläget är antingen \"sloppy\" eller \"mouse\" "
 "kommer fokus inte att ändras omedelbart när muspekaren går in över ett "
 "fönster, utan först efter att muspekaren slutar röra sig."
 
@@ -367,7 +367,7 @@ msgstr "Dragbar rambredd"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Mängd av totalt dragbara ramar. Om temats synliga ramar inte är tillräckliga "
@@ -453,58 +453,47 @@ msgstr "Växla till VT 11"
 msgid "Switch to VT 12"
 msgstr "Växla till VT 12"
 
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:1800
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Lägesväxel (grupp %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:1707
 msgid "Switch monitor"
 msgstr "Växla skärm"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Visa hjälp på skärmen"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Inbyggd display"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Okänd display"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:463
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr "En annan kompositionshanterare körs redan på skärm %i på display ”%s”."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Ljudsignalhändelse"
 
-#. Translators: %s is a window title
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
@@ -522,52 +511,52 @@ msgstr ""
 "Du kan välja att vänta en kort stund på det för att fortsätta eller tvinga "
 "programmet att helt avslutas."
 
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Tvinga avslut"
-
 #: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Vänta"
 
-#: src/core/display.c:608
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Tvinga avslut"
+
+#: src/core/display.c:590
 #, c-format
-msgid "Failed to open X Window System display “%s”\n"
+msgid "Failed to open X Window System display '%s'\n"
 msgstr "Misslyckades med att öppna X Window System-displayen ”%s”\n"
 
-#: src/core/main.c:189
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Inaktivera anslutning till sessionshanteraren"
 
-#: src/core/main.c:195
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Ersätt körande fönsterhanteraren"
 
-#: src/core/main.c:201
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Ange sessionshanteringsid"
 
-#: src/core/main.c:206
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "X-display att använda"
 
-#: src/core/main.c:212
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Initiera session från sparandefil"
 
-#: src/core/main.c:218
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Gör X-anrop synkrona"
 
-#: src/core/main.c:225
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Kör som en wayland-kompositionshanterare"
 
-#: src/core/main.c:231
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Kör som en nästlad kompositionshanterare"
 
-#: src/core/main.c:239
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Kör som en full display-tjänst, i stället för nästlad"
 
@@ -575,7 +564,7 @@ msgstr "Kör som en full display-tjänst, i stället för nästlad"
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -599,38 +588,38 @@ msgstr "Mutter-insticksmodul att använda"
 msgid "Workspace %d"
 msgstr "Arbetsyta %d"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "Display ”%s” har redan en fönsterhanterare; försök med flaggan --replace för "
 "att ersätta den aktuella fönsterhanteraren."
 
-#: src/core/screen.c:665
+#: src/core/screen.c:606
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
+msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skärm %d på display ”%s” är ogiltig\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter kompilerades utan stöd för utförligt läge\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Lägesväxel: Läge %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
-"Dessa fönster saknar stöd för ”spara nuvarande inställningar” och kommer att "
-"behöva startas om manuellt nästa gång du loggar in."
+"Dessa fönster saknar stöd för &quot;spara nuvarande inställningar&quot; och "
+"kommer att behöva startas om manuellt nästa gång du loggar in."
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (på %s)"

src/Makefile-tests.am

@@ -27,25 +27,13 @@ endif
 EXTRA_DIST += tests/mutter-all.test.in
 
 mutter_test_client_SOURCES = tests/test-client.c
-mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
+mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter.la
 
 mutter_test_runner_SOURCES = tests/test-runner.c
-mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
+mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter.la
 
-mutter_test_unit_tests_SOURCES = \
-	tests/unit-tests.c \
-	tests/meta-backend-test.c \
-	tests/meta-backend-test.h \
-	tests/meta-monitor-manager-test.c \
-	tests/meta-monitor-manager-test.h \
-	tests/monitor-store-unit-tests.c \
-	tests/monitor-store-unit-tests.h \
-	tests/monitor-test-utils.c \
-	tests/monitor-test-utils.h \
-	tests/monitor-unit-tests.c \
-	tests/monitor-unit-tests.h \
-	$(NULL)
-mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
+mutter_test_unit_tests_SOURCES = tests/unit-tests.c
+mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter.la
 
 .PHONY: run-tests run-test-runner-tests run-unit-tests
 
@@ -62,6 +50,6 @@ endif
 # Some random test programs for bits of the code
 
 testboxes_SOURCES = core/testboxes.c
-testboxes_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
+testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
 
 noinst_PROGRAMS += testboxes

src/Makefile.am

@@ -1,7 +1,7 @@
 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
 .AUTOPARALLEL:
 
-lib_LTLIBRARIES = libmutter-@LIBMUTTER_API_VERSION@.la
+lib_LTLIBRARIES = libmutter.la
 
 SUBDIRS=compositor/plugins
 
@@ -79,7 +79,7 @@ wayland_protocols =				\
 	wayland/protocol/gtk-primary-selection.xml	\
 	$(NULL)
 
-libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
+libmutter_la_SOURCES =				\
 	backends/meta-backend.c			\
 	meta/meta-backend.h			\
 	backends/meta-backend-private.h		\
@@ -91,9 +91,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-cursor-tracker-private.h	\
 	backends/meta-cursor-renderer.c		\
 	backends/meta-cursor-renderer.h		\
-	backends/meta-egl.c			\
-	backends/meta-egl.h			\
-	backends/meta-egl-ext.h			\
 	backends/meta-display-config-shared.h	\
 	backends/meta-idle-monitor.c		\
 	backends/meta-idle-monitor-private.h	\
@@ -101,16 +98,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-idle-monitor-dbus.h	\
 	backends/meta-input-settings.c		\
 	backends/meta-input-settings-private.h	\
-	backends/meta-logical-monitor.c		\
-	backends/meta-logical-monitor.h		\
 	backends/meta-monitor-config.c		\
 	backends/meta-monitor-config.h		\
-	backends/meta-monitor-config-manager.c	\
-	backends/meta-monitor-config-manager.h	\
-	backends/meta-monitor-config-store.c	\
-	backends/meta-monitor-config-store.h	\
-	backends/meta-monitor.c			\
-	backends/meta-monitor.h			\
 	backends/meta-monitor-manager.c		\
 	meta/meta-monitor-manager.h		\
 	backends/meta-monitor-manager-private.h	\
@@ -134,10 +123,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/x11/meta-clutter-backend-x11.h		\
 	backends/x11/meta-cursor-renderer-x11.c		\
 	backends/x11/meta-cursor-renderer-x11.h		\
-	backends/x11/cm/meta-backend-x11-cm.c		\
-	backends/x11/cm/meta-backend-x11-cm.h		\
-	backends/x11/nested/meta-backend-x11-nested.c	\
-	backends/x11/nested/meta-backend-x11-nested.h	\
 	backends/x11/nested/meta-cursor-renderer-x11-nested.c		\
 	backends/x11/nested/meta-cursor-renderer-x11-nested.h		\
 	backends/x11/meta-idle-monitor-xsync.c		\
@@ -232,7 +217,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	core/meta-gesture-tracker-private.h	\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
-	core/main-private.h			\
 	core/main.c				\
 	core/place.c				\
 	core/place.h				\
@@ -289,7 +273,7 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	$(NULL)
 
 if HAVE_WAYLAND
-libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
+libmutter_la_SOURCES +=				\
 	compositor/meta-surface-actor-wayland.c	\
 	compositor/meta-surface-actor-wayland.h	\
 	wayland/meta-wayland.c			\
@@ -307,8 +291,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 	wayland/meta-wayland-data-device.c      \
 	wayland/meta-wayland-data-device.h      \
 	wayland/meta-wayland-data-device-private.h	\
-	wayland/meta-wayland-egl-stream.c	\
-	wayland/meta-wayland-egl-stream.h	\
 	wayland/meta-wayland-input-device.c	\
 	wayland/meta-wayland-input-device.h	\
 	wayland/meta-wayland-pointer-gestures.c	\
@@ -373,7 +355,7 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 endif
 
 if HAVE_NATIVE_BACKEND
-libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
+libmutter_la_SOURCES +=					\
 	backends/native/meta-backend-native.c		\
 	backends/native/meta-backend-native.h		\
 	backends/native/meta-backend-native-private.h	\
@@ -401,14 +383,13 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
 	$(NULL)
 endif
 
-nodist_libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES = $(mutter_built_sources)
+nodist_libmutter_la_SOURCES = $(mutter_built_sources)
 
-libmutter_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
-	-no-undefined -export-symbols-regex "^(meta|ag)_.*"
-libmutter_@LIBMUTTER_API_VERSION@_la_LIBADD  = \
+libmutter_la_LDFLAGS = -no-undefined -export-symbols-regex "^(meta|ag)_.*"
+libmutter_la_LIBADD  = \
 	$(MUTTER_LIBS) \
 	$(MUTTER_NATIVE_BACKEND_LIBS)	\
-	$(top_builddir)/clutter/clutter/libmutter-clutter-$(LIBMUTTER_API_VERSION).la \
+	$(top_builddir)/clutter/clutter/libmutter-clutter-1.0.la \
 	$(NULL)
 
 # Headers installed for plugins; introspected information will
@@ -467,7 +448,7 @@ bin_PROGRAMS=mutter
 noinst_PROGRAMS=
 
 mutter_SOURCES = core/mutter.c
-mutter_LDADD = $(MUTTER_LIBS) libmutter-@LIBMUTTER_API_VERSION@.la
+mutter_LDADD = $(MUTTER_LIBS) libmutter.la
 
 libexec_PROGRAMS = mutter-restart-helper
 mutter_restart_helper_SOURCES = core/restart-helper.c
@@ -476,51 +457,36 @@ mutter_restart_helper_LDADD = $(MUTTER_LIBS)
 include Makefile-tests.am
 
 if HAVE_INTROSPECTION
-
 include $(INTROSPECTION_MAKEFILE)
 
+# Since we don't make any guarantees about stability and we don't support
+# parallel install, there's no real reason to change directories, filenames,
+# etc. as we change the Mutter tarball version.
+#api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
+api_version = 3.0
+
 # These files are in package-private directories, even though they may be used
 # by plugins.  If you're writing a plugin, use g-ir-compiler --add-include-path
 # and g-ir-compiler --includedir.
 girdir = $(pkglibdir)
-gir_DATA = Meta-$(LIBMUTTER_API_VERSION).gir
+gir_DATA = Meta-$(api_version).gir
 
 typelibdir = $(pkglibdir)
-typelib_DATA = Meta-$(LIBMUTTER_API_VERSION).typelib
+typelib_DATA = Meta-$(api_version).typelib
 
-INTROSPECTION_GIRS = Meta-$(LIBMUTTER_API_VERSION).gir
-INTROSPECTION_SCANNER_ARGS =					\
-	--add-include-path=$(top_builddir)/clutter/clutter	\
-	--add-include-path=$(top_builddir)/cogl/cogl		\
-	--add-include-path=$(top_builddir)/cogl/cogl-pango	\
-	$(NULL)
-INTROSPECTION_COMPILER_ARGS =					\
-	--includedir=$(top_builddir)/clutter/clutter		\
-	--includedir=$(top_builddir)/cogl/cogl			\
-	--includedir=$(top_builddir)/cogl/cogl-pango		\
-	$(NULL)
-INTROSPECTION_SCANNER_ENV = \
-	PKG_CONFIG_PATH=$(top_builddir)/clutter/clutter/:$(top_builddir)/cogl/cogl/:$(top_builddir)/cogl/cogl-pango/:$${PKG_CONFIG_PATH}
+INTROSPECTION_GIRS = Meta-$(api_version).gir
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/clutter/clutter --add-include-path=$(top_builddir)/cogl/cogl --add-include-path=$(top_builddir)/cogl/cogl-pango
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/clutter/clutter --includedir=$(top_builddir)/cogl/cogl --includedir=$(top_builddir)/cogl/cogl-pango
 
-Meta-@LIBMUTTER_API_VERSION@.gir: libmutter-$(LIBMUTTER_API_VERSION).la
-Meta_@LIBMUTTER_API_VERSION@_gir_VERSION = $(LIBMUTTER_API_VERSION)
-Meta_@LIBMUTTER_API_VERSION@_gir_INCLUDES =	\
-	GObject-2.0				\
-	GDesktopEnums-3.0			\
-	Gdk-3.0					\
-	Gtk-3.0					\
-	Cogl-$(LIBMUTTER_API_VERSION)		\
-	Clutter-$(LIBMUTTER_API_VERSION)	\
-	xlib-2.0				\
-	xfixes-4.0				\
-	$(NULL)
-Meta_@LIBMUTTER_API_VERSION@_gir_EXPORT_PACKAGES = libmutter-$(LIBMUTTER_API_VERSION)
-Meta_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS)
-Meta_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-$(LIBMUTTER_API_VERSION).la
-Meta_@LIBMUTTER_API_VERSION@_gir_FILES =			\
-	$(libmutterinclude_base_headers)			\
-	$(filter %.c,$(libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES) $(nodist_libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES))
-Meta_@LIBMUTTER_API_VERSION@_SCANNERFLAGS = --warn-all --warn-error
+Meta-$(api_version).gir: libmutter.la
+@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
+@META_GIR@_EXPORT_PACKAGES = libmutter
+@META_GIR@_CFLAGS = $(AM_CPPFLAGS)
+@META_GIR@_LIBS = libmutter.la
+@META_GIR@_FILES =				\
+	$(libmutterinclude_base_headers)	\
+	$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
+@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
 
 endif
 
@@ -532,11 +498,10 @@ CLEANFILES =					\
 	$(gir_DATA)
 
 DISTCLEANFILES = 				\
-	$(libmutterinclude_built_headers)	\
-	$(pkgconfig_DATA)
+	$(libmutterinclude_built_headers)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libmutter-$(LIBMUTTER_API_VERSION).pc
+pkgconfig_DATA = libmutter.pc
 
 EXTRA_DIST +=					\
 	$(wayland_protocols)			\

src/backends/meta-backend-private.h

@@ -35,7 +35,6 @@
 #include "meta-cursor-renderer.h"
 #include "meta-monitor-manager-private.h"
 #include "meta-input-settings-private.h"
-#include "backends/meta-egl.h"
 #include "backends/meta-pointer-constraint.h"
 #include "backends/meta-renderer.h"
 #include "core/util-private.h"
@@ -43,8 +42,22 @@
 #define DEFAULT_XKB_RULES_FILE "evdev"
 #define DEFAULT_XKB_MODEL "pc105+inet"
 
-#define META_TYPE_BACKEND (meta_backend_get_type ())
-G_DECLARE_DERIVABLE_TYPE (MetaBackend, meta_backend, META, BACKEND, GObject)
+#define META_TYPE_BACKEND             (meta_backend_get_type ())
+#define META_BACKEND(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BACKEND, MetaBackend))
+#define META_BACKEND_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BACKEND, MetaBackendClass))
+#define META_IS_BACKEND(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BACKEND))
+#define META_IS_BACKEND_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BACKEND))
+#define META_BACKEND_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BACKEND, MetaBackendClass))
+
+struct _MetaBackend
+{
+  GObject parent;
+
+  GHashTable *device_monitors;
+  gint current_device_id;
+
+  MetaPointerConstraint *client_pointer_constraint;
+};
 
 struct _MetaBackendClass
 {
@@ -71,8 +84,6 @@ struct _MetaBackendClass
                          int          x,
                          int          y);
 
-  MetaLogicalMonitor * (* get_current_logical_monitor) (MetaBackend *backend);
-
   void (* set_keymap) (MetaBackend *backend,
                        const char  *layouts,
                        const char  *variants,
@@ -95,25 +106,17 @@ struct _MetaBackendClass
   void (* set_numlock) (MetaBackend *backend,
                         gboolean     numlock_state);
 
-  void (* track_position) (MetaBackend *backend,
-                           gboolean     enabled);
 };
 
-void meta_init_backend (GType backend_gtype);
+void meta_init_backend (MetaBackendType backend_type);
 
 ClutterBackend * meta_backend_get_clutter_backend (MetaBackend *backend);
 
 MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
                                                  int          device_id);
-void meta_backend_foreach_device_monitor (MetaBackend *backend,
-                                          GFunc        func,
-                                          gpointer     user_data);
-
 MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
-MetaCursorTracker * meta_backend_get_cursor_tracker (MetaBackend *backend);
 MetaCursorRenderer * meta_backend_get_cursor_renderer (MetaBackend *backend);
 MetaRenderer * meta_backend_get_renderer (MetaBackend *backend);
-MetaEgl * meta_backend_get_egl (MetaBackend *backend);
 
 gboolean meta_backend_grab_device (MetaBackend *backend,
                                    int          device_id,
@@ -126,8 +129,6 @@ void meta_backend_warp_pointer (MetaBackend *backend,
                                 int          x,
                                 int          y);
 
-MetaLogicalMonitor * meta_backend_get_current_logical_monitor (MetaBackend *backend);
-
 struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
 
 void meta_backend_update_last_device (MetaBackend *backend,
@@ -140,7 +141,6 @@ gboolean meta_backend_get_relative_motion_deltas (MetaBackend *backend,
                                                   double       *dx_unaccel,
                                                   double       *dy_unaccel);
 
-MetaPointerConstraint * meta_backend_get_client_pointer_constraint (MetaBackend *backend);
 void meta_backend_set_client_pointer_constraint (MetaBackend *backend,
                                                  MetaPointerConstraint *constraint);
 
@@ -152,10 +152,4 @@ gboolean meta_is_stage_views_enabled (void);
 
 MetaInputSettings *meta_backend_get_input_settings (MetaBackend *backend);
 
-void meta_backend_update_cursor_position (MetaBackend *backend, int x, int y);
-
-void meta_backend_cursor_position_changed (MetaBackend *backend);
-void meta_backend_track_position_ref (MetaBackend *backend);
-void meta_backend_track_position_unref (MetaBackend *backend);
-
 #endif /* META_BACKEND_PRIVATE_H */

src/backends/meta-backend.c

@@ -41,7 +41,7 @@
 #endif
 
 #include "backends/meta-idle-monitor-private.h"
-#include "backends/meta-logical-monitor.h"
+
 #include "backends/meta-monitor-manager-dummy.h"
 
 static MetaBackend *_backend;
@@ -62,24 +62,14 @@ meta_get_backend (void)
 struct _MetaBackendPrivate
 {
   MetaMonitorManager *monitor_manager;
-  MetaCursorTracker *cursor_tracker;
   MetaCursorRenderer *cursor_renderer;
   MetaInputSettings *input_settings;
   MetaRenderer *renderer;
-  MetaEgl *egl;
 
   ClutterBackend *clutter_backend;
   ClutterActor *stage;
 
   guint device_update_idle_id;
-
-  GHashTable *device_monitors;
-
-  int current_device_id;
-
-  MetaPointerConstraint *client_pointer_constraint;
-
-  uint32_t track_position_refcount;
 };
 typedef struct _MetaBackendPrivate MetaBackendPrivate;
 
@@ -103,7 +93,7 @@ meta_backend_finalize (GObject *object)
   if (priv->device_update_idle_id)
     g_source_remove (priv->device_update_idle_id);
 
-  g_hash_table_destroy (priv->device_monitors);
+  g_hash_table_destroy (backend->device_monitors);
 
   G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
 }
@@ -123,12 +113,11 @@ static void
 center_pointer (MetaBackend *backend)
 {
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  MetaMonitorManager *monitor_manager = priv->monitor_manager;
-  MetaLogicalMonitor *primary;
-
-  primary =
-    meta_monitor_manager_get_primary_logical_monitor (monitor_manager);
+  MetaMonitorInfo *monitors, *primary;
+  guint n_monitors;
 
+  monitors = meta_monitor_manager_get_monitor_infos (priv->monitor_manager, &n_monitors);
+  primary = &monitors[meta_monitor_manager_get_primary_index (priv->monitor_manager)];
   meta_backend_warp_pointer (backend,
                              primary->rect.x + primary->rect.width / 2,
                              primary->rect.y + primary->rect.height / 2);
@@ -148,31 +137,12 @@ meta_backend_monitors_changed (MetaBackend *backend)
   if (clutter_input_device_get_coords (device, NULL, &point))
     {
       /* If we're outside all monitors, warp the pointer back inside */
-      if (!meta_monitor_manager_get_logical_monitor_at (monitor_manager,
-                                                        point.x, point.y) &&
-          !meta_monitor_manager_is_headless (monitor_manager))
+      if (meta_monitor_manager_get_monitor_at_point (monitor_manager,
+                                                     point.x, point.y) < 0)
         center_pointer (backend);
     }
 }
 
-void
-meta_backend_foreach_device_monitor (MetaBackend *backend,
-                                     GFunc        func,
-                                     gpointer     user_data)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  GHashTableIter iter;
-  gpointer value;
-
-  g_hash_table_iter_init (&iter, priv->device_monitors);
-  while (g_hash_table_iter_next (&iter, NULL, &value))
-    {
-      MetaIdleMonitor *device_monitor = META_IDLE_MONITOR (value);
-
-      func (device_monitor, user_data);
-    }
-}
-
 static MetaIdleMonitor *
 meta_backend_create_idle_monitor (MetaBackend *backend,
                                   int          device_id)
@@ -184,22 +154,19 @@ static void
 create_device_monitor (MetaBackend *backend,
                        int          device_id)
 {
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
   MetaIdleMonitor *idle_monitor;
 
-  g_assert (g_hash_table_lookup (priv->device_monitors, &device_id) == NULL);
+  g_assert (g_hash_table_lookup (backend->device_monitors, &device_id) == NULL);
 
   idle_monitor = meta_backend_create_idle_monitor (backend, device_id);
-  g_hash_table_insert (priv->device_monitors, &idle_monitor->device_id, idle_monitor);
+  g_hash_table_insert (backend->device_monitors, &idle_monitor->device_id, idle_monitor);
 }
 
 static void
 destroy_device_monitor (MetaBackend *backend,
                         int          device_id)
 {
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  g_hash_table_remove (priv->device_monitors, &device_id);
+  g_hash_table_remove (backend->device_monitors, &device_id);
 }
 
 static void
@@ -268,7 +235,6 @@ on_device_removed (ClutterDeviceManager *device_manager,
                    gpointer              user_data)
 {
   MetaBackend *backend = META_BACKEND (user_data);
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
   int device_id = clutter_input_device_get_device_id (device);
 
   destroy_device_monitor (backend, device_id);
@@ -276,9 +242,9 @@ on_device_removed (ClutterDeviceManager *device_manager,
   /* If the device the user last interacted goes away, check again pointer
    * visibility.
    */
-  if (priv->current_device_id == device_id)
+  if (backend->current_device_id == device_id)
     {
-      MetaCursorTracker *cursor_tracker = priv->cursor_tracker;
+      MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
       gboolean has_touchscreen, has_pointing_device;
       ClutterInputDeviceType device_type;
 
@@ -324,9 +290,8 @@ meta_backend_real_post_init (MetaBackend *backend)
 
   priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
 
-  priv->device_monitors =
-    g_hash_table_new_full (g_int_hash, g_int_equal,
-                           NULL, (GDestroyNotify) g_object_unref);
+  backend->device_monitors = g_hash_table_new_full (g_int_hash, g_int_equal,
+                                                    NULL, (GDestroyNotify) g_object_unref);
 
   {
     MetaCursorTracker *cursor_tracker;
@@ -352,7 +317,7 @@ meta_backend_real_post_init (MetaBackend *backend)
         has_touchscreen |= device_is_slave_touchscreen (device);
       }
 
-    cursor_tracker = priv->cursor_tracker;
+    cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
     meta_cursor_tracker_set_pointer_visible (cursor_tracker, !has_touchscreen);
 
     g_slist_free (devices);
@@ -446,8 +411,6 @@ meta_backend_initable_init (GInitable     *initable,
   MetaBackend *backend = META_BACKEND (initable);
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
 
-  priv->egl = g_object_new (META_TYPE_EGL, NULL);
-
   priv->renderer = META_BACKEND_GET_CLASS (backend)->create_renderer (backend);
   if (!priv->renderer)
     {
@@ -457,8 +420,6 @@ meta_backend_initable_init (GInitable     *initable,
       return FALSE;
     }
 
-  priv->cursor_tracker = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
-
   return TRUE;
 }
 
@@ -487,9 +448,7 @@ MetaIdleMonitor *
 meta_backend_get_idle_monitor (MetaBackend *backend,
                                int          device_id)
 {
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return g_hash_table_lookup (priv->device_monitors, &device_id);
+  return g_hash_table_lookup (backend->device_monitors, &device_id);
 }
 
 /**
@@ -503,14 +462,6 @@ meta_backend_get_monitor_manager (MetaBackend *backend)
   return priv->monitor_manager;
 }
 
-MetaCursorTracker *
-meta_backend_get_cursor_tracker (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return priv->cursor_tracker;
-}
-
 /**
  * meta_backend_get_cursor_renderer: (skip)
  */
@@ -532,16 +483,6 @@ MetaRenderer * meta_backend_get_renderer (MetaBackend *backend)
   return priv->renderer;
 }
 
-/**
- * meta_backend_get_egl: (skip)
- */
-MetaEgl * meta_backend_get_egl (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return priv->egl;
-}
-
 /**
  * meta_backend_grab_device: (skip)
  */
@@ -575,12 +516,6 @@ meta_backend_warp_pointer (MetaBackend *backend,
   META_BACKEND_GET_CLASS (backend)->warp_pointer (backend, x, y);
 }
 
-MetaLogicalMonitor *
-meta_backend_get_current_logical_monitor (MetaBackend *backend)
-{
-  return META_BACKEND_GET_CLASS (backend)->get_current_logical_monitor (backend);
-}
-
 void
 meta_backend_set_keymap (MetaBackend *backend,
                          const char  *layouts,
@@ -633,8 +568,8 @@ meta_backend_get_stage (MetaBackend *backend)
 static gboolean
 update_last_device (MetaBackend *backend)
 {
+  MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  MetaCursorTracker *cursor_tracker = priv->cursor_tracker;
   ClutterInputDeviceType device_type;
   ClutterDeviceManager *manager;
   ClutterInputDevice *device;
@@ -642,11 +577,11 @@ update_last_device (MetaBackend *backend)
   priv->device_update_idle_id = 0;
   manager = clutter_device_manager_get_default ();
   device = clutter_device_manager_get_device (manager,
-                                              priv->current_device_id);
+                                              backend->current_device_id);
   device_type = clutter_input_device_get_device_type (device);
 
   g_signal_emit_by_name (backend, "last-device-changed",
-                         priv->current_device_id);
+                         backend->current_device_id);
 
   switch (device_type)
     {
@@ -671,7 +606,7 @@ meta_backend_update_last_device (MetaBackend *backend,
   ClutterDeviceManager *manager;
   ClutterInputDevice *device;
 
-  if (priv->current_device_id == device_id)
+  if (backend->current_device_id == device_id)
     return;
 
   manager = clutter_device_manager_get_default ();
@@ -681,7 +616,7 @@ meta_backend_update_last_device (MetaBackend *backend,
       clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
     return;
 
-  priv->current_device_id = device_id;
+  backend->current_device_id = device_id;
 
   if (priv->device_update_idle_id == 0)
     {
@@ -707,25 +642,15 @@ meta_backend_get_relative_motion_deltas (MetaBackend *backend,
                                             dx_unaccel, dy_unaccel);
 }
 
-MetaPointerConstraint *
-meta_backend_get_client_pointer_constraint (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return priv->client_pointer_constraint;
-}
-
 void
 meta_backend_set_client_pointer_constraint (MetaBackend           *backend,
                                             MetaPointerConstraint *constraint)
 {
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+  g_assert (!constraint || !backend->client_pointer_constraint);
 
-  g_assert (!constraint || !priv->client_pointer_constraint);
-
-  g_clear_object (&priv->client_pointer_constraint);
+  g_clear_object (&backend->client_pointer_constraint);
   if (constraint)
-    priv->client_pointer_constraint = g_object_ref (constraint);
+    backend->client_pointer_constraint = g_object_ref (constraint);
 }
 
 /* Mutter is responsible for pulling events off the X queue, so Clutter
@@ -799,14 +724,31 @@ meta_get_clutter_backend (void)
 }
 
 void
-meta_init_backend (GType backend_gtype)
+meta_init_backend (MetaBackendType backend_type)
 {
+  GType type;
   MetaBackend *backend;
   GError *error = NULL;
 
+  switch (backend_type)
+    {
+    case META_BACKEND_TYPE_X11:
+      type = META_TYPE_BACKEND_X11;
+      break;
+
+#ifdef HAVE_NATIVE_BACKEND
+    case META_BACKEND_TYPE_NATIVE:
+      type = META_TYPE_BACKEND_NATIVE;
+      break;
+#endif
+
+    default:
+      g_assert_not_reached ();
+    }
+
   /* meta_backend_init() above install the backend globally so
    * so meta_get_backend() works even during initialization. */
-  backend = g_object_new (backend_gtype, NULL);
+  backend = g_object_new (type, NULL);
   if (!g_initable_init (G_INITABLE (backend), NULL, &error))
     {
       g_warning ("Failed to create backend: %s", error->message);
@@ -868,42 +810,3 @@ meta_backend_get_input_settings (MetaBackend *backend)
 
   return priv->input_settings;
 }
-
-void
-meta_backend_update_cursor_position (MetaBackend *backend, int x, int y)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  meta_cursor_renderer_set_position (priv->cursor_renderer, x, y);
-
-  meta_backend_cursor_position_changed (backend);
-}
-
-void
-meta_backend_cursor_position_changed (MetaBackend *backend)
-{
-  meta_cursor_tracker_cursor_position_changed (backend->cursor_tracker);
-}
-
-static void
-meta_backend_track_position (MetaBackend *backend, gboolean enabled)
-{
-  if (META_BACKEND_GET_CLASS (backend)->track_position)
-    META_BACKEND_GET_CLASS (backend)->track_position (backend, enabled);
-}
-
-void
-meta_backend_track_position_ref (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  if (priv->track_position_refcount++ == 0)
-    meta_backend_track_position (backend, TRUE);
-}
-
-void
-meta_backend_track_position_unref (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  if (priv->track_position_refcount-- == 0)
-    meta_backend_track_position (backend, FALSE);
-}

src/backends/meta-cursor-tracker-private.h

@@ -30,6 +30,8 @@
 struct _MetaCursorTracker {
   GObject parent_instance;
 
+  MetaCursorRenderer *renderer;
+
   gboolean is_showing;
 
   MetaCursorSprite *displayed_cursor;
@@ -61,8 +63,10 @@ void     meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker);
 void     meta_cursor_tracker_set_root_cursor     (MetaCursorTracker *tracker,
                                                   MetaCursorSprite  *cursor_sprite);
 
+void     meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
+					      int                new_x,
+					      int                new_y);
+
 MetaCursorSprite * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
 
-void meta_backend_cursor_position_changed (MetaCursorTracker *tracker);
-
 #endif

src/backends/meta-cursor-tracker.c

@@ -47,7 +47,6 @@
 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);
 
 enum {
-  POSITION_CHANGED,
   CURSOR_CHANGED,
   LAST_SIGNAL
 };
@@ -74,11 +73,7 @@ get_displayed_cursor (MetaCursorTracker *tracker)
 static void
 update_displayed_cursor (MetaCursorTracker *tracker)
 {
-  MetaBackend *backend = meta_get_backend ();
-  MetaCursorRenderer *cursor_renderer =
-    meta_backend_get_cursor_renderer (backend);
-
-  meta_cursor_renderer_set_cursor (cursor_renderer, tracker->displayed_cursor);
+  meta_cursor_renderer_set_cursor (tracker->renderer, tracker->displayed_cursor);
 }
 
 static void
@@ -100,6 +95,9 @@ sync_cursor (MetaCursorTracker *tracker)
 static void
 meta_cursor_tracker_init (MetaCursorTracker *self)
 {
+  MetaBackend *backend = meta_get_backend ();
+
+  self->renderer = meta_backend_get_cursor_renderer (backend);
   self->is_showing = TRUE;
 }
 
@@ -129,15 +127,16 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
                                           0,
                                           NULL, NULL, NULL,
                                           G_TYPE_NONE, 0);
-
-  signals[POSITION_CHANGED] = g_signal_new ("position-changed",
-                                            G_TYPE_FROM_CLASS (klass),
-                                            G_SIGNAL_RUN_LAST,
-                                            0,
-                                            NULL, NULL, NULL,
-                                            G_TYPE_NONE, 0);
 }
 
+static MetaCursorTracker *
+meta_cursor_tracker_new (void)
+{
+  return g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
+}
+
+static MetaCursorTracker *_cursor_tracker;
+
 /**
  * meta_cursor_tracker_get_for_screen:
  * @screen: the #MetaScreen
@@ -149,12 +148,10 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
 MetaCursorTracker *
 meta_cursor_tracker_get_for_screen (MetaScreen *screen)
 {
-  MetaBackend *backend = meta_get_backend ();
-  MetaCursorTracker *tracker = meta_backend_get_cursor_tracker (backend);
+  if (!_cursor_tracker)
+    _cursor_tracker = meta_cursor_tracker_new ();
 
-  g_assert (tracker);
-
-  return tracker;
+  return _cursor_tracker;
 }
 
 static void
@@ -356,6 +353,16 @@ meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
   sync_cursor (tracker);
 }
 
+void
+meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
+                                     int                new_x,
+                                     int                new_y)
+{
+  g_assert (meta_is_wayland_compositor ());
+
+  meta_cursor_renderer_set_position (tracker->renderer, new_x, new_y);
+}
+
 static void
 get_pointer_position_gdk (int         *x,
                           int         *y,
@@ -429,21 +436,3 @@ meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker)
 {
   return tracker->displayed_cursor;
 }
-
-void
-meta_cursor_tracker_position_changed (MetaCursorTracker *tracker)
-{
-  g_signal_emit (tracker, signals[POSITION_CHANGED], 0);
-}
-
-void
-meta_cursor_tracker_enable_track_position (MetaCursorTracker *tracker)
-{
-  meta_backend_track_position_ref (meta_get_backend ());
-}
-
-void
-meta_cursor_tracker_disable_track_position (MetaCursorTracker *tracker)
-{
-  meta_backend_track_position_unref (meta_get_backend ());
-}

src/backends/meta-egl-ext.h

@@ -1,101 +0,0 @@
-/*
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef META_EGL_EXT_H
-#define META_EGL_EXT_H
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-/*
- * This is a little different to the tests shipped with EGL implementations,
- * which wrap the entire thing in #ifndef EGL_WL_bind_wayland_display, then go
- * on to define both BindWaylandDisplay and QueryWaylandBuffer.
- *
- * Unfortunately, some implementations (particularly the version of Mesa shipped
- * in Ubuntu 12.04) define EGL_WL_bind_wayland_display, but then only provide
- * prototypes for (Un)BindWaylandDisplay, completely omitting
- * QueryWaylandBuffer.
- *
- * Detect this, and provide our own definitions if necessary.
- */
-#ifndef EGL_WAYLAND_BUFFER_WL
-#define EGL_WAYLAND_BUFFER_WL		0x31D5 /* eglCreateImageKHR target */
-#define EGL_WAYLAND_PLANE_WL		0x31D6 /* eglCreateImageKHR target */
-
-#define EGL_TEXTURE_Y_U_V_WL            0x31D7
-#define EGL_TEXTURE_Y_UV_WL             0x31D8
-#define EGL_TEXTURE_Y_XUXV_WL           0x31D9
-#define EGL_TEXTURE_EXTERNAL_WL         0x31DA
-
-struct wl_resource;
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglQueryWaylandBufferWL(EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
-#endif
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWL) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
-#endif
-
-/*
- * FIXME: Remove both EGL_EXT_stream_acquire_mode and
- *        EGL_NV_output_drm_flip_event definitions below once both extensions
- *        get published by Khronos and incorportated into Khronos' header files
- */
-#ifndef EGL_EXT_stream_acquire_mode
-#define EGL_EXT_stream_acquire_mode 1
-#define EGL_CONSUMER_AUTO_ACQUIRE_EXT         0x332B
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERACQUIREATTRIBEXTPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireAttribEXT (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
-#endif
-#endif /* EGL_EXT_stream_acquire_mode */
-
-#ifndef EGL_NV_output_drm_flip_event
-#define EGL_NV_output_drm_flip_event 1
-#define EGL_DRM_FLIP_EVENT_DATA_NV            0x333E
-#endif /* EGL_NV_output_drm_flip_event */
-
-#ifndef EGL_NV_stream_attrib
-#define EGL_NV_stream_attrib 1
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamAttribNV(EGLDisplay dpy, const EGLAttrib *attrib_list);
-EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamAttribNV(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value);
-EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamAttribNV(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value);
-EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireAttribNV(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
-EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseAttribNV(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
-#endif
-typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMATTRIBNVPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMATTRIBNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMATTRIBNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERRELEASEATTRIBNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
-#endif /* EGL_NV_stream_attrib */
-
-#ifndef EGL_WL_wayland_eglstream
-#define EGL_WL_wayland_eglstream 1
-#define EGL_WAYLAND_EGLSTREAM_WL              0x334B
-#endif /* EGL_WL_wayland_eglstream */
-
-#endif /* META_EGL_EXT_H */

src/backends/meta-egl.c

@@ -1,757 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2016 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#include "config.h"
-
-#include "backends/meta-backend-private.h"
-#include "backends/meta-egl.h"
-#include "backends/meta-egl-ext.h"
-#include "meta/util.h"
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <gio/gio.h>
-#include <glib.h>
-#include <glib-object.h>
-
-struct _MetaEgl
-{
-  GObject parent;
-
-  PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT;
-
-  PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
-  PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
-
-  PFNEGLQUERYWAYLANDBUFFERWL eglQueryWaylandBufferWL;
-
-  PFNEGLQUERYDEVICESEXTPROC eglQueryDevicesEXT;
-  PFNEGLQUERYDEVICESTRINGEXTPROC eglQueryDeviceStringEXT;
-
-  PFNEGLGETOUTPUTLAYERSEXTPROC eglGetOutputLayersEXT;
-  PFNEGLQUERYOUTPUTLAYERATTRIBEXTPROC eglQueryOutputLayerAttribEXT;
-
-  PFNEGLCREATESTREAMKHRPROC eglCreateStreamKHR;
-  PFNEGLDESTROYSTREAMKHRPROC eglDestroyStreamKHR;
-  PFNEGLQUERYSTREAMKHRPROC eglQueryStreamKHR;
-
-  PFNEGLCREATESTREAMATTRIBNVPROC eglCreateStreamAttribNV;
-
-  PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC eglCreateStreamProducerSurfaceKHR;
-
-  PFNEGLSTREAMCONSUMEROUTPUTEXTPROC eglStreamConsumerOutputEXT;
-
-  PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC eglStreamConsumerGLTextureExternalKHR;
-
-  PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
-  PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC eglStreamConsumerAcquireAttribNV;
-};
-
-G_DEFINE_TYPE (MetaEgl, meta_egl, G_TYPE_OBJECT)
-
-static const char *
-get_egl_error_str (void)
-{
-  EGLint error_number;
-
-  error_number = eglGetError ();
-
-  switch (error_number)
-    {
-    case EGL_SUCCESS:
-      return "The last function succeeded without error.";
-      break;
-    case EGL_NOT_INITIALIZED:
-      return "EGL is not initialized, or could not be initialized, for the specified EGL display connection.";
-      break;
-    case EGL_BAD_ACCESS:
-      return "EGL cannot access a requested resource (for example a context is bound in another thread).";
-      break;
-    case EGL_BAD_ALLOC:
-      return "EGL failed to allocate resources for the requested operation.";
-      break;
-    case EGL_BAD_ATTRIBUTE:
-      return "An unrecognized attribute or attribute value was passed in the attribute list.";
-      break;
-    case EGL_BAD_CONTEXT:
-      return "An EGLContext argument does not name a valid EGL rendering context.";
-      break;
-    case EGL_BAD_CONFIG:
-      return "An EGLConfig argument does not name a valid EGL frame buffer configuration.";
-      break;
-    case EGL_BAD_CURRENT_SURFACE:
-      return "The current surface of the calling thread is a window, pixel buffer or pixmap that is no longer valid.";
-      break;
-    case EGL_BAD_DISPLAY:
-      return "An EGLDisplay argument does not name a valid EGL display connection.";
-      break;
-    case EGL_BAD_SURFACE:
-      return "An EGLSurface argument does not name a valid surface (window, pixel buffer or pixmap) configured for GL rendering.";
-      break;
-    case EGL_BAD_MATCH:
-      return "Arguments are inconsistent (for example, a valid context requires buffers not supplied by a valid surface).";
-      break;
-    case EGL_BAD_PARAMETER:
-      return "One or more argument values are invalid.";
-      break;
-    case EGL_BAD_NATIVE_PIXMAP:
-      return "A NativePixmapType argument does not refer to a valid native pixmap.";
-      break;
-    case EGL_BAD_NATIVE_WINDOW:
-      return "A NativeWindowType argument does not refer to a valid native window.";
-      break;
-    case EGL_CONTEXT_LOST:
-      return "A power management event has occurred. The application must destroy all contexts and reinitialise OpenGL ES state and objects to continue rendering. ";
-      break;
-    default:
-      return "Unknown error";
-      break;
-    }
-}
-
-static void
-set_egl_error (GError **error)
-{
-  const char *error_str;
-
-  if (!error)
-    return;
-
-  error_str = get_egl_error_str ();
-  g_set_error_literal (error, G_IO_ERROR,
-                       G_IO_ERROR_FAILED,
-                       error_str);
-}
-
-static gboolean
-extensions_string_has_extensions_valist (const char *extensions_str,
-                                         char     ***missing_extensions,
-                                         char       *first_extension,
-                                         va_list     var_args)
-{
-  char **extensions;
-  char *extension;
-  size_t num_missing_extensions = 0;
-
-  if (missing_extensions)
-    *missing_extensions = NULL;
-
-  extensions = g_strsplit (extensions_str, " ", -1);
-
-  extension = first_extension;
-  while (extension)
-    {
-      if (!g_strv_contains ((const char * const *) extensions, extension))
-        {
-          num_missing_extensions++;
-          if (missing_extensions)
-            {
-              *missing_extensions = g_realloc_n (*missing_extensions,
-                                                 num_missing_extensions + 1,
-                                                 sizeof (const char *));
-              (*missing_extensions)[num_missing_extensions - 1] = extension;
-              (*missing_extensions)[num_missing_extensions] = NULL;
-            }
-          else
-            {
-              break;
-            }
-        }
-      extension = va_arg (var_args, char *);
-    }
-
-  g_strfreev (extensions);
-
-  return num_missing_extensions == 0;
-}
-
-gboolean
-meta_egl_has_extensions (MetaEgl   *egl,
-                         EGLDisplay display,
-                         char    ***missing_extensions,
-                         char      *first_extension,
-                         ...)
-{
-  va_list var_args;
-  const char *extensions_str;
-  gboolean has_extensions;
-
-  extensions_str = (const char *) eglQueryString (display, EGL_EXTENSIONS);
-  if (!extensions_str)
-    {
-      g_warning ("Failed to query string: %s", get_egl_error_str ());
-      return FALSE;
-    }
-
-  va_start (var_args, first_extension);
-  has_extensions = extensions_string_has_extensions_valist (extensions_str,
-                                                            missing_extensions,
-                                                            first_extension,
-                                                            var_args);
-  va_end (var_args);
-
-  return has_extensions;
-}
-
-gboolean
-meta_egl_initialize (MetaEgl   *egl,
-                     EGLDisplay display,
-                     GError   **error)
-{
-  if (!eglInitialize (display, NULL, NULL))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_choose_config (MetaEgl      *egl,
-                        EGLDisplay    display,
-                        const EGLint *attrib_list,
-                        EGLConfig    *chosen_config,
-                        GError      **error)
-{
-  EGLint num_configs;
-  EGLConfig *configs;
-  EGLint num_matches;
-
-  if (!eglGetConfigs (display, NULL, 0, &num_configs))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  if (num_configs < 1)
-    {
-      g_set_error (error, G_IO_ERROR,
-                   G_IO_ERROR_FAILED,
-                   "No EGL configurations available");
-      return FALSE;
-    }
-
-  configs = g_new0 (EGLConfig, num_configs);
-
-  if (!eglChooseConfig (display, attrib_list, configs, num_configs, &num_matches))
-    {
-      g_free (configs);
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  /*
-   * We don't have any preference specified yet, so lets choose the first one.
-   */
-  *chosen_config = configs[0];
-
-  g_free (configs);
-
-  return TRUE;
-}
-
-EGLSurface
-meta_egl_create_pbuffer_surface (MetaEgl      *egl,
-                                 EGLDisplay    display,
-                                 EGLConfig     config,
-                                 const EGLint *attrib_list,
-                                 GError      **error)
-{
-  EGLSurface surface;
-
-  surface = eglCreatePbufferSurface (display, config, attrib_list);
-  if (surface == EGL_NO_SURFACE)
-    {
-      set_egl_error (error);
-      return EGL_NO_SURFACE;
-    }
-
-  return surface;
-}
-
-static gboolean
-is_egl_proc_valid_real (void       *proc,
-                        const char *proc_name,
-                        GError    **error)
-{
-  if (!proc)
-    {
-      g_set_error (error, G_IO_ERROR,
-                   G_IO_ERROR_FAILED,
-                   "EGL proc '%s' not resolved",
-                   proc_name);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-#define is_egl_proc_valid(proc, error) \
-  is_egl_proc_valid_real (proc, #proc, error)
-
-EGLDisplay
-meta_egl_get_platform_display (MetaEgl      *egl,
-                               EGLenum       platform,
-                               void         *native_display,
-                               const EGLint *attrib_list,
-                               GError      **error)
-{
-  EGLDisplay display;
-
-  if (!is_egl_proc_valid (egl->eglGetPlatformDisplayEXT, error))
-    return EGL_NO_DISPLAY;
-
-  display = egl->eglGetPlatformDisplayEXT (platform,
-                                           native_display,
-                                           attrib_list);
-  if (display == EGL_NO_DISPLAY)
-    {
-      set_egl_error (error);
-      return EGL_NO_DISPLAY;
-    }
-
-  return display;
-}
-
-EGLImageKHR
-meta_egl_create_image (MetaEgl        *egl,
-                       EGLDisplay      display,
-                       EGLContext      context,
-                       EGLenum         target,
-                       EGLClientBuffer buffer,
-                       const EGLint   *attrib_list,
-                       GError        **error)
-{
-  EGLImageKHR image;
-
-  if (!is_egl_proc_valid (egl->eglCreateImageKHR, error))
-    return EGL_NO_IMAGE_KHR;
-
-  image = egl->eglCreateImageKHR (display, context,
-                                  target, buffer, attrib_list);
-  if (image == EGL_NO_IMAGE_KHR)
-    {
-      set_egl_error (error);
-      return EGL_NO_IMAGE_KHR;
-    }
-
-  return image;
-}
-
-gboolean
-meta_egl_destroy_image (MetaEgl    *egl,
-                        EGLDisplay  display,
-                        EGLImageKHR image,
-                        GError    **error)
-{
-  if (!is_egl_proc_valid (egl->eglDestroyImageKHR, error))
-    return FALSE;
-
-  if (!egl->eglDestroyImageKHR (display, image))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_query_wayland_buffer (MetaEgl            *egl,
-                               EGLDisplay          display,
-                               struct wl_resource *buffer,
-                               EGLint              attribute,
-                               EGLint             *value,
-                               GError            **error)
-{
-  if (!is_egl_proc_valid (egl->eglQueryWaylandBufferWL, error))
-   return FALSE;
-
-  if (!egl->eglQueryWaylandBufferWL (display, buffer, attribute, value))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_query_devices (MetaEgl      *egl,
-                        EGLint        max_devices,
-                        EGLDeviceEXT *devices,
-                        EGLint       *num_devices,
-                        GError      **error)
-{
-  if (!is_egl_proc_valid (egl->eglQueryDevicesEXT, error))
-    return FALSE;
-
-  if (!egl->eglQueryDevicesEXT (max_devices,
-                                devices,
-                                num_devices))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-const char *
-meta_egl_query_device_string (MetaEgl     *egl,
-                              EGLDeviceEXT device,
-                              EGLint       name,
-                              GError     **error)
-{
-  const char *device_string;
-
-  if (!is_egl_proc_valid (egl->eglQueryDeviceStringEXT, error))
-    return NULL;
-
-  device_string = egl->eglQueryDeviceStringEXT (device, name);
-  if (!device_string)
-    {
-      set_egl_error (error);
-      return NULL;
-    }
-
-  return device_string;
-}
-
-gboolean
-meta_egl_egl_device_has_extensions (MetaEgl     *egl,
-                                    EGLDeviceEXT device,
-                                    char      ***missing_extensions,
-                                    char        *first_extension,
-                                    ...)
-{
-  va_list var_args;
-  const char *extensions_str;
-  gboolean has_extensions;
-  GError *error = NULL;
-
-  extensions_str = meta_egl_query_device_string (egl, device, EGL_EXTENSIONS,
-                                                 &error);
-  if (!extensions_str)
-    {
-      g_warning ("Failed to query device string: %s", error->message);
-      g_error_free (error);
-      return FALSE;
-    }
-
-  va_start (var_args, first_extension);
-  has_extensions = extensions_string_has_extensions_valist (extensions_str,
-                                                            missing_extensions,
-                                                            first_extension,
-                                                            var_args);
-  va_end (var_args);
-
-  return has_extensions;
-}
-
-gboolean
-meta_egl_get_output_layers (MetaEgl           *egl,
-                            EGLDisplay         display,
-                            const EGLAttrib   *attrib_list,
-                            EGLOutputLayerEXT *layers,
-                            EGLint             max_layers,
-                            EGLint            *num_layers,
-                            GError           **error)
-{
-  if (!is_egl_proc_valid (egl->eglGetOutputLayersEXT, error))
-    return FALSE;
-
-  if (!egl->eglGetOutputLayersEXT (display,
-                                   attrib_list,
-                                   layers,
-                                   max_layers,
-                                   num_layers))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_query_output_layer_attrib (MetaEgl          *egl,
-                                    EGLDisplay        display,
-                                    EGLOutputLayerEXT layer,
-                                    EGLint            attribute,
-                                    EGLAttrib        *value,
-                                    GError          **error)
-{
-  if (!is_egl_proc_valid (egl->eglQueryOutputLayerAttribEXT, error))
-    return FALSE;
-
-  if (!egl->eglQueryOutputLayerAttribEXT (display, layer,
-                                          attribute, value))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-EGLStreamKHR
-meta_egl_create_stream (MetaEgl      *egl,
-                        EGLDisplay    display,
-                        const EGLint *attrib_list,
-                        GError      **error)
-{
-  EGLStreamKHR stream;
-
-  if (!is_egl_proc_valid (egl->eglCreateStreamKHR, error))
-    return EGL_NO_STREAM_KHR;
-
-  stream = egl->eglCreateStreamKHR (display, attrib_list);
-  if (stream == EGL_NO_STREAM_KHR)
-    {
-      set_egl_error (error);
-      return EGL_NO_STREAM_KHR;
-    }
-
-  return stream;
-}
-
-gboolean
-meta_egl_destroy_stream (MetaEgl     *egl,
-                         EGLDisplay   display,
-                         EGLStreamKHR stream,
-                         GError     **error)
-{
-  if (!is_egl_proc_valid (egl->eglDestroyStreamKHR, error))
-    return FALSE;
-
-  if (!egl->eglDestroyStreamKHR (display, stream))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_query_stream (MetaEgl     *egl,
-                       EGLDisplay   display,
-                       EGLStreamKHR stream,
-                       EGLenum      attribute,
-                       EGLint      *value,
-                       GError     **error)
-{
-  if (!is_egl_proc_valid (egl->eglQueryStreamKHR, error))
-    return FALSE;
-
-  if (!egl->eglQueryStreamKHR (display, stream, attribute, value))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-EGLStreamKHR
-meta_egl_create_stream_attrib (MetaEgl         *egl,
-                               EGLDisplay       display,
-                               const EGLAttrib *attrib_list,
-                               GError         **error)
-{
-  EGLStreamKHR stream;
-
-  if (!is_egl_proc_valid (egl->eglCreateStreamAttribNV, error))
-    return FALSE;
-
-  stream = egl->eglCreateStreamAttribNV (display, attrib_list);
-  if (stream == EGL_NO_STREAM_KHR)
-    {
-      set_egl_error (error);
-      return EGL_NO_STREAM_KHR;
-    }
-
-  return stream;
-}
-
-EGLSurface
-meta_egl_create_stream_producer_surface (MetaEgl     *egl,
-                                         EGLDisplay   display,
-                                         EGLConfig    config,
-                                         EGLStreamKHR stream,
-                                         const EGLint *attrib_list,
-                                         GError      **error)
-{
-  EGLSurface surface;
-
-  if (!is_egl_proc_valid (egl->eglCreateStreamProducerSurfaceKHR, error))
-    return EGL_NO_SURFACE;
-
-  surface = egl->eglCreateStreamProducerSurfaceKHR (display,
-                                                    config,
-                                                    stream,
-                                                    attrib_list);
-  if (surface == EGL_NO_SURFACE)
-    {
-      set_egl_error (error);
-      return EGL_NO_SURFACE;
-    }
-
-  return surface;
-}
-
-gboolean
-meta_egl_stream_consumer_output (MetaEgl          *egl,
-                                 EGLDisplay        display,
-                                 EGLStreamKHR      stream,
-                                 EGLOutputLayerEXT layer,
-                                 GError          **error)
-{
-  if (!is_egl_proc_valid (egl->eglStreamConsumerOutputEXT, error))
-    return FALSE;
-
-  if (!egl->eglStreamConsumerOutputEXT (display, stream, layer))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_stream_consumer_acquire_attrib (MetaEgl     *egl,
-                                         EGLDisplay   display,
-                                         EGLStreamKHR stream,
-                                         EGLAttrib   *attrib_list,
-                                         GError     **error)
-{
-  if (!is_egl_proc_valid (egl->eglStreamConsumerAcquireAttribNV, error))
-    return FALSE;
-
-  if (!egl->eglStreamConsumerAcquireAttribNV (display, stream, attrib_list))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_stream_consumer_gl_texture_external (MetaEgl     *egl,
-                                              EGLDisplay   display,
-                                              EGLStreamKHR stream,
-                                              GError     **error)
-{
-  if (!is_egl_proc_valid (egl->eglStreamConsumerGLTextureExternalKHR, error))
-    return FALSE;
-
-  if (!egl->eglStreamConsumerGLTextureExternalKHR (display, stream))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_egl_stream_consumer_acquire (MetaEgl     *egl,
-                                  EGLDisplay   display,
-                                  EGLStreamKHR stream,
-                                  GError     **error)
-{
-  if (!is_egl_proc_valid (egl->eglStreamConsumerAcquireKHR, error))
-    return FALSE;
-
-  if (!egl->eglStreamConsumerAcquireKHR (display, stream))
-    {
-      set_egl_error (error);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-#define GET_EGL_PROC_ADDR(proc) \
-  egl->proc = (void *) eglGetProcAddress (#proc);
-
-#define GET_EGL_PROC_ADDR_REQUIRED(proc) \
-  GET_EGL_PROC_ADDR(proc) \
-  if (!egl->proc) \
-    { \
-      meta_fatal ("Failed to get proc address for '%s'\n", #proc); \
-    }
-
-static void
-meta_egl_constructed (GObject *object)
-{
-  MetaEgl *egl = META_EGL (object);
-
-  GET_EGL_PROC_ADDR_REQUIRED (eglGetPlatformDisplayEXT);
-
-  GET_EGL_PROC_ADDR (eglCreateImageKHR);
-  GET_EGL_PROC_ADDR (eglDestroyImageKHR);
-
-  GET_EGL_PROC_ADDR (eglQueryWaylandBufferWL);
-
-  GET_EGL_PROC_ADDR (eglQueryDevicesEXT);
-  GET_EGL_PROC_ADDR (eglQueryDeviceStringEXT);
-
-  GET_EGL_PROC_ADDR (eglGetOutputLayersEXT);
-  GET_EGL_PROC_ADDR (eglQueryOutputLayerAttribEXT);
-
-  GET_EGL_PROC_ADDR (eglCreateStreamKHR);
-  GET_EGL_PROC_ADDR (eglDestroyStreamKHR);
-  GET_EGL_PROC_ADDR (eglQueryStreamKHR);
-
-  GET_EGL_PROC_ADDR (eglCreateStreamAttribNV);
-
-  GET_EGL_PROC_ADDR (eglCreateStreamProducerSurfaceKHR);
-
-  GET_EGL_PROC_ADDR (eglStreamConsumerOutputEXT);
-
-  GET_EGL_PROC_ADDR (eglStreamConsumerGLTextureExternalKHR);
-
-  GET_EGL_PROC_ADDR (eglStreamConsumerAcquireKHR);
-  GET_EGL_PROC_ADDR (eglStreamConsumerAcquireAttribNV);
-}
-
-#undef GET_EGL_PROC_ADDR
-
-static void
-meta_egl_init (MetaEgl *egl)
-{
-}
-
-static void
-meta_egl_class_init (MetaEglClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->constructed = meta_egl_constructed;
-}

src/backends/meta-egl.h

@@ -1,166 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2016 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef META_EGL_H
-#define META_EGL_H
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <glib-object.h>
-
-#define META_TYPE_EGL (meta_egl_get_type ())
-G_DECLARE_FINAL_TYPE (MetaEgl, meta_egl, META, EGL, GObject)
-
-gboolean meta_egl_has_extensions (MetaEgl   *egl,
-                                  EGLDisplay display,
-                                  char    ***missing_extensions,
-                                  char      *first_extension,
-                                  ...);
-
-gboolean meta_egl_initialize (MetaEgl   *egl,
-                              EGLDisplay display,
-                              GError   **error);
-
-gboolean meta_egl_choose_config (MetaEgl      *egl,
-                                 EGLDisplay    display,
-                                 const EGLint *attrib_list,
-                                 EGLConfig    *chosen_config,
-                                 GError      **error);
-
-EGLImageKHR meta_egl_create_image (MetaEgl        *egl,
-                                   EGLDisplay      display,
-                                   EGLContext      context,
-                                   EGLenum         target,
-                                   EGLClientBuffer buffer,
-                                   const EGLint   *attrib_list,
-                                   GError        **error);
-
-gboolean meta_egl_destroy_image (MetaEgl    *egl,
-                                 EGLDisplay  display,
-                                 EGLImageKHR image,
-                                 GError    **error);
-
-EGLSurface meta_egl_create_pbuffer_surface (MetaEgl      *egl,
-                                            EGLDisplay    display,
-                                            EGLConfig     config,
-                                            const EGLint *attrib_list,
-                                            GError      **error);
-
-EGLDisplay meta_egl_get_platform_display (MetaEgl      *egl,
-                                          EGLenum       platform,
-                                          void         *native_display,
-                                          const EGLint *attrib_list,
-                                          GError      **error);
-
-gboolean meta_egl_query_wayland_buffer (MetaEgl            *egl,
-                                        EGLDisplay          display,
-                                        struct wl_resource *buffer,
-                                        EGLint              attribute,
-                                        EGLint             *value,
-                                        GError            **error);
-
-gboolean meta_egl_query_devices (MetaEgl      *egl,
-                                 EGLint        max_devices,
-                                 EGLDeviceEXT *devices,
-                                 EGLint       *num_devices,
-                                 GError      **error);
-
-const char * meta_egl_query_device_string (MetaEgl     *egl,
-                                           EGLDeviceEXT device,
-                                           EGLint       name,
-                                           GError     **error);
-
-gboolean meta_egl_egl_device_has_extensions (MetaEgl      *egl,
-                                             EGLDeviceEXT device,
-                                             char      ***missing_extensions,
-                                             char        *first_extension,
-                                             ...);
-
-gboolean meta_egl_get_output_layers (MetaEgl           *egl,
-                                     EGLDisplay         display,
-                                     const EGLAttrib   *attrib_list,
-                                     EGLOutputLayerEXT *layers,
-                                     EGLint             max_layers,
-                                     EGLint            *num_layers,
-                                     GError           **error);
-
-gboolean meta_egl_query_output_layer_attrib (MetaEgl          *egl,
-                                             EGLDisplay        display,
-                                             EGLOutputLayerEXT layer,
-                                             EGLint            attribute,
-                                             EGLAttrib        *value,
-                                             GError          **error);
-
-EGLStreamKHR meta_egl_create_stream (MetaEgl      *egl,
-                                     EGLDisplay    display,
-                                     const EGLint *attrib_list,
-                                     GError      **error);
-
-gboolean meta_egl_destroy_stream (MetaEgl     *egl,
-                                  EGLDisplay   display,
-                                  EGLStreamKHR stream,
-                                  GError      **error);
-
-gboolean meta_egl_query_stream (MetaEgl     *egl,
-                                EGLDisplay   display,
-                                EGLStreamKHR stream,
-                                EGLenum      attribute,
-                                EGLint      *value,
-                                GError     **error);
-
-EGLStreamKHR meta_egl_create_stream_attrib (MetaEgl         *egl,
-                                            EGLDisplay       display,
-                                            const EGLAttrib *attrib_list,
-                                            GError         **error);
-
-EGLSurface meta_egl_create_stream_producer_surface (MetaEgl     *egl,
-                                                    EGLDisplay   display,
-                                                    EGLConfig    config,
-                                                    EGLStreamKHR stream,
-                                                    const EGLint *attrib_list,
-                                                    GError      **error);
-
-gboolean meta_egl_stream_consumer_output (MetaEgl          *egl,
-                                          EGLDisplay        display,
-                                          EGLStreamKHR      stream,
-                                          EGLOutputLayerEXT layer,
-                                          GError          **error);
-
-gboolean meta_egl_stream_consumer_acquire_attrib (MetaEgl     *egl,
-                                                  EGLDisplay   display,
-                                                  EGLStreamKHR stream,
-                                                  EGLAttrib   *attrib_list,
-                                                  GError     **error);
-
-gboolean meta_egl_stream_consumer_acquire (MetaEgl     *egl,
-                                           EGLDisplay   display,
-                                           EGLStreamKHR stream,
-                                           GError     **error);
-
-gboolean meta_egl_stream_consumer_gl_texture_external (MetaEgl     *egl,
-                                                       EGLDisplay   display,
-                                                       EGLStreamKHR stream,
-                                                       GError     **error);
-
-#endif /* META_EGL_H */

src/backends/meta-input-settings-private.h

@@ -108,16 +108,6 @@ struct _MetaInputSettingsClass
                                         ClutterInputDevice         *device,
                                         GDesktopPointerAccelProfile profile);
 
-  void (* set_stylus_pressure) (MetaInputSettings            *settings,
-                                ClutterInputDevice           *device,
-                                ClutterInputDeviceTool       *tool,
-                                const gint32                  curve[4]);
-  void (* set_stylus_button_map) (MetaInputSettings          *settings,
-                                  ClutterInputDevice         *device,
-                                  ClutterInputDeviceTool     *tool,
-                                  GDesktopStylusButtonAction  primary,
-                                  GDesktopStylusButtonAction  secondary);
-
   gboolean (* has_two_finger_scroll) (MetaInputSettings  *settings,
                                       ClutterInputDevice *device);
 };
@@ -128,18 +118,29 @@ MetaInputSettings * meta_input_settings_create (void);
 
 GSettings *           meta_input_settings_get_tablet_settings (MetaInputSettings  *settings,
                                                                ClutterInputDevice *device);
-MetaLogicalMonitor *  meta_input_settings_get_tablet_logical_monitor (MetaInputSettings  *settings,
-                                                                      ClutterInputDevice *device);
+MetaMonitorInfo *     meta_input_settings_get_tablet_monitor_info (MetaInputSettings  *settings,
+                                                                   ClutterInputDevice *device);
 
 GDesktopTabletMapping meta_input_settings_get_tablet_mapping (MetaInputSettings  *settings,
                                                               ClutterInputDevice *device);
 
+GDesktopStylusButtonAction meta_input_settings_get_stylus_button_action (MetaInputSettings      *settings,
+                                                                         ClutterInputDeviceTool *tool,
+                                                                         ClutterInputDevice     *current_device,
+                                                                         guint                   button);
+gdouble                    meta_input_settings_translate_tablet_tool_pressure (MetaInputSettings      *input_settings,
+                                                                               ClutterInputDeviceTool *tool,
+                                                                               ClutterInputDevice     *current_tablet,
+                                                                               gdouble                 pressure);
+
 gboolean                   meta_input_settings_is_pad_button_grabbed     (MetaInputSettings  *input_settings,
                                                                           ClutterInputDevice *pad,
                                                                           guint               button);
 
-gboolean                   meta_input_settings_handle_pad_button         (MetaInputSettings           *input_settings,
-                                                                          const ClutterPadButtonEvent *event);
+gboolean                   meta_input_settings_handle_pad_button         (MetaInputSettings  *input_settings,
+                                                                          ClutterInputDevice *pad,
+                                                                          gboolean            is_press,
+                                                                          guint               button);
 gchar *                    meta_input_settings_get_pad_button_action_label (MetaInputSettings  *input_settings,
                                                                             ClutterInputDevice *pad,
                                                                             guint               button);

src/backends/meta-input-settings.c

@@ -45,17 +45,28 @@ static GQuark quark_tool_settings = 0;
 
 typedef struct _MetaInputSettingsPrivate MetaInputSettingsPrivate;
 typedef struct _DeviceMappingInfo DeviceMappingInfo;
+typedef struct _ToolSettings ToolSettings;
 
 struct _DeviceMappingInfo
 {
   MetaInputSettings *input_settings;
   ClutterInputDevice *device;
   GSettings *settings;
+  GSettings *gsd_settings;
 #ifdef HAVE_LIBWACOM
   WacomDevice *wacom_device;
 #endif
 };
 
+struct _ToolSettings
+{
+  GSettings *settings;
+  ClutterInputDeviceTool *tool;
+  GDesktopStylusButtonAction button_action;
+  GDesktopStylusButtonAction secondary_button_action;
+  gdouble curve[4];
+};
+
 struct _MetaInputSettingsPrivate
 {
   ClutterDeviceManager *device_manager;
@@ -69,8 +80,6 @@ struct _MetaInputSettingsPrivate
 
   GHashTable *mappable_devices;
 
-  ClutterVirtualInputDevice *virtual_pad_keyboard;
-
 #ifdef HAVE_LIBWACOM
   WacomDeviceDatabase *wacom_db;
 #endif
@@ -121,8 +130,6 @@ meta_input_settings_dispose (GObject *object)
   MetaInputSettings *settings = META_INPUT_SETTINGS (object);
   MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (settings);
 
-  g_clear_object (&priv->virtual_pad_keyboard);
-
   g_clear_object (&priv->mouse_settings);
   g_clear_object (&priv->touchpad_settings);
   g_clear_object (&priv->trackball_settings);
@@ -724,6 +731,19 @@ meta_input_settings_find_output (MetaInputSettings  *input_settings,
   return NULL;
 }
 
+static DeviceMappingInfo *
+lookup_mapping_info (ClutterInputDevice *device)
+{
+  MetaInputSettings *settings;
+  MetaInputSettingsPrivate *priv;
+
+  settings = meta_backend_get_input_settings (meta_get_backend ());
+  if (!settings)
+    return NULL;
+  priv = meta_input_settings_get_instance_private (settings);
+  return g_hash_table_lookup (priv->mappable_devices, device);
+}
+
 static void
 update_tablet_keep_aspect (MetaInputSettings  *input_settings,
                            GSettings          *settings,
@@ -756,8 +776,12 @@ update_tablet_keep_aspect (MetaInputSettings  *input_settings,
   if (clutter_input_device_get_mapping_mode (device) ==
       CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE)
     {
+      DeviceMappingInfo *info = NULL;
+
       keep_aspect = g_settings_get_boolean (settings, "keep-aspect");
-      output = meta_input_settings_find_output (input_settings, settings, device);
+      info = lookup_mapping_info (device);
+      if (info)
+        output = meta_input_settings_find_output (input_settings, info->settings, device);
     }
   else
     {
@@ -812,6 +836,7 @@ update_tablet_mapping (MetaInputSettings  *input_settings,
 {
   MetaInputSettingsClass *input_settings_class;
   GDesktopTabletMapping mapping;
+  DeviceMappingInfo *info;
 
   if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
       clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
@@ -832,7 +857,8 @@ update_tablet_mapping (MetaInputSettings  *input_settings,
 #endif
 
   input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  mapping = g_settings_get_enum (settings, "mapping");
+  mapping = g_settings_get_boolean (settings, "is-absolute") ?
+    G_DESKTOP_TABLET_MAPPING_ABSOLUTE : G_DESKTOP_TABLET_MAPPING_RELATIVE;
 
   settings_device_set_uint_setting (input_settings, device,
                                     input_settings_class->set_tablet_mapping,
@@ -840,7 +866,9 @@ update_tablet_mapping (MetaInputSettings  *input_settings,
 
   /* Relative mapping disables keep-aspect/display */
   update_tablet_keep_aspect (input_settings, settings, device);
-  update_device_display (input_settings, settings, device);
+  info = lookup_mapping_info (device);
+  if (info)
+    update_device_display (input_settings, info->settings, device);
 }
 
 static void
@@ -850,7 +878,7 @@ update_tablet_area (MetaInputSettings  *input_settings,
 {
   MetaInputSettingsClass *input_settings_class;
   GVariant *variant;
-  const gdouble *area;
+  const guint32 *area;
   gsize n_elems;
 
   if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
@@ -875,7 +903,7 @@ update_tablet_area (MetaInputSettings  *input_settings,
   input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
   variant = g_settings_get_value (settings, "area");
 
-  area = g_variant_get_fixed_array (variant, &n_elems, sizeof (gdouble));
+  area = g_variant_get_fixed_array (variant, &n_elems, sizeof (guint32));
   if (n_elems == 4)
     {
       input_settings_class->set_tablet_area (input_settings, device,
@@ -914,7 +942,7 @@ update_tablet_left_handed (MetaInputSettings  *input_settings,
 #endif
 
   input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  enabled = g_settings_get_boolean (settings, "left-handed");
+  enabled = g_settings_get_enum (settings, "rotation") != 0;
 
   settings_device_set_bool_setting (input_settings, device,
                                     input_settings_class->set_left_handed,
@@ -982,13 +1010,20 @@ mapped_device_changed_cb (GSettings         *settings,
 {
   if (strcmp (key, "display") == 0)
     update_device_display (info->input_settings, settings, info->device);
-  else if (strcmp (key, "mapping") == 0)
+}
+
+static void
+mapped_device_gsd_setting_changed_cb (GSettings         *settings,
+                                      const gchar       *key,
+                                      DeviceMappingInfo *info)
+{
+  if (strcmp (key, "is-absolute") == 0)
     update_tablet_mapping (info->input_settings, settings, info->device);
   else if (strcmp (key, "area") == 0)
     update_tablet_area (info->input_settings, settings, info->device);
   else if (strcmp (key, "keep-aspect") == 0)
     update_tablet_keep_aspect (info->input_settings, settings, info->device);
-  else if (strcmp (key, "left-handed") == 0)
+  else if (strcmp (key, "rotation") == 0)
     update_tablet_left_handed (info->input_settings, settings, info->device);
 }
 
@@ -998,13 +1033,14 @@ apply_mappable_device_settings (MetaInputSettings *input_settings,
 {
   update_device_display (input_settings, info->settings, info->device);
 
-  if (clutter_input_device_get_device_type (info->device) == CLUTTER_TABLET_DEVICE ||
-      clutter_input_device_get_device_type (info->device) == CLUTTER_PAD_DEVICE)
+  if (info->gsd_settings &&
+      (clutter_input_device_get_device_type (info->device) == CLUTTER_TABLET_DEVICE ||
+       clutter_input_device_get_device_type (info->device) == CLUTTER_PAD_DEVICE))
     {
-      update_tablet_mapping (input_settings, info->settings, info->device);
-      update_tablet_area (input_settings, info->settings, info->device);
-      update_tablet_keep_aspect (input_settings, info->settings, info->device);
-      update_tablet_left_handed (input_settings, info->settings, info->device);
+      update_tablet_mapping (input_settings, info->gsd_settings, info->device);
+      update_tablet_area (input_settings, info->gsd_settings, info->device);
+      update_tablet_keep_aspect (input_settings, info->gsd_settings, info->device);
+      update_tablet_left_handed (input_settings, info->gsd_settings, info->device);
     }
 }
 
@@ -1046,36 +1082,205 @@ lookup_device_settings (ClutterInputDevice *device)
   return settings;
 }
 
+static gchar *
+get_tablet_settings_id (ClutterInputDevice *device,
+                        DeviceMappingInfo  *info)
+{
+  gchar *id = NULL, *machine_id;
+  gsize length;
+
+  if (!g_file_get_contents ("/etc/machine-id", &machine_id, &length, NULL))
+    return NULL;
+
+  machine_id = g_strstrip (machine_id);
+#ifdef HAVE_LIBWACOM
+  if (info->wacom_device)
+    id = g_strdup_printf ("%s-%s", machine_id, libwacom_get_match (info->wacom_device));
+#endif
+
+  if (!id)
+    id = g_strdup_printf ("%s-%s:%s", machine_id,
+                          clutter_input_device_get_vendor_id (device),
+                          clutter_input_device_get_product_id (device));
+
+  g_free (machine_id);
+
+  return id;
+}
+
+static gboolean
+has_gsd_schemas (void)
+{
+  GSettingsSchema *schema;
+
+  schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
+                                            "org.gnome.settings-daemon.peripherals.wacom",
+                                            TRUE);
+  if (!schema)
+    return FALSE;
+
+  g_settings_schema_unref (schema);
+  return TRUE;
+}
+
 static GSettings *
+lookup_device_gsd_settings (ClutterInputDevice *device,
+                            DeviceMappingInfo  *info)
+{
+  ClutterInputDeviceType type;
+  GSettings *settings = NULL;
+
+  type = clutter_input_device_get_device_type (device);
+
+  if (type == CLUTTER_TABLET_DEVICE ||
+      type == CLUTTER_PEN_DEVICE ||
+      type == CLUTTER_ERASER_DEVICE ||
+      type == CLUTTER_CURSOR_DEVICE ||
+      type == CLUTTER_PAD_DEVICE)
+    {
+      gchar *device_id, *path;
+
+      if (!has_gsd_schemas ())
+        return NULL;
+
+      device_id = get_tablet_settings_id (device, info);
+      path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/",
+                              device_id);
+      settings = g_settings_new_with_path ("org.gnome.settings-daemon.peripherals.wacom",
+                                           path);
+      g_free (device_id);
+      g_free (path);
+    }
+
+  return settings;
+}
+
+static void
+tool_settings_cache_pressure_curve (ToolSettings *tool_settings)
+{
+  GVariant *variant;
+  const gint32 *curve;
+  gsize n_elems;
+
+  variant = g_settings_get_value (tool_settings->settings, "pressurecurve");
+
+  curve = g_variant_get_fixed_array (variant, &n_elems, sizeof (gint32));
+  if (n_elems == 4)
+    {
+      tool_settings->curve[0] = (gdouble) curve[0] / 100;
+      tool_settings->curve[1] = (gdouble) curve[1] / 100;
+      tool_settings->curve[2] = (gdouble) curve[2] / 100;
+      tool_settings->curve[3] = (gdouble) curve[3] / 100;
+    }
+  else
+    {
+      tool_settings->curve[0] = tool_settings->curve[1] = 0;
+      tool_settings->curve[2] = tool_settings->curve[3] = 1;
+    }
+
+  g_variant_unref (variant);
+}
+
+static GDesktopStylusButtonAction
+translate_stylus_button_action (guint32 button_number)
+{
+  switch (button_number)
+    {
+    case 2:
+      return G_DESKTOP_STYLUS_BUTTON_ACTION_MIDDLE;
+    case 3:
+      return G_DESKTOP_STYLUS_BUTTON_ACTION_RIGHT;
+    case 8:
+      return G_DESKTOP_STYLUS_BUTTON_ACTION_BACK;
+    case 9:
+      return G_DESKTOP_STYLUS_BUTTON_ACTION_FORWARD;
+    default:
+      return G_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT;
+    }
+}
+
+static void
+tool_settings_changed_cb (GSettings    *settings,
+                          const gchar  *key,
+                          ToolSettings *tool_settings)
+{
+  if (strcmp (key, "buttonmapping") == 0)
+    {
+      GVariant *variant = g_settings_get_value (settings, "buttonmapping");
+      const guint32 *mapping;
+      gsize n_elems;
+
+      mapping = g_variant_get_fixed_array (variant, &n_elems, sizeof (guint32));
+      tool_settings->button_action = translate_stylus_button_action (mapping[2]);
+      tool_settings->secondary_button_action = translate_stylus_button_action (mapping[3]);
+      g_variant_unref (variant);
+    }
+  else if (strcmp (key, "pressurecurve") == 0)
+    tool_settings_cache_pressure_curve (tool_settings);
+}
+
+static ToolSettings *
+tool_settings_new (ClutterInputDeviceTool *tool,
+                   const gchar            *schema_path)
+{
+  ToolSettings *tool_settings;
+  GVariant *variant;
+  const guint32 *mapping;
+  gsize n_elems;
+
+  tool_settings = g_new0 (ToolSettings, 1);
+  tool_settings->tool = tool;
+  tool_settings->curve[0] = tool_settings->curve[1] = 0;
+  tool_settings->curve[2] = tool_settings->curve[3] = 1;
+
+  if (has_gsd_schemas ())
+    {
+      tool_settings->settings =
+        g_settings_new_with_path ("org.gnome.settings-daemon.peripherals.wacom.stylus",
+                                  schema_path);
+
+      g_signal_connect (tool_settings->settings, "changed",
+                        G_CALLBACK (tool_settings_changed_cb), tool_settings);
+
+      /* Initialize values */
+      variant = g_settings_get_value (tool_settings->settings, "buttonmapping");
+      mapping = g_variant_get_fixed_array (variant, &n_elems, sizeof (guint32));
+      tool_settings->button_action = translate_stylus_button_action (mapping[2]);
+      tool_settings->secondary_button_action = translate_stylus_button_action (mapping[3]);
+      tool_settings_cache_pressure_curve (tool_settings);
+
+      g_variant_unref (variant);
+    }
+
+  return tool_settings;
+}
+
+static void
+tool_settings_free (ToolSettings *tool_settings)
+{
+  g_object_unref (tool_settings->settings);
+  g_free (tool_settings);
+}
+
+static ToolSettings *
 lookup_tool_settings (ClutterInputDeviceTool *tool,
                       ClutterInputDevice     *device)
 {
-  GSettings *tool_settings;
-  guint64 serial;
-  gchar *path;
+  ToolSettings *tool_settings;
+  guint64 tool_id;
+  gchar *device_id, *path;
 
   tool_settings = g_object_get_qdata (G_OBJECT (tool), quark_tool_settings);
   if (tool_settings)
     return tool_settings;
 
-  serial = clutter_input_device_tool_get_serial (tool);
-
-  if (serial == 0)
-    {
-      path = g_strdup_printf ("/org/gnome/desktop/peripherals/stylus/default-%s:%s/",
-                              clutter_input_device_get_vendor_id (device),
-                              clutter_input_device_get_product_id (device));
-    }
-  else
-    {
-      path = g_strdup_printf ("/org/gnome/desktop/peripherals/stylus/%lx/", serial);
-    }
-
-  tool_settings =
-    g_settings_new_with_path ("org.gnome.desktop.peripherals.tablet.stylus",
-                              path);
+  tool_id = clutter_input_device_tool_get_id (tool);
+  device_id = get_tablet_settings_id (device, lookup_mapping_info (device));
+  path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/%" G_GUINT64_FORMAT "/",
+                          device_id, tool_id);
+  tool_settings = tool_settings_new (tool, path);
   g_object_set_qdata_full (G_OBJECT (tool), quark_tool_settings, tool_settings,
-                           (GDestroyNotify) g_object_unref);
+                           (GDestroyNotify) tool_settings_free);
   g_free (path);
 
   return tool_settings;
@@ -1085,16 +1290,15 @@ static GSettings *
 lookup_pad_button_settings (ClutterInputDevice *device,
                             guint               button)
 {
-  const gchar *vendor, *product;
   GSettings *settings;
-  gchar *path;
+  gchar *device_id, *path;
 
-  vendor = clutter_input_device_get_vendor_id (device);
-  product = clutter_input_device_get_product_id (device);
-  path = g_strdup_printf ("/org/gnome/desktop/peripherals/tablets/%s:%s/button%c/",
-                          vendor, product, 'A' + button);
-  settings = g_settings_new_with_path ("org.gnome.desktop.peripherals.tablet.pad-button",
+  device_id = get_tablet_settings_id (device, lookup_mapping_info (device));
+  path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/button%c/",
+                          device_id, 'A' + button);
+  settings = g_settings_new_with_path ("org.gnome.settings-daemon.peripherals.wacom.tablet-button",
                                        path);
+  g_free (device_id);
   g_free (path);
 
   return settings;
@@ -1125,6 +1329,7 @@ device_mapping_info_free (DeviceMappingInfo *info)
     libwacom_destroy (info->wacom_device);
 #endif
   g_object_unref (info->settings);
+  g_clear_object (&info->gsd_settings);
   g_slice_free (DeviceMappingInfo, info);
 }
 
@@ -1173,6 +1378,13 @@ check_add_mappable_device (MetaInputSettings  *input_settings,
 
   g_hash_table_insert (priv->mappable_devices, device, info);
 
+  info->gsd_settings = lookup_device_gsd_settings (device, info);
+  if (info->gsd_settings)
+    {
+      g_signal_connect (info->gsd_settings, "changed",
+                        G_CALLBACK (mapped_device_gsd_setting_changed_cb), info);
+    }
+
   apply_mappable_device_settings (input_settings, info);
 
   return TRUE;
@@ -1206,77 +1418,6 @@ apply_device_settings (MetaInputSettings  *input_settings,
                                 device);
 }
 
-static void
-update_stylus_pressure (MetaInputSettings      *input_settings,
-                        ClutterInputDevice     *device,
-                        ClutterInputDeviceTool *tool)
-{
-  MetaInputSettingsClass *input_settings_class;
-  GSettings *tool_settings;
-  const gint32 *curve;
-  GVariant *variant;
-  gsize n_elems;
-
-  if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
-      clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
-      clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE)
-    return;
-
-  if (!tool)
-    return;
-
-  tool_settings = lookup_tool_settings (tool, device);
-
-  if (clutter_input_device_tool_get_tool_type (tool) ==
-      CLUTTER_INPUT_DEVICE_TOOL_ERASER)
-    variant = g_settings_get_value (tool_settings, "eraser-pressure-curve");
-  else
-    variant = g_settings_get_value (tool_settings, "pressure-curve");
-
-  curve = g_variant_get_fixed_array (variant, &n_elems, sizeof (gint32));
-  if (n_elems != 4)
-    return;
-
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  input_settings_class->set_stylus_pressure (input_settings, device, tool, curve);
-}
-
-static void
-update_stylus_buttonmap (MetaInputSettings      *input_settings,
-                         ClutterInputDevice     *device,
-                         ClutterInputDeviceTool *tool)
-{
-  MetaInputSettingsClass *input_settings_class;
-  GDesktopStylusButtonAction primary, secondary;
-  GSettings *tool_settings;
-
-  if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
-      clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
-      clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE)
-    return;
-
-  if (!tool)
-    return;
-
-  tool_settings = lookup_tool_settings (tool, device);
-
-  primary = g_settings_get_enum (tool_settings, "button-action");
-  secondary = g_settings_get_enum (tool_settings, "secondary-button-action");
-
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  input_settings_class->set_stylus_button_map (input_settings, device, tool,
-                                               primary, secondary);
-}
-
-static void
-apply_stylus_settings (MetaInputSettings      *input_settings,
-                       ClutterInputDevice     *device,
-                       ClutterInputDeviceTool *tool)
-{
-  update_stylus_pressure (input_settings, device, tool);
-  update_stylus_buttonmap (input_settings, device, tool);
-}
-
 static void
 evaluate_two_finger_scrolling (MetaInputSettings  *input_settings,
                                ClutterInputDevice *device)
@@ -1323,18 +1464,6 @@ meta_input_settings_device_removed (ClutterDeviceManager *device_manager,
     apply_device_settings (input_settings, NULL);
 }
 
-static void
-meta_input_settings_tool_changed (ClutterDeviceManager   *device_manager,
-                                  ClutterInputDevice     *device,
-                                  ClutterInputDeviceTool *tool,
-                                  MetaInputSettings      *input_settings)
-{
-  if (!tool)
-    return;
-
-  apply_stylus_settings (input_settings, device, tool);
-}
-
 static void
 check_mappable_devices (MetaInputSettings *input_settings)
 {
@@ -1395,8 +1524,6 @@ meta_input_settings_init (MetaInputSettings *settings)
                     G_CALLBACK (meta_input_settings_device_added), settings);
   g_signal_connect (priv->device_manager, "device-removed",
                     G_CALLBACK (meta_input_settings_device_removed), settings);
-  g_signal_connect (priv->device_manager, "tool-changed",
-                    G_CALLBACK (meta_input_settings_tool_changed), settings);
 
   priv->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
   g_signal_connect (priv->mouse_settings, "changed",
@@ -1466,9 +1593,9 @@ meta_input_settings_get_tablet_settings (MetaInputSettings  *settings,
   return info ? g_object_ref (info->settings) : NULL;
 }
 
-MetaLogicalMonitor *
-meta_input_settings_get_tablet_logical_monitor (MetaInputSettings  *settings,
-                                                ClutterInputDevice *device)
+MetaMonitorInfo *
+meta_input_settings_get_tablet_monitor_info (MetaInputSettings  *settings,
+                                             ClutterInputDevice *device)
 {
   MetaInputSettingsPrivate *priv;
   DeviceMappingInfo *info;
@@ -1509,13 +1636,46 @@ meta_input_settings_get_tablet_mapping (MetaInputSettings  *settings,
   return g_settings_get_enum (info->settings, "mapping");
 }
 
+GDesktopStylusButtonAction
+meta_input_settings_get_stylus_button_action (MetaInputSettings      *input_settings,
+                                              ClutterInputDeviceTool *tool,
+                                              ClutterInputDevice     *current_tablet,
+                                              guint                   button)
+{
+  ToolSettings *tool_settings;
+
+  g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings),
+                        G_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT);
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE_TOOL (tool),
+                        G_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT);
+
+  tool_settings = lookup_tool_settings (tool, current_tablet);
+
+  if (button == 2)
+    return tool_settings->button_action;
+  else if (button == 3)
+    return tool_settings->secondary_button_action;
+  else
+    return G_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT;
+}
+
 static GDesktopPadButtonAction
 meta_input_settings_get_pad_button_action (MetaInputSettings   *input_settings,
                                            ClutterInputDevice  *pad,
                                            guint                button)
 {
-  GDesktopPadButtonAction action;
+  /* GsdWacomActionType to GDesktopPadButtonAction map */
+  GDesktopPadButtonAction action_map[4] = {
+    G_DESKTOP_PAD_BUTTON_ACTION_NONE,
+    G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING,
+    G_DESKTOP_PAD_BUTTON_ACTION_SWITCH_MONITOR,
+    G_DESKTOP_PAD_BUTTON_ACTION_HELP
+  };
   GSettings *settings;
+  guint32 action;
+
+  if (!has_gsd_schemas ())
+    return G_DESKTOP_PAD_BUTTON_ACTION_NONE;
 
   g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings),
                         G_DESKTOP_PAD_BUTTON_ACTION_NONE);
@@ -1523,10 +1683,10 @@ meta_input_settings_get_pad_button_action (MetaInputSettings   *input_settings,
                         G_DESKTOP_PAD_BUTTON_ACTION_NONE);
 
   settings = lookup_pad_button_settings (pad, button);
-  action = g_settings_get_enum (settings, "action");
+  action = g_settings_get_enum (settings, "action-type");
   g_object_unref (settings);
 
-  return action;
+  return action_map[action];
 }
 
 #ifdef HAVE_LIBWACOM
@@ -1600,7 +1760,7 @@ meta_input_settings_cycle_tablet_output (MetaInputSettings  *input_settings,
   MetaInputSettingsPrivate *priv;
   DeviceMappingInfo *info;
   MetaOutput *output;
-  const gchar *edid[4] = { 0 }, *pretty_name = NULL;
+  const gchar *edid[4] = { 0 };
 
   g_return_if_fail (META_IS_INPUT_SETTINGS (input_settings));
   g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
@@ -1612,14 +1772,10 @@ meta_input_settings_cycle_tablet_output (MetaInputSettings  *input_settings,
   g_return_if_fail (info != NULL);
 
 #ifdef HAVE_LIBWACOM
-  if (info->wacom_device)
-    {
-      /* Output rotation only makes sense on external tablets */
-      if (libwacom_get_integration_flags (info->wacom_device) != WACOM_DEVICE_INTEGRATED_NONE)
-        return;
-
-      pretty_name = libwacom_get_name (info->wacom_device);
-    }
+  /* Output rotation only makes sense on external tablets */
+  if (info->wacom_device &&
+      (libwacom_get_integration_flags (info->wacom_device) != WACOM_DEVICE_INTEGRATED_NONE))
+    return;
 #endif
 
   output = meta_input_settings_find_output (input_settings,
@@ -1631,77 +1787,50 @@ meta_input_settings_cycle_tablet_output (MetaInputSettings  *input_settings,
   edid[1] = output ? output->product : "";
   edid[2] = output ? output->serial : "";
   g_settings_set_strv (info->settings, "display", edid);
-
-  meta_display_show_tablet_mapping_notification (meta_get_display (),
-                                                 device, pretty_name);
 }
 
-static void
-emulate_modifiers (ClutterVirtualInputDevice *device,
-                   ClutterModifierType        mods,
-                   ClutterKeyState            state)
+static gdouble
+calculate_bezier_position (gdouble pos,
+                           gdouble x1,
+                           gdouble y1,
+                           gdouble x2,
+                           gdouble y2)
 {
-  guint i;
-  struct {
-    ClutterModifierType mod;
-    guint keyval;
-  } mod_map[] = {
-    { CLUTTER_SHIFT_MASK, CLUTTER_KEY_Shift_L },
-    { CLUTTER_CONTROL_MASK, CLUTTER_KEY_Control_L },
-    { CLUTTER_MOD1_MASK, CLUTTER_KEY_Meta_L }
-  };
+  gdouble int1_y, int2_y;
 
-  for (i = 0; i < G_N_ELEMENTS (mod_map); i++)
-    {
-      if ((mods & mod_map[i].mod) == 0)
-        continue;
+  pos = CLAMP (pos, 0, 1);
 
-      clutter_virtual_input_device_notify_keyval (device,
-                                                  clutter_get_current_event_time (),
-                                                  mod_map[i].keyval, state);
-    }
+  /* 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;
 }
 
-static void
-meta_input_settings_emulate_keybinding (MetaInputSettings  *input_settings,
-                                        ClutterInputDevice *pad,
-                                        guint               button,
-                                        gboolean            is_press)
+gdouble
+meta_input_settings_translate_tablet_tool_pressure (MetaInputSettings      *input_settings,
+                                                    ClutterInputDeviceTool *tool,
+                                                    ClutterInputDevice     *current_tablet,
+                                                    gdouble                 pressure)
 {
-  MetaInputSettingsPrivate *priv;
-  ClutterKeyState state;
-  GSettings *settings;
-  guint key, mods;
-  gchar *accel;
+  ToolSettings *tool_settings;
 
-  priv = meta_input_settings_get_instance_private (input_settings);
-  settings = lookup_pad_button_settings (pad, button);
-  accel = g_settings_get_string (settings, "keybinding");
-  g_object_unref (settings);
+  pressure = CLAMP (pressure, 0, 1);
 
-  /* FIXME: This is appalling */
-  gtk_accelerator_parse (accel, &key, &mods);
-  g_free (accel);
+  g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), pressure);
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE_TOOL (tool), pressure);
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (current_tablet), pressure);
 
-  if (!priv->virtual_pad_keyboard)
-    {
-      ClutterDeviceManager *manager = clutter_device_manager_get_default ();
-
-      priv->virtual_pad_keyboard =
-        clutter_device_manager_create_virtual_device (manager,
-                                                      CLUTTER_KEYBOARD_DEVICE);
-    }
-
-  state = is_press ? CLUTTER_KEY_STATE_PRESSED : CLUTTER_KEY_STATE_RELEASED;
-
-  if (is_press)
-    emulate_modifiers (priv->virtual_pad_keyboard, mods, state);
-
-  clutter_virtual_input_device_notify_keyval (priv->virtual_pad_keyboard,
-                                              clutter_get_current_event_time (),
-                                              key, state);
-  if (!is_press)
-    emulate_modifiers (priv->virtual_pad_keyboard, mods, state);
+  tool_settings = lookup_tool_settings (tool, current_tablet);
+  pressure = calculate_bezier_position (pressure,
+                                        tool_settings->curve[0],
+                                        tool_settings->curve[1],
+                                        tool_settings->curve[2],
+                                        tool_settings->curve[3]);
+  return pressure;
 }
 
 gboolean
@@ -1719,41 +1848,17 @@ meta_input_settings_is_pad_button_grabbed (MetaInputSettings  *input_settings,
 }
 
 gboolean
-meta_input_settings_handle_pad_button (MetaInputSettings           *input_settings,
-                                       const ClutterPadButtonEvent *event)
+meta_input_settings_handle_pad_button (MetaInputSettings  *input_settings,
+                                       ClutterInputDevice *pad,
+                                       gboolean            is_press,
+                                       guint               button)
 {
   GDesktopPadButtonAction action;
-  ClutterInputDevice *pad;
-  gint button, group, mode;
-  gboolean is_press;
 
   g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), FALSE);
-  g_return_val_if_fail (event->type == CLUTTER_PAD_BUTTON_PRESS ||
-                        event->type == CLUTTER_PAD_BUTTON_RELEASE, FALSE);
-
-  pad = clutter_event_get_source_device ((ClutterEvent *) event);
-  button = event->button;
-  mode = event->mode;
-  group = clutter_input_device_get_mode_switch_button_group (pad, button);
-  is_press = event->type == CLUTTER_PAD_BUTTON_PRESS;
-
-  if (is_press && group >= 0)
-    {
-      guint n_modes = clutter_input_device_get_group_n_modes (pad, group);
-      const gchar *pretty_name = NULL;
-#ifdef HAVE_LIBWACOM
-      MetaInputSettingsPrivate *priv;
-      DeviceMappingInfo *info;
-
-      priv = meta_input_settings_get_instance_private (input_settings);
-      info = g_hash_table_lookup (priv->mappable_devices, pad);
-
-      if (info && info->wacom_device)
-        pretty_name = libwacom_get_name (info->wacom_device);
-#endif
-      meta_display_notify_pad_group_switch (meta_get_display (), pad,
-                                            pretty_name, group, mode, n_modes);
-    }
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (pad), FALSE);
+  g_return_val_if_fail (clutter_input_device_get_device_type (pad) ==
+                        CLUTTER_PAD_DEVICE, FALSE);
 
   action = meta_input_settings_get_pad_button_action (input_settings, pad, button);
 
@@ -1768,9 +1873,6 @@ meta_input_settings_handle_pad_button (MetaInputSettings           *input_settin
         meta_display_request_pad_osd (meta_get_display (), pad, FALSE);
       return TRUE;
     case G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING:
-      meta_input_settings_emulate_keybinding (input_settings, pad,
-                                              button, is_press);
-      return TRUE;
     case G_DESKTOP_PAD_BUTTON_ACTION_NONE:
     default:
       return FALSE;
@@ -1783,23 +1885,12 @@ meta_input_settings_get_pad_button_action_label (MetaInputSettings  *input_setti
                                                  guint               button)
 {
   GDesktopPadButtonAction action;
-  gint group;
 
   g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), NULL);
   g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (pad), NULL);
   g_return_val_if_fail (clutter_input_device_get_device_type (pad) ==
                         CLUTTER_PAD_DEVICE, NULL);
 
-  group = clutter_input_device_get_mode_switch_button_group (pad, button);
-
-  if (group >= 0)
-    {
-      /* TRANSLATORS: This string refers to a button that switches between
-       * different modes.
-       */
-      return g_strdup_printf (_("Mode Switch (Group %d)"), group);
-    }
-
   action = meta_input_settings_get_pad_button_action (input_settings, pad, button);
 
   switch (action)
@@ -1810,7 +1901,7 @@ meta_input_settings_get_pad_button_action_label (MetaInputSettings  *input_setti
         gchar *accel;
 
         settings = lookup_pad_button_settings (pad, button);
-        accel = g_settings_get_string (settings, "keybinding");
+        accel = g_settings_get_string (settings, "custom-action");
         g_object_unref (settings);
 
         return accel;

src/backends/meta-logical-monitor.c

@@ -1,137 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2016 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include "backends/meta-logical-monitor.h"
-
-G_DEFINE_TYPE (MetaLogicalMonitor, meta_logical_monitor, G_TYPE_OBJECT)
-
-MetaLogicalMonitor *
-meta_logical_monitor_new (MetaMonitor *monitor,
-                          int          x,
-                          int          y,
-                          int          number)
-{
-  MetaLogicalMonitor *logical_monitor;
-  MetaOutput *main_output;
-  GList *outputs;
-  GList *l;
-  gboolean is_presentation;
-
-  g_assert (meta_monitor_is_active (monitor));
-
-  logical_monitor = g_object_new (META_TYPE_LOGICAL_MONITOR, NULL);
-
-  main_output = meta_monitor_get_main_output (monitor);
-  logical_monitor->number = number;
-  logical_monitor->winsys_id = main_output->winsys_id;
-  logical_monitor->scale = main_output->scale;
-  logical_monitor->in_fullscreen = -1;
-
-  logical_monitor->rect.x = x;
-  logical_monitor->rect.y = y;
-  meta_monitor_get_dimensions (monitor,
-                               &logical_monitor->rect.width,
-                               &logical_monitor->rect.height);
-
-  is_presentation = TRUE;
-  outputs = meta_monitor_get_outputs (monitor);
-  for (l = outputs; l; l = l->next)
-    {
-      MetaOutput *output = l->data;
-
-      output->crtc->logical_monitor = logical_monitor;
-
-      is_presentation = is_presentation && output->is_presentation;
-    }
-
-  logical_monitor->is_presentation = is_presentation;
-
-  logical_monitor->monitors = g_list_append (logical_monitor->monitors,
-                                             monitor);
-
-  return logical_monitor;
-}
-
-void
-meta_logical_monitor_add_monitor (MetaLogicalMonitor *logical_monitor,
-                                  MetaMonitor        *monitor)
-{
-  GList *l;
-  gboolean is_presentation;
-
-  is_presentation = logical_monitor->is_presentation;
-  logical_monitor->monitors = g_list_append (logical_monitor->monitors,
-                                             monitor);
-
-  for (l = logical_monitor->monitors; l; l = l->next)
-    {
-      MetaMonitor *monitor = l->data;
-      GList *outputs;
-      GList *l_output;
-
-      outputs = meta_monitor_get_outputs (monitor);
-      for (l_output = outputs; l_output; l_output = l_output->next)
-        {
-          MetaOutput *output = l_output->data;
-
-          is_presentation = is_presentation && output->is_presentation;
-          output->crtc->logical_monitor = logical_monitor;
-        }
-    }
-
-  logical_monitor->is_presentation = is_presentation;
-}
-
-gboolean
-meta_logical_monitor_is_primary (MetaLogicalMonitor *logical_monitor)
-{
-  return logical_monitor->is_primary;
-}
-
-void
-meta_logical_monitor_make_primary (MetaLogicalMonitor *logical_monitor)
-{
-  logical_monitor->is_primary = TRUE;
-}
-
-int
-meta_logical_monitor_get_scale (MetaLogicalMonitor *logical_monitor)
-{
-  return logical_monitor->scale;
-}
-
-GList *
-meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor)
-{
-  return logical_monitor->monitors;
-}
-
-static void
-meta_logical_monitor_init (MetaLogicalMonitor *logical_monitor)
-{
-}
-
-static void
-meta_logical_monitor_class_init (MetaLogicalMonitorClass *klass)
-{
-}

src/backends/meta-logical-monitor.h

@@ -1,78 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2016 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_LOGICAL_MONITOR_H
-#define META_LOGICAL_MONITOR_H
-
-#include <glib-object.h>
-
-#include "backends/meta-monitor.h"
-#include "backends/meta-monitor-manager-private.h"
-#include "meta/boxes.h"
-
-#define META_MAX_OUTPUTS_PER_MONITOR 4
-
-struct _MetaLogicalMonitor
-{
-  GObject parent;
-
-  int number;
-  MetaRectangle rect;
-  gboolean is_primary;
-  gboolean is_presentation; /* XXX: not yet used */
-  gboolean in_fullscreen;
-  int scale;
-
-  /* The primary or first output for this monitor, 0 if we can't figure out.
-     It can be matched to a winsys_id of a MetaOutput.
-
-     This is used as an opaque token on reconfiguration when switching from
-     clone to extened, to decide on what output the windows should go next
-     (it's an attempt to keep windows on the same monitor, and preferably on
-     the primary one).
-  */
-  glong winsys_id;
-
-  GList *monitors;
-};
-
-#define META_TYPE_LOGICAL_MONITOR (meta_logical_monitor_get_type ())
-G_DECLARE_FINAL_TYPE (MetaLogicalMonitor, meta_logical_monitor,
-                      META, LOGICAL_MONITOR,
-                      GObject)
-
-MetaLogicalMonitor * meta_logical_monitor_new (MetaMonitor *monitor,
-                                               int          x,
-                                               int          y,
-                                               int          number);
-
-void meta_logical_monitor_add_monitor (MetaLogicalMonitor *logical_monitor,
-                                       MetaMonitor        *monitor);
-
-gboolean meta_logical_monitor_is_primary (MetaLogicalMonitor *logical_monitor);
-
-void meta_logical_monitor_make_primary (MetaLogicalMonitor *logical_monitor);
-
-int meta_logical_monitor_get_scale (MetaLogicalMonitor *logical_monitor);
-
-GList * meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor);
-
-#endif /* META_LOGICAL_MONITOR_H */

src/backends/meta-monitor-config-manager.c

@@ -1,794 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2016 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include "backends/meta-monitor-config-manager.h"
-
-#include "backends/meta-monitor-config-store.h"
-#include "backends/meta-monitor-manager-private.h"
-#include "core/boxes-private.h"
-
-struct _MetaMonitorConfigManager
-{
-  GObject parent;
-
-  MetaMonitorManager *monitor_manager;
-
-  MetaMonitorConfigStore *config_store;
-
-  MetaMonitorsConfig *current_config;
-};
-
-G_DEFINE_TYPE (MetaMonitorConfigManager, meta_monitor_config_manager,
-               G_TYPE_OBJECT)
-
-G_DEFINE_TYPE (MetaMonitorsConfig, meta_monitors_config,
-               G_TYPE_OBJECT)
-
-MetaMonitorConfigManager *
-meta_monitor_config_manager_new (MetaMonitorManager *monitor_manager)
-{
-  MetaMonitorConfigManager *config_manager;
-
-  config_manager = g_object_new (META_TYPE_MONITOR_CONFIG_MANAGER, NULL);
-  config_manager->monitor_manager = monitor_manager;
-  config_manager->config_store = g_object_new (META_TYPE_MONITOR_CONFIG_STORE,
-                                               NULL);
-
-  return config_manager;
-}
-
-MetaMonitorConfigStore *
-meta_monitor_config_manager_get_store (MetaMonitorConfigManager *config_manager)
-{
-  return config_manager->config_store;
-}
-
-static gboolean
-is_crtc_assigned (MetaCrtc  *crtc,
-                  GPtrArray *crtc_infos)
-{
-  unsigned int i;
-
-  for (i = 0; i < crtc_infos->len; i++)
-    {
-      MetaCrtcInfo *assigned_crtc_info = g_ptr_array_index (crtc_infos, i);
-
-      if (assigned_crtc_info->crtc == crtc)
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-static MetaCrtc *
-find_unassigned_crtc (MetaOutput *output,
-                      GPtrArray  *crtc_infos)
-{
-  unsigned int i;
-
-  for (i = 0; i < output->n_possible_crtcs; i++)
-    {
-      MetaCrtc *crtc = output->possible_crtcs[i];
-
-      if (is_crtc_assigned (crtc, crtc_infos))
-        continue;
-
-      return crtc;
-    }
-
-  return NULL;
-}
-
-typedef struct
-{
-  MetaLogicalMonitorConfig *logical_monitor_config;
-  MetaMonitorConfig *monitor_config;
-  GPtrArray *crtc_infos;
-  GPtrArray *output_infos;
-} MonitorAssignmentData;
-
-static gboolean
-assign_monitor_crtc (MetaMonitor         *monitor,
-                     MetaMonitorMode     *mode,
-                     MetaMonitorCrtcMode *monitor_crtc_mode,
-                     gpointer             user_data,
-                     GError             **error)
-{
-  MonitorAssignmentData *data = user_data;
-  MetaOutput *output;
-  MetaCrtc *crtc;
-  MetaCrtcInfo *crtc_info;
-  MetaOutputInfo *output_info;
-  MetaMonitorConfig *first_monitor_config;
-  gboolean assign_output_as_primary;
-  gboolean assign_output_as_presentation;
-
-  output = monitor_crtc_mode->output;
-
-  crtc = find_unassigned_crtc (output, data->crtc_infos);
-  if (!crtc)
-    {
-      MetaMonitorSpec *monitor_spec = meta_monitor_get_spec (monitor);
-
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "No available CRTC for monitor '%s %s' not found",
-                   monitor_spec->vendor, monitor_spec->product);
-      return FALSE;
-    }
-
-  crtc_info = g_slice_new0 (MetaCrtcInfo);
-  *crtc_info = (MetaCrtcInfo) {
-    .crtc = crtc,
-    .mode = monitor_crtc_mode->crtc_mode,
-    .x = monitor_crtc_mode->x,
-    .y = monitor_crtc_mode->y,
-    .transform = META_MONITOR_TRANSFORM_NORMAL,
-    .outputs = g_ptr_array_new ()
-  };
-  g_ptr_array_add (crtc_info->outputs, output);
-
-  /*
-   * Currently, MetaCrtcInfo are deliberately offset incorrectly to carry over
-   * logical monitor location inside the MetaCrtc struct, when in fact this
-   * depends on the framebuffer configuration. This will eventually be negated
-   * when setting the actual KMS mode.
-   *
-   * TODO: Remove this hack when we don't need to rely on MetaCrtc to pass
-   * logical monitor state.
-   */
-  crtc_info->x += data->logical_monitor_config->layout.x;
-  crtc_info->y += data->logical_monitor_config->layout.y;
-
-  /*
-   * Only one output can be marked as primary (due to Xrandr limitation),
-   * so only mark the main output of the first monitor in the logical monitor
-   * as such.
-   */
-  first_monitor_config = data->logical_monitor_config->monitor_configs->data;
-  if (data->monitor_config == first_monitor_config &&
-      meta_monitor_get_main_output (monitor) == output)
-    assign_output_as_primary = TRUE;
-  else
-    assign_output_as_primary = FALSE;
-
-  if (data->logical_monitor_config->is_presentation)
-    assign_output_as_presentation = TRUE;
-  else
-    assign_output_as_presentation = FALSE;
-
-  output_info = g_slice_new0 (MetaOutputInfo);
-  *output_info = (MetaOutputInfo) {
-    .output = output,
-    .is_primary = assign_output_as_primary,
-    .is_presentation = assign_output_as_presentation,
-    .is_underscanning = data->monitor_config->is_underscanning
-  };
-
-  g_ptr_array_add (data->crtc_infos, crtc_info);
-  g_ptr_array_add (data->output_infos, output_info);
-
-  return TRUE;
-}
-
-static gboolean
-assign_monitor_crtcs (MetaMonitorManager       *manager,
-                      MetaLogicalMonitorConfig *logical_monitor_config,
-                      MetaMonitorConfig        *monitor_config,
-                      GPtrArray                *crtc_infos,
-                      GPtrArray                *output_infos,
-                      GError                  **error)
-{
-  MetaMonitorSpec *monitor_spec = monitor_config->monitor_spec;
-  MetaMonitorModeSpec *monitor_mode_spec = monitor_config->mode_spec;
-  MetaMonitor *monitor;
-  MetaMonitorMode *monitor_mode;
-  MonitorAssignmentData data;
-
-  monitor = meta_monitor_manager_get_monitor_from_spec (manager, monitor_spec);
-  if (!monitor)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Configured monitor '%s %s' not found",
-                   monitor_spec->vendor, monitor_spec->product);
-      return FALSE;
-    }
-
-  monitor_mode = meta_monitor_get_mode_from_spec (monitor, monitor_mode_spec);
-  if (!monitor_mode)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid mode %dx%d (%f) for monitor '%s %s'",
-                   monitor_mode_spec->width, monitor_mode_spec->height,
-                   monitor_mode_spec->refresh_rate,
-                   monitor_spec->vendor, monitor_spec->product);
-      return FALSE;
-    }
-
-  data = (MonitorAssignmentData) {
-    .logical_monitor_config = logical_monitor_config,
-    .monitor_config = monitor_config,
-    .crtc_infos = crtc_infos,
-    .output_infos = output_infos
-  };
-  if (!meta_monitor_mode_foreach_crtc (monitor, monitor_mode,
-                                       assign_monitor_crtc,
-                                       &data,
-                                       error))
-    return FALSE;
-
-  return TRUE;
-}
-
-static gboolean
-assign_logical_monitor_crtcs (MetaMonitorManager       *manager,
-                              MetaLogicalMonitorConfig *logical_monitor_config,
-                              GPtrArray                *crtc_infos,
-                              GPtrArray                *output_infos,
-                              GError                  **error)
-{
-  GList *l;
-
-  for (l = logical_monitor_config->monitor_configs; l; l = l->next)
-    {
-      MetaMonitorConfig *monitor_config = l->data;
-
-      if (!assign_monitor_crtcs (manager,
-                                 logical_monitor_config,
-                                 monitor_config,
-                                 crtc_infos, output_infos,
-                                 error))
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
-gboolean
-meta_monitor_config_manager_assign (MetaMonitorManager *manager,
-                                    MetaMonitorsConfig *config,
-                                    GPtrArray         **out_crtc_infos,
-                                    GPtrArray         **out_output_infos,
-                                    GError            **error)
-{
-  GPtrArray *crtc_infos;
-  GPtrArray *output_infos;
-  GList *l;
-
-  crtc_infos =
-    g_ptr_array_new_with_free_func ((GDestroyNotify) meta_crtc_info_free);
-  output_infos =
-    g_ptr_array_new_with_free_func ((GDestroyNotify) meta_output_info_free);
-
-  for (l = config->logical_monitor_configs; l; l = l->next)
-    {
-      MetaLogicalMonitorConfig *logical_monitor_config = l->data;
-
-      if (!assign_logical_monitor_crtcs (manager, logical_monitor_config,
-                                         crtc_infos, output_infos,
-                                         error))
-        {
-          g_ptr_array_free (crtc_infos, TRUE);
-          g_ptr_array_free (output_infos, TRUE);
-          return FALSE;
-        }
-    }
-
-  *out_crtc_infos = crtc_infos;
-  *out_output_infos = output_infos;
-
-  return TRUE;
-}
-
-static MetaMonitorsConfigKey *
-create_key_for_current_state (MetaMonitorManager *monitor_manager)
-{
-  MetaMonitorsConfigKey *config_key;
-  GList *l;
-  GList *monitor_specs;
-
-  monitor_specs = NULL;
-  for (l = monitor_manager->monitors; l; l = l->next)
-    {
-      MetaMonitor *monitor = l->data;
-      MetaMonitorSpec *monitor_spec;
-
-      if (meta_monitor_is_laptop_panel (monitor) &&
-          meta_monitor_manager_is_lid_closed (monitor_manager))
-        continue;
-
-      monitor_spec = meta_monitor_spec_clone (meta_monitor_get_spec (monitor));
-      monitor_specs = g_list_prepend (monitor_specs, monitor_spec);
-    }
-
-  if (!monitor_specs)
-    return NULL;
-
-  monitor_specs = g_list_sort (monitor_specs,
-                               (GCompareFunc) meta_monitor_spec_compare);
-
-  config_key = g_new0 (MetaMonitorsConfigKey, 1);
-  *config_key = (MetaMonitorsConfigKey) {
-    .monitor_specs = monitor_specs
-  };
-
-  return config_key;
-}
-
-MetaMonitorsConfig *
-meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager)
-{
-  MetaMonitorsConfigKey *config_key;
-  MetaMonitorsConfig *config;
-
-  config_key = create_key_for_current_state (config_manager->monitor_manager);
-  if (!config_key)
-    return NULL;
-
-  config = meta_monitor_config_store_lookup (config_manager->config_store,
-                                             config_key);
-  meta_monitors_config_key_free (config_key);
-
-  return config;
-}
-
-typedef enum _MonitorMatchRule
-{
-  MONITOR_MATCH_ALL = 0,
-  MONITOR_MATCH_EXTERNAL = (1 << 0)
-} MonitorMatchRule;
-
-static MetaMonitor *
-find_monitor_with_highest_preferred_resolution (MetaMonitorManager *monitor_manager,
-                                                MonitorMatchRule    match_rule)
-{
-  GList *monitors;
-  GList *l;
-  int largest_area = 0;
-  MetaMonitor *largest_monitor = NULL;
-
-  monitors = meta_monitor_manager_get_monitors (monitor_manager);
-  for (l = monitors; l; l = l->next)
-    {
-      MetaMonitor *monitor = l->data;
-      MetaMonitorMode *mode;
-      int width, height;
-      int area;
-
-      if (match_rule & MONITOR_MATCH_EXTERNAL)
-        {
-          if (meta_monitor_is_laptop_panel (monitor))
-            continue;
-        }
-
-      mode = meta_monitor_get_preferred_mode (monitor);
-      meta_monitor_mode_get_resolution (mode, &width, &height);
-      area = width * height;
-
-      if (area > largest_area)
-        {
-          largest_area = area;
-          largest_monitor = monitor;
-        }
-    }
-
-  return largest_monitor;
-}
-
-/*
- * Try to find the primary monitor. The priority of classification is:
- *
- * 1. Find the primary monitor as reported by the underlying system,
- * 2. Find the laptop panel
- * 3. Find the external monitor with highest resolution
- *
- * If the laptop lid is closed, exclude the laptop panel from possible
- * alternatives, except if no other alternatives exist.
- */
-static MetaMonitor *
-find_primary_monitor (MetaMonitorManager *monitor_manager)
-{
-  MetaMonitor *monitor;
-
-  if (meta_monitor_manager_is_lid_closed (monitor_manager))
-    {
-      monitor = meta_monitor_manager_get_primary_monitor (monitor_manager);
-      if (monitor && !meta_monitor_is_laptop_panel (monitor))
-        return monitor;
-
-      monitor =
-        find_monitor_with_highest_preferred_resolution (monitor_manager,
-                                                        MONITOR_MATCH_EXTERNAL);
-      if (monitor)
-        return monitor;
-
-      return find_monitor_with_highest_preferred_resolution (monitor_manager,
-                                                             MONITOR_MATCH_ALL);
-    }
-  else
-    {
-      monitor = meta_monitor_manager_get_primary_monitor (monitor_manager);
-      if (monitor)
-        return monitor;
-
-      monitor = meta_monitor_manager_get_laptop_panel (monitor_manager);
-      if (monitor)
-        return monitor;
-
-      return find_monitor_with_highest_preferred_resolution (monitor_manager,
-                                                             MONITOR_MATCH_ALL);
-    }
-}
-
-static MetaMonitorConfig *
-create_monitor_config (MetaMonitor     *monitor,
-                       MetaMonitorMode *mode)
-{
-  MetaMonitorSpec *monitor_spec;
-  MetaMonitorModeSpec *mode_spec;
-  MetaMonitorConfig *monitor_config;
-
-  monitor_spec = meta_monitor_get_spec (monitor);
-  mode_spec = meta_monitor_mode_get_spec (mode);
-
-  monitor_config = g_new0 (MetaMonitorConfig, 1);
-  *monitor_config = (MetaMonitorConfig) {
-    .monitor_spec = meta_monitor_spec_clone (monitor_spec),
-    .mode_spec = g_memdup (mode_spec, sizeof (MetaMonitorModeSpec)),
-    .is_underscanning = meta_monitor_is_underscanning (monitor)
-  };
-
-  return monitor_config;
-}
-
-static MetaLogicalMonitorConfig *
-create_preferred_logical_monitor_config (MetaMonitor *monitor,
-                                         int          x,
-                                         int          y)
-{
-  MetaMonitorMode *mode;
-  int width, height;
-  MetaMonitorConfig *monitor_config;
-  MetaLogicalMonitorConfig *logical_monitor_config;
-
-  mode = meta_monitor_get_preferred_mode (monitor);
-  meta_monitor_mode_get_resolution (mode, &width, &height);
-  monitor_config = create_monitor_config (monitor, mode);
-
-  logical_monitor_config = g_new0 (MetaLogicalMonitorConfig, 1);
-  *logical_monitor_config = (MetaLogicalMonitorConfig) {
-    .layout = (MetaRectangle) {
-      .x = x,
-      .y = y,
-      .width = width,
-      .height = height
-    },
-    .monitor_configs = g_list_append (NULL, monitor_config)
-  };
-
-  return logical_monitor_config;
-}
-
-MetaMonitorsConfig *
-meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager)
-{
-  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
-  GList *logical_monitor_configs;
-  MetaMonitor *primary_monitor;
-  MetaLogicalMonitorConfig *primary_logical_monitor_config;
-  int x;
-  GList *monitors;
-  GList *l;
-
-  primary_monitor = find_primary_monitor (monitor_manager);
-  if (!primary_monitor)
-    return NULL;
-
-  primary_logical_monitor_config =
-    create_preferred_logical_monitor_config (primary_monitor, 0, 0);
-  primary_logical_monitor_config->is_primary = TRUE;
-  logical_monitor_configs = g_list_append (NULL,
-                                           primary_logical_monitor_config);
-
-  x = primary_logical_monitor_config->layout.width;
-  monitors = meta_monitor_manager_get_monitors (monitor_manager);
-  for (l = monitors; l; l = l->next)
-    {
-      MetaMonitor *monitor = l->data;
-      MetaLogicalMonitorConfig *logical_monitor_config;
-
-      if (monitor == primary_monitor)
-        continue;
-
-      if (meta_monitor_is_laptop_panel (monitor) &&
-          meta_monitor_manager_is_lid_closed (monitor_manager))
-        continue;
-
-      logical_monitor_config =
-        create_preferred_logical_monitor_config (monitor, x, 0);
-      logical_monitor_configs = g_list_append (logical_monitor_configs,
-                                               logical_monitor_config);
-
-      x += logical_monitor_config->layout.width;
-    }
-
-  return meta_monitors_config_new (logical_monitor_configs);
-}
-
-MetaMonitorsConfig *
-meta_monitor_config_manager_create_fallback (MetaMonitorConfigManager *config_manager)
-{
-  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
-  MetaMonitor *primary_monitor;
-  GList *logical_monitor_configs;
-  MetaLogicalMonitorConfig *primary_logical_monitor_config;
-
-  primary_monitor = find_primary_monitor (monitor_manager);
-  if (!primary_monitor)
-    return NULL;
-
-  primary_logical_monitor_config =
-    create_preferred_logical_monitor_config (primary_monitor, 0, 0);
-  primary_logical_monitor_config->is_primary = TRUE;
-  logical_monitor_configs = g_list_append (NULL,
-                                           primary_logical_monitor_config);
-
-  return meta_monitors_config_new (logical_monitor_configs);
-}
-
-MetaMonitorsConfig *
-meta_monitor_config_manager_create_suggested (MetaMonitorConfigManager *config_manager)
-{
-  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
-  MetaLogicalMonitorConfig *primary_logical_monitor_config = NULL;
-  MetaMonitor *primary_monitor;
-  GList *logical_monitor_configs;
-  GList *region;
-  GList *monitors;
-  GList *l;
-
-  primary_monitor = find_primary_monitor (monitor_manager);
-  if (!primary_monitor)
-    return NULL;
-
-  logical_monitor_configs = NULL;
-  region = NULL;
-  monitors = meta_monitor_manager_get_monitors (monitor_manager);
-  for (l = monitors; l; l = l->next)
-    {
-      MetaMonitor *monitor = l->data;
-      MetaLogicalMonitorConfig *logical_monitor_config;
-      int x, y;
-
-      if (!meta_monitor_get_suggested_position (monitor, &x, &y))
-        continue;
-
-      logical_monitor_config =
-        create_preferred_logical_monitor_config (monitor, x, y);
-      logical_monitor_configs = g_list_append (logical_monitor_configs,
-                                               logical_monitor_config);
-
-      if (meta_rectangle_overlaps_with_region (region,
-                                               &logical_monitor_config->layout))
-        {
-          g_warning ("Suggested monitor config has overlapping region, rejecting");
-          g_list_free (region);
-          g_list_free_full (logical_monitor_configs,
-                            (GDestroyNotify) meta_logical_monitor_config_free);
-          return NULL;
-        }
-
-      region = g_list_prepend (region, &logical_monitor_config->layout);
-
-      if (monitor == primary_monitor)
-        primary_logical_monitor_config = logical_monitor_config;
-    }
-
-  g_list_free (region);
-
-  if (!logical_monitor_configs)
-    return NULL;
-
-  if (!primary_logical_monitor_config)
-    primary_logical_monitor_config =
-      g_list_first (logical_monitor_configs)->data;
-
-  primary_logical_monitor_config->is_primary = TRUE;
-
-  return meta_monitors_config_new (logical_monitor_configs);
-}
-
-void
-meta_monitor_config_manager_set_current (MetaMonitorConfigManager *config_manager,
-                                         MetaMonitorsConfig       *config)
-{
-  g_set_object (&config_manager->current_config, config);
-}
-
-MetaMonitorsConfig *
-meta_monitor_config_manager_get_current (MetaMonitorConfigManager *config_manager)
-{
-  return config_manager->current_config;
-}
-
-static void
-meta_monitor_config_manager_dispose (GObject *object)
-{
-  MetaMonitorConfigManager *config_manager =
-    META_MONITOR_CONFIG_MANAGER (object);
-
-  g_clear_object (&config_manager->current_config);
-
-  G_OBJECT_CLASS (meta_monitor_config_manager_parent_class)->dispose (object);
-}
-
-static void
-meta_monitor_config_manager_init (MetaMonitorConfigManager *config_manager)
-{
-}
-
-static void
-meta_monitor_config_manager_class_init (MetaMonitorConfigManagerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = meta_monitor_config_manager_dispose;
-}
-
-void
-meta_monitor_config_free (MetaMonitorConfig *monitor_config)
-{
-  meta_monitor_spec_free (monitor_config->monitor_spec);
-  g_free (monitor_config->mode_spec);
-  g_free (monitor_config);
-}
-
-void
-meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor_config)
-{
-  g_list_free_full (logical_monitor_config->monitor_configs,
-                    (GDestroyNotify) meta_monitor_config_free);
-  g_free (logical_monitor_config);
-}
-
-static MetaMonitorsConfigKey *
-meta_monitors_config_key_new (GList *logical_monitor_configs)
-{
-  MetaMonitorsConfigKey *config_key;
-  GList *monitor_specs;
-  GList *l;
-
-  monitor_specs = NULL;
-  for (l = logical_monitor_configs; l; l = l->next)
-    {
-      MetaLogicalMonitorConfig *logical_monitor_config = l->data;
-      GList *k;
-
-      for (k = logical_monitor_config->monitor_configs; k; k = k->next)
-        {
-          MetaMonitorConfig *monitor_config = k->data;
-          MetaMonitorSpec *monitor_spec;
-
-          monitor_spec = meta_monitor_spec_clone (monitor_config->monitor_spec);
-          monitor_specs = g_list_prepend (monitor_specs, monitor_spec);
-        }
-    }
-
-  monitor_specs = g_list_sort (monitor_specs,
-                               (GCompareFunc) meta_monitor_spec_compare);
-
-  config_key = g_new0 (MetaMonitorsConfigKey, 1);
-  *config_key = (MetaMonitorsConfigKey) {
-    .monitor_specs = monitor_specs
-  };
-
-  return config_key;
-}
-
-void
-meta_monitors_config_key_free (MetaMonitorsConfigKey *config_key)
-{
-  g_list_free_full (config_key->monitor_specs,
-                    (GDestroyNotify) meta_monitor_spec_free);
-  g_free (config_key);
-}
-
-unsigned int
-meta_monitors_config_key_hash (gconstpointer data)
-{
-  const MetaMonitorsConfigKey *config_key = data;
-  GList *l;
-  unsigned long hash;
-
-  hash = 0;
-  for (l = config_key->monitor_specs; l; l = l->next)
-    {
-      MetaMonitorSpec *monitor_spec = l->data;
-
-      hash ^= (g_str_hash (monitor_spec->connector) ^
-               g_str_hash (monitor_spec->vendor) ^
-               g_str_hash (monitor_spec->product) ^
-               g_str_hash (monitor_spec->serial));
-    }
-
-  return hash;
-}
-
-gboolean
-meta_monitors_config_key_equal (gconstpointer data_a,
-                                gconstpointer data_b)
-{
-  const MetaMonitorsConfigKey *config_key_a = data_a;
-  const MetaMonitorsConfigKey *config_key_b = data_b;
-  GList *l_a, *l_b;
-
-  for (l_a = config_key_a->monitor_specs, l_b = config_key_b->monitor_specs;
-       l_a && l_b;
-       l_a = l_a->next, l_b = l_b->next)
-    {
-      MetaMonitorSpec *monitor_spec_a = l_a->data;
-      MetaMonitorSpec *monitor_spec_b = l_b->data;
-
-      if (!meta_monitor_spec_equals (monitor_spec_a, monitor_spec_b))
-        return FALSE;
-    }
-
-  if (l_b || l_b)
-    return FALSE;
-
-  return TRUE;
-}
-
-MetaMonitorsConfig *
-meta_monitors_config_new (GList *logical_monitor_configs)
-{
-  MetaMonitorsConfig *config;
-
-  config = g_object_new (META_TYPE_MONITORS_CONFIG, NULL);
-  config->logical_monitor_configs = logical_monitor_configs;
-  config->key = meta_monitors_config_key_new (logical_monitor_configs);
-
-  return config;
-}
-
-static void
-meta_monitors_config_finalize (GObject *object)
-{
-  MetaMonitorsConfig *config = META_MONITORS_CONFIG (object);
-
-  meta_monitors_config_key_free (config->key);
-  g_list_free_full (config->logical_monitor_configs,
-                    (GDestroyNotify) meta_logical_monitor_config_free);
-}
-
-static void
-meta_monitors_config_init (MetaMonitorsConfig *config)
-{
-}
-
-static void
-meta_monitors_config_class_init (MetaMonitorsConfigClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = meta_monitors_config_finalize;
-}

src/backends/meta-monitor-config-manager.h

@@ -1,100 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2016 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_MONITOR_CONFIG_MANAGER_H
-#define META_MONITOR_CONFIG_MANAGER_H
-
-#include "backends/meta-monitor.h"
-#include "backends/meta-monitor-manager-private.h"
-
-#define META_TYPE_MONITOR_CONFIG_MANAGER (meta_monitor_config_manager_get_type ())
-G_DECLARE_FINAL_TYPE (MetaMonitorConfigManager, meta_monitor_config_manager,
-                      META, MONITOR_CONFIG_MANAGER, GObject)
-
-typedef struct _MetaMonitorConfig
-{
-  MetaMonitorSpec *monitor_spec;
-  MetaMonitorModeSpec *mode_spec;
-  gboolean is_underscanning;
-} MetaMonitorConfig;
-
-typedef struct _MetaLogicalMonitorConfig
-{
-  MetaRectangle layout;
-  GList *monitor_configs;
-  gboolean is_primary;
-  gboolean is_presentation;
-} MetaLogicalMonitorConfig;
-
-typedef struct _MetaMonitorsConfigKey
-{
-  GList *monitor_specs;
-} MetaMonitorsConfigKey;
-
-struct _MetaMonitorsConfig
-{
-  GObject parent;
-
-  MetaMonitorsConfigKey *key;
-  GList *logical_monitor_configs;
-};
-
-#define META_TYPE_MONITORS_CONFIG (meta_monitors_config_get_type ())
-G_DECLARE_FINAL_TYPE (MetaMonitorsConfig, meta_monitors_config,
-                      META, MONITORS_CONFIG, GObject)
-
-MetaMonitorConfigManager * meta_monitor_config_manager_new (MetaMonitorManager *monitor_manager);
-
-MetaMonitorConfigStore * meta_monitor_config_manager_get_store (MetaMonitorConfigManager *config_manager);
-
-gboolean meta_monitor_config_manager_assign (MetaMonitorManager *manager,
-                                             MetaMonitorsConfig *config,
-                                             GPtrArray         **crtc_infos,
-                                             GPtrArray         **output_infos,
-                                             GError            **error);
-
-MetaMonitorsConfig * meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager);
-
-MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);
-
-MetaMonitorsConfig * meta_monitor_config_manager_create_fallback (MetaMonitorConfigManager *config_manager);
-
-MetaMonitorsConfig * meta_monitor_config_manager_create_suggested (MetaMonitorConfigManager *config_manager);
-
-void meta_monitor_config_manager_set_current (MetaMonitorConfigManager *config_manager,
-                                              MetaMonitorsConfig       *config);
-
-MetaMonitorsConfig * meta_monitor_config_manager_get_current (MetaMonitorConfigManager *config_manager);
-
-MetaMonitorsConfig * meta_monitors_config_new (GList *logical_monitor_configs);
-
-unsigned int meta_monitors_config_key_hash (gconstpointer config_key);
-
-gboolean meta_monitors_config_key_equal (gconstpointer config_key_a,
-                                         gconstpointer config_key_b);
-
-void meta_monitors_config_key_free (MetaMonitorsConfigKey *config_key);
-
-void meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor_config);
-
-void meta_monitor_config_free (MetaMonitorConfig *monitor_config);
-
-#endif /* META_MONITOR_CONFIG_MANAGER_H */

src/backends/meta-monitor-config-store.c

@@ -1,986 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2017 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include "backends/meta-monitor-config-store.h"
-
-#include <gio/gio.h>
-#include <string.h>
-
-#include "backends/meta-monitor-config-manager.h"
-#include "core/boxes-private.h"
-
-/*
- * Example configuration:
- *
- * <monitors version="2">
- *   <configuration>
- *     <logicalmonitor>
- *       <x>0</x>
- *       <y>0</y>
- *       <monitor>
- *         <monitorspec>
- *           <connector>LVDS1</connector>
- *           <vendor>Vendor A</vendor>
- *           <product>Product A</product>
- *           <serial>Serial A</serial>
- *         </monitorspec>
- *         <mode>
- *           <width>1920</width>
- *           <height>1080</height>
- *           <rate>60.049972534179688</rate>
- *         </mode>
- *       </monitor>
- *       <primary>yes</primary>
- *       <presentation>no</presentation>
- *     </logicalmonitor>
- *     <logicalmonitor>
- *       <x>1920</x>
- *       <y>1080</y>
- *       <monitor>
- *         <monitorspec>
- *           <connector>LVDS2</connector>
- *           <vendor>Vendor B</vendor>
- *           <product>Product B</product>
- *           <serial>Serial B</serial>
- *         </monitorspec>
- *         <mode>
- *           <width>1920</width>
- *           <height>1080</height>
- *           <rate>60.049972534179688</rate>
- *         </mode>
- *         <underscanning>yes</underscanning>
- *       </monitor>
- *       <presentation>yes</presentation>
- *     </logicalmonitor>
- *   </configuration>
- * </monitors>
- *
- */
-
-struct _MetaMonitorConfigStore
-{
-  GObject parent;
-
-  GHashTable *configs;
-};
-
-typedef enum
-{
-  STATE_INITIAL,
-  STATE_MONITORS,
-  STATE_CONFIGURATION,
-  STATE_LOGICAL_MONITOR,
-  STATE_LOGICAL_MONITOR_X,
-  STATE_LOGICAL_MONITOR_Y,
-  STATE_LOGICAL_MONITOR_PRIMARY,
-  STATE_LOGICAL_MONITOR_PRESENTATION,
-  STATE_MONITOR,
-  STATE_MONITOR_SPEC,
-  STATE_MONITOR_SPEC_CONNECTOR,
-  STATE_MONITOR_SPEC_VENDOR,
-  STATE_MONITOR_SPEC_PRODUCT,
-  STATE_MONITOR_SPEC_SERIAL,
-  STATE_MONITOR_MODE,
-  STATE_MONITOR_MODE_WIDTH,
-  STATE_MONITOR_MODE_HEIGHT,
-  STATE_MONITOR_MODE_RATE,
-  STATE_MONITOR_UNDERSCANNING
-} ParserState;
-
-typedef struct
-{
-  ParserState state;
-  MetaMonitorConfigStore *config_store;
-
-  GList *current_logical_monitor_configs;
-  MetaMonitorSpec *current_monitor_spec;
-  MetaMonitorModeSpec *current_monitor_mode_spec;
-  MetaMonitorConfig *current_monitor_config;
-  MetaLogicalMonitorConfig *current_logical_monitor_config;
-} ConfigParser;
-
-G_DEFINE_TYPE (MetaMonitorConfigStore, meta_monitor_config_store,
-               G_TYPE_OBJECT)
-
-static void
-handle_start_element (GMarkupParseContext  *context,
-                      const char           *element_name,
-                      const char          **attribute_names,
-                      const char          **attribute_values,
-                      gpointer              user_data,
-                      GError              **error)
-{
-  ConfigParser *parser = user_data;
-
-  switch (parser->state)
-    {
-    case STATE_INITIAL:
-      {
-        char *version;
-
-        if (!g_str_equal (element_name, "monitors"))
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                         "Invalid document element '%s'", element_name);
-            return;
-          }
-
-        if (!g_markup_collect_attributes (element_name, attribute_names, attribute_values,
-                                          error,
-                                          G_MARKUP_COLLECT_STRING, "version", &version,
-                                          G_MARKUP_COLLECT_INVALID))
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                         "Missing config file format version");
-          }
-        
-        /* TODO: Handle converting version 1 configuration files. */
-
-        if (!g_str_equal (version, "2"))
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                         "Invalid or unsupported version '%s'", version);
-            return;
-          }
-
-        parser->state = STATE_MONITORS;
-        return;
-      }
-
-    case STATE_MONITORS:
-      {
-        if (!g_str_equal (element_name, "configuration"))
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                         "Invalid toplevel element '%s'", element_name);
-            return;
-          }
-
-        parser->state = STATE_CONFIGURATION;
-        return;
-      }
-
-    case STATE_CONFIGURATION:
-      {
-        if (!g_str_equal (element_name, "logicalmonitor"))
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                         "Invalid configuration element '%s'", element_name);
-            return;
-          }
-
-        parser->current_logical_monitor_config =
-          g_new0 (MetaLogicalMonitorConfig, 1);
-
-        parser->state = STATE_LOGICAL_MONITOR;
-        return;
-      }
-
-    case STATE_LOGICAL_MONITOR:
-      {
-        if (g_str_equal (element_name, "x"))
-          {
-            parser->state = STATE_LOGICAL_MONITOR_X;
-          }
-        else if (g_str_equal (element_name, "y"))
-          {
-            parser->state = STATE_LOGICAL_MONITOR_Y;
-          }
-        else if (g_str_equal (element_name, "primary"))
-          {
-            parser->state = STATE_LOGICAL_MONITOR_PRIMARY;
-          }
-        else if (g_str_equal (element_name, "presentation"))
-          {
-            parser->state = STATE_LOGICAL_MONITOR_PRESENTATION;
-          }
-        else if (g_str_equal (element_name, "monitor"))
-          {
-            parser->current_monitor_config = g_new0 (MetaMonitorConfig, 1);;
-
-            parser->state = STATE_MONITOR;
-          }
-        else
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                         "Invalid monitor logicalmonitor element '%s'", element_name);
-            return;
-          }
-
-        return;
-      }
-
-    case STATE_LOGICAL_MONITOR_X:
-    case STATE_LOGICAL_MONITOR_Y:
-    case STATE_LOGICAL_MONITOR_PRIMARY:
-    case STATE_LOGICAL_MONITOR_PRESENTATION:
-      {
-        g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                     "Invalid logical monitor element '%s'", element_name);
-        return;
-      }
-
-    case STATE_MONITOR:
-      {
-        if (g_str_equal (element_name, "monitorspec"))
-          {
-            parser->current_monitor_spec = g_new0 (MetaMonitorSpec, 1);
-
-            parser->state = STATE_MONITOR_SPEC;
-          }
-        else if (g_str_equal (element_name, "mode"))
-          {
-            parser->current_monitor_mode_spec = g_new0 (MetaMonitorModeSpec, 1);
-
-            parser->state = STATE_MONITOR_MODE;
-          }
-        else if (g_str_equal (element_name, "underscanning"))
-          {
-            parser->state = STATE_MONITOR_UNDERSCANNING;
-          }
-        else
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                         "Invalid monitor element '%s'", element_name);
-            return;
-          }
-
-        return;
-      }
-
-    case STATE_MONITOR_SPEC:
-      {
-        if (g_str_equal (element_name, "connector"))
-          {
-            parser->state = STATE_MONITOR_SPEC_CONNECTOR;
-          }
-        else if (g_str_equal (element_name, "vendor"))
-          {
-            parser->state = STATE_MONITOR_SPEC_VENDOR;
-          }
-        else if (g_str_equal (element_name, "product"))
-          {
-            parser->state = STATE_MONITOR_SPEC_PRODUCT;
-          }
-        else if (g_str_equal (element_name, "serial"))
-          {
-            parser->state = STATE_MONITOR_SPEC_SERIAL;
-          }
-        else
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                         "Invalid monitor spec element '%s'", element_name);
-            return;
-          }
-
-        return;
-      }
-
-    case STATE_MONITOR_SPEC_CONNECTOR:
-    case STATE_MONITOR_SPEC_VENDOR:
-    case STATE_MONITOR_SPEC_PRODUCT:
-    case STATE_MONITOR_SPEC_SERIAL:
-      {
-        g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                     "Invalid monitor spec element '%s'", element_name);
-        return;
-      }
-
-    case STATE_MONITOR_MODE:
-      {
-        if (g_str_equal (element_name, "width"))
-          {
-            parser->state = STATE_MONITOR_MODE_WIDTH;
-          }
-        else if (g_str_equal (element_name, "height"))
-          {
-            parser->state = STATE_MONITOR_MODE_HEIGHT;
-          }
-        else if (g_str_equal (element_name, "rate"))
-          {
-            parser->state = STATE_MONITOR_MODE_RATE;
-          }
-        else
-          {
-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                         "Invalid mode element '%s'", element_name);
-            return;
-          }
-
-        return;
-      }
-
-    case STATE_MONITOR_MODE_WIDTH:
-    case STATE_MONITOR_MODE_HEIGHT:
-    case STATE_MONITOR_MODE_RATE:
-      {
-        g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                     "Invalid mode sub element '%s'", element_name);
-        return;
-      }
-
-    case STATE_MONITOR_UNDERSCANNING:
-      {
-        g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                     "Invalid element '%s' under underscanning", element_name);
-        return;
-      }
-    }
-}
-
-static gboolean
-verify_monitor_spec (MetaMonitorSpec *monitor_spec,
-                     GError         **error)
-{
-  if (monitor_spec->connector &&
-      monitor_spec->vendor &&
-      monitor_spec->product &&
-      monitor_spec->serial)
-    {
-      return TRUE;
-    }
-  else
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Monitor spec incomplete");
-      return FALSE;
-    }
-}
-
-static gboolean
-verify_monitor_mode (MetaMonitorModeSpec *monitor_mode_spec,
-                     GError             **error)
-{
-  if (monitor_mode_spec->width > 0 &&
-      monitor_mode_spec->height > 0 &&
-      monitor_mode_spec->refresh_rate > 0.0f)
-    {
-      return TRUE;
-    }
-  else
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Monitor mode invalid");
-      return FALSE;
-    }
-}
-
-static gboolean
-verify_monitor_config (MetaMonitorConfig *monitor_config,
-                       GError           **error)
-{
-  if (monitor_config->monitor_spec && monitor_config->mode_spec)
-    {
-      return TRUE;
-    }
-  else
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Monitor config incomplete");
-      return FALSE;
-    }
-}
-
-static gboolean
-verify_logical_monitor_config (MetaLogicalMonitorConfig *logical_monitor_config,
-                               GError                  **error)
-{
-  if (logical_monitor_config->layout.x < 0 ||
-      logical_monitor_config->layout.y < 0)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid logical monitor position (%d, %d)",
-                   logical_monitor_config->layout.x,
-                   logical_monitor_config->layout.y);
-      return FALSE;
-    }
-
-  if (!logical_monitor_config->monitor_configs)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Logical monitor is empty");
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static gboolean
-derive_logical_monitor_layout (MetaLogicalMonitorConfig *logical_monitor_config,
-                               GError                  **error)
-{
-  MetaMonitorConfig *monitor_config;
-  int mode_width, mode_height;
-  GList *l;
-
-  monitor_config = logical_monitor_config->monitor_configs->data;
-  mode_width = monitor_config->mode_spec->width;
-  mode_height = monitor_config->mode_spec->height;
-
-  for (l = logical_monitor_config->monitor_configs->next; l; l = l->next)
-    {
-      monitor_config = l->data;
-
-      if (monitor_config->mode_spec->width != mode_width ||
-          monitor_config->mode_spec->height != mode_height)
-        {
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Monitors in logical monitor incompatible");
-          return FALSE;
-        }
-    }
-
-  logical_monitor_config->layout.width = mode_width;
-  logical_monitor_config->layout.height = mode_height;
-
-  return TRUE;
-}
-
-static gboolean
-verify_config (MetaMonitorsConfig *config,
-               GError            **error)
-{
-  gboolean has_primary;
-  GList *region;
-  GList *l;
-
-  if (!config->logical_monitor_configs)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Monitors config incomplete");
-      return FALSE;
-    }
-
-  region = NULL;
-  has_primary = FALSE;
-  for (l = config->logical_monitor_configs; l; l = l->next)
-    {
-      MetaLogicalMonitorConfig *logical_monitor_config = l->data;
-
-      if (meta_rectangle_overlaps_with_region (region,
-                                               &logical_monitor_config->layout))
-        {
-          g_list_free (region);
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Logical monitors overlap");
-          return FALSE;
-        }
-
-      if (has_primary && logical_monitor_config->is_primary)
-        {
-          g_list_free (region);
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Config contains multiple primary logical monitors");
-          return FALSE;
-        }
-      else if (logical_monitor_config->is_primary)
-        {
-          has_primary = TRUE;
-        }
-
-      region = g_list_prepend (region, &logical_monitor_config->layout);
-    }
-
-  g_list_free (region);
-
-  if (!has_primary)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Config is missing primary logical");
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static void
-handle_end_element (GMarkupParseContext  *context,
-                    const char           *element_name,
-                    gpointer              user_data,
-                    GError              **error)
-{
-  ConfigParser *parser = user_data;
-
-  switch (parser->state)
-    {
-    case STATE_LOGICAL_MONITOR_X:
-    case STATE_LOGICAL_MONITOR_Y:
-    case STATE_LOGICAL_MONITOR_PRIMARY:
-    case STATE_LOGICAL_MONITOR_PRESENTATION:
-      {
-        parser->state = STATE_LOGICAL_MONITOR;
-        return;
-      }
-
-    case STATE_MONITOR_SPEC_CONNECTOR:
-    case STATE_MONITOR_SPEC_VENDOR:
-    case STATE_MONITOR_SPEC_PRODUCT:
-    case STATE_MONITOR_SPEC_SERIAL:
-      {
-        parser->state = STATE_MONITOR_SPEC;
-        return;
-      }
-
-    case STATE_MONITOR_SPEC:
-      {
-        g_assert (g_str_equal (element_name, "monitorspec"));
-
-        if (!verify_monitor_spec (parser->current_monitor_spec, error))
-          return;
-
-        parser->current_monitor_config->monitor_spec =
-          parser->current_monitor_spec;
-        parser->current_monitor_spec = NULL;
-
-        parser->state = STATE_MONITOR;
-        return;
-      }
-
-    case STATE_MONITOR_MODE_WIDTH:
-    case STATE_MONITOR_MODE_HEIGHT:
-    case STATE_MONITOR_MODE_RATE:
-      {
-        parser->state = STATE_MONITOR_MODE;
-        return;
-      }
-
-    case STATE_MONITOR_MODE:
-      {
-        g_assert (g_str_equal (element_name, "mode"));
-
-        if (!verify_monitor_mode (parser->current_monitor_mode_spec, error))
-          return;
-
-        parser->current_monitor_config->mode_spec =
-          parser->current_monitor_mode_spec;
-        parser->current_monitor_mode_spec = NULL;
-
-        parser->state = STATE_MONITOR;
-        return;
-      }
-
-    case STATE_MONITOR_UNDERSCANNING:
-      {
-        g_assert (g_str_equal (element_name, "underscanning"));
-
-        parser->state = STATE_MONITOR;
-        return;
-      }
-
-    case STATE_MONITOR:
-      {
-        MetaLogicalMonitorConfig *logical_monitor_config;
-
-        g_assert (g_str_equal (element_name, "monitor"));
-
-        if (!verify_monitor_config (parser->current_monitor_config, error))
-          return;
-
-        logical_monitor_config = parser->current_logical_monitor_config;
-
-        logical_monitor_config->monitor_configs =
-          g_list_append (logical_monitor_config->monitor_configs,
-                         parser->current_monitor_config);
-        parser->current_monitor_config = NULL;
-
-        parser->state = STATE_LOGICAL_MONITOR;
-        return;
-      }
-
-    case STATE_LOGICAL_MONITOR:
-      {
-        MetaLogicalMonitorConfig *logical_monitor_config =
-          parser->current_logical_monitor_config;
-
-        g_assert (g_str_equal (element_name, "logicalmonitor"));
-
-        if (!verify_logical_monitor_config (logical_monitor_config, error))
-          return;
-
-        if (!derive_logical_monitor_layout (logical_monitor_config, error))
-          return;
-
-        parser->current_logical_monitor_configs =
-          g_list_append (parser->current_logical_monitor_configs,
-                         logical_monitor_config);
-        parser->current_logical_monitor_config = NULL;
-
-        parser->state = STATE_CONFIGURATION;
-        return;
-      }
-
-    case STATE_CONFIGURATION:
-      {
-        MetaMonitorsConfig *config;
-
-        g_assert (g_str_equal (element_name, "configuration"));
-
-        config =
-          meta_monitors_config_new (parser->current_logical_monitor_configs);
-
-        if (!verify_config (config, error))
-          {
-            g_object_unref (config);
-            return;
-          }
-
-        g_hash_table_replace (parser->config_store->configs,
-                              config->key, config);
-
-        parser->current_logical_monitor_configs = NULL;
-
-        parser->state = STATE_MONITORS;
-        return;
-      }
-
-    case STATE_MONITORS:
-      {
-        g_assert (g_str_equal (element_name, "monitors"));
-
-        parser->state = STATE_INITIAL;
-        return;
-      }
-
-    case STATE_INITIAL:
-      {
-        g_assert_not_reached ();
-      }
-    }
-}
-
-static gboolean
-read_int (const char  *text,
-          gsize        text_len,
-          gint        *out_value,
-          GError     **error)
-{
-  char buf[64];
-  int64_t value;
-  char *end;
-
-  strncpy (buf, text, text_len);
-  buf[MIN (63, text_len)] = 0;
-
-  value = g_ascii_strtoll (buf, &end, 10);
-
-  if (*end || value < 0 || value > G_MAXINT16)
-    {
-      g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                   "Expected a number, got %s", buf);
-      return FALSE;
-    }
-  else
-    {
-      *out_value = value;
-      return TRUE;
-    }
-}
-
-static gboolean
-read_float (const char  *text,
-            gsize        text_len,
-            float       *out_value,
-            GError     **error)
-{
-  char buf[64];
-  float value;
-  char *end;
-
-  strncpy (buf, text, text_len);
-  buf[MIN (63, text_len)] = 0;
-
-  value = g_ascii_strtod (buf, &end);
-
-  if (*end)
-    {
-      g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                   "Expected a number, got %s", buf);
-      return FALSE;
-    }
-  else
-    {
-      *out_value = value;
-      return TRUE;
-    }
-}
-
-static gboolean
-read_bool (const char  *text,
-           gsize        text_len,
-           gboolean    *out_value,
-           GError     **error)
-{
-  if (strncmp (text, "no", text_len) == 0)
-    {
-      *out_value = FALSE;
-      return TRUE;
-    }
-  else if (strncmp (text, "yes", text_len) == 0)
-    {
-      *out_value = TRUE;
-      return TRUE;
-    }
-  else
-    {
-      g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                   "Invalid boolean value '%.*s'", (int) text_len, text);
-      return FALSE;
-    }
-}
-
-static gboolean
-is_all_whitespace (const char *text,
-                   gsize       text_len)
-{
-  gsize i;
-
-  for (i = 0; i < text_len; i++)
-    if (!g_ascii_isspace (text[i]))
-      return FALSE;
-
-  return TRUE;
-}
-
-static void
-handle_text (GMarkupParseContext *context,
-             const gchar         *text,
-             gsize                text_len,
-             gpointer             user_data,
-             GError             **error)
-{
-  ConfigParser *parser = user_data;
-
-  switch (parser->state)
-    {
-    case STATE_INITIAL:
-    case STATE_MONITORS:
-    case STATE_CONFIGURATION:
-    case STATE_LOGICAL_MONITOR:
-    case STATE_MONITOR:
-    case STATE_MONITOR_SPEC:
-    case STATE_MONITOR_MODE:
-      {
-        if (!is_all_whitespace (text, text_len))
-          g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                       "Unexpected content at this point");
-        return;
-      }
-
-    case STATE_MONITOR_SPEC_CONNECTOR:
-      {
-        parser->current_monitor_spec->connector = g_strndup (text, text_len);
-        return;
-      }
-
-    case STATE_MONITOR_SPEC_VENDOR:
-      {
-        parser->current_monitor_spec->vendor = g_strndup (text, text_len);
-        return;
-      }
-
-    case STATE_MONITOR_SPEC_PRODUCT:
-      {
-        parser->current_monitor_spec->product = g_strndup (text, text_len);
-        return;
-      }
-
-    case STATE_MONITOR_SPEC_SERIAL:
-      {
-        parser->current_monitor_spec->serial = g_strndup (text, text_len);
-        return;
-      }
-
-    case STATE_LOGICAL_MONITOR_X:
-      {
-        read_int (text, text_len,
-                  &parser->current_logical_monitor_config->layout.x, error);
-        return;
-      }
-
-    case STATE_LOGICAL_MONITOR_Y:
-      {
-        read_int (text, text_len,
-                  &parser->current_logical_monitor_config->layout.y, error);
-        return;
-      }
-
-    case STATE_LOGICAL_MONITOR_PRIMARY:
-      {
-        read_bool (text, text_len,
-                   &parser->current_logical_monitor_config->is_primary,
-                   error);
-        return;
-      }
-
-    case STATE_LOGICAL_MONITOR_PRESENTATION:
-      {
-        read_bool (text, text_len,
-                   &parser->current_logical_monitor_config->is_presentation,
-                   error);
-        return;
-      }
-
-    case STATE_MONITOR_MODE_WIDTH:
-      {
-        read_int (text, text_len,
-                  &parser->current_monitor_mode_spec->width,
-                  error);
-        return;
-      }
-
-    case STATE_MONITOR_MODE_HEIGHT:
-      {
-        read_int (text, text_len,
-                  &parser->current_monitor_mode_spec->height,
-                  error);
-        return;
-      }
-
-    case STATE_MONITOR_MODE_RATE:
-      {
-        read_float (text, text_len,
-                    &parser->current_monitor_mode_spec->refresh_rate,
-                    error);
-        return;
-      }
-
-    case STATE_MONITOR_UNDERSCANNING:
-      {
-        read_bool (text, text_len,
-                   &parser->current_monitor_config->is_underscanning,
-                   error);
-        return;
-      }
-    }
-}
-
-static const GMarkupParser config_parser = {
-  .start_element = handle_start_element,
-  .end_element = handle_end_element,
-  .text = handle_text
-};
-
-static gboolean
-read_config_file (MetaMonitorConfigStore *config_store,
-                  GFile                  *file,
-                  GError                **error)
-{
-  char *buffer;
-  gsize size;
-  ConfigParser parser;
-  GMarkupParseContext *parse_context;
-
-  if (!g_file_load_contents (file, NULL, &buffer, &size, NULL, error))
-    return FALSE;
-
-  parser = (ConfigParser) {
-    .state = STATE_INITIAL,
-    .config_store = config_store
-  };
-
-  parse_context = g_markup_parse_context_new (&config_parser,
-                                              G_MARKUP_TREAT_CDATA_AS_TEXT |
-                                              G_MARKUP_PREFIX_ERROR_POSITION,
-                                              &parser, NULL);
-  if (!g_markup_parse_context_parse (parse_context, buffer, size, error))
-    {
-      g_list_free_full (parser.current_logical_monitor_configs,
-                        (GDestroyNotify) meta_logical_monitor_config_free);
-      g_clear_pointer (&parser.current_monitor_spec,
-                       meta_monitor_spec_free);
-      g_free (parser.current_monitor_mode_spec);
-      g_clear_pointer (&parser.current_monitor_config,
-                      meta_monitor_config_free);
-      g_clear_pointer (&parser.current_logical_monitor_config,
-                       meta_logical_monitor_config_free);
-      return FALSE;
-    }
-
-  g_markup_parse_context_free (parse_context);
-  g_free (buffer);
-
-  return TRUE;
-}
-
-MetaMonitorsConfig *
-meta_monitor_config_store_lookup (MetaMonitorConfigStore *config_store,
-                                  MetaMonitorsConfigKey  *key)
-{
-  return META_MONITORS_CONFIG (g_hash_table_lookup (config_store->configs,
-                                                    key));
-}
-
-void
-meta_monitor_config_store_add (MetaMonitorConfigStore *config_store,
-                               MetaMonitorsConfig     *config)
-{
-  g_hash_table_insert (config_store->configs,
-                       config->key, g_object_ref (config));
-}
-
-gboolean
-meta_monitor_config_store_set_custom (MetaMonitorConfigStore *config_store,
-                                      const char             *path,
-                                      GError                **error)
-{
-  g_autoptr (GFile) custom_file = NULL;
-
-  g_hash_table_remove_all (config_store->configs);
-
-  custom_file = g_file_new_for_path (path);
-
-  return read_config_file (config_store, custom_file, error);
-}
-
-int
-meta_monitor_config_store_get_config_count (MetaMonitorConfigStore *config_store)
-{
-  return (int) g_hash_table_size (config_store->configs);
-}
-
-static void
-meta_monitor_config_store_dispose (GObject *object)
-{
-  MetaMonitorConfigStore *config_store = META_MONITOR_CONFIG_STORE (object);
-
-  g_clear_pointer (&config_store->configs, g_hash_table_destroy);
-
-  G_OBJECT_CLASS (meta_monitor_config_store_parent_class)->dispose (object);
-}
-
-static void
-meta_monitor_config_store_init (MetaMonitorConfigStore *config_store)
-{
-  config_store->configs = g_hash_table_new_full (meta_monitors_config_key_hash,
-                                                 meta_monitors_config_key_equal,
-                                                 NULL,
-                                                 g_object_unref);
-}
-
-static void
-meta_monitor_config_store_class_init (MetaMonitorConfigStoreClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = meta_monitor_config_store_dispose;
-}

src/backends/meta-monitor-config-store.h

@@ -1,45 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2017 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_MONITOR_CONFIG_STORE_H
-#define META_MONITOR_CONFIG_STORE_H
-
-#include <glib-object.h>
-
-#include "backends/meta-monitor-config-manager.h"
-
-#define META_TYPE_MONITOR_CONFIG_STORE (meta_monitor_config_store_get_type ())
-G_DECLARE_FINAL_TYPE (MetaMonitorConfigStore, meta_monitor_config_store,
-                      META, MONITOR_CONFIG_STORE, GObject)
-
-MetaMonitorsConfig * meta_monitor_config_store_lookup (MetaMonitorConfigStore *config_store,
-                                                       MetaMonitorsConfigKey  *key);
-
-void meta_monitor_config_store_add (MetaMonitorConfigStore *config_store,
-                                    MetaMonitorsConfig     *config);
-
-gboolean meta_monitor_config_store_set_custom (MetaMonitorConfigStore *config_store,
-                                               const char             *path,
-                                               GError                **error);
-
-int meta_monitor_config_store_get_config_count (MetaMonitorConfigStore *config_store);
-
-#endif /* META_MONITOR_CONFIG_STORE_H */