Bump version to 3.16.1.1

Update NEWS.

.gitignore

@@ -44,6 +44,9 @@ po/*.pot
 libmutter.pc
 mutter
 mutter-restart-helper
+mutter-test-client
+mutter-test-runner
+mutter-all.test
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
 org.gnome.mutter.wayland.gschema.valid

NEWS

@@ -1,3 +1,227 @@
+3.16.1.1
+========
+* Prevent a crash when switching VTs or adding input devices [Carlos; #747886]
+
+Contributors:
+  Carlos Garnacho
+
+3.16.1
+======
+* Add function to refresh all background instances [Rui; #739178]
+* Fix swapped scroll methods on wayland [Ondrej; #746870]
+* Manually activate stage to fix accessibility on wayland [Ray, Rui; #746670]
+* Center pointer on primary monitor on startup [Carlos; #746896]
+* wayland: Reword synchronized state application semantics [Jonas; #743617]
+* Ensure input settings are applied on startup [Rui; #747434]
+* Misc. bug fixes [Jonas, Giovanni, Calvin, Ray, Rui; #744932, #746509, #746692,
+  #746510, #746545, #747263]
+
+Contributors:
+  Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Ondrej Holy, Rui Matos,
+  Jasper St. Pierre, Ray Strode, Calvin Walton
+
+Translations:
+  Khaled Hosny [ar], Marek Černocký [cs]
+
+3.16.0
+======
+* wayland: Don't skip notifying about initial maximized state [Jonas; #745303]
+
+Contributors:
+  Jonas Ådahl
+
+Translations:
+  Kjartan Maraas [nb], Jiri Grönroos [fi], Andika Triwidada [id],
+  Inaki Larranaga Murgoitio [eu], Ask H. Larsen [da], Muhammet Kara [tr]
+
+3.15.92
+=======
+* Ensure pointer visibility on monitor changes [Rui, Marek; #745121, #745752]
+* Fix geometry of shaded windows [Florian; #746145]
+* Take over cursor visibility handling from gsd [Carlos; #712775]
+* Fix touch interaction on window decorations [Carlos; #745335]
+* Add options for libinput_config_click_method [Carlos; #746290]
+* Scale window decorations on HiDPI displays [Florian; #744354]
+* Misc. bug fixes [Carlos, Ray, Rui; #745163, #746295, #746098, #745734]
+
+Contributors:
+  Marek Chalupa, Carlos Garnacho, Rui Matos, Florian Müllner,
+  Jasper St. Pierre, Ray Strode
+
+Translations:
+  Piotr Drąg [pl], Milo Casagrande [it], Changwoo Ryu [ko],
+  Daniel Korostil [uk], Baurzhan Muftakhidinov [kk], Trần Ngọc Quân [vi],
+  Alexander Shopov [bg], Jordi Mas [ca], Samir Ribic [bs], A S Alam [pa],
+  Matej Urbančič [sl]
+
+3.15.91
+=======
+* wayland: Fix nested compositor mode [Jonas; #745401]
+* wayland: Fix pointer constraining [Marek; #727337]
+* wayland: Fix input region on HiDPI [Jonas; #744933]
+* Allow themes to style buttons differently based on function [Horst; #745108]
+* Misc. bug fixes and cleanups [Ray, Rui, Alban; #745141, #745118, #745476,
+  #745442]
+
+Contributors:
+  Jonas Ådahl, Alban Browaeys, Marek Chalupa, Horst, Rui Matos,
+  Jasper St. Pierre, Ray Strode
+
+Translations:
+  Chao-Hsiung Liao [zh_TW], Efstathios Iosifidis [el], Dušan Kazik [sk],
+  Balázs Úr [hu], Daniel Mustieles [es], Claude Paroz [fr], Stas Solovey [ru],
+  Yosef Or Boczko [he], Rafael Ferreira [pt_BR], Aurimas Černius [lt],
+  Fran Dieguez [gl], Anders Jonsson [sv], Мирослав Николић [sr, sr@latin]
+
+3.15.90
+=======
+* Initialize MetaOutput even when we can't get the EDID [Rui; #743412]
+* Expose MetaMonitorManager to introspection [Rui; #743745]
+* Fix flash on unredirection [Chris; #743858]
+* Update xdg-shell implementation to v5 [Jonas; #744452]
+* Do not try to use seat devices that aren't (yet) present [Ray; #744640]
+* Add keybindings for switching to VT8-VT12 [Ray; #744800]
+* Misc bug fixes [Jonas, Cosimo; #743678, #744500]
+
+Contributors:
+  Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
+  Ray Strode, Chris Wilson
+
+Translations:
+  Yosef Or Boczko [he], Yuri Myasoedov [ru], Kristjan SCHMIDT [eo],
+  Matej Urbančič [sl], Dušan Kazik [sk]
+
+3.15.4
+======
+* Use GTK+ theme for window decorations instead of metacity [Florian; #741917]
+* Export the same EDID information on X11 and wayland [Carlos; #742882]
+* Apply input device configuration on wayland [Carlos; #739397]
+* Implement pointer barriers on wayland [Jonas; #706655]
+* Misc. bug fixes (Ting-Wei, Rui, Ikey, Florian, Marek, Jonas; #741829,
+  #738630, #737463, #698995, #727893, #742825, #742824, #742841, #743173,
+  #743189, #743217, #743254]
+
+Contributors:
+  Jonas Ådahl, Giovanni Campagna, Marek Chalupa, Ikey Doherty, Adel Gadllah,
+  Carlos Garnacho, Ting-Wei Lan, Rui Matos, Florian Müllner, Jasper St. Pierre,
+  Rico Tzschichholz
+
+Translations:
+  Matej Urbančič [sl], Balázs Úr [hu], Marek Černocký [cs],
+  Inaki Larranaga Murgoitio [eu], Rafael Ferreira [pt_BR],
+  Daniel Mustieles [es], Fran Dieguez [gl]
+
+3.15.3
+======
+* Don't leave left-over frames queued [Owen; #738686]
+* Set CRTC configuration even if it might be redundant [Rui; #740838]
+
+Contributors:
+  Rui Matos, Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
+
+Translations:
+  Trần Ngọc Quân [vi], Muhammet Kara [tr]
+
+3.15.2
+======
+* Don't enable hiDPI on monitors with broken EDID [Bastien; #734839]
+* Prevent crash applying monitor config for a closed lid [Rui; #739450]
+* Fix "flicker" during startup transition [Ray; #740377]
+* Misc. bug fixes [Lan, Florian, Carlos; #731521, #740133, #738890]
+
+Contributors:
+  Emmanuele Bassi, Carlos Garnacho, Jonathon Jongsma, Ting-Wei Lan, Rui Matos,
+  Florian Müllner, Bastien Nocera, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Kjartan Maraas [nb]
+
+3.15.1
+======
+* Use GResources for theme loading [Cosimo; #736936]
+* Fix headerbar drag getting stuck on xwayland [Carlos; #738411]
+* Fix wayland hiDPI regressions [Adel; #739161]
+* Misc bug fixes and cleanups [Jasper, Rui, Carlos; #662962, #738630, #738888,
+  #738890]
+
+Contributors:
+  Cosimo Cecchi, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
+  Jasper St. Pierre
+
+3.14.1
+======
+* Fix move-titlebar-onscreen function [Florian; #736915]
+* Fix stacking of the guard window [Owen; #737233]
+* Fix keycode lookup for non-default layouts [Rui; #737134]
+* Fix workspaces-only-on-primary handling [Florian; #737178]
+* Don't unstick sticky windows on workspace removal [Florian; #737625]
+* Do not auto-minimize fullscreen windows [Jasper; #705177]
+* Upload keymap to newly added keyboard devices [Rui; #737673]
+* Apply keyboard repeat settings [Rui; #728055]
+* Don't send pressed keys on enter [Rui; #727178]
+* Fix build without wayland/native [Rico; #738225]
+* Send modifiers after the key event [Rui; #738238]
+* Fix unredirect heuristic [Adel; #738271]
+* Do not show system chrome over fullscreen windows [Florian; #693991]
+* Misc. bug fixes [Florian, Adel, Tom; #737135, #737581, #738146, #738384]
+
+Contributors:
+  Tom Beckmann, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
+  Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
+
+Translations:
+  Krishnababu Krothapalli [te], Мирослав Николић [sr, sr@latin],
+  Alexander Shopov [bg], Saibal Ray [bn_IN], Milo Casagrande [it],
+  Rūdolfs Mazurs [lv]
+
+3.14.0
+======
+* Fix placement of popup windows on wayland [Jasper; #736812]
+* Only increment serial once per event [Jasper; #736840]
+* Fix window positioning regression with non-GTK+ toolkits [Owen; #736719]
+
+Contributors:
+  Jasper St. Pierre, Owen W. Taylor
+
+Translations:
+  Saibal Ray [bn_IN], Dušan Kazik [sk], Manoj Kumar Giri [or],
+  Christian Kirbach [de], Ask H. Larsen [da], YunQiang Su [zh_CN],
+  Bernd Homuth [de], Shankar Prasad [kn], Petr Kovar [cs], Rajesh Ranjan [hi]
+
+3.13.92
+=======
+* Rewrite background code [Owen; #735637, #736568]
+* Fix size in nested mode [Owen; #736279]
+* Fix destroy animation of background windows [Florian; #735927]
+* Wire keymap changes up to the wayland frontend [Rui; #736433]
+* Add a test framework and stacking tests [Owen; #736505]
+* Simplify handling of the merged X and wayland stack [Owen; #736559]
+* Fix cursor size on HiDPI [Adel; #729337]
+* Misc. bug fixes [Owen; #735632, #736589, #736694]
+
+Contributors:
+  Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre, Owen W. Taylor
+
+Translations:
+  Andika Triwidada [id], Piotr Drąg [pl], Changwoo Ryu [ko],
+  Kjartan Maraas [nb], Ville-Pekka Vainio [fi], Yuri Myasoedov [ru],
+  Aurimas Černius [lt], Balázs Úr [hu], Sweta Kothari [gu], A S Alam [pa],
+  Sandeep Sheshrao Shedmake [mr], Shantha kumar [ta], Gil Forcada [ca],
+  Carles Ferrando [ca@valencia], Mattias Eriksson [sv]
+
+3.13.91
+=======
+* Misc. bug fixes [Carlos; #735452]
+
+Contributors:
+  Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
+  Rico Tzschichholz
+
+Translations:
+  Chao-Hsiung Liao po/zh_HK, zh_TW.po, Enrico Nicoletto [pt_BR],
+  Kjartan Maraas [nb], Fran Diéguez [gl], Yosef Or Boczko [he],
+  Maria  Mavridou [el], Claude Paroz [fr]
+
 3.13.90
 =======
 * Only call XSync() once per frame [Rui; #728464]

autogen.sh

@@ -4,7 +4,6 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="mutter"
 REQUIRED_AUTOMAKE_VERSION=1.11
 
 (test -f $srcdir/configure.ac \
@@ -19,4 +18,4 @@ which gnome-autogen.sh || {
     echo "your distribution's package manager)."
     exit 1
 }
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+. gnome-autogen.sh

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ(2.62)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [13])
+m4_define([mutter_minor_version], [16])
-m4_define([mutter_micro_version], [90])
+m4_define([mutter_micro_version], [1.1])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -72,21 +72,26 @@ CLUTTER_PACKAGE=clutter-1.0
 
 MUTTER_PC_MODULES="
    gtk+-3.0 >= 3.9.11
-   gio-unix-2.0 >= 2.25.10
+   gio-unix-2.0 >= 2.35.1
    pango >= 1.2.0
    cairo >= 1.10.0
-   gsettings-desktop-schemas >= 3.7.3
+   gsettings-desktop-schemas >= 3.15.92
-   xcomposite >= 0.2 xfixes xext xdamage xi >= 1.6.0
+   $CLUTTER_PACKAGE >= 1.21.3
-   xcursor
-   $CLUTTER_PACKAGE >= 1.19.5
-   clutter-egl-1.0
    cogl-1.0 >= 1.17.1
-   libinput
    upower-glib >= 0.99.0
    gnome-desktop-3.0
+   xcomposite >= 0.2
+   xcursor
+   xdamage
+   xext
+   xfixes
+   xi >= 1.6.0
    xkbfile
    xkeyboard-config
+   xkbcommon >= 0.4.3
    xkbcommon-x11
+   xrender
+   x11-xcb
    xcb-randr
 "
 
@@ -121,6 +126,12 @@ AC_ARG_WITH([xwayland-path],
             [XWAYLAND_PATH="$withval"],
             [XWAYLAND_PATH="$bindir/Xwayland"])
 
+AC_ARG_ENABLE(installed_tests,
+              AS_HELP_STRING([--enable-installed-tests],
+                             [Install test programs (default: no)]),,
+              [enable_installed_tests=no])
+AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
+
 ## here we get the flags we'll actually use
 
 # Unconditionally use this dir to avoid a circular dep with gnomecc
@@ -186,25 +197,43 @@ if test x$found_introspection != xno; then
   AC_SUBST(META_GIR)
 fi
 
-AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
-  AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
-AC_SUBST([WAYLAND_SCANNER])
 AC_SUBST(XWAYLAND_PATH)
 
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
 
-PKG_CHECK_MODULES(MUTTER_NATIVE_BACKEND, [libdrm libsystemd], [have_native_backend=yes], [have_native_backend=no])
+MUTTER_NATIVE_BACKEND_MODULES="clutter-egl-1.0 libdrm libsystemd libinput gudev-1.0 gbm >= 10.3"
-if test $have_native_backend = yes; then
-   AC_DEFINE([HAVE_NATIVE_BACKEND],[1],[Define if you want to enable the native (KMS) backend based on systemd])
-fi
-AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes])
 
-PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.5.90], [have_wayland=yes], [have_wayland=no])
+AC_ARG_ENABLE(native-backend,
-if test $have_wayland = yes; then
+  AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS) backend]),,
-   AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])
+  enable_native_backend=auto
-fi
+)
-AM_CONDITIONAL([HAVE_WAYLAND],[test $have_wayland = yes])
+AS_IF([test "$enable_native_backend" = "yes"], [have_native_backend=yes],
+      [test "$enable_native_backend" = "auto"], PKG_CHECK_EXISTS([$MUTTER_NATIVE_BACKEND_MODULES], [have_native_backend=yes]))
+
+AS_IF([test "$have_native_backend" = "yes"], [
+  PKG_CHECK_MODULES([MUTTER_NATIVE_BACKEND], [$MUTTER_NATIVE_BACKEND_MODULES])
+  AC_DEFINE([HAVE_NATIVE_BACKEND],[1], [Define if you want to enable the native (KMS) backend based on systemd])
+])
+AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])
+
+MUTTER_WAYLAND_MODULES="clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.6.90"
+
+AC_ARG_ENABLE(wayland,
+  AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),,
+  enable_wayland=auto
+)
+AS_IF([test "$enable_wayland" = "yes"], [have_wayland=yes],
+      [test "$enable_wayland" = "auto"], PKG_CHECK_EXISTS([$MUTTER_WAYLAND_MODULES], [have_wayland=yes]))
+
+AS_IF([test "$have_wayland" = "yes"], [
+  PKG_CHECK_MODULES([MUTTER_WAYLAND], [$MUTTER_WAYLAND_MODULES])
+  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
+  AS_IF([test $WAYLAND_SCANNER = "no"],
+    [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
+  AC_SUBST([WAYLAND_SCANNER])
+  AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])
+])
+AM_CONDITIONAL([HAVE_WAYLAND],[test "$have_wayland" = "yes"])
 
 PKG_CHECK_EXISTS([xi >= 1.6.99.1],
                  AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))
@@ -405,6 +434,8 @@ mutter-$VERSION
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
+	Wayland:                  ${have_wayland}
+	Native (KMS) backend:     ${have_native_backend}
 "
 
 

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

@@ -29,5 +29,25 @@
       <default><![CDATA[['<Primary><Alt>F7']]]></default>
       <_summary>Switch to VT 7</_summary>
     </key>
+    <key name="switch-to-session-8" type="as">
+      <default><![CDATA[['<Primary><Alt>F8']]]></default>
+      <_summary>Switch to VT 8</_summary>
+    </key>
+    <key name="switch-to-session-9" type="as">
+      <default><![CDATA[['<Primary><Alt>F9']]]></default>
+      <_summary>Switch to VT 9</_summary>
+    </key>
+    <key name="switch-to-session-10" type="as">
+      <default><![CDATA[['<Primary><Alt>F10']]]></default>
+      <_summary>Switch to VT 10</_summary>
+    </key>
+    <key name="switch-to-session-11" type="as">
+      <default><![CDATA[['<Primary><Alt>F11']]]></default>
+      <_summary>Switch to VT 11</_summary>
+    </key>
+    <key name="switch-to-session-12" type="as">
+      <default><![CDATA[['<Primary><Alt>F12']]]></default>
+      <_summary>Switch to VT 12</_summary>
+    </key>
   </schema>
 </schemalist>

doc/Makefile.am

@@ -1,4 +1,4 @@
 SUBDIRS = man reference
 
-EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
+EXTRA_DIST = dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt rationales.txt

doc/reference/Makefile.am

@@ -81,6 +81,7 @@ IGNORE_HFILES= \
 	keybindings-private.h \
 	meta-background-actor-private.h \
 	meta-background-group-private.h \
+	meta-dbus-login1.h \
 	meta-module.h \
 	meta-plugin-manager.h \
 	meta-shadow-factory-private.h \
@@ -111,6 +112,24 @@ IGNORE_HFILES= \
 	xprops.h \
 	$(NULL)
 
+if !HAVE_NATIVE_BACKEND
+IGNORE_HFILES+= \
+	meta-backend-native.h \
+	meta-barrier-native.h \
+	meta-cursor-renderer-native.h \
+	meta-idle-monitor-native.h \
+	meta-input-settings-native.h \
+	meta-monitor-manager-kms.h \
+	$(NULL)
+endif
+
+if !HAVE_WAYLAND
+IGNORE_HFILES += \
+	meta-surface-actor-wayland.h	\
+	wayland				\
+	$(NULL)
+endif
+
 MKDB_OPTIONS+=--ignore-files="$(IGNORE_HFILES)"
 
 # Images to copy into HTML directory.

doc/reference/meta-docs.sgml.in

@@ -22,7 +22,6 @@
     <title>Mutter Core Reference</title>
     <xi:include href="xml/main.xml"/>
     <xi:include href="xml/common.xml"/>
-    <xi:include href="xml/gradient.xml"/>
     <xi:include href="xml/prefs.xml"/>
     <xi:include href="xml/util.xml"/>
     <xi:include href="xml/errors.xml"/>

doc/reference/meta-sections.txt

@@ -172,15 +172,6 @@ meta_error_trap_push_with_return
 meta_error_trap_pop_with_return
 </SECTION>
 
-<SECTION>
-<FILE>gradient</FILE>
-MetaGradientType
-meta_gradient_create_simple
-meta_gradient_create_multi
-meta_gradient_create_interwoven
-meta_gradient_add_alpha
-</SECTION>
-
 <SECTION>
 <FILE>group</FILE>
 MetaGroup
@@ -558,7 +549,6 @@ meta_window_is_skip_taskbar
 meta_window_get_rect
 meta_window_get_buffer_rect
 meta_window_get_frame_rect
-meta_window_get_outer_rect
 meta_window_client_rect_to_frame_rect
 meta_window_frame_rect_to_client_rect
 meta_window_get_screen

doc/theme-format.txt

@@ -1,396 +0,0 @@
-Themes are in a simple XML-subset format. There are multiple versions
-of the theme format, and a given theme can support more than one format.
-
-Version 1:     THEMEDIR/metacity-1/metacity-theme-1.xml
-  (original metacity format)
-Version 2:     THEMEDIR/metacity-1/metacity-theme-2.xml
-Version 3:     THEMEDIR/metacity-1/metacity-theme-3.xml
-
-The subdirectory name is "metacity-1" in all versions.
-
-As you might expect, older versions of metacity will not understand
-newer theme formats. However, newer versions will use old themes.
-Metacity will always use the newest theme format it understands that
-the X server supports. Some format versions are only supported if you
-have the right X server features.
-
-Each format *requires* the corresponding filename. If you put version
-2 format features in the metacity-1/metacity-theme-1.xml file, then
-metacity will get angry.
-
-This document has separate sections for each format version. You may
-want to read the document in reverse order, since the base features
-are discussed under version 1.
-
-New Features in Theme Format Version 3.4
-========================================
-
-An additional color type is added to pick up custom colors defined
-in the GTK+ theme's CSS:
-
-  gtk:custom(name,fallback)
-
-where <name> refers to a custom color defined with @define-color in
-the GTK+ theme, and <fallback> provides an alternative color definition
-in case the color referenced by <name> is not found.
-
-New Features in Theme Format Version 3.3
-========================================
-
-Add two additional button background functions - left_single_background and
-right_single_background - for button groups with just a single button.
-
-There are now additional frame states to style left/right tiled windows
-differently ("tiled_left", "tiled_right", "tiled_left_and_shaded",
-"tiled_right_and_shaded").
-
-New Features in Theme Format Version 3.2
-========================================
-
-A new window type 'attached' is added for modal dialogs which are
-attached to their parent window. (When the attach_modal_dialogs preference
-is turned on.) If no style is defined for the 'attached' window type,
-the 'border' window type will be used instead.
-
-New Features in Theme Format Version 3.1
-========================================
-
-Additional predefined variables are added for positioning expressions:
-
- frame_x_center: the X center of the entire frame, with respect to the
-     piece currently being drawn.
- frame_y_center: the Y center of the entire frame, with respect to the
-     piece currently being drawn.
-
-The <title/> element now supports an "ellipsize_width" attribute. When
-specified, this gives a width at which to ellipsize the title. If not
-specified, the title will simply be clipped to the title area.
-
-New Features in Theme Format Version 3
-======================================
-
-Format version 3 has exactly one new feature; any element in the file
-can now have a version attribute:
-
-  version="[<|<=|=>|>] MAJOR.MINOR"
-
-(< and > should be to be entity escaped as &lt; and &gt;). If this
-version check is not met, then the element and its children will be
-ignored. This allows having alternate sections of the theme file for
-older and newer version of the Metacity theme format.
-
-When placed on the toplevel <metacity_theme> element, an unsatisfied
-version check will not just cause the contents of the file to be
-ignored, it will also cause the lookup of a theme file to proceed on
-and look for an older format 2 or format 1 file. This allows making a
-metacity-theme-3.xml file that is only used the format version 3.2 or
-newer is supported, and using metacity-theme-1.xml for older window
-managers.
-
-New Features in Theme Format Version 2
-======================================
-
-The optional attributes rounded_top_left, rounded_top_right,
-rounded_bottom_left and rounded_bottom_right on <frame_geometry>
-should now be the radius of the corner in pixels. You may still use
-the values "false" for 0 and "true" for 5, which means v1 values will
-still work just fine.
-
-<frame_geometry> has a new optional attribute, hide_buttons. If this
-is true, no buttons will be displayed on the titlebar.
-
-Anywhere you can use a positive integer, you can use an integer constant.
-
-As well as constant integers and reals, you may define constant colours,
-thus:
-  <constant name="RevoltingPink" value="#FF00FF"/>
-  <constant name="Background" value="gtk:bg[NORMAL]"/>
-
-<frame_style> has two new optional attributes, background and alpha.
-If you specify alpha, you must specify background. background is a
-colour used for the background of the frame. alpha is the transparency
-as a real between 0.0 and 1.0. If the current X server does not support
-alpha channels, the value is ignored.
-
-The filename attribute of <image> may begin with "theme:". If so, the
-rest of the string is the name of a theme icon. The 64x64 version of the
-icon is used, except for fallback mini_icons, which use the 16x16 version.
-This does not affect ordinary resizing. For example:
-  <button function="close" state="normal">
-    <draw_ops>
-      <include name="active_button"/>
-      <image filename="theme:gnome-logout" x="2" y="2"
-          width="width-4" height="height-4"/>
-      <!-- Note: not "theme:gnome-logout.png" or similar. -->
-    </draw_ops>
-  </button>
-
-<menu_icon>s are parsed but ignored.
-
-Fallback icons can be specified using <fallback>. There are two
-optional arguments, icon and mini_icon. The values of these arguments
-are identical to that of the filename attribute of <image>. Fallback
-icons are used when a window does not supply its own icon. If a fallback
-icon is not specified with <fallback>, Metacity will use a built-in
-icon, as in metacity-theme-1.
-
-The <arc> element, as well as the original start_angle and end_angle
-attributes, may be given from and to attributes. The values of these
-attributes are given in degrees clockwise, with 0 being straight up.
-For example:
-  <arc from="0.0" to="90.0" filled="true" color="#FF00FF"
-      x="0" y="5" width="15" height="15"/>
-
-<frame state="shaded"> may now take an optional resize attribute, with
-the same interpretation as the resize attribute on <frame state="normal">.
-If this attribute is omitted for state="shaded", it defaults to "both".
-(If it is omitted for state="normal", it remains an error.)
-
-In addition to the four <button> functions which are required in
-metacity-theme-1, there are six new functions in metacity-theme-2:
-shade, unshade, above, unabove, stick and unstick.
-      
-Overview of Theme Format Version 1
-==================================
-
-<?xml version="1.0"?>
-<metacity_theme>
-<!-- Only one info section is allowed -->
-<info>
-  <name>Foo</name>
-  <author>Foo P. Bar</author>
-  <copyright>whoever, 2002</copyright>
-  <date>Jan 31 2005</date>
-  <description>A sentence about the theme.</description>
-</info>
-
-<!-- define a frame geometry to be referenced later -->
-<!-- frame_geometry has an optional has_title attribute which 
-     determines whether the title text height is included in the 
-     height calculation. if not specified, defaults to true.
-     It also has an optional text_size="medium" attribute
-     (same sizes as with Pango markup, xx-small thru medium thru
-     xx-large) 
-
-     Finally it has optional args rounded_top_left=true, 
-     rounded_top_right=true, rounded_bottom_left=true,
-     rounded_bottom_right=true.
-
-     -->
-<frame_geometry name="normal" has_title="true" title_scale="medium">
-  <distance name="left_width" value="6"/>
-  <distance name="right_width" value="6"/>
-  <distance name="bottom_height" value="7"/>
-  <distance name="left_titlebar_edge" value="6"/>
-  <distance name="right_titlebar_edge" value="6"/>
-  <distance name="button_width" value="17"/>
-  <distance name="button_height" value="17"/>
-  <!-- alternative to button_width button_height distances -->
-  <aspect_ratio name="button" value="1.0"/>
-  <distance name="title_vertical_pad" value="4"/>
-  <border name="title_border" left="3" right="12" top="4" bottom="3"/>
-  <border name="button_border" left="0" right="0" top="1" bottom="1"/>
-</frame_geometry>
-
-<!-- inheritance is allowed; simply overwrites values from parent -->
-<frame_geometry name="borderless" parent="normal">
-  <distance name="left_width" value="0"/>
-  <distance name="right_width" value="0"/>
-  <distance name="bottom_height" value="0"/>
-  <distance name="left_titlebar_edge" value="0"/>
-  <distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<!-- define a constant to use in positions/sizes of draw operations;
-     constant names must start with a capital letter.
-  -->
-<constant name="LineOffset" value="3"/>
-
-<!-- define drawing operations to be referenced later; 
-     these draw-op lists can also be placed inline. 
-
-     Positions/lengths are given as expressions.
-     Operators are: +,-,*,/,%,`max`,`min`
-     All operators are infix including `max` and `min`, 
-      i.e. "2 `max` 5"
-     
-     Some variables are predefined, and constants can also 
-     be used. Variables are:
-
-       width - width of target area
-       height - height of target area
-       object_width - natural width of object being drawn
-       object_height - natural height of object being drawn
-       left_width - distance from left of frame to client window
-       right_width - distance from right of frame to client window
-       top_height - distance from top of frame to client window
-       bottom_height - distance from bottom of frame to client window
-       mini_icon_width - width of mini icon for window
-       mini_icon_height - height of mini icon
-       icon_width - width of large icon
-       icon_height - height of large icon
-       title_width - width of title text
-       title_height - height of title text
-
-    All these are always defined, except object_width/object_height 
-    which only exists for <image> right now.
-
-  -->
-
-<draw_ops name="demo_all_ops">
-  <line color="#00FF00" x1="LineOffset" y1="0" x2="0" y2="height"/>
-  <line color="gtk:fg[NORMAL]" 
-        x1="width - 1" y1="0" x2="width - 1" y2="height" 
-        width="3" dash_on_length="2" dash_off_length="3"/>
-  <rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7"
-             x="0" y="0" width="width - 1" height="height - 1" filled="true"/>
-  <arc color="dark gray" x="0" y="0" width="width - 1" height="height - 1" 
-       filled="false" start_angle="30" extent_angle="180"/>
-  <tint color="orange" alpha="0.5" x="0" y="0" width="width" height="height"/>
- <!-- may be vertical, horizontal, diagonal -->
-  <gradient type="diagonal" 
-            x="10" y="30" width="width / 3" height="height / 4">
-    <!-- any number of colors allowed here. A color can be 
-         a color name like "blue" (look at gcolorsel), a hex color
-         as in HTML (#FFBB99), or a color from the gtk theme 
-         given as "gtk:base[NORMAL]", "gtk:fg[ACTIVE]", etc.
-       -->
-    <color value="gtk:fg[SELECTED]"/>
-    <!-- color obtained by a 0.5 alpha composite of the second color onto the first -->
-    <color value="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.5"/>
-  </gradient>
-  <!-- image has an optional colorize="#color" attribute to give the
-       image a certain color -->
-  <image filename="foo.png" alpha="0.7"
-         x="10" y="30" width="width / 3" height="height / 4"/>
-  <gtk_arrow state="normal" shadow="in" arrow="up"
-             filled="true"
-             x="2" y="2" width="width - 4" height="height - 4"/>
-  <gtk_box state="normal" shadow="out"
-           x="2" y="2" width="width - 4" height="height - 4"/>
-  <gtk_vline state="normal" x="2" y1="0" y2="height"/>
-  <!-- window's icon -->
-  <icon alpha="0.7"
-        x="10" y="30" width="width / 3" height="height / 4"/>
-  <!-- window's title -->
-  <title color="gtk:text[NORMAL]" x="20" y="30"/>
-  <!-- include another draw ops list; has optional x/y/width/height attrs -->
-  <include name="some_other_draw_ops"/>
-  <!-- tile another draw ops list; has optional
-       x/y/width/height/tile_xoffset/tile_yoffset -->
-  <tile name="some_other_draw_ops" tile_width="10" tile_height="10"/>
-</draw_ops>
-
-<frame_style name="normal" geometry="normal">
-  <!-- How to draw each piece of the frame.
-       For each piece, a draw_ops can be given inline or referenced 
-       by name. If a piece is omitted, then nothing will be drawn 
-       for that piece.
-
-       For each piece, the "width" and "height" variables in 
-       coordinate expressions refers to the dimensions of the piece, 
-       the origin is at the top left of the piece.
-  
-       So <rectangle x="0" y="0" width="width-1" height="height-1"/>
-       will outline a piece.
-    -->
-
-  <piece position="entire_background" draw_ops="demo_all_ops"/>
-  <piece position="left_titlebar_edge">
-    <draw_ops>
-      <line color="#00FF00" x1="0" y1="0" x2="0" y2="height"/>
-    </draw_ops>
-  </piece>
-
-  <!-- The complete list of frame pieces:
-
-       entire_background: whole frame
-       titlebar: entire area above the app's window 
-       titlebar_middle: area of titlebar_background not considered
-                        part of an edge
-       left_titlebar_edge: left side of titlebar background
-       right_titlebar_edge: right side of titlebar background
-       top_titlebar_edge: top side of titlebar background
-       bottom_titlebar_edge: bottom side of titlebar background 
-       title: the title area (doesn't include buttons)
-       left_edge: left edge of the frame
-       right_edge: right edge of the frame
-       bottom_edge: bottom edge of the frame
-       overlay: same area as entire_background, but drawn after 
-                drawing all sub-pieces instead of before
-
-   -->
-
-  <!-- For buttons, drawing methods have to be provided for 
-       each of three states: 
-          normal, pressed, prelight
-       and the button function or position must be provided:
-          close, maximize, minimize, menu, 
-          left_left_background, left_middle_background,
-          left_right_background, right_left_background, 
-          right_middle_background, right_right_background
-       So a working theme needs 3*4 = 12 button declarations
-       and a theme may have up to 3*10 = 30 button declarations
-       in order to handle button-rearrangement preferences.
- 
-       (The name "function" for the attribute is from before the 
-        background values existed.)
-    -->
-
-  <button function="close" state="normal" draw_ops="previously_named"/>
-  <button function="menu" state="normal">
-    <draw_ops>
-      <icon alpha="0.7"
-            x="0" y="0" width="object_width" height="object_height"/>
-    </draw_ops>
-  </button>
-
-</frame_style>
-
-<!-- styles can inherit from each other with the parent="" attribute. 
-     In a subclass anything can be re-specified to override 
-     the parent style. -->
-<frame_style name="focused" parent="normal">
-  <piece position="title">
-    <draw_ops>
-      <rectangle color="gtk:bg[SELECTED]"
-                 x="0" y="0" width="width-1" height="height-1"/>
-      <title color="gtk:fg[SELECTED]" x="(width - title_width) / 2"
-                                      y="(height - title_height) / 2"/>
-    </draw_ops>
-  </piece>
-</frame_style>
-
-<!-- Maps styles to states of frame. 
-
-     Focus: yes (focused), no (not focused)
-     Window states: normal, maximized, shaded, maximized_and_shaded
-     Window resizability: none, vertical, horizontal, both
-
-     Everything unspecified just does the same as
-     unfocused/normal/both.
-
-     only state="normal" needs a resize="" attribute.
- -->
-<frame_style_set name="normal">
-<frame focus="yes" state="normal" resize="both" style="focused"/>
-<frame focus="no" state="normal" resize="both" style="normal"/>
-</frame_style_set>
-
-<!-- Each window type needs a style set 
-     Types: normal, dialog, modal_dialog, menu, utility, border
-  -->
-<window type="normal" style_set="normal"/>
-
-
-<!-- For menu icons, drawing methods are needed for the same 
-     four types as the buttons, and GTK states
-     (insensitive,prelight,normal,etc.)
-  -->
-
-<menu_icon function="close" state="normal" draw_ops="previously_named"/>
-
-
-</metacity_theme>
-
-

po/POTFILES.in

@@ -22,9 +22,7 @@ src/core/screen.c
 src/core/util.c
 src/core/window.c
 src/ui/frames.c
-src/ui/resizepopup.c
 src/ui/theme.c
-src/ui/theme-parser.c
 src/x11/session.c
 src/x11/window-props.c
 src/x11/xprops.c

src/Makefile-tests.am

@@ -0,0 +1,49 @@
+# A framework for running scripted tests
+
+if HAVE_WAYLAND
+
+if BUILDOPT_INSTALL_TESTS
+stackingdir = $(pkgdatadir)/tests/stacking
+dist_stacking_DATA =				\
+	tests/stacking/basic-x11.metatest	\
+	tests/stacking/basic-wayland.metatest	\
+	tests/stacking/minimized.metatest   	\
+	tests/stacking/mixed-windows.metatest   \
+	tests/stacking/override-redirect.metatest
+
+mutter-all.test: tests/mutter-all.test.in
+	$(AM_V_GEN) sed  -e "s|@libexecdir[@]|$(libexecdir)|g"  $< > $@.tmp && mv $@.tmp $@
+
+installedtestsdir = $(datadir)/installed-tests/mutter
+installedtests_DATA = mutter-all.test
+
+installedtestsbindir = $(libexecdir)/installed-tests/mutter
+installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner
+else
+noinst_PROGRAMS += mutter-test-client mutter-test-runner
+endif
+
+EXTRA_DIST += tests/mutter-all.test.in
+
+mutter_test_client_SOURCES = tests/test-client.c
+mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter.la
+
+mutter_test_runner_SOURCES = tests/test-runner.c
+mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter.la
+
+.PHONY: run-tests
+
+run-tests: mutter-test-client mutter-test-runner
+	./mutter-test-runner $(dist_stacking_DATA)
+
+endif
+
+# Some random test programs for bits of the code
+
+testboxes_SOURCES = core/testboxes.c
+testasyncgetprop_SOURCES = x11/testasyncgetprop.c
+
+noinst_PROGRAMS+=testboxes testasyncgetprop
+
+testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
+testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la

src/Makefile.am

@@ -5,6 +5,9 @@ lib_LTLIBRARIES = libmutter.la
 
 SUBDIRS=compositor/plugins
 
+EXTRA_DIST =
+NULL =
+
 AM_CPPFLAGS = \
 	-DCLUTTER_ENABLE_COMPOSITOR_API					\
 	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
@@ -29,7 +32,8 @@ AM_CPPFLAGS = \
 	-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\"				\
 	-DMUTTER_PLUGIN_DIR=\"$(MUTTER_PLUGIN_DIR)\"			\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
-	-DXWAYLAND_PATH=\"$(XWAYLAND_PATH)\"
+	-DXWAYLAND_PATH=\"$(XWAYLAND_PATH)\"				\
+	$(NULL)
 
 mutter_built_sources = \
 	$(dbus_idle_built_sources)		\
@@ -37,19 +41,28 @@ mutter_built_sources = \
 	$(dbus_login1_built_sources)		\
 	mutter-enum-types.h 			\
 	mutter-enum-types.c			\
+	$(NULL)
+
+if HAVE_WAYLAND
+mutter_built_sources += \
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
 	xdg-shell-protocol.c			\
-	xdg-shell-server-protocol.h
+	xdg-shell-server-protocol.h		\
+	$(NULL)
+endif
 
-wayland_protocols = \
+wayland_protocols =				\
 	wayland/protocol/gtk-shell.xml		\
-	wayland/protocol/xdg-shell.xml
+	wayland/protocol/xdg-shell.xml		\
+	$(NULL)
 
 libmutter_la_SOURCES =				\
 	backends/meta-backend.c			\
 	meta/meta-backend.h			\
 	backends/meta-backend-private.h		\
+	backends/meta-barrier.c			\
+	backends/meta-barrier-private.h		\
 	backends/meta-cursor.c			\
 	backends/meta-cursor.h			\
 	backends/meta-cursor-private.h		\
@@ -62,10 +75,13 @@ libmutter_la_SOURCES =				\
 	backends/meta-idle-monitor-private.h	\
 	backends/meta-idle-monitor-dbus.c	\
 	backends/meta-idle-monitor-dbus.h	\
+	backends/meta-input-settings.c		\
+	backends/meta-input-settings-private.h	\
 	backends/meta-monitor-config.c		\
 	backends/meta-monitor-config.h		\
 	backends/meta-monitor-manager.c		\
-	backends/meta-monitor-manager.h		\
+	meta/meta-monitor-manager.h		\
+	backends/meta-monitor-manager-private.h	\
 	backends/meta-monitor-manager-dummy.c	\
 	backends/meta-monitor-manager-dummy.h	\
 	backends/meta-stage.h			\
@@ -74,15 +90,18 @@ libmutter_la_SOURCES =				\
 	backends/edid.h				\
 	backends/x11/meta-backend-x11.c			\
 	backends/x11/meta-backend-x11.h			\
+	backends/x11/meta-barrier-x11.c			\
+	backends/x11/meta-barrier-x11.h			\
 	backends/x11/meta-cursor-renderer-x11.c		\
 	backends/x11/meta-cursor-renderer-x11.h		\
 	backends/x11/meta-idle-monitor-xsync.c		\
 	backends/x11/meta-idle-monitor-xsync.h		\
+	backends/x11/meta-input-settings-x11.c		\
+	backends/x11/meta-input-settings-x11.h		\
 	backends/x11/meta-monitor-manager-xrandr.c	\
 	backends/x11/meta-monitor-manager-xrandr.h	\
 	core/meta-accel-parse.c			\
 	core/meta-accel-parse.h			\
-	core/barrier.c				\
 	meta/barrier.h				\
 	core/bell.c				\
 	core/bell.h				\
@@ -96,11 +115,17 @@ libmutter_la_SOURCES =				\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
 	compositor/meta-background.c		\
+	compositor/meta-background-private.h	\
 	compositor/meta-background-actor.c	\
 	compositor/meta-background-actor-private.h	\
+	compositor/meta-background-image.c	\
 	compositor/meta-background-group.c	\
 	compositor/meta-cullable.c		\
 	compositor/meta-cullable.h		\
+	compositor/meta-dnd-actor.c		\
+	compositor/meta-dnd-actor-private.h	\
+	compositor/meta-feedback-actor.c	\
+	compositor/meta-feedback-actor-private.h	\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@@ -129,6 +154,7 @@ libmutter_la_SOURCES =				\
 	meta/compositor.h			\
 	meta/meta-background.h			\
 	meta/meta-background-actor.h		\
+	meta/meta-background-image.h		\
 	meta/meta-background-group.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shadow-factory.h		\
@@ -149,8 +175,6 @@ libmutter_la_SOURCES =				\
 	meta/errors.h				\
 	core/frame.c				\
 	core/frame.h				\
-	ui/gradient.c				\
-	meta/gradient.h				\
 	core/meta-gesture-tracker.c		\
 	core/meta-gesture-tracker-private.h	\
 	core/keybindings.c			\
@@ -182,9 +206,6 @@ libmutter_la_SOURCES =				\
 	ui/ui.h					\
 	ui/frames.c				\
 	ui/frames.h				\
-	ui/resizepopup.c			\
-	ui/resizepopup.h			\
-	ui/theme-parser.c			\
 	ui/theme.c				\
 	meta/theme.h				\
 	ui/theme-private.h			\
@@ -209,7 +230,8 @@ libmutter_la_SOURCES =				\
 	x11/window-x11-private.h		\
 	x11/xprops.c				\
 	x11/xprops.h				\
-	x11/mutter-Xatomtype.h
+	x11/mutter-Xatomtype.h			\
+	$(NULL)
 
 if HAVE_WAYLAND
 libmutter_la_SOURCES +=				\
@@ -221,12 +243,18 @@ libmutter_la_SOURCES +=				\
 	wayland/meta-xwayland.c			\
 	wayland/meta-xwayland.h			\
 	wayland/meta-xwayland-private.h		\
+	wayland/meta-wayland-buffer.c      	\
+	wayland/meta-wayland-buffer.h      	\
+	wayland/meta-wayland-region.c      	\
+	wayland/meta-wayland-region.h      	\
 	wayland/meta-wayland-data-device.c      \
 	wayland/meta-wayland-data-device.h      \
 	wayland/meta-wayland-keyboard.c		\
 	wayland/meta-wayland-keyboard.h		\
 	wayland/meta-wayland-pointer.c		\
 	wayland/meta-wayland-pointer.h		\
+	wayland/meta-wayland-popup.c		\
+	wayland/meta-wayland-popup.h		\
 	wayland/meta-wayland-seat.c		\
 	wayland/meta-wayland-seat.h		\
 	wayland/meta-wayland-touch.c		\
@@ -238,29 +266,35 @@ libmutter_la_SOURCES +=				\
 	wayland/meta-wayland-outputs.c		\
 	wayland/meta-wayland-outputs.h		\
 	wayland/window-wayland.c		\
-	wayland/window-wayland.h
+	wayland/window-wayland.h		\
+	$(NULL)
 endif
 
 if HAVE_NATIVE_BACKEND
 libmutter_la_SOURCES +=					\
 	backends/native/meta-backend-native.c		\
 	backends/native/meta-backend-native.h		\
+	backends/native/meta-backend-native-private.h	\
+	backends/native/meta-barrier-native.c		\
+	backends/native/meta-barrier-native.h		\
 	backends/native/meta-cursor-renderer-native.c	\
 	backends/native/meta-cursor-renderer-native.h	\
 	backends/native/meta-idle-monitor-native.c	\
 	backends/native/meta-idle-monitor-native.h	\
+	backends/native/meta-input-settings-native.c	\
+	backends/native/meta-input-settings-native.h	\
 	backends/native/meta-monitor-manager-kms.c	\
 	backends/native/meta-monitor-manager-kms.h	\
 	backends/native/meta-launcher.c			\
 	backends/native/meta-launcher.h			\
 	backends/native/dbus-utils.c			\
-	backends/native/dbus-utils.h
+	backends/native/dbus-utils.h			\
+	$(NULL)
 endif
 
-nodist_libmutter_la_SOURCES =			\
+nodist_libmutter_la_SOURCES = $(mutter_built_sources)
-	$(mutter_built_sources)
 
-libmutter_la_LDFLAGS = -no-undefined
+libmutter_la_LDFLAGS = -no-undefined -export-symbols-regex "^(meta|ag)_.*"
 libmutter_la_LIBADD  = $(MUTTER_LIBS) $(MUTTER_NATIVE_BACKEND_LIBS)
 
 # Headers installed for plugins; introspected information will
@@ -273,17 +307,18 @@ libmutterinclude_headers =			\
 	meta/compositor.h			\
 	meta/display.h				\
 	meta/errors.h				\
-	meta/gradient.h				\
 	meta/group.h				\
 	meta/keybindings.h			\
 	meta/main.h				\
 	meta/meta-backend.h			\
-	meta/meta-background-actor.h		\
-	meta/meta-background-group.h		\
 	meta/meta-background.h			\
+	meta/meta-background-actor.h		\
+	meta/meta-background-image.h		\
+	meta/meta-background-group.h		\
 	meta/meta-cursor-tracker.h		\
 	meta/meta-idle-monitor.h		\
 	meta/meta-plugin.h			\
+	meta/meta-monitor-manager.h		\
 	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
@@ -293,7 +328,8 @@ libmutterinclude_headers =			\
 	meta/types.h				\
 	meta/util.h				\
 	meta/window.h				\
-	meta/workspace.h
+	meta/workspace.h			\
+	$(NULL)
 
 libmutterinclude_built_headers =		\
 	meta/meta-version.h
@@ -317,6 +353,7 @@ nodist_libmutterinclude_HEADERS =		\
 	$(libmutterinclude_built_headers)
 
 bin_PROGRAMS=mutter
+noinst_PROGRAMS=
 
 mutter_SOURCES = core/mutter.c
 mutter_LDADD = $(MUTTER_LIBS) libmutter.la
@@ -325,6 +362,8 @@ libexec_PROGRAMS = mutter-restart-helper
 mutter_restart_helper_SOURCES = core/restart-helper.c
 mutter_restart_helper_LDADD = $(MUTTER_LIBS)
 
+include Makefile-tests.am
+
 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
 
@@ -358,16 +397,6 @@ Meta-$(api_version).gir: libmutter.la
 
 endif
 
-testboxes_SOURCES = core/testboxes.c
-testgradient_SOURCES = ui/testgradient.c
-testasyncgetprop_SOURCES = x11/testasyncgetprop.c
-
-noinst_PROGRAMS=testboxes testgradient testasyncgetprop
-
-testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
-testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
-testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la
-
 dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
 
 CLEANFILES =					\
@@ -381,14 +410,15 @@ DISTCLEANFILES = 				\
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmutter.pc
 
-EXTRA_DIST =				\
+EXTRA_DIST +=					\
-	$(wayland_protocols)		\
+	$(wayland_protocols)			\
-	libmutter.pc.in \
+	libmutter.pc.in				\
-	mutter-enum-types.h.in \
+	mutter-enum-types.h.in			\
-	mutter-enum-types.c.in \
+	mutter-enum-types.c.in			\
-	org.freedesktop.login1.xml	\
+	org.freedesktop.login1.xml		\
 	org.gnome.Mutter.DisplayConfig.xml	\
-	org.gnome.Mutter.IdleMonitor.xml
+	org.gnome.Mutter.IdleMonitor.xml	\
+	$(NULL)
 
 BUILT_SOURCES =					\
 	$(mutter_built_sources)			\

src/backends/edid.h

@@ -189,7 +189,5 @@ struct MonitorInfo
 };
 
 MonitorInfo *decode_edid (const uchar *data);
-char *make_display_name (const MonitorInfo *info);
-char *make_display_size_string (int width_mm, int height_mm);
 
 #endif

src/backends/meta-backend-private.h

@@ -33,7 +33,7 @@
 #include <meta/meta-backend.h>
 #include <meta/meta-idle-monitor.h>
 #include "meta-cursor-renderer.h"
-#include "meta-monitor-manager.h"
+#include "meta-monitor-manager-private.h"
 
 #define DEFAULT_XKB_RULES_FILE "evdev"
 #define DEFAULT_XKB_MODEL "pc105+inet"
@@ -49,8 +49,8 @@ struct _MetaBackend
 {
   GObject parent;
 
-  MetaIdleMonitor *device_monitors[256];
+  GHashTable *device_monitors;
-  int device_id_max;
+  gint current_device_id;
 };
 
 struct _MetaBackendClass
@@ -107,4 +107,7 @@ void meta_backend_warp_pointer (MetaBackend *backend,
 
 struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
 
+void meta_backend_update_last_device (MetaBackend *backend,
+                                      int          device_id);
+
 #endif /* META_BACKEND_PRIVATE_H */

