frame: Don't allow resizing of edges that are constrained

https://bugzilla.gnome.org/show_bug.cgi?id=751857

.gitignore

@@ -46,6 +46,7 @@ mutter
 mutter-restart-helper
 mutter-test-client
 mutter-test-runner
+mutter-test-unit-tests
 mutter-all.test
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml

NEWS

@@ -1,3 +1,29 @@
+3.20.0
+======
+* Fix crash when using visual bell [Jonas; #763858]
+
+Contributors:
+  Jonas Ådahl, Jasper St. Pierre
+
+Translations:
+  Milo Casagrande [it], Ask Hjorth Larsen [da]
+
+3.19.92
+=======
+* Add system bell support on wayland [Jonas; #763284]
+* Add gtk_surface.present to gtk-shell [Jonas; #763295]
+* Handle DND drops on the root window [Carlos; #762104]
+* Misc. bug fixes [Jonas, Carlos, Rui; #762828, #760745, #763125, #762763,
+  #762661, #762639, #763159]
+
+Contributors:
+  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner
+
+Translations:
+  Rūdolfs Mazurs [lv], Balázs Úr [hu], Claude Paroz [fr], Matej Urbančič [sl],
+  Мирослав Николић [sr, sr@latin], Sebastian Rasmussen [sv], Changwoo Ryu [ko],
+  Gil Forcada [ca], Tom Tryfonidis [el]
+
 3.19.91
 =======
 * Add --nested CLI argument to fix nested wayland session [Jonas; #758658]

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ(2.62)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [19])
-m4_define([mutter_micro_version], [91])
+m4_define([mutter_minor_version], [20])
+m4_define([mutter_micro_version], [0])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])

po/LINGUAS

@@ -29,6 +29,7 @@ eu
 fa
 fi
 fr
+fur
 ga
 gl
 gu

po/ca.po

@@ -6,21 +6,23 @@
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007, 2008.
 # David Planella <david.planella@gmail.com>, 2008, 2009, 2011, 2012.
 # Jordi Serratosa <jordis@softcatala.cat>, 2012.
-# Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014.
+# Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.24\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-10 17:33-0400\n"
-"PO-Revision-Date: 2015-03-10 17:33-0400\n"
-"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-03-13 01:36+0000\n"
+"PO-Revision-Date: 2016-03-13 14:45+0100\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -465,22 +467,22 @@ msgstr "Canvia al terminal virtual 11"
 msgid "Switch to VT 12"
 msgstr "Canvia al terminal virtual 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Pantalla integrada"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Pantalla desconeguda"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -496,7 +498,7 @@ msgstr ""
 "Ja s'està executant un altre gestor de composició a la pantalla %i a la "
 "visualització «%s»."
 
-#: ../src/core/bell.c:185
+#: ../src/core/bell.c:192
 msgid "Bell event"
 msgstr "Esdeveniment de campana"
 
@@ -525,41 +527,51 @@ msgstr "_Espera"
 msgid "_Force Quit"
 msgstr "_Força'n la sortida"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
 "S'ha produït un error en obrir la pantalla del sistema de finestres X «%s»\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Inhabilita la connexió al gestor de sessions"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Reemplaça el gestor de finestres en execució"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Especifica l'ID de gestió de sessió"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Visualització X per usar"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Inicialitza la sessió des del fitxer desat"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Fes que les crides a l'X siguin síncrones"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Funciona com a compositor de Wayland"
 
-#: ../src/core/main.c:220
+# Notes:
+# Afegeix una nota
+#
+# Camins:
+# ../src/core/main.c:223
+#: ../src/core/main.c:223
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "Funciona com a compositor imbricat"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Funciona com a servidor de pantalla completa, en comptes d'imbricat"
 
@@ -587,12 +599,12 @@ msgstr "Escriu versió"
 msgid "Mutter plugin to use"
 msgstr "Connector del Mutter a utilitzar"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -601,12 +613,12 @@ msgstr ""
 "La pantalla «%s» ja té un gestor de finestres; proveu l'opció --replace per "
 "reemplaçar el gestor de finestres actual."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La pantalla %d en la visualització '%s' no és vàlida\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter es va compilar sense compatibilitat per al mode detallat\n"
 

po/da.po

@@ -1,5 +1,5 @@
 # Danish translation of Mutter.
-# Copyright (C) 2002-2009, 2012-2015.
+# Copyright (C) 2002-2009, 2012-2016.
 # This file is distributed under the same license as the metacity package.
 # Kjartan Maraas <kmaraas@gnome.org>, 2002
 # Keld simonsen <keld@dkuug.dk>, 2002
@@ -8,7 +8,7 @@
 # Lasse Bang Mikkelsen <lbm@fatalerror.dk>, 2006.
 # Kenneth Nielsen <k.nielsen81@gmail.com>, 2008.
 # Joe Hansen <joedalton2@yahoo.dk>, 2011.
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2007, 09, 10, 12, 13, 14, 15.
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2007, 09, 10, 12, 13, 14, 15, 16.
 #
 # Konventioner:
 #
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-21 16:30+0100\n"
-"PO-Revision-Date: 2015-03-14 17:01+0100\n"
+"POT-Creation-Date: 2016-03-20 23:17+0100\n"
+"PO-Revision-Date: 2016-03-20 21:46+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -291,7 +291,7 @@ msgstr ""
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
-msgstr "Fastgør modaldialogvinduer"
+msgstr "Fastgør modaldialoger"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
@@ -299,9 +299,8 @@ msgid ""
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""
-"Når sand, vil modaldialogvinduer hænge sammen med titellinjen af "
-"ophavsvinduet og flyttes sammen med dette, frem for at have uafhængige "
-"titellinjer."
+"Når sand, vil modaldialoger hænge sammen med titellinjen af ophavsvinduet og "
+"flyttes sammen med dette, frem for at have uafhængige titellinjer."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -463,22 +462,22 @@ msgstr "Skift til VT 11"
 msgid "Switch to VT 12"
 msgstr "Skift til VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Indbygget skærm"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Ukendt skærm"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -493,7 +492,7 @@ msgid ""
 msgstr ""
 "En anden komposithåndtering kører allerede på skærm %i på terminal \"%s\"."
 
-#: ../src/core/bell.c:185
+#: ../src/core/bell.c:192
 msgid "Bell event"
 msgstr "Bip-hændelse"
 
@@ -522,40 +521,44 @@ msgstr "_Vent"
 msgid "_Force Quit"
 msgstr "_Tving til at afslutte"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Kunne ikke åbne X Window System-terminalen \"%s\"\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Deaktivér forbindelse til sessionshåndtering"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Erstat den kørende vindueshåndtering"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Angiv sessionhåndterings-id"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "X-skærm som bruges"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Initialisér session fra gemt fil"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Gør kald til X synkrone"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Kør som en wayland-kompositor"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Kør som en indlejret kompositor"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Kør som fuld displayserver, frem for indlejret"
 
@@ -582,12 +585,12 @@ msgstr "Vis version"
 msgid "Mutter plugin to use"
 msgstr "Mutter-udvidelsesmodul der skal bruges"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbejdsområde %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -596,12 +599,12 @@ msgstr ""
 "Terminalen \"%s\" har allerede en vindueshåndtering; prøv tilvalget --"
 "replace for at erstatte den aktuelle vindueshåndtering."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skærm %d på terminal \"%s\" er ugyldig\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter blev kompileret uden understøttelse for uddybende tilstand\n"
 
@@ -1336,9 +1339,6 @@ msgstr "%s (på %s)"
 #~ msgid "_Dialog"
 #~ msgstr "_Dialog"
 
-#~ msgid "_Modal dialog"
-#~ msgstr "_Modaldialogvindue"
-
 #~ msgid "_Utility"
 #~ msgstr "_Værktøj"
 
@@ -1402,9 +1402,6 @@ msgstr "%s (på %s)"
 #~ msgid "Border"
 #~ msgstr "Ramme"
 
-#~ msgid "Attached Modal Dialog"
-#~ msgstr "Fastgjort modaldialogvindue"
-
 #~ msgid "Button layout test %d"
 #~ msgstr "Knaplayouttest %d"
 

po/el.po

@@ -20,16 +20,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: 2015-02-21 11:31+0000\n"
-"PO-Revision-Date: 2015-02-21 15:43+0200\n"
-"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
+"POT-Creation-Date: 2016-03-12 01:36+0000\n"
+"PO-Revision-Date: 2016-03-14 23:05+0200\n"
+"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
 "Language-Team: Greek, Modern (1453-) <opensuse-translation-el@opensuse.org>\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: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
@@ -453,46 +453,41 @@ msgid "Switch to VT 7"
 msgstr "Εναλλαγή στο VT 7"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Εναλλαγή στο VT 8"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Εναλλαγή στο VT 9"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Εναλλαγή στο VT 10"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Εναλλαγή στο VT 11"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Εναλλαγή στο VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Ενσωματωμένη οθόνη"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Άγνωστη"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Άγνωστη οθόνη"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -507,7 +502,7 @@ msgid ""
 msgstr ""
 "Εκτελείται ένας άλλος διαχειριστής παραθύρων στην οθόνη %i προβολή \"%s\"."
 
-#: ../src/core/bell.c:185
+#: ../src/core/bell.c:192
 msgid "Bell event"
 msgstr "Ηχητικό συμβάν κουδουνιού"
 
@@ -537,40 +532,44 @@ msgid "_Force Quit"
 msgstr "_Εξαναγκασμός σε τερματισμό"
 
 # gconf/gconf-internals.c:2416
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Αποτυχία ανοίγματος οθόνης του συστήματος παραθύρων Χ '%s'\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Απενεργοποίηση σύνδεσης στο διαχειριστή συνεδρίας"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Αντικατάσταση του τρέχοντος διαχειριστή παραθύρων"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Καθορισμός αναγνωριστικού διαχείρισης συνεδρίας"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Εμφάνιση Χ για χρήση"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Εκκίνηση συνεδρίας από savefile"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Να καταστούν σύγχρονες οι κλήσεις του X"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
-msgstr "Εκτέλεση ως συνθετητής wayland"
+msgstr "Εκτέλεση ως wayland compositor"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Εκτέλεση ως ενσωματωμένος compositor"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Εκτέλεση ως διακομιστής πλήρους οθόνης, αντί ενσωματωμένης"
 
@@ -598,16 +597,13 @@ msgstr "Εμφάνιση έκδοσης"
 msgid "Mutter plugin to use"
 msgstr "Πρόσθετα του Mutter για χρήση"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Χώρος εργασίας %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
-#| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."
@@ -616,12 +612,12 @@ msgstr ""
 "χρησιμοποιήσετε την επιλογή --replace για να αντικαταστήσετε τον τρέχων "
 "διαχειριστή παραθύρων."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Η οθόνη %d στην προβολή '%s' δεν είναι έγκυρη\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Το Mutter έχει μεταγλωττιστεί χωρίς υποστήριξη για λειτουργία εμφάνισης "

po/eu.po

@@ -2,24 +2,23 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
+#
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2012, 2013, 2014, 2015.
-#
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2012, 2013, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-21 15:50+0100\n"
-"PO-Revision-Date: 2015-03-21 15:51+0100\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-23 17:05+0100\n"
+"PO-Revision-Date: 2016-03-23 17:06+0100\n"
+"Last-Translator: dooteo <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
@@ -455,22 +454,22 @@ msgstr "Aldatu 11. TBra"
 msgid "Switch to VT 12"
 msgstr "Aldatu 12. TBra"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Bertako pantaila"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Pantaila ezezaguna"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -486,7 +485,7 @@ msgstr ""
 "Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen \"%2$s\" "
 "pantailako %1$i. monitorean \"."
 
-#: ../src/core/bell.c:185
+#: ../src/core/bell.c:194
 msgid "Bell event"
 msgstr "Soinuaren gertaera"
 
@@ -515,40 +514,44 @@ msgstr "_Itxaron"
 msgid "_Force Quit"
 msgstr "_Behartu ixtera"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Huts egin du X Window sistemaren '%s' pantaila irekitzean\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Desgaitu saio-kudeatzailearen konexioa"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Ordeztu exekutatzen dagoen leiho-kudeatzailea"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Zehaztu saio-kudeatzailearen IDa"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "X pantaila erabiltzeko"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Hasieratu saioa babes-fitxategitik"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Egin X deiak sinkronoak izatea"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Exekutatu wayland konposatzaile gisa"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Exekutatu habiaratutako konposatzaile gisa"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Exekutatu pantaila-zerbitzari oso bezala, habiaratuta baino"
 
@@ -575,12 +578,12 @@ msgstr "Erakutsi bertsioa"
 msgid "Mutter plugin to use"
 msgstr "Mutter-en osagaia erabiltzeko"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. laneko area"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -589,12 +592,12 @@ msgstr ""
 "'%s' pantailak badu leiho-kudeatzailea; erabili --replace aukera uneko leiho-"
 "kudeatzailea ordezteko."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "'%2$s' bistaratzeko %1$d pantaila ez da baliozkoa\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter modu xehatuaren euskarririk gabe konpilatu da\n"
 
@@ -676,11 +679,11 @@ msgstr "%s (%s)"
 #~ "\" ez dator bat formatuarekin"
 
 #~ msgid ""
-#~ "GTK color specification must have the state in brackets, e.g. gtk:fg"
-#~ "[NORMAL] where NORMAL is the state; could not parse \"%s\""
+#~ "GTK color specification must have the state in brackets, e.g. gtk:"
+#~ "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 #~ msgstr ""
-#~ "GTK kolore-zehaztapenak egoera kortxete artean izan behar du, adib. gtk:fg"
-#~ "[NORMAL], NORMAL egoera izanik; \"%s\" ezin da analizatu"
+#~ "GTK kolore-zehaztapenak egoera kortxete artean izan behar du, adib. gtk:"
+#~ "fg[NORMAL], NORMAL egoera izanik; \"%s\" ezin da analizatu"
 
 #~ msgid ""
 #~ "GTK color specification must have a close bracket after the state, e.g. "

po/fr.po

@@ -1,5 +1,5 @@
 # French translation of mutter.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the metacity package.
 #
 # Christophe Fergeau <teuf@users.sourceforge.net>, 2002.
@@ -11,7 +11,7 @@
 # Cyprien Le Pannérer <cyplp@free.fr>, 2006.
 # Robert-André Mauchin <zebob.m@gmail.com>, 2007. 
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
-# Claude Paroz <claude@2xlibre.net>, 2008-2015.
+# Claude Paroz <claude@2xlibre.net>, 2008-2016.
 # Bruno Brouard <annoa.b@gmail.com>, 2011-12.
 #
 msgid ""
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-23 23:11+0000\n"
-"PO-Revision-Date: 2015-02-24 10:08+0100\n"
+"POT-Creation-Date: 2016-03-05 13:41+0000\n"
+"PO-Revision-Date: 2016-03-05 17:57+0100\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -468,22 +468,22 @@ msgstr "Passer à l'émulateur de terminal 11"
 msgid "Switch to VT 12"
 msgstr "Passer à l'émulateur de terminal 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Affichage intégré"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Affichage inconnu"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -528,40 +528,44 @@ msgstr "_Attendre"
 msgid "_Force Quit"
 msgstr "_Forcer à quitter"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Impossible d'ouvrir l'affichage « %s » du système X Window\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Désactiver la connexion au gestionnaire de sessions"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Remplacer le gestionnaire de fenêtres en cours de fonctionnement"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Indiquer l'ID de gestion de sessions"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Affichage X à utiliser"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Initialiser la session depuis le fichier de sauvegarde"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Rendre synchrones les appels à X"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Lancer comme un compositeur wayland"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Lancer comme un compositeur imbriqué"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Lancer comme un serveur d'affichage complet, plutôt qu'imbriqué"
 
@@ -589,12 +593,12 @@ msgstr "Afficher la version"
 msgid "Mutter plugin to use"
 msgstr "Greffon de Mutter à utiliser"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -603,12 +607,12 @@ msgstr ""
 "L'affichage « %s » a déjà un gestionnaire de fenêtres ; essayez d'utiliser "
 "l'option --replace pour remplacer le gestionnaire de fenêtres actuel."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "L'écran %d sur l'affichage « %s » n'est pas valide\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter a été compilé sans la prise en charge du mode bavard\n"
 

po/fur.po

@@ -0,0 +1,583 @@
+# Friulian translation for mutter.
+# Copyright (C) 2016 mutter's COPYRIGHT HOLDER
+# This file is distributed under the same license as the mutter package.
+# Fabio Tomat <f.t.public@gmail.com>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mutter master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-03-25 01:58+0000\n"
+"PO-Revision-Date: 2016-03-25 17:54+0100\n"
+"Language-Team: Friulian <fur@li.org>\n"
+"Language: fur\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
+"X-Generator: Poedit 1.8.5\n"
+
+#: ../data/50-mutter-navigation.xml.in.h:1
+msgid "Navigation"
+msgstr "Navigazion"
+
+#: ../data/50-mutter-navigation.xml.in.h:2
+msgid "Move window to workspace 1"
+msgstr "Sposte barcon tal spazi di lavôr 1"
+
+#: ../data/50-mutter-navigation.xml.in.h:3
+msgid "Move window to workspace 2"
+msgstr "Sposte barcon tal spazi di lavôr 2"
+
+#: ../data/50-mutter-navigation.xml.in.h:4
+msgid "Move window to workspace 3"
+msgstr "Sposte barcon tal spazi di lavôr 3"
+
+#: ../data/50-mutter-navigation.xml.in.h:5
+msgid "Move window to workspace 4"
+msgstr "Sposte barcon tal spazi di lavôr 4"
+
+#: ../data/50-mutter-navigation.xml.in.h:6
+msgid "Move window to last workspace"
+msgstr "Sposte barcon tal ultin spazi di lavôr"
+
+#: ../data/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the left"
+msgstr "Sposte barcon tal spazi di lavôr a çampe"
+
+#: ../data/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace to the right"
+msgstr "Sposte barcon tal spazi di lavôr a drete"
+
+#: ../data/50-mutter-navigation.xml.in.h:9
+msgid "Move window one workspace up"
+msgstr "Sposte barcon tal spazi di lavôr parsore"
+
+#: ../data/50-mutter-navigation.xml.in.h:10
+msgid "Move window one workspace down"
+msgstr "Sposte barcon tal spazi di lavôr sot"
+
+#: ../data/50-mutter-navigation.xml.in.h:11
+msgid "Move window one monitor to the left"
+msgstr "Sposte barcon tal visôr a çampe"
+
+#: ../data/50-mutter-navigation.xml.in.h:12
+msgid "Move window one monitor to the right"
+msgstr "Sposte barcon tal visôr a drete"
+
+#: ../data/50-mutter-navigation.xml.in.h:13
+msgid "Move window one monitor up"
+msgstr "Sposte barcon tal visôr parsore"
+
+#: ../data/50-mutter-navigation.xml.in.h:14
+msgid "Move window one monitor down"
+msgstr "Sposte barcon tal visôr sot"
+
+#: ../data/50-mutter-navigation.xml.in.h:15
+msgid "Switch applications"
+msgstr "Passâ di une aplicazion in chê altre"
+
+#: ../data/50-mutter-navigation.xml.in.h:16
+msgid "Switch to previous application"
+msgstr "Passe ae aplicazion prime"
+
+#: ../data/50-mutter-navigation.xml.in.h:17
+msgid "Switch windows"
+msgstr "Passâ di un barcon in chel altri"
+
+#: ../data/50-mutter-navigation.xml.in.h:18
+msgid "Switch to previous window"
+msgstr "Passe al barcon prime"
+
+#: ../data/50-mutter-navigation.xml.in.h:19
+msgid "Switch windows of an application"
+msgstr "Passâ di un barcon in chel altri di une aplicazion"
+
+#: ../data/50-mutter-navigation.xml.in.h:20
+msgid "Switch to previous window of an application"
+msgstr "Passe al barcon prime di une aplicazion"
+
+#: ../data/50-mutter-navigation.xml.in.h:21
+msgid "Switch system controls"
+msgstr "Passâ di un control di sisteme in chel altri"
+
+#: ../data/50-mutter-navigation.xml.in.h:22
+msgid "Switch to previous system control"
+msgstr "Passe al control di sisteme precedent"
+
+#: ../data/50-mutter-navigation.xml.in.h:23
+msgid "Switch windows directly"
+msgstr ""
+
+#: ../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:26
+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:28
+msgid "Switch directly to previous system control"
+msgstr ""
+
+#: ../data/50-mutter-navigation.xml.in.h:29
+msgid "Hide all normal windows"
+msgstr "Plate ducj i barcons normâi"
+
+#: ../data/50-mutter-navigation.xml.in.h:30
+msgid "Switch to workspace 1"
+msgstr "Passe al spazi di lavôr 1"
+
+#: ../data/50-mutter-navigation.xml.in.h:31
+msgid "Switch to workspace 2"
+msgstr "Passe al spazi di lavôr 2"
+
+#: ../data/50-mutter-navigation.xml.in.h:32
+msgid "Switch to workspace 3"
+msgstr "Passe al spazi di lavôr 3"
+
+#: ../data/50-mutter-navigation.xml.in.h:33
+msgid "Switch to workspace 4"
+msgstr "Passe al spazi di lavôr 4"
+
+#: ../data/50-mutter-navigation.xml.in.h:34
+msgid "Switch to last workspace"
+msgstr "Passe al ultin spazi di lavôr"
+
+#: ../data/50-mutter-navigation.xml.in.h:35
+msgid "Move to workspace left"
+msgstr "Sposte il spazi di lavôr a çampe"
+
+#: ../data/50-mutter-navigation.xml.in.h:36
+msgid "Move to workspace right"
+msgstr "Sposte il spazi di lavôr a drete"
+
+#: ../data/50-mutter-navigation.xml.in.h:37
+msgid "Move to workspace above"
+msgstr "Sposte il spazi di lavôr parsore"
+
+#: ../data/50-mutter-navigation.xml.in.h:38
+msgid "Move to workspace below"
+msgstr "Sposte il spazi di lavôr sot"
+
+#: ../data/50-mutter-system.xml.in.h:1
+msgid "System"
+msgstr "Sisteme"
+
+#: ../data/50-mutter-system.xml.in.h:2
+msgid "Show the run command prompt"
+msgstr ""
+
+#: ../data/50-mutter-system.xml.in.h:3
+msgid "Show the activities overview"
+msgstr "Mostre la panoramiche ativitâts"
+
+#: ../data/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Barcons"
+
+#: ../data/50-mutter-windows.xml.in.h:2
+msgid "Activate the window menu"
+msgstr "Ative il menù dal barcon"
+
+#: ../data/50-mutter-windows.xml.in.h:3
+msgid "Toggle fullscreen mode"
+msgstr "Ative/Disative modalitât plen visôr"
+
+#: ../data/50-mutter-windows.xml.in.h:4
+msgid "Toggle maximization state"
+msgstr "Ative/Disative il stât slargjât"
+
+#: ../data/50-mutter-windows.xml.in.h:5
+msgid "Maximize window"
+msgstr "Slargje il barcon"
+
+#: ../data/50-mutter-windows.xml.in.h:6
+msgid "Restore window"
+msgstr "Ripristine barcon"
+
+#: ../data/50-mutter-windows.xml.in.h:7
+msgid "Toggle shaded state"
+msgstr "Ative/Disative stât inrodolât"
+
+#: ../data/50-mutter-windows.xml.in.h:8
+msgid "Close window"
+msgstr "Siere il barcon"
+
+#: ../data/50-mutter-windows.xml.in.h:9
+msgid "Hide window"
+msgstr "Plate il barcon"
+
+#: ../data/50-mutter-windows.xml.in.h:10
+msgid "Move window"
+msgstr "Sposte il barcon"
+
+#: ../data/50-mutter-windows.xml.in.h:11
+msgid "Resize window"
+msgstr "Ridimensione barcon"
+
+#: ../data/50-mutter-windows.xml.in.h:12
+msgid "Toggle window on all workspaces or one"
+msgstr "Ative/Disative barcon su ducj i spazis di lavôr o nome un"
+
+#: ../data/50-mutter-windows.xml.in.h:13
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Tire sù il barcon se al è cuviert, se no sbassilu"
+
+#: ../data/50-mutter-windows.xml.in.h:14
+msgid "Raise window above other windows"
+msgstr "Met il barcon parsore di chei altris"
+
+#: ../data/50-mutter-windows.xml.in.h:15
+msgid "Lower window below other windows"
+msgstr "Bute il barcon sot di chei altris"
+
+#: ../data/50-mutter-windows.xml.in.h:16
+msgid "Maximize window vertically"
+msgstr "Slargje il barcon par verticâl"
+
+#: ../data/50-mutter-windows.xml.in.h:17
+msgid "Maximize window horizontally"
+msgstr "Slargje il barcon par orizontâl"
+
+#: ../data/50-mutter-windows.xml.in.h:18
+msgid "View split on left"
+msgstr ""
+
+#: ../data/50-mutter-windows.xml.in.h:19
+msgid "View split on right"
+msgstr ""
+
+#: ../data/mutter.desktop.in.h:1
+msgid "Mutter"
+msgstr "Mutter"
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+msgid "Attach modal dialogs"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+msgid "Workspaces are managed dynamically"
+msgstr "I spazis di vore a son ministrât in maniere dinamiche"
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+msgid "Workspaces only on primary"
+msgstr "Spazis di vore nome tal visôr primari"
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+msgid "No tab popup"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Delay focus changes until the pointer stops moving"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+msgid ""
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Auto maximize nearly monitor sized windows"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
+msgid ""
+"If enabled, new windows that are initially the size of the monitor "
+"automatically get maximized."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
+msgid "Place new windows in the center"
+msgstr "Place i gnûfs barcons tal mieç"
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
+msgid ""
+"When true, the new windows will always be put in the center of the active "
+"screen of the monitor."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+msgid "Select window from tab popup"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+msgid "Cancel tab popup"
+msgstr ""
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+msgid "Switch to VT 1"
+msgstr "Passe al VT 1"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+msgid "Switch to VT 2"
+msgstr "Passe al VT 2"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+msgid "Switch to VT 3"
+msgstr "Passe al VT 3"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+msgid "Switch to VT 4"
+msgstr "Passe al VT 4"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+msgid "Switch to VT 5"
+msgstr "Passe al VT 5"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+msgid "Switch to VT 6"
+msgstr "Passe al VT 6"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+msgid "Switch to VT 7"
+msgstr "Passe al VT 7"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+msgid "Switch to VT 8"
+msgstr "Passe al VT 8"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+msgid "Switch to VT 9"
+msgstr "Passe al VT 9"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+msgid "Switch to VT 10"
+msgstr "Passe al VT 10"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+msgid "Switch to VT 11"
+msgstr "Passe al VT 11"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+msgid "Switch to VT 12"
+msgstr "Passe al VT 12"
+
+#: ../src/backends/meta-monitor-manager.c:518
+msgid "Built-in display"
+msgstr "Display integrât"
+
+#: ../src/backends/meta-monitor-manager.c:544
+msgid "Unknown"
+msgstr "No cognossût"
+
+#: ../src/backends/meta-monitor-manager.c:546
+msgid "Unknown Display"
+msgstr "Display no cognossût"
+
+#. TRANSLATORS: this is a monitor vendor name, followed by a
+#. * size in inches, like 'Dell 15"'
+#.
+#: ../src/backends/meta-monitor-manager.c:554
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#. This probably means that a non-WM compositor like xcompmgr is running;
+#. * we have no way to get it to exit
+#: ../src/compositor/compositor.c:456
+#, c-format
+msgid ""
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
+msgstr ""
+"Un altri compositing manager al è za in esecuzion sul schermi %i sul display "
+"\"%s\"."
+
+#: ../src/core/bell.c:194
+msgid "Bell event"
+msgstr "Event cjampane"
+
+#: ../src/core/delete.c:127
+#, c-format
+msgid "“%s” is not responding."
+msgstr "“%s” nol rispuint."
+
+#: ../src/core/delete.c:129
+msgid "Application is not responding."
+msgstr "La aplicazion no rispuint."
+
+#: ../src/core/delete.c:134
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+
+#: ../src/core/delete.c:141
+msgid "_Wait"
+msgstr "_Spiete"
+
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "Sfuarce _Jessude"
+
+#: ../src/core/display.c:555
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Impussibil vierzi il display '%s' di X Window System\n"
+
+#: ../src/core/main.c:181
+msgid "Disable connection to session manager"
+msgstr ""
+
+#: ../src/core/main.c:187
+msgid "Replace the running window manager"
+msgstr "Rimplace il window manager in vore"
+
+#: ../src/core/main.c:193
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../src/core/main.c:198
+msgid "X Display to use"
+msgstr "Display X di doprâ"
+
+#: ../src/core/main.c:204
+msgid "Initialize session from savefile"
+msgstr "Inizialize session da file salvât"
+
+#: ../src/core/main.c:210
+msgid "Make X calls synchronous"
+msgstr "Fâs lis clamadis X sincronis"
+
+#: ../src/core/main.c:217
+msgid "Run as a wayland compositor"
+msgstr "Eseguìs come compositor wayland"
+
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Eseguìs come compositor nidiât"
+
+#: ../src/core/main.c:231
+msgid "Run as a full display server, rather than nested"
+msgstr "Eseguìs come servidôr display complet, invezit che nidiât"
+
+#: ../src/core/mutter.c:39
+#, c-format
+msgid ""
+"mutter %s\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"This is free software; see the source for copying conditions.\n"
+"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
+"PARTICULAR PURPOSE.\n"
+msgstr ""
+"mutter %s\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., e altris\n"
+"Chest al è software libar; viodi i sorzints pes condizions di copie.\n"
+"No je NISSUNE garanzie; nancje di COMERCIABILITÂT o IDONEITÂT A UNE "
+"FINALITÂT PARTICOLÂR.\n"
+
+#: ../src/core/mutter.c:53
+msgid "Print version"
+msgstr "Stampe version"
+
+#: ../src/core/mutter.c:59
+msgid "Mutter plugin to use"
+msgstr "Plugin Mutter di doprâ"
+
+#: ../src/core/prefs.c:1997
+#, c-format
+msgid "Workspace %d"
+msgstr "Spazi di lavôr %d"
+
+#: ../src/core/screen.c:521
+#, c-format
+msgid ""
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
+msgstr ""
+"Il display \"%s\" al à za un window manager; prove dopre la opzion --replace "
+"par rimplaçâ chel atuâl."
+
+#: ../src/core/screen.c:603
+#, c-format
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Schermi %d su display '%s' no valit\n"
+
+#: ../src/core/util.c:121
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter al è stât compilât cence supuart pe modalitât fetose\n"
+
+#: ../src/x11/session.c:1815
+msgid ""
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
+msgstr ""
+"Chescj barcons no supuartin la funzion &quot;salve impostazions atuâi&quot; "
+"e si scugnarà tornâ a inviâlis a man tal prossim acès."
+
+#: ../src/x11/window-props.c:549
+#, c-format
+msgid "%s (on %s)"
+msgstr "%s (su %s)"

po/hu.po

@@ -1,4 +1,4 @@
-# Hungarian translation of mutter
+# Hungarian translation of mutter.
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the mutter package.
 #
@@ -6,14 +6,14 @@
 # Gabor Sari <saga at externet dot hu>, 2003.
 # Laszlo Dvornik <dvornik at gnome dot hu>, 2004.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
-# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014, 2015.
+# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-22 11:10+0000\n"
-"PO-Revision-Date: 2015-02-22 20:52+0100\n"
+"POT-Creation-Date: 2016-03-04 13:42+0000\n"
+"PO-Revision-Date: 2016-03-04 20:43+0100\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -436,46 +436,41 @@ msgid "Switch to VT 7"
 msgstr "Váltás a 7. VT-re"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Váltás a 8. VT-re"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Váltás a 9. VT-re"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Váltás a 10. VT-re"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Váltás a 11. VT-re"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Váltás a 12. VT-re"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Beépített kijelző"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Ismeretlen kijelző"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -519,40 +514,45 @@ msgstr "Vá_rakozás"
 msgid "_Force Quit"
 msgstr "_Erőltetett kilépés"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nem sikerült megnyitni a(z) „%s” X Window rendszer képernyőt\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "A munkamenet-kezelőhöz való csatlakozás tiltása"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "A futó ablakkezelő helyettesítése"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "A munkamenet-kezelő azonosítójának megadása"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "A használandó X megjelenítő"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "A munkamenet előkészítése a mentési fájlból"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Az X-hívások szinkronná tétele"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Futtatás wayland betűszedőként"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "Futtatás beágyazott betűszedőként"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr ""
 "Futtatás teljes megjelenítő kiszolgálóként az egymásba ágyazott helyett"
@@ -580,12 +580,12 @@ msgstr "Verzió kinyomtatása"
 msgid "Mutter plugin to use"
 msgstr "Használandó Mutter bővítmény"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. munkaterület"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -594,12 +594,12 @@ msgstr ""
 "A(z) „%s” kijelző már rendelkezik ablakkezelővel; próbálja a --replace "
 "kapcsolóval helyettesíteni a jelenlegi ablakkezelőt."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A(z) %d képernyő a(z) „%s” megjelenítőn érvénytelen\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "A Mutter ablakkezelőt a részletes mód támogatása nélkül fordították\n"
 

po/it.po

@@ -5,15 +5,15 @@
 # Pier Luigi Fiorini <plfiorini@libero.it>, 2002.
 # Lapo Calamandrei <lapo.calamandrei@virgilio.it>, 2003.
 # Luca Ferretti <lferrett@gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015.
+# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-04 23:11+0000\n"
-"PO-Revision-Date: 2015-03-05 09:16+0100\n"
+"POT-Creation-Date: 2016-03-17 13:44+0000\n"
+"PO-Revision-Date: 2016-03-17 21:24+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 1.7.4\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -466,22 +466,22 @@ msgstr "Passa al VT 11"
 msgid "Switch to VT 12"
 msgstr "Passa al VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Display integrato"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Display sconosciuto"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -497,7 +497,7 @@ msgstr ""
 "Un altro compositing manager è già in esecuzione sullo schermo %i sul "
 "display «%s»."
 
-#: ../src/core/bell.c:185
+#: ../src/core/bell.c:192
 msgid "Bell event"
 msgstr "Evento campanella"
 
@@ -526,40 +526,44 @@ msgstr "_Attendi"
 msgid "_Force Quit"
 msgstr "_Forza uscita"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Apertura del display «%s» di X Window System non riuscita\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Disabilita la connessione al gestore di sessione"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Sostituisce il window manager in esecuzione"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Specifica l'ID di gestione sessione"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Display X da usare"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Inizializza la sessione da file salvato"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Rende le chiamate X sincrone"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Esegui come compositor Wayland"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Esegui come compositor annidato"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Esegui come display server invece che annidato"
 
@@ -586,12 +590,12 @@ msgstr "Stampa la versione"
 msgid "Mutter plugin to use"
 msgstr "Plugin Mutter da usare"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Spazio di lavoro %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -600,12 +604,12 @@ msgstr ""
 "Il display «%s» ha già un window manager; provare a utilizzare l'opzione --"
 "replace per sostituirlo."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Lo schermo %d nel display «%s» non è valido\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Mutter è stato compilato escludendo il supporto per la modalità prolissa\n"

po/ko.po

@@ -6,7 +6,7 @@
 # Changwoo Ryu <cwryu@debian.org>, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
 #
 # Updated in mutter:
-# Changwoo Ryu <cwryu@debian.org>, 2011-2015.
+# Changwoo Ryu <cwryu@debian.org>, 2011-2016.
 #
 #
 # 주의:
@@ -18,8 +18,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: 2015-03-07 11:12+0000\n"
-"PO-Revision-Date: 2015-03-08 03:44+0900\n"
+"POT-Creation-Date: 2016-03-12 13:40+0000\n"
+"PO-Revision-Date: 2016-03-13 04:38+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: Korean\n"
@@ -453,22 +453,22 @@ msgstr "가상 터미널 11로 이동"
 msgid "Switch to VT 12"
 msgstr "가상 터미널 12로 이동"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "내장 디스플레이"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "알 수 없는 디스플레이"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -484,7 +484,7 @@ msgstr ""
 "다른 창 구성 관리 프로그램이 이미 디스플레이 \"%2$s\" 화면 %1$i번에서 실행 중"
 "입니다."
 
-#: ../src/core/bell.c:185
+#: ../src/core/bell.c:192
 msgid "Bell event"
 msgstr "삑소리 이벤트"
 
@@ -511,40 +511,44 @@ msgstr "기다리기(_W)"
 msgid "_Force Quit"
 msgstr "강제로 끝내기(_F)"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X 윈도 시스템 디스플레이 '%s'을(를) 여는데 실패하였습니다\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "세션 관리자와 연결 하지 않습니다"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "실행 중인 창 관리자를 바꿉니다"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "세션 관리 ID를 지정합니다"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "사용할 X 디스플레이"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "저장 파일에서 세션을 초기화 합니다"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "동기 X 호출을 합니다"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "웨일랜드 컴포지터로 실행합니다"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "내장 컴포지터로 실행합니다"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "전체 디스플레이 서버로 실행, 내장 프로그램 아님"
 
@@ -571,24 +575,26 @@ msgstr "버전을 출력합니다"
 msgid "Mutter plugin to use"
 msgstr "사용할 머터 플러그인"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "작업 공간 %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."
-msgstr "디스플레이 \"%s\"에 이미 창 관리자가 있습니다. 현재 창 관리자를 바꾸려면 --replace 옵션을 써보십시오."
+msgstr ""
+"디스플레이 \"%s\"에 이미 창 관리자가 있습니다. 현재 창 관리자를 바꾸려면 --"
+"replace 옵션을 써보십시오."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "디스플레이 '%2$s'의 화면 %1$d은(는) 잘못되었습니다\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "머터가 자세한 모드 지원 없이 컴파일 되었습니다\n"
 

po/lv.po

@@ -7,14 +7,14 @@
 # Raivis Dejus <orvils@gmail.com>, 2006, 2007, 2009.
 # Rudolfs <rudolfs.mazurs@gmail.com>, 2011.
 # Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2014, 2015.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-09-20 11:14+0000\n"
-"PO-Revision-Date: 2015-09-20 18:51+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
+"keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-03-03 13:37+0000\n"
+"PO-Revision-Date: 2016-03-03 22:19+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -437,46 +437,41 @@ msgid "Switch to VT 7"
 msgstr "Pārslēgties uz VT 7"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Pārslēgties uz VT 8"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Pārslēgties uz VT 9"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Pārslēgties uz VT 10"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Pārslēgties uz VT 11"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Pārslēgties uz VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:500
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Iebūvēts displejs"
 
-#: ../src/backends/meta-monitor-manager.c:526
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../src/backends/meta-monitor-manager.c:528
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Nezināms displejs"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:536
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -519,40 +514,45 @@ msgstr "_Gaidīt"
 msgid "_Force Quit"
 msgstr "Aizvērt _piespiedu kārtā"
 
-#: ../src/core/display.c:563
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Neizdevās atvērt X logu sistēmas displeju “%s”\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Deaktivēt savienojumu ar sesiju pārvaldnieku"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Aizvietot darbojošos logu pārvaldnieku"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Norādiet sesiju pārvaldības ID"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Lietojamais X displejs"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Inicializēt sesiju no saglabātās datnes"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Padarīt X izsaukumus sinhronus"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Palaist kā wayland kompozitoru"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "Palaist kā ligzdotu kompozitoru"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Palaist kā pilnu attēlošanas serveri, nevis iegultu"
 
@@ -579,29 +579,26 @@ msgstr "Parādīt versiju"
 msgid "Mutter plugin to use"
 msgstr "Izmantojamais mutter spraudnis"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Darbvieta %d"
 
-#: ../src/core/screen.c:526
+#: ../src/core/screen.c:521
 #, c-format
-#| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."
 msgstr ""
-"Displejam “%s” jau ir logu pārvaldnieks; mēģiniet lietot --replace "
-"iespēju, lai aizvietotu pašreizējo logu pārvaldnieku."
+"Displejam “%s” jau ir logu pārvaldnieks; mēģiniet lietot --replace iespēju, "
+"lai aizvietotu pašreizējo logu pārvaldnieku."
 
-#: ../src/core/screen.c:608
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Ekrāna %d displejs “%s“ nav derīgs\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter tika kompilēts bez detalizētas izvades režīma atbalsta\n"
 
@@ -617,3 +614,4 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (uz %s)"
+

po/sl.po

@@ -4,15 +4,15 @@
 #
 # Andraž Tori <andraz.tori1@guest.arnes.si>, 2000.
 # Matjaž Horvat <m@owca.info>, 2006.
-# Matej Urbančič <mateju@svn.gnome.org>, 2007-2015.
+# Matej Urbančič <mateju@svn.gnome.org>, 2007-2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-15 11:07+0000\n"
-"PO-Revision-Date: 2015-03-15 14:36+0100\n"
+"POT-Creation-Date: 2016-03-05 21:12+0100\n"
+"PO-Revision-Date: 2016-03-05 21:12+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -455,22 +455,22 @@ msgstr "Preklopi na VT 11"
 msgid "Switch to VT 12"
 msgstr "Preklopi na VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Vgrajen zaslon"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Neznan zaslon"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -514,40 +514,44 @@ msgstr "_Počakaj"
 msgid "_Force Quit"
 msgstr "_Vsili konec"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Onemogoči povezavo z upravljalnikom sej"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Zamenjaj trenutni upravljalnik oken"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Navedite ID upravljanja seje"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Zaslon X za uporabo"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Začni sejo iz shranjene datoteke"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Uskladi klice X"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Zaženi izbirnik wayland"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Zaženi kot gnezden vpisovalnik"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"
 
@@ -575,12 +579,12 @@ msgid "Mutter plugin to use"
 msgstr "Vstavek Mutter za uporabo"
 
 # G:1 K:0 O:0
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -589,12 +593,12 @@ msgstr ""
 "Zaslon \"%s\" že ima določen upravljalnik oken; poskušajte uporabiti možnost "
 "--replace za zamenjavo trenutnega upravljalnika zaslona."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Program Mutter je kodno preveden brez podpore za podrobni način izpisovanja\n"

po/sr.po

@@ -1,19 +1,21 @@
 # Serbian translation of mutter.
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the mutter package.
+#
+# Translators: 
 # Горан Ракић <grakic@devbase.net>
 # Данило Шеган <danilo@prevod.org>, 2005.
 # Милош Поповић <gpopac@gmail.com>, 2010.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2015.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-04 11:14+0000\n"
-"PO-Revision-Date: 2015-03-04 19:46+0200\n"
+"POT-Creation-Date: 2016-03-09 01:41+0000\n"
+"PO-Revision-Date: 2016-03-09 09:52+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
+"Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -436,46 +438,41 @@ msgid "Switch to VT 7"
 msgstr "Прелазак на ВТ 7"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Прелазак на ВТ 8"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Прелазак на ВТ 9"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Прелазак на ВТ 10"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Прелазак на ВТ 11"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Прелазак на ВТ 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Уграђени дисплеј"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Непознат дисплеј"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -519,40 +516,45 @@ msgstr "_Сачекај"
 msgid "_Force Quit"
 msgstr "_Приморај излаз"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Нисам успео да отворим екран „%s“ Икс система прозора\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Искључује везу са управником сесије"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Мења текућег управника прозорима"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Наводи ИБ управника сесије"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Икс екран који ће бити коришћен"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Покреће сесију из датотеке чувања"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Чини Икс позиве усклађеним"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Ради као вајландов саставник"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "Ради као угнеждени саставник"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Ради као пуни сервер приказа, уместо као угнеждени"
 
@@ -566,8 +568,8 @@ msgid ""
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "матер %s\n"
-"Сва права задржана (C) 2001–%d Havoc Pennington, Red Hat, Inc., и остали\n"
-"Ово је слободан програм; погледајте изворни код за услове коришћења.\n"
+"Сва права задржана © 2001–%d Хевок Пенингтон, Ред Хет, Инк., и остали\n"
+"Ово је слободан програм; погледајте изворни кôд за услове коришћења.\n"
 "НЕ постоји никаква гаранција; чак ни гаранција о ТРЖИШНОЈ ВРЕДНОСТИ или "
 "ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
 
@@ -579,29 +581,26 @@ msgstr "Исписује издање"
 msgid "Mutter plugin to use"
 msgstr "Прикључци Матера за коришћење"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. радни простор"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
-#| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."
 msgstr ""
-"Приказ „%s“ већ има управника прозора; пробајте да користите опцију "
-"„--replace“ да замените тренутног управника прозора."
+"Приказ „%s“ већ има управника прозора; пробајте да користите опцију „--"
+"replace“ да замените тренутног управника прозора."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Приказ „%d“ на екрану „%s“ није исправан\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Матер је преведен без подршке за опширан режим\n"
 

po/sr@latin.po

@@ -1,19 +1,21 @@
 # Serbian translation of mutter.
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the mutter package.
+#
+# Translators: 
 # Goran Rakić <grakic@devbase.net>
 # Danilo Šegan <danilo@prevod.org>, 2005.
 # Miloš Popović <gpopac@gmail.com>, 2010.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2015.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-04 11:14+0000\n"
-"PO-Revision-Date: 2015-03-04 19:46+0200\n"
+"POT-Creation-Date: 2016-03-09 01:41+0000\n"
+"PO-Revision-Date: 2016-03-09 09:52+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
+"Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -436,46 +438,41 @@ msgid "Switch to VT 7"
 msgstr "Prelazak na VT 7"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Prelazak na VT 8"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Prelazak na VT 9"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Prelazak na VT 10"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Prelazak na VT 11"
 
 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Prelazak na VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Ugrađeni displej"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Nepoznat displej"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -519,40 +516,45 @@ msgstr "_Sačekaj"
 msgid "_Force Quit"
 msgstr "_Primoraj izlaz"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nisam uspeo da otvorim ekran „%s“ Iks sistema prozora\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Isključuje vezu sa upravnikom sesije"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Menja tekućeg upravnika prozorima"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Navodi IB upravnika sesije"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Iks ekran koji će biti korišćen"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Pokreće sesiju iz datoteke čuvanja"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Čini Iks pozive usklađenim"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Radi kao vajlandov sastavnik"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "Radi kao ugneždeni sastavnik"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Radi kao puni server prikaza, umesto kao ugneždeni"
 
@@ -566,8 +568,8 @@ msgid ""
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mater %s\n"
-"Sva prava zadržana (C) 2001–%d Havoc Pennington, Red Hat, Inc., i ostali\n"
-"Ovo je slobodan program; pogledajte izvorni kod za uslove korišćenja.\n"
+"Sva prava zadržana © 2001–%d Hevok Penington, Red Het, Ink., i ostali\n"
+"Ovo je slobodan program; pogledajte izvorni kôd za uslove korišćenja.\n"
 "NE postoji nikakva garancija; čak ni garancija o TRŽIŠNOJ VREDNOSTI ili "
 "PRILAGOĐENOSTI ODREĐENOJ NAMENI.\n"
 
@@ -579,29 +581,26 @@ msgstr "Ispisuje izdanje"
 msgid "Mutter plugin to use"
 msgstr "Priključci Matera za korišćenje"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. radni prostor"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
-#| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."
 msgstr ""
-"Prikaz „%s“ već ima upravnika prozora; probajte da koristite opciju "
-"„--replace“ da zamenite trenutnog upravnika prozora."
+"Prikaz „%s“ već ima upravnika prozora; probajte da koristite opciju „--"
+"replace“ da zamenite trenutnog upravnika prozora."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Prikaz „%d“ na ekranu „%s“ nije ispravan\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mater je preveden bez podrške za opširan režim\n"
 

po/sv.po

@@ -1,24 +1,25 @@
 # Swedish messages for mutter.
-# Copyright © 2001-2015 Free Software Foundation, Inc.
+# Copyright © 2001-2016 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Mattias Eriksson <snaggen@gmail.com>, 2014.
 # Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015.
+# Sebastian Rasmussen <sebras@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-19 21:45+0000\n"
-"PO-Revision-Date: 2015-02-24 17:54+0100\n"
-"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
+"POT-Creation-Date: 2016-03-05 13:41+0000\n"
+"PO-Revision-Date: 2016-03-06 13:47+0100\n"
+"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -270,15 +271,15 @@ msgstr "Modifierare att använda för utökade fönsterhanteringsåtgärder"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
-"This key will initiate the \"overlay\", which is a combination window overview "
-"and application launching system. The default is intended to be the \"Windows key"
-"\" on PC hardware. It's expected that this binding either the default or set to "
-"the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Denna nyckel kommer att initiera \"overlay\", som är en kombinerad "
 "fönsteröversikt och programstartare. Standard är tänkt att vara \"Windows-"
-"tangenten\" på PC-maskinvara. Det är förväntat att denna bindning antingen är "
-"standard eller inställd till en tom sträng."
+"tangenten\" på PC-maskinvara. Det är förväntat att denna bindning antingen "
+"är standard eller inställd till en tom sträng."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
@@ -287,12 +288,12 @@ msgstr "Bifoga modala dialogfönster"
 #: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
-"attached to the titlebar of the parent window and are moved together with the "
-"parent window."
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
 msgstr ""
-"När true kommer, istället för att ha oberoende namnlister, modala dialogfönster "
-"att visas anslutna till namnlisten i föräldrafönstret och flyttas tillsammans "
-"med föräldrafönstret."
+"När true kommer, istället för att ha oberoende namnlister, modala "
+"dialogfönster att visas anslutna till namnlisten i föräldrafönstret och "
+"flyttas tillsammans med föräldrafönstret."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -300,13 +301,13 @@ msgstr "Aktivera kantframhävning när fönster släpps på skärmkanter"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
-"If enabled, dropping windows on vertical screen edges maximizes them vertically "
-"and resizes them horizontally to cover half of the available area. Dropping "
-"windows on the top screen edge maximizes them completely."
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"Om aktiverad, släppa fönster på vertikala skärmkanter kommer att maximera dem "
-"vertikalt och storleksändra dem horisontellt till att täcka hälften av den "
-"tillgängliga ytan. Släppa fönster på övre skärmkanten maximerar dem helt."
+"Om aktiverad, släppa fönster på vertikala skärmkanter kommer att maximera "
+"dem vertikalt och storleksändra dem horisontellt till att täcka hälften av "
+"den tillgängliga ytan. Släppa fönster på övre skärmkanten maximerar dem helt."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
@@ -315,12 +316,12 @@ msgstr "Arbetsytor hanteras dynamiskt"
 #: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there's a "
-"static number of workspaces (determined by the num-workspaces key in org.gnome."
-"desktop.wm.preferences)."
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
 msgstr ""
-"Bestämmer huruvida arbetsytor hanteras dynamiskt eller huruvida det finns ett "
-"fast antal arbetsytor (bestäms av nyckeln num-workspaces i org.gnome.desktop.wm."
-"preferences)."
+"Bestämmer huruvida arbetsytor hanteras dynamiskt eller huruvida det finns "
+"ett fast antal arbetsytor (bestäms av nyckeln num-workspaces i org.gnome."
+"desktop.wm.preferences)."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
@@ -328,11 +329,11 @@ msgstr "Arbetsytor endast på primär"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
-"Determines whether workspace switching should happen for windows on all monitors "
-"or only for windows on the primary monitor."
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
 msgstr ""
-"Bestämmer huruvida arbetsyteväxling ska hända för alla fönster på alla skärmar "
-"eller endast för fönster på den primära skärmen."
+"Bestämmer huruvida arbetsyteväxling ska hända för alla fönster på alla "
+"skärmar eller endast för fönster på den primära skärmen."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
@@ -340,11 +341,11 @@ msgstr "Ingen flik-popup"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
-"Determines whether the use of popup and highlight frame should be disabled for "
-"window cycling."
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
 msgstr ""
-"Bestämmer huruvida användning av popup och framhävning av kontur ska inaktiveras "
-"vid fönsterväxling."
+"Bestämmer huruvida användning av popup och framhävning av kontur ska "
+"inaktiveras vid fönsterväxling."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
@@ -352,13 +353,13 @@ msgstr "Fördröj fokusändringar till muspekaren hålls still"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
-"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
-"focus will not be changed immediately when entering a window, but only after the "
-"pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "Om satt till \"true\", och fokusläget är antingen \"sloppy\" eller \"mouse\" "
-"kommer fokus inte att ändras omedelbart när muspekaren går in över ett fönster, "
-"utan först efter att muspekaren slutar röra sig."
+"kommer fokus inte att ändras omedelbart när muspekaren går in över ett "
+"fönster, utan först efter att muspekaren slutar röra sig."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
@@ -366,8 +367,8 @@ msgstr "Dragbar rambredd"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
-"The amount of total draggable borders. If the theme's visible borders are not "
-"enough, invisible borders will be added to meet this value."
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Mängd av totalt dragbara ramar. Om temats synliga ramar inte är tillräckliga "
 "kommer osynliga ramar att läggas till för att möta detta värde."
@@ -378,8 +379,8 @@ msgstr "Automatiskt maximera fönster vars storlek ligger nära skärmens storle
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
-"If enabled, new windows that are initially the size of the monitor automatically "
-"get maximized."
+"If enabled, new windows that are initially the size of the monitor "
+"automatically get maximized."
 msgstr ""
 "Om aktiverad kommer nya fönster med nästan samma storlek som skärmen att bli "
 "automatiskt maximerade."
@@ -390,11 +391,11 @@ msgstr "Placera nya fönster centrerat"
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
-"When true, the new windows will always be put in the center of the active screen "
-"of the monitor."
+"When true, the new windows will always be put in the center of the active "
+"screen of the monitor."
 msgstr ""
-"När satt till \"true\", kommer nya fönster alltid att placeras centrerat på den "
-"aktiva skärmen."
+"När satt till \"true\", kommer nya fönster alltid att placeras centrerat på "
+"den aktiva skärmen."
 
 #: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
@@ -452,22 +453,22 @@ msgstr "Växla till VT 11"
 msgid "Switch to VT 12"
 msgstr "Växla till VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Inbyggd display"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Okänd display"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -477,8 +478,9 @@ msgstr "%s %s"
 #: ../src/compositor/compositor.c:456
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display \"%s\"."
-msgstr "En annan compositing-hanterare körs redan på skärm %i på display \"%s\"."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
+msgstr "En annan kompositionshanterare körs redan på skärm %i på display ”%s”."
 
 #: ../src/core/bell.c:185
 msgid "Bell event"
@@ -495,8 +497,8 @@ msgstr "Programmet svarar inte."
 
 #: ../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."
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
 msgstr ""
 "Du kan välja att vänta en kort stund på det för att fortsätta eller tvinga "
 "programmet att helt avslutas."
@@ -509,40 +511,44 @@ msgstr "_Vänta"
 msgid "_Force Quit"
 msgstr "_Tvinga avslut"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Misslyckades med att öppna X Window System-displayen ”%s”\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Inaktivera anslutning till sessionshanteraren"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Ersätt körande fönsterhanteraren"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Ange sessionshanteringsid"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "X-display att använda"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Initiera session från sparandefil"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Gör X-anrop synkrona"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
-msgstr "Kör som en wayland-compositor"
+msgstr "Kör som en wayland-kompositionshanterare"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Kör som en nästlad kompositionshanterare"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Kör som en full display-tjänst, i stället för nästlad"
 
@@ -552,8 +558,8 @@ msgid ""
 "mutter %s\n"
 "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
-"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-"PURPOSE.\n"
+"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
+"PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc. och andra\n"
@@ -569,33 +575,33 @@ msgstr "Skriv ut version"
 msgid "Mutter plugin to use"
 msgstr "Mutter-insticksmodul att använda"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbetsyta %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
-"Display \"%s\" already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
-"Display ”%s” har redan en fönsterhanterare; försök med flaggan --replace för att "
-"ersätta den aktuella fönsterhanteraren."
+"Display ”%s” har redan en fönsterhanterare; försök med flaggan --replace för "
+"att ersätta den aktuella fönsterhanteraren."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skärm %d på display ”%s” är ogiltig\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter kompilerades utan stöd för utförligt läge\n"
 
 #: ../src/x11/session.c:1815
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
 "Dessa fönster saknar stöd för &quot;spara nuvarande inställningar&quot; och "
 "kommer att behöva startas om manuellt nästa gång du loggar in."

po/vi.po

@@ -1,17 +1,17 @@
 # Vietnamese translation for Metacity.
-# Copyright © 2015 GNOME i18n Project for Vietnamese.
+# Copyright © 2016 GNOME i18n Project for Vietnamese.
 # This file is distributed under the same license as the Metacity package.
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2002-2004, 2007, 2008, 2011-2013.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-09 23:13+0000\n"
-"PO-Revision-Date: 2015-03-10 13:28+0700\n"
+"POT-Creation-Date: 2016-03-26 14:03+0000\n"
+"PO-Revision-Date: 2016-03-27 07:22+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
 "Language: vi\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
-msgstr "Di chuyển"
+msgstr "Điều hướng"
 
 #: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
@@ -447,22 +447,22 @@ msgstr "Chuyển sang VT 11"
 msgid "Switch to VT 12"
 msgstr "Chuyển sang VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Màn hình tích hợp"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Không hiểu màn hình"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -477,7 +477,7 @@ msgid ""
 msgstr ""
 "Bộ quản lý cửa sổ đã đang chạy trên Màn hình %i trên bộ trình bày \"%s\"."
 
-#: ../src/core/bell.c:185
+#: ../src/core/bell.c:194
 msgid "Bell event"
 msgstr "Sự kiện chuông"
 
@@ -506,40 +506,44 @@ msgstr "_Chờ"
 msgid "_Force Quit"
 msgstr "_Buộc thoát"
 
-#: ../src/core/display.c:562
+#: ../src/core/display.c:555
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X \"%s\".\n"
 
-#: ../src/core/main.c:176
+#: ../src/core/main.c:181
 msgid "Disable connection to session manager"
 msgstr "Vô hiệu hóa kết nối với bộ quản lý phiên làm việc"
 
-#: ../src/core/main.c:182
+#: ../src/core/main.c:187
 msgid "Replace the running window manager"
 msgstr "Thay thế bộ quản lý cửa sổ đang chạy"
 
-#: ../src/core/main.c:188
+#: ../src/core/main.c:193
 msgid "Specify session management ID"
 msgstr "Ghi rõ mã số quản lý phiên làm việc"
 
-#: ../src/core/main.c:193
+#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Bộ trình bày X cần dùng"
 
-#: ../src/core/main.c:199
+#: ../src/core/main.c:204
 msgid "Initialize session from savefile"
 msgstr "Khởi động phiên làm việc từ tập tin lưu"
 
-#: ../src/core/main.c:205
+#: ../src/core/main.c:210
 msgid "Make X calls synchronous"
 msgstr "Khiến các lời gọi X đồng bộ với nhau"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:217
 msgid "Run as a wayland compositor"
 msgstr "Chạy như là một “wayland compositor”"
 
-#: ../src/core/main.c:220
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Chạy như là một “nested compositor”"
+
+#: ../src/core/main.c:231
 msgid "Run as a full display server, rather than nested"
 msgstr "Chạy như là một dịch vụ hiển thị đầy đủ, thay cho lồng nhau"
 
@@ -567,12 +571,12 @@ msgstr "Hiển thị phiên bản"
 msgid "Mutter plugin to use"
 msgstr "Phần bổ sung Mutter cần dùng"
 
-#: ../src/core/prefs.c:2004
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Vùng làm việc %d"
 
-#: ../src/core/screen.c:525
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -581,12 +585,12 @@ msgstr ""
 "Màn hình \"%s\" đã có bộ quản lý cửa sổ rồi; hãy thử dùng tùy chọn “--"
 "replace” để thay thế bộ quản lý cửa sổ đang dùng."
 
-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:603
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Màn hình %d trên bộ trình bày \"%s\" không hợp lệ.\n"
 
-#: ../src/core/util.c:118
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter đã được biên dịch không hỗ trợ chế độ chi tiết\n"
 

src/backends/meta-cursor-renderer.c

@@ -27,8 +27,6 @@
 #include "meta-cursor-renderer.h"
 
 #include <meta/meta-backend.h>
-#include <backends/meta-backend-private.h>
-#include <backends/meta-monitor-manager-private.h>
 #include <meta/util.h>
 
 #include <cogl/cogl.h>
@@ -118,14 +116,6 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
   };
 }
 
-static gboolean
-is_cursor_in_monitors_area (int x, int y)
-{
-  MetaMonitorManager *monitor_manager = meta_backend_get_monitor_manager (meta_get_backend ());
-  return meta_monitor_manager_get_monitor_at_point (monitor_manager,
-                                                    (gfloat) x, (gfloat) y) >= 0;
-}
-
 static void
 update_cursor (MetaCursorRenderer *renderer,
                MetaCursorSprite   *cursor_sprite)
@@ -134,11 +124,6 @@ update_cursor (MetaCursorRenderer *renderer,
   gboolean handled_by_backend;
   gboolean should_redraw = FALSE;
 
-  /* do not render cursor if it is not on any monitor. Such situation
-   * can occur e. g. after monitor hot-plug */
-  if (!is_cursor_in_monitors_area (priv->current_x, priv->current_y))
-    return;
-
   if (cursor_sprite)
     meta_cursor_sprite_prepare_at (cursor_sprite,
                                    priv->current_x,

src/compositor/compositor-private.h

@@ -60,4 +60,7 @@ void     meta_end_modal_for_plugin   (MetaCompositor   *compositor,
 gint64 meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,
                                                       gint64       monotonic_time);
 
+void meta_compositor_flash_window (MetaCompositor *compositor,
+                                   MetaWindow     *window);
+
 #endif /* META_COMPOSITOR_PRIVATE_H */

src/compositor/compositor.c

@@ -1249,6 +1249,48 @@ meta_compositor_flash_screen (MetaCompositor *compositor,
   clutter_actor_restore_easing_state (flash);
 }
 
+static void
+window_flash_out_completed (ClutterTimeline *timeline,
+                            gboolean         is_finished,
+                            gpointer         user_data)
+{
+  ClutterActor *flash = CLUTTER_ACTOR (user_data);
+  clutter_actor_destroy (flash);
+}
+
+void
+meta_compositor_flash_window (MetaCompositor *compositor,
+                              MetaWindow     *window)
+{
+  ClutterActor *window_actor =
+    CLUTTER_ACTOR (meta_window_get_compositor_private (window));
+  ClutterActor *flash;
+  ClutterTransition *transition;
+
+  flash = clutter_actor_new ();
+  clutter_actor_set_background_color (flash, CLUTTER_COLOR_Black);
+  clutter_actor_set_size (flash, window->rect.width, window->rect.height);
+  clutter_actor_set_position (flash,
+                              window->custom_frame_extents.left,
+                              window->custom_frame_extents.top);
+  clutter_actor_set_opacity (flash, 0);
+  clutter_actor_add_child (window_actor, flash);
+
+  clutter_actor_save_easing_state (flash);
+  clutter_actor_set_easing_mode (flash, CLUTTER_EASE_IN_QUAD);
+  clutter_actor_set_easing_duration (flash, FLASH_TIME_MS);
+  clutter_actor_set_opacity (flash, 192);
+
+  transition = clutter_actor_get_transition (flash, "opacity");
+  clutter_timeline_set_auto_reverse (CLUTTER_TIMELINE (transition), TRUE);
+  clutter_timeline_set_repeat_count (CLUTTER_TIMELINE (transition), 2);
+
+  g_signal_connect (transition, "stopped",
+                    G_CALLBACK (window_flash_out_completed), flash);
+
+  clutter_actor_restore_easing_state (flash);
+}
+
 /**
  * meta_compositor_monotonic_time_to_server_time:
  * @display: a #MetaDisplay

src/compositor/meta-shaped-texture-private.h

@@ -36,5 +36,6 @@ void meta_shaped_texture_set_fallback_size (MetaShapedTexture *stex,
                                             guint              fallback_width,
                                             guint              fallback_height);
 gboolean meta_shaped_texture_is_obscured (MetaShapedTexture *self);
+cairo_region_t * meta_shaped_texture_get_opaque_region (MetaShapedTexture *stex);
 
 #endif

src/compositor/meta-shaped-texture.c

@@ -303,6 +303,7 @@ set_cogl_texture (MetaShapedTexture *stex,
     {
       priv->tex_width = width;
       priv->tex_height = height;
+      meta_shaped_texture_set_mask_texture (stex, NULL);
       clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
       g_signal_emit (stex, signals[SIZE_CHANGED], 0);
     }
@@ -789,6 +790,13 @@ meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex,
     priv->opaque_region = NULL;
 }
 
+cairo_region_t *
+meta_shaped_texture_get_opaque_region (MetaShapedTexture *stex)
+{
+  MetaShapedTexturePrivate *priv = stex->priv;
+  return priv->opaque_region;
+}
+
 /**
  * meta_shaped_texture_get_image:
  * @stex: A #MetaShapedTexture

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

@@ -136,7 +136,8 @@ meta_surface_actor_wayland_get_subsurface_rect (MetaSurfaceActorWayland *self,
                                                 MetaRectangle           *rect)
 {
   MetaWaylandSurface *surface = meta_surface_actor_wayland_get_surface (self);
-  CoglTexture *texture = surface->buffer->texture;
+  MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface);
+  CoglTexture *texture = buffer->texture;
   MetaWindow *toplevel_window;
   int monitor_scale;
   float x, y;

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

@@ -238,6 +238,33 @@ meta_surface_actor_x11_is_visible (MetaSurfaceActor *actor)
   return is_visible (self);
 }
 
+static gboolean
+meta_surface_actor_x11_is_opaque (MetaSurfaceActor *actor)
+{
+  MetaSurfaceActorX11 *self = META_SURFACE_ACTOR_X11 (actor);
+  MetaSurfaceActorX11Private *priv = meta_surface_actor_x11_get_instance_private (self);
+
+  /* If we're not ARGB32, then we're opaque. */
+  if (!meta_surface_actor_is_argb32 (actor))
+    return TRUE;
+
+  cairo_region_t *opaque_region = meta_surface_actor_get_opaque_region (actor);
+
+  /* If we have no opaque region, then no pixels are opaque. */
+  if (!opaque_region)
+    return FALSE;
+
+  MetaWindow *window = priv->window;
+  cairo_rectangle_int_t client_area;
+  meta_window_get_client_area_rect (window, &client_area);
+
+  /* Otherwise, check if our opaque region covers our entire surface. */
+  if (cairo_region_contains_rectangle (opaque_region, &client_area) == CAIRO_REGION_OVERLAP_IN)
+    return TRUE;
+
+  return FALSE;
+}
+
 static gboolean
 meta_surface_actor_x11_should_unredirect (MetaSurfaceActor *actor)
 {
@@ -255,15 +282,15 @@ meta_surface_actor_x11_should_unredirect (MetaSurfaceActor *actor)
   if (window->shape_region != NULL)
     return FALSE;
 
-  if (meta_surface_actor_is_argb32 (actor) && !meta_window_requested_bypass_compositor (window))
-    return FALSE;
-
   if (!meta_window_is_monitor_sized (window))
     return FALSE;
 
   if (meta_window_requested_bypass_compositor (window))
     return TRUE;
 
+  if (!meta_surface_actor_x11_is_opaque (actor))
+    return FALSE;
+
   if (meta_window_is_override_redirect (window))
     return TRUE;
 

src/compositor/meta-surface-actor.c

@@ -235,6 +235,13 @@ meta_surface_actor_set_opaque_region (MetaSurfaceActor *self,
   meta_shaped_texture_set_opaque_region (priv->texture, region);
 }
 
+cairo_region_t *
+meta_surface_actor_get_opaque_region (MetaSurfaceActor *actor)
+{
+  MetaSurfaceActorPrivate *priv = actor->priv;
+  return meta_shaped_texture_get_opaque_region (priv->texture);
+}
+
 static gboolean
 is_frozen (MetaSurfaceActor *self)
 {

src/compositor/meta-surface-actor.h

@@ -60,6 +60,7 @@ void meta_surface_actor_set_input_region (MetaSurfaceActor *self,
                                           cairo_region_t   *region);
 void meta_surface_actor_set_opaque_region (MetaSurfaceActor *self,
                                            cairo_region_t   *region);
+cairo_region_t * meta_surface_actor_get_opaque_region (MetaSurfaceActor *self);
 
 void meta_surface_actor_process_damage (MetaSurfaceActor *actor,
                                         int x, int y, int width, int height);

src/compositor/meta-window-actor.c

@@ -817,13 +817,6 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
       meta_window_is_fullscreen (priv->window))
     return FALSE;
 
-  /*
-   * If we have two snap-tiled windows, we don't want the shadow to obstruct
-   * the other window.
-   */
-  if (meta_window_get_tile_match (priv->window))
-    return FALSE;
-
   /*
    * Always put a shadow around windows with a frame - This should override
    * the restriction about not putting a shadow around ARGB windows.

src/core/bell.c

@@ -52,6 +52,7 @@
 #include "screen-private.h"
 #include "window-private.h"
 #include "util-private.h"
+#include "compositor/compositor-private.h"
 #include <meta/prefs.h>
 #include <meta/compositor.h>
 #ifdef HAVE_LIBCANBERRA
@@ -131,6 +132,12 @@ bell_flash_window_frame (MetaWindow *window)
   g_source_set_name_by_id (id, "[mutter] bell_unflash_frame");
 }
 
+static void
+bell_flash_window (MetaWindow *window)
+{
+  meta_compositor_flash_window (window->display->compositor, window);
+}
+
 /**
  * bell_flash_frame:
  * @display:  The display the bell event came in on
@@ -145,6 +152,8 @@ bell_flash_frame (MetaDisplay *display,
 {
   if (window && window->frame)
     bell_flash_window_frame (window);
+  else if (window)
+    bell_flash_window (window);
   else
     bell_flash_fullscreen (display);
 }
@@ -203,33 +212,18 @@ bell_audible_notify (MetaDisplay *display,
   return FALSE;
 }
 
-void
+gboolean
 meta_bell_notify (MetaDisplay *display,
-		  XkbAnyEvent *xkb_ev)
+                  MetaWindow  *window)
 {
-  MetaWindow *window;
-  XkbBellNotifyEvent *xkb_bell_event = (XkbBellNotifyEvent*) xkb_ev;
-
-  window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-  if (!window && display->focus_window && display->focus_window->frame)
-    window = display->focus_window;
-
   /* flash something */
   if (meta_prefs_get_visual_bell ())
     bell_visual_notify (display, window);
 
   if (meta_prefs_bell_is_audible ())
-    {
-      if (!bell_audible_notify (display, window))
-        {
-          /* Force a classic bell if the libcanberra bell failed. */
-          XkbForceDeviceBell (display->xdisplay,
-                              xkb_bell_event->device,
-                              xkb_bell_event->bell_class,
-                              xkb_bell_event->bell_id,
-                              xkb_bell_event->percent);
-        }
-    }
+    return bell_audible_notify (display, window);
+
+  return TRUE;
 }
 
 void

src/core/bell.h

@@ -25,15 +25,14 @@
 /**
  * meta_bell_notify:
  * @display: The display the bell event came in on
- * @xkb_ev: The bell event we just received
+ * @window: The window the bell event was received on
  *
- * Gives the user some kind of visual bell; in fact, this is our response
- * to any kind of bell request, but we set it up so that we only get
- * notified about visual bells, and X deals with audible ones.
- *
- * If the configure script found we had no XKB, this does not exist.
+ * Gives the user some kind of aural or visual feedback, such as a bell sound
+ * or flash. What type of feedback is invoked depends on the configuration.
+ * If the aural feedback could not be invoked, FALSE is returned.
  */
-void meta_bell_notify (MetaDisplay *display, XkbAnyEvent *xkb_ev);
+gboolean meta_bell_notify (MetaDisplay *display,
+                           MetaWindow  *window);
 
 /**
  * meta_bell_set_audible:

src/core/constraints.c

@@ -97,7 +97,7 @@ typedef enum
   PRIORITY_ENTIRELY_VISIBLE_ON_WORKAREA = 1,
   PRIORITY_SIZE_HINTS_INCREMENTS = 1,
   PRIORITY_MAXIMIZATION = 2,
-  PRIORITY_TILING = 2,
+  PRIORITY_CONSTRAINED_EDGES = 2,
   PRIORITY_FULLSCREEN = 2,
   PRIORITY_SIZE_HINTS_LIMITS = 3,
   PRIORITY_TITLEBAR_VISIBLE = 4,
@@ -152,7 +152,7 @@ static gboolean constrain_maximization       (MetaWindow         *window,
                                               ConstraintInfo     *info,
                                               ConstraintPriority  priority,
                                               gboolean            check_only);
-static gboolean constrain_tiling             (MetaWindow         *window,
+static gboolean constrain_constrained_edges  (MetaWindow         *window,
                                               ConstraintInfo     *info,
                                               ConstraintPriority  priority,
                                               gboolean            check_only);
@@ -213,7 +213,7 @@ typedef struct {
 static const Constraint all_constraints[] = {
   {constrain_modal_dialog,       "constrain_modal_dialog"},
   {constrain_maximization,       "constrain_maximization"},
-  {constrain_tiling,             "constrain_tiling"},
+  {constrain_constrained_edges,  "constrain_constrained_edges"},
   {constrain_fullscreen,         "constrain_fullscreen"},
   {constrain_size_increments,    "constrain_size_increments"},
   {constrain_size_limits,        "constrain_size_limits"},
@@ -701,16 +701,11 @@ constrain_maximization (MetaWindow         *window,
     return TRUE;
 
   /* Determine whether constraint applies; exit if it doesn't */
-  if ((!window->maximized_horizontally && !window->maximized_vertically) ||
-      META_WINDOW_TILED_SIDE_BY_SIDE (window))
+  if (!window->maximized_horizontally && !window->maximized_vertically)
     return TRUE;
 
   /* Calculate target_size = maximized size of (window + frame) */
-  if (META_WINDOW_TILED_MAXIMIZED (window))
-    {
-      meta_window_get_current_tile_area (window, &target_size);
-    }
-  else if (META_WINDOW_MAXIMIZED (window))
+  if (META_WINDOW_MAXIMIZED (window))
     {
       target_size = info->work_area_monitor;
     }
@@ -773,58 +768,6 @@ constrain_maximization (MetaWindow         *window,
   return TRUE;
 }
 
-static gboolean
-constrain_tiling (MetaWindow         *window,
-                  ConstraintInfo     *info,
-                  ConstraintPriority  priority,
-                  gboolean            check_only)
-{
-  MetaRectangle target_size;
-  MetaRectangle min_size, max_size;
-  gboolean hminbad, vminbad;
-  gboolean horiz_equal, vert_equal;
-  gboolean constraint_already_satisfied;
-
-  if (priority > PRIORITY_TILING)
-    return TRUE;
-
-  /* Determine whether constraint applies; exit if it doesn't */
-  if (!META_WINDOW_TILED_SIDE_BY_SIDE (window))
-    return TRUE;
-
-  /* Calculate target_size - as the tile previews need this as well, we
-   * use an external function for the actual calculation
-   */
-  meta_window_get_current_tile_area (window, &target_size);
-
-  /* Check min size constraints; max size constraints are ignored as for
-   * maximized windows.
-   */
-  get_size_limits (window, &min_size, &max_size);
-  hminbad = target_size.width < min_size.width;
-  vminbad = target_size.height < min_size.height;
-  if (hminbad || vminbad)
-    return TRUE;
-
-  /* Determine whether constraint is already satisfied; exit if it is */
-  horiz_equal = target_size.x      == info->current.x &&
-                target_size.width  == info->current.width;
-  vert_equal  = target_size.y      == info->current.y &&
-                target_size.height == info->current.height;
-  constraint_already_satisfied = horiz_equal && vert_equal;
-  if (check_only || constraint_already_satisfied)
-    return constraint_already_satisfied;
-
-  /*** Enforce constraint ***/
-  info->current.x      = target_size.x;
-  info->current.width  = target_size.width;
-  info->current.y      = target_size.y;
-  info->current.height = target_size.height;
-
-  return TRUE;
-}
-
-
 static gboolean
 constrain_fullscreen (MetaWindow         *window,
                       ConstraintInfo     *info,
@@ -860,6 +803,45 @@ constrain_fullscreen (MetaWindow         *window,
   return TRUE;
 }
 
+static gboolean
+constrain_constrained_edges (MetaWindow         *window,
+                             ConstraintInfo     *info,
+                             ConstraintPriority  priority,
+                             gboolean            check_only)
+{
+  MetaRectangle monitor, new_rectangle;
+  gboolean constraint_already_satisfied;
+
+  if (priority > PRIORITY_CONSTRAINED_EDGES)
+    return TRUE;
+
+  /* Determine whether constraint applies; exit if it doesn't */
+  if (!window->constrained_edges)
+    return TRUE;
+
+  new_rectangle = info->current;
+  monitor = info->work_area_monitor;
+
+  if (window->constrained_edges & META_DIRECTION_LEFT)
+    new_rectangle.x = monitor.x;
+  if (window->constrained_edges & META_DIRECTION_RIGHT)
+    new_rectangle.x = monitor.x + monitor.width - new_rectangle.width;
+  if (window->constrained_edges & META_DIRECTION_TOP)
+    new_rectangle.y = monitor.y;
+  if (window->constrained_edges & META_DIRECTION_BOTTOM)
+    new_rectangle.y = monitor.y + monitor.height - new_rectangle.height;
+
+  constraint_already_satisfied =
+    meta_rectangle_equal (&info->current, &new_rectangle);
+
+  if (check_only || constraint_already_satisfied)
+    return constraint_already_satisfied;
+
+  /*** Enforce constraint ***/
+  info->current = new_rectangle;
+  return TRUE;
+}
+
 static gboolean
 constrain_size_increments (MetaWindow         *window,
                            ConstraintInfo     *info,
@@ -877,7 +859,6 @@ constrain_size_increments (MetaWindow         *window,
 
   /* Determine whether constraint applies; exit if it doesn't */
   if (META_WINDOW_MAXIMIZED (window) || window->fullscreen ||
-      META_WINDOW_TILED_SIDE_BY_SIDE (window) ||
       info->action_type == ACTION_MOVE)
     return TRUE;
 
@@ -1020,7 +1001,6 @@ constrain_aspect_ratio (MetaWindow         *window,
   constraints_are_inconsistent = minr > maxr;
   if (constraints_are_inconsistent ||
       META_WINDOW_MAXIMIZED (window) || window->fullscreen ||
-      META_WINDOW_TILED_SIDE_BY_SIDE (window) ||
       info->action_type == ACTION_MOVE)
     return TRUE;
 

src/core/display-private.h

@@ -74,13 +74,6 @@ typedef enum {
  */
 #define N_IGNORED_CROSSING_SERIALS  10
 
-typedef enum {
-  META_TILE_NONE,
-  META_TILE_LEFT,
-  META_TILE_RIGHT,
-  META_TILE_MAXIMIZED
-} MetaTileMode;
-
 typedef enum {
   /* Normal interaction where you're interacting with windows.
    * Events go to windows normally. */
@@ -211,8 +204,6 @@ struct _MetaDisplay
   int         grab_anchor_root_x;
   int         grab_anchor_root_y;
   MetaRectangle grab_anchor_window_pos;
-  MetaTileMode  grab_tile_mode;
-  int           grab_tile_monitor_number;
   int         grab_latest_motion_x;
   int         grab_latest_motion_y;
   guint       grab_have_pointer : 1;

src/core/display.c

@@ -649,8 +649,6 @@ meta_display_open (void)
 
   display->grab_op = META_GRAB_OP_NONE;
   display->grab_window = NULL;
-  display->grab_tile_mode = META_TILE_NONE;
-  display->grab_tile_monitor_number = -1;
 
   display->grab_edge_resistance_data = NULL;
 
@@ -1212,7 +1210,7 @@ meta_grab_op_is_moving (MetaGrabOp op)
 }
 
 /**
- * meta_grab_op_windows_are_interactable:
+ * meta_display_windows_are_interactable:
  * @op: A #MetaGrabOp
  *
  * Whether windows can be interacted with.
@@ -1894,8 +1892,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
   display->grab_op = op;
   display->grab_window = grab_window;
   display->grab_button = button;
-  display->grab_tile_mode = grab_window->tile_mode;
-  display->grab_tile_monitor_number = grab_window->tile_monitor_number;
   display->grab_anchor_root_x = root_x;
   display->grab_anchor_root_y = root_y;
   display->grab_latest_motion_x = root_x;
@@ -1993,8 +1989,6 @@ meta_display_end_grab_op (MetaDisplay *display,
 
   display->event_route = META_EVENT_ROUTE_NORMAL;
   display->grab_window = NULL;
-  display->grab_tile_mode = META_TILE_NONE;
-  display->grab_tile_monitor_number = -1;
 
   meta_display_update_cursor (display);
 

src/core/frame.c

@@ -274,12 +274,6 @@ meta_frame_get_flags (MetaFrame *frame)
   if (META_WINDOW_MAXIMIZED (frame->window))
     flags |= META_FRAME_MAXIMIZED;
 
-  if (META_WINDOW_TILED_LEFT (frame->window))
-    flags |= META_FRAME_TILED_LEFT;
-
-  if (META_WINDOW_TILED_RIGHT (frame->window))
-    flags |= META_FRAME_TILED_RIGHT;
-
   if (frame->window->fullscreen)
     flags |= META_FRAME_FULLSCREEN;
 
@@ -289,6 +283,18 @@ meta_frame_get_flags (MetaFrame *frame)
   if (frame->window->wm_state_above)
     flags |= META_FRAME_ABOVE;
 
+  if (frame->window->constrained_edges & META_DIRECTION_LEFT)
+    flags |= META_FRAME_CONSTRAINED_LEFT_EDGE;
+
+  if (frame->window->constrained_edges & META_DIRECTION_RIGHT)
+    flags |= META_FRAME_CONSTRAINED_RIGHT_EDGE;
+
+  if (frame->window->constrained_edges & META_DIRECTION_TOP)
+    flags |= META_FRAME_CONSTRAINED_TOP_EDGE;
+
+  if (frame->window->constrained_edges & META_DIRECTION_BOTTOM)
+    flags |= META_FRAME_CONSTRAINED_BOTTOM_EDGE;
+
   return flags;
 }
 

src/core/keybindings.c

@@ -2001,23 +2001,13 @@ process_mouse_move_resize_grab (MetaDisplay     *display,
 
   if (event->keyval == CLUTTER_KEY_Escape)
     {
-      /* Hide the tiling preview if necessary */
-      if (window->tile_mode != META_TILE_NONE)
-        meta_screen_hide_tile_preview (screen);
-
-      /* Restore the original tile mode */
-      window->tile_mode = display->grab_tile_mode;
-      window->tile_monitor_number = display->grab_tile_monitor_number;
-
       /* End move or resize and restore to original state.  If the
        * window was a maximized window that had been "shaken loose" we
        * need to remaximize it.  In normal cases, we need to do a
        * moveresize now to get the position back to the original.
        */
-      if (window->shaken_loose || window->tile_mode == META_TILE_MAXIMIZED)
+      if (window->shaken_loose)
         meta_window_maximize (window, META_MAXIMIZE_BOTH);
-      else if (window->tile_mode != META_TILE_NONE)
-        meta_window_tile (window);
       else
         meta_window_move_resize_frame (display->grab_window,
                                        TRUE,
@@ -2939,41 +2929,25 @@ handle_toggle_above       (MetaDisplay     *display,
 }
 
 static void
-handle_toggle_tiled (MetaDisplay     *display,
-                     MetaScreen      *screen,
-                     MetaWindow      *window,
-                     ClutterKeyEvent *event,
-                     MetaKeyBinding  *binding,
-                     gpointer         dummy)
+handle_toggle_tiled_left (MetaDisplay     *display,
+                          MetaScreen      *screen,
+                          MetaWindow      *window,
+                          ClutterKeyEvent *event,
+                          MetaKeyBinding  *binding,
+                          gpointer         dummy)
 {
-  MetaTileMode mode = binding->handler->data;
+  meta_window_toggle_tile (window, META_TILE_ZONE_W);
+}
 
-  if ((META_WINDOW_TILED_LEFT (window) && mode == META_TILE_LEFT) ||
-      (META_WINDOW_TILED_RIGHT (window) && mode == META_TILE_RIGHT))
-    {
-      window->tile_monitor_number = window->saved_maximize ? window->monitor->number
-        : -1;
-      window->tile_mode = window->saved_maximize ? META_TILE_MAXIMIZED
-        : META_TILE_NONE;
-
-      if (window->saved_maximize)
-        meta_window_maximize (window, META_MAXIMIZE_BOTH);
-      else
-        meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
-    }
-  else if (meta_window_can_tile_side_by_side (window))
-    {
-      window->tile_monitor_number = window->monitor->number;
-      window->tile_mode = mode;
-      /* Maximization constraints beat tiling constraints, so if the window
-       * is maximized, tiling won't have any effect unless we unmaximize it
-       * horizontally first; rather than calling meta_window_unmaximize(),
-       * we just set the flag and rely on meta_window_tile() syncing it to
-       * save an additional roundtrip.
-       */
-      window->maximized_horizontally = FALSE;
-      meta_window_tile (window);
-    }
+static void
+handle_toggle_tiled_right (MetaDisplay     *display,
+                           MetaScreen      *screen,
+                           MetaWindow      *window,
+                           ClutterKeyEvent *event,
+                           MetaKeyBinding  *binding,
+                           gpointer         dummy)
+{
+  meta_window_toggle_tile (window, META_TILE_ZONE_E);
 }
 
 static void
@@ -3706,14 +3680,14 @@ init_builtin_key_bindings (MetaDisplay *display)
                           mutter_keybindings,
                           META_KEY_BINDING_PER_WINDOW,
                           META_KEYBINDING_ACTION_TOGGLE_TILED_LEFT,
-                          handle_toggle_tiled, META_TILE_LEFT);
+                          handle_toggle_tiled_left, 0);
 
   add_builtin_keybinding (display,
                           "toggle-tiled-right",
                           mutter_keybindings,
                           META_KEY_BINDING_PER_WINDOW,
                           META_KEYBINDING_ACTION_TOGGLE_TILED_RIGHT,
-                          handle_toggle_tiled, META_TILE_RIGHT);
+                          handle_toggle_tiled_right, 0);
 
   add_builtin_keybinding (display,
                           "toggle-above",

src/core/screen-private.h

@@ -57,7 +57,13 @@ struct _MetaScreen
   MetaRectangle rect;  /* Size of screen; rect.x & rect.y are always 0 */
   MetaUI *ui;
 
-  guint tile_preview_timeout_id;
+  struct {
+    gboolean exists;
+    guint timeout_id;
+    MetaWindow *window;
+    MetaRectangle area;
+    int monitor;
+  } tile_preview;
 
   MetaWorkspace *active_workspace;
 
@@ -132,9 +138,12 @@ void          meta_screen_foreach_window      (MetaScreen                 *scree
 
 void          meta_screen_update_cursor       (MetaScreen                 *screen);
 
-void          meta_screen_update_tile_preview          (MetaScreen    *screen,
-                                                        gboolean       delay);
-void          meta_screen_hide_tile_preview            (MetaScreen    *screen);
+void          meta_screen_update_tile_preview (MetaScreen    *screen,
+                                               MetaWindow    *window,
+                                               MetaRectangle  area,
+                                               int            monitor,
+                                               gboolean       delay);
+void          meta_screen_hide_tile_preview   (MetaScreen *screen);
 
 MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *screen,
                                                 MetaWindow                 *not_this_one);

src/core/screen.c

@@ -718,8 +718,6 @@ meta_screen_new (MetaDisplay *display,
   screen->ui = meta_ui_new (screen->display->xdisplay,
                             screen->xscreen);
 
-  screen->tile_preview_timeout_id = 0;
-
   screen->stack = meta_stack_new (screen);
   screen->stack_tracker = meta_stack_tracker_new (screen);
 
@@ -807,8 +805,8 @@ meta_screen_free (MetaScreen *screen,
 
   g_free (screen->monitor_infos);
 
-  if (screen->tile_preview_timeout_id)
-    g_source_remove (screen->tile_preview_timeout_id);
+  if (screen->tile_preview.timeout_id)
+    g_source_remove (screen->tile_preview.timeout_id);
 
   g_free (screen->screen_name);
 
@@ -1233,7 +1231,8 @@ root_cursor_prepare_at (MetaCursorSprite *cursor_sprite,
   monitor = meta_screen_get_monitor_for_point (screen, x, y);
 
   /* Reload the cursor texture if the scale has changed. */
-  meta_cursor_sprite_set_theme_scale (cursor_sprite, monitor->scale);
+  if (monitor)
+    meta_cursor_sprite_set_theme_scale (cursor_sprite, monitor->scale);
 }
 
 static void
@@ -1287,44 +1286,20 @@ static gboolean
 meta_screen_update_tile_preview_timeout (gpointer data)
 {
   MetaScreen *screen = data;
-  MetaWindow *window = screen->display->grab_window;
-  gboolean needs_preview = FALSE;
 
-  screen->tile_preview_timeout_id = 0;
+  screen->tile_preview.timeout_id = 0;
 
-  if (window)
+  if (screen->tile_preview.exists)
     {
-      switch (window->tile_mode)
-        {
-          case META_TILE_LEFT:
-          case META_TILE_RIGHT:
-              if (!META_WINDOW_TILED_SIDE_BY_SIDE (window))
-                needs_preview = TRUE;
-              break;
-
-          case META_TILE_MAXIMIZED:
-              if (!META_WINDOW_MAXIMIZED (window))
-                needs_preview = TRUE;
-              break;
-
-          default:
-              needs_preview = FALSE;
-              break;
-        }
-    }
-
-  if (needs_preview)
-    {
-      MetaRectangle tile_rect;
-      int monitor;
-
-      monitor = meta_window_get_current_tile_monitor_number (window);
-      meta_window_get_current_tile_area (window, &tile_rect);
       meta_compositor_show_tile_preview (screen->display->compositor,
-                                         window, &tile_rect, monitor);
+                                         screen->tile_preview.window,
+                                         &screen->tile_preview.area,
+                                         screen->tile_preview.monitor);
     }
   else
-    meta_compositor_hide_tile_preview (screen->display->compositor);
+    {
+      meta_compositor_hide_tile_preview (screen->display->compositor);
+    }
 
   return FALSE;
 }
@@ -1332,37 +1307,47 @@ meta_screen_update_tile_preview_timeout (gpointer data)
 #define TILE_PREVIEW_TIMEOUT_MS 200
 
 void
-meta_screen_update_tile_preview (MetaScreen *screen,
-                                 gboolean    delay)
+meta_screen_update_tile_preview (MetaScreen    *screen,
+                                 MetaWindow    *window,
+                                 MetaRectangle  area,
+                                 int            monitor,
+                                 gboolean       delay)
 {
+  screen->tile_preview.exists = TRUE;
+  screen->tile_preview.window = window;
+  screen->tile_preview.area = area;
+  screen->tile_preview.monitor = monitor;
+
   if (delay)
     {
-      if (screen->tile_preview_timeout_id > 0)
+      if (screen->tile_preview.timeout_id > 0)
         return;
 
-      screen->tile_preview_timeout_id =
+      screen->tile_preview.timeout_id =
         g_timeout_add (TILE_PREVIEW_TIMEOUT_MS,
                        meta_screen_update_tile_preview_timeout,
                        screen);
-      g_source_set_name_by_id (screen->tile_preview_timeout_id,
+      g_source_set_name_by_id (screen->tile_preview.timeout_id,
                                "[mutter] meta_screen_update_tile_preview_timeout");
     }
   else
     {
-      if (screen->tile_preview_timeout_id > 0)
-        g_source_remove (screen->tile_preview_timeout_id);
+      if (screen->tile_preview.timeout_id > 0)
+        g_source_remove (screen->tile_preview.timeout_id);
 
-      meta_screen_update_tile_preview_timeout ((gpointer)screen);
+      meta_screen_update_tile_preview_timeout ((gpointer) screen);
     }
 }
 
 void
 meta_screen_hide_tile_preview (MetaScreen *screen)
 {
-  if (screen->tile_preview_timeout_id > 0)
-    g_source_remove (screen->tile_preview_timeout_id);
+  screen->tile_preview.exists = FALSE;
 
-  meta_compositor_hide_tile_preview (screen->display->compositor);
+  if (screen->tile_preview.timeout_id > 0)
+    g_source_remove (screen->tile_preview.timeout_id);
+
+  meta_screen_update_tile_preview_timeout ((gpointer) screen);
 }
 
 MetaWindow*

src/core/stack.c

@@ -117,7 +117,6 @@ meta_stack_add (MetaStack  *stack,
               window->desc, window->stack_position);
 
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }
 
 void
@@ -153,7 +152,6 @@ meta_stack_remove (MetaStack  *stack,
                                      GUINT_TO_POINTER (window->frame->xwindow));
 
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }
 
 void
@@ -163,7 +161,6 @@ meta_stack_update_layer (MetaStack  *stack,
   stack->need_relayer = TRUE;
 
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }
 
 void
@@ -173,7 +170,6 @@ meta_stack_update_transient (MetaStack  *stack,
   stack->need_constrain = TRUE;
 
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }
 
 /* raise/lower within a layer */
@@ -202,7 +198,6 @@ meta_stack_raise (MetaStack  *stack,
   meta_window_set_stack_position_no_sync (window, max_stack_position);
 
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }
 
 void
@@ -230,7 +225,6 @@ meta_stack_lower (MetaStack  *stack,
   meta_window_set_stack_position_no_sync (window, min_stack_position);
 
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }
 
 void
@@ -246,27 +240,6 @@ meta_stack_thaw (MetaStack *stack)
 
   stack->freeze_count -= 1;
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, NULL);
-}
-
-void
-meta_stack_update_window_tile_matches (MetaStack     *stack,
-                                       MetaWorkspace *workspace)
-{
-  GList *windows, *tmp;
-
-  if (stack->freeze_count > 0)
-    return;
-
-  windows = meta_stack_list_windows (stack, workspace);
-  tmp = windows;
-  while (tmp)
-    {
-      meta_window_compute_tile_match ((MetaWindow *) tmp->data);
-      tmp = tmp->next;
-    }
-
-  g_list_free (windows);
 }
 
 static gboolean
@@ -1448,7 +1421,6 @@ meta_stack_set_positions (MetaStack *stack,
               "Reset the stack positions of (nearly) all windows\n");
 
   stack_sync_to_xserver (stack);
-  meta_stack_update_window_tile_matches (stack, NULL);
 }
 
 void
@@ -1511,6 +1483,4 @@ meta_window_set_stack_position (MetaWindow *window,
 {
   meta_window_set_stack_position_no_sync (window, position);
   stack_sync_to_xserver (window->screen->stack);
-  meta_stack_update_window_tile_matches (window->screen->stack,
-                                         window->screen->active_workspace);
 }

src/core/stack.h

@@ -413,6 +413,4 @@ GList* meta_stack_get_positions (MetaStack *stack);
 void   meta_stack_set_positions (MetaStack *stack,
                                  GList     *windows);
 
-void meta_stack_update_window_tile_matches (MetaStack     *stack,
-                                            MetaWorkspace *workspace);
 #endif

src/core/startup-notification.c

@@ -93,7 +93,7 @@ G_DECLARE_DERIVABLE_TYPE (MetaStartupNotificationSequence,
 
 typedef struct {
   gchar *id;
-  time_t timestamp;
+  gint64 timestamp;
 } MetaStartupNotificationSequencePrivate;
 
 struct _MetaStartupNotificationSequenceClass {
@@ -385,9 +385,12 @@ meta_startup_notification_sequence_x11_class_init (MetaStartupNotificationSequen
 static MetaStartupNotificationSequence *
 meta_startup_notification_sequence_x11_new (SnStartupSequence *seq)
 {
+  gint64 timestamp;
+
+  timestamp = sn_startup_sequence_get_timestamp (seq) * 1000;
   return g_object_new (META_TYPE_STARTUP_NOTIFICATION_SEQUENCE_X11,
                        "id", sn_startup_sequence_get_id (seq),
-                       "timestamp", sn_startup_sequence_get_timestamp (seq) * 1000,
+                       "timestamp", timestamp,
                        "seq", seq,
                        NULL);
 }

src/core/window-private.h

@@ -88,6 +88,20 @@ typedef enum
   META_MOVE_RESIZE_RESULT_FRAME_SHAPE_CHANGED = 1 << 2,
 } MetaMoveResizeResultFlags;
 
+/* This contains all the "state" needed for a certain size configuration.
+ * We have three of these size configurations: normal, tiled, and
+ * maximized. The idea here is that if the user tiles a normal window,
+ * then maximizes it, we should, upon unmaximizing and untiling the window,
+ * return to a normal state. We need a way of storing this information
+ * while maximized, so we use this structure. */
+struct _MetaWindowSizeState
+{
+  guint maximized_horizontally : 1;
+  guint maximized_vertically : 1;
+  MetaRectangle rect;
+};
+typedef struct _MetaWindowSizeState MetaWindowSizeState;
+
 struct _MetaWindow
 {
   GObject parent_instance;
@@ -157,14 +171,6 @@ struct _MetaWindow
   guint maximize_vertically_after_placement : 1;
   guint minimize_after_placement : 1;
 
-  /* The current or requested tile mode. If maximized_vertically is true,
-   * this is the current mode. If not, it is the mode which will be
-   * requested after the window grab is released */
-  guint tile_mode : 2;
-  /* The last "full" maximized/unmaximized state. We need to keep track of
-   * that to toggle between normal/tiled or maximized/tiled states. */
-  guint saved_maximize : 1;
-  int tile_monitor_number;
   int preferred_output_winsys_id;
 
   /* Whether we're shaded */
@@ -401,9 +407,6 @@ struct _MetaWindow
   /* The current window geometry of the window. */
   MetaRectangle rect;
 
-  /* The geometry to restore when we unmaximize. */
-  MetaRectangle saved_rect;
-
   /* This is the geometry the window will have if no constraints have
    * applied. We use this whenever we are moving implicitly (for example,
    * if we move to avoid a panel, we can snap back to this position if
@@ -441,11 +444,16 @@ struct _MetaWindow
   /* Focused window that is (directly or indirectly) attached to this one */
   MetaWindow *attached_focus_window;
 
-  /* The currently complementary tiled window, if any */
-  MetaWindow *tile_match;
-
   /* Bypass compositor hints */
   guint bypass_compositor;
+
+  /* This is where we store data while in another state. The information
+   * above in MetaWindow is always the current state of the window. */
+  struct {
+    MetaWindowSizeState normal, tiled, maximized;
+  } size_states;
+
+  MetaDirection constrained_edges;
 };
 
 struct _MetaWindowClass
@@ -492,17 +500,8 @@ struct _MetaWindowClass
                                         (w)->maximized_vertically)
 #define META_WINDOW_MAXIMIZED_VERTICALLY(w)    ((w)->maximized_vertically)
 #define META_WINDOW_MAXIMIZED_HORIZONTALLY(w)  ((w)->maximized_horizontally)
-#define META_WINDOW_TILED_SIDE_BY_SIDE(w)      ((w)->maximized_vertically && \
-                                                !(w)->maximized_horizontally && \
-                                                 (w)->tile_mode != META_TILE_NONE)
-#define META_WINDOW_TILED_LEFT(w)     (META_WINDOW_TILED_SIDE_BY_SIDE(w) && \
-                                       (w)->tile_mode == META_TILE_LEFT)
-#define META_WINDOW_TILED_RIGHT(w)    (META_WINDOW_TILED_SIDE_BY_SIDE(w) && \
-                                       (w)->tile_mode == META_TILE_RIGHT)
-#define META_WINDOW_TILED_MAXIMIZED(w)(META_WINDOW_MAXIMIZED(w) && \
-                                       (w)->tile_mode == META_TILE_MAXIMIZED)
 #define META_WINDOW_ALLOWS_MOVE(w)     ((w)->has_move_func && !(w)->fullscreen)
-#define META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS(w)   ((w)->has_resize_func && !META_WINDOW_MAXIMIZED (w) && !META_WINDOW_TILED_SIDE_BY_SIDE(w) && !(w)->fullscreen && !(w)->shaded)
+#define META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS(w)   ((w)->has_resize_func && !META_WINDOW_MAXIMIZED (w) && !(w)->fullscreen && !(w)->shaded)
 #define META_WINDOW_ALLOWS_RESIZE(w)   (META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS (w) &&                \
                                         (((w)->size_hints.min_width < (w)->size_hints.max_width) ||  \
                                          ((w)->size_hints.min_height < (w)->size_hints.max_height)))
