dnd 2

This is needed for DND surfaces. We should probably test to see if it's
used for cursor surfaces at all.

configure.ac

@@ -76,17 +76,23 @@ MUTTER_PC_MODULES="
    pango >= 1.2.0
    cairo >= 1.10.0
    gsettings-desktop-schemas >= 3.7.3
-   xcomposite >= 0.2 xfixes xext xdamage xi >= 1.6.0
-   xcursor
    $CLUTTER_PACKAGE >= 1.19.5
    clutter-egl-1.0
    cogl-1.0 >= 1.17.1
-   libinput
+   gbm
    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
+   x11-xcb
    xcb-randr
 "
 
@@ -186,15 +192,11 @@ 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])
+PKG_CHECK_MODULES(MUTTER_NATIVE_BACKEND, [libdrm libsystemd libinput], [have_native_backend=yes], [have_native_backend=no])
 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
@@ -202,6 +204,11 @@ 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])
 if test $have_wayland = yes; then
+   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])
 fi
 AM_CONDITIONAL([HAVE_WAYLAND],[test $have_wayland = yes])

po/el.po

@@ -18,16 +18,16 @@ msgstr ""
 "Project-Id-Version: metacity.gnome-2-26\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-07-15 21:19+0000\n"
-"PO-Revision-Date: 2014-07-16 13:25+0200\n"
-"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
+"POT-Creation-Date: 2014-08-20 21:50+0000\n"
+"PO-Revision-Date: 2014-08-21 12:13+0200\n"
+"Last-Translator: Maria Mavridou <mavridou@gmail.com>\n"
 "Language-Team: www.gnome.gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 1.6.4\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
@@ -91,66 +91,100 @@ msgid "Switch applications"
 msgstr "Εναλλαγή εφαρμογών"
 
 #: ../data/50-mutter-navigation.xml.in.h:16
+#| msgid "Switch applications"
+msgid "Switch to previous application"
+msgstr "Εναλλαγή στην προηγούμενη εφαρμογή"
+
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Εναλλαγή παραθύρων"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: ../data/50-mutter-navigation.xml.in.h:18
+#| msgid "Switch windows"
+msgid "Switch to previous window"
+msgstr "Εναλλαγή στο προηγούμενο παράθυρο"
+
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Εναλλαγή παραθύρων μιας εφαρμογής"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: ../data/50-mutter-navigation.xml.in.h:20
+#| msgid "Switch windows of an application"
+msgid "Switch to previous window of an application"
+msgstr "Εναλλαγή στο προηγούμενο παράθυρο μιας εφαρμογής"
+
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Εναλλαγή ελέγχων συστήματος"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: ../data/50-mutter-navigation.xml.in.h:22
+#| msgid "Switch system controls"
+msgid "Switch to previous system control"
+msgstr "Εναλλαγή σε προηγούμενους ελέγχους συστήματος"
+
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Άμεση εναλλαγή παραθύρων"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: ../data/50-mutter-navigation.xml.in.h:24
+msgid "Switch directly to previous window"
+msgstr "Άμεση εναλλαγή στο προηγούμενο παράθυρο"
+
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Άμεση εναλλαγή παραθύρων μιας εφαρμογής"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: ../data/50-mutter-navigation.xml.in.h:26
+#| msgid "Switch windows of an application"
+msgid "Switch directly to previous window of an app"
+msgstr "Άμεση εναλλαγή στο προηγούμενο παράθυρο μιας εφαρμογής"
+
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Άμεση εναλλαγή ελέγχων συστήματος"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: ../data/50-mutter-navigation.xml.in.h:28
+#| msgid "Switch system controls"
+msgid "Switch directly to previous system control"
+msgstr "Άμεση εναλλαγή σε προηγούμενους ελέγχους συστήματος"
+
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Απόκρυψη όλων των κανονικών παραθύρων"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Εναλλαγή στον χώρο εργασίας 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Εναλλαγή στον χώρο εργασίας 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Εναλλαγή στον χώρο εργασίας 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Εναλλαγή στον χώρο εργασίας 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Εναλλαγή στον τελευταίο χώρο εργασίας"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Μετακίνηση στον χώρο εργασίας αριστερά"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Μετακίνηση στον χώρο εργασίας δεξιά"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Μετακίνηση στον χώρο εργασίας επάνω"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Μετακίνηση στον χώρο εργασίας κάτω"
 
@@ -444,7 +478,7 @@ msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:445
+#: ../src/compositor/compositor.c:441
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -452,11 +486,11 @@ msgid ""
 msgstr ""
 "Εκτελείται ένας άλλος διαχειριστής παραθύρων στην οθόνη %i προβολή \"%s\"."
 
-#: ../src/compositor/meta-background.c:990
+#: ../src/compositor/meta-background.c:1044
 msgid "background texture could not be created from file"
 msgstr "η υφή παρασκηνίου δεν μπόρεσε να δημιουργηθεί από αρχείο"
 
-#: ../src/core/bell.c:215
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Ηχητικό συμβάν κουδουνιού"
 
@@ -486,49 +520,49 @@ msgid "_Force Quit"
 msgstr "_Εξαναγκασμός σε τερματισμό"
 
 # gconf/gconf-internals.c:2416
-#: ../src/core/display.c:464
+#: ../src/core/display.c:547
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Αποτυχία ανοίγματος οθόνης του συστήματος παραθύρων Χ '%s'\n"
 
-#: ../src/core/main.c:172
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Απενεργοποίηση σύνδεσης στο διαχειριστή συνεδρίας"
 
-#: ../src/core/main.c:178
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Αντικατάσταση του τρέχοντος διαχειριστή παραθύρων"
 
-#: ../src/core/main.c:184
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Καθορισμός αναγνωριστικού διαχείρισης συνεδρίας"
 
-#: ../src/core/main.c:189
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Εμφάνιση Χ για χρήση"
 
-#: ../src/core/main.c:195
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Εκκίνηση συνεδρίας από savefile"
 
-#: ../src/core/main.c:201
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Να καταστούν σύγχρονες οι κλήσεις του X"
 
-#: ../src/core/main.c:207
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Εκτέλεση ως συνθετητής wayland"
 
-#: ../src/core/main.c:214
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Εκτέλεση ως διακομιστής πλήρους οθόνης, αντί ενσωματωμένης"
 
-#: ../src/core/main.c:448
+#: ../src/core/main.c:459
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Αποτυχία σάρωσης καταλόγου θεμάτων: %s\n"
 
-#: ../src/core/main.c:464
+#: ../src/core/main.c:475
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -560,17 +594,17 @@ msgstr "Εμφάνιση έκδοσης"
 msgid "Mutter plugin to use"
 msgstr "Πρόσθετα του Mutter για χρήση"
 
-#: ../src/core/prefs.c:2086
+#: ../src/core/prefs.c:2101
 #, c-format
 msgid "Workspace %d"
 msgstr "Χώρος εργασίας %d"
 
-#: ../src/core/screen.c:553
+#: ../src/core/screen.c:548
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Η οθόνη %d στην προβολή '%s' δεν είναι έγκυρη\n"
 
-#: ../src/core/screen.c:569
+#: ../src/core/screen.c:564
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -580,7 +614,7 @@ msgstr ""
 "προσπαθήστε να χρησιμοποιήσετε την επιλογή --replace για να αντικαταστήσετε "
 "τον τρέχων διαχειριστή παραθύρων.\n"
 
-#: ../src/core/screen.c:662
+#: ../src/core/screen.c:657
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Η οθόνη %d στην προβολή \"%s\" έχει ήδη ένα διαχειριστή παραθύρων\n"
@@ -1310,7 +1344,7 @@ msgstr ""
 "εγκατάστασης&quot; και θα πρέπει να επανεκκινηθούν χειροκίνητα στην επόμενη "
 "είσοδο σας."
 
-#: ../src/x11/window-props.c:513
+#: ../src/x11/window-props.c:515
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (σε %s)"

po/gl.po

@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-01 21:56+0200\n"
-"PO-Revision-Date: 2014-07-01 21:58+0200\n"
+"POT-Creation-Date: 2014-08-25 22:40+0200\n"
+"PO-Revision-Date: 2014-08-25 22:42+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -86,66 +86,94 @@ msgid "Switch applications"
 msgstr "Cambiar entre aplicativos"
 
 #: ../data/50-mutter-navigation.xml.in.h:16
+msgid "Switch to previous application"
+msgstr "Cambiar ao aplicativo aplicativos"
+
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Cambiar xanelas"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: ../data/50-mutter-navigation.xml.in.h:18
+msgid "Switch to previous window"
+msgstr "Cambiar á xanela anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Cambiar entre as xanelas dun aplicativo"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: ../data/50-mutter-navigation.xml.in.h:20
+msgid "Switch to previous window of an application"
+msgstr "Cambia á xanela anterior dun aplicativo"
+
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Cambiar entre os controles do sistema"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: ../data/50-mutter-navigation.xml.in.h:22
+msgid "Switch to previous system control"
+msgstr "Cambia ao control do sistema anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Cambiar xanelas directamente"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: ../data/50-mutter-navigation.xml.in.h:24
+msgid "Switch directly to previous window"
+msgstr "Cambia directamente á xanela anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Cambiar entre as xanelas dun aplicativo directamente"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: ../data/50-mutter-navigation.xml.in.h:26
+msgid "Switch directly to previous window of an app"
+msgstr "Cambia directamente á xanela anterior do aplicativo"
+
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Cambiar entre os controles do sistema directamente"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: ../data/50-mutter-navigation.xml.in.h:28
+msgid "Switch directly to previous system control"
+msgstr "Cambiar directamente ao control do sistema anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Ocultar todas as xanelas normais"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Cambiar ao espazo de traballo 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Cambiar ao espazo de traballo 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Cambiar ao espazo de traballo 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Cambiar ao espazo de traballo 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Cambiar ao último espazo de traballo"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Mover ao espazo da esquerda"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Mover ao espazo da dereita"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Mover ao espazo de arriba"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Mover ao espazo de traballo de abaixo"
 
@@ -434,7 +462,7 @@ msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:464
+#: ../src/compositor/compositor.c:441
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -443,24 +471,24 @@ msgstr ""
 "Xa se está a executar outro xestor de composición na pantalla %i na "
 "visualización «%s»"
 