src/backends/meta-backend.c

@@ -26,14 +26,20 @@
 
 #include <meta/meta-backend.h>
 #include "meta-backend-private.h"
+#include "meta-input-settings-private.h"
 
 #include "backends/x11/meta-backend-x11.h"
+#include "meta-cursor-tracker-private.h"
 #include "meta-stage.h"
 
 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-backend-native.h"
 #endif
 
+#include "backends/meta-idle-monitor-private.h"
+
+#include "backends/meta-monitor-manager-dummy.h"
+
 static MetaBackend *_backend;
 
 /**
@@ -53,6 +59,7 @@ struct _MetaBackendPrivate
 {
   MetaMonitorManager *monitor_manager;
   MetaCursorRenderer *cursor_renderer;
+  MetaInputSettings *input_settings;
 
   ClutterActor *stage;
 };
@@ -65,15 +72,11 @@ meta_backend_finalize (GObject *object)
 {
   MetaBackend *backend = META_BACKEND (object);
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  int i;
 
   g_clear_object (&priv->monitor_manager);
+  g_clear_object (&priv->input_settings);
 
-  for (i = 0; i <= backend->device_id_max; i++)
+  g_hash_table_destroy (backend->device_monitors);
-    {
-      if (backend->device_monitors[i])
-        g_object_unref (backend->device_monitors[i]);
-    }
 
   G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
 }
@@ -89,12 +92,169 @@ meta_backend_sync_screen_size (MetaBackend *backend)
   META_BACKEND_GET_CLASS (backend)->update_screen_size (backend, width, height);
 }
 
+static void
+center_pointer (MetaBackend *backend)
+{
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+  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);
+}
+
 static void
 on_monitors_changed (MetaMonitorManager *monitors,
                      gpointer user_data)
 {
   MetaBackend *backend = META_BACKEND (user_data);
+  ClutterDeviceManager *manager = clutter_device_manager_get_default ();
+  ClutterInputDevice *device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE);
+  ClutterPoint point;
+
   meta_backend_sync_screen_size (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_monitor_at_point (monitors, point.x, point.y) < 0)
+        center_pointer (backend);
+    }
+}
+
+static MetaIdleMonitor *
+meta_backend_create_idle_monitor (MetaBackend *backend,
+                                  int          device_id)
+{
+  return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id);
+}
+
+static void
+create_device_monitor (MetaBackend *backend,
+                       int          device_id)
+{
+  MetaIdleMonitor *idle_monitor;
+
+  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 (backend->device_monitors, &idle_monitor->device_id, idle_monitor);
+}
+
+static void
+destroy_device_monitor (MetaBackend *backend,
+                        int          device_id)
+{
+  g_hash_table_remove (backend->device_monitors, &device_id);
+}
+
+static void
+on_device_added (ClutterDeviceManager *device_manager,
+                 ClutterInputDevice   *device,
+                 gpointer              user_data)
+{
+  MetaBackend *backend = META_BACKEND (user_data);
+  int device_id = clutter_input_device_get_device_id (device);
+
+  create_device_monitor (backend, device_id);
+}
+
+static inline gboolean
+device_is_slave_touchscreen (ClutterInputDevice *device)
+{
+  return (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER &&
+          clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE);
+}
+
+static inline gboolean
+check_has_pointing_device (ClutterDeviceManager *manager)
+{
+  const GSList *devices;
+
+  devices = clutter_device_manager_peek_devices (manager);
+
+  for (; devices; devices = devices->next)
+    {
+      ClutterInputDevice *device = devices->data;
+
+      if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
+        continue;
+      if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
+          clutter_input_device_get_device_type (device) == CLUTTER_KEYBOARD_DEVICE)
+        continue;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static inline gboolean
+check_has_slave_touchscreen (ClutterDeviceManager *manager)
+{
+  const GSList *devices;
+
+  devices = clutter_device_manager_peek_devices (manager);
+
+  for (; devices; devices = devices->next)
+    {
+      ClutterInputDevice *device = devices->data;
+
+      if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER &&
+          clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+on_device_removed (ClutterDeviceManager *device_manager,
+                   ClutterInputDevice   *device,
+                   gpointer              user_data)
+{
+  MetaBackend *backend = META_BACKEND (user_data);
+  int device_id = clutter_input_device_get_device_id (device);
+
+  destroy_device_monitor (backend, device_id);
+
+  /* If the device the user last interacted goes away, check again pointer
+   * visibility.
+   */
+  if (backend->current_device_id == device_id)
+    {
+      MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
+      gboolean has_touchscreen, has_pointing_device;
+      ClutterInputDeviceType device_type;
+
+      device_type = clutter_input_device_get_device_type (device);
+      has_touchscreen = check_has_slave_touchscreen (device_manager);
+
+      if (device_type == CLUTTER_TOUCHSCREEN_DEVICE && has_touchscreen)
+        {
+          /* There's more touchscreens left, keep the pointer hidden */
+          meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
+        }
+      else if (device_type != CLUTTER_KEYBOARD_DEVICE)
+        {
+          has_pointing_device = check_has_pointing_device (device_manager);
+          meta_cursor_tracker_set_pointer_visible (cursor_tracker,
+                                                   has_pointing_device &&
+                                                   !has_touchscreen);
+        }
+    }
+}
+
+static MetaMonitorManager *
+create_monitor_manager (MetaBackend *backend)
+{
+  if (g_getenv ("META_DUMMY_MONITORS"))
+    return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
+
+  return META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
 }
 
 static void
@@ -106,13 +266,50 @@ meta_backend_real_post_init (MetaBackend *backend)
   clutter_actor_realize (priv->stage);
   META_BACKEND_GET_CLASS (backend)->select_stage_events (backend);
 
-  priv->monitor_manager = META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
+  priv->monitor_manager = create_monitor_manager (backend);
 
   g_signal_connect (priv->monitor_manager, "monitors-changed",
                     G_CALLBACK (on_monitors_changed), backend);
   meta_backend_sync_screen_size (backend);
 
   priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
+
+  backend->device_monitors = g_hash_table_new_full (g_int_hash, g_int_equal,
+                                                    NULL, (GDestroyNotify) g_object_unref);
+
+  {
+    MetaCursorTracker *cursor_tracker;
+    ClutterDeviceManager *manager;
+    gboolean has_touchscreen = FALSE;
+    GSList *devices, *l;
+
+    /* Create the core device monitor. */
+    create_device_monitor (backend, 0);
+
+    manager = clutter_device_manager_get_default ();
+    g_signal_connect_object (manager, "device-added",
+                             G_CALLBACK (on_device_added), backend, 0);
+    g_signal_connect_object (manager, "device-removed",
+                             G_CALLBACK (on_device_removed), backend, 0);
+
+    devices = clutter_device_manager_list_devices (manager);
+
+    for (l = devices; l != NULL; l = l->next)
+      {
+        ClutterInputDevice *device = l->data;
+        on_device_added (manager, device, backend);
+        has_touchscreen |= device_is_slave_touchscreen (device);
+      }
+
+    cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
+    meta_cursor_tracker_set_pointer_visible (cursor_tracker, !has_touchscreen);
+
+    g_slist_free (devices);
+  }
+
+  priv->input_settings = meta_input_settings_create ();
+
+  center_pointer (backend);
 }
 
 static MetaCursorRenderer *
@@ -174,6 +371,18 @@ meta_backend_class_init (MetaBackendClass *klass)
                 0,
                 NULL, NULL, NULL,
                 G_TYPE_NONE, 0);
+  g_signal_new ("keymap-layout-group-changed",
+                G_TYPE_FROM_CLASS (object_class),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL, NULL,
+                G_TYPE_NONE, 1, G_TYPE_UINT);
+  g_signal_new ("last-device-changed",
+                G_TYPE_FROM_CLASS (object_class),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL, NULL,
+                G_TYPE_NONE, 1, G_TYPE_INT);
 }
 
 static void
@@ -182,23 +391,6 @@ meta_backend_init (MetaBackend *backend)
   _backend = backend;
 }
 
-/* FIXME -- destroy device monitors at some point */
-G_GNUC_UNUSED static void
-destroy_device_monitor (MetaBackend *backend,
-                        int          device_id)
-{
-  g_clear_object (&backend->device_monitors[device_id]);
-  if (device_id == backend->device_id_max)
-    backend->device_id_max--;
-}
-
-static MetaIdleMonitor *
-meta_backend_create_idle_monitor (MetaBackend *backend,
-                                  int          device_id)
-{
-  return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id);
-}
-
 static void
 meta_backend_post_init (MetaBackend *backend)
 {
@@ -212,15 +404,7 @@ MetaIdleMonitor *
 meta_backend_get_idle_monitor (MetaBackend *backend,
                                int          device_id)
 {
-  g_return_val_if_fail (device_id >= 0 && device_id < 256, NULL);
+  return g_hash_table_lookup (backend->device_monitors, &device_id);
-
-  if (!backend->device_monitors[device_id])
-    {
-      backend->device_monitors[device_id] = meta_backend_create_idle_monitor (backend, device_id);
-      backend->device_id_max = MAX (backend->device_id_max, device_id);
-    }
-
-  return backend->device_monitors[device_id];
 }
 
 /**
@@ -319,6 +503,45 @@ meta_backend_get_stage (MetaBackend *backend)
   return priv->stage;
 }
 
+void
+meta_backend_update_last_device (MetaBackend *backend,
+                                 int          device_id)
+{
+  ClutterInputDeviceType device_type;
+  MetaCursorTracker *cursor_tracker;
+  ClutterDeviceManager *manager;
+  ClutterInputDevice *device;
+
+  if (backend->current_device_id == device_id)
+    return;
+
+  manager = clutter_device_manager_get_default ();
+  device = clutter_device_manager_get_device (manager, device_id);
+
+  if (!device ||
+      clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
+    return;
+
+  device_type = clutter_input_device_get_device_type (device);
+
+  cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
+  backend->current_device_id = device_id;
+  g_signal_emit_by_name (backend, "last-device-changed", device_id);
+
+  if (device_type == CLUTTER_KEYBOARD_DEVICE)
+    return;
+
+  switch (device_type)
+    {
+    case CLUTTER_TOUCHSCREEN_DEVICE:
+      meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
+      break;
+    default:
+      meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
+      break;
+    }
+}
+
 static GType
 get_backend_type (void)
 {
@@ -397,6 +620,7 @@ static GSourceFuncs event_funcs = {
 void
 meta_clutter_init (void)
 {
+  ClutterSettings *clutter_settings;
   GSource *source;
 
   meta_create_backend ();
@@ -404,6 +628,13 @@ meta_clutter_init (void)
   if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
     g_error ("Unable to initialize Clutter.\n");
 
+  /*
+   * XXX: We cannot handle high dpi scaling yet, so fix the scale to 1
+   * for now.
+   */
+  clutter_settings = clutter_settings_get_default ();
+  g_object_set (clutter_settings, "window-scaling-factor", 1, NULL);
+
   source = g_source_new (&event_funcs, sizeof (GSource));
   g_source_attach (source, NULL);
   g_source_unref (source);

src/backends/meta-barrier-private.h

@@ -0,0 +1,81 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014-2015 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.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+#ifndef META_BARRIER_PRIVATE_H
+#define META_BARRIER_PRIVATE_H
+
+G_BEGIN_DECLS
+
+#define META_TYPE_BARRIER_IMPL            (meta_barrier_impl_get_type ())
+#define META_BARRIER_IMPL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BARRIER_IMPL, MetaBarrierImpl))
+#define META_BARRIER_IMPL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BARRIER_IMPL, MetaBarrierImplClass))
+#define META_IS_BARRIER_IMPL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BARRIER_IMPL))
+#define META_IS_BARRIER_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BARRIER_IMPL))
+#define META_BARRIER_IMPL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BARRIER_IMPL, MetaBarrierImplClass))
+
+typedef struct _MetaBarrierImpl        MetaBarrierImpl;
+typedef struct _MetaBarrierImplClass   MetaBarrierImplClass;
+
+struct _MetaBarrierImpl
+{
+  GObject parent;
+};
+
+struct _MetaBarrierImplClass
+{
+  GObjectClass parent_class;
+
+  gboolean (*is_active) (MetaBarrierImpl *barrier);
+  void (*release) (MetaBarrierImpl  *barrier,
+                   MetaBarrierEvent *event);
+  void (*destroy) (MetaBarrierImpl *barrier);
+};
+
+GType meta_barrier_impl_get_type (void) G_GNUC_CONST;
+
+void _meta_barrier_emit_hit_signal (MetaBarrier      *barrier,
+                                    MetaBarrierEvent *event);
+void _meta_barrier_emit_left_signal (MetaBarrier      *barrier,
+                                     MetaBarrierEvent *event);
+
+void meta_barrier_event_unref (MetaBarrierEvent *event);
+
+G_END_DECLS
+
+struct _MetaBarrierPrivate
+{
+  MetaDisplay *display;
+
+  int x1;
+  int y1;
+  int x2;
+  int y2;
+
+  MetaBarrierDirection directions;
+
+  MetaBarrierImpl *impl;
+};
+
+#endif /* META_BARRIER_PRIVATE_H */

src/backends/meta-barrier.c

@@ -10,15 +10,16 @@
 
 #include <glib-object.h>
 
-#include <X11/extensions/XInput2.h>
-#include <X11/extensions/Xfixes.h>
 #include <meta/util.h>
 #include <meta/barrier.h>
-#include "display-private.h"
+#include "backends/native/meta-backend-native.h"
+#include "backends/native/meta-barrier-native.h"
+#include "backends/x11/meta-backend-x11.h"
+#include "backends/x11/meta-barrier-x11.h"
 #include "mutter-enum-types.h"
-#include "core.h"
 
 G_DEFINE_TYPE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MetaBarrierImpl, meta_barrier_impl, G_TYPE_OBJECT)
 
 enum {
   PROP_0,
@@ -45,21 +46,6 @@ enum {
 
 static guint obj_signals[LAST_SIGNAL];
 
-struct _MetaBarrierPrivate
-{
-  MetaDisplay *display;
-
-  int x1;
-  int y1;
-  int x2;
-  int y2;
-
-  MetaBarrierDirection directions;
-
-  PointerBarrier xbarrier;
-};
-
-static void meta_barrier_event_unref (MetaBarrierEvent *event);
 
 static void
 meta_barrier_get_property (GObject    *object,
@@ -133,13 +119,11 @@ static void
 meta_barrier_dispose (GObject *object)
 {
   MetaBarrier *barrier = META_BARRIER (object);
-  MetaBarrierPrivate *priv = barrier->priv;
 
   if (meta_barrier_is_active (barrier))
     {
-      meta_bug ("MetaBarrier wrapper %p for X barrier %ld was destroyed"
+      meta_bug ("MetaBarrier %p was destroyed while it was still active.",
-                " while the X barrier is still active.",
+                barrier);
-                barrier, priv->xbarrier);
     }
 
   G_OBJECT_CLASS (meta_barrier_parent_class)->dispose (object);
@@ -148,7 +132,12 @@ meta_barrier_dispose (GObject *object)
 gboolean
 meta_barrier_is_active (MetaBarrier *barrier)
 {
-  return barrier->priv->xbarrier != 0;
+  MetaBarrierImpl *impl = barrier->priv->impl;
+
+  if (impl)
+    return META_BARRIER_IMPL_GET_CLASS (impl)->is_active (impl);
+  else
+    return FALSE;
 }
 
 /**
@@ -165,15 +154,10 @@ void
 meta_barrier_release (MetaBarrier      *barrier,
                       MetaBarrierEvent *event)
 {
-#ifdef HAVE_XI23
+  MetaBarrierImpl *impl = barrier->priv->impl;
-  MetaBarrierPrivate *priv = barrier->priv;
+
-  if (META_DISPLAY_HAS_XINPUT_23 (priv->display))
+  if (impl)
-    {
+    META_BARRIER_IMPL_GET_CLASS (impl)->release (impl, event);
-      XIBarrierReleasePointer (priv->display->xdisplay,
-                               META_VIRTUAL_CORE_POINTER_ID,
-                               priv->xbarrier, event->event_id);
-    }
-#endif /* HAVE_XI23 */
 }
 
 static void
@@ -181,31 +165,26 @@ meta_barrier_constructed (GObject *object)
 {
   MetaBarrier *barrier = META_BARRIER (object);
   MetaBarrierPrivate *priv = barrier->priv;
-  Display *dpy;
-  Window root;
 
   g_return_if_fail (priv->x1 == priv->x2 || priv->y1 == priv->y2);
 
-  if (priv->display == NULL)
+#if defined(HAVE_NATIVE_BACKEND)
-    {
+  if (META_IS_BACKEND_NATIVE (meta_get_backend ()))
-      g_warning ("A display must be provided when constructing a barrier.");
+    priv->impl = meta_barrier_impl_native_new (barrier);
-      return;
+#endif
-    }
+#if defined(HAVE_XI23)
+  if (META_IS_BACKEND_X11 (meta_get_backend ()) &&
+      !meta_is_wayland_compositor ())
+    priv->impl = meta_barrier_impl_x11_new (barrier);
+#endif
 
-  dpy = priv->display->xdisplay;
+  if (priv->impl == NULL)
-  root = DefaultRootWindow (dpy);
+    g_warning ("Created a non-working barrier");
 
-  priv->xbarrier = XFixesCreatePointerBarrier (dpy, root,
+  /* Take a ref that we'll release in destroy() so that the object stays
-                                               priv->x1, priv->y1,
+   * alive while active. */
-                                               priv->x2, priv->y2,
-                                               priv->directions, 0, NULL);
-
-  /* Take a ref that we'll release when the XID dies inside destroy(),
-   * so that the object stays alive and doesn't get GC'd. */
   g_object_ref (barrier);
 
-  g_hash_table_insert (priv->display->xids, &priv->xbarrier, barrier);
-
   G_OBJECT_CLASS (meta_barrier_parent_class)->constructed (object);
 }
 
@@ -306,20 +285,10 @@ meta_barrier_class_init (MetaBarrierClass *klass)
 void
 meta_barrier_destroy (MetaBarrier *barrier)
 {
-  MetaBarrierPrivate *priv = barrier->priv;
+  MetaBarrierImpl *impl = barrier->priv->impl;
-  Display *dpy;
 
-  if (priv->display == NULL)
+  if (impl)
-    return;
+    return META_BARRIER_IMPL_GET_CLASS (impl)->destroy (impl);
-
-  dpy = priv->display->xdisplay;
-
-  if (!meta_barrier_is_active (barrier))
-    return;
-
-  XFixesDestroyPointerBarrier (dpy, priv->xbarrier);
-  g_hash_table_remove (priv->display->xids, &priv->xbarrier);
-  priv->xbarrier = 0;
 
   g_object_unref (barrier);
 }
@@ -330,71 +299,32 @@ meta_barrier_init (MetaBarrier *barrier)
   barrier->priv = G_TYPE_INSTANCE_GET_PRIVATE (barrier, META_TYPE_BARRIER, MetaBarrierPrivate);
 }
 
-#ifdef HAVE_XI23
+void
+_meta_barrier_emit_hit_signal (MetaBarrier      *barrier,
+                               MetaBarrierEvent *event)
+{
+  g_signal_emit (barrier, obj_signals[HIT], 0, event);
+}
+
+void
+_meta_barrier_emit_left_signal (MetaBarrier      *barrier,
+                                MetaBarrierEvent *event)
+{
+  g_signal_emit (barrier, obj_signals[LEFT], 0, event);
+}
+
 static void
-meta_barrier_fire_event (MetaBarrier    *barrier,
+meta_barrier_impl_class_init (MetaBarrierImplClass *klass)
-                         XIBarrierEvent *xevent)
 {
-  MetaBarrierEvent *event = g_slice_new0 (MetaBarrierEvent);
+  klass->is_active = NULL;
-
+  klass->release = NULL;
-  event->ref_count = 1;
+  klass->destroy = NULL;
-  event->event_id = xevent->eventid;
-  event->time = xevent->time;
-  event->dt = xevent->dtime;
-
-  event->x = xevent->root_x;
-  event->y = xevent->root_y;
-  event->dx = xevent->dx;
-  event->dy = xevent->dy;
-
-  event->released = (xevent->flags & XIBarrierPointerReleased) != 0;
-  event->grabbed = (xevent->flags & XIBarrierDeviceIsGrabbed) != 0;
-
-  switch (xevent->evtype)
-    {
-    case XI_BarrierHit:
-      g_signal_emit (barrier, obj_signals[HIT], 0, event);
-      break;
-    case XI_BarrierLeave:
-      g_signal_emit (barrier, obj_signals[LEFT], 0, event);
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-
-  meta_barrier_event_unref (event);
 }
 
-gboolean
+static void
-meta_display_process_barrier_event (MetaDisplay *display,
+meta_barrier_impl_init (MetaBarrierImpl *impl)
-                                    XIEvent     *event)
 {
-  MetaBarrier *barrier;
-  XIBarrierEvent *xev;
-
-  if (event == NULL)
-    return FALSE;
-
-  switch (event->evtype)
-    {
-    case XI_BarrierHit:
-    case XI_BarrierLeave:
-      break;
-    default:
-      return FALSE;
-    }
-
-  xev = (XIBarrierEvent *) event;
-  barrier = g_hash_table_lookup (display->xids, &xev->barrier);
-  if (barrier != NULL)
-    {
-      meta_barrier_fire_event (barrier, xev);
-      return TRUE;
-    }
-
-  return FALSE;
 }
-#endif /* HAVE_XI23 */
 
 static MetaBarrierEvent *
 meta_barrier_event_ref (MetaBarrierEvent *event)
@@ -406,7 +336,7 @@ meta_barrier_event_ref (MetaBarrierEvent *event)
   return event;
 }
 
-static void
+void
 meta_barrier_event_unref (MetaBarrierEvent *event)
 {
   g_return_if_fail (event != NULL);

src/backends/meta-cursor-private.h

@@ -25,12 +25,18 @@
 #include "meta-cursor.h"
 
 #include <cogl/cogl.h>
+
+#ifdef HAVE_NATIVE_BACKEND
 #include <gbm.h>
+#endif
 
 typedef struct {
   CoglTexture2D *texture;
-  struct gbm_bo *bo;
   int hot_x, hot_y;
+
+#ifdef HAVE_NATIVE_BACKEND
+  struct gbm_bo *bo;
+#endif
 } MetaCursorImage;
 
 struct _MetaCursorReference {
@@ -44,8 +50,10 @@ CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor
                                                      int                 *hot_x,
                                                      int                 *hot_y);
 
+#ifdef HAVE_NATIVE_BACKEND
 struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
                                                  int                 *hot_x,
                                                  int                 *hot_y);
+#endif
 
 #endif /* META_CURSOR_PRIVATE_H */

src/backends/meta-cursor-renderer.c

@@ -53,15 +53,18 @@ queue_redraw (MetaCursorRenderer *renderer)
   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
   MetaBackend *backend = meta_get_backend ();
   ClutterActor *stage = meta_backend_get_stage (backend);
+  CoglTexture *texture;
 
   /* During early initialization, we can have no stage */
   if (!stage)
     return;
 
-  if (priv->handled_by_backend)
+  if (priv->displayed_cursor && !priv->handled_by_backend)
-    meta_stage_set_cursor (META_STAGE (stage), NULL, &priv->current_rect);
+    texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, NULL, NULL);
   else
-    meta_stage_set_cursor (META_STAGE (stage), priv->displayed_cursor, &priv->current_rect);
+    texture = NULL;
+
+  meta_stage_set_cursor (META_STAGE (stage), texture, &priv->current_rect);
 }
 
 static gboolean

