Bump version to 3.15.3

Update NEWS.
wayland: Use g_source_add_unix_fd instead of g_source_add_poll
2014-12-19 12:05:52 +01:00 · 2014-12-15 14:44:00 -08:00 · 2014-12-15 14:15:46 -08:00 · 2014-12-15 13:52:40 -08:00 · 2014-12-15 13:30:39 -08:00 · 2014-12-11 13:42:44 +01:00
25 changed files with 2360 additions and 4558 deletions
--- a/25
+++ b/25
@@ -1,3 +1,28 @@
+3.15.3
+======
+* Don't leave left-over frames queued [Owen; #738686]
+* Set CRTC configuration even if it might be redundant [Rui; #740838]
+
+Contributors:
+  Rui Matos, Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
+
+Translations:
+  Trần Ngọc Quân [vi], Muhammet Kara [tr]
+
+3.15.2
+======
+* Don't enable hiDPI on monitors with broken EDID [Bastien; #734839]
+* Prevent crash applying monitor config for a closed lid [Rui; #739450]
+* Fix "flicker" during startup transition [Ray; #740377]
+* Misc. bug fixes [Lan, Florian, Carlos; #731521, #740133, #738890]
+
+Contributors:
+  Emmanuele Bassi, Carlos Garnacho, Jonathon Jongsma, Ting-Wei Lan, Rui Matos,
+  Florian Müllner, Bastien Nocera, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Kjartan Maraas [nb]
+
 3.15.1
 ======
 * Use GResources for theme loading [Cosimo; #736936]
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [15])
-m4_define([mutter_micro_version], [1])
+m4_define([mutter_micro_version], [3])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -206,7 +206,7 @@ if test $have_native_backend = yes; then
 fi
 AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes])

-PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.5.90], [have_wayland=yes], [have_wayland=no])
+PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.6.90], [have_wayland=yes], [have_wayland=no])
 if test $have_wayland = yes; then
   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
   AS_IF([test $WAYLAND_SCANNER = "no"],
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -111,6 +111,15 @@ IGNORE_HFILES= \
 	xprops.h \
 	$(NULL)

+if !HAVE_NATIVE_BACKEND
+IGNORE_HFILES+= \
+	meta-backend-native.h \
+	meta-cursor-renderer-native.h \
+	meta-idle-monitor-native.h \
+	meta-monitor-manager-kms.h \
+	$(NULL)
+endif
+
 if !HAVE_WAYLAND
 IGNORE_HFILES += \
 	meta-surface-actor-wayland.h	\
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mutter 3.13.x\n"
+"Project-Id-Version: mutter 3.15.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-06 14:13+0200\n"
-"PO-Revision-Date: 2014-08-23 13:37+0200\n"
+"POT-Creation-Date: 2014-11-15 18:32+0100\n"
+"PO-Revision-Date: 2014-11-15 18:34+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@@ -351,7 +351,7 @@ 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 ""
+msgstr "Hvis denne settes til «true» og fokusmodus er enten «sloppy» eller «mouse» så vil fokus ikke endres med en gang markøren kommer inn i et vindu, men i stedet når markørens bevegelse stopper."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
@@ -385,7 +385,7 @@ msgstr "Plasser nye vinduer i senter"
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
-msgstr ""
+msgstr "Når denne er «true» vil mye vinduer alltid plasseres midt på aktivt område på skjermen."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
@@ -423,29 +423,29 @@ msgstr "Bytt til VT 6"
 msgid "Switch to VT 7"
 msgstr "Bytt til VT 7"

-#: ../src/backends/meta-monitor-manager.c:412
+#: ../src/backends/meta-monitor-manager.c:350
 msgid "Built-in display"
 msgstr "Innebygget skjerm"

-#: ../src/backends/meta-monitor-manager.c:437
+#: ../src/backends/meta-monitor-manager.c:375
 msgid "Unknown"
 msgstr "Ukjent"

-#: ../src/backends/meta-monitor-manager.c:439
+#: ../src/backends/meta-monitor-manager.c:377
 msgid "Unknown Display"
 msgstr "Ukjent skjerm"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:447
+#: ../src/backends/meta-monitor-manager.c:385
 #, 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:443
+#: ../src/compositor/compositor.c:456
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -481,7 +481,7 @@ msgstr "_Vent"
 msgid "_Force Quit"
 msgstr "_Tvungen nedstenging"

-#: ../src/core/display.c:547
+#: ../src/core/display.c:550
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under åpning av X Window System skjerm «%s»\n"
@@ -518,12 +518,12 @@ msgstr "Kjør som en wayland-kompositør"
 msgid "Run as a full display server, rather than nested"
 msgstr "Kjør som en full skjermtjener, heller enn nøstet"

-#: ../src/core/main.c:459
+#: ../src/core/main.c:451
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Feil under søk i temakatalog: %s\n"

-#: ../src/core/main.c:475
+#: ../src/core/main.c:467
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -553,17 +553,17 @@ msgstr "Skriv versjonsnummer"
 msgid "Mutter plugin to use"
 msgstr "Mutter-tillegg som skal brukes"

-#: ../src/core/prefs.c:2101
+#: ../src/core/prefs.c:2064
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"

-#: ../src/core/screen.c:548
+#: ../src/core/screen.c:543
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"

-#: ../src/core/screen.c:564
+#: ../src/core/screen.c:559
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -572,7 +572,7 @@ msgstr ""
 "Skjerm %d på display «%s» har allerede en vindushåndterer; prøv å bruke "
 "flagget --replace for å erstatte aktiv vindushåndterer.\n"

-#: ../src/core/screen.c:657
+#: ../src/core/screen.c:652
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skjerm %d på display «%s» har allerede en vinduhåndterer\n"
@@ -589,48 +589,48 @@ msgstr "Mutter er kompilert uten støtte for «verbose» modus\n"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:233
+#: ../src/ui/theme.c:154
 msgid "top"
 msgstr "topp"

-#: ../src/ui/theme.c:235
+#: ../src/ui/theme.c:156
 msgid "bottom"
 msgstr "bunn"

-#: ../src/ui/theme.c:237
+#: ../src/ui/theme.c:158
 msgid "left"
 msgstr "venstre"

-#: ../src/ui/theme.c:239
+#: ../src/ui/theme.c:160
 msgid "right"
 msgstr "høyre"

-#: ../src/ui/theme.c:267
+#: ../src/ui/theme.c:188
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "rammegeometrien spesifiserer ikke «%s»-dimensjon"

-#: ../src/ui/theme.c:286
+#: ../src/ui/theme.c:207
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "rammegeometri spesifiserer ikke dimensjon «%s» for kant «%s»"

-#: ../src/ui/theme.c:323
+#: ../src/ui/theme.c:244
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Aspektrate %g for knapp er ikke fornuftig"

-#: ../src/ui/theme.c:335
+#: ../src/ui/theme.c:256
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rammegeometrien spesifiserer ikke størrelse på knapper"

-#: ../src/ui/theme.c:1061
+#: ../src/ui/theme.c:1024
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradienter må ha minst to farger"

-#: ../src/ui/theme.c:1211
+#: ../src/ui/theme.c:1174
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -639,7 +639,7 @@ msgstr ""
 "Egendefinert GTK-fargespesifikasjon må ha fargenavn og reserve i parantes, f."
 "eks gtk:custom(foo,bar); kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1227
+#: ../src/ui/theme.c:1190
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -648,7 +648,7 @@ msgstr ""
 "Ugyldig tegn «%c» i parameter color_name for gtk:custom, kun A-Za-z0-9-_ er "
 "gyldig"

-#: ../src/ui/theme.c:1241
+#: ../src/ui/theme.c:1204
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -657,7 +657,7 @@ msgstr ""
 "Gtk:custom-format er «gtk:custom(color_name,fallback)», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1286
+#: ../src/ui/theme.c:1249
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -666,7 +666,7 @@ msgstr ""
 "GTK-fargespesifikasjon må ha tilstand i klammer, f.eks. gtk:fg[NORMAL], hvor "
 "NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1300
+#: ../src/ui/theme.c:1263
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -675,17 +675,17 @@ msgstr ""
 "GTK-fargespesifikasjon må ha en avsluttende klamme etter tilstanden, f.eks. "
 "gtk:fg[NORMAL], hvor NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1311
+#: ../src/ui/theme.c:1274
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Forsto ikke tilstand «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1324
+#: ../src/ui/theme.c:1287
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Forsto ikke fargekomponent «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1352
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -694,56 +694,56 @@ msgstr ""
 "Blandingsformat er «blend/bg_color/fg_color/alpha», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1363
+#: ../src/ui/theme.c:1326
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Kunne ikke lese alpha-verdi «%s» i blandet farge"

-#: ../src/ui/theme.c:1373
+#: ../src/ui/theme.c:1336
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha-verdi «%s» i blandet farge er ikke mellom 0.0 og 1.0"

-#: ../src/ui/theme.c:1419
+#: ../src/ui/theme.c:1382
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "Skyggeformatet er «shade/base_color/factor», «%s» passer ikke i formatet"

-#: ../src/ui/theme.c:1430
+#: ../src/ui/theme.c:1393
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Kunne ikke lese skyggefaktor «%s» i skyggelagt farge"

-#: ../src/ui/theme.c:1440
+#: ../src/ui/theme.c:1403
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Skyggefaktor «%s» i skyggelagt farge er negativ"

-#: ../src/ui/theme.c:1469
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Kunne ikke lese farge «%s»"

-#: ../src/ui/theme.c:1778
+#: ../src/ui/theme.c:1741
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatuttrykk inneholder tegn «%s» som ikke er tillatt"

-#: ../src/ui/theme.c:1805
+#: ../src/ui/theme.c:1768
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "Koordinatuttrykk inneholder flyttall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1819
+#: ../src/ui/theme.c:1782
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Koordinatuttrykk inneholder heltall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1940
+#: ../src/ui/theme.c:1903
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -752,39 +752,39 @@ msgstr ""
 "Koordinatuttrykket inneholdt en ukjent operator ved begynnelsen av denne "
 "teksten: «%s»"

-#: ../src/ui/theme.c:1997
+#: ../src/ui/theme.c:1960
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatuttrykket var tomt eller ble ikke forstått"

-#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
+#: ../src/ui/theme.c:2073 ../src/ui/theme.c:2083 ../src/ui/theme.c:2117
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatuttrykket resulterer i divisjon med null"

-#: ../src/ui/theme.c:2162
+#: ../src/ui/theme.c:2125
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Koordinatuttrykket prøver å bruke mod-operator på et flyttall"

-#: ../src/ui/theme.c:2218
+#: ../src/ui/theme.c:2181
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatuttrykket har en operator «%s» hvor en operand var ventet"

-#: ../src/ui/theme.c:2227
+#: ../src/ui/theme.c:2190
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatuttrykket hadde en operand hvor en operator var ventet"

-#: ../src/ui/theme.c:2235
+#: ../src/ui/theme.c:2198
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatuttrykket sluttet med en operator i stedet for en operand"

-#: ../src/ui/theme.c:2245
+#: ../src/ui/theme.c:2208
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -793,38 +793,38 @@ msgstr ""
 "Koordinatuttrykket har en operator «%c» etter en operator «%c» og ingen "
 "operand mellom dem."

-#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
+#: ../src/ui/theme.c:2359 ../src/ui/theme.c:2404
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatuttrykket haddeen ukjent variabel eller konstant «%s»"

-#: ../src/ui/theme.c:2495
+#: ../src/ui/theme.c:2458
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Tolkeren for koordinatuttrykk oversteg buffergrensen."

-#: ../src/ui/theme.c:2524
+#: ../src/ui/theme.c:2487
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatuttrykket hadde en parantes slutt uten parantes start"

-#: ../src/ui/theme.c:2588
+#: ../src/ui/theme.c:2551
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Koordinatuttrykket hadde en åpen parantes uten en avsluttende parantes"

-#: ../src/ui/theme.c:2599
+#: ../src/ui/theme.c:2562
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Koordinatuttrykket ser ikke ut til å ha noen operatorer eller operander"

-#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
+#: ../src/ui/theme.c:2775 ../src/ui/theme.c:2795 ../src/ui/theme.c:2815
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Tema inneholdt et uttrykk som resulterte i en feil: %s\n"

-#: ../src/ui/theme.c:4455
+#: ../src/ui/theme.c:4055
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -833,25 +833,25 @@ msgstr ""
 "<button function=«%s» state=«%s» draw_ops=«ett-eller-annet»/> må "
 "spesifiseres for denne rammestilen"

-#: ../src/ui/theme.c:4970 ../src/ui/theme.c:4995
+#: ../src/ui/theme.c:4570 ../src/ui/theme.c:4595
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Mangler <frame state=«%s» resize=«%s» focus=«%s» stil=«ett-eller-annet»/>"

-#: ../src/ui/theme.c:5041
+#: ../src/ui/theme.c:4641
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Klarte ikke å laste tema «%s»: %s\n"

-#: ../src/ui/theme.c:5177 ../src/ui/theme.c:5184 ../src/ui/theme.c:5191
-#: ../src/ui/theme.c:5198 ../src/ui/theme.c:5205
+#: ../src/ui/theme.c:4777 ../src/ui/theme.c:4784 ../src/ui/theme.c:4791
+#: ../src/ui/theme.c:4798 ../src/ui/theme.c:4805
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "<%s> er ikke satt for tema «%s»"

-#: ../src/ui/theme.c:5213
+#: ../src/ui/theme.c:4813
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -860,14 +860,14 @@ msgstr ""
 "Ingen rammestil satt for vindutype «%s» i tema «%s», legg til et <window "
 "type=«%s» style_set=«ett-eller-annet»/>-element"

-#: ../src/ui/theme.c:5620 ../src/ui/theme.c:5682 ../src/ui/theme.c:5745
+#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5282 ../src/ui/theme.c:5345
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Brukerdefinerte konstanter må begynne med stor bokstav; «%s» gjør ikke det"

-#: ../src/ui/theme.c:5628 ../src/ui/theme.c:5690 ../src/ui/theme.c:5753
+#: ../src/ui/theme.c:5228 ../src/ui/theme.c:5290 ../src/ui/theme.c:5353
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstant «%s» er allerede definert"
@@ -930,13 +930,13 @@ msgstr "Bolske verdier må være «sann» eller «usann» ikke «%s»"
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "Vinkelen må være mellom 0.0 og 360.0, var %g\n"

-#: ../src/ui/theme-parser.c:800
+#: ../src/ui/theme-parser.c:797
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "Alpha må være mellom 0.0 (usynlig) og 1.0 (helt ugjennomsiktig), var %g\n"

-#: ../src/ui/theme-parser.c:865
+#: ../src/ui/theme-parser.c:862
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -945,58 +945,58 @@ msgstr ""
 "Ugyldig skalering av tittel «%s» (må være en av xx-small,x-small,small,"
 "medium,large,x-large,xx-large)\n"

-#: ../src/ui/theme-parser.c:1021 ../src/ui/theme-parser.c:1084
-#: ../src/ui/theme-parser.c:1118 ../src/ui/theme-parser.c:1221
+#: ../src/ui/theme-parser.c:1018 ../src/ui/theme-parser.c:1081
+#: ../src/ui/theme-parser.c:1115 ../src/ui/theme-parser.c:1218
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> navn «%s» brukt på nytt"

-#: ../src/ui/theme-parser.c:1033 ../src/ui/theme-parser.c:1130
-#: ../src/ui/theme-parser.c:1233
+#: ../src/ui/theme-parser.c:1030 ../src/ui/theme-parser.c:1127
+#: ../src/ui/theme-parser.c:1230
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s> opphav «%s» er ikke definert"

-#: ../src/ui/theme-parser.c:1143
+#: ../src/ui/theme-parser.c:1140
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s> geometri «%s» er ikke definert"

-#: ../src/ui/theme-parser.c:1156
+#: ../src/ui/theme-parser.c:1153
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> må spesifisere enten en geometri eller et opphav som har geometri"

-#: ../src/ui/theme-parser.c:1198
+#: ../src/ui/theme-parser.c:1195
 msgid "You must specify a background for an alpha value to be meaningful"
 msgstr "Du må oppgi en bakgrunn for at en alpha-verdi skal ha mening"

-#: ../src/ui/theme-parser.c:1266
+#: ../src/ui/theme-parser.c:1263
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Ukjent type «%s» på <%s>-element"

-#: ../src/ui/theme-parser.c:1277
+#: ../src/ui/theme-parser.c:1274
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Ukjent style_set «%s» på <%s>-element"

-#: ../src/ui/theme-parser.c:1285
+#: ../src/ui/theme-parser.c:1282
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Vindutype «%s» er allerede tildelt et stilsett"

-#: ../src/ui/theme-parser.c:1315 ../src/ui/theme-parser.c:1379
-#: ../src/ui/theme-parser.c:1605 ../src/ui/theme-parser.c:2840
-#: ../src/ui/theme-parser.c:2886 ../src/ui/theme-parser.c:3036
-#: ../src/ui/theme-parser.c:3272 ../src/ui/theme-parser.c:3310
-#: ../src/ui/theme-parser.c:3348 ../src/ui/theme-parser.c:3386
+#: ../src/ui/theme-parser.c:1312 ../src/ui/theme-parser.c:1376
+#: ../src/ui/theme-parser.c:1602 ../src/ui/theme-parser.c:2821
+#: ../src/ui/theme-parser.c:2867 ../src/ui/theme-parser.c:3017
+#: ../src/ui/theme-parser.c:3253 ../src/ui/theme-parser.c:3291
+#: ../src/ui/theme-parser.c:3329 ../src/ui/theme-parser.c:3367
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> er ikke tillatt under <%s>"

-#: ../src/ui/theme-parser.c:1429 ../src/ui/theme-parser.c:1443
-#: ../src/ui/theme-parser.c:1488
+#: ../src/ui/theme-parser.c:1426 ../src/ui/theme-parser.c:1440
+#: ../src/ui/theme-parser.c:1485
 msgid ""
 "Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" "
 "for buttons"
@@ -1004,123 +1004,123 @@ msgstr ""
 "Kan ikke spesifisere både «button_width»/«button_height» og «aspect_ratio» "
 "for knapper"

-#: ../src/ui/theme-parser.c:1452
+#: ../src/ui/theme-parser.c:1449
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Avstand «%s» er ukjent"

-#: ../src/ui/theme-parser.c:1497
+#: ../src/ui/theme-parser.c:1494
 #, c-format
 msgid "Aspect ratio \"%s\" is unknown"
 msgstr "Aspektrate «%s» er ukjent"

-#: ../src/ui/theme-parser.c:1559
+#: ../src/ui/theme-parser.c:1556
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Grense «%s» er ukjent"

-#: ../src/ui/theme-parser.c:1870
+#: ../src/ui/theme-parser.c:1867
 #, c-format
 msgid "No \"start_angle\" or \"from\" attribute on element <%s>"
 msgstr "Ingen «start_angle» eller «from»-attributt på element <%s>"

-#: ../src/ui/theme-parser.c:1877
+#: ../src/ui/theme-parser.c:1874
 #, c-format
 msgid "No \"extent_angle\" or \"to\" attribute on element <%s>"
 msgstr "Ingen «extent_angle» eller «to»-attributt <%s>-element"

-#: ../src/ui/theme-parser.c:2117
+#: ../src/ui/theme-parser.c:2114
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Forsto ikke verdi «%s» for gradienttype"

-#: ../src/ui/theme-parser.c:2195 ../src/ui/theme-parser.c:2570
+#: ../src/ui/theme-parser.c:2189 ../src/ui/theme-parser.c:2551
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Forsto ikke fyll-type «%s» for <%s>-element"

-#: ../src/ui/theme-parser.c:2362 ../src/ui/theme-parser.c:2445
-#: ../src/ui/theme-parser.c:2508
+#: ../src/ui/theme-parser.c:2343 ../src/ui/theme-parser.c:2426
+#: ../src/ui/theme-parser.c:2489
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Forsto ikke tilstand «%s» for element <%s>"

-#: ../src/ui/theme-parser.c:2372 ../src/ui/theme-parser.c:2455
+#: ../src/ui/theme-parser.c:2353 ../src/ui/theme-parser.c:2436
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Forsto ikke skygge «%s» for element <%s>"

-#: ../src/ui/theme-parser.c:2382
+#: ../src/ui/theme-parser.c:2363
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Forsto ikke pil «%s» for element <%s>"

-#: ../src/ui/theme-parser.c:2696 ../src/ui/theme-parser.c:2792
+#: ../src/ui/theme-parser.c:2677 ../src/ui/theme-parser.c:2773
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "Ingen <draw_ops> kalt «%s» er definert"

-#: ../src/ui/theme-parser.c:2708 ../src/ui/theme-parser.c:2804
+#: ../src/ui/theme-parser.c:2689 ../src/ui/theme-parser.c:2785
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "Hvis du tar med draw_ops «%s» her vil dette lage en sirkulær referanse"

-#: ../src/ui/theme-parser.c:2919
+#: ../src/ui/theme-parser.c:2900
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Ukjent posisjon «%s» for rammesdel"

-#: ../src/ui/theme-parser.c:2927
+#: ../src/ui/theme-parser.c:2908
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Rammestil har allerede en del i posisjon %s"

-#: ../src/ui/theme-parser.c:2944 ../src/ui/theme-parser.c:3021
+#: ../src/ui/theme-parser.c:2925 ../src/ui/theme-parser.c:3002
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "Ingen <draw_ops> med navn «%s» er definert"

-#: ../src/ui/theme-parser.c:2974
+#: ../src/ui/theme-parser.c:2955
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Ukjent funksjon «%s» for knapp"

-#: ../src/ui/theme-parser.c:2984
+#: ../src/ui/theme-parser.c:2965
 #, c-format
 msgid "Button function \"%s\" does not exist in this version (%d, need %d)"
 msgstr "Knappefunksjon «%s» eksisterer ikke i denne versjonen (%d, trenger %d)"

-#: ../src/ui/theme-parser.c:2996
+#: ../src/ui/theme-parser.c:2977
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Ukjent tilstand «%s» for knapp"

-#: ../src/ui/theme-parser.c:3004
+#: ../src/ui/theme-parser.c:2985
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "Rammestil har allerede en knapp for funksjon %s tilstand %s"

-#: ../src/ui/theme-parser.c:3075
+#: ../src/ui/theme-parser.c:3056
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "«%s» er ikke en gyldig verdi for fokusattributt"

-#: ../src/ui/theme-parser.c:3084
+#: ../src/ui/theme-parser.c:3065
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "«%s» er ikke en gyldig verdi for tilstandsattributt"

-#: ../src/ui/theme-parser.c:3094
+#: ../src/ui/theme-parser.c:3075
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "En stil med navn «%s» er ikke definert"

-#: ../src/ui/theme-parser.c:3115 ../src/ui/theme-parser.c:3138
+#: ../src/ui/theme-parser.c:3096 ../src/ui/theme-parser.c:3119
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "«%s» er ikke en gyldig verdi for attributt for endring av størrelse"

-#: ../src/ui/theme-parser.c:3149
+#: ../src/ui/theme-parser.c:3130
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -1129,27 +1129,27 @@ msgstr ""
 "Skal ikke være noen «resize»-attributt på <%s>-element for maksimert/"
 "skyggelagt tilstand"

-#: ../src/ui/theme-parser.c:3163
+#: ../src/ui/theme-parser.c:3144
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized states"
 msgstr ""
 "Skal ikke være noen «resize»-attributt på <%s>-element for maksimert tilstand"

-#: ../src/ui/theme-parser.c:3177 ../src/ui/theme-parser.c:3221
+#: ../src/ui/theme-parser.c:3158 ../src/ui/theme-parser.c:3202
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 "Stil er allerede spesifisert for tilstand %s størrelsesendring %s fokus %s"

-#: ../src/ui/theme-parser.c:3188 ../src/ui/theme-parser.c:3199
-#: ../src/ui/theme-parser.c:3210 ../src/ui/theme-parser.c:3232
-#: ../src/ui/theme-parser.c:3243 ../src/ui/theme-parser.c:3254
+#: ../src/ui/theme-parser.c:3169 ../src/ui/theme-parser.c:3180
+#: ../src/ui/theme-parser.c:3191 ../src/ui/theme-parser.c:3213
+#: ../src/ui/theme-parser.c:3224 ../src/ui/theme-parser.c:3235
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Stil er allerede spesifisert for tilstand %s fokus %s"

-#: ../src/ui/theme-parser.c:3293
+#: ../src/ui/theme-parser.c:3274
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1158,7 +1158,7 @@ msgstr ""
 "draw_ops-attributt i tillegg til et <draw_ops>-element, eller så "
 "spesifiserte det to elementer)"

-#: ../src/ui/theme-parser.c:3331
+#: ../src/ui/theme-parser.c:3312
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1167,7 +1167,7 @@ msgstr ""
 "draw_ops-attributt i tillegg til et <draw_ops>-element, eller det "
 "spesifiserte to elementer)"

-#: ../src/ui/theme-parser.c:3369
+#: ../src/ui/theme-parser.c:3350
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -1176,12 +1176,12 @@ msgstr ""
 "draw_ops-attributt i tillegg til et <draw_ops>-element, eller det "
 "spesifiserte to elementer)"

-#: ../src/ui/theme-parser.c:3433
+#: ../src/ui/theme-parser.c:3414
 #, c-format
 msgid "Bad version specification '%s'"
 msgstr "Ugyldig versjonspesifikasjon «%s»"

-#: ../src/ui/theme-parser.c:3506
+#: ../src/ui/theme-parser.c:3487
 msgid ""
 "\"version\" attribute cannot be used in metacity-theme-1.xml or metacity-"
 "theme-2.xml"
@@ -1189,66 +1189,66 @@ msgstr ""
 "«version»-attributt kan ikke brukes i metacity-theme-1.xml eller metacity-"
 "theme-2.xml"

-#: ../src/ui/theme-parser.c:3529
+#: ../src/ui/theme-parser.c:3510
 #, c-format
 msgid "Theme requires version %s but latest supported theme version is %d.%d"
 msgstr "Tema krever versjon %s men siste støttede temaversjon er %d.%d"

-#: ../src/ui/theme-parser.c:3561
+#: ../src/ui/theme-parser.c:3542
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Ytterste element i temaet må være <metacity_theme> ikke <%s>"

-#: ../src/ui/theme-parser.c:3581
+#: ../src/ui/theme-parser.c:3562
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 "Element <%s> er ikke tillatt inne i et name/author/date/description element"

-#: ../src/ui/theme-parser.c:3586
+#: ../src/ui/theme-parser.c:3567
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Element <%s> er ikke tillatt inne i et <constand> element"

-#: ../src/ui/theme-parser.c:3598
+#: ../src/ui/theme-parser.c:3579
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "Element <%s> er ikke tillatt inne i et avstand/kant/aspektrate-element"

-#: ../src/ui/theme-parser.c:3620
+#: ../src/ui/theme-parser.c:3601
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "Element <%s> er ikke tillatt inne i et element for tegneoperasjon"

-#: ../src/ui/theme-parser.c:3630 ../src/ui/theme-parser.c:3660
-#: ../src/ui/theme-parser.c:3665 ../src/ui/theme-parser.c:3670
+#: ../src/ui/theme-parser.c:3611 ../src/ui/theme-parser.c:3641
+#: ../src/ui/theme-parser.c:3646 ../src/ui/theme-parser.c:3651
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> er ikke tillatt inne i et <%s>-element"

-#: ../src/ui/theme-parser.c:3898
+#: ../src/ui/theme-parser.c:3879
 msgid "No draw_ops provided for frame piece"
 msgstr "Ingen draw_ops tilbys for rammedelen"

-#: ../src/ui/theme-parser.c:3913
+#: ../src/ui/theme-parser.c:3894
 msgid "No draw_ops provided for button"
 msgstr "Ingen draw_ops tilbys for knappen"

-#: ../src/ui/theme-parser.c:3967
+#: ../src/ui/theme-parser.c:3948
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Ingen tekst er tillatt inne i element <%s>"

-#: ../src/ui/theme-parser.c:4025 ../src/ui/theme-parser.c:4037
-#: ../src/ui/theme-parser.c:4049 ../src/ui/theme-parser.c:4061
-#: ../src/ui/theme-parser.c:4073
+#: ../src/ui/theme-parser.c:4006 ../src/ui/theme-parser.c:4018
+#: ../src/ui/theme-parser.c:4030 ../src/ui/theme-parser.c:4042
+#: ../src/ui/theme-parser.c:4054
 #, c-format
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> spesifisert to ganger for dette temaet"

-#: ../src/ui/theme-parser.c:4335
+#: ../src/ui/theme-parser.c:4316
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Fant ikke en gyldig fil for tema %s\n"
@@ -1261,10 +1261,7 @@ msgstr ""
 "Disse vinduene støtter ikke &quot;lagre aktiv konfigurasjon&quot;og vil "
 "måtte startes på nytt manuelt neste gang du logger inn."

-#: ../src/x11/window-props.c:515
+#: ../src/x11/window-props.c:558
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (på %s)"
-
-#~ msgid "background texture could not be created from file"
-#~ msgstr "bakgrunnstekstur kunne ikke lages fra fil"
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -55,7 +55,8 @@ meta_cursor_reference_ref (MetaCursorReference *self)
 static void
 meta_cursor_image_free (MetaCursorImage *image)
 {
-  cogl_object_unref (image->texture);
+  if (image->texture)
+    cogl_object_unref (image->texture);

 #ifdef HAVE_NATIVE_BACKEND
  if (image->bo)
@@ -255,22 +256,30 @@ meta_cursor_image_load_from_xcursor_image (MetaCursorImage   *image,
 #endif
 }

+static void
+load_cursor_image (MetaCursorReference *cursor)
+{
+  XcursorImage *image;
+
+  /* Either cursors are loaded from X cursors or buffers. Since
+   * buffers are converted over immediately, we can make sure to
+   * load this directly. */
+  g_assert (cursor->cursor != META_CURSOR_NONE);
+
+  image = load_cursor_on_client (cursor->cursor);
+  if (!image)
+    return;
+
+  meta_cursor_image_load_from_xcursor_image (&cursor->image, image);
+  XcursorImageDestroy (image);
+}
+
 MetaCursorReference *
 meta_cursor_reference_from_theme (MetaCursor cursor)
 {
-  MetaCursorReference *self;
-  XcursorImage *image;
-
-  image = load_cursor_on_client (cursor);
-  if (!image)
-    return NULL;
-
-  self = g_slice_new0 (MetaCursorReference);
+  MetaCursorReference *self = g_slice_new0 (MetaCursorReference);
  self->ref_count = 1;
  self->cursor = cursor;
-  meta_cursor_image_load_from_xcursor_image (&self->image, image);
-
-  XcursorImageDestroy (image);
  return self;
 }

@@ -380,10 +389,14 @@ meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
                                        int                 *hot_x,
                                        int                 *hot_y)
 {
+  if (!cursor->image.texture)
+    load_cursor_image (cursor);
+
  if (hot_x)
    *hot_x = cursor->image.hot_x;
  if (hot_y)
    *hot_y = cursor->image.hot_y;
+
  return COGL_TEXTURE (cursor->image.texture);
 }

@@ -393,6 +406,9 @@ meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
                                  int                 *hot_x,
                                  int                 *hot_y)
 {
+  if (!cursor->image.bo)
+    load_cursor_image (cursor);
+
  if (hot_x)
    *hot_x = cursor->image.hot_x;
  if (hot_y)
--- a/src/backends/meta-monitor-config.c
+++ b/src/backends/meta-monitor-config.c
@@ -34,6 +34,7 @@

 #include "config.h"

+#include "boxes-private.h"
 #include "meta-monitor-config.h"

 #include <string.h>
@@ -1096,40 +1097,108 @@ init_config_from_preferred_mode (MetaOutputConfig *config,
  config->is_presentation = FALSE;
 }

-static MetaConfiguration *
-make_default_config (MetaMonitorConfig *self,
-                     MetaOutput        *outputs,
-                     unsigned           n_outputs,
-                     int                max_width,
-                     int                max_height)
+/* This function handles configuring the outputs when the driver provides a
+ * suggested layout position for each output. This is done in recent versions
+ * of qxl and allows displays to be aligned on the guest in the same order as
+ * they are aligned on the client.
+ */
+static gboolean
+make_suggested_config (MetaMonitorConfig *self,
+                       MetaOutput        *outputs,
+                       unsigned           n_outputs,
+                       int                max_width,
+                       int                max_height,
+                       MetaConfiguration *config)
 {
-  unsigned i, j;
-  int x, y;
-  MetaConfiguration *ret;
+  unsigned int i;
  MetaOutput *primary;
+  GList *region = NULL;

-  ret = config_new ();
-  make_config_key (ret, outputs, n_outputs, -1);
-  ret->outputs = g_new0 (MetaOutputConfig, n_outputs);
+  g_return_val_if_fail (config != NULL, FALSE);
+  primary = find_primary_output (outputs, n_outputs);

-  /* Special case the simple case: one output, primary at preferred mode,
-     nothing else to do */
-  if (n_outputs == 1)
+  for (i = 0; i < n_outputs; i++)
    {
-      init_config_from_preferred_mode (&ret->outputs[0], &outputs[0]);
-      ret->outputs[0].is_primary = TRUE;
-      return ret;
+      gboolean is_primary = (&outputs[i] == primary);
+
+      if (outputs[i].suggested_x < 0 || outputs[i].suggested_y < 0)
+          return FALSE;
+
+      init_config_from_preferred_mode (&config->outputs[i], &outputs[i]);
+      config->outputs[i].is_primary = is_primary;
+
+      config->outputs[i].rect.x = outputs[i].suggested_x;
+      config->outputs[i].rect.y = outputs[i].suggested_y;
+
+      /* Reject the configuration if the suggested positions result in
+       * overlapping displays */
+      if (meta_rectangle_overlaps_with_region (region, &config->outputs[i].rect))
+        {
+          g_warning ("Overlapping outputs, rejecting suggested configuration");
+          g_list_free (region);
+          return FALSE;
+        }
+
+      region = g_list_prepend (region, &config->outputs[i].rect);
    }

-  /* If we reach this point, this is either the first time mutter runs
-     on this system ever, or we just hotplugged a new screen.
-     In the latter case, search for a configuration that includes one
-     less screen, then add the new one as a presentation screen
-     in preferred mode.
+  g_list_free (region);
+  return TRUE;
+}

-     XXX: but presentation mode is not implemented in the control-center
-     or in mutter core, so let's do extended for now.
+static void
+make_linear_config (MetaMonitorConfig *self,
+                    MetaOutput        *outputs,
+                    unsigned           n_outputs,
+                    int                max_width,
+                    int                max_height,
+                    MetaConfiguration *config)
+{
+  MetaOutput *primary;
+  unsigned i;
+  int x;
+
+  g_return_if_fail (config != NULL);
+
+  primary = find_primary_output (outputs, n_outputs);
+
+  x = primary->preferred_mode->width;
+  for (i = 0; i < n_outputs; i++)
+    {
+      gboolean is_primary = (&outputs[i] == primary);
+
+      init_config_from_preferred_mode (&config->outputs[i], &outputs[i]);
+      config->outputs[i].is_primary = is_primary;
+
+      if (is_primary)
+        {
+          config->outputs[i].rect.x = 0;
+        }
+      else
+        {
+          config->outputs[i].rect.x = x;
+          x += config->outputs[i].rect.width;
+        }
+    }
+}
+
+/* Search for a configuration that includes one less screen, then add the new
+ * one as a presentation screen in preferred mode.
+ *
+ * XXX: but presentation mode is not implemented in the control-center or in
+ * mutter core, so let's do extended for now.
  */
+static gboolean
+extend_stored_config (MetaMonitorConfig *self,
+                      MetaOutput        *outputs,
+                      unsigned           n_outputs,
+                      int                max_width,
+                      int                max_height,
+                      MetaConfiguration *config)
+{
+  int x, y;
+  unsigned i, j;
+
  x = 0;
  y = 0;
  for (i = 0; i < n_outputs; i++)
@@ -1147,63 +1216,80 @@ make_default_config (MetaMonitorConfig *self,
            {
              if (j < i)
                {
-                  g_assert (output_key_equal (&ret->keys[j], &ref->keys[j]));
-                  ret->outputs[j] = ref->outputs[j];
+                  g_assert (output_key_equal (&config->keys[j], &ref->keys[j]));
+                  config->outputs[j] = ref->outputs[j];
                  x = MAX (x, ref->outputs[j].rect.x + ref->outputs[j].rect.width);
                  y = MAX (y, ref->outputs[j].rect.y + ref->outputs[j].rect.height);
                }
              else if (j > i)
                {
-                  g_assert (output_key_equal (&ret->keys[j], &ref->keys[j - 1]));
-                  ret->outputs[j] = ref->outputs[j - 1];
+                  g_assert (output_key_equal (&config->keys[j], &ref->keys[j - 1]));
+                  config->outputs[j] = ref->outputs[j - 1];
                  x = MAX (x, ref->outputs[j - 1].rect.x + ref->outputs[j - 1].rect.width);
                  y = MAX (y, ref->outputs[j - 1].rect.y + ref->outputs[j - 1].rect.height);
                }
              else
                {
-                  init_config_from_preferred_mode (&ret->outputs[j], &outputs[0]);
+                  init_config_from_preferred_mode (&config->outputs[j], &outputs[0]);
                }
            }

          /* Place the new output at the right end of the screen, if it fits,
             otherwise below it, otherwise disable it (or apply_configuration will fail) */
-          if (x + ret->outputs[i].rect.width <= max_width)
-            ret->outputs[i].rect.x = x;
-          else if (y + ret->outputs[i].rect.height <= max_height)
-            ret->outputs[i].rect.y = y;
+          if (x + config->outputs[i].rect.width <= max_width)
+            config->outputs[i].rect.x = x;
+          else if (y + config->outputs[i].rect.height <= max_height)
+            config->outputs[i].rect.y = y;
          else
-            ret->outputs[i].enabled = FALSE;
+            config->outputs[i].enabled = FALSE;

-          return ret;
+          return TRUE;
        }
    }

-  /* No previous configuration found, try with a really default one, which
-     is one primary that goes first and the rest to the right of it, extended.
-  */
-  primary = find_primary_output (outputs, n_outputs);
+  return FALSE;
+}

-  x = primary->preferred_mode->width;
+static MetaConfiguration *
+make_default_config (MetaMonitorConfig *self,
+                     MetaOutput        *outputs,
+                     unsigned           n_outputs,
+                     int                max_width,
+                     int                max_height,
+                     gboolean           use_stored_config)
+{
+  MetaConfiguration *ret = NULL;
+  unsigned i;
+
+  ret = config_new ();
+  make_config_key (ret, outputs, n_outputs, -1);
+  ret->outputs = g_new0 (MetaOutputConfig, n_outputs);
+
+  /* Special case the simple case: one output, primary at preferred mode,
+     nothing else to do */
+  if (n_outputs == 1)
+    {
+      init_config_from_preferred_mode (&ret->outputs[0], &outputs[0]);
+      ret->outputs[0].is_primary = TRUE;
+      goto check_limits;
+    }
+
+  if (make_suggested_config (self, outputs, n_outputs, max_width, max_height, ret))
+      goto check_limits;
+
+  if (use_stored_config &&
+      extend_stored_config (self, outputs, n_outputs, max_width, max_height, ret))
+      goto check_limits;
+
+  make_linear_config (self, outputs, n_outputs, max_width, max_height, ret);
+
+check_limits:
+  /* Disable outputs that would go beyond framebuffer limits */
  for (i = 0; i < n_outputs; i++)
    {
-      gboolean is_primary = (&outputs[i] == primary);
-
-      init_config_from_preferred_mode (&ret->outputs[i], &outputs[i]);
-      ret->outputs[i].is_primary = is_primary;
-
-      if (is_primary)
-        {
-          ret->outputs[i].rect.x = 0;
-        }
-      else
-        {
-          ret->outputs[i].rect.x = x;
-          x += ret->outputs[i].rect.width;
-        }
-
-      /* Disable outputs that would go beyond framebuffer limits */
-      if (ret->outputs[i].rect.x + ret->outputs[i].rect.width > max_width)
-        ret->outputs[i].enabled = FALSE;
+        if ((ret->outputs[i].rect.x + ret->outputs[i].rect.width > max_width)
+            || (ret->outputs[i].rect.y + ret->outputs[i].rect.height > max_height))
+          ret->outputs[i].enabled = FALSE;
    }

  return ret;
@@ -1261,6 +1347,7 @@ meta_monitor_config_make_default (MetaMonitorConfig  *self,
  unsigned n_outputs;
  gboolean ok = FALSE;
  int max_width, max_height;
+  gboolean use_stored_config;

  outputs = meta_monitor_manager_get_outputs (manager, &n_outputs);
  meta_monitor_manager_get_screen_limits (manager, &max_width, &max_height);
@@ -1271,7 +1358,16 @@ meta_monitor_config_make_default (MetaMonitorConfig  *self,
      return;
    }

-  default_config = make_default_config (self, outputs, n_outputs, max_width, max_height);
+  /* if the device has hotplug_mode_update, it's possible that the
+   * current display configuration does not match a stored configuration.
+   * Since extend_existing_config() tries to build a configuration that is
+   * based on a previously-stored configuration, it's quite likely that the
+   * resulting config will fail. Even if it doesn't fail, it may result in
+   * an unexpected configuration, so don't attempt to use a stored config
+   * in this situation. */
+  use_stored_config = !meta_monitor_manager_has_hotplug_mode_update (manager);
+  default_config = make_default_config (self, outputs, n_outputs, max_width, max_height, use_stored_config);
+
  if (default_config != NULL)
    {
      ok = apply_configuration_with_lid (self, default_config, manager);
--- a/src/backends/meta-monitor-manager.h
+++ b/src/backends/meta-monitor-manager.h
@@ -116,6 +116,8 @@ struct _MetaOutput

  /* get a new preferred mode on hotplug events, to handle dynamic guest resizing */
  gboolean hotplug_mode_update;
+  gint suggested_x;
+  gint suggested_y;
 };

 struct _MetaCRTC
--- a/src/backends/native/meta-launcher.c
+++ b/src/backends/native/meta-launcher.c
@@ -130,8 +130,8 @@ take_device (Login1Session *session_proxy,
 {
  gboolean ret = FALSE;
  GVariant *fd_variant = NULL;
+  GUnixFDList *fd_list = NULL;
  int fd = -1;
-  GUnixFDList *fd_list;

  if (!login1_session_call_take_device_sync (session_proxy,
                                             dev_major,
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@@ -207,7 +207,7 @@ find_properties (MetaMonitorManagerKms *manager_kms,
               strcmp (prop->name, "EDID") == 0)
        output_kms->edid_blob_id = output_kms->connector->prop_values[i];

-      drmModeFreeProperty(prop);
+      drmModeFreeProperty (prop);
    }
 }

@@ -229,8 +229,10 @@ read_output_edid (MetaMonitorManagerKms *manager_kms,
    }

  if (edid_blob->length > 0)
-    return g_bytes_new_with_free_func (edid_blob->data, edid_blob->length,
-                                       (GDestroyNotify)drmModeFreePropertyBlob, edid_blob);
+    {
+      return g_bytes_new_with_free_func (edid_blob->data, edid_blob->length,
+                                         (GDestroyNotify)drmModeFreePropertyBlob, edid_blob);
+    }
  else
    {
      drmModeFreePropertyBlob (edid_blob);
@@ -415,6 +417,8 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
 	  meta_output->name = make_output_name (connector);
 	  meta_output->width_mm = connector->mmWidth;
 	  meta_output->height_mm = connector->mmHeight;
+	  meta_output->suggested_x = -1;
+	  meta_output->suggested_y = -1;

          switch (connector->subpixel)
            {
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -139,6 +139,34 @@ meta_monitor_transform_from_xrandr_all (Rotation rotation)
  return ret;
 }

+static gboolean
+output_get_integer_property (MetaMonitorManagerXrandr *manager_xrandr,
+                             MetaOutput *output, const char *propname,
+                             gint *value)
+{
+  gboolean exists = FALSE;
+  Atom atom, actual_type;
+  int actual_format;
+  unsigned long nitems, bytes_after;
+  unsigned char *buffer;
+
+  atom = XInternAtom (manager_xrandr->xdisplay, propname, False);
+  XRRGetOutputProperty (manager_xrandr->xdisplay,
+                        (XID)output->winsys_id,
+                        atom,
+                        0, G_MAXLONG, False, False, XA_INTEGER,
+                        &actual_type, &actual_format,
+                        &nitems, &bytes_after, &buffer);
+
+  exists = (actual_type == XA_INTEGER && actual_format == 32 && nitems == 1);
+
+  if (exists && value != NULL)
+    *value = ((int*)buffer)[0];
+
+  XFree (buffer);
+  return exists;
+}
+
 static gboolean
 output_get_property_exists (MetaMonitorManagerXrandr *manager_xrandr,
                            MetaOutput *output, const char *propname)
@@ -356,6 +384,28 @@ output_get_hotplug_mode_update (MetaMonitorManagerXrandr *manager_xrandr,
  return output_get_property_exists (manager_xrandr, output, "hotplug_mode_update");
 }

+static gint
+output_get_suggested_x (MetaMonitorManagerXrandr *manager_xrandr,
+                        MetaOutput               *output)
+{
+  gint val;
+  if (output_get_integer_property (manager_xrandr, output, "suggested X", &val))
+    return val;
+
+  return -1;
+}
+
+static gint
+output_get_suggested_y (MetaMonitorManagerXrandr *manager_xrandr,
+                        MetaOutput               *output)
+{
+  gint val;
+  if (output_get_integer_property (manager_xrandr, output, "suggested Y", &val))
+    return val;
+
+  return -1;
+}
+
 static char *
 get_xmode_name (XRRModeInfo *xmode)
 {
@@ -543,6 +593,8 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 	  meta_output->height_mm = output->mm_height;
 	  meta_output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
          meta_output->hotplug_mode_update = output_get_hotplug_mode_update (manager_xrandr, meta_output);
+	  meta_output->suggested_x = output_get_suggested_x (manager_xrandr, meta_output);
+	  meta_output->suggested_y = output_get_suggested_y (manager_xrandr, meta_output);

 	  meta_output->n_modes = output->nmode;
 	  meta_output->modes = g_new0 (MetaMonitorMode *, meta_output->n_modes);
@@ -836,26 +888,12 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
          unsigned int j, n_outputs;
          int width, height;
          Status ok;
-          unsigned long old_controlled_mask;
-          unsigned long new_controlled_mask;

          mode = crtc_info->mode;

          n_outputs = crtc_info->outputs->len;
          outputs = g_new (XID, n_outputs);

-          old_controlled_mask = 0;
-          for (j = 0; j < manager->n_outputs; j++)
-            {
-              MetaOutput *output;
-
-              output = &manager->outputs[j];
-
-              if (output->crtc == crtc)
-                old_controlled_mask |= 1UL << j;
-            }
-
-          new_controlled_mask = 0;
          for (j = 0; j < n_outputs; j++)
            {
              MetaOutput *output;
@@ -864,21 +902,10 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,

              output->is_dirty = TRUE;
              output->crtc = crtc;
-              new_controlled_mask |= 1UL << j;

              outputs[j] = output->winsys_id;
            }

-          if (crtc->current_mode == mode &&
-              crtc->rect.x == crtc_info->x &&
-              crtc->rect.y == crtc_info->y &&
-              crtc->transform == crtc_info->transform &&
-              old_controlled_mask == new_controlled_mask)
-            {
-              /* No change */
-              goto next;
-            }
-
          ok = XRRSetCrtcConfig (manager_xrandr->xdisplay,
                                 manager_xrandr->resources,
                                 (XID)crtc->crtc_id,
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -49,6 +49,8 @@ meta_surface_actor_pick (ClutterActor       *actor,
 {
  MetaSurfaceActor *self = META_SURFACE_ACTOR (actor);
  MetaSurfaceActorPrivate *priv = self->priv;
+  ClutterActorIter iter;
+  ClutterActor *child;

  if (!clutter_actor_should_pick_paint (actor))
    return;
@@ -65,8 +67,6 @@ meta_surface_actor_pick (ClutterActor       *actor,
      CoglContext *ctx;
      CoglFramebuffer *fb;
      CoglColor cogl_color;
-      ClutterActorIter iter;
-      ClutterActor *child;

      n_rects = cairo_region_num_rectangles (priv->input_region);
      rectangles = g_alloca (sizeof (float) * 4 * n_rects);
@@ -93,12 +93,12 @@ meta_surface_actor_pick (ClutterActor       *actor,
      cogl_pipeline_set_color (pipeline, &cogl_color);
      cogl_framebuffer_draw_rectangles (fb, pipeline, rectangles, n_rects);
      cogl_object_unref (pipeline);
-
-      clutter_actor_iter_init (&iter, actor);
-
-      while (clutter_actor_iter_next (&iter, &child))
-        clutter_actor_paint (child);
    }
+
+  clutter_actor_iter_init (&iter, actor);
+
+  while (clutter_actor_iter_next (&iter, &child))
+    clutter_actor_paint (child);
 }

 static void
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -100,7 +100,7 @@ struct _MetaWindowActorPrivate
  guint		    disposed               : 1;

  /* If set, the client needs to be sent a _NET_WM_FRAME_DRAWN
-   * client message using the most recent frame in ->frames */
+   * client message for one or more messages in ->frames */
  guint             needs_frame_drawn      : 1;
  guint             repaint_scheduled      : 1;

@@ -118,10 +118,21 @@ struct _MetaWindowActorPrivate

 typedef struct _FrameData FrameData;

+/* Each time the application updates the sync request counter to a new even value
+ * value, we queue a frame into the windows list of frames. Once we're painting
+ * an update "in response" to the window, we fill in frame_counter with the
+ * Cogl counter for that frame, and send _NET_WM_FRAME_DRAWN at the end of the
+ * frame. _NET_WM_FRAME_TIMINGS is sent when we get a frame_complete callback.
+ *
+ * As an exception, if a window is completely obscured, we try to throttle drawning
+ * to a slower frame rate. In this case, frame_counter stays -1 until
+ * send_frame_message_timeout() runs, at which point we send both the
+ * _NET_WM_FRAME_DRAWN and _NET_WM_FRAME_TIMINGS messages.
+ */
 struct _FrameData
 {
-  int64_t frame_counter;
  guint64 sync_request_serial;
+  int64_t frame_counter;
  gint64 frame_drawn_time;
 };

@@ -655,6 +666,30 @@ clip_shadow_under_window (MetaWindowActor *self)
  return is_non_opaque (self) && priv->window->frame;
 }

+static void
+assign_frame_counter_to_frames (MetaWindowActor *self)
+{
+  MetaWindowActorPrivate *priv = self->priv;
+  GList *l;
+
+  /* If the window is obscured, then we're expecting to deal with sending
+   * frame messages in a timeout, rather than in this paint cycle.
+   */
+  if (priv->send_frame_messages_timer != 0)
+    return;
+
+  for (l = priv->frames; l; l = l->next)
+    {
+      FrameData *frame = l->data;
+
+      if (frame->frame_counter == -1)
+        {
+          CoglOnscreen *onscreen = COGL_ONSCREEN (cogl_get_draw_framebuffer());
+          frame->frame_counter = cogl_onscreen_get_frame_counter (onscreen);
+        }
+    }
+}
+
 static void
 meta_window_actor_paint (ClutterActor *actor)
 {
@@ -671,6 +706,8 @@ meta_window_actor_paint (ClutterActor *actor)
    {
      g_source_remove (priv->send_frame_messages_timer);
      priv->send_frame_messages_timer = 0;
+
+      assign_frame_counter_to_frames (self);
    }

  if (shadow != NULL)
@@ -873,16 +910,27 @@ send_frame_messages_timeout (gpointer data)
 {
  MetaWindowActor *self = (MetaWindowActor *) data;
  MetaWindowActorPrivate *priv = self->priv;
-  FrameData *frame = g_slice_new0 (FrameData);
+  GList *l;

-  frame->sync_request_serial = priv->window->sync_request_serial;
+  for (l = priv->frames; l;)
+    {
+      GList *l_next = l->next;
+      FrameData *frame = l->data;

-  do_send_frame_drawn (self, frame);
-  do_send_frame_timings (self, frame, 0, 0);
+      if (frame->frame_counter == -1)
+        {
+          do_send_frame_drawn (self, frame);
+          do_send_frame_timings (self, frame, 0, 0);
+
+          priv->frames = g_list_delete_link (priv->frames, l);
+          frame_data_free (frame);
+        }
+
+      l = l_next;
+    }

  priv->needs_frame_drawn = FALSE;
  priv->send_frame_messages_timer = 0;
-  frame_data_free (frame);

  return FALSE;
 }
@@ -891,6 +939,10 @@ static void
 queue_send_frame_messages_timeout (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
+
+  if (priv->send_frame_messages_timer != 0)
+    return;
+
  MetaDisplay *display = meta_window_get_display (priv->window);
  gint64 current_time = meta_compositor_monotonic_time_to_server_time (display, g_get_monotonic_time ());
  MetaMonitorManager *monitor_manager = meta_monitor_manager_get ();
@@ -933,6 +985,7 @@ meta_window_actor_queue_frame_drawn (MetaWindowActor *self,
    return;

  frame = g_slice_new0 (FrameData);
+  frame->frame_counter = -1;

  priv->needs_frame_drawn = TRUE;

@@ -1155,7 +1208,7 @@ gboolean
 meta_window_actor_should_unredirect (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  if (priv->surface)
+  if (!meta_window_actor_is_destroyed (self) && priv->surface)
    return meta_surface_actor_should_unredirect (priv->surface);
  else
    return FALSE;
@@ -1905,24 +1958,12 @@ meta_window_actor_handle_updates (MetaWindowActor *self)
 void
 meta_window_actor_pre_paint (MetaWindowActor *self)
 {
-  MetaWindowActorPrivate *priv = self->priv;
-  GList *l;
-
  if (meta_window_actor_is_destroyed (self))
    return;

  meta_window_actor_handle_updates (self);

-  for (l = priv->frames; l != NULL; l = l->next)
-    {
-      FrameData *frame = l->data;
-
-      if (frame->frame_counter == 0)
-        {
-          CoglOnscreen *onscreen = COGL_ONSCREEN (cogl_get_draw_framebuffer());
-          frame->frame_counter = cogl_onscreen_get_frame_counter (onscreen);
-        }
-    }
+  assign_frame_counter_to_frames (self);
 }

 static void
@@ -1963,16 +2004,23 @@ meta_window_actor_post_paint (MetaWindowActor *self)
  if (meta_window_actor_is_destroyed (self))
    return;

- /* This window had damage, but wasn't actually redrawn because
-  * it is obscured. So we should wait until timer expiration
-  * before sending _NET_WM_FRAME_* messages.
-  */
-  if (priv->send_frame_messages_timer != 0)
-    return;
-
-  if (priv->needs_frame_drawn)
+  /* If the window had damage, but wasn't actually redrawn because
+   * it is obscured, we should wait until timer expiration before
+   * sending _NET_WM_FRAME_* messages.
+   */
+  if (priv->send_frame_messages_timer == 0 &&
+      priv->needs_frame_drawn)
    {
-      do_send_frame_drawn (self, priv->frames->data);
+      GList *l;
+
+      for (l = priv->frames; l; l = l->next)
+        {
+          FrameData *frame = l->data;
+
+          if (frame->frame_drawn_time == 0)
+            do_send_frame_drawn (self, frame);
+        }
+
      priv->needs_frame_drawn = FALSE;
    }

@@ -2057,15 +2105,20 @@ meta_window_actor_frame_complete (MetaWindowActor *self,
    {
      GList *l_next = l->next;
      FrameData *frame = l->data;
+      gint64 frame_counter = cogl_frame_info_get_frame_counter (frame_info);

-      if (frame->frame_counter == cogl_frame_info_get_frame_counter (frame_info))
+      if (frame->frame_counter != -1 && frame->frame_counter <= frame_counter)
        {
-          if (frame->frame_drawn_time != 0)
-            {
-              priv->frames = g_list_delete_link (priv->frames, l);
-              send_frame_timings (self, frame, frame_info, presentation_time);
-              frame_data_free (frame);
-            }
+          if (G_UNLIKELY (frame->frame_drawn_time == 0))
+            g_warning ("%s: Frame has assigned frame counter but no frame drawn time",
+                       priv->window->desc);
+          if (G_UNLIKELY (frame->frame_counter < frame_counter))
+            g_warning ("%s: frame_complete callback never occurred for frame %" G_GINT64_FORMAT,
+                       priv->window->desc, frame->frame_counter);
+
+          priv->frames = g_list_delete_link (priv->frames, l);
+          send_frame_timings (self, frame, frame_info, presentation_time);
+          frame_data_free (frame);
        }

      l = l_next;
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -328,17 +328,17 @@ setup_constraint_info (ConstraintInfo      *info,
  info->orig    = *orig;
  info->current = *new;

-  if (flags & META_IS_MOVE_ACTION && flags & META_IS_RESIZE_ACTION)
+  if (flags & META_MOVE_RESIZE_MOVE_ACTION && flags & META_MOVE_RESIZE_RESIZE_ACTION)
    info->action_type = ACTION_MOVE_AND_RESIZE;
-  else if (flags & META_IS_RESIZE_ACTION)
+  else if (flags & META_MOVE_RESIZE_RESIZE_ACTION)
    info->action_type = ACTION_RESIZE;
-  else if (flags & META_IS_MOVE_ACTION)
+  else if (flags & META_MOVE_RESIZE_MOVE_ACTION)
    info->action_type = ACTION_MOVE;
  else
    g_error ("BAD, BAD developer!  No treat for you!  (Fix your calls to "
             "meta_window_move_resize_internal()).\n");

-  info->is_user_action = (flags & META_IS_USER_ACTION);
+  info->is_user_action = (flags & META_MOVE_RESIZE_USER_ACTION);

  info->resize_gravity = resize_gravity;

@@ -1017,6 +1017,7 @@ constrain_aspect_ratio (MetaWindow         *window,
  double best_width, best_height;
  double alt_width, alt_height;
  MetaRectangle *start_rect;
+  MetaRectangle client_rect;

  if (priority > PRIORITY_ASPECT_RATIO)
    return TRUE;
@@ -1068,15 +1069,18 @@ constrain_aspect_ratio (MetaWindow         *window,
      fudge = 1;
      break;
    }
+
+  meta_window_frame_rect_to_client_rect (window, &info->current, &client_rect);
+
  constraint_already_satisfied =
-    info->current.width - (info->current.height * minr ) > -minr*fudge &&
-    info->current.width - (info->current.height * maxr ) <  maxr*fudge;
+    client_rect.width - (client_rect.height * minr ) > -minr*fudge &&
+    client_rect.width - (client_rect.height * maxr ) <  maxr*fudge;
  if (check_only || constraint_already_satisfied)
    return constraint_already_satisfied;

  /*** Enforce constraint ***/
-  new_width = info->current.width;
-  new_height = info->current.height;
+  new_width = client_rect.width;
+  new_height = client_rect.height;

  switch (info->resize_gravity)
    {
@@ -1123,6 +1127,14 @@ constrain_aspect_ratio (MetaWindow         *window,
      break;
    }

+  {
+    client_rect.width = new_width;
+    client_rect.height = new_height;
+    meta_window_client_rect_to_frame_rect (window, &client_rect, &client_rect);
+    new_width = client_rect.width;
+    new_height = client_rect.height;
+  }
+
  /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
   * See bug 448183
   */
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1205,7 +1205,7 @@ meta_grab_op_is_resizing (MetaGrabOp op)
  if (!grab_op_is_window (op))
    return FALSE;

-  return (op & META_GRAB_OP_WINDOW_DIR_MASK) != 0;
+  return (op & META_GRAB_OP_WINDOW_DIR_MASK) != 0 || op == META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN;
 }

 gboolean
@@ -1953,6 +1953,11 @@ meta_display_end_grab_op (MetaDisplay *display,
  g_signal_emit (display, display_signals[GRAB_OP_END], 0,
                 display->screen, grab_window, grab_op);

+  /* We need to reset this early, since the
+   * meta_window_grab_op_ended callback relies on this being
+   * up to date. */
+  display->grab_op = META_GRAB_OP_NONE;
+
  if (display->event_route == META_EVENT_ROUTE_WINDOW_OP)
    {
      /* Clear out the edge cache */
@@ -1985,7 +1990,6 @@ meta_display_end_grab_op (MetaDisplay *display,
    }

  display->event_route = META_EVENT_ROUTE_NORMAL;
-  display->grab_op = META_GRAB_OP_NONE;
  display->grab_window = NULL;
  display->grab_tile_mode = META_TILE_NONE;
  display->grab_tile_monitor_number = -1;
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -496,15 +496,6 @@ create_guard_window (Display *xdisplay, MetaScreen *screen)
  return guard_window;
 }

-/* Set a black background on the root window so that we don't
- * see confusing old copies of old windows when debugging
- * and testing. */
-static void
-meta_screen_set_background (MetaScreen *screen)
-{
-  XSetWindowBackground (screen->display->xdisplay, screen->xroot, 0x00000000);
-}
-
 MetaScreen*
 meta_screen_new (MetaDisplay *display,
                 int          number,
@@ -709,7 +700,6 @@ meta_screen_new (MetaDisplay *display,
  reload_monitor_infos (screen);

  meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);
-  meta_screen_set_background (screen);

  /* Handle creating a no_focus_window for this screen */
  screen->no_focus_window =
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -72,11 +72,12 @@ typedef enum {

 typedef enum
 {
-  META_IS_CONFIGURE_REQUEST = 1 << 0,
-  META_IS_USER_ACTION       = 1 << 1,
-  META_IS_MOVE_ACTION       = 1 << 2,
-  META_IS_RESIZE_ACTION     = 1 << 3,
-  META_IS_WAYLAND_RESIZE    = 1 << 4,
+  META_MOVE_RESIZE_CONFIGURE_REQUEST = 1 << 0,
+  META_MOVE_RESIZE_USER_ACTION       = 1 << 1,
+  META_MOVE_RESIZE_MOVE_ACTION       = 1 << 2,
+  META_MOVE_RESIZE_RESIZE_ACTION     = 1 << 3,
+  META_MOVE_RESIZE_WAYLAND_RESIZE    = 1 << 4,
+  META_MOVE_RESIZE_STATE_CHANGED     = 1 << 5,
 } MetaMoveResizeFlags;

 typedef enum
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2690,7 +2690,10 @@ meta_window_maximize (MetaWindow        *window,

      meta_window_get_frame_rect (window, &old_rect);

-      meta_window_move_resize_now (window);
+      meta_window_move_resize_internal (window,
+                                        META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION | META_MOVE_RESIZE_STATE_CHANGED,
+                                        NorthWestGravity,
+                                        window->unconstrained_rect);

      meta_window_get_frame_rect (window, &new_rect);
      meta_compositor_maximize_window (window->display->compositor,
@@ -3044,7 +3047,7 @@ meta_window_unmaximize_internal (MetaWindow        *window,
      meta_window_client_rect_to_frame_rect (window, &target_rect, &target_rect);

      meta_window_move_resize_internal (window,
-                                        META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION,
+                                        META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION | META_MOVE_RESIZE_STATE_CHANGED,
                                        gravity,
                                        target_rect);

@@ -3189,9 +3192,11 @@ meta_window_make_fullscreen (MetaWindow  *window)
  if (!window->fullscreen)
    {
      meta_window_make_fullscreen_internal (window);
-      /* move_resize with new constraints
-       */
-      meta_window_queue(window, META_QUEUE_MOVE_RESIZE);
+
+      meta_window_move_resize_internal (window,
+                                        META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION | META_MOVE_RESIZE_STATE_CHANGED,
+                                        NorthWestGravity,
+                                        window->unconstrained_rect);
    }
 }

@@ -3213,19 +3218,19 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
      /* Window's size hints may have changed while maximized, making
       * saved_rect invalid.  #329152
       */
+      meta_window_frame_rect_to_client_rect (window, &target_rect, &target_rect);
      ensure_size_hints_satisfied (&target_rect, &window->size_hints);
+      meta_window_client_rect_to_frame_rect (window, &target_rect, &target_rect);

      /* Need to update window->has_resize_func before we move_resize()
       */
      meta_window_recalc_features (window);
      set_net_wm_state (window);

-      meta_window_move_resize_frame (window,
-                                     FALSE,
-                                     target_rect.x,
-                                     target_rect.y,
-                                     target_rect.width,
-                                     target_rect.height);
+      meta_window_move_resize_internal (window,
+                                        META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION | META_MOVE_RESIZE_STATE_CHANGED,
+                                        NorthWestGravity,
+                                        target_rect);

      meta_window_update_layer (window);

@@ -3612,19 +3617,19 @@ meta_window_move_resize_internal (MetaWindow          *window,
  /* The action has to be a move, a resize or the wayland client
   * acking our choice of size.
   */
-  g_assert (flags & (META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION | META_IS_WAYLAND_RESIZE));
+  g_assert (flags & (META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION | META_MOVE_RESIZE_WAYLAND_RESIZE));

  did_placement = !window->placed && window->calc_placement;

  /* We don't need it in the idle queue anymore. */
  meta_window_unqueue (window, META_QUEUE_MOVE_RESIZE);

-  if ((flags & META_IS_RESIZE_ACTION) && (flags & META_IS_MOVE_ACTION))
+  if ((flags & META_MOVE_RESIZE_RESIZE_ACTION) && (flags & META_MOVE_RESIZE_MOVE_ACTION))
    {
      /* We're both moving and resizing. Just use the passed in rect. */
      unconstrained_rect = frame_rect;
    }
-  else if ((flags & META_IS_RESIZE_ACTION))
+  else if ((flags & META_MOVE_RESIZE_RESIZE_ACTION))
    {
      /* If this is only a resize, then ignore the position given in
       * the parameters and instead calculate the new position from
@@ -3635,7 +3640,7 @@ meta_window_move_resize_internal (MetaWindow          *window,
                                          frame_rect.width,
                                          frame_rect.height);
    }
-  else if ((flags & META_IS_MOVE_ACTION))
+  else if ((flags & META_MOVE_RESIZE_MOVE_ACTION))
    {
      /* If this is only a move, then ignore the passed in size and
       * just use the existing size of the window. */
@@ -3644,7 +3649,7 @@ meta_window_move_resize_internal (MetaWindow          *window,
      unconstrained_rect.width = window->rect.width;
      unconstrained_rect.height = window->rect.height;
    }
-  else if ((flags & META_IS_WAYLAND_RESIZE))
+  else if ((flags & META_MOVE_RESIZE_WAYLAND_RESIZE))
    {
      /* This is a Wayland buffer acking our size. The new rect is
       * just the existing one we have. Ignore the passed-in rect
@@ -3655,7 +3660,7 @@ meta_window_move_resize_internal (MetaWindow          *window,
    g_assert_not_reached ();

  constrained_rect = unconstrained_rect;
-  if (flags & (META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION))
+  if (flags & (META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION))
    {
      MetaRectangle old_rect;
      meta_window_get_frame_rect (window, &old_rect);
@@ -3698,10 +3703,10 @@ meta_window_move_resize_internal (MetaWindow          *window,

  old_output_winsys_id = window->monitor->winsys_id;

-  meta_window_update_monitor (window, flags & META_IS_USER_ACTION);
+  meta_window_update_monitor (window, flags & META_MOVE_RESIZE_USER_ACTION);

  if (old_output_winsys_id != window->monitor->winsys_id &&
-      flags & META_IS_MOVE_ACTION && flags & META_IS_USER_ACTION)
+      flags & META_MOVE_RESIZE_MOVE_ACTION && flags & META_MOVE_RESIZE_USER_ACTION)
    window->preferred_output_winsys_id = window->monitor->winsys_id;

  if ((result & META_MOVE_RESIZE_RESULT_FRAME_SHAPE_CHANGED) && window->frame_bounds)
@@ -3739,7 +3744,7 @@ meta_window_move_frame (MetaWindow *window,

  g_return_if_fail (!window->override_redirect);

-  flags = (user_op ? META_IS_USER_ACTION : 0) | META_IS_MOVE_ACTION;
+  flags = (user_op ? META_MOVE_RESIZE_USER_ACTION : 0) | META_MOVE_RESIZE_MOVE_ACTION;
  meta_window_move_resize_internal (window, flags, NorthWestGravity, rect);
 }

@@ -3789,7 +3794,7 @@ meta_window_move_resize_frame (MetaWindow  *window,

  g_return_if_fail (!window->override_redirect);

-  flags = (user_op ? META_IS_USER_ACTION : 0) | META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION;
+  flags = (user_op ? META_MOVE_RESIZE_USER_ACTION : 0) | META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION;

  meta_window_move_resize_internal (window, flags, NorthWestGravity, rect);
 }
@@ -3841,7 +3846,7 @@ meta_window_resize_frame_with_gravity (MetaWindow *window,
  rect.width = w;
  rect.height = h;

-  flags = (user_op ? META_IS_USER_ACTION : 0) | META_IS_RESIZE_ACTION;
+  flags = (user_op ? META_MOVE_RESIZE_USER_ACTION : 0) | META_MOVE_RESIZE_RESIZE_ACTION;
  meta_window_move_resize_internal (window, flags, gravity, rect);
 }

--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -547,9 +547,16 @@ data_device_set_selection (struct wl_client *client,
  meta_wayland_data_device_set_selection (data_device, source, serial);
 }

+static void
+data_device_release(struct wl_client *client, struct wl_resource *resource)
+{
+  wl_resource_destroy(resource);
+}
+
 static const struct wl_data_device_interface data_device_interface = {
  data_device_start_drag,
  data_device_set_selection,
+  data_device_release,
 };

 static void
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -65,6 +65,33 @@ unbind_resource (struct wl_resource *resource)
  wl_list_remove (wl_resource_get_link (resource));
 }

+static void
+sync_focus_surface (MetaWaylandPointer *pointer)
+{
+  MetaDisplay *display = meta_get_display ();
+
+  switch (display->event_route)
+    {
+    case META_EVENT_ROUTE_WINDOW_OP:
+    case META_EVENT_ROUTE_COMPOSITOR_GRAB:
+      /* The compositor has a grab, so remove our focus... */
+      meta_wayland_pointer_set_focus (pointer, NULL);
+      break;
+
+    case META_EVENT_ROUTE_NORMAL:
+    case META_EVENT_ROUTE_WAYLAND_POPUP:
+      {
+        const MetaWaylandPointerGrabInterface *interface = pointer->grab->interface;
+        interface->focus (pointer->grab, pointer->current);
+      }
+      break;
+
+    default:
+      g_assert_not_reached ();
+    }
+
+}
+
 static void
 set_cursor_surface (MetaWaylandPointer *pointer,
                    MetaWaylandSurface *surface)
@@ -179,7 +206,7 @@ default_grab_button (MetaWaylandPointerGrab *grab,
    }

  if (pointer->button_count == 0 && event_type == CLUTTER_BUTTON_RELEASE)
-    meta_wayland_pointer_set_focus (pointer, pointer->current);
+    sync_focus_surface (pointer);
 }

 static const MetaWaylandPointerGrabInterface default_pointer_grab_interface = {
@@ -247,36 +274,6 @@ count_buttons (const ClutterEvent *event)
  return count;
 }

-static void
-sync_focus_surface (MetaWaylandPointer *pointer)
-{
-  MetaDisplay *display = meta_get_display ();
-  MetaWaylandSurface *focus_surface;
-
-  switch (display->event_route)
-    {
-    case META_EVENT_ROUTE_WINDOW_OP:
-      /* Don't update the focus surface while we're grabbing a window. */
-      return;
-
-    case META_EVENT_ROUTE_COMPOSITOR_GRAB:
-      /* The compositor has focus, so remove our focus... */
-      focus_surface = NULL;
-      break;
-
-    case META_EVENT_ROUTE_NORMAL:
-    case META_EVENT_ROUTE_WAYLAND_POPUP:
-      focus_surface = pointer->current;
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-
-  const MetaWaylandPointerGrabInterface *interface = pointer->grab->interface;
-  interface->focus (pointer->grab, focus_surface);
-}
-
 static void
 repick_for_event (MetaWaylandPointer *pointer,
                  const ClutterEvent *for_event)
@@ -307,6 +304,7 @@ repick_for_event (MetaWaylandPointer *pointer,
    pointer->current = NULL;

  sync_focus_surface (pointer);
+  meta_wayland_pointer_update_cursor_surface (pointer);
 }

 void
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -36,7 +36,7 @@

 /* Global/master objects (version exported by wl_registry and negotiated through bind) */
 #define META_WL_COMPOSITOR_VERSION          3
-#define META_WL_DATA_DEVICE_MANAGER_VERSION 1
+#define META_WL_DATA_DEVICE_MANAGER_VERSION 2
 #define META_XDG_SHELL_VERSION              1
 #define META_WL_SHELL_VERSION               1
 #define META_WL_SEAT_VERSION                4
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -59,7 +59,6 @@ get_time (void)
 typedef struct
 {
  GSource source;
-  GPollFD pfd;
  struct wl_display *display;
 } WaylandEventSource;

@@ -75,13 +74,6 @@ wayland_event_source_prepare (GSource *base, int *timeout)
  return FALSE;
 }

-static gboolean
-wayland_event_source_check (GSource *base)
-{
-  WaylandEventSource *source = (WaylandEventSource *)base;
-  return source->pfd.revents;
-}
-
 static gboolean
 wayland_event_source_dispatch (GSource *base,
                               GSourceFunc callback,
@@ -98,7 +90,7 @@ wayland_event_source_dispatch (GSource *base,
 static GSourceFuncs wayland_event_source_funcs =
 {
  wayland_event_source_prepare,
-  wayland_event_source_check,
+  NULL,
  wayland_event_source_dispatch,
  NULL
 };
@@ -112,9 +104,9 @@ wayland_event_source_new (struct wl_display *display)
  source = (WaylandEventSource *) g_source_new (&wayland_event_source_funcs,
                                                sizeof (WaylandEventSource));
  source->display = display;
-  source->pfd.fd = wl_event_loop_get_fd (loop);
-  source->pfd.events = G_IO_IN | G_IO_ERR;
-  g_source_add_poll (&source->source, &source->pfd);
+  g_source_add_unix_fd (&source->source,
+                        wl_event_loop_get_fd (loop),
+                        G_IO_IN | G_IO_ERR);

  return &source->source;
 }
--- a/src/wayland/window-wayland.c
+++ b/src/wayland/window-wayland.c
@@ -168,7 +168,7 @@ meta_window_wayland_move_resize_internal (MetaWindow                *window,
   * it can be for maximized or fullscreen.
   */

-  if (flags & META_IS_WAYLAND_RESIZE)
+  if (flags & META_MOVE_RESIZE_WAYLAND_RESIZE)
    {
      /* This is a call to wl_surface_commit(), ignore the constrained_rect and
       * update the real client size to match the buffer size.
@@ -188,8 +188,11 @@ meta_window_wayland_move_resize_internal (MetaWindow                *window,
    }
  else
    {
+      /* If the size changed, or the state changed, then we have to wait until
+       * the client acks our configure before moving the window. */
      if (constrained_rect.width != window->rect.width ||
-          constrained_rect.height != window->rect.height)
+          constrained_rect.height != window->rect.height ||
+          (flags & META_MOVE_RESIZE_STATE_CHANGED))
        {
          /* If we get a 0x0 size, this means that we're trying to resize
           * a surface that doesn't have any buffer attached. This can happen
@@ -397,7 +400,7 @@ meta_window_wayland_move_resize (MetaWindow        *window,
  window->custom_frame_extents.left = new_geom.x;
  window->custom_frame_extents.top = new_geom.y;

-  flags = META_IS_WAYLAND_RESIZE;
+  flags = META_MOVE_RESIZE_WAYLAND_RESIZE;

  /* x/y are ignored when we're doing interactive resizing */
  if (!meta_grab_op_is_resizing (window->display->grab_op))
@@ -407,7 +410,7 @@ meta_window_wayland_move_resize (MetaWindow        *window,
          rect.x = wl_window->pending_move_x;
          rect.y = wl_window->pending_move_y;
          wl_window->has_pending_move = FALSE;
-          flags |= META_IS_MOVE_ACTION;
+          flags |= META_MOVE_RESIZE_MOVE_ACTION;
        }
      else
        {
@@ -419,7 +422,7 @@ meta_window_wayland_move_resize (MetaWindow        *window,
        {
          rect.x += dx;
          rect.y += dy;
-          flags |= META_IS_MOVE_ACTION;
+          flags |= META_MOVE_RESIZE_MOVE_ACTION;
        }
    }

@@ -429,7 +432,7 @@ meta_window_wayland_move_resize (MetaWindow        *window,
  rect.height = new_geom.height;

  if (rect.width != window->rect.width || rect.height != window->rect.height)
-    flags |= META_IS_RESIZE_ACTION;
+    flags |= META_MOVE_RESIZE_RESIZE_ACTION;

  gravity = meta_resize_gravity_from_grab_op (window->display->grab_op);
  meta_window_move_resize_internal (window, flags, gravity, rect);
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -491,7 +491,7 @@ meta_window_apply_session_info (MetaWindow *window,
      window->size_hints.win_gravity = info->gravity;
      gravity = window->size_hints.win_gravity;

-      flags = META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION;
+      flags = META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION;

      adjust_for_gravity (window, FALSE, gravity, &rect);
      meta_window_client_rect_to_frame_rect (window, &rect, &rect);
@@ -560,7 +560,7 @@ meta_window_x11_manage (MetaWindow *window)
      rect.width = window->size_hints.width;
      rect.height = window->size_hints.height;

-      flags = META_IS_CONFIGURE_REQUEST | META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION;
+      flags = META_MOVE_RESIZE_CONFIGURE_REQUEST | META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION;

      adjust_for_gravity (window, TRUE, gravity, &rect);
      meta_window_client_rect_to_frame_rect (window, &rect, &rect);
@@ -1056,7 +1056,7 @@ meta_window_x11_move_resize_internal (MetaWindow                *window,

  gboolean is_configure_request;

-  is_configure_request = (flags & META_IS_CONFIGURE_REQUEST) != 0;
+  is_configure_request = (flags & META_MOVE_RESIZE_CONFIGURE_REQUEST) != 0;

  meta_frame_calc_borders (window->frame, &borders);

@@ -1684,7 +1684,7 @@ meta_window_x11_update_input_region (MetaWindow *window)
      /* Translate the set of XShape rectangles that we
       * get from the X server to a cairo_region. */
      XRectangle *rects = NULL;
-      int n_rects, ordering;
+      int n_rects = -1, ordering;

      meta_error_trap_push (window->display);
      rects = XShapeGetRectangles (window->display->xdisplay,
@@ -1694,21 +1694,46 @@ meta_window_x11_update_input_region (MetaWindow *window)
                                   &ordering);
      meta_error_trap_pop (window->display);

-      /* XXX: The x shape extension doesn't provide a way to only test if an
-       * input shape has been specified, so we have to query and throw away the
-       * rectangles. */
-      if (rects)
-        {
-          if (n_rects > 1 ||
-              (n_rects == 1 &&
-               (rects[0].x != 0 ||
-                rects[0].y != 0 ||
-                rects[0].width != priv->client_rect.width ||
-                rects[0].height != priv->client_rect.height)))
-            region = region_create_from_x_rectangles (rects, n_rects);
+      /* XXX: The X Shape specification is quite unfortunately specified.
+       *
+       * By default, the window has a shape the same as its bounding region,
+       * which we consider "NULL".
+       *
+       * If the window sets an empty region, then we'll get n_rects as 0
+       * and rects as NULL, which we need to transform back into an empty
+       * region.
+       *
+       * It would be great to have a less-broken extension for this, but
+       * hey, it's X11!
+       */

-          XFree (rects);
+      if (n_rects == -1)
+        {
+          /* We had an error. */
+          region = NULL;
        }
+      else if (n_rects == 0)
+        {
+          /* Client set an empty region. */
+          region = cairo_region_create ();
+        }
+      else if (n_rects == 1 &&
+               (rects[0].x == 0 ||
+                rects[0].y == 0 ||
+                rects[0].width == priv->client_rect.width ||
+                rects[0].height == priv->client_rect.height))
+        {
+          /* This is the bounding region case. Keep the
+           * region as NULL. */
+          region = NULL;
+        }
+      else
+        {
+          /* Window has a custom shape. */
+          region = region_create_from_x_rectangles (rects, n_rects);
+        }
+
+      meta_XFree (rects);
    }

  if (region != NULL)
@@ -1946,16 +1971,16 @@ meta_window_move_resize_request (MetaWindow *window,
   * windows offscreen when users don't want it if not constrained
   * (e.g. hitting a dropdown triangle in a fileselector to show more
   * options, which makes the window bigger).  Thus we do not set
-   * META_IS_USER_ACTION in flags to the
+   * META_MOVE_RESIZE_USER_ACTION in flags to the
   * meta_window_move_resize_internal() call.
   */
-  flags = META_IS_CONFIGURE_REQUEST;
+  flags = META_MOVE_RESIZE_CONFIGURE_REQUEST;
  if (value_mask & (CWX | CWY))
-    flags |= META_IS_MOVE_ACTION;
+    flags |= META_MOVE_RESIZE_MOVE_ACTION;
  if (value_mask & (CWWidth | CWHeight))
-    flags |= META_IS_RESIZE_ACTION;
+    flags |= META_MOVE_RESIZE_RESIZE_ACTION;

-  if (flags & (META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION))
+  if (flags & (META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION))
    {
      MetaRectangle rect, monitor_rect;
Author	SHA1	Message	Date
Florian Müllner	69079b3b48	Bump version to 3.15.3 Update NEWS.	2014-12-19 12:05:52 +01:00
Jasper St. Pierre	ad7292faef	wayland: Use g_source_add_unix_fd instead of g_source_add_poll g_source_add_poll is deprecated.	2014-12-15 14:44:00 -08:00
Jasper St. Pierre	2f7843b295	monitor-manager-kms: Fix some minor style issues Spotted by Dave Airlie <airlied@redhat.com>	2014-12-15 14:15:46 -08:00
Jasper St. Pierre	b24cd5ae08	window: Force state changes on maximized / fullscreen	2014-12-15 13:52:40 -08:00
Jasper St. Pierre	c782078e00	Rename MetaMoveResizeFlags items to fit with the theme Use a proper prefix, even if more wordy, instead of META_IS.	2014-12-15 13:30:39 -08:00
Rui Matos	5a86286aba	monitor-manager-xrandr: Set CRTC config even if it might be redundant This optimization breaks our use of XRRScreenResources' timestamps to detect hotplugs in case one of the outputs is disconnected and the remaining ones don't need any mode, position or transform adjustments. In that scenario, when applying the new configuration, we resize the X screen but never call XRRSetCrtcConfig() and since XRRSetScreenSize() doesn't take a timestamp and the X server doesn't update its last set timestamp, when we next get a RRScreenChangeNotify and update ourselves, XRRScreenResources.timestamp will still be smaller than XRRScreenResources.configTimestamp which makes us think we're seeing a new hotplug. We just don't enter an endless loop because the screen size that we keep applying is always the same and the X server short-circuits and stops sending us RRScreenChangeNotifys. Always calling XRRSetCrtcConfig() ensures that the last set timestamp will be bigger than configTimestamp in the next event and thus making us trigger the monitors-changed signal properly. Note that the X server already does basically the same checks that we're removing here, so doing this shouldn't be a significant efficiency loss. See http://cgit.freedesktop.org/xorg/xserver/tree/randr/rrcrtc.c?h=server-1.16-branch#n539	2014-12-11 13:42:44 +01:00
Muhammet Kara	b1ac83d3b6	Updated Turkish translation	2014-12-10 22:22:41 +00:00
Rico Tzschichholz	e73f5cc8ab	build: Require wayland-server >= 1.6.90 Needed since `b832bc7424`	2014-12-10 09:53:46 +01:00
Jasper St. Pierre	593b417e5e	cursor: Don't free the image if it hasn't loaded Otherwise, we'll try to free a null image and crash.	2014-12-04 16:46:30 -08:00
Owen W. Taylor	5e84c8f20b	MetaWindowActor: don't overwrite send_frame_messages_timer If the app finished multiple frames before we sent _NET_WM_FRAME_DRAWN, we could add the send_frame_messages_timer multiple times. In the rare case that the app immediately closed the window, the older timeout could potentially then run on the freed actor. https://bugzilla.gnome.org/show_bug.cgi?id=738686	2014-12-02 11:47:13 -05:00
Owen W. Taylor	9745f9f8ce	Fix problems resulting in left-over queued frames * Use -1 rather than 0 as a flag for pending queue entries; 0 is a valid frame_counter value from Cogl. * Consistently handle the fact we can have more than one pending entry. It's app misbehavior to submit a new frame before _NET_WM_FRAME_DRAWN is received; but we accept such frame messages, so we can't just leak them. * If we remove send_frame_message_timer, assign the current frame counter to pending entries. * To try to avoid regressing on this, when sending _NET_WM_FRAME_TIMINGS messages, if we have stale messages, or messages with no frame drawn time, warn and remove them from the queue rather than just accumulating. * Improve commenting. https://bugzilla.gnome.org/show_bug.cgi?id=738686	2014-12-02 11:47:13 -05:00
Trần Ngọc Quân	99f7be33ad	Updated Vietnamese translation Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com>	2014-12-02 15:03:58 +07:00
Jasper St. Pierre	6492845f27	display: Unknown keyboard resize ops are resizing ops This fixes the resize popup not showing up when doing a keyboard resize.	2014-12-01 08:31:49 -08:00
Jasper St. Pierre	fd1243d881	cursor: Load cursor images lazily It doesn't make sense to load cursor textures that we might not ever use. Since the code here also uses CoglTexture2D, and cursors tend to be NPOT textures, then we won't crash users of cards without NPOT support. At least until they open the magnifier. :)	2014-11-27 14:38:07 -08:00
Florian Müllner	00535b34b6	Bump version to 3.15.2 Update NEWS.	2014-11-27 13:23:57 +00:00
Jasper St. Pierre	a2b2a7a26f	display: Call grab_op_ended after actually ending the grab op Otherwise, we'll still think we're resizing the window when we send out the configure, causing apps that care about that to get stuck in that state.	2014-11-26 15:43:32 -08:00
Jasper St. Pierre	9fdf487da1	pointer: Actually do change the focus during window ops Whenever the compositor takes a grab, we're supposed send leave/enter events to the current surface, which makes sense, as the compositor has stolen the pointer from the client. I forget why I added the special case in the first place, but it's likely a bug that's since been fixed. This actually fixes a bug: it prevents the need to double-click on X11 application titlebars when grabbing them.	2014-11-26 15:32:18 -08:00
Jasper St. Pierre	c5033616e9	pointer: Sync the focus surface instead of calling set_focus directly set_focus is really meant to be an internal function, and sync_focus_surface should be able to be called at any time and get things right.	2014-11-26 15:29:42 -08:00
Jasper St. Pierre	a0e038f34b	pointer: Forcibly steal pointer focus when the compositor has a grab	2014-11-26 15:29:25 -08:00
Jasper St. Pierre	71dab32769	launcher: Fix a crash that happens when TakeDevice has an error	2014-11-26 13:28:47 -08:00
Jasper St. Pierre	c408cf7aac	window-x11: Fix windows that set empty input shapes Windows that set empty input shapes get n_rects of 0 when querying them later, which makes sense, but the code that interpreted the result translated it into a NULL input shape, which meant it was the same as the bounding region. As such, an empty input shape would actually get interpreted as a full input shape! We, ourselves, set an empty input shape on tray icon windows in gnome-shell since we would handle the picking ourselves. This meant that we'd actually get the MetaSurfaceActorX11 when hovering over the tray icon, instead of the ShellGTKEmbed that we capture events on and react to. This fixes weird tray icon behavior in gnome-shell.	2014-11-26 12:51:35 -08:00
Carlos Garnacho	e96eb0e82e	compositor: Always recurse over surface children actors when picking The parent pick() implementation in ClutterActor only recurses if the vfunc is untouched, which means it's up to the MetaWaylandSurface implementation to actually recurse, just the same as if an input mask applied. https://bugzilla.gnome.org/show_bug.cgi?id=738890	2014-11-24 14:44:11 +01:00
Jasper St. Pierre	0015963457	pointer: Make sure to always update the focus surface after repicking Our current and focus surfaces might get out of sync during destruction, which is odd, but just always do this to satisfy it.	2014-11-22 17:06:42 -08:00
Jasper St. Pierre	b832bc7424	wayland: Upgrade to v2 of data-device To fix a resource leak.	2014-11-22 12:22:02 -08:00
Jasper St. Pierre	89b14babb9	monitor-config: Fix warning	2014-11-22 12:21:54 -08:00
Ray Strode	7ecde19aee	Revert "screen: Set a black background for testing purposes" This reverts commit `ec8ed1dbb0`. 1) It turns out to add a momentary flicker from the transition between the login screen and user session 2) It actually isn't needed anymore since bug 733026 https://bugzilla.gnome.org/show_bug.cgi?id=740377	2014-11-20 14:44:21 -05:00
Jonathon Jongsma	d7854794cf	monitor-manager: check framebuffer limits for all configs Refactor make_default_config() to always sanity-check the configuration to ensure that it fits within the framebuffer. Previously, this was only done for the default linear configuration.	2014-11-20 12:24:16 -06:00
Jonathon Jongsma	f6f5f624d4	monitor-manager: Add support for suggested position for outputs In recent versions of the QXL driver, it may set "suggested X\|Y" connector properties. These properties are used to indicate the position at which multiple displays should be aligned. If all outputs have a suggested position, the displays are arranged according to these positions, otherwise we fall back to the default configuration. At the moment, we trust that the driver has chosen sane values for the suggested position.	2014-11-20 12:24:16 -06:00
Jonathon Jongsma	7012c82fc7	monitor-config: ignore stored config when hotplug_mode_update is set When the output device has hotplug_mode_update (e.g. the qxl driver used in vms), the displays can be dynamically resized, so the current display configuration does not often match a stored configuration. When a new monitor is added, make_default_config() tries to create a new display configuration by choosing a stored configuration with N-1 monitors, and then adding a new monitor to the end of the layout. Because the stored config doesn't match the current outputs, apply_configuration() will routinely fail, leaving the additional display unconfigured. In this case, it's more useful to just fall back to creating a new default configuration from scratch so that all outputs get configured to their preferred mode.	2014-11-20 12:24:16 -06:00
Jonathon Jongsma	a0d2d207e7	monitor-config: refactor make_default_config() Move logic for creating different types of configurations into separate functions. This keeps things a bit cleaner and allows us to add alternate configuration types more easily.	2014-11-20 12:24:16 -06:00
Florian Müllner	6e25c37da1	window-actor: Do not request unredirection when destroyed WindowActors can outlive their corresponding window to animate unmap. Unredirecting the actor does not make sense in that case, so make sure to not request it. https://bugzilla.gnome.org/show_bug.cgi?id=740133	2014-11-18 16:10:12 +01:00
Kjartan Maraas	061f434201	Updated Norwegian bokmål translation.	2014-11-15 18:34:58 +01:00
Ting-Wei Lan	638087fe78	build: Fix gtk-doc build failure when native backend is disabled https://bugzilla.gnome.org/show_bug.cgi?id=731521	2014-11-15 01:03:29 +08:00
Jasper St. Pierre	286a6ada5a	window: Make sure size hints are applied in client rect on unfullscreen	2014-11-12 17:53:44 -08:00
Jasper St. Pierre	cb66ab5a87	constraints: Fix up aspect ratio math for frame rect conversion	2014-11-10 15:49:06 -08:00