-#: ../src/compositor/meta-background.c:990
+#: ../src/compositor/meta-background.c:1044
 msgid "background texture could not be created from file"
 msgstr "a textura do fondo non puido crearse desde o ficheiro"
 
-#: ../src/core/bell.c:215
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Evento de campá"
 
-#: ../src/core/delete.c:129
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "«%s» non está respondendo."
 
-#: ../src/core/delete.c:131
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "O Aplicativo non está respondendo."
 
-#: ../src/core/delete.c:136
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -468,57 +496,57 @@ msgstr ""
 "Pode elixir esperar un momento para ver se continúa ou forzar ao aplicativo "
 "a pechar completamente."
 
-#: ../src/core/delete.c:143
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "Espe_rar"
 
-#: ../src/core/delete.c:143
+#: ../src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Forzar a saída"
 
-#: ../src/core/display.c:448
+#: ../src/core/display.c:547
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Produciuse un erro ao abrir a visualización do X Window System «%s»\n"
 
-#: ../src/core/main.c:172
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desactivar a conexión ao xestor de sesión"
 
-#: ../src/core/main.c:178
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Substituír o xestor de xanelas en execución"
 
-#: ../src/core/main.c:184
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar o ID de xestión de sesión"
 
-#: ../src/core/main.c:189
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Pantalla X que se vai usar"
 
-#: ../src/core/main.c:195
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde o ficheiro de salvagarda"
 
-#: ../src/core/main.c:201
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Facer que as chamadas a X sexan sincrónicas"
 
-#: ../src/core/main.c:207
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Executar como compositor de wayland"
 
-#: ../src/core/main.c:214
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como un servidor de pantalla completo, fronte a un aniñado"
 
-#: ../src/core/main.c:448
+#: ../src/core/main.c:459
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Produciuse un erro ao dixitalizar o directorio de temas: %s\n"
 
-#: ../src/core/main.c:464
+#: ../src/core/main.c:475
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -549,17 +577,17 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Engadido de mutter que usar"
 
-#: ../src/core/prefs.c:2086
+#: ../src/core/prefs.c:2101
 #, c-format
 msgid "Workspace %d"
 msgstr "Espazo de traballo %d"
 
-#: ../src/core/screen.c:539
+#: ../src/core/screen.c:548
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A pantalla %d na visualización «%s» non é válida\n"
 
-#: ../src/core/screen.c:555
+#: ../src/core/screen.c:564
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -568,7 +596,7 @@ msgstr ""
 "A visualización %d na pantalla «%s» ten xa un xestor de xanelas, tente usar "
 "a opción --replace para substituír o xestor de xanelas.\n"
 
-#: ../src/core/screen.c:660
+#: ../src/core/screen.c:657
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "A visualización %d na pantalla «%s» ten xa un xestor de xanelas\n"
@@ -585,48 +613,48 @@ msgstr "Mutter foi compilado sen compatibilidade para o modo detallado\n"
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/ui/theme.c:232
+#: ../src/ui/theme.c:233
 msgid "top"
 msgstr "superior"
 
-#: ../src/ui/theme.c:234
+#: ../src/ui/theme.c:235
 msgid "bottom"
 msgstr "inferior"
 
-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:237
 msgid "left"
 msgstr "esquerda"
 
-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:239
 msgid "right"
 msgstr "dereita"
 
-#: ../src/ui/theme.c:266
+#: ../src/ui/theme.c:267
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "a xeometría do marco non especifica a dimensión «%s»"
 
-#: ../src/ui/theme.c:285
+#: ../src/ui/theme.c:286
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "a xeometría do marco non especifica a dimensión «%s» para o bordo «%s»"
 
-#: ../src/ui/theme.c:322
+#: ../src/ui/theme.c:323
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "A proporción de aspecto do botón %g non é razoábel"
 
-#: ../src/ui/theme.c:334
+#: ../src/ui/theme.c:335
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "A xeometría do marco non especifica o tamaño dos botóns"
 
-#: ../src/ui/theme.c:1060
+#: ../src/ui/theme.c:1061
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "As gradacións deben ter polo menos dúas cores"
 
-#: ../src/ui/theme.c:1210
+#: ../src/ui/theme.c:1211
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -636,7 +664,7 @@ msgstr ""
 "entre parénteses, por exemplo: gtk:custom(foo,bar); non foi posíbel analizar "
 "«%s»."
 
-#: ../src/ui/theme.c:1226
+#: ../src/ui/theme.c:1227
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -645,7 +673,7 @@ msgstr ""
 "O carácter «%c» non é válido no parámetro «color_name» de «gtk:custom», só "
 "«A-Za-z0-9» son válidos"
 
-#: ../src/ui/theme.c:1240
+#: ../src/ui/theme.c:1241
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -654,7 +682,7 @@ msgstr ""
 "O formato de «gtk:custom» é «gtk:custom(nome_de_cor,nome_alternativo», «%s» "
 "non respecta o formato"
 
-#: ../src/ui/theme.c:1285
+#: ../src/ui/theme.c:1286
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -663,7 +691,7 @@ msgstr ""
 "A especificación de cor do GTK debe ter o estado entre parénteses, exemplo. "
 "gtk:fg[NORMAL] onde NORMAL é o estado; non foi posíbel analizar «%s»"
 
-#: ../src/ui/theme.c:1299
+#: ../src/ui/theme.c:1300
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -673,17 +701,17 @@ msgstr ""
 "estado, exemplo. gtk:fg[NORMAL] onde NORMAL é o estado; non foi posíbel "
 "analizar «%s»"
 
-#: ../src/ui/theme.c:1310
+#: ../src/ui/theme.c:1311
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Non se entende o estado «%s» na especificación da cor"
 
-#: ../src/ui/theme.c:1323
+#: ../src/ui/theme.c:1324
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Non se entende o compoñente de cor «%s» na especificación da cor"
 
-#: ../src/ui/theme.c:1351
+#: ../src/ui/theme.c:1352
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -692,17 +720,17 @@ msgstr ""
 "O formato de blend é «blend/bg_color/fg_color/alpha», «%s»non coincide co "
 "formato"
 
-#: ../src/ui/theme.c:1362
+#: ../src/ui/theme.c:1363
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Non foi posíbel analizar o valor alfa «%s» na cor mesturada"
 
-#: ../src/ui/theme.c:1372
+#: ../src/ui/theme.c:1373
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "O valor alfa «%s» na cor mesturada non está entre 0.0 e 1.0"
 
-#: ../src/ui/theme.c:1418
+#: ../src/ui/theme.c:1419
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -710,28 +738,28 @@ msgstr ""
 "O formato de sombreado é \"shade/base_color/factor\", «%s» non coincide co "
 "formato"
 
-#: ../src/ui/theme.c:1429
+#: ../src/ui/theme.c:1430
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Non foi posíbel analizar o factor de sombreado «%s» na cor sombreada"
 
-#: ../src/ui/theme.c:1439
+#: ../src/ui/theme.c:1440
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "O factor de sombreado «%s» na cor sombreada é negativo"
 
-#: ../src/ui/theme.c:1468
+#: ../src/ui/theme.c:1469
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Non foi posíbel analizar a cor «%s»"
 
-#: ../src/ui/theme.c:1777
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 "A expresión de coordenadas contén un carácter «%s» que non está permitido"
 
-#: ../src/ui/theme.c:1804
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -740,14 +768,14 @@ msgstr ""
 "A expresión de coordenadas contén un número de coma flotante «%s» que non "
 "foi posíbel analizar"
 
-#: ../src/ui/theme.c:1818
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "A expresión de coordenadas contén un enteiro «%s» que non foi posíbel "
 "analizar"
 
-#: ../src/ui/theme.c:1939
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -756,17 +784,17 @@ msgstr ""
 "A expresión de coordenadas contén un operador non válido ao inicio do seu "
 "texto: «%s»"
 
-#: ../src/ui/theme.c:1996
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "A expresión de coordenadas está baleira ou non se entendeu"
 
-#: ../src/ui/theme.c:2109 ../src/ui/theme.c:2119 ../src/ui/theme.c:2153
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "A expresión de coordenadas resultou nun erro de división por cero"
 
-#: ../src/ui/theme.c:2161
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@@ -774,25 +802,25 @@ msgstr ""
 "A expresión de coordenadas tentou usar un operador mod cun número de coma "
 "flotante"
 
-#: ../src/ui/theme.c:2217
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "A expresión de coordenadas ten un operador «%s» onde se esperaba un operando"
 
-#: ../src/ui/theme.c:2226
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "A expresión de coordenadas ten un operando onde se esperaba un operador"
 
-#: ../src/ui/theme.c:2234
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "A expresión de coordenadas remata cun operador en vez dun operando"
 
-#: ../src/ui/theme.c:2244
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -801,42 +829,42 @@ msgstr ""
 "A expresión de coordenadas ten un operador \"%c\" seguido do operador \"%c\" "
 "sen un operando entre eles"
 
-#: ../src/ui/theme.c:2395 ../src/ui/theme.c:2440
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "A expresión de coordenadas ten unha variábel ou constante descoñecida «%s»"
 
-#: ../src/ui/theme.c:2494
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "O analizador da expresión de coordenadas desbordou o seu búfer."
 
-#: ../src/ui/theme.c:2523
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "A expresión de coordenadas ten unha paréntese pechada sen unha paréntese "
 "aberta"
 
-#: ../src/ui/theme.c:2587
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "A expresión de coordenadas ten unha paréntese aberta sen unha paréntese "
 "pechada"
 
-#: ../src/ui/theme.c:2598
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "A expresión de coordenadas non parece ter nin operadores nin operandos"
 
-#: ../src/ui/theme.c:2811 ../src/ui/theme.c:2831 ../src/ui/theme.c:2851
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "O tema contiña unha expresión que resultou ser un erro: %s\n"
 
-#: ../src/ui/theme.c:4466
+#: ../src/ui/theme.c:4455
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -845,24 +873,24 @@ msgstr ""
 "<button function=«%s» state=«%s» draw_ops=\"whatever\"/> débese especificar "
 "para este estilo de marco"
 