src/backends/meta-cursor-renderer.h

@@ -30,8 +30,6 @@
 #include <meta/screen.h>
 #include "meta-cursor.h"
 
-#include <gbm.h>
-
 #define META_TYPE_CURSOR_RENDERER            (meta_cursor_renderer_get_type ())
 #define META_CURSOR_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer))
 #define META_CURSOR_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))

src/backends/meta-cursor-tracker.c

@@ -27,7 +27,9 @@
  *                     pointer abstraction"
  */
 
-#include <config.h>
+#include "config.h"
+#include "meta-cursor-tracker-private.h"
+
 #include <string.h>
 #include <meta/main.h>
 #include <meta/util.h>
@@ -38,11 +40,10 @@
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <X11/extensions/Xfixes.h>
 
 #include "meta-backend-private.h"
-
 #include "meta-cursor-private.h"
-#include "meta-cursor-tracker-private.h"
 
 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);
 
@@ -184,6 +185,7 @@ meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
     return FALSE;
 
   g_clear_pointer (&tracker->xfixes_cursor, meta_cursor_reference_unref);
+  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
 
   return TRUE;
 }

src/backends/meta-cursor.c

@@ -55,9 +55,13 @@ meta_cursor_reference_ref (MetaCursorReference *self)
 static void
 meta_cursor_image_free (MetaCursorImage *image)
 {
-  cogl_object_unref (image->texture);
+  if (image->texture)
+    cogl_object_unref (image->texture);
+
+#ifdef HAVE_NATIVE_BACKEND
   if (image->bo)
     gbm_bo_destroy (image->bo);
+#endif
 }
 
 static void
@@ -139,70 +143,90 @@ load_cursor_on_client (MetaCursor cursor)
                                   meta_prefs_get_cursor_size ());
 }
 
+#ifdef HAVE_NATIVE_BACKEND
+static void
+get_hardware_cursor_size (uint64_t *cursor_width, uint64_t *cursor_height)
+{
+  MetaBackend *meta_backend = meta_get_backend ();
+  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
+
+  if (META_IS_CURSOR_RENDERER_NATIVE (renderer))
+    {
+      meta_cursor_renderer_native_get_cursor_size (META_CURSOR_RENDERER_NATIVE (renderer), cursor_width, cursor_height);
+      return;
+    }
+
+  g_assert_not_reached ();
+}
+#endif
+
+#ifdef HAVE_NATIVE_BACKEND
 static void
 meta_cursor_image_load_gbm_buffer (struct gbm_device *gbm,
                                    MetaCursorImage   *image,
                                    uint8_t           *pixels,
-                                   int                width,
+                                   uint               width,
-                                   int                height,
+                                   uint               height,
                                    int                rowstride,
                                    uint32_t           gbm_format)
 {
-  if (width > 64 || height > 64)
+  uint64_t cursor_width, cursor_height;
+  get_hardware_cursor_size (&cursor_width, &cursor_height);
+
+  if (width > cursor_width || height > cursor_height)
     {
-      meta_warning ("Invalid theme cursor size (must be at most 64x64)\n");
+      meta_warning ("Invalid theme cursor size (must be at most %ux%u)\n",
+                    (unsigned int)cursor_width, (unsigned int)cursor_height);
       return;
     }
 
   if (gbm_device_is_format_supported (gbm, gbm_format,
-                                      GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE))
+                                      GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE))
     {
-      uint8_t buf[4 * 64 * 64];
+      uint8_t buf[4 * cursor_width * cursor_height];
-      int i;
+      uint i;
 
-      image->bo = gbm_bo_create (gbm, 64, 64,
+      image->bo = gbm_bo_create (gbm, cursor_width, cursor_height,
-                                 gbm_format, GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE);
+                                 gbm_format, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE);
 
       memset (buf, 0, sizeof(buf));
       for (i = 0; i < height; i++)
-        memcpy (buf + i * 4 * 64, pixels + i * rowstride, width * 4);
+        memcpy (buf + i * 4 * cursor_width, pixels + i * rowstride, width * 4);
 
-      gbm_bo_write (image->bo, buf, 64 * 64 * 4);
+      gbm_bo_write (image->bo, buf, cursor_width * cursor_height * 4);
     }
   else
     meta_warning ("HW cursor for format %d not supported\n", gbm_format);
 }
+#endif
 
+#ifdef HAVE_NATIVE_BACKEND
 static struct gbm_device *
 get_gbm_device (void)
 {
-#ifdef HAVE_NATIVE_BACKEND
   MetaBackend *meta_backend = meta_get_backend ();
   MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
 
   if (META_IS_CURSOR_RENDERER_NATIVE (renderer))
     return meta_cursor_renderer_native_get_gbm_device (META_CURSOR_RENDERER_NATIVE (renderer));
-#endif
+  else
-
+    return NULL;
-  return NULL;
 }
+#endif
 
 static void
 meta_cursor_image_load_from_xcursor_image (MetaCursorImage   *image,
                                            XcursorImage      *xc_image)
 {
-  int width, height, rowstride;
+  uint width, height, rowstride;
   CoglPixelFormat cogl_format;
-  uint32_t gbm_format;
   ClutterBackend *clutter_backend;
   CoglContext *cogl_context;
-  struct gbm_device *gbm;
 
   width           = xc_image->width;
   height          = xc_image->height;
   rowstride       = width * 4;
 
-  gbm_format = GBM_FORMAT_ARGB8888;
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
   cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;
 #else
@@ -221,31 +245,41 @@ meta_cursor_image_load_from_xcursor_image (MetaCursorImage   *image,
                                                   (uint8_t *) xc_image->pixels,
                                                   NULL);
 
-  gbm = get_gbm_device ();
+#ifdef HAVE_NATIVE_BACKEND
+  struct gbm_device *gbm = get_gbm_device ();
   if (gbm)
     meta_cursor_image_load_gbm_buffer (gbm,
                                        image,
                                        (uint8_t *) xc_image->pixels,
                                        width, height, rowstride,
-                                       gbm_format);
+                                       GBM_FORMAT_ARGB8888);
+#endif
+}
+
+static void
+load_cursor_image (MetaCursorReference *cursor)
+{
+  XcursorImage *image;
+
+  /* Either cursors are loaded from X cursors or buffers. Since
+   * buffers are converted over immediately, we can make sure to
+   * load this directly. */
+  g_assert (cursor->cursor != META_CURSOR_NONE);
+
+  image = load_cursor_on_client (cursor->cursor);
+  if (!image)
+    return;
+
+  meta_cursor_image_load_from_xcursor_image (&cursor->image, image);
+  XcursorImageDestroy (image);
 }
 
 MetaCursorReference *
 meta_cursor_reference_from_theme (MetaCursor cursor)
 {
-  MetaCursorReference *self;
+  MetaCursorReference *self = g_slice_new0 (MetaCursorReference);
-  XcursorImage *image;
-
-  image = load_cursor_on_client (cursor);
-  if (!image)
-    return NULL;
-
-  self = g_slice_new0 (MetaCursorReference);
   self->ref_count = 1;
   self->cursor = cursor;
-  meta_cursor_image_load_from_xcursor_image (&self->image, image);
-
-  XcursorImageDestroy (image);
   return self;
 }
 
@@ -256,13 +290,8 @@ meta_cursor_image_load_from_buffer (MetaCursorImage    *image,
                                     int                 hot_x,
                                     int                 hot_y)
 {
-  struct gbm_device *gbm = get_gbm_device ();
-
   ClutterBackend *backend;
   CoglContext *cogl_context;
-  struct wl_shm_buffer *shm_buffer;
-  uint32_t gbm_format;
-  int width, height;
 
   image->hot_x = hot_x;
   image->hot_y = hot_y;
@@ -272,16 +301,24 @@ meta_cursor_image_load_from_buffer (MetaCursorImage    *image,
 
   image->texture = cogl_wayland_texture_2d_new_from_buffer (cogl_context, buffer, NULL);
 
-  width = cogl_texture_get_width (COGL_TEXTURE (image->texture));
+#ifdef HAVE_NATIVE_BACKEND
-  height = cogl_texture_get_height (COGL_TEXTURE (image->texture));
+  struct gbm_device *gbm = get_gbm_device ();
-
+  if (gbm)
-  shm_buffer = wl_shm_buffer_get (buffer);
-  if (shm_buffer)
     {
-      if (gbm)
+      uint32_t gbm_format;
+      uint64_t cursor_width, cursor_height;
+      uint width, height;
+
+      width = cogl_texture_get_width (COGL_TEXTURE (image->texture));
+      height = cogl_texture_get_height (COGL_TEXTURE (image->texture));
+
+      struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (buffer);
+      if (shm_buffer)
         {
           int rowstride = wl_shm_buffer_get_stride (shm_buffer);
 
+          wl_shm_buffer_begin_access (shm_buffer);
+
           switch (wl_shm_buffer_get_format (shm_buffer))
             {
 #if G_BYTE_ORDER == G_BIG_ENDIAN
@@ -309,30 +346,31 @@ meta_cursor_image_load_from_buffer (MetaCursorImage    *image,
                                              (uint8_t *) wl_shm_buffer_get_data (shm_buffer),
                                              width, height, rowstride,
                                              gbm_format);
-        }
-    }
-  else
-    {
-      /* HW cursors must be 64x64, but 64x64 is huge, and no cursor theme actually uses
-         that, so themed cursors must be padded with transparent pixels to fill the
-         overlay. This is trivial if we have CPU access to the data, but it's not
-         possible if the buffer is in GPU memory (and possibly tiled too), so if we
-         don't get the right size, we fallback to GL.
-      */
-      if (width != 64 || height != 64)
-        {
-          meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n");
-          return;
-        }
 
-      if (gbm)
+          wl_shm_buffer_end_access (shm_buffer);
+        }
+      else
         {
-          image->bo = gbm_bo_import (gbm, GBM_BO_IMPORT_WL_BUFFER,
+          /* HW cursors have a predefined size (at least 64x64), which usually is bigger than cursor theme
-                                     buffer, GBM_BO_USE_CURSOR_64X64);
+             size, so themed cursors must be padded with transparent pixels to fill the
+             overlay. This is trivial if we have CPU access to the data, but it's not
+             possible if the buffer is in GPU memory (and possibly tiled too), so if we
+             don't get the right size, we fallback to GL.
+          */
+          get_hardware_cursor_size (&cursor_width, &cursor_height);
+
+          if (width != cursor_width || height != cursor_height)
+            {
+              meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n");
+              return;
+            }
+
+          image->bo = gbm_bo_import (gbm, GBM_BO_IMPORT_WL_BUFFER, buffer, GBM_BO_USE_CURSOR);
           if (!image->bo)
             meta_warning ("Importing HW cursor from wl_buffer failed\n");
         }
     }
+#endif
 }
 
 MetaCursorReference *
@@ -355,24 +393,33 @@ meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
                                         int                 *hot_x,
                                         int                 *hot_y)
 {
+  if (!cursor->image.texture)
+    load_cursor_image (cursor);
+
   if (hot_x)
     *hot_x = cursor->image.hot_x;
   if (hot_y)
     *hot_y = cursor->image.hot_y;
+
   return COGL_TEXTURE (cursor->image.texture);
 }
 
+#ifdef HAVE_NATIVE_BACKEND
 struct gbm_bo *
 meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
                                   int                 *hot_x,
                                   int                 *hot_y)
 {
+  if (!cursor->image.bo)
+    load_cursor_image (cursor);
+
   if (hot_x)
     *hot_x = cursor->image.hot_x;
   if (hot_y)
     *hot_y = cursor->image.hot_y;
   return cursor->image.bo;
 }
+#endif
 
 MetaCursor
 meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor)

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

@@ -0,0 +1,87 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2014 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+#ifndef META_INPUT_SETTINGS_PRIVATE_H
+#define META_INPUT_SETTINGS_PRIVATE_H
+
+#include "display-private.h"
+
+#include <clutter/clutter.h>
+
+#define META_TYPE_INPUT_SETTINGS             (meta_input_settings_get_type ())
+#define META_INPUT_SETTINGS(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_INPUT_SETTINGS, MetaInputSettings))
+#define META_INPUT_SETTINGS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_INPUT_SETTINGS, MetaInputSettingsClass))
+#define META_IS_INPUT_SETTINGS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_INPUT_SETTINGS))
+#define META_IS_INPUT_SETTINGS_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_INPUT_SETTINGS))
+#define META_INPUT_SETTINGS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_INPUT_SETTINGS, MetaInputSettingsClass))
+
+typedef struct _MetaInputSettings MetaInputSettings;
+typedef struct _MetaInputSettingsClass MetaInputSettingsClass;
+
+struct _MetaInputSettings
+{
+  GObject parent_instance;
+};
+
+struct _MetaInputSettingsClass
+{
+  GObjectClass parent_class;
+
+  void (* set_send_events)   (MetaInputSettings        *settings,
+                              ClutterInputDevice       *device,
+                              GDesktopDeviceSendEvents  mode);
+  void (* set_matrix)        (MetaInputSettings  *settings,
+                              ClutterInputDevice *device,
+                              gfloat              matrix[6]);
+  void (* set_speed)         (MetaInputSettings  *settings,
+                              ClutterInputDevice *device,
+                              gdouble             speed);
+  void (* set_left_handed)   (MetaInputSettings  *settings,
+                              ClutterInputDevice *device,
+                              gboolean            enabled);
+  void (* set_tap_enabled)   (MetaInputSettings  *settings,
+                              ClutterInputDevice *device,
+                              gboolean            enabled);
+  void (* set_invert_scroll) (MetaInputSettings  *settings,
+                              ClutterInputDevice *device,
+                              gboolean            inverted);
+  void (* set_scroll_method) (MetaInputSettings            *settings,
+                              ClutterInputDevice           *device,
+                              GDesktopTouchpadScrollMethod  mode);
+  void (* set_scroll_button) (MetaInputSettings  *settings,
+                              ClutterInputDevice *device,
+                              guint               button);
+
+  void (* set_click_method)  (MetaInputSettings            *settings,
+                              ClutterInputDevice           *device,
+                              GDesktopTouchpadClickMethod   mode);
+
+  void (* set_keyboard_repeat) (MetaInputSettings *settings,
+                                gboolean           repeat,
+                                guint              delay,
+                                guint              interval);
+};
+
+GType meta_input_settings_get_type (void) G_GNUC_CONST;
+
+MetaInputSettings * meta_input_settings_create (void);
+
+#endif /* META_INPUT_SETTINGS_PRIVATE_H */

src/backends/meta-input-settings.c

@@ -0,0 +1,895 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2014 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+/**
+ * SECTION:input-settings
+ * @title: MetaInputSettings
+ * @short_description: Mutter input device configuration
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include "meta-backend-private.h"
+#include "meta-input-settings-private.h"
+#include "x11/meta-input-settings-x11.h"
+
+#ifdef HAVE_NATIVE_BACKEND
+#include "native/meta-backend-native.h"
+#include "native/meta-input-settings-native.h"
+#endif
+
+#include <meta/util.h>
+
+typedef struct _MetaInputSettingsPrivate MetaInputSettingsPrivate;
+typedef struct _DeviceMappingInfo DeviceMappingInfo;
+
+struct _DeviceMappingInfo
+{
+  MetaInputSettings *input_settings;
+  ClutterInputDevice *device;
+  GSettings *settings;
+};
+
+struct _MetaInputSettingsPrivate
+{
+  ClutterDeviceManager *device_manager;
+  MetaMonitorManager *monitor_manager;
+  guint monitors_changed_id;
+
+  GSettings *mouse_settings;
+  GSettings *touchpad_settings;
+  GSettings *trackball_settings;
+  GSettings *keyboard_settings;
+
+  GHashTable *mappable_devices;
+};
+
+typedef void (*ConfigBoolFunc)   (MetaInputSettings  *input_settings,
+                                  ClutterInputDevice *device,
+                                  gboolean            setting);
+typedef void (*ConfigDoubleFunc) (MetaInputSettings  *input_settings,
+                                  ClutterInputDevice *device,
+                                  gdouble             value);
+typedef void (*ConfigUintFunc)   (MetaInputSettings  *input_settings,
+                                  ClutterInputDevice *device,
+                                  guint               value);
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettings, meta_input_settings, G_TYPE_OBJECT)
+
+static GSList *
+meta_input_settings_get_devices (MetaInputSettings      *settings,
+                                 ClutterInputDeviceType  type)
+{
+  MetaInputSettingsPrivate *priv;
+  const GSList *devices;
+  GSList *list = NULL;
+
+  priv = meta_input_settings_get_instance_private (settings);
+  devices = clutter_device_manager_peek_devices (priv->device_manager);
+
+  while (devices)
+    {
+      ClutterInputDevice *device = devices->data;
+
+      if (clutter_input_device_get_device_type (device) == type &&
+          clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER)
+        list = g_slist_prepend (list, device);
+
+      devices = devices->next;
+    }
+
+  return list;
+}
+
+static void
+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->mouse_settings);
+  g_clear_object (&priv->touchpad_settings);
+  g_clear_object (&priv->trackball_settings);
+  g_clear_object (&priv->keyboard_settings);
+  g_clear_pointer (&priv->mappable_devices, g_hash_table_unref);
+
+  if (priv->monitors_changed_id && priv->monitor_manager)
+    {
+      g_signal_handler_disconnect (priv->monitor_manager,
+                                   priv->monitors_changed_id);
+      priv->monitors_changed_id = 0;
+    }
+
+  g_clear_object (&priv->monitor_manager);
+
+  G_OBJECT_CLASS (meta_input_settings_parent_class)->dispose (object);
+}
+
+static void
+settings_device_set_bool_setting (MetaInputSettings  *input_settings,
+                                  ClutterInputDevice *device,
+                                  ConfigBoolFunc      func,
+                                  gboolean            enabled)
+{
+  func (input_settings, device, enabled);
+}
+
+static void
+settings_set_bool_setting (MetaInputSettings      *input_settings,
+                           ClutterInputDeviceType  type,
+                           ConfigBoolFunc          func,
+                           gboolean                enabled)
+{
+  GSList *devices, *d;
+
+  devices = meta_input_settings_get_devices (input_settings, type);
+
+  for (d = devices; d; d = d->next)
+    settings_device_set_bool_setting (input_settings, d->data, func, enabled);
+
+  g_slist_free (devices);
+}
+
+static void
+settings_device_set_double_setting (MetaInputSettings  *input_settings,
+                                    ClutterInputDevice *device,
+                                    ConfigDoubleFunc    func,
+                                    gdouble             value)
+{
+  func (input_settings, device, value);
+}
+
+static void
+settings_set_double_setting (MetaInputSettings      *input_settings,
+                             ClutterInputDeviceType  type,
+                             ConfigDoubleFunc        func,
+                             gdouble                 value)
+{
+  GSList *devices, *d;
+
+  devices = meta_input_settings_get_devices (input_settings, type);
+
+  for (d = devices; d; d = d->next)
+    settings_device_set_double_setting (input_settings, d->data, func, value);
+
+  g_slist_free (devices);
+}
+
+static void
+settings_device_set_uint_setting (MetaInputSettings  *input_settings,
+                                  ClutterInputDevice *device,
+                                  ConfigUintFunc      func,
+                                  guint               value)
+{
+  (func) (input_settings, device, value);
+}
+
+static void
+settings_set_uint_setting (MetaInputSettings      *input_settings,
+                           ClutterInputDeviceType  type,
+                           ConfigUintFunc          func,
+                           guint                   value)
+{
+  GSList *devices, *d;
+
+  devices = meta_input_settings_get_devices (input_settings, type);
+
+  for (d = devices; d; d = d->next)
+    settings_device_set_uint_setting (input_settings, d->data, func, value);
+
+  g_slist_free (devices);
+}
+
+static void
+update_touchpad_left_handed (MetaInputSettings  *input_settings,
+                             ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  GDesktopTouchpadHandedness handedness;
+  MetaInputSettingsPrivate *priv;
+  gboolean enabled = FALSE;
+
+  if (device &&
+      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  handedness = g_settings_get_enum (priv->touchpad_settings, "left-handed");
+
+  switch (handedness)
+    {
+    case G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT:
+      enabled = FALSE;
+      break;
+    case G_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT:
+      enabled = TRUE;
+      break;
+    case G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE:
+      enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  if (device)
+    {
+      settings_device_set_bool_setting (input_settings, device,
+                                        input_settings_class->set_left_handed,
+                                        enabled);
+    }
+  else
+    {
+      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 input_settings_class->set_left_handed,
+                                 enabled);
+    }
+}
+
+static void
+update_mouse_left_handed (MetaInputSettings  *input_settings,
+                          ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  MetaInputSettingsPrivate *priv;
+  gboolean enabled;
+
+  if (device &&
+      clutter_input_device_get_device_type (device) != CLUTTER_POINTER_DEVICE)
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
+
+  if (device)
+    {
+      settings_device_set_bool_setting (input_settings, device,
+                                        input_settings_class->set_left_handed,
+                                        enabled);
+    }
+  else
+    {
+      GDesktopTouchpadHandedness touchpad_handedness;
+
+      settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE,
+                                 input_settings_class->set_left_handed,
+                                 enabled);
+
+      touchpad_handedness = g_settings_get_enum (priv->touchpad_settings,
+                                                 "left-handed");
+
+      /* Also update touchpads if they're following mouse settings */
+      if (touchpad_handedness == G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE)
+        update_touchpad_left_handed (input_settings, NULL);
+    }
+}
+
+static GSettings *
+get_settings_for_device_type (MetaInputSettings      *input_settings,
+                              ClutterInputDeviceType  type)
+{
+  MetaInputSettingsPrivate *priv;
+  priv = meta_input_settings_get_instance_private (input_settings);
+  switch (type)
+    {
+    case CLUTTER_POINTER_DEVICE:
+      return priv->mouse_settings;
+    case CLUTTER_TOUCHPAD_DEVICE:
+      return priv->touchpad_settings;
+    default:
+      return NULL;
+    }
+}
+
+static void
+update_device_speed (MetaInputSettings      *input_settings,
+                     ClutterInputDevice     *device)
+{
+  GSettings *settings;
+  ConfigDoubleFunc func;
+  const gchar *key = "speed";
+
+  func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_speed;
+
+  if (device)
+    {
+      settings = get_settings_for_device_type (input_settings,
+                                               clutter_input_device_get_device_type (device));
+      if (!settings)
+        return;
+
+      settings_device_set_double_setting (input_settings, device, func,
+                                          g_settings_get_double (settings, key));
+    }
+  else
+    {
+      settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
+      settings_set_double_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
+                                   g_settings_get_double (settings, key));
+      settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
+      settings_set_double_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
+                                   g_settings_get_double (settings, key));
+    }
+}
+
+static void
+update_device_natural_scroll (MetaInputSettings      *input_settings,
+                              ClutterInputDevice     *device)
+{
+  GSettings *settings;
+  ConfigBoolFunc func;
+  const gchar *key = "natural-scroll";
+
+  func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_invert_scroll;
+
+  if (device)
+    {
+      settings = get_settings_for_device_type (input_settings,
+                                               clutter_input_device_get_device_type (device));
+      if (!settings)
+        return;
+
+      settings_device_set_bool_setting (input_settings, device, func,
+                                        g_settings_get_boolean (settings, key));
+    }
+  else
+    {
+      settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
+      settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
+                                 g_settings_get_boolean (settings, key));
+      settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
+      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
+                                 g_settings_get_boolean (settings, key));
+    }
+}
+
+static void
+update_touchpad_tap_enabled (MetaInputSettings  *input_settings,
+                             ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  MetaInputSettingsPrivate *priv;
+  gboolean enabled;
+
+  if (device &&
+      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-to-click");
+
+  if (device)
+    {
+      settings_device_set_bool_setting (input_settings, device,
+                                        input_settings_class->set_tap_enabled,
+                                        enabled);
+    }
+  else
+    {
+      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 input_settings_class->set_tap_enabled,
+                                 enabled);
+    }
+}
+
+static void
+update_touchpad_scroll_method (MetaInputSettings *input_settings,
+                               ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  GDesktopTouchpadScrollMethod method;
+  MetaInputSettingsPrivate *priv;
+
+  if (device &&
+      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  method = g_settings_get_enum (priv->touchpad_settings, "scroll-method");
+
+  if (device)
+    {
+      settings_device_set_uint_setting (input_settings, device,
+                                        input_settings_class->set_scroll_method,
+                                        method);
+    }
+  else
+    {
+      settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 (ConfigUintFunc) input_settings_class->set_scroll_method,
+                                 method);
+    }
+}
+
+static void
+update_touchpad_click_method (MetaInputSettings *input_settings,
+                              ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  GDesktopTouchpadScrollMethod method;
+  MetaInputSettingsPrivate *priv;
+
+  if (device &&
+      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  method = g_settings_get_enum (priv->touchpad_settings, "click-method");
+
+  if (device)
+    {
+      settings_device_set_uint_setting (input_settings, device,
+                                        input_settings_class->set_click_method,
+                                        method);
+    }
+  else
+    {
+      settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 (ConfigUintFunc) input_settings_class->set_click_method,
+                                 method);
+    }
+}
+
+static void
+update_touchpad_send_events (MetaInputSettings  *input_settings,
+                             ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  MetaInputSettingsPrivate *priv;
+  GDesktopDeviceSendEvents mode;
+
+  if (device &&
+      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  mode = g_settings_get_enum (priv->touchpad_settings, "send-events");
+
+  if (device)
+    {
+      settings_device_set_uint_setting (input_settings, device,
+                                        input_settings_class->set_send_events,
+                                        mode);
+    }
+  else
+    {
+      settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 input_settings_class->set_send_events,
+                                 mode);
+    }
+}
+
+static gboolean
+device_is_trackball (ClutterInputDevice *device)
+{
+  gboolean is_trackball;
+  char *name;
+
+  if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
+    return FALSE;
+
+  name = g_ascii_strdown (clutter_input_device_get_device_name (device), -1);
+  is_trackball = strstr (name, "trackball") != NULL;
+  g_free (name);
+
+  return is_trackball;
+}
+
+static void
+update_trackball_scroll_button (MetaInputSettings  *input_settings,
+                                ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  MetaInputSettingsPrivate *priv;
+  guint button;
+
+  if (device && !device_is_trackball (device))
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  /* This key is 'i' in the schema but it also specifies a minimum
+   * range of 0 so the cast here is safe. */
+  button = (guint) g_settings_get_int (priv->trackball_settings, "scroll-wheel-emulation-button");
+
+  if (device)
+    {
+      input_settings_class->set_scroll_button (input_settings, device, button);
+    }
+  else if (!device)
+    {
+      MetaInputSettingsPrivate *priv;
+      const GSList *devices;
+
+      priv = meta_input_settings_get_instance_private (input_settings);
+      devices = clutter_device_manager_peek_devices (priv->device_manager);
+
+      while (devices)
+        {
+          ClutterInputDevice *device = devices->data;
+
+          if (device_is_trackball (device))
+            input_settings_class->set_scroll_button (input_settings, device, button);
+
+          devices = devices->next;
+        }
+    }
+}
+
+static void
+update_keyboard_repeat (MetaInputSettings *input_settings)
+{
+  MetaInputSettingsClass *input_settings_class;
+  MetaInputSettingsPrivate *priv;
+  guint delay, interval;
+  gboolean repeat;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  repeat = g_settings_get_boolean (priv->keyboard_settings, "repeat");
+  delay = g_settings_get_uint (priv->keyboard_settings, "delay");
+  interval = g_settings_get_uint (priv->keyboard_settings, "repeat-interval");
+
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  input_settings_class->set_keyboard_repeat (input_settings,
+                                             repeat, delay, interval);
+}
+
+static MetaOutput *
+meta_input_settings_find_output (MetaInputSettings  *input_settings,
+                                 GSettings          *settings,
+                                 ClutterInputDevice *device)
+{
+  MetaInputSettingsPrivate *priv;
+  guint n_values, n_outputs, i;
+  MetaOutput *outputs;
+  gchar **edid;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  edid = g_settings_get_strv (settings, "display");
+  n_values = g_strv_length (edid);
+
+  if (n_values != 3)
+    {
+      g_warning ("EDID configuration for device '%s' "
+                 "is incorrect, must have 3 values",
+                 clutter_input_device_get_device_name (device));
+      return NULL;
+    }
+
+  if (!*edid[0] && !*edid[1] && !*edid[2])
+    return NULL;
+
+  outputs = meta_monitor_manager_get_outputs (priv->monitor_manager,
+                                              &n_outputs);
+  for (i = 0; i < n_outputs; i++)
+    {
+      if (g_strcmp0 (outputs[i].vendor, edid[0]) == 0 &&
+          g_strcmp0 (outputs[i].product, edid[1]) == 0 &&
+          g_strcmp0 (outputs[i].serial, edid[2]) == 0)
+        return &outputs[i];
+    }
+
+  return NULL;
+}
+
+static void
+update_device_display (MetaInputSettings  *input_settings,
+                       GSettings          *settings,
+                       ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  MetaInputSettingsPrivate *priv;
+  gfloat matrix[6] = { 1, 0, 0, 0, 1, 0 };
+  MetaOutput *output;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  output = meta_input_settings_find_output (input_settings, settings, device);
+
+  if (output)
+    meta_monitor_manager_get_monitor_matrix (priv->monitor_manager,
+                                             output, matrix);
+
+  input_settings_class->set_matrix (input_settings, device, matrix);
+}
+
+static void
+meta_input_settings_changed_cb (GSettings  *settings,
+                                const char *key,
+                                gpointer    user_data)
+{
+  MetaInputSettings *input_settings = META_INPUT_SETTINGS (user_data);
+  MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
+
+  if (settings == priv->mouse_settings)
+    {
+      if (strcmp (key, "left-handed") == 0)
+        update_mouse_left_handed (input_settings, NULL);
+      else if (strcmp (key, "speed") == 0)
+        update_device_speed (input_settings, NULL);
+      else if (strcmp (key, "natural-scroll") == 0)
+        update_device_natural_scroll (input_settings, NULL);
+    }
+  else if (settings == priv->touchpad_settings)
+    {
+      if (strcmp (key, "left-handed") == 0)
+        update_touchpad_left_handed (input_settings, NULL);
+      else if (strcmp (key, "speed") == 0)
+        update_device_speed (input_settings, NULL);
+      else if (strcmp (key, "natural-scroll") == 0)
+        update_device_natural_scroll (input_settings, NULL);
+      else if (strcmp (key, "tap-to-click") == 0)
+        update_touchpad_tap_enabled (input_settings, NULL);
+      else if (strcmp (key, "send-events") == 0)
+        update_touchpad_send_events (input_settings, NULL);
+      else if (strcmp (key, "scroll-method") == 0)
+        update_touchpad_scroll_method (input_settings, NULL);
+      else if (strcmp (key, "click-method") == 0)
+        update_touchpad_click_method (input_settings, NULL);
+    }
+  else if (settings == priv->trackball_settings)
+    {
+      if (strcmp (key, "scroll-wheel-emulation-button") == 0)
+        update_trackball_scroll_button (input_settings, NULL);
+    }
+  else if (settings == priv->keyboard_settings)
+    {
+      if (strcmp (key, "repeat") == 0 ||
+          strcmp (key, "repeat-interval") == 0 ||
+          strcmp (key, "delay") == 0)
+        update_keyboard_repeat (input_settings);
+    }
+}
+
+static void
+mapped_device_changed_cb (GSettings         *settings,
+                          const gchar       *key,
+                          DeviceMappingInfo *info)
+{
+  if (strcmp (key, "display") == 0)
+    update_device_display (info->input_settings, settings, info->device);
+}
+
+static GSettings *
+lookup_device_settings (ClutterInputDevice *device)
+{
+  const gchar *group, *schema, *vendor, *product;
+  ClutterInputDeviceType type;
+  GSettings *settings;
+  gchar *path;
+
+  type = clutter_input_device_get_device_type (device);
+
+  if (type == CLUTTER_TOUCHSCREEN_DEVICE)
+    {
+      group = "touchscreens";
+      schema = "org.gnome.desktop.peripherals.touchscreen";
+    }
+  else if (type == CLUTTER_TABLET_DEVICE ||
+           type == CLUTTER_PEN_DEVICE ||
+           type == CLUTTER_ERASER_DEVICE ||
+           type == CLUTTER_CURSOR_DEVICE)
+    {
+      group = "tablets";
+      schema = "org.gnome.desktop.peripherals.tablet";
+    }
+  else
+    return NULL;
+
+  vendor = clutter_input_device_get_vendor_id (device);
+  product = clutter_input_device_get_product_id (device);
+  path = g_strdup_printf ("/org/gnome/desktop/peripherals/%s/%s:%s/",
+                          group, vendor, product);
+
+  settings = g_settings_new_with_path (schema, path);
+  g_free (path);
+
+  return settings;
+}
+
+static void
+monitors_changed_cb (MetaMonitorManager *monitor_manager,
+                     MetaInputSettings  *input_settings)
+{
+  MetaInputSettingsPrivate *priv;
+  ClutterInputDevice *device;
+  GSettings *settings;
+  GHashTableIter iter;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  g_hash_table_iter_init (&iter, priv->mappable_devices);
+
+  while (g_hash_table_iter_next (&iter, (gpointer *) &device,
+                                 (gpointer *) &settings))
+    update_device_display (input_settings, settings, device);
+}
+
+static gboolean
+check_add_mappable_device (MetaInputSettings  *input_settings,
+                           ClutterInputDevice *device)
+{
+  MetaInputSettingsPrivate *priv;
+  DeviceMappingInfo *info;
+  GSettings *settings;
+
+  settings = lookup_device_settings (device);
+
+  if (!settings)
+    return FALSE;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+
+  info = g_new0 (DeviceMappingInfo, 1);
+  info->input_settings = input_settings;
+  info->device = device;
+  info->settings = settings;
+
+  g_signal_connect_data (settings, "changed",
+                         G_CALLBACK (mapped_device_changed_cb),
+                         info, (GClosureNotify) g_free, 0);
+
+  g_hash_table_insert (priv->mappable_devices, device, settings);
+
+  update_device_display (input_settings, settings, device);
+
+  return TRUE;
+}
+
+static void
+apply_device_settings (MetaInputSettings  *input_settings,
+                       ClutterInputDevice *device)
+{
+  update_mouse_left_handed (input_settings, device);
+  update_device_speed (input_settings, device);
+  update_device_natural_scroll (input_settings, device);
+
+  update_touchpad_left_handed (input_settings, device);
+  update_device_speed (input_settings, device);
+  update_device_natural_scroll (input_settings, device);
+  update_touchpad_tap_enabled (input_settings, device);
+  update_touchpad_send_events (input_settings, device);
+  update_touchpad_scroll_method (input_settings, device);
+  update_touchpad_click_method (input_settings, device);
+
+  update_trackball_scroll_button (input_settings, device);
+}
+
+static void
+meta_input_settings_device_added (ClutterDeviceManager *device_manager,
+                                  ClutterInputDevice   *device,
+                                  MetaInputSettings    *input_settings)
+{
+  if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
+    return;
+
+  apply_device_settings (input_settings, device);
+  check_add_mappable_device (input_settings, device);
+}
+
+static void
+meta_input_settings_device_removed (ClutterDeviceManager *device_manager,
+                                    ClutterInputDevice   *device,
+                                    MetaInputSettings    *input_settings)
+{
+  MetaInputSettingsPrivate *priv;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  g_hash_table_remove (priv->mappable_devices, device);
+}
+
+static void
+check_mappable_devices (MetaInputSettings *input_settings)
+{
+  MetaInputSettingsPrivate *priv;
+  const GSList *devices, *l;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  devices = clutter_device_manager_peek_devices (priv->device_manager);
+
+  for (l = devices; l; l = l->next)
+    {
+      ClutterInputDevice *device = l->data;
+
+      if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
+        continue;
+
+      check_add_mappable_device (input_settings, device);
+    }
+}
+
+static void
+meta_input_settings_constructed (GObject *object)
+{
+  MetaInputSettings *input_settings = META_INPUT_SETTINGS (object);
+
+  apply_device_settings (input_settings, NULL);
+  update_keyboard_repeat (input_settings);
+  check_mappable_devices (input_settings);
+}
+
+static void
+meta_input_settings_class_init (MetaInputSettingsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = meta_input_settings_dispose;
+  object_class->constructed = meta_input_settings_constructed;
+}
+
+static void
+meta_input_settings_init (MetaInputSettings *settings)
+{
+  MetaInputSettingsPrivate *priv;
+
+  priv = meta_input_settings_get_instance_private (settings);
+  priv->device_manager = clutter_device_manager_get_default ();
+  g_signal_connect (priv->device_manager, "device-added",
+                    G_CALLBACK (meta_input_settings_device_added), settings);
+  g_signal_connect (priv->device_manager, "device-removed",
+                    G_CALLBACK (meta_input_settings_device_removed), settings);
+
+  priv->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
+  g_signal_connect (priv->mouse_settings, "changed",
+                    G_CALLBACK (meta_input_settings_changed_cb), settings);
+
+  priv->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
+  g_signal_connect (priv->touchpad_settings, "changed",
+                    G_CALLBACK (meta_input_settings_changed_cb), settings);
+
+  priv->trackball_settings = g_settings_new ("org.gnome.desktop.peripherals.trackball");
+  g_signal_connect (priv->trackball_settings, "changed",
+                    G_CALLBACK (meta_input_settings_changed_cb), settings);
+
+  priv->keyboard_settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard");
+  g_signal_connect (priv->keyboard_settings, "changed",
+                    G_CALLBACK (meta_input_settings_changed_cb), settings);
+
+  priv->mappable_devices =
+    g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_object_unref);
+
+  priv->monitor_manager = g_object_ref (meta_monitor_manager_get ());
+  g_signal_connect (priv->monitor_manager, "monitors-changed",
+                    G_CALLBACK (monitors_changed_cb), settings);
+}
+
+MetaInputSettings *
+meta_input_settings_create (void)
+{
+#ifdef HAVE_NATIVE_BACKEND
+  MetaBackend *backend;
+
+  backend = meta_get_backend ();
+
+  if (META_IS_BACKEND_NATIVE (backend))
+    return g_object_new (META_TYPE_INPUT_SETTINGS_NATIVE, NULL);
+#endif
+  if (!meta_is_wayland_compositor ())
+    return g_object_new (META_TYPE_INPUT_SETTINGS_X11, NULL);
+
+  return NULL;
+}