@@ -522,7 +521,6 @@ void        meta_window_unmanage           (MetaWindow  *window,
                                             guint32      timestamp);
 void        meta_window_queue              (MetaWindow  *window,
                                             guint queuebits);
-void        meta_window_tile               (MetaWindow        *window);
 void        meta_window_maximize_internal  (MetaWindow        *window,
                                             MetaMaximizeFlags  directions,
                                             MetaRectangle     *saved_rect);
@@ -584,11 +582,6 @@ gboolean meta_window_handle_mouse_grab_op_event  (MetaWindow         *window,
 
 GList* meta_window_get_workspaces (MetaWindow *window);
 
-int meta_window_get_current_tile_monitor_number (MetaWindow *window);
-void meta_window_get_current_tile_area         (MetaWindow    *window,
-                                                MetaRectangle *tile_area);
-
-
 gboolean meta_window_same_application (MetaWindow *window,
                                        MetaWindow *other_window);
 
@@ -626,9 +619,6 @@ void meta_window_update_for_monitors_changed (MetaWindow *window);
 void meta_window_on_all_workspaces_changed (MetaWindow *window);
 
 gboolean meta_window_should_attach_to_parent (MetaWindow *window);
-gboolean meta_window_can_tile_side_by_side   (MetaWindow *window);
-
-void meta_window_compute_tile_match (MetaWindow *window);
 
 gboolean meta_window_updates_are_frozen (MetaWindow *window);
 
@@ -695,4 +685,7 @@ gboolean meta_window_has_pointer (MetaWindow *window);
 
 void meta_window_emit_size_changed (MetaWindow *window);
 
+void meta_window_toggle_tile (MetaWindow   *window,
+                              MetaTileZone  tile_zone);
+
 #endif

src/meta/common.h

@@ -83,7 +83,11 @@ typedef enum
   META_FRAME_IS_FLASHING              = 1 << 14,
   META_FRAME_ABOVE                    = 1 << 15,
   META_FRAME_TILED_LEFT               = 1 << 16,
-  META_FRAME_TILED_RIGHT              = 1 << 17
+  META_FRAME_TILED_RIGHT              = 1 << 17,
+  META_FRAME_CONSTRAINED_LEFT_EDGE    = 1 << 18,
+  META_FRAME_CONSTRAINED_RIGHT_EDGE   = 1 << 19,
+  META_FRAME_CONSTRAINED_TOP_EDGE     = 1 << 20,
+  META_FRAME_CONSTRAINED_BOTTOM_EDGE  = 1 << 21,
 } MetaFrameFlags;
 
 /**
@@ -317,6 +321,26 @@ typedef enum
   META_DIRECTION_VERTICAL   = META_DIRECTION_UP   | META_DIRECTION_DOWN,
 } MetaDirection;
 
+/* Tile zones are specified in terms of their constrained edges.
+ * So, "top left corner" is top and left, which should be obvious,
+ * but "left side of the screen" is top, bottom, and left
+ */
+typedef enum {
+  META_TILE_ZONE_MAXIMIZED_HORZ = META_DIRECTION_HORIZONTAL,
+  META_TILE_ZONE_MAXIMIZED_VERT = META_DIRECTION_VERTICAL,
+  META_TILE_ZONE_MAXIMIZED      = META_TILE_ZONE_MAXIMIZED_HORZ | META_TILE_ZONE_MAXIMIZED_VERT,
+
+  META_TILE_ZONE_W = META_TILE_ZONE_MAXIMIZED_VERT | META_DIRECTION_LEFT,
+  META_TILE_ZONE_E = META_TILE_ZONE_MAXIMIZED_VERT | META_DIRECTION_RIGHT,
+  META_TILE_ZONE_N = META_TILE_ZONE_MAXIMIZED_HORZ | META_DIRECTION_TOP,
+  META_TILE_ZONE_S = META_TILE_ZONE_MAXIMIZED_HORZ | META_DIRECTION_BOTTOM,
+
+  META_TILE_ZONE_NW = META_DIRECTION_TOP | META_DIRECTION_LEFT,
+  META_TILE_ZONE_NE = META_DIRECTION_TOP | META_DIRECTION_RIGHT,
+  META_TILE_ZONE_SW = META_DIRECTION_BOTTOM | META_DIRECTION_LEFT,
+  META_TILE_ZONE_SE = META_DIRECTION_BOTTOM | META_DIRECTION_RIGHT,
+} MetaTileZone;
+
 /**
  * MetaMotionDirection:
  * @META_MOTION_UP: Upwards motion
@@ -520,7 +544,6 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
  * @META_LAYER_TOP: Top layer
  * @META_LAYER_DOCK: Dock layer
  * @META_LAYER_FULLSCREEN: Fullscreen layer
- * @META_LAYER_FOCUSED_WINDOW: Focused window layer
  * @META_LAYER_OVERRIDE_REDIRECT: Override-redirect layer
  * @META_LAYER_LAST: Marks the end of the #MetaStackLayer enumeration
  *
@@ -535,7 +558,6 @@ typedef enum
   META_LAYER_TOP	       = 4, /* Same as DOCK; see EWMH and bug 330717 */
   META_LAYER_DOCK	       = 4,
   META_LAYER_FULLSCREEN	       = 5,