-#: ../src/ui/theme.c:4981 ../src/ui/theme.c:5006
+#: ../src/ui/theme.c:4970 ../src/ui/theme.c:4995
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "Falta <frame state=«%s» resize=«%s» focus=«%s» style=\"whatever\"/>"
 
-#: ../src/ui/theme.c:5052
+#: ../src/ui/theme.c:5041
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Produciuse un erro ao cargar o tema «%s»: %s\n"
 
-#: ../src/ui/theme.c:5188 ../src/ui/theme.c:5195 ../src/ui/theme.c:5202
-#: ../src/ui/theme.c:5209 ../src/ui/theme.c:5216
+#: ../src/ui/theme.c:5177 ../src/ui/theme.c:5184 ../src/ui/theme.c:5191
+#: ../src/ui/theme.c:5198 ../src/ui/theme.c:5205
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Non se configurou <%s> para o tema «%s»"
 
-#: ../src/ui/theme.c:5224
+#: ../src/ui/theme.c:5213
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -871,7 +899,7 @@ msgstr ""
 "Non hai un estilo de marco para o tipo de xanela «%s» no tema «%s», engada "
 "un elemento <window type=«%s» style_set=\"whatever\"/>"
 
-#: ../src/ui/theme.c:5631 ../src/ui/theme.c:5693 ../src/ui/theme.c:5756
+#: ../src/ui/theme.c:5620 ../src/ui/theme.c:5682 ../src/ui/theme.c:5745
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -879,7 +907,7 @@ msgstr ""
 "As constantes definidas polo usuario deben comezar cunha letra maiúscula; "
 "«%s» non o fai"
 
-#: ../src/ui/theme.c:5639 ../src/ui/theme.c:5701 ../src/ui/theme.c:5764
+#: ../src/ui/theme.c:5628 ../src/ui/theme.c:5690 ../src/ui/theme.c:5753
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "A constante «%s» xa foi definida"
@@ -1279,7 +1307,7 @@ msgstr ""
 "Estas xanelas non soportan &quot;save current setup&quot; e terán que "
 "reiniciarse manualmente a próxima vez que inicie a sesión."
 
-#: ../src/x11/window-props.c:465
+#: ../src/x11/window-props.c:515
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (en %s)"

po/nb.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter 3.13.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-23 15:01+0200\n"
-"PO-Revision-Date: 2014-07-23 15:02+0200\n"
+"POT-Creation-Date: 2014-08-23 13:36+0200\n"
+"PO-Revision-Date: 2014-08-23 13:37+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@@ -76,66 +76,94 @@ msgid "Switch applications"
 msgstr "Bytt programmer"
 
 #: ../data/50-mutter-navigation.xml.in.h:16
+msgid "Switch to previous application"
+msgstr "Bytt til forrige program"
+
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Bytt vinduer"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: ../data/50-mutter-navigation.xml.in.h:18
+msgid "Switch to previous window"
+msgstr "Bytt forrige vindu"
+
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Bytt mellom et programs vinduer"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: ../data/50-mutter-navigation.xml.in.h:20
+msgid "Switch to previous window of an application"
+msgstr "Bytt til forrige vindu i et program"
+
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Bytt systemkontroller"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: ../data/50-mutter-navigation.xml.in.h:22
+msgid "Switch to previous system control"
+msgstr "Bytt til forrige systemkontroll"
+
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Bytt vinduer direkte"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: ../data/50-mutter-navigation.xml.in.h:24
+msgid "Switch directly to previous window"
+msgstr "Bytt direkte til forrige vindu"
+
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Bytt mellom et programs vinduer direkte"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: ../data/50-mutter-navigation.xml.in.h:26
+msgid "Switch directly to previous window of an app"
+msgstr "Bytt direkte til forrive vindu i et program"
+
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Bytt systemkontroller direkte"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: ../data/50-mutter-navigation.xml.in.h:28
+msgid "Switch directly to previous system control"
+msgstr "Bytt direkte til forrige systemkontroll"
+
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Skjul alle normale vinduer"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Bytt til arbeidsområde 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Bytt til arbeidsområde 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Bytt til arbeidsområde 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Bytt til arbeidsområde 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Bytt til siste arbeidsområde"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Flytt til arbeidsområdet til venstre"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Flytt til arbeidsområdet til høyre"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Flytt til arbeidsområdet over"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Flytt til arbeidsområdet under"
 
@@ -417,18 +445,18 @@ msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:445
+#: ../src/compositor/compositor.c:441
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "En annen compositing manager kjører skjerm %i på display «%s»."
 
-#: ../src/compositor/meta-background.c:990
+#: ../src/compositor/meta-background.c:1044
 msgid "background texture could not be created from file"
 msgstr "bakgrunnstekstur kunne ikke lages fra fil"
 
-#: ../src/core/bell.c:215
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Klokkehendelse"
 
@@ -457,49 +485,49 @@ msgstr "_Vent"
 msgid "_Force Quit"
 msgstr "_Tvungen nedstenging"
 
-#: ../src/core/display.c:519
+#: ../src/core/display.c:547
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under åpning av X Window System skjerm «%s»\n"
 
-#: ../src/core/main.c:172
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Deaktiver tilkobling til sesjonshåndtereren"
 
-#: ../src/core/main.c:178
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Erstatt kjørende vindushåndterer"
 
-#: ../src/core/main.c:184
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Oppgi sesjonshåndterings-ID"
 
-#: ../src/core/main.c:189
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X-skjerm som skal brukes"
 
-#: ../src/core/main.c:195
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Initier sesjonen fra en lagret fil"
 
-#: ../src/core/main.c:201
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Gjør X-kall synkrone"
 
-#: ../src/core/main.c:207
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Kjør som en wayland-kompositør"
 
-#: ../src/core/main.c:214
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Kjør som en full skjermtjener, heller enn nøstet"
 
-#: ../src/core/main.c:450
+#: ../src/core/main.c:459
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Feil under søk i temakatalog: %s\n"
 
-#: ../src/core/main.c:466
+#: ../src/core/main.c:475
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -529,17 +557,17 @@ msgstr "Skriv versjonsnummer"
 msgid "Mutter plugin to use"
 msgstr "Mutter-tillegg som skal brukes"
 
-#: ../src/core/prefs.c:2086
+#: ../src/core/prefs.c:2101
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"
 
-#: ../src/core/screen.c:553
+#: ../src/core/screen.c:548
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"
 
-#: ../src/core/screen.c:569
+#: ../src/core/screen.c:564
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -548,7 +576,7 @@ msgstr ""
 "Skjerm %d på display «%s» har allerede en vindushåndterer; prøv å bruke "
 "flagget --replace for å erstatte aktiv vindushåndterer.\n"
 
-#: ../src/core/screen.c:662
+#: ../src/core/screen.c:657
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skjerm %d på display «%s» har allerede en vinduhåndterer\n"
@@ -1237,7 +1265,7 @@ msgstr ""
 "Disse vinduene støtter ikke &quot;lagre aktiv konfigurasjon&quot;og vil "
 "måtte startes på nytt manuelt neste gang du logger inn."
 
-#: ../src/x11/window-props.c:513
+#: ../src/x11/window-props.c:515
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (på %s)"

po/pt_BR.po

@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-07-18 09:51+0000\n"
-"PO-Revision-Date: 2014-07-18 14:53-0300\n"
+"POT-Creation-Date: 2014-08-22 09:52+0000\n"
+"PO-Revision-Date: 2014-08-22 16:18-0300\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -53,7 +53,6 @@ msgid "Move window to workspace 4"
 msgstr "Mover a janela para o espaço de trabalho 4"
 
 #: ../data/50-mutter-navigation.xml.in.h:6
-#| msgid "Move window to workspace 1"
 msgid "Move window to last workspace"
 msgstr "Mover a janela para o último espaço de trabalho"
 
@@ -98,67 +97,100 @@ msgid "Switch applications"
 msgstr "Alternar aplicativos"
 
 #: ../data/50-mutter-navigation.xml.in.h:16
+#| msgid "Switch applications"
+msgid "Switch to previous application"
+msgstr "Alternar para o aplicativo anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Alternar janelas"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: ../data/50-mutter-navigation.xml.in.h:18
+#| msgid "Switch windows"
+msgid "Switch to previous window"
+msgstr "Alternar para a janela anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Alternar as janelas de um aplicativo"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: ../data/50-mutter-navigation.xml.in.h:20
+#| msgid "Switch windows of an application"
+msgid "Switch to previous window of an application"
+msgstr "Alternar para a janela anterior de um aplicativo"
+
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Alternar os controles de sistema"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: ../data/50-mutter-navigation.xml.in.h:22
+#| msgid "Switch system controls"
+msgid "Switch to previous system control"
+msgstr "Alternar para o controle de sistema anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Alternar as janelas diretamente"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: ../data/50-mutter-navigation.xml.in.h:24
+msgid "Switch directly to previous window"
+msgstr "Alternar diretamente para a janela anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Alternar as janelas de um aplicativo diretamente"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: ../data/50-mutter-navigation.xml.in.h:26
+#| msgid "Switch windows of an application"
+msgid "Switch directly to previous window of an app"
+msgstr "Alternar diretamente para a janela anterior de um aplicativo"
+
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Alternar os controles de sistema diretamente"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: ../data/50-mutter-navigation.xml.in.h:28
+#| msgid "Switch system controls"
+msgid "Switch directly to previous system control"
+msgstr "Alternar diretamente para o controle de sistema anterior"
+
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Ocultar todas as janelas normais"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Trocar para o espaço de trabalho 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Trocar para o espaço de trabalho 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Trocar para o espaço de trabalho 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Trocar para o espaço de trabalho 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
-#| msgid "Switch to workspace 1"
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Trocar para o último espaço de trabalho"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Move para o espaço de trabalho à esquerda"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Move para o espaço de trabalho à direita"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Mover para o espaço de trabalho acima"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Mover para o espaço de trabalho abaixo"
 
@@ -399,37 +431,30 @@ msgid "Cancel tab popup"
 msgstr "Cancelar aba instantânea"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
-#| msgid "Switch to workspace 1"
 msgid "Switch to VT 1"
 msgstr "Trocar para o VT 1"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