src/backends/meta-monitor-config.c

@@ -34,6 +34,7 @@
 
 #include "config.h"
 
+#include "boxes-private.h"
 #include "meta-monitor-config.h"
 
 #include <string.h>
@@ -67,6 +68,7 @@ typedef struct {
 } MetaOutputConfig;
 
 typedef struct {
+  guint refcount;
   MetaOutputKey *keys;
   MetaOutputConfig *outputs;
   unsigned int n_outputs;
@@ -77,7 +79,6 @@ struct _MetaMonitorConfig {
 
   GHashTable *configs;
   MetaConfiguration *current;
-  gboolean current_is_stored;
   gboolean current_is_for_laptop_lid;
   MetaConfiguration *previous;
 
@@ -124,11 +125,29 @@ config_clear (MetaConfiguration *config)
   g_free (config->outputs);
 }
 
-static void
+static MetaConfiguration *
-config_free (gpointer config)
+config_ref (MetaConfiguration *config)
 {
-  config_clear (config);
+  config->refcount++;
-  g_slice_free (MetaConfiguration, config);
+  return config;
+}
+
+static void
+config_unref (MetaConfiguration *config)
+{
+  if (--config->refcount == 0)
+    {
+      config_clear (config);
+      g_slice_free (MetaConfiguration, config);
+    }
+}
+
+static MetaConfiguration *
+config_new (void)
+{
+  MetaConfiguration *config = g_slice_new0 (MetaConfiguration);
+  config->refcount = 1;
+  return config;
 }
 
 static unsigned long
@@ -220,7 +239,7 @@ meta_monitor_config_init (MetaMonitorConfig *self)
   const char *filename;
   char *path;
 
-  self->configs = g_hash_table_new_full (config_hash, config_equal, NULL, config_free);
+  self->configs = g_hash_table_new_full (config_hash, config_equal, NULL, (GDestroyNotify) config_unref);
 
   filename = g_getenv ("MUTTER_MONITOR_FILENAME");
   if (filename == NULL)
@@ -796,27 +815,6 @@ make_config_key (MetaConfiguration *key,
   key->n_outputs = o;
 }
 
-gboolean
-meta_monitor_config_match_current (MetaMonitorConfig  *self,
-                                   MetaMonitorManager *manager)
-{
-  MetaOutput *outputs;
-  unsigned n_outputs;
-  MetaConfiguration key;
-  gboolean ok;
-
-  if (self->current == NULL)
-    return FALSE;
-
-  outputs = meta_monitor_manager_get_outputs (manager, &n_outputs);
-
-  make_config_key (&key, outputs, n_outputs, -1);
-  ok = config_equal (&key, self->current);
-
-  config_clear (&key);
-  return ok;
-}
-
 gboolean
 meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager)
 {
@@ -851,73 +849,45 @@ meta_monitor_config_get_stored (MetaMonitorConfig *self,
   return stored;
 }
 
+static void
+set_current (MetaMonitorConfig *self,
+             MetaConfiguration *config)
+{
+  g_clear_pointer (&self->previous, (GDestroyNotify) config_unref);
+  self->previous = self->current;
+  self->current = config_ref (config);
+}
+
 static gboolean
 apply_configuration (MetaMonitorConfig  *self,
                      MetaConfiguration  *config,
-		     MetaMonitorManager *manager,
+		     MetaMonitorManager *manager)
-                     gboolean            stored)
 {
   GPtrArray *crtcs, *outputs;
+  gboolean ret = FALSE;
 
   crtcs = g_ptr_array_new_full (config->n_outputs, (GDestroyNotify)meta_crtc_info_free);
   outputs = g_ptr_array_new_full (config->n_outputs, (GDestroyNotify)meta_output_info_free);
 
   if (!meta_monitor_config_assign_crtcs (config, manager, crtcs, outputs))
-    {
+    goto out;
-      g_ptr_array_unref (crtcs);
-      g_ptr_array_unref (outputs);
-      if (!stored)
-        config_free (config);
-
-      return FALSE;
-    }
 
   meta_monitor_manager_apply_configuration (manager,
                                             (MetaCRTCInfo**)crtcs->pdata, crtcs->len,
                                             (MetaOutputInfo**)outputs->pdata, outputs->len);
 
-  /* Stored (persistent) configurations override the previous one always.
+  set_current (self, config);
-     Also, we clear the previous configuration if the current one (which is
-     about to become previous) is stored, or if the current one has
-     different outputs.
-  */
-  if (stored ||
-      (self->current && self->current_is_stored))
-    {
-      if (self->previous)
-        config_free (self->previous);
-      self->previous = NULL;
-    }
-  else
-    {
-      /* Despite the name, config_equal() only checks the set of outputs,
-         not their modes
-      */
-      if (self->current && config_equal (self->current, config))
-        {
-          self->previous = self->current;
-        }
-      else
-        {
-          if (self->current)
-            config_free (self->current);
-          self->previous = NULL;
-        }
-    }
 
-  self->current = config;
-  self->current_is_stored = stored;
   /* If true, we'll be overridden at the end of this call
-     inside turn_off_laptop_display()
+   * inside turn_off_laptop_display / apply_configuration_with_lid */
-  */
   self->current_is_for_laptop_lid = FALSE;
 
-  if (self->current == self->previous)
+  ret = TRUE;
-    self->previous = NULL;
 
+ out:
   g_ptr_array_unref (crtcs);
   g_ptr_array_unref (outputs);
-  return TRUE;
+  return ret;
 }
 
 static gboolean
@@ -928,6 +898,20 @@ key_is_laptop (MetaOutputKey *key)
     g_str_has_prefix (key->connector, "eDP");
 }
 
+static gboolean
+output_is_laptop (MetaOutput *output)
+{
+  /* FIXME: extend with better heuristics */
+  switch (output->connector_type)
+    {
+    case META_CONNECTOR_TYPE_eDP:
+    case META_CONNECTOR_TYPE_LVDS:
+      return TRUE;
+    default:
+      return FALSE;
+    }
+}
+
 static gboolean
 laptop_display_is_on (MetaConfiguration *config)
 {
@@ -945,6 +929,19 @@ laptop_display_is_on (MetaConfiguration *config)
   return FALSE;
 }
 