-  META_LAYER_FOCUSED_WINDOW    = 6,
   META_LAYER_OVERRIDE_REDIRECT = 7,
   META_LAYER_LAST	       = 8
 } MetaStackLayer;

src/meta/window.h

@@ -214,8 +214,6 @@ MetaFrameType meta_window_get_frame_type (MetaWindow *window);
 
 cairo_region_t *meta_window_get_frame_bounds (MetaWindow *window);
 
-MetaWindow *meta_window_get_tile_match (MetaWindow *window);
-
 void        meta_window_make_fullscreen    (MetaWindow  *window);
 void        meta_window_unmake_fullscreen  (MetaWindow  *window);
 void        meta_window_make_above         (MetaWindow  *window);
@@ -260,4 +258,8 @@ gboolean meta_window_is_client_decorated (MetaWindow *window);
 gboolean meta_window_titlebar_is_onscreen    (MetaWindow *window);
 void     meta_window_shove_titlebar_onscreen (MetaWindow *window);
 
+void     meta_window_tile (MetaWindow   *window,
+                           MetaTileZone  tile_zone);
+void     meta_window_untile (MetaWindow *window);
+
 #endif

src/tests/test-runner.c

@@ -1136,10 +1136,10 @@ main (int argc, char **argv)
 
   /* Then initalize mutter with a different set of arguments */
 