-#| msgid "Switch to workspace 2"
 msgid "Switch to VT 2"
 msgstr "Trocar para o VT 2"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
-#| msgid "Switch to workspace 3"
 msgid "Switch to VT 3"
 msgstr "Trocar para o VT 3"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
-#| msgid "Switch to workspace 4"
 msgid "Switch to VT 4"
 msgstr "Trocar para o VT 4"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
-#| msgid "Switch to workspace 5"
 msgid "Switch to VT 5"
 msgstr "Trocar para o VT 5"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
-#| msgid "Switch to workspace 6"
 msgid "Switch to VT 6"
 msgstr "Trocar para o VT 6"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
-#| msgid "Switch to workspace 7"
 msgid "Switch to VT 7"
 msgstr "Trocar para o VT 7"
 
@@ -455,7 +480,7 @@ msgstr "%s de %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:445
+#: ../src/compositor/compositor.c:441
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -463,11 +488,11 @@ msgid ""
 msgstr ""
 "Outro compositor de janelas está em execução na tela %i na área \"%s\"."
 
-#: ../src/compositor/meta-background.c:990
+#: ../src/compositor/meta-background.c:1044
 msgid "background texture could not be created from file"
 msgstr "textura de plano de fundo não pôde ser criado de arquivo"
 
-#: ../src/core/bell.c:215
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Evento de som"
 
@@ -496,49 +521,49 @@ msgstr "_Esperar"
 msgid "_Force Quit"
 msgstr "_Forçar sair"
 
-#: ../src/core/display.c:519
+#: ../src/core/display.c:547
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir a exibição \"%s\" do sistema de janelas X\n"
 
-#: ../src/core/main.c:172
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desabilitar a conexão com o gerenciador de sessões"
 
-#: ../src/core/main.c:178
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Substituir o gerenciador de janelas em execução"
 
-#: ../src/core/main.c:184
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar o ID do gerenciador de sessões"
 
-#: ../src/core/main.c:189
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Exibição do X a ser utilizada"
 
-#: ../src/core/main.c:195
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar a sessão a partir do arquivo salvo"
 
-#: ../src/core/main.c:201
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Fazer X chamadas síncronas"
 
-#: ../src/core/main.c:207
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Executar como um compositor wayland"
 
-#: ../src/core/main.c:214
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como um servidor de tela cheia, ao invés de aninhado"
 
-#: ../src/core/main.c:450
+#: ../src/core/main.c:459
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Falha ao varrer a pasta de temas: %s\n"
 
-#: ../src/core/main.c:466
+#: ../src/core/main.c:475
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -570,17 +595,17 @@ msgstr "Versão impressa"
 msgid "Mutter plugin to use"
 msgstr "Plug-in do Mutter para usar"
 
-#: ../src/core/prefs.c:2086
+#: ../src/core/prefs.c:2101
 #, c-format
 msgid "Workspace %d"
 msgstr "Espaço de trabalho %d"
 
-#: ../src/core/screen.c:553
+#: ../src/core/screen.c:548
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A tela %d na exibição \"%s\" é inválida\n"
 
-#: ../src/core/screen.c:569
+#: ../src/core/screen.c:564
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -589,7 +614,7 @@ msgstr ""
 "A tela %d na exibição \"%s\" já possui um gerenciador de janelas; tente usar "
 "a opção --replace para substituir o gerenciador de janelas atual.\n"
 
-#: ../src/core/screen.c:662
+#: ../src/core/screen.c:657
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "A tela %d na exibição \"%s\" já possui um gerenciador de janelas\n"
@@ -1304,7 +1329,7 @@ msgstr ""
 "atual&quot; e precisarão ser reiniciadas manualmente quando você reiniciar a "
 "sessão."
 
-#: ../src/x11/window-props.c:513
+#: ../src/x11/window-props.c:515
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (em %s)"

src/Makefile.am

@@ -36,11 +36,15 @@ mutter_built_sources = \
 	$(dbus_display_config_built_sources)	\
 	$(dbus_login1_built_sources)		\
 	mutter-enum-types.h 			\
-	mutter-enum-types.c			\
+	mutter-enum-types.c
+
+if HAVE_WAYLAND
+mutter_built_sources += \
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
 	xdg-shell-protocol.c			\
 	xdg-shell-server-protocol.h
+endif
 
 wayland_protocols = \
 	wayland/protocol/gtk-shell.xml		\

src/backends/meta-cursor-private.h

@@ -30,7 +30,7 @@
 typedef struct {
   CoglTexture2D *texture;
   struct gbm_bo *bo;
-  int hot_x, hot_y;
+  int offset_x, offset_y;
 } MetaCursorImage;
 
 struct _MetaCursorReference {
@@ -41,11 +41,11 @@ struct _MetaCursorReference {
 };
 
 CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
-                                                     int                 *hot_x,
-                                                     int                 *hot_y);
+                                                     int                 *offset_x,
+                                                     int                 *offset_y);
 
 struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
-                                                 int                 *hot_x,
-                                                 int                 *hot_y);
+                                                 int                 *offset_x,
+                                                 int                 *offset_y);
 
 #endif /* META_CURSOR_PRIVATE_H */

src/backends/meta-cursor-renderer.c

@@ -35,13 +35,21 @@
 
 #include "meta-stage.h"
 
+typedef struct
+{
+  CoglTexture *texture;
+  MetaRectangle current_rect;
+  gboolean handled_by_backend;
+} MetaCursorLayer;
+
 struct _MetaCursorRendererPrivate
 {
   int current_x, current_y;
-  MetaRectangle current_rect;
+
+  MetaCursorLayer core_layer;
+  MetaCursorLayer dnd_layer;
 
   MetaCursorReference *displayed_cursor;
-  gboolean handled_by_backend;
 };
 typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
 
@@ -58,10 +66,9 @@ queue_redraw (MetaCursorRenderer *renderer)
   if (!stage)
     return;
 
-  if (priv->handled_by_backend)
-    meta_stage_set_cursor (META_STAGE (stage), NULL, &priv->current_rect);
-  else
-    meta_stage_set_cursor (META_STAGE (stage), priv->displayed_cursor, &priv->current_rect);
+  if (priv->core_layer.texture && !priv->core_layer.handled_by_backend)
+    meta_stage_set_cursor (META_STAGE (stage), layer->texture, &priv->current_rect);
+  meta_stage_set_dnd_surface (META_STAGE (stage), 
 }
 
 static gboolean
@@ -81,33 +88,68 @@ meta_cursor_renderer_init (MetaCursorRenderer *renderer)
 {
 }
 
+static void
+update_layer (MetaCursorRenderer *renderer,
+              MetaCursorLayer    *layer,
+              CoglTexture        *texture,
+              int                 offset_x,
+              int                 offset_y)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+
+  layer->texture = texture;
+
+  if (layer->texture)
+    {
+      layer->current_rect.x = priv->current_x + offset_x;
+      layer->current_rect.y = priv->current_y + offset_y;
+      layer->current_rect.width = cogl_texture_get_width (layer->texture);
+      layer->current_rect.height = cogl_texture_get_height (layer->texture);
+    }
+  else
+    {
+      layer->current_rect.x = 0;
+      layer->current_rect.y = 0;
+      layer->current_rect.width = 0;
+      layer->current_rect.height = 0;
+    }
+}
+
 static void
 update_cursor (MetaCursorRenderer *renderer)
 {
   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
   gboolean handled_by_backend;
   gboolean should_redraw = FALSE;
+  CoglTexture *texture;
+  int hot_x, hot_y;
 
   if (priv->displayed_cursor)
     {
+<<<<<<< HEAD
       CoglTexture *texture;
-      int hot_x, hot_y;
+      int offset_x, offset_y;
 
-      texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, &hot_x, &hot_y);
+      texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, &offset_x, &offset_y);
 
-      priv->current_rect.x = priv->current_x - hot_x;
-      priv->current_rect.y = priv->current_y - hot_y;
+      priv->current_rect.x = priv->current_x + offset_x;
+      priv->current_rect.y = priv->current_y + offset_y;
       priv->current_rect.width = cogl_texture_get_width (COGL_TEXTURE (texture));
       priv->current_rect.height = cogl_texture_get_height (COGL_TEXTURE (texture));
+=======
+      texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, &hot_x, &hot_y);
+>>>>>>> 75e7834... dnd 2
     }
   else
     {
-      priv->current_rect.x = 0;
-      priv->current_rect.y = 0;
-      priv->current_rect.width = 0;
-      priv->current_rect.height = 0;
+      texture = NULL;
+      hot_x = 0;
+      hot_y = 0;
     }
 
+  update_layer (renderer, &priv->core_layer, texture, hot_x, hot_y);
+  update_layer (renderer, &priv->
+
   handled_by_backend = META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer);
   if (handled_by_backend != priv->handled_by_backend)
     {
@@ -141,6 +183,17 @@ meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer,
   update_cursor (renderer);
 }
 
+void
+meta_cursor_renderer_set_dnd_surface (MetaCursorRenderer *renderer,
+                                      CoglTexture        *texture,
+                                      int                 offset_x,
+                                      int                 offset_y)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+
+  update_layer (renderer, &priv->dnd_layer, 
+}
+
 void
 meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
                                    int x, int y)
@@ -168,5 +221,5 @@ meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer)
 {
   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
 
-  return &priv->current_rect;
+  return &priv->core_layer.current_rect;
 }

src/backends/meta-cursor-tracker.c

@@ -310,6 +310,7 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
                              int               *y)
 {
   MetaCursorReference *cursor;
+  int offset_x, offset_y;
 
   g_return_if_fail (META_IS_CURSOR_TRACKER (tracker));
 
@@ -324,14 +325,19 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
     }
 
   if (cursor)
-    meta_cursor_reference_get_cogl_texture (cursor, x, y);
+    {
+      meta_cursor_reference_get_cogl_texture (cursor, &offset_x, &offset_y);
+    }
   else
     {
-      if (x)
-        *x = 0;
-      if (y)
-        *y = 0;
+      offset_x = 0;
+      offset_y = 0;
     }
+
+  if (x)
+    *x = -offset_x;
+  if (y)
+    *y = -offset_y;
 }
 
 void