+static gboolean
+multiple_outputs_are_enabled (MetaConfiguration *config)
+{
+  unsigned int i, enabled;
+
+  enabled = 0;
+  for (i = 0; i < config->n_outputs; i++)
+    if (config->outputs[i].enabled)
+      enabled++;
+
+  return enabled > 1;
+}
+
 static MetaConfiguration *
 make_laptop_lid_config (MetaConfiguration  *reference)
 {
@@ -954,9 +951,9 @@ make_laptop_lid_config (MetaConfiguration  *reference)
   int x_after, y_after;
   int x_offset, y_offset;
 
-  g_assert (reference->n_outputs > 1);
+  g_assert (multiple_outputs_are_enabled (reference));
 
-  new = g_slice_new0 (MetaConfiguration);
+  new = config_new ();
   new->n_outputs = reference->n_outputs;
   new->keys = g_new0 (MetaOutputKey, reference->n_outputs);
   new->outputs = g_new0 (MetaOutputConfig, reference->n_outputs);
@@ -973,8 +970,7 @@ make_laptop_lid_config (MetaConfiguration  *reference)
       new->keys[i].product = g_strdup (current_key->product);
       new->keys[i].serial = g_strdup (current_key->serial);
 
-      if (g_str_has_prefix (current_key->connector, "LVDS") ||
+      if (key_is_laptop (current_key))
-          g_str_has_prefix (current_key->connector, "eDP"))
         {
           new->outputs[i].enabled = FALSE;
           x_after = current_output->rect.x;
@@ -1011,6 +1007,32 @@ make_laptop_lid_config (MetaConfiguration  *reference)
   return new;
 }
 
+static gboolean
+apply_configuration_with_lid (MetaMonitorConfig  *self,
+                              MetaConfiguration  *config,
+                              MetaMonitorManager *manager)
+{
+  if (self->lid_is_closed &&
+      multiple_outputs_are_enabled (config) &&
+      laptop_display_is_on (config))
+    {
+      MetaConfiguration *laptop_lid_config = make_laptop_lid_config (config);
+      if (apply_configuration (self, laptop_lid_config, manager))
+        {
+          self->current_is_for_laptop_lid = TRUE;
+          config_unref (laptop_lid_config);
+          return TRUE;
+        }
+      else
+        {
+          config_unref (laptop_lid_config);
+          return FALSE;
+        }
+    }
+  else
+    return apply_configuration (self, config, manager);
+}
+
 gboolean
 meta_monitor_config_apply_stored (MetaMonitorConfig  *self,
 				  MetaMonitorManager *manager)
@@ -1023,23 +1045,7 @@ meta_monitor_config_apply_stored (MetaMonitorConfig  *self,
   stored = meta_monitor_config_get_stored (self, outputs, n_outputs);
 
   if (stored)
-    {
+    return apply_configuration_with_lid (self, stored, manager);
-      if (self->lid_is_closed &&
-          stored->n_outputs > 1 &&
-          laptop_display_is_on (stored))
-        {
-          if (apply_configuration (self, make_laptop_lid_config (stored),
-                                   manager, FALSE))
-            {
-              self->current_is_for_laptop_lid = TRUE;
-              return TRUE;
-            }
-          else
-            return FALSE;
-        }
-      else
-        return apply_configuration (self, stored, manager, TRUE);
-    }
   else
     return FALSE;
 }
@@ -1068,8 +1074,7 @@ find_primary_output (MetaOutput *outputs,
 
   for (i = 0; i < n_outputs; i++)
     {
-      if (g_str_has_prefix (outputs[i].name, "LVDS") ||
+      if (output_is_laptop (&outputs[i]))
-          g_str_has_prefix (outputs[i].name, "eDP"))
         return &outputs[i];
     }
 
@@ -1089,47 +1094,123 @@ find_primary_output (MetaOutput *outputs,
   return best;
 }
 
-static MetaConfiguration *
+static void
-make_default_config (MetaMonitorConfig *self,
+init_config_from_preferred_mode (MetaOutputConfig *config,
-                     MetaOutput        *outputs,
+                                 MetaOutput *output)
-                     unsigned           n_outputs,
-                     int                max_width,
-                     int                max_height)
 {
-  unsigned i, j;
+  config->enabled = TRUE;
-  int x, y;
+  config->rect.x = 0;
-  MetaConfiguration *ret;
+  config->rect.y = 0;
+  config->rect.width = output->preferred_mode->width;
+  config->rect.height = output->preferred_mode->height;
+  config->refresh_rate = output->preferred_mode->refresh_rate;
+  config->transform = META_MONITOR_TRANSFORM_NORMAL;
+  config->is_primary = FALSE;
+  config->is_presentation = FALSE;
+}
+
+/* This function handles configuring the outputs when the driver provides a
+ * suggested layout position for each output. This is done in recent versions
+ * of qxl and allows displays to be aligned on the guest in the same order as
+ * they are aligned on the client.
+ */
+static gboolean
+make_suggested_config (MetaMonitorConfig *self,
+                       MetaOutput        *outputs,
+                       unsigned           n_outputs,
+                       int                max_width,
+                       int                max_height,
+                       MetaConfiguration *config)
+{
+  unsigned int i;
   MetaOutput *primary;
+  GList *region = NULL;
 
-  ret = g_slice_new (MetaConfiguration);
+  g_return_val_if_fail (config != NULL, FALSE);
-  make_config_key (ret, outputs, n_outputs, -1);
+  primary = find_primary_output (outputs, n_outputs);
-  ret->outputs = g_new0 (MetaOutputConfig, n_outputs);
 
-  /* Special case the simple case: one output, primary at preferred mode,
+  for (i = 0; i < n_outputs; i++)
-     nothing else to do */
-  if (n_outputs == 1)
     {
-      ret->outputs[0].enabled = TRUE;
+      gboolean is_primary = (&outputs[i] == primary);
-      ret->outputs[0].rect.x = 0;
-      ret->outputs[0].rect.y = 0;
-      ret->outputs[0].rect.width = outputs[0].preferred_mode->width;
-      ret->outputs[0].rect.height = outputs[0].preferred_mode->height;
-      ret->outputs[0].refresh_rate = outputs[0].preferred_mode->refresh_rate;
-      ret->outputs[0].transform = META_MONITOR_TRANSFORM_NORMAL;
-      ret->outputs[0].is_primary = TRUE;
 
-      return ret;
+      if (outputs[i].suggested_x < 0 || outputs[i].suggested_y < 0)
+          return FALSE;
+
+      init_config_from_preferred_mode (&config->outputs[i], &outputs[i]);
+      config->outputs[i].is_primary = is_primary;
+
+      config->outputs[i].rect.x = outputs[i].suggested_x;
+      config->outputs[i].rect.y = outputs[i].suggested_y;
+
+      /* Reject the configuration if the suggested positions result in
+       * overlapping displays */
+      if (meta_rectangle_overlaps_with_region (region, &config->outputs[i].rect))
+        {
+          g_warning ("Overlapping outputs, rejecting suggested configuration");
+          g_list_free (region);
+          return FALSE;
+        }
+
+      region = g_list_prepend (region, &config->outputs[i].rect);
     }
 
-  /* If we reach this point, this is either the first time mutter runs
+  g_list_free (region);
-     on this system ever, or we just hotplugged a new screen.
+  return TRUE;
-     In the latter case, search for a configuration that includes one
+}
-     less screen, then add the new one as a presentation screen
-     in preferred mode.
 
-     XXX: but presentation mode is not implemented in the control-center
+static void
-     or in mutter core, so let's do extended for now.
+make_linear_config (MetaMonitorConfig *self,
+                    MetaOutput        *outputs,
+                    unsigned           n_outputs,
+                    int                max_width,
+                    int                max_height,
+                    MetaConfiguration *config)
+{
+  MetaOutput *primary;
+  unsigned i;
+  int x;
+
+  g_return_if_fail (config != NULL);
+
+  primary = find_primary_output (outputs, n_outputs);
+
+  x = primary->preferred_mode->width;
+  for (i = 0; i < n_outputs; i++)
+    {
+      gboolean is_primary = (&outputs[i] == primary);
+
+      init_config_from_preferred_mode (&config->outputs[i], &outputs[i]);
+      config->outputs[i].is_primary = is_primary;
+
+      if (is_primary)
+        {
+          config->outputs[i].rect.x = 0;
+        }
+      else
+        {
+          config->outputs[i].rect.x = x;
+          x += config->outputs[i].rect.width;
+        }
+    }
+}
+
+/* Search for a configuration that includes one less screen, then add the new
+ * one as a presentation screen in preferred mode.
+ *
+ * XXX: but presentation mode is not implemented in the control-center or in
+ * mutter core, so let's do extended for now.
   */
+static gboolean
+extend_stored_config (MetaMonitorConfig *self,
+                      MetaOutput        *outputs,
+                      unsigned           n_outputs,
+                      int                max_width,
+                      int                max_height,
+                      MetaConfiguration *config)
+{
+  int x, y;
+  unsigned i, j;
+
   x = 0;
   y = 0;
   for (i = 0; i < n_outputs; i++)
@@ -1147,69 +1228,80 @@ make_default_config (MetaMonitorConfig *self,
             {
               if (j < i)
                 {
-                  g_assert (output_key_equal (&ret->keys[j], &ref->keys[j]));
+                  g_assert (output_key_equal (&config->keys[j], &ref->keys[j]));
-                  ret->outputs[j] = ref->outputs[j];
+                  config->outputs[j] = ref->outputs[j];
                   x = MAX (x, ref->outputs[j].rect.x + ref->outputs[j].rect.width);
                   y = MAX (y, ref->outputs[j].rect.y + ref->outputs[j].rect.height);
                 }
               else if (j > i)
                 {
-                  g_assert (output_key_equal (&ret->keys[j], &ref->keys[j - 1]));
+                  g_assert (output_key_equal (&config->keys[j], &ref->keys[j - 1]));
-                  ret->outputs[j] = ref->outputs[j - 1];
+                  config->outputs[j] = ref->outputs[j - 1];
                   x = MAX (x, ref->outputs[j - 1].rect.x + ref->outputs[j - 1].rect.width);
                   y = MAX (y, ref->outputs[j - 1].rect.y + ref->outputs[j - 1].rect.height);
                 }
               else
                 {
-                  ret->outputs[j].enabled = TRUE;
+                  init_config_from_preferred_mode (&config->outputs[j], &outputs[0]);
-                  ret->outputs[j].rect.x = 0;
-                  ret->outputs[j].rect.y = 0;
-                  ret->outputs[j].rect.width = outputs[0].preferred_mode->width;
-                  ret->outputs[j].rect.height = outputs[0].preferred_mode->height;
-                  ret->outputs[j].refresh_rate = outputs[0].preferred_mode->refresh_rate;
-                  ret->outputs[j].transform = META_MONITOR_TRANSFORM_NORMAL;
-                  ret->outputs[j].is_primary = FALSE;
-                  ret->outputs[j].is_presentation = FALSE;
                 }
             }
 
           /* Place the new output at the right end of the screen, if it fits,
              otherwise below it, otherwise disable it (or apply_configuration will fail) */
-          if (x + ret->outputs[i].rect.width <= max_width)
+          if (x + config->outputs[i].rect.width <= max_width)
-            ret->outputs[i].rect.x = x;
+            config->outputs[i].rect.x = x;
-          else if (y + ret->outputs[i].rect.height <= max_height)
+          else if (y + config->outputs[i].rect.height <= max_height)
-            ret->outputs[i].rect.y = y;
+            config->outputs[i].rect.y = y;
           else
-            ret->outputs[i].enabled = FALSE;
+            config->outputs[i].enabled = FALSE;
 
-          return ret;
+          return TRUE;
         }
     }
 
-  /* No previous configuration found, try with a really default one, which
+  return FALSE;
-     is one primary that goes first and the rest to the right of it, extended.
+}
-  */
-  primary = find_primary_output (outputs, n_outputs);
 
-  x = primary->preferred_mode->width;
+static MetaConfiguration *
+make_default_config (MetaMonitorConfig *self,
+                     MetaOutput        *outputs,
+                     unsigned           n_outputs,
+                     int                max_width,
+                     int                max_height,
+                     gboolean           use_stored_config)
+{
+  MetaConfiguration *ret = NULL;
+  unsigned i;
+
+  ret = config_new ();
+  make_config_key (ret, outputs, n_outputs, -1);
+  ret->outputs = g_new0 (MetaOutputConfig, n_outputs);
+
+  /* Special case the simple case: one output, primary at preferred mode,
+     nothing else to do */
+  if (n_outputs == 1)
+    {
+      init_config_from_preferred_mode (&ret->outputs[0], &outputs[0]);
+      ret->outputs[0].is_primary = TRUE;
+      goto check_limits;
+    }
+
+  if (make_suggested_config (self, outputs, n_outputs, max_width, max_height, ret))
+      goto check_limits;
+
+  if (use_stored_config &&
+      extend_stored_config (self, outputs, n_outputs, max_width, max_height, ret))
+      goto check_limits;
+
+  make_linear_config (self, outputs, n_outputs, max_width, max_height, ret);
+
+check_limits:
+  /* Disable outputs that would go beyond framebuffer limits */
   for (i = 0; i < n_outputs; i++)
     {
-      MetaOutput *output = &outputs[i];
+        if ((ret->outputs[i].rect.x + ret->outputs[i].rect.width > max_width)
-
+            || (ret->outputs[i].rect.y + ret->outputs[i].rect.height > max_height))
-      ret->outputs[i].enabled = TRUE;
+          ret->outputs[i].enabled = FALSE;
-      ret->outputs[i].rect.x = (output == primary) ? 0 : x;
-      ret->outputs[i].rect.y = 0;
-      ret->outputs[i].rect.width = output->preferred_mode->width;
-      ret->outputs[i].rect.height = output->preferred_mode->height;
-      ret->outputs[i].refresh_rate = output->preferred_mode->refresh_rate;
-      ret->outputs[i].transform = META_MONITOR_TRANSFORM_NORMAL;
-      ret->outputs[i].is_primary = (output == primary);
-
-      /* Disable outputs that would go beyond framebuffer limits */
-      if (ret->outputs[i].rect.x + ret->outputs[i].rect.width > max_width)
-        ret->outputs[i].enabled = FALSE;
-      else if (output != primary)
-        x += output->preferred_mode->width;
     }
 
   return ret;
@@ -1221,7 +1313,7 @@ ensure_at_least_one_output (MetaMonitorConfig  *self,
                             MetaOutput         *outputs,
                             unsigned            n_outputs)
 {
-  MetaConfiguration *ret;
+  MetaConfiguration *config;
   MetaOutput *primary;
   unsigned i;
 
@@ -1232,34 +1324,29 @@ ensure_at_least_one_output (MetaMonitorConfig  *self,
 
   /* Oh no, we don't! Activate the primary one and disable everything else */
 
-  ret = g_slice_new (MetaConfiguration);
+  config = config_new ();
-  make_config_key (ret, outputs, n_outputs, -1);
+  make_config_key (config, outputs, n_outputs, -1);
-  ret->outputs = g_new0 (MetaOutputConfig, n_outputs);
+  config->outputs = g_new0 (MetaOutputConfig, n_outputs);
 
   primary = find_primary_output (outputs, n_outputs);
 
   for (i = 0; i < n_outputs; i++)
     {
-      MetaOutput *output = &outputs[i];
+      gboolean is_primary = (&outputs[i] == primary);
 
-      if (output == primary)
+      if (is_primary)
         {
-          ret->outputs[i].enabled = TRUE;
+          init_config_from_preferred_mode (&config->outputs[i], &outputs[0]);
-          ret->outputs[i].rect.x = 0;
+          config->outputs[i].is_primary = TRUE;
-          ret->outputs[i].rect.y = 0;
-          ret->outputs[i].rect.width = output->preferred_mode->width;
-          ret->outputs[i].rect.height = output->preferred_mode->height;
-          ret->outputs[i].refresh_rate = output->preferred_mode->refresh_rate;
-          ret->outputs[i].transform = META_MONITOR_TRANSFORM_NORMAL;
-          ret->outputs[i].is_primary = TRUE;
         }
       else
         {
-          ret->outputs[i].enabled = FALSE;
+          config->outputs[i].enabled = FALSE;
         }
     }
 
-  apply_configuration (self, ret, manager, FALSE);
+  apply_configuration (self, config, manager);
+  config_unref (config);
   return FALSE;
 }
 
@@ -1270,8 +1357,9 @@ meta_monitor_config_make_default (MetaMonitorConfig  *self,
   MetaOutput *outputs;
   MetaConfiguration *default_config;
   unsigned n_outputs;
-  gboolean ok;
+  gboolean ok = FALSE;
   int max_width, max_height;
+  gboolean use_stored_config;
 
   outputs = meta_monitor_manager_get_outputs (manager, &n_outputs);
   meta_monitor_manager_get_screen_limits (manager, &max_width, &max_height);
@@ -1282,23 +1370,21 @@ meta_monitor_config_make_default (MetaMonitorConfig  *self,
       return;
     }
 
-  default_config = make_default_config (self, outputs, n_outputs, max_width, max_height);
+  /* if the device has hotplug_mode_update, it's possible that the
+   * current display configuration does not match a stored configuration.
+   * Since extend_existing_config() tries to build a configuration that is
+   * based on a previously-stored configuration, it's quite likely that the
+   * resulting config will fail. Even if it doesn't fail, it may result in
+   * an unexpected configuration, so don't attempt to use a stored config
+   * in this situation. */
+  use_stored_config = !meta_monitor_manager_has_hotplug_mode_update (manager);
+  default_config = make_default_config (self, outputs, n_outputs, max_width, max_height, use_stored_config);
 
   if (default_config != NULL)
     {
-      if (self->lid_is_closed &&
+      ok = apply_configuration_with_lid (self, default_config, manager);
-          default_config->n_outputs > 1 &&
+      config_unref (default_config);
-          laptop_display_is_on (default_config))
-        {
-          ok = apply_configuration (self, make_laptop_lid_config (default_config),
-                                    manager, FALSE);
-          config_free (default_config);
-        }
-      else
-        ok = apply_configuration (self, default_config, manager, FALSE);
     }
-  else
-    ok = FALSE;
 
   if (!ok)
     {
@@ -1335,7 +1421,7 @@ meta_monitor_config_update_current (MetaMonitorConfig  *self,
 
   outputs = meta_monitor_manager_get_outputs (manager, &n_outputs);
 
-  current = g_slice_new (MetaConfiguration);
+  current = config_new ();
   current->n_outputs = n_outputs;
   current->outputs = g_new0 (MetaOutputConfig, n_outputs);
   current->keys = g_new0 (MetaOutputKey, n_outputs);
@@ -1348,15 +1434,11 @@ meta_monitor_config_update_current (MetaMonitorConfig  *self,
 
   if (self->current && config_equal_full (current, self->current))
     {
-      config_free (current);
+      config_unref (current);
       return;
     }
 
-  if (self->current && !self->current_is_stored)
+  set_current (self, current);
-    config_free (self->current);
-
-  self->current = current;
-  self->current_is_stored = FALSE;
 }
 
 void
@@ -1364,7 +1446,17 @@ meta_monitor_config_restore_previous (MetaMonitorConfig  *self,
                                       MetaMonitorManager *manager)
 {
   if (self->previous)
-    apply_configuration (self, self->previous, manager, FALSE);
+    {
+      /* The user chose to restore the previous configuration. In this
+       * case, restore the previous configuration. */
+      MetaConfiguration *prev_config = config_ref (self->previous);
+      apply_configuration (self, prev_config, manager);
+      config_unref (prev_config);
+
+      /* After this, self->previous contains the rejected configuration.
+       * Since it was rejected, nuke it. */
+      g_clear_pointer (&self->previous, (GDestroyNotify) config_unref);
+    }
   else
     {
       if (!meta_monitor_config_apply_stored (self, manager))
@@ -1378,11 +1470,12 @@ turn_off_laptop_display (MetaMonitorConfig  *self,
 {
   MetaConfiguration *new;
 
-  if (self->current->n_outputs == 1)
+  if (!multiple_outputs_are_enabled (self->current))
     return;
 
   new = make_laptop_lid_config (self->current);
-  apply_configuration (self, new, manager, FALSE);
+  apply_configuration (self, new, manager);
+  config_unref (new);
   self->current_is_for_laptop_lid = TRUE;
 }
 
@@ -1541,16 +1634,7 @@ meta_monitor_config_save (MetaMonitorConfig *self)
 void
 meta_monitor_config_make_persistent (MetaMonitorConfig *self)
 {
-  if (self->current_is_stored)
+  g_hash_table_replace (self->configs, self->current, config_ref (self->current));
-    return;
-
-  self->current_is_stored = TRUE;
-  g_hash_table_replace (self->configs, self->current, self->current);
-
-  if (self->previous)
-    config_free (self->previous);
-  self->previous = NULL;
-
   meta_monitor_config_save (self);
 }
 
@@ -1789,7 +1873,6 @@ real_assign_crtcs (CrtcAssignment     *assignment,
                                 output_config->transform,
                                 pass);
 
-
                   if (crtc_assignment_assign (assignment, crtc, &modes[j],
                                               output_config->rect.x, output_config->rect.y,
                                               output_config->transform,

src/backends/meta-monitor-config.h

@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_CONFIG_H
 #define META_MONITOR_CONFIG_H
 
-#include "meta-monitor-manager.h"
+#include "meta-monitor-manager-private.h"
 
 #define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ())
 #define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
@@ -36,9 +36,6 @@ GType meta_monitor_config_get_type (void) G_GNUC_CONST;
 
 MetaMonitorConfig *meta_monitor_config_new (void);
 
-gboolean           meta_monitor_config_match_current (MetaMonitorConfig  *config,
-                                                      MetaMonitorManager *manager);
-
 gboolean           meta_monitor_config_apply_stored (MetaMonitorConfig  *config,
                                                      MetaMonitorManager *manager);
 

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

@@ -95,6 +95,8 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
   manager->outputs[0].backlight = -1;
   manager->outputs[0].backlight_min = 0;
   manager->outputs[0].backlight_max = 0;
+  manager->outputs[0].connector_type = META_CONNECTOR_TYPE_LVDS;
+  manager->outputs[0].scale = 1;
 }
 
 static void

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

@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_MANAGER_DUMMY_H
 #define META_MONITOR_MANAGER_DUMMY_H
 
-#include "meta-monitor-manager.h"
+#include "meta-monitor-manager-private.h"
 
 #define META_TYPE_MONITOR_MANAGER_DUMMY            (meta_monitor_manager_dummy_get_type ())
 #define META_MONITOR_MANAGER_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))

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

@@ -41,18 +41,17 @@
 #include "display-private.h"
 #include <meta/screen.h>
 #include "stack-tracker.h"
+#include <meta/meta-monitor-manager.h>
 
 #include "meta-display-config-shared.h"
 #include "meta-dbus-display-config.h"
 #include "meta-cursor.h"
 
-typedef struct _MetaMonitorManagerClass    MetaMonitorManagerClass;
-typedef struct _MetaMonitorManager         MetaMonitorManager;
 typedef struct _MetaMonitorConfigClass    MetaMonitorConfigClass;
 typedef struct _MetaMonitorConfig         MetaMonitorConfig;
 
-typedef struct _MetaOutput MetaOutput;
 typedef struct _MetaCRTC MetaCRTC;
+typedef struct _MetaOutput MetaOutput;
 typedef struct _MetaMonitorMode MetaMonitorMode;
 typedef struct _MetaMonitorInfo MetaMonitorInfo;
 typedef struct _MetaCRTCInfo MetaCRTCInfo;
@@ -69,6 +68,27 @@ typedef enum {
   META_MONITOR_TRANSFORM_FLIPPED_270,
 } MetaMonitorTransform;
 
+/* This matches the values in drm_mode.h */
+typedef enum {
+  META_CONNECTOR_TYPE_Unknown = 0,
+  META_CONNECTOR_TYPE_VGA = 1,
+  META_CONNECTOR_TYPE_DVII = 2,
+  META_CONNECTOR_TYPE_DVID = 3,
+  META_CONNECTOR_TYPE_DVIA = 4,
+  META_CONNECTOR_TYPE_Composite = 5,
+  META_CONNECTOR_TYPE_SVIDEO = 6,
+  META_CONNECTOR_TYPE_LVDS = 7,
+  META_CONNECTOR_TYPE_Component = 8,
+  META_CONNECTOR_TYPE_9PinDIN = 9,
+  META_CONNECTOR_TYPE_DisplayPort = 10,
+  META_CONNECTOR_TYPE_HDMIA = 11,
+  META_CONNECTOR_TYPE_HDMIB = 12,
+  META_CONNECTOR_TYPE_TV = 13,
+  META_CONNECTOR_TYPE_eDP = 14,
+  META_CONNECTOR_TYPE_VIRTUAL = 15,
+  META_CONNECTOR_TYPE_DSI = 16,
+} MetaConnectorType;
+
 struct _MetaOutput
 {
   /* The CRTC driving this output, NULL if the output is not enabled */
@@ -84,6 +104,8 @@ struct _MetaOutput
   CoglSubpixelOrder subpixel_order;
   int scale;
 
+  MetaConnectorType connector_type;
+
   MetaMonitorMode *preferred_mode;
   MetaMonitorMode **modes;
   unsigned int n_modes;
@@ -116,6 +138,8 @@ struct _MetaOutput
 
   /* get a new preferred mode on hotplug events, to handle dynamic guest resizing */
   gboolean hotplug_mode_update;
+  gint suggested_x;
+  gint suggested_y;
 };
 
 struct _MetaCRTC
@@ -200,7 +224,7 @@ struct _MetaCRTCInfo {
 
 /*
  * MetaOutputInfo:
- * this is the same as MetaOutputInfo, but for CRTCs
+ * this is the same as MetaCRTCInfo, but for outputs
  */
 struct _MetaOutputInfo {
   MetaOutput  *output;
@@ -297,10 +321,6 @@ struct _MetaMonitorManagerClass
                           unsigned short     *);
 };
 
-GType meta_monitor_manager_get_type (void);
-
-MetaMonitorManager *meta_monitor_manager_get  (void);
-
 void                meta_monitor_manager_rebuild_derived   (MetaMonitorManager *manager);
 
 MetaMonitorInfo    *meta_monitor_manager_get_monitor_infos (MetaMonitorManager *manager,
@@ -336,14 +356,23 @@ void                meta_monitor_manager_apply_configuration (MetaMonitorManager
 void                meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
                                                                 gboolean            ok);
 
+void               meta_output_parse_edid (MetaOutput *output,
+                                           GBytes     *edid);
+
 void               meta_crtc_info_free   (MetaCRTCInfo   *info);
 void               meta_output_info_free (MetaOutputInfo *info);
 
-void               meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
-                                                           int         n_old_outputs);
-void               meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
-                                                         int              n_old_modes);
 gboolean           meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager);
+void               meta_monitor_manager_read_current_config (MetaMonitorManager *manager);
+void               meta_monitor_manager_on_hotplug (MetaMonitorManager *manager);
+
+gboolean           meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
+                                                            MetaOutput         *output,
+                                                            gfloat              matrix[6]);
+
+gint               meta_monitor_manager_get_monitor_at_point (MetaMonitorManager *manager,
+                                                              gfloat              x,
+                                                              gfloat              y);
 
 /* Returns true if transform causes width and height to be inverted
    This is true for the odd transforms in the enum */

src/backends/meta-monitor-manager.c

@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "meta-monitor-manager.h"
+#include "meta-monitor-manager-private.h"
 
 #include <string.h>
 #include <math.h>
@@ -35,6 +35,7 @@
 #include <meta/main.h>
 #include "util-private.h"
 #include <meta/errors.h>
+#include "edid.h"
 #include "meta-monitor-config.h"
 #include "backends/x11/meta-monitor-manager-xrandr.h"
 #include "meta-backend-private.h"
@@ -44,10 +45,16 @@ enum {
   SIGNALS_LAST
 };
 
-enum {
+/* Array index matches MetaMonitorTransform */
-  PROP_0,
+static gfloat transform_matrices[][6] = {
-  PROP_POWER_SAVE_MODE,
+  {  1,  0,  0,  0,  1,  0 }, /* normal */
-  PROP_LAST
+  {  0, -1,  1,  1,  0,  0 }, /* 90° */
+  { -1,  0,  1,  0, -1,  1 }, /* 180° */
+  {  0,  1,  0, -1,  0,  1 }, /* 270° */
+  { -1,  0,  1,  0,  1,  0 }, /* normal flipped */
+  {  0,  1,  0,  1,  0,  0 }, /* 90° flipped */
+  {  1,  0,  0,  0, -1,  1 }, /* 180° flipped */
+  {  0, -1,  1, -1,  0,  1 }, /* 270° flipped */
 };
 
 static int signals[SIGNALS_LAST];
@@ -64,14 +71,6 @@ meta_monitor_manager_init (MetaMonitorManager *manager)
 {
 }
 
-static void
-read_current_config (MetaMonitorManager *manager)
-{
-  manager->serial++;
-
-  META_MONITOR_MANAGER_GET_CLASS (manager)->read_current (manager);
-}
-
 /*
  * make_logical_config:
  *
@@ -167,16 +166,44 @@ make_logical_config (MetaMonitorManager *manager)
   manager->monitor_infos = (void*)g_array_free (monitor_infos, FALSE);
 }
 
+static void
+power_save_mode_changed (MetaMonitorManager *manager,
+                         GParamSpec         *pspec,
+                         gpointer            user_data)
+{
+  MetaMonitorManagerClass *klass;
+  int mode = meta_dbus_display_config_get_power_save_mode (META_DBUS_DISPLAY_CONFIG (manager));
+
+  if (mode == META_POWER_SAVE_UNSUPPORTED)
+    return;
+
+  /* If DPMS is unsupported, force the property back. */
+  if (manager->power_save_mode == META_POWER_SAVE_UNSUPPORTED)
+    {
+      meta_dbus_display_config_set_power_save_mode (META_DBUS_DISPLAY_CONFIG (manager), META_POWER_SAVE_UNSUPPORTED);
+      return;
+    }
+
+  klass = META_MONITOR_MANAGER_GET_CLASS (manager);
+  if (klass->set_power_save_mode)
+    klass->set_power_save_mode (manager, mode);
+
+  manager->power_save_mode = mode;
+}
+
 static void
 meta_monitor_manager_constructed (GObject *object)
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (object);
 
+  g_signal_connect_object (manager, "notify::power-save-mode",
+                           G_CALLBACK (power_save_mode_changed), manager, 0);
+
   manager->in_init = TRUE;
 
   manager->config = meta_monitor_config_new ();
 
-  read_current_config (manager);
+  meta_monitor_manager_read_current_config (manager);
 
   if (!meta_monitor_config_apply_stored (manager->config, manager))
     meta_monitor_config_make_default (manager->config, manager);
@@ -189,24 +216,7 @@ meta_monitor_manager_constructed (GObject *object)
      so this is not needed.
   */
   if (META_IS_MONITOR_MANAGER_XRANDR (manager))
-    {
+    meta_monitor_manager_read_current_config (manager);
-      MetaOutput *old_outputs;
-      MetaCRTC *old_crtcs;
-      MetaMonitorMode *old_modes;
-      unsigned int n_old_outputs, n_old_modes;
-
-      old_outputs = manager->outputs;
-      n_old_outputs = manager->n_outputs;
-      old_modes = manager->modes;
-      n_old_modes = manager->n_modes;
-      old_crtcs = manager->crtcs;
-
-      read_current_config (manager);
-
-      meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
-      meta_monitor_manager_free_mode_array (old_modes, n_old_modes);
-      g_free (old_crtcs);
-    }
 
   make_logical_config (manager);
   initialize_dbus_interface (manager);
@@ -215,23 +225,6 @@ meta_monitor_manager_constructed (GObject *object)
 }
 
 static void
-meta_monitor_manager_set_power_save_mode (MetaMonitorManager *manager,
-                                          MetaPowerSave       mode)
-{
-  MetaMonitorManagerClass *klass;
-
-  if (manager->power_save_mode == META_POWER_SAVE_UNSUPPORTED ||
-      mode == META_POWER_SAVE_UNSUPPORTED)
-    return;
-
-  klass = META_MONITOR_MANAGER_GET_CLASS (manager);
-  if (klass->set_power_save_mode)
-    klass->set_power_save_mode (manager, mode);
-
-  manager->power_save_mode = mode;
-}
-
-void
 meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
                                         int         n_old_outputs)
 {
@@ -254,7 +247,7 @@ meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
   g_free (old_outputs);
 }
 
-void
+static void
 meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
                                       int              n_old_modes)
 {
@@ -298,44 +291,6 @@ meta_monitor_manager_dispose (GObject *object)
   G_OBJECT_CLASS (meta_monitor_manager_parent_class)->dispose (object);
 }
 
-static void
-meta_monitor_manager_set_property (GObject      *object,
-                                   guint         prop_id,
-                                   const GValue *value,
-                                   GParamSpec   *pspec)
-{
-  MetaMonitorManager *self = META_MONITOR_MANAGER (object);
-
-  switch (prop_id)
-    {
-    case PROP_POWER_SAVE_MODE:
-      meta_monitor_manager_set_power_save_mode (self, g_value_get_int (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_monitor_manager_get_property (GObject      *object,
-                                   guint         prop_id,
-                                   GValue       *value,
-                                   GParamSpec   *pspec)
-{
-  MetaMonitorManager *self = META_MONITOR_MANAGER (object);
-
-  switch (prop_id)
-    {
-    case PROP_POWER_SAVE_MODE:
-      g_value_set_int (value, self->power_save_mode);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
 static GBytes *
 meta_monitor_manager_real_read_edid (MetaMonitorManager *manager,
                                      MetaOutput         *output)
@@ -356,8 +311,6 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->constructed = meta_monitor_manager_constructed;
-  object_class->get_property = meta_monitor_manager_get_property;
-  object_class->set_property = meta_monitor_manager_set_property;
   object_class->dispose = meta_monitor_manager_dispose;
   object_class->finalize = meta_monitor_manager_finalize;
 
@@ -371,8 +324,6 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
 		  0,
                   NULL, NULL, NULL,
 		  G_TYPE_NONE, 0);
-
-  g_object_class_override_property (object_class, PROP_POWER_SAVE_MODE, "power-save-mode");
 }
 
 static const double known_diagonals[] = {
@@ -406,11 +357,14 @@ make_display_name (MetaMonitorManager *manager,
   char *vendor_name = NULL;
   char *ret;
 
-  if (g_str_has_prefix (output->name, "LVDS") ||
+  switch (output->connector_type)
-      g_str_has_prefix (output->name, "eDP"))
     {
+    case META_CONNECTOR_TYPE_LVDS:
+    case META_CONNECTOR_TYPE_eDP:
       ret = g_strdup (_("Built-in display"));
       goto out;
+    default:
+      break;
     }
 
   if (output->width_mm > 0 && output->height_mm > 0)
@@ -458,6 +412,32 @@ make_display_name (MetaMonitorManager *manager,
   return ret;
 }
 
+static const char *
+get_connector_type_name (MetaConnectorType connector_type)
+{
+  switch (connector_type)
+    {
+    case META_CONNECTOR_TYPE_Unknown: return "Unknown";
+    case META_CONNECTOR_TYPE_VGA: return "VGA";
+    case META_CONNECTOR_TYPE_DVII: return "DVII";
+    case META_CONNECTOR_TYPE_DVID: return "DVID";
+    case META_CONNECTOR_TYPE_DVIA: return "DVIA";
+    case META_CONNECTOR_TYPE_Composite: return "Composite";
+    case META_CONNECTOR_TYPE_SVIDEO: return "SVIDEO";
+    case META_CONNECTOR_TYPE_LVDS: return "LVDS";
+    case META_CONNECTOR_TYPE_Component: return "Component";
+    case META_CONNECTOR_TYPE_9PinDIN: return "9PinDIN";
+    case META_CONNECTOR_TYPE_DisplayPort: return "DisplayPort";
+    case META_CONNECTOR_TYPE_HDMIA: return "HDMIA";
+    case META_CONNECTOR_TYPE_HDMIB: return "HDMIB";
+    case META_CONNECTOR_TYPE_TV: return "TV";
+    case META_CONNECTOR_TYPE_eDP: return "eDP";
+    case META_CONNECTOR_TYPE_VIRTUAL: return "VIRTUAL";
+    case META_CONNECTOR_TYPE_DSI: return "DSI";
+    default: g_assert_not_reached ();
+    }
+}
+
 static gboolean
 meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                                            GDBusMethodInvocation *invocation)
@@ -538,6 +518,8 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                              g_variant_new_boolean (output->is_primary));
       g_variant_builder_add (&properties, "{sv}", "presentation",
                              g_variant_new_boolean (output->is_presentation));
+      g_variant_builder_add (&properties, "{sv}", "connector-type",
+                             g_variant_new_string (get_connector_type_name (output->connector_type)));
 
       edid_file = manager_class->get_edid_file (manager, output);
       if (edid_file)
@@ -1125,6 +1107,13 @@ initialize_dbus_interface (MetaMonitorManager *manager)
                                           g_object_unref);
 }
 
+/**
+ * meta_monitor_manager_get:
+ *
+ * Accessor for the singleton MetaMonitorManager.
+ *
+ * Returns: (transfer none): The only #MetaMonitorManager there is.
+ */
 MetaMonitorManager *
 meta_monitor_manager_get (void)
 {
@@ -1199,6 +1188,31 @@ meta_monitor_manager_get_screen_limits (MetaMonitorManager *manager,
   *height = manager->max_screen_height;
 }
 
+void
+meta_monitor_manager_read_current_config (MetaMonitorManager *manager)
+{
+  MetaOutput *old_outputs;
+  MetaCRTC *old_crtcs;
+  MetaMonitorMode *old_modes;
+  unsigned int n_old_outputs, n_old_modes;
+
+  /* Some implementations of read_current use the existing information
+   * we have available, so don't free the old configuration until after
+   * read_current finishes. */
+  old_outputs = manager->outputs;
+  n_old_outputs = manager->n_outputs;
+  old_modes = manager->modes;
+  n_old_modes = manager->n_modes;
+  old_crtcs = manager->crtcs;
+
+  manager->serial++;
+  META_MONITOR_MANAGER_GET_CLASS (manager)->read_current (manager);
+
+  meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
+  meta_monitor_manager_free_mode_array (old_modes, n_old_modes);
+  g_free (old_crtcs);
+}
+
 void
 meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager)
 {
@@ -1216,3 +1230,165 @@ meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager)
   g_free (old_monitor_infos);
 }
 
+void
+meta_output_parse_edid (MetaOutput *meta_output,
+                        GBytes     *edid)
+{
+  MonitorInfo *parsed_edid;
+  gsize len;
+
+  if (!edid)
+    goto out;
+
+  parsed_edid = decode_edid (g_bytes_get_data (edid, &len));
+
+  if (parsed_edid)
+    {
+      meta_output->vendor = g_strndup (parsed_edid->manufacturer_code, 4);
+      if (parsed_edid->dsc_product_name[0])
+        meta_output->product = g_strndup (parsed_edid->dsc_product_name, 14);
+      else
+        meta_output->product = g_strdup_printf ("0x%04x", (unsigned) parsed_edid->product_code);
+      if (parsed_edid->dsc_serial_number[0])
+        meta_output->serial = g_strndup (parsed_edid->dsc_serial_number, 14);
+      else
+        meta_output->serial = g_strdup_printf ("0x%08x", parsed_edid->serial_number);
+
+      g_free (parsed_edid);
+    }
+
+ out:
+  if (!meta_output->vendor)
+    {
+      meta_output->vendor = g_strdup ("unknown");
+      meta_output->product = g_strdup ("unknown");
+      meta_output->serial = g_strdup ("unknown");
+    }
+}
+
+void
+meta_monitor_manager_on_hotplug (MetaMonitorManager *manager)
+{
+  gboolean applied_config = FALSE;
+
+  /* If the monitor has hotplug_mode_update (which is used by VMs), don't bother
+   * applying our stored configuration, because it's likely the user just resizing
+   * the window.
+   */
+  if (!meta_monitor_manager_has_hotplug_mode_update (manager))
+    {
+      if (meta_monitor_config_apply_stored (manager->config, manager))
+        applied_config = TRUE;
+    }
+
+  /* If we haven't applied any configuration, apply the default configuration. */
+  if (!applied_config)
+    meta_monitor_config_make_default (manager->config, manager);
+}
+
+static gboolean
+calculate_viewport_matrix (MetaMonitorManager *manager,
+                           MetaOutput         *output,
+                           gfloat              viewport[6])
+{
+  gfloat x, y, width, height;
+
+  if (!output->crtc)
+    return FALSE;
+
+  x = (float) output->crtc->rect.x / manager->screen_width;
+  y = (float) output->crtc->rect.y / manager->screen_height;
+  width  = (float) output->crtc->rect.width / manager->screen_width;
+  height = (float) output->crtc->rect.height / manager->screen_height;
+
+  viewport[0] = width;
+  viewport[1] = 0.0f;
+  viewport[2] = x;
+  viewport[3] = 0.0f;
+  viewport[4] = height;
+  viewport[5] = y;
+
+  return TRUE;
+}
+
+static inline void
+multiply_matrix (float a[6],
+		 float b[6],
+		 float res[6])
+{
+  res[0] = a[0] * b[0] + a[1] * b[3];
+  res[1] = a[0] * b[1] + a[1] * b[4];
+  res[2] = a[0] * b[2] + a[1] * b[5] + a[2];
+  res[3] = a[3] * b[0] + a[4] * b[3];
+  res[4] = a[3] * b[1] + a[4] * b[4];
+  res[5] = a[3] * b[2] + a[4] * b[5] + a[5];
+}
+
+gboolean
+meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
+                                         MetaOutput         *output,
+                                         gfloat              matrix[6])
+{
+  gfloat viewport[9];
+
+  if (!calculate_viewport_matrix (manager, output, viewport))
+    return FALSE;
+
+  multiply_matrix (viewport, transform_matrices[output->crtc->transform],
+                   matrix);
+  return TRUE;
+}
+
+/**
+ * meta_monitor_manager_get_output_geometry:
+ * @manager: A #MetaMonitorManager
+ * @id: A valid #MetaOutput id
+ *
+ * Returns: The monitor index or -1 if @id isn't valid or the output
+ * isn't associated with a logical monitor.
+ */
+gint
+meta_monitor_manager_get_monitor_for_output (MetaMonitorManager *manager,
+                                             guint               id)
+{
+  MetaOutput *output;
+  guint i;
+
+  g_return_val_if_fail (META_IS_MONITOR_MANAGER (manager), -1);
+  g_return_val_if_fail (id < manager->n_outputs, -1);
+
+  output = &manager->outputs[id];
+  if (!output || !output->crtc)
+    return -1;
+
+  for (i = 0; i < manager->n_monitor_infos; i++)
+    if (meta_rectangle_contains_rect (&manager->monitor_infos[i].rect,
+                                      &output->crtc->rect))
+      return i;
+
+  return -1;
+}
+
+gint
+meta_monitor_manager_get_monitor_at_point (MetaMonitorManager *manager,
+                                           gfloat              x,
+                                           gfloat              y)
+{
+  unsigned int i;
+
+  for (i = 0; i < manager->n_monitor_infos; i++)
+    {
+      MetaMonitorInfo *monitor = &manager->monitor_infos[i];
+      int left, right, top, bottom;
+
+      left = monitor->rect.x;
+      right = left + monitor->rect.width;
+      top = monitor->rect.y;
+      bottom = top + monitor->rect.height;
+
+      if ((x >= left) && (x < right) && (y >= top) && (y < bottom))
+	return i;
+    }
+
+  return -1;
+}

src/backends/meta-stage.c

@@ -28,31 +28,83 @@
 #include <meta/meta-backend.h>
 #include <meta/util.h>
 
-struct _MetaStagePrivate {
+typedef struct {
-  CoglPipeline *pipeline;
+  gboolean enabled;
 
-  MetaCursorReference *cursor;
+  CoglPipeline *pipeline;
+  CoglTexture *texture;
 
   MetaRectangle current_rect;
   MetaRectangle previous_rect;
   gboolean previous_is_valid;
+} MetaOverlay;
+
+struct _MetaStagePrivate {
+  MetaOverlay cursor_overlay;
+  gboolean is_active;
 };
 typedef struct _MetaStagePrivate MetaStagePrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (MetaStage, meta_stage, CLUTTER_TYPE_STAGE);
 
 static void
-update_pipeline (MetaStage *stage)
+meta_overlay_init (MetaOverlay *overlay)
 {
-  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+  CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
 
-  if (priv->cursor)
+  overlay->pipeline = cogl_pipeline_new (ctx);
+}
+
+static void
+meta_overlay_free (MetaOverlay *overlay)
+{
+  if (overlay->pipeline)
+    cogl_object_unref (overlay->pipeline);
+}
+
+static void
+meta_overlay_set (MetaOverlay   *overlay,
+                  CoglTexture   *texture,
+                  MetaRectangle *rect)
+{
+  if (overlay->texture != texture)
     {
-      CoglTexture *texture = meta_cursor_reference_get_cogl_texture (priv->cursor, NULL, NULL);
+      overlay->texture = texture;
-      cogl_pipeline_set_layer_texture (priv->pipeline, 0, texture);
+
+      if (texture)
+        {
+          cogl_pipeline_set_layer_texture (overlay->pipeline, 0, texture);
+          overlay->enabled = TRUE;
+        }
+      else
+        {
+          cogl_pipeline_set_layer_texture (overlay->pipeline, 0, NULL);
+          overlay->enabled = FALSE;
+        }
     }
-  else
+
-    cogl_pipeline_set_layer_texture (priv->pipeline, 0, NULL);
+  overlay->current_rect = *rect;
+}
+
+static void
+meta_overlay_paint (MetaOverlay *overlay)
+{
+  if (!overlay->enabled)
+    return;
+
+  g_assert (meta_is_wayland_compositor ());
+
+  cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (),
+                                   overlay->pipeline,
+                                   overlay->current_rect.x,
+                                   overlay->current_rect.y,
+                                   overlay->current_rect.x +
+                                   overlay->current_rect.width,
+                                   overlay->current_rect.y +
+                                   overlay->current_rect.height);
+
+  overlay->previous_rect = overlay->current_rect;
+  overlay->previous_is_valid = TRUE;
 }
 
 static void
@@ -61,62 +113,63 @@ meta_stage_finalize (GObject *object)
   MetaStage *stage = META_STAGE (object);
   MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
 
-  if (priv->pipeline)
+  meta_overlay_free (&priv->cursor_overlay);
-    cogl_object_unref (priv->pipeline);
-}
-
-static void
-paint_cursor (MetaStage *stage)
-{
-  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
-
-  g_assert (meta_is_wayland_compositor ());
-
-  if (!priv->cursor)
-    return;
-
-  cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (),
-                                   priv->pipeline,
-                                   priv->current_rect.x,
-                                   priv->current_rect.y,
-                                   priv->current_rect.x +
-                                   priv->current_rect.width,
-                                   priv->current_rect.y +
-                                   priv->current_rect.height);
-
-  priv->previous_rect = priv->current_rect;
-  priv->previous_is_valid = TRUE;
 }
 
 static void
 meta_stage_paint (ClutterActor *actor)
 {
   MetaStage *stage = META_STAGE (actor);
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
 
   CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor);
 
-  if (meta_is_wayland_compositor ())
+  meta_overlay_paint (&priv->cursor_overlay);
-    paint_cursor (stage);
+}
+
+static void
+meta_stage_activate (ClutterStage *actor)
+{
+  MetaStage *stage = META_STAGE (actor);
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  CLUTTER_STAGE_CLASS (meta_stage_parent_class)->activate (actor);
+
+  priv->is_active = TRUE;
+}
+
+static void
+meta_stage_deactivate (ClutterStage *actor)
+{
+  MetaStage *stage = META_STAGE (actor);
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  CLUTTER_STAGE_CLASS (meta_stage_parent_class)->deactivate (actor);
+
+  priv->is_active = FALSE;
 }
 
 static void
 meta_stage_class_init (MetaStageClass *klass)
 {
+  ClutterStageClass *stage_class = (ClutterStageClass *) klass;
   ClutterActorClass *actor_class = (ClutterActorClass *) klass;
   GObjectClass *object_class = (GObjectClass *) klass;
 
   object_class->finalize = meta_stage_finalize;
 
   actor_class->paint = meta_stage_paint;
+
+  stage_class->activate = meta_stage_activate;
+  stage_class->deactivate = meta_stage_deactivate;
 }
 
 static void
 meta_stage_init (MetaStage *stage)
 {
-  CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
   MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
 
-  priv->pipeline = cogl_pipeline_new (ctx);
+  meta_overlay_init (&priv->cursor_overlay);
 
   clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), FALSE);
 }
@@ -130,46 +183,82 @@ meta_stage_new (void)
 }
 
 static void
-queue_redraw (MetaStage *stage)
+queue_redraw_for_overlay (MetaStage   *stage,
+                          MetaOverlay *overlay)
 {
-  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
   cairo_rectangle_int_t clip;
 
-  /* Clear the location the cursor was at before, if we need to. */
+  /* Clear the location the overlay was at before, if we need to. */
-  if (priv->previous_is_valid)
+  if (overlay->previous_is_valid)
     {
-      clip.x = priv->previous_rect.x;
+      clip.x = overlay->previous_rect.x;
-      clip.y = priv->previous_rect.y;
+      clip.y = overlay->previous_rect.y;
-      clip.width = priv->previous_rect.width;
+      clip.width = overlay->previous_rect.width;
-      clip.height = priv->previous_rect.height;
+      clip.height = overlay->previous_rect.height;
       clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip);
-      priv->previous_is_valid = FALSE;
+      overlay->previous_is_valid = FALSE;
     }
 
-  /* And queue a redraw for the current cursor location. */
+  /* Draw the overlay at the new position */
-  if (priv->cursor)
+  if (overlay->enabled)
     {
-      clip.x = priv->current_rect.x;
+      clip.x = overlay->current_rect.x;
-      clip.y = priv->current_rect.y;
+      clip.y = overlay->current_rect.y;
-      clip.width = priv->current_rect.width;
+      clip.width = overlay->current_rect.width;
-      clip.height = priv->current_rect.height;
+      clip.height = overlay->current_rect.height;
       clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip);
     }
 }
 
 void
-meta_stage_set_cursor (MetaStage           *stage,
+meta_stage_set_cursor (MetaStage     *stage,
-                       MetaCursorReference *cursor,
+                       CoglTexture   *texture,
-                       MetaRectangle       *rect)
+                       MetaRectangle *rect)
 {
   MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
 
-  if (priv->cursor != cursor)
+  g_assert (meta_is_wayland_compositor () || texture == NULL);
-    {
-      priv->cursor = cursor;
-      update_pipeline (stage);
-    }
 
-  priv->current_rect = *rect;
+  meta_overlay_set (&priv->cursor_overlay, texture, rect);
-  queue_redraw (stage);
+  queue_redraw_for_overlay (stage, &priv->cursor_overlay);
+}
+
+void
+meta_stage_set_active (MetaStage *stage,
+                       gboolean   is_active)
+{
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+  ClutterEvent event = { 0 };
+
+  /* Used by the native backend to inform accessibility technologies
+   * about when the stage loses and gains input focus.
+   *
+   * For the X11 backend, clutter transparently takes care of this
+   * for us.
+   */
+
+  if (priv->is_active == is_active)
+    return;
+
+  event.type = CLUTTER_STAGE_STATE;
+  clutter_event_set_stage (&event, CLUTTER_STAGE (stage));
+  event.stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED;
+
+  if (is_active)
+    event.stage_state.new_state = CLUTTER_STAGE_STATE_ACTIVATED;
+
+  /* Emitting this StageState event will result in the stage getting
+   * activated or deactivated (with the activated or deactivated signal
+   * getting emitted from the stage)
+   *
+   * FIXME: This won't update ClutterStage's own notion of its
+   * activeness. For that we would need to somehow trigger a
+   * _clutter_stage_update_state call, which will probably
+   * require new API in clutter. In practice, nothing relies
+   * on the ClutterStage's own notion of activeness when using
+   * the EGL backend.
+   *
+   * See http://bugzilla.gnome.org/746670
+   */
+  clutter_stage_event (CLUTTER_STAGE (stage), &event);
 }

src/backends/meta-stage.h

@@ -51,9 +51,12 @@ GType             meta_stage_get_type                (void) G_GNUC_CONST;
 
 ClutterActor     *meta_stage_new                     (void);
 
-void meta_stage_set_cursor (MetaStage           *stage,
+void meta_stage_set_cursor (MetaStage     *stage,
-                            MetaCursorReference *cursor,
+                            CoglTexture   *texture,
-                            MetaRectangle       *rect);
+                            MetaRectangle *rect);
+
+void meta_stage_set_active (MetaStage *stage,
+                            gboolean   is_active);
 G_END_DECLS
 
 #endif /* META_STAGE_H */

src/backends/native/meta-backend-native-private.h

@@ -0,0 +1,32 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015 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.
+ *
+ * Written by:
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+#ifndef META_BACKEND_NATIVE_PRIVATE_H
+#define META_BACKEND_NATIVE_PRIVATE_H
+
+#include "backends/native/meta-barrier-native.h"
+
+MetaBarrierManagerNative *meta_backend_native_get_barrier_manager (MetaBackendNative *native);
+
+#endif /* META_BACKEND_NATIVE_PRIVATE_H */

src/backends/native/meta-backend-native.c

@@ -24,10 +24,13 @@
 
 #include "config.h"
 
+#include "meta-backend-native.h"
+#include "meta-backend-native-private.h"
+
 #include <meta/main.h>
 #include <clutter/evdev/clutter-evdev.h>
-#include "meta-backend-native.h"
 
+#include "meta-barrier-native.h"
 #include "meta-idle-monitor-native.h"
 #include "meta-monitor-manager-kms.h"
 #include "meta-cursor-renderer-native.h"
@@ -36,11 +39,42 @@
 struct _MetaBackendNativePrivate
 {
   MetaLauncher *launcher;
+
+  MetaBarrierManagerNative *barrier_manager;
+
+  GSettings *keyboard_settings;
 };
 typedef struct _MetaBackendNativePrivate MetaBackendNativePrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendNative, meta_backend_native, META_TYPE_BACKEND);
 
+static void
+meta_backend_native_finalize (GObject *object)
+{
+  MetaBackendNative *native = META_BACKEND_NATIVE (object);
+  MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
+
+  meta_launcher_free (priv->launcher);
+
+  G_OBJECT_CLASS (meta_backend_native_parent_class)->finalize (object);
+}
+
+static void
+constrain_to_barriers (ClutterInputDevice *device,
+                       guint32             time,
+                       float              *new_x,
+                       float              *new_y)
+{
+  MetaBackendNative *native = META_BACKEND_NATIVE (meta_get_backend ());
+  MetaBackendNativePrivate *priv =
+    meta_backend_native_get_instance_private (native);
+
+  meta_barrier_manager_native_process (priv->barrier_manager,
+                                       device,
+                                       time,
+                                       new_x, new_y);
+}
+
 /*
  * The pointer constrain code is mostly a rip-off of the XRandR code from Xorg.
  * (from xserver/randr/rrcrtc.c, RRConstrainCursorHarder)
@@ -50,31 +84,6 @@ G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendNative, meta_backend_native, META_TYPE_BA
  *
  */
 