-  char *fake_args[] = { NULL, (char *)"--wayland" };
+  char *fake_args[] = { NULL, (char *)"--wayland", (char *)"--nested" };
   fake_args[0] = argv[0];
   char **fake_argv = fake_args;
-  int fake_argc = 2;
+  int fake_argc = G_N_ELEMENTS (fake_args);
 
   char *basename = g_path_get_basename (argv[0]);
   char *dirname = g_path_get_dirname (argv[0]);

src/tests/unit-tests.c

@@ -213,10 +213,10 @@ main (int argc, char *argv[])
 
   g_option_context_free (ctx);
 
-  char *fake_args[] = { NULL, "--wayland" };
+  const char *fake_args[] = { NULL, "--wayland", "--nested" };
   fake_args[0] = argv[0];
-  char **fake_argv = fake_args;
-  int fake_argc = 2;
+  char **fake_argv = (char**)fake_args;
+  int fake_argc = G_N_ELEMENTS (fake_args);
 
   ctx = meta_get_option_context ();
   if (!g_option_context_parse (ctx, &fake_argc, &fake_argv, &error))

src/ui/theme.c

@@ -100,22 +100,25 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout,
 
   if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
     {
-      borders->invisible.left   = MAX (borders->invisible.left,
-                                       draggable_borders - borders->visible.left);
-      borders->invisible.right  = MAX (borders->invisible.right,
-                                       draggable_borders - borders->visible.right);
+      if (!(flags & META_FRAME_CONSTRAINED_LEFT_EDGE))
+        borders->invisible.left   = MAX (borders->invisible.left,
+                                         draggable_borders - borders->visible.left);
+      if (!(flags & META_FRAME_CONSTRAINED_RIGHT_EDGE))
+        borders->invisible.right  = MAX (borders->invisible.right,
+                                         draggable_borders - borders->visible.right);
     }
 
   if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
     {
-      borders->invisible.bottom = MAX (borders->invisible.bottom,
-                                       draggable_borders - borders->visible.bottom);
-
       /* borders.visible.top is the height of the *title bar*. We can't do the same
        * algorithm here, titlebars are expectedly much bigger. Just subtract a couple
        * pixels to get a proper feel. */
-      if (type != META_FRAME_TYPE_ATTACHED)
+      if (!(flags & META_FRAME_CONSTRAINED_TOP_EDGE) && type != META_FRAME_TYPE_ATTACHED)
         borders->invisible.top    = MAX (borders->invisible.top, draggable_borders - 2);
+
+      if (!(flags & META_FRAME_CONSTRAINED_BOTTOM_EDGE))
+        borders->invisible.bottom = MAX (borders->invisible.bottom,
+                                         draggable_borders - borders->visible.bottom);
     }
 
   borders->total.left   = borders->invisible.left   + borders->visible.left;