src/backends/meta-cursor.c

@@ -352,25 +352,25 @@ meta_cursor_reference_from_buffer (struct wl_resource *buffer,
 
 CoglTexture *
 meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
-                                        int                 *hot_x,
-                                        int                 *hot_y)
+                                        int                 *offset_x,
+                                        int                 *offset_y)
 {
-  if (hot_x)
-    *hot_x = cursor->image.hot_x;
-  if (hot_y)
-    *hot_y = cursor->image.hot_y;
+  if (offset_x)
+    *offset_x = cursor->image.offset_x;
+  if (offset_y)
+    *offset_y = cursor->image.offset_y;
   return COGL_TEXTURE (cursor->image.texture);
 }
 
 struct gbm_bo *
 meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
-                                  int                 *hot_x,
-                                  int                 *hot_y)
+                                  int                 *offset_x,
+                                  int                 *offset_y)
 {
-  if (hot_x)
-    *hot_x = cursor->image.hot_x;
-  if (hot_y)
-    *hot_y = cursor->image.hot_y;
+  if (offset_x)
+    *offset_x = cursor->image.offset_x;
+  if (offset_y)
+    *offset_y = cursor->image.offset_y;
   return cursor->image.bo;
 }
 

src/backends/meta-cursor.h

@@ -34,8 +34,7 @@ MetaCursorReference * meta_cursor_reference_from_theme  (MetaCursor          cur
 #ifdef HAVE_WAYLAND
 #include <wayland-server.h>
 MetaCursorReference * meta_cursor_reference_from_buffer (struct wl_resource *buffer,
-                                                         int                 hot_x,
-                                                         int                 hot_y);
+                                                         int offset_x, int offset_y);
 #endif
 
 MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor);

src/backends/meta-stage.c

@@ -28,31 +28,83 @@
 #include <meta/meta-backend.h>
 #include <meta/util.h>
 
-struct _MetaStagePrivate {
-  CoglPipeline *pipeline;
+typedef struct {
+  gboolean enabled;
 
-  MetaCursorReference *cursor;
+  CoglPipeline *pipeline;
+  CoglTexture *texture;
 
   MetaRectangle current_rect;
   MetaRectangle previous_rect;
   gboolean previous_is_valid;
+} MetaOverlay;
+
+struct _MetaStagePrivate {
+  MetaOverlay dnd_overlay;
+  MetaOverlay cursor_overlay;
 };
 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);
-      cogl_pipeline_set_layer_texture (priv->pipeline, 0, texture);
+      overlay->texture = 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,42 +113,20 @@ meta_stage_finalize (GObject *object)
   MetaStage *stage = META_STAGE (object);
   MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
 
-  if (priv->pipeline)
-    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;
+  meta_overlay_free (&priv->dnd_overlay);
+  meta_overlay_free (&priv->cursor_overlay);
 }
 
 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 ())
-    paint_cursor (stage);
+  meta_overlay_paint (&priv->dnd_overlay);
+  meta_overlay_paint (&priv->cursor_overlay);
 }
 
 static void
@@ -113,10 +143,10 @@ meta_stage_class_init (MetaStageClass *klass)
 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->dnd_overlay);
+  meta_overlay_init (&priv->cursor_overlay);
 
   clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), FALSE);
 }
@@ -130,46 +160,55 @@ 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. */
-  if (priv->previous_is_valid)
+  /* Clear the location the overlay was at before, if we need to. */
+  if (overlay->previous_is_valid)
     {
-      clip.x = priv->previous_rect.x;
-      clip.y = priv->previous_rect.y;
-      clip.width = priv->previous_rect.width;
-      clip.height = priv->previous_rect.height;
+      clip.x = overlay->previous_rect.x;
+      clip.y = overlay->previous_rect.y;
+      clip.width = overlay->previous_rect.width;
+      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. */
-  if (priv->cursor)
+  /* Draw the overlay at the new position */
+  if (overlay->enabled)
     {
-      clip.x = priv->current_rect.x;
-      clip.y = priv->current_rect.y;
-      clip.width = priv->current_rect.width;
-      clip.height = priv->current_rect.height;
+      clip.x = overlay->current_rect.x;
+      clip.y = overlay->current_rect.y;
+      clip.width = overlay->current_rect.width;
+      clip.height = overlay->current_rect.height;
       clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip);
     }
 }
 
 void
-meta_stage_set_cursor (MetaStage           *stage,
-                       MetaCursorReference *cursor,
-                       MetaRectangle       *rect)
+meta_stage_set_dnd_surface (MetaStage     *stage,
+                            CoglTexture   *texture,
+                            MetaRectangle *rect)
 {
   MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
 
-  if (priv->cursor != cursor)
-    {
-      priv->cursor = cursor;
-      update_pipeline (stage);
-    }
+  g_assert (meta_is_wayland_compositor ());
 
-  priv->current_rect = *rect;
-  queue_redraw (stage);
+  meta_overlay_set (&priv->dnd_overlay, texture, rect);
+  queue_redraw_for_overlay (stage, &priv->dnd_overlay);
+}
+
+void
+meta_stage_set_cursor (MetaStage     *stage,
+                       CoglTexture   *texture,
+                       MetaRectangle *rect)
+{
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  g_assert (meta_is_wayland_compositor () || texture == NULL);
+
+  meta_overlay_set (&priv->cursor_overlay, texture, rect);
+  queue_redraw_for_overlay (stage, &priv->cursor_overlay);
 }

src/backends/meta-stage.h

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

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

@@ -72,16 +72,16 @@ set_crtc_cursor (MetaCursorRendererNative *native,
       struct gbm_bo *bo;
       union gbm_bo_handle handle;
       int width, height;
-      int hot_x, hot_y;
+      int offset_x, offset_y;
 
-      bo = meta_cursor_reference_get_gbm_bo (cursor, &hot_x, &hot_y);
+      bo = meta_cursor_reference_get_gbm_bo (cursor, &offset_x, &offset_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);
+                         width, height, -offset_x, -offset_y);
     }
   else
     {

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

@@ -330,6 +330,21 @@ output_get_hotplug_mode_update (MetaMonitorManagerXrandr *manager_xrandr,
   return output_get_boolean_property (manager_xrandr, output, "hotplug_mode_update");
 }
 
+static char *
+get_xmode_name (XRRModeInfo *xmode)
+{
+  int width = xmode->width;
+  int height = xmode->height;
+
+  if (xmode->hSkew != 0)
+    {
+      width += 2 * (xmode->hSkew >> 8);
+      height += 2 * (xmode->hSkew & 0xff);
+    }
+
+  return g_strdup_printf ("%dx%d", width, height);
+}
+
 static void
 meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 {
@@ -415,6 +430,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++)

src/compositor/compositor.c

@@ -82,7 +82,9 @@
 
 #include "backends/x11/meta-backend-x11.h"
 
+#ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland-private.h"
+#endif
 
 static gboolean
 is_modal (MetaDisplay *display)

src/compositor/meta-shaped-texture.c

@@ -28,16 +28,14 @@
 #include <config.h>
 
 #include <meta/meta-shaped-texture.h>
-#include <meta/util.h>
+#include "meta-shaped-texture-private.h"
+
+#include <cogl/cogl.h>
+#include <gdk/gdk.h> /* for gdk_rectangle_intersect() */
+
 #include "clutter-utils.h"
 #include "meta-texture-tower.h"
 
-#include "meta-shaped-texture-private.h"
-#include "meta-window-actor-private.h"
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-#include <gdk/gdk.h> /* for gdk_rectangle_intersect() */
 #include "meta-cullable.h"
 
 static void meta_shaped_texture_dispose  (GObject    *object);
@@ -298,10 +296,8 @@ meta_shaped_texture_paint (ClutterActor *actor)
   guchar opacity;
   CoglContext *ctx;
   CoglFramebuffer *fb;
-  CoglPipeline *pipeline = NULL;
   CoglTexture *paint_tex;
   ClutterActorBox alloc;
-  cairo_region_t *blended_region = NULL;
   CoglPipelineFilter filter;
 
   if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
@@ -339,6 +335,8 @@ meta_shaped_texture_paint (ClutterActor *actor)
   if (tex_width == 0 || tex_height == 0) /* no contents yet */
     return;
 
+  cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };
+
   /* Use nearest-pixel interpolation if the texture is unscaled. This
    * improves performance, especially with software rendering.
    */
@@ -354,7 +352,45 @@ meta_shaped_texture_paint (ClutterActor *actor)
   opacity = clutter_actor_get_paint_opacity (actor);
   clutter_actor_get_allocation_box (actor, &alloc);
 
-  if (priv->opaque_region != NULL && opacity == 255)
+  cairo_region_t *blended_region;
+  gboolean use_opaque_region = (priv->opaque_region != NULL && opacity == 255);
+
+  if (use_opaque_region)
+    {
+      if (priv->clip_region != NULL)
+        blended_region = cairo_region_copy (priv->clip_region);
+      else
+        blended_region = cairo_region_create_rectangle (&tex_rect);
+
+      cairo_region_subtract (blended_region, priv->opaque_region);
+    }
+  else
+    {
+      if (priv->clip_region != NULL)
+        blended_region = cairo_region_reference (priv->clip_region);
+      else
+        blended_region = NULL;
+    }
+
+  /* Limit to how many separate rectangles we'll draw; beyond this just
+   * fall back and draw the whole thing */
+#define MAX_RECTS 16
+
+  if (blended_region != NULL)
+    {
+      int n_rects = cairo_region_num_rectangles (blended_region);
+      if (n_rects > MAX_RECTS)
+        {
+          /* Fall back to taking the fully blended path. */
+          use_opaque_region = FALSE;
+
+          cairo_region_destroy (blended_region);
+          blended_region = NULL;
+        }
+    }
+
+  /* First, paint the unblended parts, which are part of the opaque region. */
+  if (use_opaque_region)
     {
       CoglPipeline *opaque_pipeline;
       cairo_region_t *region;
@@ -371,103 +407,87 @@ meta_shaped_texture_paint (ClutterActor *actor)
           region = cairo_region_reference (priv->opaque_region);
         }
 