-static gboolean
-check_all_screen_monitors(MetaMonitorInfo *monitors,
-			  unsigned         n_monitors,
-			  float            x,
-			  float            y)
-{
-  unsigned int i;
-
-  for (i = 0; i < n_monitors; i++)
-    {
-      MetaMonitorInfo *monitor = &monitors[i];
-      int left, right, top, bottom;
-
-      left = monitor->rect.x;
-      right = left + monitor->rect.width;
-      top = monitor->rect.y;
-      bottom = left + monitor->rect.height;
-
-      if ((x >= left) && (x < right) && (y >= top) && (y < bottom))
-	return TRUE;
-    }
-
-  return FALSE;
-}
-
 static void
 constrain_all_screen_monitors (ClutterInputDevice *device,
 			       MetaMonitorInfo    *monitors,
@@ -84,25 +93,25 @@ constrain_all_screen_monitors (ClutterInputDevice *device,
 {
   ClutterPoint current;
   unsigned int i;
+  float cx, cy;
 
   clutter_input_device_get_coords (device, NULL, &current);
 
+  cx = current.x;
+  cy = current.y;
+
   /* if we're trying to escape, clamp to the CRTC we're coming from */
   for (i = 0; i < n_monitors; i++)
     {
       MetaMonitorInfo *monitor = &monitors[i];
       int left, right, top, bottom;
-      float nx, ny;
 
       left = monitor->rect.x;
       right = left + monitor->rect.width;
       top = monitor->rect.y;
-      bottom = left + monitor->rect.height;
+      bottom = top + monitor->rect.height;
 
-      nx = current.x;
+      if ((cx >= left) && (cx < right) && (cy >= top) && (cy < bottom))
-      ny = current.y;
-
-      if ((nx >= left) && (nx < right) && (ny >= top) && (ny < bottom))
 	{
 	  if (*x < left)
 	    *x = left;
@@ -128,14 +137,15 @@ pointer_constrain_callback (ClutterInputDevice *device,
   MetaMonitorManager *monitor_manager;
   MetaMonitorInfo *monitors;
   unsigned int n_monitors;
-  gboolean ret;
+
+  /* Constrain to barriers */
+  constrain_to_barriers (device, time, new_x, new_y);
 
   monitor_manager = meta_monitor_manager_get ();
   monitors = meta_monitor_manager_get_monitor_infos (monitor_manager, &n_monitors);
 
   /* if we're moving inside a monitor, we're fine */
-  ret = check_all_screen_monitors(monitors, n_monitors, *new_x, *new_y);
+  if (meta_monitor_manager_get_monitor_at_point (monitor_manager, *new_x, *new_y) >= 0)
-  if (ret == TRUE)
     return;
 
   /* if we're trying to escape, clamp to the CRTC we're coming from */
@@ -229,12 +239,16 @@ meta_backend_native_lock_layout_group (MetaBackend *backend,
 {
   ClutterDeviceManager *manager = clutter_device_manager_get_default ();
   clutter_evdev_set_keyboard_layout_index (manager, idx);
+  g_signal_emit_by_name (backend, "keymap-layout-group-changed", idx, 0);
 }
 
 static void
 meta_backend_native_class_init (MetaBackendNativeClass *klass)
 {
   MetaBackendClass *backend_class = META_BACKEND_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_backend_native_finalize;
 
   backend_class->post_init = meta_backend_native_post_init;
   backend_class->create_idle_monitor = meta_backend_native_create_idle_monitor;
@@ -254,6 +268,8 @@ meta_backend_native_init (MetaBackendNative *native)
 
   /* We're a display server, so start talking to weston-launch. */
   priv->launcher = meta_launcher_new ();
+
+  priv->barrier_manager = meta_barrier_manager_native_new ();
 }
 
 gboolean
@@ -266,11 +282,20 @@ meta_activate_vt (int vt, GError **error)
   return meta_launcher_activate_vt (priv->launcher, vt, error);
 }
 
+MetaBarrierManagerNative *
+meta_backend_native_get_barrier_manager (MetaBackendNative *native)
+{
+  MetaBackendNativePrivate *priv =
+    meta_backend_native_get_instance_private (native);
+
+  return priv->barrier_manager;
+}
+
 /**
  * meta_activate_session:
  *
  * Tells mutter to activate the session. When mutter is a
- * Wayland compositor, this tells logind to switch over to
+ * display server, this tells logind to switch over to
  * the new session.
  */
 gboolean

src/backends/native/meta-barrier-native.c

@@ -0,0 +1,744 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015 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.
+ *
+ * Written by:
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+/**
+ * SECTION:barrier-native
+ * @Title: MetaBarrierImplNative
+ * @Short_Description: Pointer barriers implementation for the native backend
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <meta/barrier.h>
+#include <meta/util.h>
+#include "backends/meta-backend-private.h"
+#include "backends/meta-barrier-private.h"
+#include "backends/native/meta-backend-native.h"
+#include "backends/native/meta-backend-native-private.h"
+#include "backends/native/meta-barrier-native.h"
+
+struct _MetaBarrierManagerNative
+{
+  GHashTable *barriers;
+};
+
+typedef enum {
+  /* The barrier is active and responsive to pointer motion. */
+  META_BARRIER_STATE_ACTIVE,
+
+  /* An intermediate state after a pointer hit the pointer barrier. */
+  META_BARRIER_STATE_HIT,
+
+  /* The barrier was hit by a pointer and is still within the hit box and
+   * has not been released.*/
+  META_BARRIER_STATE_HELD,
+
+  /* The pointer was released by the user. If the following motion hits
+   * the barrier, it will pass through. */
+  META_BARRIER_STATE_RELEASE,
+
+  /* An intermediate state when the pointer has left the barrier. */
+  META_BARRIER_STATE_LEFT,
+} MetaBarrierState;
+
+struct _MetaBarrierImplNativePrivate
+{
+  MetaBarrier              *barrier;
+  MetaBarrierManagerNative *manager;
+
+  gboolean                  is_active;
+  MetaBarrierState          state;
+  int                       trigger_serial;
+  guint32                   last_event_time;
+  MetaBarrierDirection      blocked_dir;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaBarrierImplNative, meta_barrier_impl_native,
+                            META_TYPE_BARRIER_IMPL)
+
+static int
+next_serial (void)
+{
+  static int barrier_serial = 1;
+
+  barrier_serial++;
+
+  /* If it wraps, avoid 0 as it's not a valid serial. */
+  if (barrier_serial == 0)
+    barrier_serial++;
+
+  return barrier_serial;
+}
+
+typedef struct _Vector2
+{
+  float x, y;
+} Vector2;
+
+static float
+vector2_cross_product (Vector2 a, Vector2 b)
+{
+  return a.x * b.y - a.y * b.x;
+}
+
+static Vector2
+vector2_add (Vector2 a, Vector2 b)
+{
+  return (Vector2) {
+    .x = a.x + b.x,
+    .y = a.y + b.y,
+  };
+}
+
+static Vector2
+vector2_subtract (Vector2 a, Vector2 b)
+{
+  return (Vector2) {
+    .x = a.x - b.x,
+    .y = a.y - b.y,
+  };
+}
+
+static Vector2
+vector2_multiply_constant (float c, Vector2 a)
+{
+  return (Vector2) {
+    .x = c * a.x,
+    .y = c * a.y,
+  };
+}
+
+typedef struct _Line2
+{
+  Vector2 a;
+  Vector2 b;
+} Line2;
+
+static gboolean
+lines_intersect (Line2 *line1, Line2 *line2, Vector2 *intersection)
+{
+  Vector2 p = line1->a;
+  Vector2 r = vector2_subtract (line1->b, line1->a);
+  Vector2 q = line2->a;
+  Vector2 s = vector2_subtract (line2->b, line2->a);
+  float rxs;
+  float sxr;
+  float t;
+  float u;
+
+  /*
+   * The line (p, r) and (q, s) intersects where
+   *
+   *   p + t r = q + u s
+   *
+   * Calculate t:
+   *
+   *   (p + t r) × s = (q + u s) × s
+   *   p × s + t (r × s) = q × s + u (s × s)
+   *   p × s + t (r × s) = q × s
+   *   t (r × s) = q × s - p × s
+   *   t (r × s) = (q - p) × s
+   *   t = ((q - p) × s) / (r × s)
+   *
+   * Using the same method, for u we get:
+   *
+   *   u = ((p - q) × r) / (s × r)
+   */
+
+  rxs = vector2_cross_product (r, s);
+  sxr = vector2_cross_product (s, r);
+
+  /* If r × s = 0 then the lines are either parallel or collinear. */
+  if (fabs ( rxs) < DBL_MIN)
+    return FALSE;
+
+  t = vector2_cross_product (vector2_subtract (q, p), s) / rxs;
+  u = vector2_cross_product (vector2_subtract (p, q), r) / sxr;
+
+
+  /* The lines only intersect if 0 ≤ t ≤ 1 and 0 ≤ u ≤ 1. */
+  if (t < 0.0 || t > 1.0 || u < 0.0 || u > 1.0)
+    return FALSE;
+
+  *intersection = vector2_add (p, vector2_multiply_constant (t, r));
+
+  return TRUE;
+}
+
+static gboolean
+is_barrier_horizontal (MetaBarrier *barrier)
+{
+  return barrier->priv->y1 == barrier->priv->y2;
+}
+
+static gboolean
+is_barrier_blocking_directions (MetaBarrier         *barrier,
+                                MetaBarrierDirection directions)
+{
+  /* Barriers doesn't block parallel motions. */
+  if (is_barrier_horizontal (barrier))
+    {
+      if ((directions & (META_BARRIER_DIRECTION_POSITIVE_Y |
+                         META_BARRIER_DIRECTION_NEGATIVE_Y)) == 0)
+        return FALSE;
+    }
+  else
+    {
+      if ((directions & (META_BARRIER_DIRECTION_POSITIVE_X |
+                         META_BARRIER_DIRECTION_NEGATIVE_X)) == 0)
+        return FALSE;
+    }
+
+  return (barrier->priv->directions & directions) != directions;
+}
+
+static void
+dismiss_pointer (MetaBarrierImplNative *self)
+{
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+
+  priv->state = META_BARRIER_STATE_LEFT;
+}
+
+static Line2
+barrier_to_line (MetaBarrier *barrier)
+{
+  return (Line2) {
+    .a = (Vector2) {
+      .x = MIN (barrier->priv->x1, barrier->priv->x2),
+      .y = MIN (barrier->priv->y1, barrier->priv->y2),
+    },
+    .b = (Vector2) {
+      .x = MAX (barrier->priv->x1, barrier->priv->x2),
+      .y = MAX (barrier->priv->y1, barrier->priv->y2),
+    },
+  };
+}
+
+/*
+ * Calculate the hit box for a held motion. The hit box is a 2 px wide region
+ * in the opposite direction of every direction the barrier blocks. The purpose
+ * of this is to allow small movements without receiving a "left" signal. This
+ * heuristic comes from the X.org pointer barrier implementation.
+ */
+static Line2
+calculate_barrier_hit_box (MetaBarrier *barrier)
+{
+  Line2 hit_box = barrier_to_line (barrier);
+
+  if (is_barrier_horizontal (barrier))
+    {
+      if (is_barrier_blocking_directions (barrier,
+                                          META_BARRIER_DIRECTION_POSITIVE_Y))
+        hit_box.a.y -= 2.0f;
+      if (is_barrier_blocking_directions (barrier,
+                                          META_BARRIER_DIRECTION_NEGATIVE_Y))
+        hit_box.b.y += 2.0f;
+    }
+  else
+    {
+      if (is_barrier_blocking_directions (barrier,
+                                          META_BARRIER_DIRECTION_POSITIVE_X))
+        hit_box.a.x -= 2.0f;
+      if (is_barrier_blocking_directions (barrier,
+                                          META_BARRIER_DIRECTION_NEGATIVE_X))
+        hit_box.b.x += 2.0f;
+    }
+
+  return hit_box;
+}
+
+static gboolean
+is_within_box (Line2 box, Vector2 point)
+{
+  return (point.x >= box.a.x && point.x < box.b.x &&
+          point.y >= box.a.y && point.y < box.b.y);
+}
+
+static void
+maybe_release_barrier (gpointer key,
+                       gpointer value,
+                       gpointer user_data)
+{
+  MetaBarrierImplNative *self = key;
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+  MetaBarrier *barrier = priv->barrier;
+  Line2 *motion = user_data;
+  Line2 hit_box;
+
+  if (priv->state != META_BARRIER_STATE_HELD)
+    return;
+
+  /* Release if we end up outside barrier end points. */
+  if (is_barrier_horizontal (barrier))
+    {
+      if (motion->b.x > MAX (barrier->priv->x1, barrier->priv->x2) ||
+          motion->b.x < MIN (barrier->priv->x1, barrier->priv->x2))
+        {
+          dismiss_pointer (self);
+          return;
+        }
+    }
+  else
+    {
+      if (motion->b.y > MAX (barrier->priv->y1, barrier->priv->y2) ||
+          motion->b.y < MIN (barrier->priv->y1, barrier->priv->y2))
+        {
+          dismiss_pointer (self);
+          return;
+        }
+    }
+
+  /* Release if we don't intersect and end up outside of hit box. */
+  hit_box = calculate_barrier_hit_box (barrier);
+  if (!is_within_box (hit_box, motion->b))
+    {
+      dismiss_pointer (self);
+      return;
+    }
+}
+
+static void
+maybe_release_barriers (MetaBarrierManagerNative *manager,
+                        float                     prev_x,
+                        float                     prev_y,
+                        float                     x,
+                        float                     y)
+{
+  Line2 motion = {
+    .a = {
+      .x = prev_x,
+      .y = prev_y,
+    },
+    .b = {
+      .x = x,
+      .y = y,
+    },
+  };
+
+  g_hash_table_foreach (manager->barriers,
+                        maybe_release_barrier,
+                        &motion);
+}
+
+typedef struct _MetaClosestBarrierData
+{
+  struct
+  {
+    Line2                       motion;
+    MetaBarrierDirection        directions;
+  } in;
+
+  struct
+  {
+    float                       closest_distance_2;
+    MetaBarrierImplNative      *barrier_impl;
+  } out;
+} MetaClosestBarrierData;
+
+static void
+update_closest_barrier (gpointer key,
+                        gpointer value,
+                        gpointer user_data)
+{
+  MetaBarrierImplNative *self = key;
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+  MetaBarrier *barrier = priv->barrier;
+  MetaClosestBarrierData *data = user_data;
+  Line2 barrier_line;
+  Vector2 intersection;
+  float dx, dy;
+  float distance_2;
+
+  /* Ignore if the barrier is not blocking in any of the motions directions. */
+  if (!is_barrier_blocking_directions (barrier, data->in.directions))
+    return;
+
+  /* Ignore if the barrier released the pointer. */
+  if (priv->state == META_BARRIER_STATE_RELEASE)
+    return;
+
+  /* Ignore if we are moving away from barrier. */
+  if (priv->state == META_BARRIER_STATE_HELD &&
+      (data->in.directions & priv->blocked_dir) == 0)
+    return;
+
+  /* Check if the motion intersects with the barrier, and retrieve the
+   * intersection point if any. */
+  barrier_line = (Line2) {
+    .a = {
+      .x = barrier->priv->x1,
+      .y = barrier->priv->y1
+    },
+    .b = {
+      .x = barrier->priv->x2,
+      .y = barrier->priv->y2
+    },
+  };
+  if (!lines_intersect (&barrier_line, &data->in.motion, &intersection))
+    return;
+
+  /* Calculate the distance to the barrier and keep track of the closest
+   * barrier. */
+  dx = intersection.x - data->in.motion.a.x;
+  dy = intersection.y - data->in.motion.a.y;
+  distance_2 = dx*dx + dy*dy;
+  if (data->out.barrier_impl == NULL ||
+      distance_2 < data->out.closest_distance_2)
+    {
+      data->out.barrier_impl = self;
+      data->out.closest_distance_2 = distance_2;
+    }
+}
+
+static gboolean
+get_closest_barrier (MetaBarrierManagerNative *manager,
+                     float                     prev_x,
+                     float                     prev_y,
+                     float                     x,
+                     float                     y,
+                     MetaBarrierDirection      motion_dir,
+                     MetaBarrierImplNative   **barrier_impl)
+{
+  MetaClosestBarrierData closest_barrier_data;
+
+  closest_barrier_data = (MetaClosestBarrierData) {
+    .in = {
+      .motion = {
+        .a = {
+          .x = prev_x,
+          .y = prev_y,
+        },
+        .b = {
+          .x = x,
+          .y = y,
+        },
+      },
+      .directions = motion_dir,
+    },
+  };
+
+  g_hash_table_foreach (manager->barriers,
+                        update_closest_barrier,
+                        &closest_barrier_data);
+
+  if (closest_barrier_data.out.barrier_impl != NULL)
+    {
+      *barrier_impl = closest_barrier_data.out.barrier_impl;
+      return TRUE;
+    }
+  else
+    {
+      return FALSE;
+    }
+}
+
+typedef struct _MetaBarrierEventData
+{
+  guint32             time;
+  float               prev_x;
+  float               prev_y;
+  float               x;
+  float               y;
+  float               dx;
+  float               dy;
+} MetaBarrierEventData;
+
+static void
+emit_barrier_event (MetaBarrierImplNative *self,
+                    guint32                time,
+                    float                  prev_x,
+                    float                  prev_y,
+                    float                  x,
+                    float                  y,
+                    float                  dx,
+                    float                  dy)
+{
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+  MetaBarrier *barrier = priv->barrier;
+  MetaBarrierEvent *event = g_slice_new0 (MetaBarrierEvent);
+  MetaBarrierState old_state = priv->state;
+
+  switch (priv->state)
+    {
+    case META_BARRIER_STATE_HIT:
+      priv->state = META_BARRIER_STATE_HELD;
+      priv->trigger_serial = next_serial ();
+      event->dt = 0;
+
+      break;
+    case META_BARRIER_STATE_RELEASE:
+    case META_BARRIER_STATE_LEFT:
+      priv->state = META_BARRIER_STATE_ACTIVE;
+
+      /* Intentional fall-through. */
+    case META_BARRIER_STATE_HELD:
+      event->dt = time - priv->last_event_time;
+
+      break;
+    case META_BARRIER_STATE_ACTIVE:
+      g_assert_not_reached (); /* Invalid state. */
+    }
+
+  event->ref_count = 1;
+  event->event_id = priv->trigger_serial;
+  event->time = time;
+
+  event->x = x;
+  event->y = y;
+  event->dx = dx;
+  event->dy = dy;
+
+  event->grabbed = priv->state == META_BARRIER_STATE_HELD;
+  event->released = old_state == META_BARRIER_STATE_RELEASE;
+
+  priv->last_event_time = time;
+
+  if (priv->state == META_BARRIER_STATE_HELD)
+    _meta_barrier_emit_hit_signal (barrier, event);
+  else
+    _meta_barrier_emit_left_signal (barrier, event);
+
+  meta_barrier_event_unref (event);
+}
+
+static void
+maybe_emit_barrier_event (gpointer key, gpointer value, gpointer user_data)
+{
+  MetaBarrierImplNative *self = key;
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+  MetaBarrierEventData *data = user_data;
+
+  switch (priv->state) {
+    case META_BARRIER_STATE_ACTIVE:
+      break;
+    case META_BARRIER_STATE_HIT:
+    case META_BARRIER_STATE_HELD:
+    case META_BARRIER_STATE_RELEASE:
+    case META_BARRIER_STATE_LEFT:
+      emit_barrier_event (self,
+                          data->time,
+                          data->prev_x,
+                          data->prev_y,
+                          data->x,
+                          data->y,
+                          data->dx,
+                          data->dy);
+      break;
+    }
+}
+
+/* Clamp (x, y) to the barrier and remove clamped direction from motion_dir. */
+static void
+clamp_to_barrier (MetaBarrierImplNative *self,
+                  MetaBarrierDirection *motion_dir,
+                  float *x,
+                  float *y)
+{
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+  MetaBarrier *barrier = priv->barrier;
+
+  if (is_barrier_horizontal (barrier))
+    {
+      if (*motion_dir & META_BARRIER_DIRECTION_POSITIVE_Y)
+        *y = barrier->priv->y1;
+      else if (*motion_dir & META_BARRIER_DIRECTION_NEGATIVE_Y)
+        *y = barrier->priv->y1;
+
+      priv->blocked_dir = *motion_dir & (META_BARRIER_DIRECTION_POSITIVE_Y |
+                                         META_BARRIER_DIRECTION_NEGATIVE_Y);
+      *motion_dir &= ~(META_BARRIER_DIRECTION_POSITIVE_Y |
+                       META_BARRIER_DIRECTION_NEGATIVE_Y);
+    }
+  else
+    {
+      if (*motion_dir & META_BARRIER_DIRECTION_POSITIVE_X)
+        *x = barrier->priv->x1;
+      else if (*motion_dir & META_BARRIER_DIRECTION_NEGATIVE_X)
+        *x = barrier->priv->x1;
+
+      priv->blocked_dir = *motion_dir & (META_BARRIER_DIRECTION_POSITIVE_X |
+                                         META_BARRIER_DIRECTION_NEGATIVE_X);
+      *motion_dir &= ~(META_BARRIER_DIRECTION_POSITIVE_X |
+                       META_BARRIER_DIRECTION_NEGATIVE_X);
+    }
+
+  priv->state = META_BARRIER_STATE_HIT;
+}
+
+void
+meta_barrier_manager_native_process (MetaBarrierManagerNative *manager,
+                                     ClutterInputDevice       *device,
+                                     guint32                   time,
+                                     float                    *x,
+                                     float                    *y)
+{
+  ClutterPoint prev_pos;
+  float prev_x;
+  float prev_y;
+  float orig_x = *x;
+  float orig_y = *y;
+  MetaBarrierDirection motion_dir = 0;
+  MetaBarrierEventData barrier_event_data;
+  MetaBarrierImplNative *barrier_impl;
+
+  if (!clutter_input_device_get_coords (device, NULL, &prev_pos))
+    return;
+
+  prev_x = prev_pos.x;
+  prev_y = prev_pos.y;
+
+  /* Get the direction of the motion vector. */
+  if (prev_x < *x)
+    motion_dir |= META_BARRIER_DIRECTION_POSITIVE_X;
+  else if (prev_x > *x)
+    motion_dir |= META_BARRIER_DIRECTION_NEGATIVE_X;
+  if (prev_y < *y)
+    motion_dir |= META_BARRIER_DIRECTION_POSITIVE_Y;
+  else if (prev_y > *y)
+    motion_dir |= META_BARRIER_DIRECTION_NEGATIVE_Y;
+
+  /* Clamp to the closest barrier in any direction until either there are no
+   * more barriers to clamp to or all directions have been clamped. */
+  while (motion_dir != 0)
+    {
+      if (get_closest_barrier (manager,
+                               prev_x, prev_y,
+                               *x, *y,
+                               motion_dir,
+                               &barrier_impl))
+        clamp_to_barrier (barrier_impl, &motion_dir, x, y);
+      else
+        break;
+    }
+
+  /* Potentially release active barrier movements. */
+  maybe_release_barriers (manager, prev_x, prev_y, *x, *y);
+
+  /* Initiate or continue barrier interaction. */
+  barrier_event_data = (MetaBarrierEventData) {
+    .time = time,
+    .prev_x = prev_x,
+    .prev_y = prev_y,
+    .x = *x,
+    .y = *y,
+    .dx = orig_x - prev_x,
+    .dy = orig_y - prev_y,
+  };
+
+  g_hash_table_foreach (manager->barriers,
+                        maybe_emit_barrier_event,
+                        &barrier_event_data);
+}
+
+static gboolean
+_meta_barrier_impl_native_is_active (MetaBarrierImpl *impl)
+{
+  MetaBarrierImplNative *self = META_BARRIER_IMPL_NATIVE (impl);
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+
+  return priv->is_active;
+}
+
+static void
+_meta_barrier_impl_native_release (MetaBarrierImpl  *impl,
+                                   MetaBarrierEvent *event)
+{
+  MetaBarrierImplNative *self = META_BARRIER_IMPL_NATIVE (impl);
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+
+  if (priv->state == META_BARRIER_STATE_HELD &&
+      event->event_id == priv->trigger_serial)
+    priv->state = META_BARRIER_STATE_RELEASE;
+}
+
+static void
+_meta_barrier_impl_native_destroy (MetaBarrierImpl *impl)
+{
+  MetaBarrierImplNative *self = META_BARRIER_IMPL_NATIVE (impl);
+  MetaBarrierImplNativePrivate *priv =
+    meta_barrier_impl_native_get_instance_private (self);
+
+  g_hash_table_remove (priv->manager->barriers, self);
+  priv->is_active = FALSE;
+}
+
+MetaBarrierImpl *
+meta_barrier_impl_native_new (MetaBarrier *barrier)
+{
+  MetaBarrierImplNative *self;
+  MetaBarrierImplNativePrivate *priv;
+  MetaBackendNative *native;
+  MetaBarrierManagerNative *manager;
+
+  self = g_object_new (META_TYPE_BARRIER_IMPL_NATIVE, NULL);
+  priv = meta_barrier_impl_native_get_instance_private (self);
+
+  priv->barrier = barrier;
+  priv->is_active = TRUE;
+
+  native = META_BACKEND_NATIVE (meta_get_backend ());
+  manager = meta_backend_native_get_barrier_manager (native);
+  priv->manager = manager;
+  g_hash_table_add (manager->barriers, self);
+
+  return META_BARRIER_IMPL (self);
+}
+
+static void
+meta_barrier_impl_native_class_init (MetaBarrierImplNativeClass *klass)
+{
+  MetaBarrierImplClass *impl_class = META_BARRIER_IMPL_CLASS (klass);
+
+  impl_class->is_active = _meta_barrier_impl_native_is_active;
+  impl_class->release = _meta_barrier_impl_native_release;
+  impl_class->destroy = _meta_barrier_impl_native_destroy;
+}
+
+static void
+meta_barrier_impl_native_init (MetaBarrierImplNative *self)
+{
+}
+
+MetaBarrierManagerNative *
+meta_barrier_manager_native_new (void)
+{
+  MetaBarrierManagerNative *manager;
+
+  manager = g_new0 (MetaBarrierManagerNative, 1);
+
+  manager->barriers = g_hash_table_new (NULL, NULL);
+
+  return manager;
+}

src/backends/native/meta-barrier-native.h

@@ -0,0 +1,68 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015 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.
+ *
+ * Written by:
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+#ifndef META_BARRIER_NATIVE_H
+#define META_BARRIER_NATIVE_H
+
+#include "backends/meta-barrier-private.h"
+
+G_BEGIN_DECLS
+
+#define META_TYPE_BARRIER_IMPL_NATIVE            (meta_barrier_impl_native_get_type ())
+#define META_BARRIER_IMPL_NATIVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BARRIER_IMPL_NATIVE, MetaBarrierImplNative))
+#define META_BARRIER_IMPL_NATIVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BARRIER_IMPL_NATIVE, MetaBarrierImplNativeClass))
+#define META_IS_BARRIER_IMPL_NATIVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BARRIER_IMPL_NATIVE))
+#define META_IS_BARRIER_IMPL_NATIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BARRIER_IMPL_NATIVE))
+#define META_BARRIER_IMPL_NATIVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BARRIER_IMPL_NATIVE, MetaBarrierImplNativeClass))
+
+typedef struct _MetaBarrierImplNative        MetaBarrierImplNative;
+typedef struct _MetaBarrierImplNativeClass   MetaBarrierImplNativeClass;
+typedef struct _MetaBarrierImplNativePrivate MetaBarrierImplNativePrivate;
+
+typedef struct _MetaBarrierManagerNative     MetaBarrierManagerNative;
+
+struct _MetaBarrierImplNative
+{
+  MetaBarrierImpl parent;
+};
+
+struct _MetaBarrierImplNativeClass
+{
+  MetaBarrierImplClass parent_class;
+};
+
+GType meta_barrier_impl_native_get_type (void) G_GNUC_CONST;
+
+MetaBarrierImpl *meta_barrier_impl_native_new (MetaBarrier *barrier);
+
+MetaBarrierManagerNative *meta_barrier_manager_native_new (void);
+void meta_barrier_manager_native_process (MetaBarrierManagerNative *manager,
+                                          ClutterInputDevice       *device,
+                                          guint32                   time,
+                                          float                    *x,
+                                          float                    *y);
+
+G_END_DECLS
+
+#endif /* META_BARRIER_NATIVE_H */

src/backends/native/meta-cursor-renderer-native.c

@@ -27,9 +27,17 @@
 #include "meta-cursor-renderer-native.h"
 
 #include <gbm.h>
+#include <xf86drm.h>
 
 #include "meta-cursor-private.h"
-#include "meta-monitor-manager.h"
+#include "meta-monitor-manager-private.h"
+
+#ifndef DRM_CAP_CURSOR_WIDTH
+#define DRM_CAP_CURSOR_WIDTH 0x8
+#endif
+#ifndef DRM_CAP_CURSOR_HEIGHT
+#define DRM_CAP_CURSOR_HEIGHT 0x9
+#endif
 
 struct _MetaCursorRendererNativePrivate
 {
@@ -37,6 +45,9 @@ struct _MetaCursorRendererNativePrivate
 
   int drm_fd;
   struct gbm_device *gbm;
+
+  uint64_t cursor_width;
+  uint64_t cursor_height;
 };
 typedef struct _MetaCursorRendererNativePrivate MetaCursorRendererNativePrivate;
 
@@ -71,17 +82,13 @@ set_crtc_cursor (MetaCursorRendererNative *native,
     {
       struct gbm_bo *bo;
       union gbm_bo_handle handle;
-      int width, height;
       int hot_x, hot_y;
 
       bo = meta_cursor_reference_get_gbm_bo (cursor, &hot_x, &hot_y);
 
       handle = gbm_bo_get_handle (bo);
-      width = gbm_bo_get_width (bo);
-      height = gbm_bo_get_height (bo);
-
       drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, handle.u32,
-                         width, height, hot_x, hot_y);
+                         priv->cursor_width, priv->cursor_height, hot_x, hot_y);
     }
   else
     {
@@ -186,6 +193,19 @@ meta_cursor_renderer_native_init (MetaCursorRendererNative *native)
       CoglRenderer *cogl_renderer = cogl_display_get_renderer (cogl_context_get_display (ctx));
       priv->drm_fd = cogl_kms_renderer_get_kms_fd (cogl_renderer);
       priv->gbm = gbm_create_device (priv->drm_fd);
+
+      uint64_t width, height;
+      if (drmGetCap (priv->drm_fd, DRM_CAP_CURSOR_WIDTH, &width) == 0 &&
+          drmGetCap (priv->drm_fd, DRM_CAP_CURSOR_HEIGHT, &height) == 0)
+        {
+          priv->cursor_width = width;
+          priv->cursor_height = height;
+        }
+      else
+        {
+          priv->cursor_width = 64;
+          priv->cursor_height = 64;
+        }
     }
 #endif
 }
@@ -198,6 +218,16 @@ meta_cursor_renderer_native_get_gbm_device (MetaCursorRendererNative *native)
   return priv->gbm;
 }
 
+void
+meta_cursor_renderer_native_get_cursor_size (MetaCursorRendererNative *native,
+                                             uint64_t *width, uint64_t *height)
+{
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+
+  *width = priv->cursor_width;
+  *height = priv->cursor_height;
+}
+
 void
 meta_cursor_renderer_native_force_update (MetaCursorRendererNative *native)
 {

src/backends/native/meta-cursor-renderer-native.h

@@ -50,6 +50,7 @@ struct _MetaCursorRendererNativeClass
 GType meta_cursor_renderer_native_get_type (void) G_GNUC_CONST;
 
 struct gbm_device * meta_cursor_renderer_native_get_gbm_device (MetaCursorRendererNative *renderer);
+void meta_cursor_renderer_native_get_cursor_size (MetaCursorRendererNative *native, uint64_t *width, uint64_t *height);
 void meta_cursor_renderer_native_force_update (MetaCursorRendererNative *renderer);
 
 #endif /* META_CURSOR_RENDERER_NATIVE_H */

src/backends/native/meta-input-settings-native.c

@@ -0,0 +1,264 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 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.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+#include "config.h"
+
+#include <clutter/evdev/clutter-evdev.h>
+#include <libinput.h>
+
+#include "meta-input-settings-native.h"
+
+G_DEFINE_TYPE (MetaInputSettingsNative, meta_input_settings_native, META_TYPE_INPUT_SETTINGS)
+
+static void
+meta_input_settings_native_set_send_events (MetaInputSettings        *settings,
+                                            ClutterInputDevice       *device,
+                                            GDesktopDeviceSendEvents  mode)
+{
+  enum libinput_config_send_events_mode libinput_mode;
+  struct libinput_device *libinput_device;
+
+  switch (mode)
+    {
+    case G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED:
+      libinput_mode = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
+      break;
+    case G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE:
+      libinput_mode = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
+      break;
+    case G_DESKTOP_DEVICE_SEND_EVENTS_ENABLED:
+      libinput_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+  libinput_device_config_send_events_set_mode (libinput_device, libinput_mode);
+}
+
+static void
+meta_input_settings_native_set_matrix (MetaInputSettings  *settings,
+                                       ClutterInputDevice *device,
+                                       gfloat              matrix[6])
+{
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  if (libinput_device_config_calibration_has_matrix (libinput_device) > 0)
+    libinput_device_config_calibration_set_matrix (libinput_device, matrix);
+}
+
+static void
+meta_input_settings_native_set_speed (MetaInputSettings  *settings,
+                                      ClutterInputDevice *device,
+                                      gdouble             speed)
+{
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+  libinput_device_config_accel_set_speed (libinput_device,
+                                          CLAMP (speed, -1, 1));
+}
+
+static void
+meta_input_settings_native_set_left_handed (MetaInputSettings  *settings,
+                                            ClutterInputDevice *device,
+                                            gboolean            enabled)
+{
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  if (libinput_device_config_left_handed_is_available (libinput_device))
+    libinput_device_config_left_handed_set (libinput_device, enabled);
+}
+
+static void
+meta_input_settings_native_set_tap_enabled (MetaInputSettings  *settings,
+                                            ClutterInputDevice *device,
+                                            gboolean            enabled)
+{
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  if (libinput_device_config_tap_get_finger_count (libinput_device) > 0)
+    libinput_device_config_tap_set_enabled (libinput_device,
+                                            enabled ?
+                                            LIBINPUT_CONFIG_TAP_ENABLED :
+                                            LIBINPUT_CONFIG_TAP_DISABLED);
+}
+
+static void
+meta_input_settings_native_set_invert_scroll (MetaInputSettings  *settings,
+                                              ClutterInputDevice *device,
+                                              gboolean            inverted)
+{
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  if (libinput_device_config_scroll_has_natural_scroll (libinput_device))
+    libinput_device_config_scroll_set_natural_scroll_enabled (libinput_device,
+                                                              inverted);
+}
+
+static gboolean
+device_set_scroll_method (struct libinput_device             *libinput_device,
+                          enum libinput_config_scroll_method  method)
+{
+  enum libinput_config_scroll_method supported;
+
+  supported = libinput_device_config_scroll_get_methods (libinput_device);
+
+  if (method & supported)
+    libinput_device_config_scroll_set_method (libinput_device, method);
+
+  return (method & supported) != 0;
+}
+
+static gboolean
+device_set_click_method (struct libinput_device            *libinput_device,
+                         enum libinput_config_click_method  method)
+{
+  enum libinput_config_click_method supported;
+
+  supported = libinput_device_config_click_get_methods (libinput_device);
+
+  if (method & supported)
+    libinput_device_config_click_set_method (libinput_device, method);
+
+  return (method & supported) != 0;
+}
+
+static void
+meta_input_settings_native_set_scroll_method (MetaInputSettings            *settings,
+                                              ClutterInputDevice           *device,
+                                              GDesktopTouchpadScrollMethod  mode)
+{
+  enum libinput_config_scroll_method scroll_method = 0;
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  switch (mode)
+    {
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED:
+      scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING:
+      scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING:
+      scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
+      break;
+    default:
+      g_assert_not_reached ();
+      return;
+  }
+
+  device_set_scroll_method (libinput_device, scroll_method);
+}
+
+static void
+meta_input_settings_native_set_scroll_button (MetaInputSettings  *settings,
+                                              ClutterInputDevice *device,
+                                              guint               button)
+{
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  if (!device_set_scroll_method (libinput_device,
+                                 LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN))
+    return;
+
+  libinput_device_config_scroll_set_button (libinput_device, button);
+}
+
+static void
+meta_input_settings_native_set_click_method (MetaInputSettings           *settings,
+                                             ClutterInputDevice          *device,
+                                             GDesktopTouchpadClickMethod  mode)
+{
+  enum libinput_config_click_method click_method = 0;
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  switch (mode)
+    {
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_DEFAULT:
+      click_method = libinput_device_config_click_get_default_method (libinput_device);
+      break;
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_NONE:
+      click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE;
+      break;
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_AREAS:
+      click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
+      break;
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_FINGERS:
+      click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
+      break;
+    default:
+      g_assert_not_reached ();
+      return;
+  }
+
+  device_set_click_method (libinput_device, click_method);
+}
+
+static void
+meta_input_settings_native_set_keyboard_repeat (MetaInputSettings *settings,
+                                                gboolean           enabled,
+                                                guint              delay,
+                                                guint              interval)
+{
+  ClutterDeviceManager *manager = clutter_device_manager_get_default ();
+
+  clutter_evdev_set_keyboard_repeat (manager, enabled, delay, interval);
+}
+
+static void
+meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass)
+{
+  MetaInputSettingsClass *input_settings_class = META_INPUT_SETTINGS_CLASS (klass);
+
+  input_settings_class->set_send_events = meta_input_settings_native_set_send_events;
+  input_settings_class->set_matrix = meta_input_settings_native_set_matrix;
+  input_settings_class->set_speed = meta_input_settings_native_set_speed;
+  input_settings_class->set_left_handed = meta_input_settings_native_set_left_handed;
+  input_settings_class->set_tap_enabled = meta_input_settings_native_set_tap_enabled;
+  input_settings_class->set_invert_scroll = meta_input_settings_native_set_invert_scroll;
+  input_settings_class->set_scroll_method = meta_input_settings_native_set_scroll_method;
+  input_settings_class->set_scroll_button = meta_input_settings_native_set_scroll_button;
+  input_settings_class->set_click_method = meta_input_settings_native_set_click_method;
+  input_settings_class->set_keyboard_repeat = meta_input_settings_native_set_keyboard_repeat;
+}
+
+static void
+meta_input_settings_native_init (MetaInputSettingsNative *settings)
+{
+}

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

@@ -0,0 +1,49 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2014 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+#ifndef META_INPUT_SETTINGS_NATIVE_H
+#define META_INPUT_SETTINGS_NATIVE_H
+
+#include "meta-input-settings-private.h"
+
+#define META_TYPE_INPUT_SETTINGS_NATIVE             (meta_input_settings_native_get_type ())
+#define META_INPUT_SETTINGS_NATIVE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_INPUT_SETTINGS_NATIVE, MetaInputSettingsNative))
+#define META_INPUT_SETTINGS_NATIVE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_INPUT_SETTINGS_NATIVE, MetaInputSettingsNativeClass))
+#define META_IS_INPUT_SETTINGS_NATIVE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_INPUT_SETTINGS_NATIVE))
+#define META_IS_INPUT_SETTINGS_NATIVE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_INPUT_SETTINGS_NATIVE))
+#define META_INPUT_SETTINGS_NATIVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_INPUT_SETTINGS_NATIVE, MetaInputSettingsNativeClass))
+
+typedef struct _MetaInputSettingsNative MetaInputSettingsNative;
+typedef struct _MetaInputSettingsNativeClass MetaInputSettingsNativeClass;
+
+struct _MetaInputSettingsNative
+{
+  MetaInputSettings parent_instance;
+};
+
+struct _MetaInputSettingsNativeClass
+{
+  MetaInputSettingsClass parent_class;
+};
+
+GType meta_input_settings_native_get_type (void) G_GNUC_CONST;
+
+#endif /* META_INPUT_SETTINGS_NATIVE_H */

src/backends/native/meta-launcher.c

@@ -130,8 +130,8 @@ take_device (Login1Session *session_proxy,
 {
   gboolean ret = FALSE;
   GVariant *fd_variant = NULL;
+  GUnixFDList *fd_list = NULL;
   int fd = -1;
-  GUnixFDList *fd_list;
 
   if (!login1_session_call_take_device_sync (session_proxy,
                                              dev_major,
@@ -307,7 +307,7 @@ get_kms_fd (Login1Session *session_proxy,
 MetaLauncher *
 meta_launcher_new (void)
 {
-  MetaLauncher *self;
+  MetaLauncher *self = NULL;
   Login1Session *session_proxy;
   GError *error = NULL;
   int kms_fd;
@@ -317,14 +317,14 @@ meta_launcher_new (void)
     {
       g_warning ("Could not take control: %s", error->message);
       g_error_free (error);
-      return NULL;
+      goto out;
     }
 
   if (!get_kms_fd (session_proxy, &kms_fd))
-    return NULL;
+    goto out;
 
   self = g_slice_new0 (MetaLauncher);
-  self->session_proxy = session_proxy;
+  self->session_proxy = g_object_ref (session_proxy);
   self->seat_proxy = get_seat_proxy (NULL);
 
   self->session_active = TRUE;
@@ -336,6 +336,9 @@ meta_launcher_new (void)
 
   g_signal_connect (self->session_proxy, "notify::active", G_CALLBACK (on_active_changed), self);
 
+out:
+  g_object_unref (session_proxy);
+
   return self;
 }
 

src/backends/native/meta-monitor-manager-kms.c

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include "meta-monitor-manager-kms.h"
+#include "meta-monitor-config.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -38,7 +39,8 @@
 
 #include <meta/main.h>
 #include <meta/errors.h>
-#include "edid.h"
+
+#include <gudev/gudev.h>
 
 typedef struct {
   drmModeConnector *connector;
@@ -64,10 +66,9 @@ struct _MetaMonitorManagerKms
   drmModeConnector **connectors;
   unsigned int       n_connectors;
 
-  drmModeEncoder   **encoders;
+  GUdevClient *udev;
-  unsigned int       n_encoders;
 
-  drmModeEncoder    *current_encoder;
+  GSettings *desktop_settings;
 };
 
 struct _MetaMonitorManagerKmsClass
@@ -82,12 +83,9 @@ free_resources (MetaMonitorManagerKms *manager_kms)
 {
   unsigned i;
 
-  for (i = 0; i < manager_kms->n_encoders; i++)
-    drmModeFreeEncoder (manager_kms->encoders[i]);
   for (i = 0; i < manager_kms->n_connectors; i++)
     drmModeFreeConnector (manager_kms->connectors[i]);
 
-  g_free (manager_kms->encoders);
   g_free (manager_kms->connectors);
 }
 
@@ -202,7 +200,7 @@ find_properties (MetaMonitorManagerKms *manager_kms,
                strcmp (prop->name, "EDID") == 0)
         output_kms->edid_blob_id = output_kms->connector->prop_values[i];
 
-      drmModeFreeProperty(prop);
+      drmModeFreeProperty (prop);
     }
 }
 
@@ -224,8 +222,10 @@ read_output_edid (MetaMonitorManagerKms *manager_kms,
     }
 
   if (edid_blob->length > 0)
-    return g_bytes_new_with_free_func (edid_blob->data, edid_blob->length,
+    {
-                                       (GDestroyNotify)drmModeFreePropertyBlob, edid_blob);
+      return g_bytes_new_with_free_func (edid_blob->data, edid_blob->length,
+                                         (GDestroyNotify)drmModeFreePropertyBlob, edid_blob);
+    }
   else
     {
       drmModeFreePropertyBlob (edid_blob);
@@ -263,11 +263,77 @@ find_output_by_id (MetaOutput *outputs,
   return NULL;
 }
 
+/* The minimum resolution at which we turn on a window-scale of 2 */
+#define HIDPI_LIMIT 192
+
+/* The minimum screen height at which we turn on a window-scale of 2;
+ * below this there just isn't enough vertical real estate for GNOME
+ * apps to work, and it's better to just be tiny */
+#define HIDPI_MIN_HEIGHT 1200
+
+/* From http://en.wikipedia.org/wiki/4K_resolution#Resolutions_of_common_formats */
+#define SMALLEST_4K_WIDTH 3656
+
+/* Based on code from gnome-settings-daemon */
+static int
+compute_scale (MetaOutput *output)
+{
+  int scale = 1;
+
+  if (!output->crtc)
+    goto out;
+
+  /* Scaling makes no sense */
+  if (output->crtc->rect.width < HIDPI_MIN_HEIGHT)
+    goto out;
+
+  /* 4K TV */
+  if (output->name != NULL && strstr(output->name, "HDMI") != NULL &&
+      output->crtc->rect.width >= SMALLEST_4K_WIDTH)
+    goto out;
+
+  /* Somebody encoded the aspect ratio (16/9 or 16/10)
+   * instead of the physical size */
+  if ((output->width_mm == 160 && output->height_mm == 90) ||
+      (output->width_mm == 160 && output->height_mm == 100) ||
+      (output->width_mm == 16 && output->height_mm == 9) ||
+      (output->width_mm == 16 && output->height_mm == 10))
+    goto out;
+
+  if (output->width_mm > 0 && output->height_mm > 0)
+    {
+      double dpi_x, dpi_y;
+      dpi_x = (double)output->crtc->rect.width / (output->width_mm / 25.4);
+      dpi_y = (double)output->crtc->rect.height / (output->height_mm / 25.4);
+      /* We don't completely trust these values so both
+         must be high, and never pick higher ratio than
+         2 automatically */
+      if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT)
+        scale = 2;
+    }
+
+out:
+  return scale;
+}
+
+static int
+get_output_scale (MetaMonitorManager *manager,
+                  MetaOutput         *output)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
+  int scale = g_settings_get_uint (manager_kms->desktop_settings, "scaling-factor");
+  if (scale > 0)
+    return scale;
+  else
+    return compute_scale (output);
+}
+
 static void
 meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
 {
   MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
   drmModeRes *resources;
+  drmModeEncoder **encoders;
   GHashTable *modes;
   GHashTableIter iter;
   drmModeModeInfo *mode;
@@ -303,7 +369,7 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
       connector = drmModeGetConnector (manager_kms->fd, resources->connectors[i]);
       manager_kms->connectors[i] = connector;
 
-      if (connector->connection == DRM_MODE_CONNECTED)
+      if (connector && connector->connection == DRM_MODE_CONNECTED)
         {
           /* Collect all modes for this connector */
           for (j = 0; j < (unsigned)connector->count_modes; j++)
@@ -311,13 +377,9 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
         }
     }
 
-  manager_kms->n_encoders = resources->count_encoders;
+  encoders = g_new (drmModeEncoder *, resources->count_encoders);
-  manager_kms->encoders = g_new (drmModeEncoder *, manager_kms->n_encoders);
+  for (i = 0; i < (unsigned)resources->count_encoders; i++)
-  for (i = 0; i < manager_kms->n_encoders; i++)
+    encoders[i] = drmModeGetEncoder (manager_kms->fd, resources->encoders[i]);
-    {
-      manager_kms->encoders[i] = drmModeGetEncoder (manager_kms->fd,
-                                                    resources->encoders[i]);
-    }
 
   manager->n_modes = g_hash_table_size (modes);
   manager->modes = g_new0 (MetaMonitorMode, manager->n_modes);
@@ -401,7 +463,7 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
       connector = manager_kms->connectors[i];
       meta_output = &manager->outputs[n_actual_outputs];
 
-      if (connector->connection == DRM_MODE_CONNECTED)
+      if (connector && connector->connection == DRM_MODE_CONNECTED)
 	{
           meta_output->driver_private = output_kms = g_slice_new0 (MetaOutputKms);
           meta_output->driver_notify = (GDestroyNotify)meta_output_destroy_notify;
@@ -410,6 +472,8 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
 	  meta_output->name = make_output_name (connector);
 	  meta_output->width_mm = connector->mmWidth;
 	  meta_output->height_mm = connector->mmHeight;
+	  meta_output->suggested_x = -1;
+	  meta_output->suggested_y = -1;
 
           switch (connector->subpixel)
             {
@@ -448,6 +512,8 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
 	  for (j = 0; j < output_kms->n_encoders; j++)
 	    {
               output_kms->encoders[j] = drmModeGetEncoder (manager_kms->fd, connector->encoders[j]);
+              if (!output_kms->encoders[j])
+                continue;
 
               /* We only list CRTCs as supported if they are supported by all encoders
                  for this connectors.
@@ -504,29 +570,13 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
           find_properties (manager_kms, output_kms);
 
           edid = read_output_edid (manager_kms, meta_output);
-          if (edid)
+          meta_output_parse_edid (meta_output, edid);
-            {
+          g_bytes_unref (edid);
-              MonitorInfo *parsed_edid;
-              gsize len;
 
-              parsed_edid = decode_edid (g_bytes_get_data (edid, &len));
+          /* MetaConnectorType matches DRM's connector types */
-              if (parsed_edid)
+          meta_output->connector_type = (MetaConnectorType) connector->connector_type;
-                {
-                  meta_output->vendor = g_strndup (parsed_edid->manufacturer_code, 4);
-                  meta_output->product = g_strndup (parsed_edid->dsc_product_name, 14);
-                  meta_output->serial = g_strndup (parsed_edid->dsc_serial_number, 14);
 
-                  g_free (parsed_edid);
+          meta_output->scale = get_output_scale (manager, meta_output);
-                }
-
-              g_bytes_unref (edid);
-            }
-          if (!meta_output->vendor)
-            {
-              meta_output->vendor = g_strdup ("unknown");
-              meta_output->product = g_strdup ("unknown");
-              meta_output->serial = g_strdup ("unknown");
-            }
 
           /* FIXME: backlight is a very driver specific thing unfortunately,
              every DDX does its own thing, and the dumb KMS API does not include it.
@@ -569,9 +619,10 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
 
       for (j = 0; j < output_kms->n_encoders; j++)
 	{
-	  for (k = 0; k < manager_kms->n_encoders; k++)
+	  for (k = 0; k < (unsigned)resources->count_encoders; k++)
 	    {
-	      if (output_kms->encoders[j]->encoder_id == manager_kms->encoders[k]->encoder_id)
+              if (output_kms->encoders[j] && encoders[k] &&
+                  output_kms->encoders[j]->encoder_id == encoders[k]->encoder_id)
 		{
                   output_kms->encoder_mask |= (1 << k);
 		  break;
@@ -618,6 +669,10 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
         }
     }
 
+  for (i = 0; i < (unsigned)resources->count_encoders; i++)
+    drmModeFreeEncoder (encoders[i]);
+  g_free (encoders);
+
   drmModeFreeResources (resources);
 }
 
@@ -635,6 +690,9 @@ meta_monitor_manager_kms_set_power_save_mode (MetaMonitorManager *manager,
                                               MetaPowerSave       mode)
 {
   MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
+  ClutterBackend *backend;
+  CoglContext *cogl_context;
+  CoglDisplay *cogl_display;
   uint64_t state;
   unsigned i;
 
@@ -673,6 +731,14 @@ meta_monitor_manager_kms_set_power_save_mode (MetaMonitorManager *manager,
                           meta_output->name, strerror (errno));
         }
     }
+
+  backend = clutter_get_default_backend ();
+  cogl_context = clutter_backend_get_cogl_context (backend);
+  cogl_display = cogl_context_get_display (cogl_context);
+
+  for (i = 0; i < manager->n_crtcs; i++)
+    cogl_kms_display_set_ignore_crtc (cogl_display, manager->crtcs[i].crtc_id,
+                                      mode != META_POWER_SAVE_ON);
 }
 
 static void
@@ -893,6 +959,23 @@ meta_monitor_manager_kms_set_crtc_gamma (MetaMonitorManager *manager,
   drmModeCrtcSetGamma (manager_kms->fd, crtc->crtc_id, size, red, green, blue);
 }
 
+static void
+on_uevent (GUdevClient *client,
+           const char  *action,
+           GUdevDevice *device,
+           gpointer     user_data)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (user_data);
+  MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_kms);
+
+  if (!g_udev_device_get_property_as_boolean (device, "HOTPLUG"))
+    return;
+
+  meta_monitor_manager_read_current_config (manager);
+
+  meta_monitor_manager_on_hotplug (manager);
+}
+
 static void
 meta_monitor_manager_kms_init (MetaMonitorManagerKms *manager_kms)
 {
@@ -907,6 +990,24 @@ meta_monitor_manager_kms_init (MetaMonitorManagerKms *manager_kms)
   cogl_renderer = cogl_display_get_renderer (cogl_display);
 
   manager_kms->fd = cogl_kms_renderer_get_kms_fd (cogl_renderer);
+
+  const char *subsystems[2] = { "drm", NULL };
+  manager_kms->udev = g_udev_client_new (subsystems);
+  g_signal_connect (manager_kms->udev, "uevent",
+                    G_CALLBACK (on_uevent), manager_kms);
+
+  manager_kms->desktop_settings = g_settings_new ("org.gnome.desktop.interface");
+}
+
+static void
+meta_monitor_manager_kms_dispose (GObject *object)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (object);
+
+  g_clear_object (&manager_kms->udev);
+  g_clear_object (&manager_kms->desktop_settings);
+
+  G_OBJECT_CLASS (meta_monitor_manager_kms_parent_class)->dispose (object);
 }
 
 static void
@@ -925,6 +1026,7 @@ meta_monitor_manager_kms_class_init (MetaMonitorManagerKmsClass *klass)
   MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  object_class->dispose = meta_monitor_manager_kms_dispose;
   object_class->finalize = meta_monitor_manager_kms_finalize;
 
   manager_class->read_current = meta_monitor_manager_kms_read_current;

src/backends/native/meta-monitor-manager-kms.h

@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_MANAGER_KMS_H
 #define META_MONITOR_MANAGER_KMS_H
 
-#include "meta-monitor-manager.h"
+#include "meta-monitor-manager-private.h"
 
 #define META_TYPE_MONITOR_MANAGER_KMS            (meta_monitor_manager_kms_get_type ())
 #define META_MONITOR_MANAGER_KMS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKms))

src/backends/x11/meta-backend-x11.c

@@ -65,20 +65,29 @@ struct _MetaBackendX11Private
   uint8_t xkb_error_base;
 
   struct xkb_keymap *keymap;
+  gchar *keymap_layouts;
+  gchar *keymap_variants;
+  gchar *keymap_options;
 };
 typedef struct _MetaBackendX11Private MetaBackendX11Private;
 
+static void apply_keymap (MetaBackendX11 *x11);
+
 G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendX11, meta_backend_x11, META_TYPE_BACKEND);
 
 static void
 handle_alarm_notify (MetaBackend *backend,
                      XEvent      *event)
 {
-  int i;
+  GHashTableIter iter;
+  gpointer value;
 
-  for (i = 0; i <= backend->device_id_max; i++)
+  g_hash_table_iter_init (&iter, backend->device_monitors);
-    if (backend->device_monitors[i])
+  while (g_hash_table_iter_next (&iter, NULL, &value))
-      meta_idle_monitor_xsync_handle_xevent (backend->device_monitors[i], (XSyncAlarmNotifyEvent*) event);
+    {
+      MetaIdleMonitor *device_monitor = META_IDLE_MONITOR (value);
+      meta_idle_monitor_xsync_handle_xevent (device_monitor, (XSyncAlarmNotifyEvent*) event);
+    }
 }
 
 static void
@@ -120,6 +129,39 @@ translate_device_event (MetaBackendX11 *x11,
     }
 }
 
+static void
+translate_crossing_event (MetaBackendX11 *x11,
+                          XIEnterEvent   *enter_event)
+{
+  /* Throw out weird events generated by grabs. */
+  if (enter_event->mode == XINotifyGrab ||
+      enter_event->mode == XINotifyUngrab)
+    {
+      enter_event->event = None;
+      return;
+    }
+
+  enter_event->event = meta_backend_x11_get_xwindow (x11);
+}
+
+static void
+handle_device_change (MetaBackendX11 *x11,
+                      XIEvent        *event)
+{
+  XIDeviceChangedEvent *device_changed;
+
+  if (event->evtype != XI_DeviceChanged)
+    return;
+
+  device_changed = (XIDeviceChangedEvent *) event;
+
+  if (device_changed->reason != XISlaveSwitch)
+    return;
+
+  meta_backend_update_last_device (META_BACKEND (x11),
+                                   device_changed->sourceid);
+}
+
 /* Clutter makes the assumption that there is only one X window
  * per stage, which is a valid assumption to make for a generic
  * application toolkit. As such, it will ignore any events sent
@@ -131,7 +173,32 @@ translate_device_event (MetaBackendX11 *x11,
  */
 static void
 maybe_spoof_event_as_stage_event (MetaBackendX11 *x11,
-                                  XEvent         *event)
+                                  XIEvent        *input_event)
+{
+  switch (input_event->evtype)
+    {
+    case XI_Motion:
+    case XI_ButtonPress:
+    case XI_ButtonRelease:
+    case XI_KeyPress:
+    case XI_KeyRelease:
+    case XI_TouchBegin:
+    case XI_TouchUpdate:
+    case XI_TouchEnd:
+      translate_device_event (x11, (XIDeviceEvent *) input_event);
+      break;
+    case XI_Enter:
+    case XI_Leave:
+      translate_crossing_event (x11, (XIEnterEvent *) input_event);
+      break;
+    default:
+      break;
+    }
+}
+
+static void
+handle_input_event (MetaBackendX11 *x11,
+                    XEvent         *event)
 {
   MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
 
@@ -140,21 +207,10 @@ maybe_spoof_event_as_stage_event (MetaBackendX11 *x11,
     {
       XIEvent *input_event = (XIEvent *) event->xcookie.data;
 
-      switch (input_event->evtype)
+      if (input_event->evtype == XI_DeviceChanged)
-        {
+        handle_device_change (x11, input_event);
-        case XI_Motion:
+      else
-        case XI_ButtonPress:
+        maybe_spoof_event_as_stage_event (x11, input_event);
-        case XI_ButtonRelease:
-        case XI_KeyPress:
-        case XI_KeyRelease:
-        case XI_TouchBegin:
-        case XI_TouchUpdate:
-        case XI_TouchEnd:
-          translate_device_event (x11, (XIDeviceEvent *) input_event);
-          break;
-        default:
-          break;
-        }
     }
 }
 
@@ -223,7 +279,7 @@ handle_host_xevent (MetaBackend *backend,
 
   if (!bypass_clutter)
     {
-      maybe_spoof_event_as_stage_event (x11, event);
+      handle_input_event (x11, event);
       clutter_x11_handle_event (event);
     }
 
@@ -326,6 +382,17 @@ take_touch_grab (MetaBackend *backend)
                     False, &mask, 1, &mods);
 }
 
+static void
+on_device_added (ClutterDeviceManager *device_manager,
+                 ClutterInputDevice   *device,
+                 gpointer              user_data)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (user_data);
+
+  if (clutter_input_device_get_device_type (device) == CLUTTER_KEYBOARD_DEVICE)
+    apply_keymap (x11);
+}
+
 static void
 meta_backend_x11_post_init (MetaBackend *backend)
 {
@@ -376,6 +443,9 @@ meta_backend_x11_post_init (MetaBackend *backend)
     meta_fatal ("X server doesn't have the XKB extension, version %d.%d or newer\n",
                 XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MINOR_XKB_VERSION);
 
+  g_signal_connect_object (clutter_device_manager_get_default (), "device-added",
+                           G_CALLBACK (on_device_added), backend, 0);
+
   META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend);
 }
 
@@ -560,21 +630,22 @@ upload_xkb_description (Display              *xdisplay,
 }
 
 static void
-meta_backend_x11_set_keymap (MetaBackend *backend,
+apply_keymap (MetaBackendX11 *x11)
-                             const char  *layouts,
-                             const char  *variants,
-                             const char  *options)
 {
-  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
   MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
   XkbRF_RulesRec *xkb_rules;
   XkbRF_VarDefsRec xkb_var_defs = { 0 };
   gchar *rules_file_path;
 
+  if (!priv->keymap_layouts ||
+      !priv->keymap_variants ||
+      !priv->keymap_options)
+    return;
+
   get_xkbrf_var_defs (priv->xdisplay,
-                      layouts,
+                      priv->keymap_layouts,
-                      variants,
+                      priv->keymap_variants,
-                      options,
+                      priv->keymap_options,
                       &rules_file_path,
                       &xkb_var_defs);
 
@@ -598,6 +669,25 @@ meta_backend_x11_set_keymap (MetaBackend *backend,
   g_free (rules_file_path);
 }
 
+static void
+meta_backend_x11_set_keymap (MetaBackend *backend,
+                             const char  *layouts,
+                             const char  *variants,
+                             const char  *options)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+
+  g_free (priv->keymap_layouts);
+  priv->keymap_layouts = g_strdup (layouts);
+  g_free (priv->keymap_variants);
+  priv->keymap_variants = g_strdup (variants);
+  g_free (priv->keymap_options);
+  priv->keymap_options = g_strdup (options);
+
+  apply_keymap (x11);
+}
+
 static struct xkb_keymap *
 meta_backend_x11_get_keymap (MetaBackend *backend)
 {
@@ -631,10 +721,20 @@ static void
 meta_backend_x11_update_screen_size (MetaBackend *backend,
                                      int width, int height)
 {
-  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  if (meta_is_wayland_compositor ())
-  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+    {
-  Window xwin = meta_backend_x11_get_xwindow (x11);
+      /* For a nested wayland session, we want to go through Clutter to update the
-  XResizeWindow (priv->xdisplay, xwin, width, height);
+       * toplevel window size, rather than doing it directly.
+       */
+      META_BACKEND_CLASS (meta_backend_x11_parent_class)->update_screen_size (backend, width, height);
+    }
+  else
+    {
+      MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+      MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+      Window xwin = meta_backend_x11_get_xwindow (x11);
+      XResizeWindow (priv->xdisplay, xwin, width, height);
+    }
 }
 
 static void

src/backends/x11/meta-barrier-x11.c

@@ -0,0 +1,216 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014-2015 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.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+/**
+ * SECTION:barrier-x11
+ * @Title: MetaBarrierImplX11
+ * @Short_Description: Pointer barriers implementation for X11
+ */
+
+#include "config.h"
+
+#ifdef HAVE_XI23
+
+#include <glib-object.h>
+
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/Xfixes.h>
+#include <meta/barrier.h>
+#include "backends/x11/meta-barrier-x11.h"
+#include "display-private.h"
+
+struct _MetaBarrierImplX11Private
+{
+  MetaBarrier *barrier;
+  PointerBarrier xbarrier;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaBarrierImplX11, meta_barrier_impl_x11,
+                            META_TYPE_BARRIER_IMPL)
+
+static gboolean
+_meta_barrier_impl_x11_is_active (MetaBarrierImpl *impl)
+{
+  MetaBarrierImplX11 *self = META_BARRIER_IMPL_X11 (impl);
+  MetaBarrierImplX11Private *priv =
+    meta_barrier_impl_x11_get_instance_private (self);
+
+  return priv->xbarrier != 0;
+}
+
+static void
+_meta_barrier_impl_x11_release (MetaBarrierImpl  *impl,
+                                MetaBarrierEvent *event)
+{
+  MetaBarrierImplX11 *self = META_BARRIER_IMPL_X11 (impl);
+  MetaBarrierImplX11Private *priv =
+    meta_barrier_impl_x11_get_instance_private (self);
+  MetaDisplay *display = priv->barrier->priv->display;
+
+  if (META_DISPLAY_HAS_XINPUT_23 (display))
+    {
+      XIBarrierReleasePointer (display->xdisplay,
+                               META_VIRTUAL_CORE_POINTER_ID,
+                               priv->xbarrier, event->event_id);
+    }
+}
+
+static void
+_meta_barrier_impl_x11_destroy (MetaBarrierImpl *impl)
+{
+  MetaBarrierImplX11 *self = META_BARRIER_IMPL_X11 (impl);
+  MetaBarrierImplX11Private *priv =
+    meta_barrier_impl_x11_get_instance_private (self);
+  MetaDisplay *display = priv->barrier->priv->display;
+  Display *dpy;
+
+  if (display == NULL)
+    return;
+
+  dpy = display->xdisplay;
+
+  if (!meta_barrier_is_active (priv->barrier))
+    return;
+
+  XFixesDestroyPointerBarrier (dpy, priv->xbarrier);
+  g_hash_table_remove (display->xids, &priv->xbarrier);
+  priv->xbarrier = 0;
+}
+
+MetaBarrierImpl *
+meta_barrier_impl_x11_new (MetaBarrier *barrier)
+{
+  MetaBarrierImplX11 *self;
+  MetaBarrierImplX11Private *priv;
+  MetaDisplay *display = barrier->priv->display;
+  Display *dpy;
+  Window root;
+
+  if (display == NULL)
+    {
+      g_warning ("A display must be provided when constructing a barrier.");
+      return NULL;
+    }
+
+  self = g_object_new (META_TYPE_BARRIER_IMPL_X11, NULL);
+  priv = meta_barrier_impl_x11_get_instance_private (self);
+  priv->barrier = barrier;
+
+  dpy = display->xdisplay;
+  root = DefaultRootWindow (dpy);
+
+  priv->xbarrier = XFixesCreatePointerBarrier (dpy, root,
+                                               barrier->priv->x1,
+                                               barrier->priv->y1,
+                                               barrier->priv->x2,
+                                               barrier->priv->y2,
+                                               barrier->priv->directions,
+                                               0, NULL);
+
+  g_hash_table_insert (display->xids, &priv->xbarrier, barrier);
+
+  return META_BARRIER_IMPL (self);
+}
+
+static void
+meta_barrier_fire_xevent (MetaBarrier    *barrier,
+                          XIBarrierEvent *xevent)
+{
+  MetaBarrierEvent *event = g_slice_new0 (MetaBarrierEvent);
+
+  event->ref_count = 1;
+  event->event_id = xevent->eventid;
+  event->time = xevent->time;
+  event->dt = xevent->dtime;
+
+  event->x = xevent->root_x;
+  event->y = xevent->root_y;
+  event->dx = xevent->dx;
+  event->dy = xevent->dy;
+
+  event->released = (xevent->flags & XIBarrierPointerReleased) != 0;
+  event->grabbed = (xevent->flags & XIBarrierDeviceIsGrabbed) != 0;
+
+  switch (xevent->evtype)
+    {
+    case XI_BarrierHit:
+      _meta_barrier_emit_hit_signal (barrier, event);
+      break;
+    case XI_BarrierLeave:
+      _meta_barrier_emit_left_signal (barrier, event);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  meta_barrier_event_unref (event);
+}
+
+gboolean
+meta_display_process_barrier_xevent (MetaDisplay *display,
+                                     XIEvent     *event)
+{
+  MetaBarrier *barrier;
+  XIBarrierEvent *xev;
+
+  if (event == NULL)
+    return FALSE;
+
+  switch (event->evtype)
+    {
+    case XI_BarrierHit:
+    case XI_BarrierLeave:
+      break;
+    default:
+      return FALSE;
+    }
+
+  xev = (XIBarrierEvent *) event;
+  barrier = g_hash_table_lookup (display->xids, &xev->barrier);
+  if (barrier != NULL)
+    {
+      meta_barrier_fire_xevent (barrier, xev);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+meta_barrier_impl_x11_class_init (MetaBarrierImplX11Class *klass)
+{
+  MetaBarrierImplClass *impl_class = META_BARRIER_IMPL_CLASS (klass);
+
+  impl_class->is_active = _meta_barrier_impl_x11_is_active;
+  impl_class->release = _meta_barrier_impl_x11_release;
+  impl_class->destroy = _meta_barrier_impl_x11_destroy;
+}
+
+static void
+meta_barrier_impl_x11_init (MetaBarrierImplX11 *self)
+{
+}
+
+#endif /* HAVE_XI23 */

src/backends/x11/meta-barrier-x11.h

@@ -0,0 +1,59 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015 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.
+ *
+ * Written by:
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+#ifndef META_BARRIER_X11_H
+#define META_BARRIER_X11_H
+
+#include "backends/meta-barrier-private.h"
+
+G_BEGIN_DECLS
+
+#define META_TYPE_BARRIER_IMPL_X11            (meta_barrier_impl_x11_get_type ())
+#define META_BARRIER_IMPL_X11(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BARRIER_IMPL_X11, MetaBarrierImplX11))
+#define META_BARRIER_IMPL_X11_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BARRIER_IMPL_X11, MetaBarrierImplX11Class))
+#define META_IS_BARRIER_IMPL_X11(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BARRIER_IMPL_X11))
+#define META_IS_BARRIER_IMPL_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BARRIER_IMPL_X11))
+#define META_BARRIER_IMPL_X11_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BARRIER_IMPL_X11, MetaBarrierImplX11Class))
+
+typedef struct _MetaBarrierImplX11        MetaBarrierImplX11;
+typedef struct _MetaBarrierImplX11Class   MetaBarrierImplX11Class;
+typedef struct _MetaBarrierImplX11Private MetaBarrierImplX11Private;
+
+struct _MetaBarrierImplX11
+{
+  MetaBarrierImpl parent;
+};
+
+struct _MetaBarrierImplX11Class
+{
+  MetaBarrierImplClass parent_class;
+};
+
+GType meta_barrier_impl_x11_get_type (void) G_GNUC_CONST;
+
+MetaBarrierImpl *meta_barrier_impl_x11_new (MetaBarrier *barrier);
+
+G_END_DECLS
+
+#endif /* META_BARRIER_X11_H1 */

src/backends/x11/meta-cursor-renderer-x11.c

@@ -26,6 +26,8 @@
 
 #include "meta-cursor-renderer-x11.h"
 
+#include <X11/extensions/Xfixes.h>
+
 #include "meta-backend-x11.h"
 #include "meta-stage.h"
 

src/backends/x11/meta-input-settings-x11.c

@@ -0,0 +1,255 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 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.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+#include "config.h"
+
+#include "meta-backend-x11.h"
+#include "meta-input-settings-x11.h"
+
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+#include <X11/extensions/XInput2.h>
+#include <X11/XKBlib.h>
+
+#include <meta/errors.h>
+
+G_DEFINE_TYPE (MetaInputSettingsX11, meta_input_settings_x11, META_TYPE_INPUT_SETTINGS)
+
+static void
+change_property (ClutterInputDevice *device,
+                 const gchar        *property,
+                 Atom                type,
+                 int                 format,
+                 void               *data,
+                 gulong              nitems)
+{
+  MetaBackend *backend = meta_get_backend ();
+  Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+  gulong nitems_ret, bytes_after_ret;
+  int rc, device_id, format_ret;
+  Atom property_atom, type_ret;
+  guchar *data_ret;
+
+  property_atom = XInternAtom (xdisplay, property, False);
+  device_id = clutter_input_device_get_device_id (device);
+
+  rc = XIGetProperty (xdisplay, device_id, property_atom,
+                      0, 0, False, type, &type_ret, &format_ret,
+                      &nitems_ret, &bytes_after_ret, &data_ret);
+
+  meta_XFree (data_ret);
+
+  if (rc == Success && type_ret == type && format_ret == format)
+    XIChangeProperty (xdisplay, device_id, property_atom, type,
+                      format, XIPropModeReplace, data, nitems);
+}
+
+static void
+meta_input_settings_x11_set_send_events (MetaInputSettings        *settings,
+                                         ClutterInputDevice       *device,
+                                         GDesktopDeviceSendEvents  mode)
+{
+  guchar values[2] = { 0 }; /* disabled, disabled-on-external-mouse */
+
+  switch (mode)
+    {
+    case G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED:
+      values[0] = 1;
+      break;
+    case G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE:
+      values[1] = 1;
+      break;
+    default:
+      break;
+    }
+
+  change_property (device, "libinput Send Events Mode Enabled",
+                   XA_INTEGER, 8, &values, 2);
+}
+
+static void
+meta_input_settings_x11_set_matrix (MetaInputSettings  *settings,
+                                    ClutterInputDevice *device,
+                                    gfloat              matrix[6])
+{
+  MetaBackend *backend = meta_get_backend ();
+  Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+  gfloat full_matrix[9] = { matrix[0], matrix[1], matrix[2],
+                            matrix[3], matrix[4], matrix[5],
+                            0, 0, 1 };
+
+  change_property (device, "Coordinate Transformation Matrix",
+                   XInternAtom (xdisplay, "FLOAT", False),
+                   32, &full_matrix, 9);
+}
+
+static void
+meta_input_settings_x11_set_speed (MetaInputSettings  *settings,
+                                   ClutterInputDevice *device,
+                                   gdouble             speed)
+{
+  MetaBackend *backend = meta_get_backend ();
+  Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+  gfloat value = speed;
+
+  change_property (device, "libinput Accel Speed",
+                   XInternAtom (xdisplay, "FLOAT", False),
+                   32, &value, 1);
+}
+
+static void
+meta_input_settings_x11_set_left_handed (MetaInputSettings  *settings,
+                                         ClutterInputDevice *device,
+                                         gboolean            enabled)
+{
+  guchar value = (enabled) ? 1 : 0;
+
+  change_property (device, "libinput Left Handed Enabled",
+                   XA_INTEGER, 8, &value, 1);
+}
+
+static void
+meta_input_settings_x11_set_tap_enabled (MetaInputSettings  *settings,
+                                         ClutterInputDevice *device,
+                                         gboolean            enabled)
+{
+  guchar value = (enabled) ? 1 : 0;
+
+  change_property (device, "libinput Tapping Enabled",
+                   XA_INTEGER, 8, &value, 1);
+}
+
+static void
+meta_input_settings_x11_set_invert_scroll (MetaInputSettings  *settings,
+                                           ClutterInputDevice *device,
+                                           gboolean            inverted)
+{
+  guchar value = (inverted) ? 1 : 0;
+
+  change_property (device, "libinput Natural Scrolling Enabled",
+                   XA_INTEGER, 8, &value, 1);
+}
+
+static void
+meta_input_settings_x11_set_scroll_method (MetaInputSettings            *settings,
+                                           ClutterInputDevice           *device,
+                                           GDesktopTouchpadScrollMethod  mode)
+{
+  guchar values[3] = { 0 }; /* 2fg, edge, button. The last value is unused */
+
+  switch (mode)
+    {
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED:
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING:
+      values[1] = 1;
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING:
+      values[0] = 1;
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  change_property (device, "libinput Scroll Method Enabled",
+                   XA_INTEGER, 8, &values, 3);
+}
+
+static void
+meta_input_settings_x11_set_scroll_button (MetaInputSettings  *settings,
+                                           ClutterInputDevice *device,
+                                           guint               button)
+{
+  change_property (device, "libinput Scroll Method Enabled",
+                   XA_INTEGER, 32, &button, 1);
+}
+
+static void
+meta_input_settings_x11_set_click_method (MetaInputSettings           *settings,
+                                          ClutterInputDevice          *device,
+                                          GDesktopTouchpadClickMethod  mode)
+{
+  guchar values[2] = { 0 }; /* buttonareas, clickfinger */
+
+  switch (mode)
+    {
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_NONE:
+      break;
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_AREAS:
+      values[0] = 1;
+      break;
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_DEFAULT:
+      /* XXX: We can't be much smarter yet, x11 doesn't expose default settings */
+    case G_DESKTOP_TOUCHPAD_CLICK_METHOD_FINGERS:
+      values[1] = 1;
+      break;
+    default:
+      g_assert_not_reached ();
+      return;
+  }
+
+  change_property (device, "libinput Click Method Enabled",
+                   XA_INTEGER, 8, &values, 2);
+}
+
+static void
+meta_input_settings_x11_set_keyboard_repeat (MetaInputSettings *settings,
+                                             gboolean           enabled,
+                                             guint              delay,
+                                             guint              interval)
+{
+  MetaBackend *backend = meta_get_backend ();
+  Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+
+  if (enabled)
+    {
+      XAutoRepeatOn (xdisplay);
+      XkbSetAutoRepeatRate (xdisplay, XkbUseCoreKbd, delay, interval);
+    }
+  else
+    {
+      XAutoRepeatOff (xdisplay);
+    }
+}
+
+static void
+meta_input_settings_x11_class_init (MetaInputSettingsX11Class *klass)
+{
+  MetaInputSettingsClass *input_settings_class = META_INPUT_SETTINGS_CLASS (klass);
+
+  input_settings_class->set_send_events = meta_input_settings_x11_set_send_events;
+  input_settings_class->set_matrix = meta_input_settings_x11_set_matrix;
+  input_settings_class->set_speed = meta_input_settings_x11_set_speed;
+  input_settings_class->set_left_handed = meta_input_settings_x11_set_left_handed;
+  input_settings_class->set_tap_enabled = meta_input_settings_x11_set_tap_enabled;
+  input_settings_class->set_invert_scroll = meta_input_settings_x11_set_invert_scroll;
+  input_settings_class->set_scroll_method = meta_input_settings_x11_set_scroll_method;
+  input_settings_class->set_scroll_button = meta_input_settings_x11_set_scroll_button;
+  input_settings_class->set_click_method = meta_input_settings_x11_set_click_method;
+  input_settings_class->set_keyboard_repeat = meta_input_settings_x11_set_keyboard_repeat;
+}
+
+static void
+meta_input_settings_x11_init (MetaInputSettingsX11 *settings)
+{
+}

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

@@ -0,0 +1,49 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2014 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+#ifndef META_INPUT_SETTINGS_X11_H
+#define META_INPUT_SETTINGS_X11_H
+
+#include "meta-input-settings-private.h"
+
+#define META_TYPE_INPUT_SETTINGS_X11             (meta_input_settings_x11_get_type ())
+#define META_INPUT_SETTINGS_X11(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_INPUT_SETTINGS_X11, MetaInputSettingsX11))
+#define META_INPUT_SETTINGS_X11_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_INPUT_SETTINGS_X11, MetaInputSettingsX11Class))
+#define META_IS_INPUT_SETTINGS_X11(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_INPUT_SETTINGS_X11))
+#define META_IS_INPUT_SETTINGS_X11_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_INPUT_SETTINGS_X11))
+#define META_INPUT_SETTINGS_X11_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_INPUT_SETTINGS_X11, MetaInputSettingsX11Class))
+
+typedef struct _MetaInputSettingsX11 MetaInputSettingsX11;
+typedef struct _MetaInputSettingsX11Class MetaInputSettingsX11Class;
+
+struct _MetaInputSettingsX11
+{
+  MetaInputSettings parent_instance;
+};
+
+struct _MetaInputSettingsX11Class
+{
+  MetaInputSettingsClass parent_class;
+};
+
+GType meta_input_settings_x11_get_type (void) G_GNUC_CONST;
+
+#endif /* META_INPUT_SETTINGS_X11_H */

src/backends/x11/meta-monitor-manager-xrandr.c

@@ -41,7 +41,6 @@
 #include "meta-backend-x11.h"
 #include <meta/main.h>
 #include <meta/errors.h>
-#include "edid.h"
 #include "meta-monitor-config.h"
 
 #define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
@@ -57,7 +56,6 @@ struct _MetaMonitorManagerXrandr
 
   Display *xdisplay;
   XRRScreenResources *resources;
-  int time;
   int rr_event_base;
   int rr_error_base;
 };
@@ -140,11 +138,63 @@ meta_monitor_transform_from_xrandr_all (Rotation rotation)
   return ret;
 }
 
+static gboolean
+output_get_integer_property (MetaMonitorManagerXrandr *manager_xrandr,
+                             MetaOutput *output, const char *propname,
+                             gint *value)
+{
+  gboolean exists = FALSE;
+  Atom atom, actual_type;
+  int actual_format;
+  unsigned long nitems, bytes_after;
+  unsigned char *buffer;
+
+  atom = XInternAtom (manager_xrandr->xdisplay, propname, False);
+  XRRGetOutputProperty (manager_xrandr->xdisplay,
+                        (XID)output->winsys_id,
+                        atom,
+                        0, G_MAXLONG, False, False, XA_INTEGER,
+                        &actual_type, &actual_format,
+                        &nitems, &bytes_after, &buffer);
+
+  exists = (actual_type == XA_INTEGER && actual_format == 32 && nitems == 1);
+
+  if (exists && value != NULL)
+    *value = ((int*)buffer)[0];
+
+  XFree (buffer);
+  return exists;
+}
+
+static gboolean
+output_get_property_exists (MetaMonitorManagerXrandr *manager_xrandr,
+                            MetaOutput *output, const char *propname)
+{
+  gboolean exists = FALSE;
+  Atom atom, actual_type;
+  int actual_format;
+  unsigned long nitems, bytes_after;
+  unsigned char *buffer;
+
+  atom = XInternAtom (manager_xrandr->xdisplay, propname, False);
+  XRRGetOutputProperty (manager_xrandr->xdisplay,
+                        (XID)output->winsys_id,
+                        atom,
+                        0, G_MAXLONG, False, False, AnyPropertyType,
+                        &actual_type, &actual_format,
+                        &nitems, &bytes_after, &buffer);
+
+  exists = (actual_type != None);
+
+  XFree (buffer);
+  return exists;
+}
+
 static gboolean
 output_get_boolean_property (MetaMonitorManagerXrandr *manager_xrandr,
                              MetaOutput *output, const char *propname)
 {
-  gboolean value;
+  gboolean value = FALSE;
   Atom atom, actual_type;
   int actual_format;
   unsigned long nitems, bytes_after;
@@ -158,12 +208,12 @@ output_get_boolean_property (MetaMonitorManagerXrandr *manager_xrandr,
                         &actual_type, &actual_format,
                         &nitems, &bytes_after, &buffer);
 
-  if (actual_type != XA_CARDINAL || actual_format != 32 ||
+  if (actual_type != XA_CARDINAL || actual_format != 32 || nitems < 1)
-      nitems < 1)
+    goto out;
-    return FALSE;
 
   value = ((int*)buffer)[0];
 
+ out:
   XFree (buffer);
   return value;
 }
@@ -187,7 +237,7 @@ static int
 output_get_backlight_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
                              MetaOutput               *output)
 {
-  gboolean value;
+  int value = -1;
   Atom atom, actual_type;
   int actual_format;
   unsigned long nitems, bytes_after;
@@ -201,14 +251,17 @@ output_get_backlight_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
                         &actual_type, &actual_format,
                         &nitems, &bytes_after, &buffer);
 
-  if (actual_type != XA_INTEGER || actual_format != 32 ||
+  if (actual_type != XA_INTEGER || actual_format != 32 || nitems < 1)
-      nitems < 1)
+    goto out;
-    return -1;
 
   value = ((int*)buffer)[0];
 
+ out:
   XFree (buffer);
-  return normalize_backlight (output, value);
+  if (value > 0)
+    return normalize_backlight (output, value);
+  else
+    return -1;
 }
 
 static void
@@ -327,7 +380,179 @@ static gboolean
 output_get_hotplug_mode_update (MetaMonitorManagerXrandr *manager_xrandr,
                                 MetaOutput               *output)
 {
-  return output_get_boolean_property (manager_xrandr, output, "hotplug_mode_update");
+  return output_get_property_exists (manager_xrandr, output, "hotplug_mode_update");
+}
+
+static gint
+output_get_suggested_x (MetaMonitorManagerXrandr *manager_xrandr,
+                        MetaOutput               *output)
+{
+  gint val;
+  if (output_get_integer_property (manager_xrandr, output, "suggested X", &val))
+    return val;
+
+  return -1;
+}
+
+static gint
+output_get_suggested_y (MetaMonitorManagerXrandr *manager_xrandr,
+                        MetaOutput               *output)
+{
+  gint val;
+  if (output_get_integer_property (manager_xrandr, output, "suggested Y", &val))
+    return val;
+
+  return -1;
+}
+
+static MetaConnectorType
+connector_type_from_atom (MetaMonitorManagerXrandr *manager_xrandr,
+                          Atom                      atom)
+{
+  Display *xdpy = manager_xrandr->xdisplay;
+
+  if (atom == XInternAtom (xdpy, "HDMI", True))
+    return META_CONNECTOR_TYPE_HDMIA;
+  if (atom == XInternAtom (xdpy, "VGA", True))
+    return META_CONNECTOR_TYPE_VGA;
+  /* Doesn't have a DRM equivalent, but means an internal panel.
+   * We could pick either LVDS or eDP here. */
+  if (atom == XInternAtom (xdpy, "Panel", True))
+    return META_CONNECTOR_TYPE_LVDS;
+  if (atom == XInternAtom (xdpy, "DVI", True) || atom == XInternAtom (xdpy, "DVI-I", True))
+    return META_CONNECTOR_TYPE_DVII;
+  if (atom == XInternAtom (xdpy, "DVI-A", True))
+    return META_CONNECTOR_TYPE_DVIA;
+  if (atom == XInternAtom (xdpy, "DVI-D", True))
+    return META_CONNECTOR_TYPE_DVID;
+  if (atom == XInternAtom (xdpy, "DisplayPort", True))
+    return META_CONNECTOR_TYPE_DisplayPort;
+
+  if (atom == XInternAtom (xdpy, "TV", True))
+    return META_CONNECTOR_TYPE_TV;
+  if (atom == XInternAtom (xdpy, "TV-Composite", True))
+    return META_CONNECTOR_TYPE_Composite;
+  if (atom == XInternAtom (xdpy, "TV-SVideo", True))
+    return META_CONNECTOR_TYPE_SVIDEO;
+  /* Another set of mismatches. */
+  if (atom == XInternAtom (xdpy, "TV-SCART", True))
+    return META_CONNECTOR_TYPE_TV;
+  if (atom == XInternAtom (xdpy, "TV-C4", True))
+    return META_CONNECTOR_TYPE_TV;
+
+  return META_CONNECTOR_TYPE_Unknown;
+}
+
+static MetaConnectorType
+output_get_connector_type_from_prop (MetaMonitorManagerXrandr *manager_xrandr,
+                                     MetaOutput               *output)
+{
+  MetaConnectorType ret = META_CONNECTOR_TYPE_Unknown;
+  Atom atom, actual_type, connector_type_atom;
+  int actual_format;
+  unsigned long nitems, bytes_after;
+  unsigned char *buffer;
+
+  atom = XInternAtom (manager_xrandr->xdisplay, "ConnectorType", False);
+  XRRGetOutputProperty (manager_xrandr->xdisplay,
+                        (XID)output->winsys_id,
+                        atom,
+                        0, G_MAXLONG, False, False, XA_ATOM,
+                        &actual_type, &actual_format,
+                        &nitems, &bytes_after, &buffer);
+
+  if (actual_type != XA_ATOM || actual_format != 32 || nitems < 1)
+    goto out;
+
+  connector_type_atom = ((Atom *) buffer)[0];
+  ret = connector_type_from_atom (manager_xrandr, connector_type_atom);
+
+ out:
+  meta_XFree (buffer);
+  return ret;
+}
+
+static MetaConnectorType
+output_get_connector_type_from_name (MetaMonitorManagerXrandr *manager_xrandr,
+                                     MetaOutput               *output)
+{
+  const char *name = output->name;
+
+  /* drmmode_display.c, which was copy/pasted across all the FOSS
+   * xf86-video-* drivers, seems to name its outputs based on the
+   * connector type, so look for that....
+   *
+   * SNA has its own naming scheme, because what else did you expect
+   * from SNA, but it's not too different, so we can thankfully use
+   * that with minor changes.
+   *
+   * http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/drmmode_display.c#n953
+   * http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/tree/src/sna/sna_display.c#n3486
+   */
+
+  if (g_str_has_prefix (name, "DVI"))
+    return META_CONNECTOR_TYPE_DVII;
+  if (g_str_has_prefix (name, "LVDS"))
+    return META_CONNECTOR_TYPE_LVDS;
+  if (g_str_has_prefix (name, "HDMI"))
+    return META_CONNECTOR_TYPE_HDMIA;
+  if (g_str_has_prefix (name, "VGA"))
+    return META_CONNECTOR_TYPE_VGA;
+  /* SNA uses DP, not DisplayPort. Test for both. */
+  if (g_str_has_prefix (name, "DP") || g_str_has_prefix (name, "DisplayPort"))
+    return META_CONNECTOR_TYPE_DisplayPort;
+  if (g_str_has_prefix (name, "eDP"))
+    return META_CONNECTOR_TYPE_eDP;
+  if (g_str_has_prefix (name, "Virtual"))
+    return META_CONNECTOR_TYPE_VIRTUAL;
+  if (g_str_has_prefix (name, "Composite"))
+    return META_CONNECTOR_TYPE_VGA;
+  if (g_str_has_prefix (name, "S-video"))
+    return META_CONNECTOR_TYPE_SVIDEO;
+  if (g_str_has_prefix (name, "TV"))
+    return META_CONNECTOR_TYPE_TV;
+  if (g_str_has_prefix (name, "CTV"))
+    return META_CONNECTOR_TYPE_Composite;
+  if (g_str_has_prefix (name, "DSI"))
+    return META_CONNECTOR_TYPE_DSI;
+  if (g_str_has_prefix (name, "DIN"))
+    return META_CONNECTOR_TYPE_9PinDIN;
+
+  return META_CONNECTOR_TYPE_Unknown;
+}
+
+static MetaConnectorType
+output_get_connector_type (MetaMonitorManagerXrandr *manager_xrandr,
+                           MetaOutput               *output)
+{
+  MetaConnectorType ret;
+
+  /* The "ConnectorType" property is considered mandatory since RandR 1.3,
+   * but none of the FOSS drivers support it, because we're a bunch of
+   * professional software developers.
+   *
+   * Try poking it first, without any expectations that it will work.
+   * If it's not there, we thankfully have other bonghits to try next.
+   */
+  ret = output_get_connector_type_from_prop (manager_xrandr, output);
+  if (ret != META_CONNECTOR_TYPE_Unknown)
+    return ret;
+
+  /* Fall back to heuristics based on the output name. */
+  ret = output_get_connector_type_from_name (manager_xrandr, output);
+  if (ret != META_CONNECTOR_TYPE_Unknown)
+    return ret;
+
+  return META_CONNECTOR_TYPE_Unknown;
+}
+
+static char *
+get_xmode_name (XRRModeInfo *xmode)
+{
+  int width = xmode->width;
+  int height = xmode->height;
+
+  return g_strdup_printf ("%dx%d", width, height);
 }
 
 static void
@@ -395,7 +620,6 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
     return;
 
   manager_xrandr->resources = resources;
-  manager_xrandr->time = resources->configTimestamp;
   manager->n_outputs = resources->noutput;
   manager->n_crtcs = resources->ncrtc;
   manager->n_modes = resources->nmode;
@@ -415,6 +639,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
       mode->height = xmode->height;
       mode->refresh_rate = (xmode->dotClock /
 			    ((float)xmode->hTotal * xmode->vTotal));
+      mode->name = get_xmode_name (xmode);
     }
 
   for (i = 0; i < (unsigned)resources->ncrtc; i++)
@@ -463,45 +688,21 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
       if (output->connection != RR_Disconnected)
 	{
           GBytes *edid;
-          MonitorInfo *parsed_edid;
 
 	  meta_output->winsys_id = resources->outputs[i];
 	  meta_output->name = g_strdup (output->name);
 
           edid = read_output_edid (manager_xrandr, meta_output->winsys_id);
-          if (edid)
+          meta_output_parse_edid (meta_output, edid);
-            {
+          g_bytes_unref (edid);
-              gsize len;
 
-              parsed_edid = decode_edid (g_bytes_get_data (edid, &len));
-              if (parsed_edid)
-                {
-                  meta_output->vendor = g_strndup (parsed_edid->manufacturer_code, 4);
-                  if (parsed_edid->dsc_product_name[0])
-                    meta_output->product = g_strndup (parsed_edid->dsc_product_name, 14);
-                  else
-                    meta_output->product = g_strdup_printf ("0x%04x", (unsigned)parsed_edid->product_code);
-                  if (parsed_edid->dsc_serial_number[0])
-                    meta_output->serial = g_strndup (parsed_edid->dsc_serial_number, 14);
-                  else
-                    meta_output->serial = g_strdup_printf ("0x%08x", parsed_edid->serial_number);
-
-                  g_free (parsed_edid);
-                }
-
-              g_bytes_unref (edid);
-            }
-
-          if (!meta_output->vendor)
-            {
-              meta_output->vendor = g_strdup ("unknown");
-              meta_output->product = g_strdup ("unknown");
-              meta_output->serial = g_strdup ("unknown");
-            }
 	  meta_output->width_mm = output->mm_width;
 	  meta_output->height_mm = output->mm_height;
 	  meta_output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
           meta_output->hotplug_mode_update = output_get_hotplug_mode_update (manager_xrandr, meta_output);
+	  meta_output->suggested_x = output_get_suggested_x (manager_xrandr, meta_output);
+	  meta_output->suggested_y = output_get_suggested_y (manager_xrandr, meta_output);
+          meta_output->connector_type = output_get_connector_type (manager_xrandr, meta_output);
 
 	  meta_output->n_modes = output->nmode;
 	  meta_output->modes = g_new0 (MetaMonitorMode *, meta_output->n_modes);
@@ -728,7 +929,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
           XRRSetCrtcConfig (manager_xrandr->xdisplay,
                             manager_xrandr->resources,
                             (XID)crtc->crtc_id,
-                            manager_xrandr->time,
+                            CurrentTime,
                             0, 0,
                             None,
                             RR_Rotate_0,
@@ -758,7 +959,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
       XRRSetCrtcConfig (manager_xrandr->xdisplay,
                         manager_xrandr->resources,
                         (XID)crtc->crtc_id,
-                        manager_xrandr->time,
+                        CurrentTime,
                         0, 0,
                         None,
                         RR_Rotate_0,
@@ -795,26 +996,12 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
           unsigned int j, n_outputs;
           int width, height;
           Status ok;
-          unsigned long old_controlled_mask;
-          unsigned long new_controlled_mask;
 
           mode = crtc_info->mode;
 
           n_outputs = crtc_info->outputs->len;
           outputs = g_new (XID, n_outputs);
 
-          old_controlled_mask = 0;
-          for (j = 0; j < manager->n_outputs; j++)
-            {
-              MetaOutput *output;
-
-              output = &manager->outputs[j];
-
-              if (output->crtc == crtc)
-                old_controlled_mask |= 1UL << j;
-            }
-
-          new_controlled_mask = 0;
           for (j = 0; j < n_outputs; j++)
             {
               MetaOutput *output;
@@ -823,25 +1010,14 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
 
               output->is_dirty = TRUE;
               output->crtc = crtc;
-              new_controlled_mask |= 1UL << j;
 
               outputs[j] = output->winsys_id;
             }
 
-          if (crtc->current_mode == mode &&
-              crtc->rect.x == crtc_info->x &&
-              crtc->rect.y == crtc_info->y &&
-              crtc->transform == crtc_info->transform &&
-              old_controlled_mask == new_controlled_mask)
-            {
-              /* No change */
-              goto next;
-            }
-
           ok = XRRSetCrtcConfig (manager_xrandr->xdisplay,
                                  manager_xrandr->resources,
                                  (XID)crtc->crtc_id,
-                                 manager_xrandr->time,
+                                 CurrentTime,
                                  crtc_info->x, crtc_info->y,
                                  (XID)mode->mode_id,
                                  meta_monitor_transform_to_xrandr (crtc_info->transform),
@@ -849,7 +1025,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
 
           if (ok != Success)
             {
-              meta_warning ("Configuring CRTC %d with mode %d (%d x %d @ %f) at position %d, %d and transfrom %u failed\n",
+              meta_warning ("Configuring CRTC %d with mode %d (%d x %d @ %f) at position %d, %d and transform %u failed\n",
                             (unsigned)(crtc->crtc_id), (unsigned)(mode->mode_id),
                             mode->width, mode->height, (float)mode->refresh_rate,
                             crtc_info->x, crtc_info->y, crtc_info->transform);
@@ -982,16 +1158,6 @@ meta_monitor_manager_xrandr_set_crtc_gamma (MetaMonitorManager *manager,
   XRRFreeGamma (gamma);
 }
 
-static void
-meta_monitor_manager_xrandr_rebuild_derived (MetaMonitorManager *manager)
-{
-  /* This will be a no-op if the change was from our side, as
-     we already called it in the DBus method handler */
-  meta_monitor_config_update_current (manager->config, manager);
-
-  meta_monitor_manager_rebuild_derived (manager);
-}
-
 static void
 meta_monitor_manager_xrandr_init (MetaMonitorManagerXrandr *manager_xrandr)
 {
@@ -1051,63 +1217,26 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
 					   XEvent                   *event)
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_xrandr);
-  MetaOutput *old_outputs;
+  gboolean hotplug;
-  MetaCRTC *old_crtcs;
-  MetaMonitorMode *old_modes;
-  unsigned int n_old_outputs, n_old_modes;
-  gboolean new_config;
 
   if ((event->type - manager_xrandr->rr_event_base) != RRScreenChangeNotify)
     return FALSE;
 
   XRRUpdateConfiguration (event);
 
-  /* Save the old structures, so they stay valid during the update */
+  meta_monitor_manager_read_current_config (manager);
-  old_outputs = manager->outputs;
-  n_old_outputs = manager->n_outputs;
-  old_modes = manager->modes;
-  n_old_modes = manager->n_modes;
-  old_crtcs = manager->crtcs;
-
-  manager->serial++;
-  meta_monitor_manager_xrandr_read_current (manager);
-
-  new_config = manager_xrandr->resources->timestamp >=
-    manager_xrandr->resources->configTimestamp;
-  if (meta_monitor_manager_has_hotplug_mode_update (manager))
 
+  hotplug = manager_xrandr->resources->timestamp < manager_xrandr->resources->configTimestamp;
+  if (hotplug)
     {
-      /* Check if the current intended configuration is a result of an
+      /* This is a hotplug event, so go ahead and build a new configuration. */
-         XRandR call.  Otherwise, hotplug_mode_update tells us to get
+      meta_monitor_manager_on_hotplug (manager);
-         a new preferred mode on hotplug events to handle dynamic
-         guest resizing. */
-      if (new_config)
-        meta_monitor_manager_xrandr_rebuild_derived (manager);
-      else
-        meta_monitor_config_make_default (manager->config, manager);
     }
   else
     {
-      /* Check if the current intended configuration has the same outputs
+      /* Something else changed -- tell the world about it. */
-         as the new real one, or if the event is a result of an XRandR call.
+      meta_monitor_manager_rebuild_derived (manager);
-         If so, we can go straight to rebuild the logical config and tell
-         the outside world.
-         Otherwise, this event was caused by hotplug, so give a chance to
-         MetaMonitorConfig.
-
-         Note that we need to check both the timestamps and the list of
-         outputs, because the X server might emit spurious events with new
-         configTimestamps (bug 702804), and the driver may have changed
-         the EDID for some other reason (old qxl and vbox drivers). */
-      if (new_config || meta_monitor_config_match_current (manager->config, manager))
-        meta_monitor_manager_xrandr_rebuild_derived (manager);
-      else if (!meta_monitor_config_apply_stored (manager->config, manager))
-        meta_monitor_config_make_default (manager->config, manager);
     }
 
-  meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
-  meta_monitor_manager_free_mode_array (old_modes, n_old_modes);
-  g_free (old_crtcs);
-
   return TRUE;
 }

src/backends/x11/meta-monitor-manager-xrandr.h

@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_MANAGER_XRANDR_H
 #define META_MONITOR_MANAGER_XRANDR_H
 
-#include "meta-monitor-manager.h"
+#include "meta-monitor-manager-private.h"
 
 #define META_TYPE_MONITOR_MANAGER_XRANDR            (meta_monitor_manager_xrandr_get_type ())
 #define META_MONITOR_MANAGER_XRANDR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandr))

src/compositor/clutter-utils.c

@@ -51,6 +51,12 @@ round_to_fixed (float x)
   return roundf (x * 256);
 }
 
+/* Help macros to scale from OpenGL <-1,1> coordinates system to
+ * window coordinates ranging [0,window-size]. Borrowed from clutter-utils.c
+ */
+#define MTX_GL_SCALE_X(x,w,v1,v2) ((((((x) / (w)) + 1.0f) / 2.0f) * (v1)) + (v2))
+#define MTX_GL_SCALE_Y(y,w,v1,v2) ((v1) - (((((y) / (w)) + 1.0f) / 2.0f) * (v1)) + (v2))
+
 /* This helper function checks if (according to our fixed point precision)
  * the vertices @verts form a box of width @widthf and height @heightf
  * located at integral coordinates. These coordinates are returned
@@ -118,3 +124,67 @@ meta_actor_is_untransformed (ClutterActor *actor,
   return meta_actor_vertices_are_untransformed (verts, widthf, heightf, x_origin, y_origin);
 }
 
+/**
+ * meta_actor_painting_untransformed:
+ * @paint_width: the width of the painted area
+ * @paint_height: the height of the painted area
+ * @x_origin: if the transform is only an integer translation
+ *  then the X coordinate of the location of the origin under the transformation
+ *  from drawing space to screen pixel space is returned here.
+ * @y_origin: if the transform is only an integer translation
+ *  then the X coordinate of the location of the origin under the transformation
+ *  from drawing space to screen pixel space is returned here.
+ *
+ * Determines if the current painting transform is an integer translation.
+ * This can differ from the result of meta_actor_is_untransformed() when
+ * painting an actor if we're inside a inside a clone paint. @paint_width
+ * and @paint_height are used to determine the vertices of the rectangle
+ * we check to see if the painted area is "close enough" to the integer
+ * transform.
+ */
+gboolean
+meta_actor_painting_untransformed (int              paint_width,
+                                   int              paint_height,
+                                   int             *x_origin,
+                                   int             *y_origin)
+{
+  CoglMatrix modelview, projection, modelview_projection;
+  ClutterVertex vertices[4];
+  float viewport[4];
+  int i;
+
+  cogl_get_modelview_matrix (&modelview);
+  cogl_get_projection_matrix (&projection);
+
+  cogl_matrix_multiply (&modelview_projection,
+                        &projection,
+                        &modelview);
+
+  vertices[0].x = 0;
+  vertices[0].y = 0;
+  vertices[0].z = 0;
+  vertices[1].x = paint_width;
+  vertices[1].y = 0;
+  vertices[1].z = 0;
+  vertices[2].x = 0;
+  vertices[2].y = paint_height;
+  vertices[2].z = 0;
+  vertices[3].x = paint_width;
+  vertices[3].y = paint_height;
+  vertices[3].z = 0;
+
+  cogl_get_viewport (viewport);
+
+  for (i = 0; i < 4; i++)
+    {
+      float w = 1;
+      cogl_matrix_transform_point (&modelview_projection, &vertices[i].x, &vertices[i].y, &vertices[i].z, &w);
+      vertices[i].x = MTX_GL_SCALE_X (vertices[i].x, w,
+                                      viewport[2], viewport[0]);
+      vertices[i].y = MTX_GL_SCALE_Y (vertices[i].y, w,
+                                      viewport[3], viewport[1]);
+    }
+
+  return meta_actor_vertices_are_untransformed (vertices, paint_width, paint_height, x_origin, y_origin);
+}
+