src/wayland/meta-wayland-buffer.c

@@ -30,6 +30,15 @@
 #include <cogl/cogl-wayland-server.h>
 #include <meta/util.h>
 
+enum
+{
+  RESOURCE_DESTROYED,
+
+  LAST_SIGNAL
+};
+
+guint signals[LAST_SIGNAL];
+
 G_DEFINE_TYPE (MetaWaylandBuffer, meta_wayland_buffer, G_TYPE_OBJECT);
 
 static void
@@ -40,29 +49,10 @@ meta_wayland_buffer_destroy_handler (struct wl_listener *listener,
     wl_container_of (listener, buffer, destroy_listener);
 
   buffer->resource = NULL;
-  wl_signal_emit (&buffer->destroy_signal, buffer);
+  g_signal_emit (buffer, signals[RESOURCE_DESTROYED], 0);
   g_object_unref (buffer);
 }
 
-void
-meta_wayland_buffer_ref_use_count (MetaWaylandBuffer *buffer)
-{
-  g_warn_if_fail (buffer->resource);
-
-  buffer->use_count++;
-}
-
-void
-meta_wayland_buffer_unref_use_count (MetaWaylandBuffer *buffer)
-{
-  g_return_if_fail (buffer->use_count != 0);
-
-  buffer->use_count--;
-
-  if (buffer->use_count == 0 && buffer->resource)
-    wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
-}
-
 MetaWaylandBuffer *
 meta_wayland_buffer_from_resource (struct wl_resource *resource)
 {
@@ -82,7 +72,6 @@ meta_wayland_buffer_from_resource (struct wl_resource *resource)
       buffer = g_object_new (META_TYPE_WAYLAND_BUFFER, NULL);
 
       buffer->resource = resource;
-      wl_signal_init (&buffer->destroy_signal);
       buffer->destroy_listener.notify = meta_wayland_buffer_destroy_handler;
       wl_resource_add_destroy_listener (resource, &buffer->destroy_listener);
     }