-      if (cairo_region_is_empty (region))
-        goto paint_blended;
-
-      opaque_pipeline = get_unblended_pipeline (ctx);
-      cogl_pipeline_set_layer_texture (opaque_pipeline, 0, paint_tex);
-      cogl_pipeline_set_layer_filters (opaque_pipeline, 0, filter, filter);
-
-      n_rects = cairo_region_num_rectangles (region);
-      for (i = 0; i < n_rects; i++)
+      if (!cairo_region_is_empty (region))
         {
-          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (region, i, &rect);
-          paint_clipped_rectangle (fb, opaque_pipeline, &rect, &alloc);
+          opaque_pipeline = get_unblended_pipeline (ctx);
+          cogl_pipeline_set_layer_texture (opaque_pipeline, 0, paint_tex);
+          cogl_pipeline_set_layer_filters (opaque_pipeline, 0, filter, filter);
+
+          n_rects = cairo_region_num_rectangles (region);
+          for (i = 0; i < n_rects; i++)
+            {
+              cairo_rectangle_int_t rect;
+              cairo_region_get_rectangle (region, i, &rect);
+              paint_clipped_rectangle (fb, opaque_pipeline, &rect, &alloc);
+            }
+
+          cogl_object_unref (opaque_pipeline);
         }
 
-      cogl_object_unref (opaque_pipeline);
-
-      if (priv->clip_region != NULL)
-        {
-          blended_region = cairo_region_copy (priv->clip_region);
-        }
-      else
-        {
-          cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
-          blended_region = cairo_region_create_rectangle (&rect);
-        }
-
-      cairo_region_subtract (blended_region, priv->opaque_region);
-
-    paint_blended:
       cairo_region_destroy (region);
     }
 
-  if (blended_region == NULL && priv->clip_region != NULL)
-    blended_region = cairo_region_reference (priv->clip_region);
+  /* Now, go ahead and paint the blended parts. */
 
-  if (blended_region != NULL && cairo_region_is_empty (blended_region))
-    goto out;
-
-  if (priv->mask_texture == NULL)
+  /* We have three cases:
+   *   1) blended_region has rectangles - paint the rectangles.
+   *   2) blended_region is empty - don't paint anything
+   *   3) blended_region is NULL - paint fully-blended.
+   *
+   *   1) and 3) are the times where we have to paint stuff. This tests
+   *   for 1) and 3).
+   */
+  if (blended_region == NULL || !cairo_region_is_empty (blended_region))
     {
-      pipeline = get_unmasked_pipeline (ctx);
-    }
-  else
-    {
-      pipeline = get_masked_pipeline (ctx);
-      cogl_pipeline_set_layer_texture (pipeline, 1, priv->mask_texture);
-      cogl_pipeline_set_layer_filters (pipeline, 1, filter, filter);
-    }
+      CoglPipeline *blended_pipeline;
 
-  cogl_pipeline_set_layer_texture (pipeline, 0, paint_tex);
-  cogl_pipeline_set_layer_filters (pipeline, 0, filter, filter);
+      if (priv->mask_texture == NULL)
+        {
+          blended_pipeline = get_unmasked_pipeline (ctx);
+        }
+      else
+        {
+          blended_pipeline = get_masked_pipeline (ctx);
+          cogl_pipeline_set_layer_texture (blended_pipeline, 1, priv->mask_texture);
+          cogl_pipeline_set_layer_filters (blended_pipeline, 1, filter, filter);
+        }
 
-  {
-    CoglColor color;
-    cogl_color_init_from_4ub (&color, opacity, opacity, opacity, opacity);
-    cogl_pipeline_set_color (pipeline, &color);
-  }
+      cogl_pipeline_set_layer_texture (blended_pipeline, 0, paint_tex);
+      cogl_pipeline_set_layer_filters (blended_pipeline, 0, filter, filter);
 
-  if (blended_region != NULL)
-    {
-      int n_rects;
+      CoglColor color;
+      cogl_color_init_from_4ub (&color, opacity, opacity, opacity, opacity);
+      cogl_pipeline_set_color (blended_pipeline, &color);
 
-      /* Limit to how many separate rectangles we'll draw; beyond this just
-       * fall back and draw the whole thing */
-#     define MAX_RECTS 16
-
-      n_rects = cairo_region_num_rectangles (blended_region);
-      if (n_rects <= MAX_RECTS)
-	{
+      if (blended_region != NULL)
+        {
+          /* 1) blended_region is not empty. Paint the rectangles. */
           int i;
-          cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };
+          int n_rects = cairo_region_num_rectangles (blended_region);
 
-	  for (i = 0; i < n_rects; i++)
-	    {
-	      cairo_rectangle_int_t rect;
+          for (i = 0; i < n_rects; i++)
+            {
+              cairo_rectangle_int_t rect;
+              cairo_region_get_rectangle (blended_region, i, &rect);
 
-	      cairo_region_get_rectangle (blended_region, i, &rect);
+              if (!gdk_rectangle_intersect (&tex_rect, &rect, &rect))
+                continue;
 
-	      if (!gdk_rectangle_intersect (&tex_rect, &rect, &rect))
-		continue;
-
-              paint_clipped_rectangle (fb, pipeline, &rect, &alloc);
+              paint_clipped_rectangle (fb, blended_pipeline, &rect, &alloc);
             }
+        }
+      else
+        {
+          /* 3) blended_region is NULL. Do a full paint. */
+          cogl_framebuffer_draw_rectangle (fb, blended_pipeline,
+                                           0, 0,
+                                           alloc.x2 - alloc.x1,
+                                           alloc.y2 - alloc.y1);
+        }
 
-          goto out;
-	}
+      cogl_object_unref (blended_pipeline);
     }
 
-  cogl_framebuffer_draw_rectangle (fb, pipeline,
-                                   0, 0,
-                                   alloc.x2 - alloc.x1,
-                                   alloc.y2 - alloc.y1);
-
- out:
-  if (pipeline != NULL)
-    cogl_object_unref (pipeline);
   if (blended_region != NULL)
     cairo_region_destroy (blended_region);
 }
@@ -485,7 +505,7 @@ meta_shaped_texture_get_preferred_width (ClutterActor *self,
   priv = META_SHAPED_TEXTURE (self)->priv;
 
   if (min_width_p)
-    *min_width_p = 0;
+    *min_width_p = priv->tex_width;
 
   if (natural_width_p)
     *natural_width_p = priv->tex_width;
@@ -504,7 +524,7 @@ meta_shaped_texture_get_preferred_height (ClutterActor *self,
   priv = META_SHAPED_TEXTURE (self)->priv;
 
   if (min_height_p)
-    *min_height_p = 0;
+    *min_height_p = priv->tex_height;
 
   if (natural_height_p)
     *natural_height_p = priv->tex_height;
@@ -514,16 +534,17 @@ static cairo_region_t *
 effective_unobscured_region (MetaShapedTexture *self)
 {
   MetaShapedTexturePrivate *priv = self->priv;
-  ClutterActor *parent = clutter_actor_get_parent (CLUTTER_ACTOR (self));
+  ClutterActor *actor;
 
-  if (clutter_actor_has_mapped_clones (CLUTTER_ACTOR (self)))
-    return NULL;
-
-  while (parent && !META_IS_WINDOW_ACTOR (parent))
-    parent = clutter_actor_get_parent (parent);
-
-  if (parent && clutter_actor_has_mapped_clones (parent))
-    return NULL;
+  /* Fail if we have any mapped clones. */
+  actor = CLUTTER_ACTOR (self);
+  do
+    {
+      if (clutter_actor_has_mapped_clones (actor))
+        return NULL;
+      actor = clutter_actor_get_parent (actor);
+    }
+  while (actor != NULL);
 
   return priv->unobscured_region;
 }

src/compositor/meta-surface-actor-wayland.c

@@ -34,45 +34,15 @@
 struct _MetaSurfaceActorWaylandPrivate
 {
   MetaWaylandSurface *surface;
-  MetaWaylandBuffer *buffer;
-  struct wl_listener buffer_destroy_listener;
 };
 typedef struct _MetaSurfaceActorWaylandPrivate MetaSurfaceActorWaylandPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (MetaSurfaceActorWayland, meta_surface_actor_wayland, META_TYPE_SURFACE_ACTOR)
 
-static void
-meta_surface_actor_handle_buffer_destroy (struct wl_listener *listener, void *data)
-{
-  MetaSurfaceActorWaylandPrivate *priv = wl_container_of (listener, priv, buffer_destroy_listener);
-
-  /* If the buffer is destroyed while we're attached to it,
-   * we want to unset priv->buffer so we don't access freed
-   * memory. Keep the texture set however so the user doesn't
-   * see the window disappear. */
-  priv->buffer = NULL;
-}
-
 static void
 meta_surface_actor_wayland_process_damage (MetaSurfaceActor *actor,
                                            int x, int y, int width, int height)
 {
-  MetaSurfaceActorWayland *self = META_SURFACE_ACTOR_WAYLAND (actor);
-  MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (self);
-
-  if (priv->buffer)
-    {
-      struct wl_resource *resource = priv->buffer->resource;
-      struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (resource);
-
-      if (shm_buffer)
-        {
-          CoglTexture2D *texture = COGL_TEXTURE_2D (priv->buffer->texture);
-          cogl_wayland_texture_set_region_from_shm_buffer (texture, x, y, width, height, shm_buffer, x, y, 0, NULL);
-        }
-
-      meta_surface_actor_update_area (META_SURFACE_ACTOR (self), x, y, width, height);
-    }
 }
 
 static void
@@ -213,7 +183,7 @@ meta_surface_actor_wayland_dispose (GObject *object)
 {
   MetaSurfaceActorWayland *self = META_SURFACE_ACTOR_WAYLAND (object);
 
-  meta_surface_actor_wayland_set_buffer (self, NULL);
+  meta_surface_actor_wayland_set_texture (self, NULL);
 
   G_OBJECT_CLASS (meta_surface_actor_wayland_parent_class)->dispose (object);
 }
@@ -244,9 +214,6 @@ meta_surface_actor_wayland_class_init (MetaSurfaceActorWaylandClass *klass)
 static void
 meta_surface_actor_wayland_init (MetaSurfaceActorWayland *self)
 {
-  MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (self);
-
-  priv->buffer_destroy_listener.notify = meta_surface_actor_handle_buffer_destroy;
 }
 
 MetaSurfaceActor *
@@ -263,24 +230,11 @@ meta_surface_actor_wayland_new (MetaWaylandSurface *surface)
 }
 
 void
-meta_surface_actor_wayland_set_buffer (MetaSurfaceActorWayland *self,
-                                       MetaWaylandBuffer       *buffer)
+meta_surface_actor_wayland_set_texture (MetaSurfaceActorWayland *self,
+                                        CoglTexture *texture)
 {
-  MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (self);
   MetaShapedTexture *stex = meta_surface_actor_get_texture (META_SURFACE_ACTOR (self));
-
-  if (priv->buffer)
-    wl_list_remove (&priv->buffer_destroy_listener.link);
-
-  priv->buffer = buffer;
-
-  if (priv->buffer)
-    {
-      wl_signal_add (&priv->buffer->destroy_signal, &priv->buffer_destroy_listener);
-      meta_shaped_texture_set_texture (stex, priv->buffer->texture);
-    }
-  else
-    meta_shaped_texture_set_texture (stex, NULL);
+  meta_shaped_texture_set_texture (stex, texture);
 }
 
 MetaWaylandSurface *

src/compositor/meta-surface-actor-wayland.h

@@ -58,8 +58,8 @@ GType meta_surface_actor_wayland_get_type (void);
 MetaSurfaceActor * meta_surface_actor_wayland_new (MetaWaylandSurface *surface);
 MetaWaylandSurface * meta_surface_actor_wayland_get_surface (MetaSurfaceActorWayland *self);
 
-void meta_surface_actor_wayland_set_buffer (MetaSurfaceActorWayland *self,
-                                            MetaWaylandBuffer         *buffer);
+void meta_surface_actor_wayland_set_texture (MetaSurfaceActorWayland *self,
+                                             CoglTexture *texture);
 
 double meta_surface_actor_wayland_get_scale (MetaSurfaceActorWayland *actor);
 

src/compositor/meta-surface-actor-x11.c

@@ -179,19 +179,6 @@ is_visible (MetaSurfaceActorX11 *self)
   return (priv->pixmap != None) && !priv->unredirected;
 }
 