@@ -98,7 +87,6 @@ meta_wayland_buffer_ensure_texture (MetaWaylandBuffer *buffer)
   CoglTexture *texture;
   struct wl_shm_buffer *shm_buffer;
 
-  g_return_val_if_fail (buffer->use_count != 0, NULL);
   g_return_val_if_fail (buffer->resource, NULL);
 
   if (buffer->texture)
@@ -134,8 +122,6 @@ meta_wayland_buffer_process_damage (MetaWaylandBuffer *buffer,
 {
   struct wl_shm_buffer *shm_buffer;
 
-  g_return_if_fail (buffer->use_count != 0);
-
   shm_buffer = wl_shm_buffer_get (buffer->resource);
 
   if (shm_buffer)
@@ -181,4 +167,11 @@ meta_wayland_buffer_class_init (MetaWaylandBufferClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = meta_wayland_buffer_finalize;
+
+  signals[RESOURCE_DESTROYED] = g_signal_new ("resource-destroyed",
+                                              G_TYPE_FROM_CLASS (object_class),
+                                              G_SIGNAL_RUN_LAST,
+                                              0,
+                                              NULL, NULL, NULL,
+                                              G_TYPE_NONE, 0);
 }

src/wayland/meta-wayland-buffer.h

@@ -36,11 +36,9 @@ struct _MetaWaylandBuffer
   GObject parent;
 
   struct wl_resource *resource;
-  struct wl_signal destroy_signal;
   struct wl_listener destroy_listener;
 
   CoglTexture *texture;
-  uint32_t use_count;
 };
 
 #define META_TYPE_WAYLAND_BUFFER (meta_wayland_buffer_get_type ())
@@ -48,8 +46,6 @@ G_DECLARE_FINAL_TYPE (MetaWaylandBuffer, meta_wayland_buffer,
                       META, WAYLAND_BUFFER, GObject);
 
 MetaWaylandBuffer *     meta_wayland_buffer_from_resource       (struct wl_resource    *resource);
-void                    meta_wayland_buffer_ref_use_count       (MetaWaylandBuffer     *buffer);
-void                    meta_wayland_buffer_unref_use_count     (MetaWaylandBuffer     *buffer);
 CoglTexture *           meta_wayland_buffer_ensure_texture      (MetaWaylandBuffer     *buffer);
 void                    meta_wayland_buffer_process_damage      (MetaWaylandBuffer     *buffer,
                                                                  cairo_region_t        *region);

src/wayland/meta-wayland-data-device.c

@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <glib.h>
+#include <glib-unix.h>
 
 #include "meta-wayland-data-device.h"
 #include "meta-wayland-data-device-private.h"
@@ -39,6 +40,8 @@
 
 #include "gtk-primary-selection-server-protocol.h"
 
+#define ROOTWINDOW_DROP_MIME "application/x-rootwindow-drop"
+
 #define ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \
                      WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | \
                      WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK)
@@ -696,6 +699,8 @@ struct _MetaWaylandDragGrab {
 
   int                     drag_start_x, drag_start_y;
   ClutterModifierType     buttons;
+
+  guint                   need_initial_focus : 1;
 };
 
 static void
@@ -724,30 +729,64 @@ meta_wayland_drag_grab_set_source (MetaWaylandDragGrab   *drag_grab,
                        drag_grab);
 }
 
+static void
+meta_wayland_drag_source_fake_acceptance (MetaWaylandDataSource *source,
+                                          const gchar           *mimetype)
+{
+  uint32_t actions, user_action, action = 0;
+
+  actions = meta_wayland_data_source_get_actions (source);
+  user_action = meta_wayland_data_source_get_user_action (source);
+
+  /* Pick a suitable action */
+  if ((user_action & actions) != 0)
+    action = user_action;
+  else if (actions != 0)
+    action = 1 << (ffs (actions) - 1);
+
+  /* Bail out if there is none, source didn't cooperate */
+  if (action == 0)
+    return;
+
+  meta_wayland_data_source_target (source, mimetype);
+  meta_wayland_data_source_set_current_action (source, action);
+  meta_wayland_data_source_set_has_target (source, TRUE);
+}
+
 void
 meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
                                   MetaWaylandSurface  *surface)
 {
   MetaWaylandSeat *seat = drag_grab->seat;
+  MetaWaylandDataSource *source = drag_grab->drag_data_source;
   struct wl_client *client;
   struct wl_resource *data_device_resource, *offer = NULL;
 
-  if (drag_grab->drag_focus == surface)
+  if (!drag_grab->need_initial_focus &&
+      drag_grab->drag_focus == surface)
     return;
 
+  drag_grab->need_initial_focus = FALSE;
+
   if (drag_grab->drag_focus)
     {
       meta_wayland_surface_drag_dest_focus_out (drag_grab->drag_focus);
       drag_grab->drag_focus = NULL;
     }
 
-  if (drag_grab->drag_data_source)
-    meta_wayland_data_source_set_current_offer (drag_grab->drag_data_source, NULL);
+  if (source)
+    meta_wayland_data_source_set_current_offer (source, NULL);
+
+  if (!surface && source &&
+      meta_wayland_data_source_has_mime_type (source, ROOTWINDOW_DROP_MIME))
+    meta_wayland_drag_source_fake_acceptance (source, ROOTWINDOW_DROP_MIME);
+  else if (source)
+    meta_wayland_data_source_target (source, NULL);
 
   if (!surface)
     return;
 
-  if (!drag_grab->drag_data_source &&
+  if (!source &&
       wl_resource_get_client (surface->resource) != drag_grab->drag_client)
     return;
 
@@ -755,9 +794,8 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
 
   data_device_resource = wl_resource_find_for_client (&seat->data_device.resource_list, client);
 
-  if (drag_grab->drag_data_source && data_device_resource)
-    offer = meta_wayland_data_source_send_offer (drag_grab->drag_data_source,
-                                                 data_device_resource);
+  if (source && data_device_resource)
+    offer = meta_wayland_data_source_send_offer (source, data_device_resource);
 
   drag_grab->drag_focus = surface;
   drag_grab->drag_focus_data_device = data_device_resource;
@@ -850,6 +888,47 @@ data_device_end_drag_grab (MetaWaylandDragGrab *drag_grab)
   g_slice_free (MetaWaylandDragGrab, drag_grab);
 }
 
+static gboolean
+on_fake_read_hup (GIOChannel   *channel,
+                  GIOCondition  condition,
+                  gpointer      data)
+{
+  MetaWaylandDataSource *source = data;
+
+  meta_wayland_data_source_notify_finish (source);
+  g_io_channel_shutdown (channel, FALSE, NULL);
+  g_io_channel_unref (channel);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+meta_wayland_data_source_fake_read (MetaWaylandDataSource *source,
+                                    const gchar           *mimetype)
+{
+  GIOChannel *channel;
+  int p[2];
+
+  if (!g_unix_open_pipe (p, FD_CLOEXEC, NULL))
+    {
+      meta_wayland_data_source_notify_finish (source);
+      return;
+    }
+
+  if (!g_unix_set_fd_nonblocking (p[0], TRUE, NULL) ||
+      !g_unix_set_fd_nonblocking (p[1], TRUE, NULL))
+    {
+      meta_wayland_data_source_notify_finish (source);
+      close (p[0]);
+      close (p[1]);
+      return;
+    }
+
+  meta_wayland_data_source_send (source, mimetype, p[1]);
+  channel = g_io_channel_unix_new (p[0]);
+  g_io_add_watch (channel, G_IO_HUP, on_fake_read_hup, source);
+}
+
 static void
 drag_grab_button (MetaWaylandPointerGrab *grab,
 		  const ClutterEvent     *event)
@@ -878,6 +957,15 @@ drag_grab_button (MetaWaylandPointerGrab *grab,
           meta_wayland_source_update_in_ask (source);
           success = TRUE;
         }
+      else if (!drag_grab->drag_focus && source &&
+               meta_wayland_data_source_has_target (source) &&
+               meta_wayland_data_source_get_current_action (source) &&
+               meta_wayland_data_source_has_mime_type (source, ROOTWINDOW_DROP_MIME))
+        {
+          /* Perform a fake read, that will lead to notify_finish() being called */
+          meta_wayland_data_source_fake_read (source, ROOTWINDOW_DROP_MIME);
+          success = TRUE;
+        }
       else
         {
           meta_wayland_data_source_cancel (source);
@@ -979,7 +1067,7 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice                 *data
 {
   MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
   MetaWaylandDragGrab *drag_grab;
-  ClutterPoint pos, stage_pos;
+  ClutterPoint pos, surface_pos;
   ClutterModifierType modifiers;
 
   data_device->current_grab = drag_grab = g_slice_new0 (MetaWaylandDragGrab);
@@ -998,11 +1086,14 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice                 *data
   wl_resource_add_destroy_listener (surface->resource,
                                     &drag_grab->drag_origin_listener);
 
-  clutter_input_device_get_coords (seat->pointer.device, NULL, &pos);
   clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)),
-                                       pos.x, pos.y, &stage_pos.x, &stage_pos.y);
-  drag_grab->drag_start_x = stage_pos.x;
-  drag_grab->drag_start_y = stage_pos.y;
+                                       seat->pointer.grab_x,
+                                       seat->pointer.grab_y,
+                                       &surface_pos.x, &surface_pos.y);
+  drag_grab->drag_start_x = surface_pos.x;
+  drag_grab->drag_start_y = surface_pos.y;
+
+  drag_grab->need_initial_focus = TRUE;
 
   modifiers = clutter_input_device_get_modifier_state (seat->pointer.device);
   drag_grab->buttons = modifiers &
@@ -1030,6 +1121,7 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice                 *data
       clutter_actor_add_child (drag_grab->feedback_actor,
                                CLUTTER_ACTOR (drag_grab->drag_surface->surface_actor));
 
+      clutter_input_device_get_coords (seat->pointer.device, NULL, &pos);
       meta_feedback_actor_set_position (META_FEEDBACK_ACTOR (drag_grab->feedback_actor),
                                         pos.x, pos.y);
     }
@@ -1117,6 +1209,8 @@ selection_data_source_destroyed (gpointer data, GObject *object_was_here)
       if (data_device_resource)
         wl_data_device_send_selection (data_device_resource, NULL);
     }
+
+  wl_signal_emit (&data_device->selection_ownership_signal, NULL);
 }
 
 static void
@@ -1513,6 +1607,8 @@ primary_source_destroyed (gpointer  data,
       if (data_device_resource)
         gtk_primary_selection_device_send_selection (data_device_resource, NULL);
     }
+
+  wl_signal_emit (&data_device->primary_ownership_signal, NULL);
 }
 
 void

src/wayland/meta-wayland-pointer-constraints.c

@@ -44,6 +44,7 @@
 #include "pointer-constraints-unstable-v1-server-protocol.h"
 
 static GQuark quark_pending_constraint_state = 0;
+static GQuark quark_surface_pointer_constraints_data = 0;
 
 struct _MetaWaylandPointerConstraint
 {
@@ -64,6 +65,14 @@ struct _MetaWaylandPointerConstraint
   MetaPointerConstraint *constraint;
 };
 