-static void
-damage_area (MetaSurfaceActorX11 *self,
-             int x, int y, int width, int height)
-{
-  MetaSurfaceActorX11Private *priv = meta_surface_actor_x11_get_instance_private (self);
-
-  if (!is_visible (self))
-    return;
-
-  cogl_texture_pixmap_x11_update_area (priv->texture, x, y, width, height);
-  meta_surface_actor_update_area (META_SURFACE_ACTOR (self), x, y, width, height);
-}
-
 static void
 meta_surface_actor_x11_process_damage (MetaSurfaceActor *actor,
                                        int x, int y, int width, int height)
@@ -218,11 +205,10 @@ meta_surface_actor_x11_process_damage (MetaSurfaceActor *actor,
         priv->does_full_damage = TRUE;
     }
 
-  /* Drop damage event for unredirected windows */
-  if (priv->unredirected)
+  if (!is_visible (self))
     return;
 
-  damage_area (self, x, y, width, height);
+  cogl_texture_pixmap_x11_update_area (priv->texture, x, y, width, height);
 }
 
 static void

src/compositor/meta-surface-actor.c

@@ -188,7 +188,7 @@ meta_surface_actor_get_texture (MetaSurfaceActor *self)
   return self->priv->texture;
 }
 
-void
+static void
 meta_surface_actor_update_area (MetaSurfaceActor *self,
                                 int x, int y, int width, int height)
 {
@@ -262,6 +262,9 @@ meta_surface_actor_process_damage (MetaSurfaceActor *self,
     }
 
   META_SURFACE_ACTOR_GET_CLASS (self)->process_damage (self, x, y, width, height);
+
+  if (meta_surface_actor_is_visible (self))
+    meta_surface_actor_update_area (self, x, y, width, height);
 }
 
 void
@@ -277,9 +280,15 @@ meta_surface_actor_is_argb32 (MetaSurfaceActor *self)
   CoglTexture *texture = meta_shaped_texture_get_texture (stex);
 
   /* If we don't have a texture, like during initialization, assume
-   * that we're ARGB32. */
+   * that we're ARGB32.
+   *
+   * If we are unredirected and we have no texture assume that we are
+   * not ARGB32 otherwise we wouldn't be unredirected in the first
+   * place. This prevents us from continually redirecting and
+   * unredirecting on every paint.
+   */
   if (!texture)