+typedef struct _MetaWaylandSurfacePointerConstraintsData
+{
+  GList *pointer_constraints;
+  MetaWindow *window;
+  gulong appears_changed_handler_id;
+  gulong raised_handler_id;
+} MetaWaylandSurfacePointerConstraintsData;
+
 typedef struct
 {
   MetaWaylandPointerConstraint *constraint;
@@ -84,15 +93,137 @@ static const struct zwp_confined_pointer_v1_interface confined_pointer_interface
 static const MetaWaylandPointerGrabInterface locked_pointer_grab_interface;
 static const MetaWaylandPointerGrabInterface confined_pointer_grab_interface;
 
-static cairo_region_t *
-create_infinite_constraint_region (void)
+static void
+meta_wayland_pointer_constraint_destroy (MetaWaylandPointerConstraint *constraint);
+
+static void
+meta_wayland_pointer_constraint_maybe_enable_for_window (MetaWindow *window);
+
+static void
+meta_wayland_pointer_constraint_maybe_remove_for_seat (MetaWaylandSeat *seat,
+                                                       MetaWindow      *window);
+
+static MetaWaylandSurfacePointerConstraintsData *
+get_surface_constraints_data (MetaWaylandSurface *surface)
 {
-  return cairo_region_create_rectangle (&(cairo_rectangle_int_t) {
-                                          .x = INT_MIN / 2,
-                                          .y = INT_MIN / 2,
-                                          .width = INT_MAX,
-                                          .height = INT_MAX,
-                                        });
+  return g_object_get_qdata (G_OBJECT (surface),
+                             quark_surface_pointer_constraints_data);
+}
+
+static void
+appears_focused_changed (MetaWindow *window,
+                         GParamSpec *pspec,
+                         gpointer    user_data)
+{
+  MetaWaylandCompositor *wayland_compositor;
+
+  wayland_compositor = meta_wayland_compositor_get_default ();
+  meta_wayland_pointer_constraint_maybe_remove_for_seat (wayland_compositor->seat,
+                                                         window);
+
+  if (window->unmanaging)
+    return;
+
+  meta_wayland_pointer_constraint_maybe_enable_for_window (window);
+}
+
+static void
+window_raised (MetaWindow *window)
+{
+  meta_wayland_pointer_constraint_maybe_enable_for_window (window);
+}
+
+static MetaWaylandSurfacePointerConstraintsData *
+surface_constraint_data_new (MetaWaylandSurface *surface)
+{
+  MetaWaylandSurfacePointerConstraintsData *data;
+
+  data = g_new0 (MetaWaylandSurfacePointerConstraintsData, 1);
+
+  if (surface->window)
+    {
+      data->window = surface->window;
+      g_object_add_weak_pointer (G_OBJECT (data->window),
+                                 (gpointer *) &data->window);
+      data->appears_changed_handler_id =
+        g_signal_connect (data->window, "notify::appears-focused",
+                          G_CALLBACK (appears_focused_changed), NULL);
+      data->raised_handler_id =
+        g_signal_connect (data->window, "raised",
+                          G_CALLBACK (window_raised), NULL);
+    }
+  else
+    {
+      /* TODO: Support constraints on non-toplevel windows, such as subsurfaces.
+       */
+      g_warn_if_reached ();
+    }
+
+  return data;
+}
+static void
+surface_constraint_data_free (MetaWaylandSurfacePointerConstraintsData *data)
+{
+  if (data->window)
+    {
+      g_signal_handler_disconnect (data->window,
+                                   data->appears_changed_handler_id);
+      g_signal_handler_disconnect (data->window,
+                                   data->raised_handler_id);
+      g_object_remove_weak_pointer (G_OBJECT (data->window),
+                                    (gpointer *) &data->window);
+    }
+
+  g_list_free_full (data->pointer_constraints,
+                    (GDestroyNotify) meta_wayland_pointer_constraint_destroy);
+  g_free (data);
+}
+
+static MetaWaylandSurfacePointerConstraintsData *
+ensure_surface_constraints_data (MetaWaylandSurface *surface)
+{
+  MetaWaylandSurfacePointerConstraintsData *data;
+
+  data = get_surface_constraints_data (surface);
+  if (!data)
+    {
+      data = surface_constraint_data_new (surface);
+      g_object_set_qdata_full (G_OBJECT (surface),
+                               quark_surface_pointer_constraints_data,
+                               data,
+                               (GDestroyNotify) surface_constraint_data_free);
+    }
+
+  return data;
+}
+
+static void
+surface_add_pointer_constraint (MetaWaylandSurface           *surface,
+                                MetaWaylandPointerConstraint *constraint)
+{
+  MetaWaylandSurfacePointerConstraintsData *data;
+
+  data = ensure_surface_constraints_data (surface);
+  data->pointer_constraints = g_list_append (data->pointer_constraints,
+                                             constraint);
+}
+
+static void
+surface_remove_pointer_constraints (MetaWaylandSurface           *surface,
+                                    MetaWaylandPointerConstraint *constraint)
+{
+  MetaWaylandSurfacePointerConstraintsData *data;
+
+  data = get_surface_constraints_data (surface);
+  data->pointer_constraints =
+    g_list_remove (data->pointer_constraints, constraint);
+
+  if (!data->pointer_constraints)
+    {
+      g_object_set_qdata (G_OBJECT (surface),
+                          quark_surface_pointer_constraints_data,
+                          NULL);
+    }
 }
 
 static MetaWaylandPointerConstraint *
@@ -122,7 +253,7 @@ meta_wayland_pointer_constraint_new (MetaWaylandSurface                      *su
     }
   else
     {
-      constraint->region = create_infinite_constraint_region ();
+      constraint->region = NULL;
     }
 
   return constraint;
@@ -212,6 +343,7 @@ meta_wayland_pointer_constraint_enable (MetaWaylandPointerConstraint *constraint
 static void
 meta_wayland_pointer_constraint_disable (MetaWaylandPointerConstraint *constraint)
 {
+  constraint->is_enabled = FALSE;
   meta_wayland_pointer_constraint_notify_deactivated (constraint);
   meta_wayland_pointer_end_grab (constraint->grab.pointer);
   meta_backend_set_client_pointer_constraint (meta_get_backend (), NULL);
@@ -224,7 +356,7 @@ meta_wayland_pointer_constraint_destroy (MetaWaylandPointerConstraint *constrain
     meta_wayland_pointer_constraint_disable (constraint);
 
   wl_resource_set_user_data (constraint->resource, NULL);
-  cairo_region_destroy (constraint->region);
+  g_clear_pointer (&constraint->region, cairo_region_destroy);
   g_object_unref (constraint);
 }
 
@@ -237,7 +369,7 @@ is_within_constraint_region (MetaWaylandPointerConstraint *constraint,
   gboolean is_within;
 
   region = meta_wayland_pointer_constraint_calculate_effective_region (constraint);
-  is_within = cairo_region_contains_point (constraint->region,
+  is_within = cairo_region_contains_point (region,
                                            wl_fixed_to_int (sx),
                                            wl_fixed_to_int (sy));
   cairo_region_destroy (region);
@@ -248,13 +380,18 @@ is_within_constraint_region (MetaWaylandPointerConstraint *constraint,
 static void
 meta_wayland_pointer_constraint_maybe_enable (MetaWaylandPointerConstraint *constraint)
 {
-  MetaWaylandSeat *seat = constraint->seat;
   wl_fixed_t sx, sy;
 
   if (constraint->is_enabled)
     return;
 
-  if (seat->keyboard.focus_surface != constraint->surface)
+  if (!constraint->surface->window)
+    {
+      g_warn_if_reached ();
+      return;
+    }
+
+  if (!meta_window_appears_focused (constraint->surface->window))
     return;
 
   meta_wayland_pointer_get_relative_coordinates (&constraint->seat->pointer,
@@ -271,49 +408,59 @@ meta_wayland_pointer_constraint_remove (MetaWaylandPointerConstraint *constraint
 {
   MetaWaylandSurface *surface = constraint->surface;
 
-  meta_wayland_surface_remove_pointer_constraint (surface, constraint);
+  surface_remove_pointer_constraints (surface, constraint);
   meta_wayland_pointer_constraint_destroy (constraint);
 }
 
 void
 meta_wayland_pointer_constraint_maybe_remove_for_seat (MetaWaylandSeat *seat,
-                                                       MetaWindow      *focus_window)
+                                                       MetaWindow      *window)
 {
   MetaWaylandPointer *pointer = &seat->pointer;
+  MetaWaylandPointerConstraint *constraint;
 
-  if ((pointer->grab->interface == &confined_pointer_grab_interface ||
-       pointer->grab->interface == &locked_pointer_grab_interface) &&
-      pointer->focus_surface &&
-      pointer->focus_surface->window != focus_window)
+  if ((pointer->grab->interface != &confined_pointer_grab_interface &&
+       pointer->grab->interface != &locked_pointer_grab_interface))
+    return;
+
+  constraint = wl_container_of (pointer->grab, constraint, grab);
+
+  if (constraint->surface != window->surface)
+    return;
+
+  if (meta_window_appears_focused (window) &&
+      pointer->focus_surface == window->surface)
+    return;
+
+  switch (constraint->lifetime)
     {
-      MetaWaylandPointerConstraint *constraint =
-        wl_container_of (pointer->grab, constraint, grab);
+    case ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT:
+      meta_wayland_pointer_constraint_remove (constraint);
+      break;
 
-      switch (constraint->lifetime)
-        {
-        case ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT:
-          meta_wayland_pointer_constraint_remove (constraint);
-          break;
+    case ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT:
+      meta_wayland_pointer_constraint_disable (constraint);
+      break;
 
-        case ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT:
-          meta_wayland_pointer_constraint_disable (constraint);
-          break;
-
-        default:
-          g_assert_not_reached ();
-        }
+    default:
+      g_assert_not_reached ();
     }
 }
 
-void
+static void
 meta_wayland_pointer_constraint_maybe_enable_for_window (MetaWindow *window)
 {
   MetaWaylandSurface *surface = window->surface;
-  GList *it;
+  MetaWaylandSurfacePointerConstraintsData *surface_data;
+  GList *l;
 
-  for (it = surface->pointer_constraints; it; it = it->next)
+  surface_data = get_surface_constraints_data (surface);
+  if (!surface_data)
+    return;
+
+  for (l = surface_data->pointer_constraints; l; l = l->next)
     {
-      MetaWaylandPointerConstraint *constraint = it->data;
+      MetaWaylandPointerConstraint *constraint = l->data;
 
       meta_wayland_pointer_constraint_maybe_enable (constraint);
     }
@@ -330,8 +477,9 @@ meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerCo
 {
   cairo_region_t *region;
 
-  region = cairo_region_copy (constraint->surface->input_region);
-  cairo_region_intersect (region, constraint->region);
+  region = meta_wayland_surface_calculate_input_region (constraint->surface);
+  if (constraint->region)
+    cairo_region_intersect (region, constraint->region);
 
   return region;
 }
@@ -454,7 +602,7 @@ pending_constraint_state_applied (MetaWaylandPendingState           *pending,
     }
   else
     {
-      constraint->region = create_infinite_constraint_region ();
+      constraint->region = NULL;
     }
 
   g_signal_handler_disconnect (pending,
@@ -510,6 +658,28 @@ meta_wayland_pointer_constraint_set_pending_region (MetaWaylandPointerConstraint
     }
 }
 
+static MetaWaylandPointerConstraint *
+get_pointer_constraint_for_seat (MetaWaylandSurface *surface,
+                                 MetaWaylandSeat    *seat)
+{
+  MetaWaylandSurfacePointerConstraintsData *surface_data;
+  GList *l;
+
+  surface_data = get_surface_constraints_data (surface);
+  if (!surface_data)
+    return NULL;
+
+  for (l = surface_data->pointer_constraints; l; l = l->next)
+    {
+      MetaWaylandPointerConstraint *constraint = l->data;
+
+      if (seat == constraint->seat)
+        return constraint;
+    }
+
+  return NULL;
+}
+
 static void
 init_pointer_constraint (struct wl_resource                      *resource,
                          uint32_t                                 id,
@@ -525,7 +695,7 @@ init_pointer_constraint (struct wl_resource                      *resource,
   struct wl_resource *cr;
   MetaWaylandPointerConstraint *constraint;
 
-  if (meta_wayland_surface_get_pointer_constraint_for_seat (surface, seat))
+  if (get_pointer_constraint_for_seat (surface, seat))
     {
       wl_resource_post_error (resource,
                               WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -553,7 +723,7 @@ init_pointer_constraint (struct wl_resource                      *resource,
       return;
     }
 
-  meta_wayland_surface_add_pointer_constraint (surface, constraint);
+  surface_add_pointer_constraint (surface, constraint);
 
   wl_resource_set_implementation (cr, implementation, constraint,
                                   pointer_constraint_resource_destroyed);
@@ -815,4 +985,6 @@ meta_wayland_pointer_constraint_class_init (MetaWaylandPointerConstraintClass *k
 {
   quark_pending_constraint_state =
     g_quark_from_static_string ("-meta-wayland-pointer-constraint-pending_state");
+  quark_surface_pointer_constraints_data =
+    g_quark_from_static_string ("-meta-wayland-surface-constraints-data");
 }

src/wayland/meta-wayland-pointer-constraints.h

@@ -38,17 +38,10 @@ G_DECLARE_FINAL_TYPE (MetaWaylandPointerConstraint,
 
 void meta_wayland_pointer_constraints_init (MetaWaylandCompositor *compositor);
 
-void meta_wayland_pointer_constraint_destroy (MetaWaylandPointerConstraint *constraint);
-
 MetaWaylandSeat * meta_wayland_pointer_constraint_get_seat (MetaWaylandPointerConstraint *constraint);
 
 cairo_region_t * meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerConstraint *constraint);
 
 MetaWaylandSurface * meta_wayland_pointer_constraint_get_surface (MetaWaylandPointerConstraint *constraint);
 
-void meta_wayland_pointer_constraint_maybe_remove_for_seat (MetaWaylandSeat *seat,
-                                                            MetaWindow      *focus_window);
-
-void meta_wayland_pointer_constraint_maybe_enable_for_window (MetaWindow *window);
-
 #endif /* META_WAYLAND_POINTER_CONSTRAINTS_H */

src/wayland/meta-wayland-pointer.c

@@ -80,6 +80,8 @@ struct _MetaWaylandSurfaceRoleCursor
   int hot_x;
   int hot_y;
   MetaCursorSprite *cursor_sprite;
+
+  MetaWaylandBuffer *buffer;
 };
 
 G_DEFINE_TYPE (MetaWaylandSurfaceRoleCursor,
@@ -863,8 +865,7 @@ meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,
   interface = pointer->grab->interface;
   grab->pointer = pointer;
 
-  if (pointer->current)
-    interface->focus (pointer->grab, pointer->current);
+  interface->focus (pointer->grab, pointer->current);
 }
 
 void
@@ -967,28 +968,30 @@ update_cursor_sprite_texture (MetaWaylandSurface *surface)
   MetaWaylandSurfaceRoleCursor *cursor_role =
     META_WAYLAND_SURFACE_ROLE_CURSOR (surface->role);
   MetaCursorSprite *cursor_sprite = cursor_role->cursor_sprite;
-  ClutterBackend *clutter_backend = clutter_get_default_backend ();
-  CoglContext *cogl_context =
-    clutter_backend_get_cogl_context (clutter_backend);
-  CoglTexture *texture;
+  MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface);
 
-  if (surface->buffer)
+  g_return_if_fail (!buffer || buffer->texture);
+
+  if (buffer)
     {
-      struct wl_resource *buffer;
-
-      buffer = surface->buffer->resource;
-      texture = cogl_wayland_texture_2d_new_from_buffer (cogl_context,
-                                                         buffer,
-                                                         NULL);
-
       meta_cursor_sprite_set_texture (cursor_sprite,
-                                      texture,
+                                      buffer->texture,
                                       cursor_role->hot_x * surface->scale,
                                       cursor_role->hot_y * surface->scale);
-      meta_cursor_renderer_realize_cursor_from_wl_buffer (cursor_renderer,
-                                                          cursor_sprite,
-                                                          buffer);
-      cogl_object_unref (texture);
+
+      if (cursor_role->buffer)
+        {
+          struct wl_resource *buffer_resource;
+
+          g_assert (cursor_role->buffer == buffer);
+          buffer_resource = buffer->resource;
+          meta_cursor_renderer_realize_cursor_from_wl_buffer (cursor_renderer,
+                                                              cursor_sprite,
+                                                              buffer_resource);
+
+          meta_wayland_surface_unref_buffer_use_count (surface);
+          g_clear_object (&cursor_role->buffer);
+        }
     }
   else
     {
@@ -1014,8 +1017,9 @@ cursor_sprite_prepare_at (MetaCursorSprite *cursor_sprite,
   if (!meta_xwayland_is_xwayland_surface (surface))
     {
       monitor = meta_screen_get_monitor_for_point (screen, x, y);
-      meta_cursor_sprite_set_texture_scale (cursor_sprite,
-                                            (float)monitor->scale / surface->scale);
+      if (monitor)
+        meta_cursor_sprite_set_texture_scale (cursor_sprite,
+                                              (float)monitor->scale / surface->scale);
     }
   meta_wayland_surface_update_outputs (surface);
 }
@@ -1262,18 +1266,53 @@ meta_wayland_pointer_get_seat (MetaWaylandPointer *pointer)
 static void
 cursor_surface_role_assigned (MetaWaylandSurfaceRole *surface_role)
 {
+  MetaWaylandSurfaceRoleCursor *cursor_role =
+    META_WAYLAND_SURFACE_ROLE_CURSOR (surface_role);
+  MetaWaylandSurface *surface =
+    meta_wayland_surface_role_get_surface (surface_role);
+  MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface);
+
+  if (buffer)
+    {
+      g_set_object (&cursor_role->buffer, buffer);
+      meta_wayland_surface_ref_buffer_use_count (surface);
+    }
+
+  meta_wayland_surface_queue_pending_frame_callbacks (surface);
+}
+
+static void
+cursor_surface_role_pre_commit (MetaWaylandSurfaceRole  *surface_role,
+                                MetaWaylandPendingState *pending)
+{
+  MetaWaylandSurfaceRoleCursor *cursor_role =
+    META_WAYLAND_SURFACE_ROLE_CURSOR (surface_role);
   MetaWaylandSurface *surface =
     meta_wayland_surface_role_get_surface (surface_role);
 
-  meta_wayland_surface_queue_pending_frame_callbacks (surface);
+  if (pending->newly_attached && cursor_role->buffer)
+    {
+      meta_wayland_surface_unref_buffer_use_count (surface);
+      g_clear_object (&cursor_role->buffer);
+    }
 }
 
 static void
 cursor_surface_role_commit (MetaWaylandSurfaceRole  *surface_role,
                             MetaWaylandPendingState *pending)
 {
+  MetaWaylandSurfaceRoleCursor *cursor_role =
+    META_WAYLAND_SURFACE_ROLE_CURSOR (surface_role);
   MetaWaylandSurface *surface =
     meta_wayland_surface_role_get_surface (surface_role);
+  MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface);
+
+  if (pending->newly_attached)
+    {
+      g_set_object (&cursor_role->buffer, buffer);
+      if (cursor_role->buffer)
+        meta_wayland_surface_ref_buffer_use_count (surface);
+    }
 
   meta_wayland_surface_queue_pending_state_frame_callbacks (surface, pending);
 
@@ -1321,11 +1360,6 @@ cursor_surface_role_dispose (GObject *object)
     meta_wayland_surface_role_get_surface (META_WAYLAND_SURFACE_ROLE (object));
   MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
   MetaWaylandPointer *pointer = &compositor->seat->pointer;
-  MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
-
-  g_signal_handlers_disconnect_by_func (cursor_tracker,
-                                        (gpointer) cursor_sprite_prepare_at,
-                                        cursor_role);
 
   if (pointer->cursor_surface == surface)
     pointer->cursor_surface = NULL;
@@ -1333,6 +1367,12 @@ cursor_surface_role_dispose (GObject *object)
 
   g_clear_object (&cursor_role->cursor_sprite);
 
+  if (cursor_role->buffer)
+    {
+      meta_wayland_surface_unref_buffer_use_count (surface);
+      g_clear_object (&cursor_role->buffer);
+    }
+
   G_OBJECT_CLASS (meta_wayland_surface_role_cursor_parent_class)->dispose (object);
 }
 
@@ -1349,6 +1389,7 @@ meta_wayland_surface_role_cursor_class_init (MetaWaylandSurfaceRoleCursorClass *
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   surface_role_class->assigned = cursor_surface_role_assigned;
+  surface_role_class->pre_commit = cursor_surface_role_pre_commit;
   surface_role_class->commit = cursor_surface_role_commit;
   surface_role_class->is_on_output = cursor_surface_role_is_on_output;
 

src/wayland/meta-wayland-surface.c

@@ -48,6 +48,7 @@
 #include "display-private.h"
 #include "window-private.h"
 #include "meta-window-wayland.h"
+#include "bell.h"
 
 #include "compositor/region-utils.h"
 
@@ -139,6 +140,10 @@ G_DEFINE_TYPE (MetaWaylandSurfaceRoleDND,
 static void
 meta_wayland_surface_role_assigned (MetaWaylandSurfaceRole *surface_role);
 
+static void
+meta_wayland_surface_role_pre_commit (MetaWaylandSurfaceRole  *surface_role,
+                                      MetaWaylandPendingState *pending);
+
 static void
 meta_wayland_surface_role_commit (MetaWaylandSurfaceRole  *surface_role,
                                   MetaWaylandPendingState *pending);
@@ -162,6 +167,13 @@ meta_wayland_surface_assign_role (MetaWaylandSurface *surface,
 
       meta_wayland_surface_role_assigned (surface->role);
 
+      /* Release the use count held on behalf of the just assigned role. */
+      if (surface->unassigned.buffer)
+        {
+          meta_wayland_surface_unref_buffer_use_count (surface);
+          g_clear_object (&surface->unassigned.buffer);
+        }
+
       return TRUE;
     }
   else if (G_OBJECT_TYPE (surface->role) != role_type)
@@ -174,56 +186,29 @@ meta_wayland_surface_assign_role (MetaWaylandSurface *surface,
     }
 }
 
-static void
-surface_use_buffer (MetaWaylandSurface *surface)
-{
-  g_return_if_fail (!surface->using_buffer);
-
-  meta_wayland_buffer_ref_use_count (surface->buffer);
-  surface->using_buffer = TRUE;
-}
-
-static void
-surface_stop_using_buffer (MetaWaylandSurface *surface)
-{
-  if (!surface->using_buffer)
-    return;
-
-  meta_wayland_buffer_unref_use_count (surface->buffer);
-  surface->using_buffer = FALSE;
-}
-
-static void
-surface_set_buffer (MetaWaylandSurface *surface,
-                    MetaWaylandBuffer  *buffer)
-{
-  if (surface->buffer == buffer)
-    return;
-
-  if (surface->buffer)
-    surface_stop_using_buffer (surface);
-
-  g_set_object (&surface->buffer, buffer);
-}
-
 static void
 surface_process_damage (MetaWaylandSurface *surface,
                         cairo_region_t *region)
 {
+  MetaWaylandBuffer *buffer = surface->buffer_ref.buffer;
   unsigned int buffer_width;
   unsigned int buffer_height;
   cairo_rectangle_int_t surface_rect;
   cairo_region_t *scaled_region;
   int i, n_rectangles;
 
-  if (!surface->buffer)
+  /* If the client destroyed the buffer it attached before committing, but
+   * still posted damage, or posted damage without any buffer, don't try to
+   * process it on the non-existing buffer.
+   */
+  if (!buffer)
     return;
 
   /* Intersect the damage region with the surface region before scaling in
    * order to avoid integer overflow when scaling a damage region is too large
    * (for example INT32_MAX which mesa passes). */
-  buffer_width = cogl_texture_get_width (surface->buffer->texture);
-  buffer_height = cogl_texture_get_height (surface->buffer->texture);
+  buffer_width = cogl_texture_get_width (buffer->texture);
+  buffer_height = cogl_texture_get_height (buffer->texture);
   surface_rect = (cairo_rectangle_int_t) {
     .width = buffer_width / surface->scale,
     .height = buffer_height / surface->scale,
@@ -235,7 +220,7 @@ surface_process_damage (MetaWaylandSurface *surface,
   scaled_region = meta_region_scale (region, surface->scale);
 
   /* First update the buffer. */
-  meta_wayland_buffer_process_damage (surface->buffer, scaled_region);
+  meta_wayland_buffer_process_damage (buffer, scaled_region);
 
   /* Now damage the actor. The actor expects damage in the unscaled texture
    * coordinate space, i.e. same as the buffer. */
@@ -289,7 +274,7 @@ calculate_surface_window_geometry (MetaWaylandSurface *surface,
   if (!CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (surface_actor)))
     return;
 
-  if (!surface->buffer)
+  if (!surface->buffer_ref.buffer)
     return;
 
   meta_surface_actor_wayland_get_subsurface_rect (surface_actor,
@@ -325,6 +310,36 @@ destroy_window (MetaWaylandSurface *surface)
   g_assert (surface->window == NULL);
 }
 
+MetaWaylandBuffer *
+meta_wayland_surface_get_buffer (MetaWaylandSurface *surface)
+{
+  return surface->buffer_ref.buffer;
+}
+
+void
+meta_wayland_surface_ref_buffer_use_count (MetaWaylandSurface *surface)
+{
+  g_return_if_fail (surface->buffer_ref.buffer);
+  g_warn_if_fail (surface->buffer_ref.buffer->resource);
+
+  surface->buffer_ref.use_count++;
+}
+
+void
+meta_wayland_surface_unref_buffer_use_count (MetaWaylandSurface *surface)
+{
+  MetaWaylandBuffer *buffer = surface->buffer_ref.buffer;
+
+  g_return_if_fail (surface->buffer_ref.use_count != 0);
+
+  surface->buffer_ref.use_count--;
+
+  g_return_if_fail (buffer);
+
+  if (surface->buffer_ref.use_count == 0 && buffer->resource)
+    wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
+}
+
 static void
 queue_surface_actor_frame_callbacks (MetaWaylandSurface      *surface,
                                      MetaWaylandPendingState *pending)
@@ -343,6 +358,7 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,
 {
   MetaWaylandSurface *surface =
     meta_wayland_surface_role_get_surface (surface_role);
+  MetaWaylandBuffer *buffer = surface->buffer_ref.buffer;
   MetaWindow *window = surface->window;
 
   queue_surface_actor_frame_callbacks (surface, pending);
@@ -358,12 +374,12 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,
       /* For wl_shell, it's equivalent to an unmap. Semantics
        * are poorly defined, so we can choose some that are
        * convenient for us. */
-      if (surface->buffer && !window)
+      if (buffer && !window)
         {
           window = meta_window_wayland_new (meta_get_display (), surface);
           meta_wayland_surface_set_window (surface, window);
         }
-      else if (surface->buffer == NULL && window)
+      else if (buffer == NULL && window)
         {
           destroy_window (surface);
           return;
@@ -371,7 +387,7 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,
     }
   else
     {
-      if (surface->buffer == NULL)
+      if (buffer == NULL)
         {
           /* XDG surfaces can't commit NULL buffers */
           wl_resource_post_error (surface->resource,
@@ -389,7 +405,7 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,
     {
       MetaRectangle geom = { 0 };
 
-      CoglTexture *texture = surface->buffer->texture;
+      CoglTexture *texture = buffer->texture;
       /* Update the buffer rect immediately. */
       window->buffer_rect.width = cogl_texture_get_width (texture);
       window->buffer_rect.height = cogl_texture_get_height (texture);
@@ -431,11 +447,11 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,
 }
 
 static void
-surface_handle_pending_buffer_destroy (struct wl_listener *listener, void *data)
+pending_buffer_resource_destroyed (MetaWaylandBuffer       *buffer,
+                                   MetaWaylandPendingState *pending)
 {
-  MetaWaylandPendingState *state = wl_container_of (listener, state, buffer_destroy_listener);
-
-  state->buffer = NULL;
+  g_signal_handler_disconnect (buffer, pending->buffer_destroy_handler_id);
+  pending->buffer = NULL;
 }
 
 static void
@@ -453,7 +469,6 @@ pending_state_init (MetaWaylandPendingState *state)
   state->opaque_region_set = FALSE;
 
   state->damage = cairo_region_create ();
-  state->buffer_destroy_listener.notify = surface_handle_pending_buffer_destroy;
   wl_list_init (&state->frame_callback_list);
 
   state->has_new_geometry = FALSE;
@@ -469,7 +484,8 @@ pending_state_destroy (MetaWaylandPendingState *state)
   g_clear_pointer (&state->opaque_region, cairo_region_destroy);
 
   if (state->buffer)
-    wl_list_remove (&state->buffer_destroy_listener.link);
+    g_signal_handler_disconnect (state->buffer,
+                                 state->buffer_destroy_handler_id);
   wl_list_for_each_safe (cb, next, &state->frame_callback_list, link)
     wl_resource_destroy (cb->resource);
 }
@@ -486,7 +502,7 @@ move_pending_state (MetaWaylandPendingState *from,
                     MetaWaylandPendingState *to)
 {
   if (from->buffer)
-    wl_list_remove (&from->buffer_destroy_listener.link);
+    g_signal_handler_disconnect (from->buffer, from->buffer_destroy_handler_id);
 
   to->newly_attached = from->newly_attached;
   to->buffer = from->buffer;
@@ -505,7 +521,12 @@ move_pending_state (MetaWaylandPendingState *from,
   wl_list_insert_list (&to->frame_callback_list, &from->frame_callback_list);
 
   if (to->buffer)
-    wl_signal_add (&to->buffer->destroy_signal, &to->buffer_destroy_listener);
+    {
+      to->buffer_destroy_handler_id =
+        g_signal_connect (to->buffer, "resource-destroyed",
+                          G_CALLBACK (pending_buffer_resource_destroyed),
+                          to);
+    }
 
   pending_state_init (from);
 }
@@ -553,7 +574,7 @@ subsurface_surface_commit (MetaWaylandSurfaceRole  *surface_role,
 
   queue_surface_actor_frame_callbacks (surface, pending);
 
-  if (surface->buffer != NULL)
+  if (surface->buffer_ref.buffer != NULL)
     clutter_actor_show (CLUTTER_ACTOR (surface_actor));
   else
     clutter_actor_hide (CLUTTER_ACTOR (surface_actor));
@@ -650,28 +671,59 @@ static void
 apply_pending_state (MetaWaylandSurface      *surface,
                      MetaWaylandPendingState *pending)
 {
-  gboolean release_new_buffer = FALSE;
+  MetaSurfaceActorWayland *surface_actor_wayland =
+    META_SURFACE_ACTOR_WAYLAND (surface->surface_actor);
+
+  if (surface->role)
+    {
+      meta_wayland_surface_role_pre_commit (surface->role, pending);
+    }
+  else
+    {
+      if (pending->newly_attached && surface->unassigned.buffer)
+        {
+          meta_wayland_surface_unref_buffer_use_count (surface);
+          g_clear_object (&surface->unassigned.buffer);
+        }
+    }
 
   if (pending->newly_attached)
     {
-      if (!surface->buffer && surface->window)
+      gboolean switched_buffer;
+
+      if (!surface->buffer_ref.buffer && surface->window)
         meta_window_queue (surface->window, META_QUEUE_CALC_SHOWING);
 
-      surface_set_buffer (surface, pending->buffer);
+      /* Always release any previously held buffer. If the buffer held is same
+       * as the newly attached buffer, we still need to release it here, because
+       * wl_surface.attach+commit and wl_buffer.release on the attached buffer
+       * is symmetric.
+       */
+      if (surface->buffer_held)
+        meta_wayland_surface_unref_buffer_use_count (surface);
 
-      if (pending->buffer && !surface->using_buffer)
+      switched_buffer = g_set_object (&surface->buffer_ref.buffer,
+                                      pending->buffer);
+
+      if (pending->buffer)
+        meta_wayland_surface_ref_buffer_use_count (surface);
+
+      if (switched_buffer && pending->buffer)
         {
-          struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (pending->buffer->resource);
+          CoglTexture *texture;
 
-          surface_use_buffer (surface);
-          CoglTexture *texture = meta_wayland_buffer_ensure_texture (pending->buffer);
-          meta_surface_actor_wayland_set_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor), texture);
-
-          /* Release the buffer as soon as possible, so the client can reuse it
-          */
-          if (shm_buffer)
-            release_new_buffer = TRUE;
+          texture = meta_wayland_buffer_ensure_texture (pending->buffer);
+          meta_surface_actor_wayland_set_texture (surface_actor_wayland,
+                                                  texture);
         }
+
+      /* If the newly attached buffer is going to be accessed directly without
+       * making a copy, such as an EGL buffer, mark it as in-use don't release
+       * it until is replaced by a subsequent wl_surface.commit or when the
+       * wl_surface is destroyed.
+       */
+      surface->buffer_held = (pending->buffer &&
+                              !wl_shm_buffer_get (pending->buffer->resource));
     }
 
   if (pending->scale > 0)
@@ -680,9 +732,6 @@ apply_pending_state (MetaWaylandSurface      *surface,
   if (!cairo_region_is_empty (pending->damage))
     surface_process_damage (surface, pending->damage);
 
-  if (release_new_buffer)
-    surface_stop_using_buffer (surface);
-
   surface->offset_x += pending->dx;
   surface->offset_y += pending->dy;
 
@@ -720,14 +769,31 @@ apply_pending_state (MetaWaylandSurface      *surface,
       wl_list_insert_list (&surface->pending_frame_callback_list,
                            &pending->frame_callback_list);
       wl_list_init (&pending->frame_callback_list);
+
+      if (pending->newly_attached)
+        {
+          /* The need to keep the wl_buffer from being released depends on what
+           * role the surface is given. That means we need to also keep a use
+           * count for wl_buffer's that are used by unassigned wl_surface's.
+           */
+          g_set_object (&surface->unassigned.buffer, surface->buffer_ref.buffer);
+          if (surface->unassigned.buffer)
+            meta_wayland_surface_ref_buffer_use_count (surface);
+        }
     }
 
+  /* If we have a buffer that we are not using, decrease the use count so it may
+   * be released if no-one else has a use-reference to it.
+   */
+  if (pending->newly_attached &&
+      !surface->buffer_held && surface->buffer_ref.buffer)
+    meta_wayland_surface_unref_buffer_use_count (surface);
+
   g_signal_emit (pending,
                  pending_state_signals[PENDING_STATE_SIGNAL_APPLIED],
                  0);
 
-  meta_surface_actor_wayland_sync_state (
-    META_SURFACE_ACTOR_WAYLAND (surface->surface_actor));
+  meta_surface_actor_wayland_sync_state (surface_actor_wayland);
 
   pending_state_reset (pending);
 
@@ -778,7 +844,10 @@ wl_surface_attach (struct wl_client *client,
     buffer = NULL;
 
   if (surface->pending->buffer)
-    wl_list_remove (&surface->pending->buffer_destroy_listener.link);
+    {
+      g_signal_handler_disconnect (surface->pending->buffer,
+                                   surface->pending->buffer_destroy_handler_id);
+    }
 
   surface->pending->newly_attached = TRUE;
   surface->pending->buffer = buffer;
@@ -786,8 +855,12 @@ wl_surface_attach (struct wl_client *client,
   surface->pending->dy = dy;
 
   if (buffer)
-    wl_signal_add (&buffer->destroy_signal,
-                   &surface->pending->buffer_destroy_listener);
+    {
+      surface->pending->buffer_destroy_handler_id =
+        g_signal_connect (buffer, "resource-destroyed",
+                          G_CALLBACK (pending_buffer_resource_destroyed),
+                          surface->pending);
+    }
 }
 
 static void
@@ -1109,10 +1182,16 @@ wl_surface_destructor (struct wl_resource *resource)
   if (surface->window)
     destroy_window (surface);
 
-  g_list_free_full (surface->pointer_constraints,
-                    (GDestroyNotify) meta_wayland_pointer_constraint_destroy);
+  if (surface->unassigned.buffer)
+    {
+      meta_wayland_surface_unref_buffer_use_count (surface);
+      g_clear_object (&surface->unassigned.buffer);
+    }
+
+  if (surface->buffer_held)
+    meta_wayland_surface_unref_buffer_use_count (surface);
+  g_clear_object (&surface->buffer_ref.buffer);
 
-  surface_set_buffer (surface, NULL);
   g_clear_object (&surface->pending);
 
   if (surface->opaque_region)
@@ -2019,17 +2098,33 @@ gtk_surface_unset_modal (struct wl_client   *client,
   meta_window_set_type (surface->window, META_WINDOW_NORMAL);
 }
 
-static const struct gtk_surface_interface meta_wayland_gtk_surface_interface = {
+static void
+gtk_surface_present (struct wl_client   *client,
+                     struct wl_resource *resource,
+                     uint32_t            timestamp)
+{
+  MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
+  MetaWindow *window = surface->window;
+
+  if (!window)
+    return;
+
+  meta_window_activate_full (window, timestamp,
+                             META_CLIENT_TYPE_APPLICATION, NULL);
+}
+
+static const struct gtk_surface1_interface meta_wayland_gtk_surface_interface = {
   gtk_surface_set_dbus_properties,
   gtk_surface_set_modal,
   gtk_surface_unset_modal,
+  gtk_surface_present,
 };
 
 static void
-get_gtk_surface (struct wl_client *client,
-                 struct wl_resource *resource,
-                 guint32 id,
-                 struct wl_resource *surface_resource)
+gtk_shell_get_gtk_surface (struct wl_client   *client,
+                           struct wl_resource *resource,
+                           guint32             id,
+                           struct wl_resource *surface_resource)
 {
   MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
 
@@ -2041,14 +2136,17 @@ get_gtk_surface (struct wl_client *client,
       return;
     }
 
-  surface->gtk_surface = wl_resource_create (client, &gtk_surface_interface, wl_resource_get_version (resource), id);
+  surface->gtk_surface = wl_resource_create (client,
+                                             &gtk_surface1_interface,
+                                             wl_resource_get_version (resource),
+                                             id);
   wl_resource_set_implementation (surface->gtk_surface, &meta_wayland_gtk_surface_interface, surface, gtk_surface_destructor);
 }
 
 static void
-set_startup_id (struct wl_client   *client,
-                struct wl_resource *resource,
-                const char         *startup_id)
+gtk_shell_set_startup_id (struct wl_client   *client,
+                          struct wl_resource *resource,
+                          const char         *startup_id)
 {
   MetaDisplay *display;
 
@@ -2057,9 +2155,33 @@ set_startup_id (struct wl_client   *client,
                                              startup_id);
 }
 
-static const struct gtk_shell_interface meta_wayland_gtk_shell_interface = {
-  get_gtk_surface,
-  set_startup_id
+static void
+gtk_shell_system_bell (struct wl_client   *client,
+                       struct wl_resource *resource,
+                       struct wl_resource *gtk_surface_resource)
+{
+  MetaDisplay *display = meta_get_display ();
+
+  if (gtk_surface_resource)
+    {
+      MetaWaylandSurface *surface =
+        wl_resource_get_user_data (gtk_surface_resource);
+
+      if (!surface->window)
+        return;
+
+      meta_bell_notify (display, surface->window);
+    }
+  else
+    {
+      meta_bell_notify (display, NULL);
+    }
+}
+
+static const struct gtk_shell1_interface meta_wayland_gtk_shell_interface = {
+  gtk_shell_get_gtk_surface,
+  gtk_shell_set_startup_id,
+  gtk_shell_system_bell,
 };
 
 static void
@@ -2071,24 +2193,13 @@ bind_gtk_shell (struct wl_client *client,
   struct wl_resource *resource;
   uint32_t capabilities = 0;
 
-  resource = wl_resource_create (client, &gtk_shell_interface, version, id);
-
-  if (version < 2)
-    {
-      wl_resource_post_error (resource,
-                              WL_DISPLAY_ERROR_INVALID_OBJECT,
-                              "Incompatible gtk-shell version "
-                              "(supported version: %d)",
-                              META_GTK_SHELL_VERSION);
-      return;
-    }
-
+  resource = wl_resource_create (client, &gtk_shell1_interface, version, id);
   wl_resource_set_implementation (resource, &meta_wayland_gtk_shell_interface, data, NULL);
 
   if (!meta_prefs_get_show_fallback_app_menu ())
-    capabilities = GTK_SHELL_CAPABILITY_GLOBAL_APP_MENU;
+    capabilities = GTK_SHELL1_CAPABILITY_GLOBAL_APP_MENU;
 
-  gtk_shell_send_capabilities (resource, capabilities);
+  gtk_shell1_send_capabilities (resource, capabilities);
 }
 
 static void
@@ -2351,8 +2462,8 @@ meta_wayland_shell_init (MetaWaylandCompositor *compositor)
     g_error ("Failed to register a global wl-shell object");
 
   if (wl_global_create (compositor->wayland_display,
-                        &gtk_shell_interface,
-                        META_GTK_SHELL_VERSION,
+                        &gtk_shell1_interface,
+                        META_GTK_SHELL1_VERSION,
                         compositor, bind_gtk_shell) == NULL)
     g_error ("Failed to register a global gtk-shell object");
 
@@ -2520,39 +2631,6 @@ meta_wayland_surface_get_toplevel_window (MetaWaylandSurface *surface)
   return NULL;
 }
 
-void
-meta_wayland_surface_add_pointer_constraint (MetaWaylandSurface           *surface,
-                                             MetaWaylandPointerConstraint *constraint)
-{
-  surface->pointer_constraints = g_list_append (surface->pointer_constraints,
-                                                constraint);
-}
-
-void
-meta_wayland_surface_remove_pointer_constraint (MetaWaylandSurface           *surface,
-                                                MetaWaylandPointerConstraint *constraint)
-{
-  surface->pointer_constraints = g_list_remove (surface->pointer_constraints,
-                                                constraint);
-}
-
-MetaWaylandPointerConstraint *
-meta_wayland_surface_get_pointer_constraint_for_seat (MetaWaylandSurface *surface,
-                                                      MetaWaylandSeat    *seat)
-{
-  GList *iter;
-
-  for (iter = surface->pointer_constraints; iter; iter = iter->next)
-    {
-      MetaWaylandPointerConstraint *constraint = iter->data;
-
-      if (seat == meta_wayland_pointer_constraint_get_seat (constraint))
-        return constraint;
-    }
-
-  return NULL;
-}
-
 void
 meta_wayland_surface_get_relative_coordinates (MetaWaylandSurface *surface,
                                                float               abs_x,
@@ -2616,6 +2694,17 @@ meta_wayland_surface_role_assigned (MetaWaylandSurfaceRole *surface_role)
   META_WAYLAND_SURFACE_ROLE_GET_CLASS (surface_role)->assigned (surface_role);
 }
 
+static void
+meta_wayland_surface_role_pre_commit (MetaWaylandSurfaceRole  *surface_role,
+                                      MetaWaylandPendingState *pending)
+{
+  MetaWaylandSurfaceRoleClass *klass;
+
+  klass = META_WAYLAND_SURFACE_ROLE_GET_CLASS (surface_role);
+  if (klass->pre_commit)
+    klass->pre_commit (surface_role, pending);
+}
+
 static void
 meta_wayland_surface_role_commit (MetaWaylandSurfaceRole  *surface_role,
                                   MetaWaylandPendingState *pending)
@@ -2754,3 +2843,26 @@ meta_wayland_surface_role_subsurface_class_init (MetaWaylandSurfaceRoleSubsurfac
   surface_role_class->commit = subsurface_surface_commit;
   surface_role_class->is_on_output = actor_surface_is_on_output;
 }
+
+cairo_region_t *
+meta_wayland_surface_calculate_input_region (MetaWaylandSurface *surface)
+{
+  cairo_region_t *region;
+  cairo_rectangle_int_t buffer_rect;
+  CoglTexture *texture;
+
+  if (!surface->buffer_ref.buffer)
+    return NULL;
+
+  texture = surface->buffer_ref.buffer->texture;
+  buffer_rect = (cairo_rectangle_int_t) {
+    .width = cogl_texture_get_width (texture) / surface->scale,
+    .height = cogl_texture_get_height (texture) / surface->scale,
+  };
+  region = cairo_region_create_rectangle (&buffer_rect);
+
+  if (surface->input_region)
+    cairo_region_intersect (region, surface->input_region);
+
+  return region;
+}

src/wayland/meta-wayland-surface.h

@@ -56,6 +56,8 @@ struct _MetaWaylandSurfaceRoleClass
   GObjectClass parent_class;
 
   void (*assigned) (MetaWaylandSurfaceRole *surface_role);
+  void (*pre_commit) (MetaWaylandSurfaceRole  *surface_role,
+                      MetaWaylandPendingState *pending);
   void (*commit) (MetaWaylandSurfaceRole  *surface_role,
                   MetaWaylandPendingState *pending);
   gboolean (*is_on_output) (MetaWaylandSurfaceRole *surface_role,
@@ -104,7 +106,7 @@ struct _MetaWaylandPendingState
   /* wl_surface.attach */
   gboolean newly_attached;
   MetaWaylandBuffer *buffer;
-  struct wl_listener buffer_destroy_listener;
+  gulong buffer_destroy_handler_id;
   int32_t dx;
   int32_t dy;
 
@@ -151,8 +153,6 @@ struct _MetaWaylandSurface
   MetaSurfaceActor *surface_actor;
   MetaWaylandSurfaceRole *role;
   MetaWindow *window;
-  MetaWaylandBuffer *buffer;
-  gboolean using_buffer;
   cairo_region_t *input_region;
   cairo_region_t *opaque_region;
   int scale;
@@ -160,11 +160,25 @@ struct _MetaWaylandSurface
   GList *subsurfaces;
   GHashTable *outputs_to_destroy_notify_id;
 
+  /* Buffer reference state. */
+  struct {
+    MetaWaylandBuffer *buffer;
+    unsigned int use_count;
+  } buffer_ref;
+
+  /* Buffer renderer state. */
+  gboolean buffer_held;
+
   /* List of pending frame callbacks that needs to stay queued longer than one
    * commit sequence, such as when it has not yet been assigned a role.
    */
   struct wl_list pending_frame_callback_list;
 
+  /* Intermediate state for when no role has been assigned. */
+  struct {
+    MetaWaylandBuffer *buffer;
+  } unassigned;
+
   struct {
     const MetaWaylandDragDestFuncs *funcs;
   } dnd;
@@ -218,8 +232,6 @@ struct _MetaWaylandSurface
     gboolean pending_pos;
     GSList *pending_placement_ops;
   } sub;
-
-  GList *pointer_constraints;
 };
 
 void                meta_wayland_shell_init     (MetaWaylandCompositor *compositor);
@@ -232,6 +244,12 @@ MetaWaylandSurface *meta_wayland_surface_create (MetaWaylandCompositor *composit
 gboolean            meta_wayland_surface_assign_role (MetaWaylandSurface *surface,
                                                       GType               role_type);
 
+MetaWaylandBuffer  *meta_wayland_surface_get_buffer (MetaWaylandSurface *surface);
+
+void                meta_wayland_surface_ref_buffer_use_count (MetaWaylandSurface *surface);
+
+void                meta_wayland_surface_unref_buffer_use_count (MetaWaylandSurface *surface);
+
 void                meta_wayland_surface_set_window (MetaWaylandSurface *surface,
                                                      MetaWindow         *window);
 
@@ -264,15 +282,6 @@ void                meta_wayland_surface_queue_pending_frame_callbacks (MetaWayl
 void                meta_wayland_surface_queue_pending_state_frame_callbacks (MetaWaylandSurface      *surface,
                                                                               MetaWaylandPendingState *pending);
 
-void                meta_wayland_surface_add_pointer_constraint (MetaWaylandSurface           *surface,
-                                                                 MetaWaylandPointerConstraint *constraint);
-
-void                meta_wayland_surface_remove_pointer_constraint (MetaWaylandSurface           *surface,
-                                                                    MetaWaylandPointerConstraint *constraint);
-MetaWaylandPointerConstraint *
-                    meta_wayland_surface_get_pointer_constraint_for_seat (MetaWaylandSurface *surface,
-                                                                          MetaWaylandSeat    *seat);
-
 void                meta_wayland_surface_get_relative_coordinates (MetaWaylandSurface *surface,
                                                                    float               abs_x,
                                                                    float               abs_y,
@@ -287,4 +296,6 @@ void                meta_wayland_surface_get_absolute_coordinates (MetaWaylandSu
 
 MetaWaylandSurface * meta_wayland_surface_role_get_surface (MetaWaylandSurfaceRole *role);
 
+cairo_region_t *    meta_wayland_surface_calculate_input_region (MetaWaylandSurface *surface);
+
 #endif

src/wayland/meta-wayland-versions.h

@@ -42,7 +42,7 @@
 #define META_WL_SEAT_VERSION                5
 #define META_WL_OUTPUT_VERSION              2
 #define META_XSERVER_VERSION                1
-#define META_GTK_SHELL_VERSION              3
+#define META_GTK_SHELL1_VERSION             1
 #define META_WL_SUBCOMPOSITOR_VERSION       1
 #define META_ZWP_POINTER_GESTURES_V1_VERSION    1
 

src/wayland/meta-window-wayland.c

@@ -363,7 +363,9 @@ meta_window_wayland_main_monitor_changed (MetaWindow *window,
   /* Window size. */
   scale_rect_size (&window->rect, scale_factor);
   scale_rect_size (&window->unconstrained_rect, scale_factor);
-  scale_rect_size (&window->saved_rect, scale_factor);
+  scale_rect_size (&window->size_states.normal.rect, scale_factor);
+  scale_rect_size (&window->size_states.tiled.rect, scale_factor);
+  scale_rect_size (&window->size_states.maximized.rect, scale_factor);
 
   /* Window geometry offset (XXX: Need a better place, see
    * meta_window_wayland_move_resize). */
@@ -403,11 +405,6 @@ appears_focused_changed (GObject    *object,
                          gpointer    user_data)
 {
   MetaWindow *window = META_WINDOW (object);
-  MetaWaylandCompositor *wayland_compositor;
-
-  wayland_compositor = meta_wayland_compositor_get_default ();
-  meta_wayland_pointer_constraint_maybe_remove_for_seat (wayland_compositor->seat,
-                                                         window);
 
   /* When we're unmanaging, we remove focus from the window,
    * causing this to fire. Don't do anything in that case. */
@@ -415,8 +412,6 @@ appears_focused_changed (GObject    *object,
     return;
 
   surface_state_changed (window);
-
-  meta_wayland_pointer_constraint_maybe_enable_for_window (window);
 }
 
 static void

src/wayland/meta-xwayland-selection.c

@@ -672,11 +672,17 @@ wayland_data_read_cb (GObject      *object,
                                            res, &error);
   if (error)
     {
+      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        {
+          g_error_free (error);
+          return;
+        }
+
       g_warning ("Error transfering wayland clipboard to X11: %s\n",
                  error->message);
       g_error_free (error);
 
-      if (data)
+      if (data && data->stream == G_INPUT_STREAM (object))
         {
           reply_selection_request (&data->request_event, FALSE);
           g_clear_pointer (&selection->wayland_selection,

src/wayland/protocol/gtk-shell.xml

@@ -1,12 +1,9 @@
 <protocol name="gtk">
 
-  <interface name="gtk_shell" version="3">
+  <interface name="gtk_shell1" version="1">
     <description summary="gtk specific extensions">
       gtk_shell is a protocol extension providing additional features for
-      clients implementing it. It is not backward compatible, and a client must
-      always only bind to the specific version it implements. If a client binds
-      to a version different from the version the server provides, an error will
-      be raised.
+      clients implementing it.
     </description>
 
     <enum name="capability">
@@ -20,16 +17,20 @@
     </event>
 
     <request name="get_gtk_surface">
-      <arg name="gtk_surface" type="new_id" interface="gtk_surface"/>
+      <arg name="gtk_surface" type="new_id" interface="gtk_surface1"/>
       <arg name="surface" type="object" interface="wl_surface"/>
     </request>
 
-    <request name="set_startup_id" since="3">
+    <request name="set_startup_id">
       <arg name="startup_id" type="string" allow-null="true"/>
     </request>
+
+    <request name="system_bell">
+      <arg name="surface" type="object" interface="gtk_surface1" allow-null="true"/>
+    </request>
   </interface>
 
-  <interface name="gtk_surface" version="3">
+  <interface name="gtk_surface1" version="1">
     <request name="set_dbus_properties">
       <arg name="application_id" type="string" allow-null="true"/>
       <arg name="app_menu_path" type="string" allow-null="true"/>
@@ -41,6 +42,10 @@
 
     <request name="set_modal"/>
     <request name="unset_modal"/>
+
+    <request name="present">
+      <arg name="time" type="uint"/>
+    </request>
   </interface>
 
 </protocol>

src/x11/events.c

@@ -1162,6 +1162,30 @@ process_selection_clear (MetaDisplay   *display,
   return TRUE;
 }
 
+static void
+notify_bell (MetaDisplay *display,
+             XkbAnyEvent *xkb_ev)
+{
+  XkbBellNotifyEvent *xkb_bell_event = (XkbBellNotifyEvent*) xkb_ev;
+  MetaWindow *window;
+
+  window = meta_display_lookup_x_window (display, xkb_bell_event->window);
+  if (!window && display->focus_window && display->focus_window->frame)
+    window = display->focus_window;
+
+  display->last_bell_time = xkb_ev->time;
+  if (!meta_bell_notify (display, window) &&
+      meta_prefs_bell_is_audible ())
+    {
+      /* Force a classic bell if the libcanberra bell failed. */
+      XkbForceDeviceBell (display->xdisplay,
+                          xkb_bell_event->device,
+                          xkb_bell_event->bell_class,
+                          xkb_bell_event->bell_id,
+                          xkb_bell_event->percent);
+    }
+}
+
 static gboolean
 handle_other_xevent (MetaDisplay *display,
                      XEvent      *event)
@@ -1618,8 +1642,7 @@ handle_other_xevent (MetaDisplay *display,
               if (XSERVER_TIME_IS_BEFORE(display->last_bell_time,
                                          xkb_ev->time - 100))
                 {
-                  display->last_bell_time = xkb_ev->time;
-                  meta_bell_notify (display, xkb_ev);
+                  notify_bell (display, xkb_ev);
                 }
               break;
             default:

src/x11/session.c

@@ -965,10 +965,10 @@ save_state (void)
             {
               fprintf (outfile,
                        "    <maximized saved_x=\"%d\" saved_y=\"%d\" saved_width=\"%d\" saved_height=\"%d\"/>\n",
-                       window->saved_rect.x,
-                       window->saved_rect.y,
-                       window->saved_rect.width,
-                       window->saved_rect.height);
+                       window->size_states.normal.rect.x,
+                       window->size_states.normal.rect.y,
+                       window->size_states.normal.rect.width,
+                       window->size_states.normal.rect.height);
             }
 
           /* Gravity */

src/x11/window-x11.c

@@ -413,10 +413,10 @@ meta_window_apply_session_info (MetaWindow *window,
                           info->saved_rect.height,
                           window->desc);
 
-              window->saved_rect.x = info->saved_rect.x;
-              window->saved_rect.y = info->saved_rect.y;
-              window->saved_rect.width = info->saved_rect.width;
-              window->saved_rect.height = info->saved_rect.height;
+              window->size_states.normal.rect.x = info->saved_rect.x;
+              window->size_states.normal.rect.y = info->saved_rect.y;
+              window->size_states.normal.rect.width = info->saved_rect.width;
+              window->size_states.normal.rect.height = info->saved_rect.height;
             }
 	}
     }