-    return TRUE;
+    return !meta_surface_actor_is_unredirected (self);
 
   switch (cogl_texture_get_components (texture))
     {

src/compositor/meta-surface-actor.h

@@ -61,9 +61,6 @@ void meta_surface_actor_set_input_region (MetaSurfaceActor *self,
 void meta_surface_actor_set_opaque_region (MetaSurfaceActor *self,
                                            cairo_region_t   *region);
 
-void meta_surface_actor_update_area (MetaSurfaceActor *actor,
-                                     int x, int y, int width, int height);
-
 void meta_surface_actor_process_damage (MetaSurfaceActor *actor,
                                         int x, int y, int width, int height);
 void meta_surface_actor_pre_paint (MetaSurfaceActor *actor);

src/compositor/meta-window-actor.c

@@ -35,9 +35,8 @@
 
 #ifdef HAVE_WAYLAND
 #include "meta-surface-actor-wayland.h"
-#endif
-
 #include "wayland/meta-wayland-surface.h"
+#endif
 
 typedef enum {
   INITIALLY_FROZEN,
@@ -407,9 +406,12 @@ meta_window_actor_update_surface (MetaWindowActor *self)
   MetaWindow *window = priv->window;
   MetaSurfaceActor *surface_actor;
 
+#ifdef HAVE_WAYLAND
   if (window->surface)
     surface_actor = window->surface->surface_actor;
-  else if (!meta_is_wayland_compositor ())
+  else
+#endif
+  if (!meta_is_wayland_compositor ())
     surface_actor = meta_surface_actor_x11_new (window);
   else
     surface_actor = NULL;

src/core/events.c

@@ -35,6 +35,7 @@
 #endif
 
 #ifdef HAVE_WAYLAND
+#include "backends/meta-cursor-tracker-private.h"
 #include "wayland/meta-wayland-private.h"
 #endif
 #include "meta-surface-actor.h"
@@ -187,6 +188,14 @@ meta_display_handle_event (MetaDisplay        *display,
     }
 #endif
 
+#ifdef HAVE_WAYLAND
+  if (meta_is_wayland_compositor () && event->type == CLUTTER_MOTION)
+    {
+      MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
+      meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y);
+    }
+#endif
+
   handle_idletime_for_event (event);
 
   window = get_window_for_event (display, event);

src/core/window-private.h

@@ -518,7 +518,6 @@ MetaWindow * _meta_window_shared_new       (MetaDisplay         *display,
 
 void        meta_window_unmanage           (MetaWindow  *window,
                                             guint32      timestamp);
-void        meta_window_calc_showing       (MetaWindow  *window);
 void        meta_window_queue              (MetaWindow  *window,
                                             guint queuebits);
 void        meta_window_tile               (MetaWindow        *window);

src/core/window.c

@@ -1157,9 +1157,6 @@ _meta_window_shared_new (MetaDisplay         *display,
   /* disable show desktop mode unless we're a desktop component */
   maybe_leave_show_desktop_mode (window);
 
-  if (!window->override_redirect)
-    sync_client_window_mapped (window);
-
   meta_window_queue (window, META_QUEUE_CALC_SHOWING);
   /* See bug 303284; a transient of the given window can already exist, in which
    * case we think it should probably be shown.
@@ -1523,9 +1520,6 @@ implement_showing (MetaWindow *window,
   meta_verbose ("Implement showing = %d for window %s\n",
                 showing, window->desc);
 
-  if (!window->override_redirect)
-    sync_client_window_mapped (window);
-
   if (!showing)
     {
       /* When we manage a new window, we normally delay placing it
@@ -1541,9 +1535,12 @@ implement_showing (MetaWindow *window,
     }
   else
     meta_window_show (window);
+
+  if (!window->override_redirect)
+    sync_client_window_mapped (window);
 }
 
-void
+static void
 meta_window_calc_showing (MetaWindow  *window)
 {
   implement_showing (window, meta_window_should_be_showing (window));

src/core/workspace.c

@@ -241,6 +241,19 @@ workspace_free_builtin_struts (MetaWorkspace *workspace)
   workspace->builtin_struts = NULL;
 }
 
+/* Ensure that the workspace is empty by making sure that
+ * all of our windows are on-all-workspaces. */
+static void
+assert_workspace_empty (MetaWorkspace *workspace)
+{
+  GList *l;
+  for (l = workspace->windows; l != NULL; l = l->next)
+    {
+      MetaWindow *window = l->data;
+      g_assert (window->on_all_workspaces);
+    }
+}
+
 void
 meta_workspace_remove (MetaWorkspace *workspace)
 {
@@ -249,7 +262,7 @@ meta_workspace_remove (MetaWorkspace *workspace)
 
   g_return_if_fail (workspace != workspace->screen->active_workspace);
 
-  g_assert (workspace->windows == NULL);
+  assert_workspace_empty (workspace);
 
   screen = workspace->screen;
 
@@ -344,12 +357,14 @@ meta_workspace_relocate_windows (MetaWorkspace *workspace,
   for (l = copy; l != NULL; l = l->next)
     {
       MetaWindow *window = l->data;
-      meta_window_change_workspace (window, new_home);
+
+      if (!window->override_redirect)
+        meta_window_change_workspace (window, new_home);
     }
 
   g_list_free (copy);
 
-  g_assert (workspace->windows == NULL);
+  assert_workspace_empty (workspace);
 }
 
 void

src/wayland/meta-wayland-pointer.c

@@ -315,14 +315,6 @@ meta_wayland_pointer_update (MetaWaylandPointer *pointer,
   repick_for_event (pointer, event);
 
   pointer->button_count = count_buttons (event);
-
-  if (pointer->cursor_tracker)
-    {
-      ClutterPoint pos;
-
-      clutter_input_device_get_coords (pointer->device, NULL, &pos);
-      meta_cursor_tracker_update_position (pointer->cursor_tracker, pos.x, pos.y);
-    }
 }
 
 static void

src/wayland/meta-wayland-surface.c

@@ -109,11 +109,15 @@ surface_process_damage (MetaWaylandSurface *surface,
   int i, n_rectangles;
   cairo_rectangle_int_t buffer_rect;
   int scale = surface->scale;
+  CoglTexture *texture;
+  struct wl_shm_buffer *shm_buffer;
 
   /* Damage without a buffer makes no sense so ignore that, otherwise we would crash */
   if (!surface->buffer)
     return;
 
+  texture = surface->buffer->texture;
+
   buffer_rect.x = 0;
   buffer_rect.y = 0;
   buffer_rect.width = cogl_texture_get_width (surface->buffer->texture);
@@ -125,10 +129,16 @@ surface_process_damage (MetaWaylandSurface *surface,
 
   n_rectangles = cairo_region_num_rectangles (region);
 
+  shm_buffer = wl_shm_buffer_get (surface->buffer->resource);
+
   for (i = 0; i < n_rectangles; i++)
     {
       cairo_rectangle_int_t rect;
       cairo_region_get_rectangle (region, i, &rect);
+
+      if (shm_buffer)
+        cogl_wayland_texture_set_region_from_shm_buffer (texture, rect.x, rect.y, rect.width, rect.height, shm_buffer, rect.x, rect.y, 0, NULL);
+
       meta_surface_actor_process_damage (surface->surface_actor,
                                          rect.x * scale, rect.y * scale, rect.width * scale, rect.height * scale);
     }
@@ -177,6 +187,9 @@ calculate_surface_window_geometry (MetaWaylandSurface *surface,
   if (!CLUTTER_ACTOR_IS_VISIBLE (surface_actor))
     return;
 
+  if (!surface->buffer)
+    return;
+
   /* XXX: Is there a better way to do this using Clutter APIs? */
   clutter_actor_get_position (surface_actor, &x, &y);
 
@@ -403,7 +416,7 @@ commit_pending_state (MetaWaylandSurface      *surface,
       if (pending->buffer)
         {
           ensure_buffer_texture (pending->buffer);
-          meta_surface_actor_wayland_set_buffer (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor), pending->buffer);
+          meta_surface_actor_wayland_set_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor), pending->buffer->texture);
         }
     }
 
@@ -413,6 +426,9 @@ commit_pending_state (MetaWaylandSurface      *surface,
   if (!cairo_region_is_empty (pending->damage))
     surface_process_damage (surface, pending->damage);
 
+  surface->offset_x += pending->dx;
+  surface->offset_y += pending->dy;
+
   if (pending->opaque_region)
     {
       pending->opaque_region = scale_region (pending->opaque_region, surface->scale);
@@ -1008,6 +1024,8 @@ xdg_shell_get_xdg_surface (struct wl_client *client,
       return;
     }
 
+  surface->xdg_shell_resource = resource;
+
   window = meta_window_wayland_new (meta_get_display (), surface);
   meta_wayland_surface_set_window (surface, window);
 }
@@ -1064,6 +1082,8 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
       return;
     }
 
+  surface->xdg_shell_resource = resource;
+
   window = meta_window_wayland_new (meta_get_display (), surface);
   meta_window_move_frame (window, FALSE,
                           parent_surf->window->rect.x + x,
@@ -1085,41 +1105,13 @@ static const struct xdg_shell_interface meta_wayland_xdg_shell_interface = {
   xdg_shell_pong,
 };
 
-typedef struct {
-  struct wl_resource *resource;
-  struct wl_listener client_destroy_listener;
-} XdgShell;
-
-static void
-xdg_shell_handle_client_destroy (struct wl_listener *listener, void *data)
-{
-  XdgShell *xdg_shell = wl_container_of (listener, xdg_shell, client_destroy_listener);
-  g_slice_free (XdgShell, xdg_shell);
-}
-
-static struct wl_resource *
-get_xdg_shell_for_client (struct wl_client *client)
-{
-  struct wl_listener *listener;
-  XdgShell *xdg_shell;
-
-  listener = wl_client_get_destroy_listener (client, xdg_shell_handle_client_destroy);
-
-  /* No xdg_shell has been bound for this client */
-  if (listener == NULL)
-    return NULL;
-
-  xdg_shell = wl_container_of (listener, xdg_shell, client_destroy_listener);
-  return xdg_shell->resource;
-}
-
 static void
 bind_xdg_shell (struct wl_client *client,
                 void *data,
                 guint32 version,
                 guint32 id)
 {
-  XdgShell *xdg_shell;
+  struct wl_resource *resource;
 
   if (version != META_XDG_SHELL_VERSION)
     {
@@ -1127,13 +1119,8 @@ bind_xdg_shell (struct wl_client *client,
       return;
     }
 
-  xdg_shell = g_slice_new (XdgShell);
-
-  xdg_shell->resource = wl_resource_create (client, &xdg_shell_interface, version, id);
-  wl_resource_set_implementation (xdg_shell->resource, &meta_wayland_xdg_shell_interface, data, NULL);
-
-  xdg_shell->client_destroy_listener.notify = xdg_shell_handle_client_destroy;
-  wl_client_add_destroy_listener (client, &xdg_shell->client_destroy_listener);
+  resource = wl_resource_create (client, &xdg_shell_interface, version, id);
+  wl_resource_set_implementation (resource, &meta_wayland_xdg_shell_interface, data, NULL);
 }
 
 static void
@@ -1846,23 +1833,10 @@ void
 meta_wayland_surface_ping (MetaWaylandSurface *surface,
                            guint32             serial)
 {
-  if (surface->xdg_surface.resource)
-    {
-      struct wl_client *client = wl_resource_get_client (surface->resource);
-      struct wl_resource *xdg_shell = get_xdg_shell_for_client (client);
-
-      if (xdg_shell == NULL)
-        {
-          g_warning ("Trying to ping a surface without an xdg_shell bound. How does this happen?");
-          return;
-        }
-
-      xdg_shell_send_ping (xdg_shell, serial);
-    }
+  if (surface->xdg_shell_resource)
+    xdg_shell_send_ping (surface->xdg_shell_resource, serial);
   else if (surface->wl_shell_surface.resource)
-    {
-      wl_shell_surface_send_ping (surface->wl_shell_surface.resource, serial);
-    }
+    wl_shell_surface_send_ping (surface->wl_shell_surface.resource, serial);
 }
 
 void

src/wayland/meta-wayland-surface.h

@@ -81,6 +81,7 @@ struct _MetaWaylandSurface
   MetaWaylandCompositor *compositor;
   MetaSurfaceActor *surface_actor;
   MetaWindow *window;
+  struct wl_resource *xdg_shell_resource;
   MetaWaylandSurfaceExtension xdg_surface;
   MetaWaylandSurfaceExtension xdg_popup;
   MetaWaylandSurfaceExtension wl_shell_surface;
@@ -114,6 +115,8 @@ struct _MetaWaylandSurface
     GSList *pending_placement_ops;
   } sub;
 
+  int32_t offset_x, offset_y;
+
   gboolean has_set_geometry;
 
   /* All the pending state that wl_surface.commit will apply. */

src/wayland/meta-wayland-touch.c

@@ -32,6 +32,10 @@
 #include "meta-surface-actor-wayland.h"
 #include "meta-wayland-private.h"
 
+#ifdef HAVE_NATIVE_BACKEND
+#include "backends/native/meta-backend-native.h"
+#endif
+
 struct _MetaWaylandTouchSurface
 {
   MetaWaylandSurface *surface;
@@ -472,6 +476,7 @@ meta_wayland_touch_cancel (MetaWaylandTouch *touch)
   g_list_free (surfaces);
 }
 
+#ifdef HAVE_NATIVE_BACKEND
 static gboolean
 evdev_filter_func (struct libinput_event *event,
                    gpointer               data)
@@ -508,6 +513,7 @@ evdev_filter_func (struct libinput_event *event,
 
   return CLUTTER_EVENT_PROPAGATE;
 }
+#endif
 
 void
 meta_wayland_touch_init (MetaWaylandTouch  *touch,
@@ -527,13 +533,23 @@ meta_wayland_touch_init (MetaWaylandTouch  *touch,
 
   manager = clutter_device_manager_get_default ();
   touch->device = clutter_device_manager_get_core_device (manager, CLUTTER_TOUCHSCREEN_DEVICE);
-  clutter_evdev_add_filter (evdev_filter_func, touch, NULL);
+
+#ifdef HAVE_NATIVE_BACKEND
+  MetaBackend *backend = meta_get_backend ();
+  if (META_IS_BACKEND_NATIVE (backend))
+    clutter_evdev_add_filter (evdev_filter_func, touch, NULL);
+#endif
 }
 
 void
 meta_wayland_touch_release (MetaWaylandTouch *touch)
 {
-  clutter_evdev_remove_filter (evdev_filter_func, touch);
+#ifdef HAVE_NATIVE_BACKEND
+  MetaBackend *backend = meta_get_backend ();
+  if (META_IS_BACKEND_NATIVE (backend))
+    clutter_evdev_remove_filter (evdev_filter_func, touch);
+#endif
+
   g_clear_pointer (&touch->touch_surfaces, (GDestroyNotify) g_hash_table_unref);
   g_clear_pointer (&touch->touches, (GDestroyNotify) g_hash_table_unref);
   touch->display = NULL;

src/wayland/protocol/xdg-shell.xml

@@ -45,7 +45,7 @@
 	they implement using static_assert to ensure the protocol and
 	implementation versions match.
       </description>
-      <entry name="current" value="3" summary="Always the latest version"/>
+      <entry name="current" value="4" summary="Always the latest version"/>
     </enum>
 
 
@@ -239,8 +239,8 @@
       <description summary="types of state on the surface">
         The different state values used on the surface. This is designed for
         state values like maximized, fullscreen. It is paired with the
-        request_change_state event to ensure that both the client and the
-        compositor setting the state can be synchronized.
+        configure event to ensure that both the client and the compositor
+        setting the state can be synchronized.
 
         States set in this way are double-buffered. They will get applied on
         the next commit.