ChangeLog

+commit 8ec78275a80734536ee1f6697683294bbe60db6b
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Mar 18 16:50:29 2018 -0400
+
+    Cast to correct types
+
+commit f21d72873ea5a9f12cd8288441971e8ecb4a45e0
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Mar 18 16:44:50 2018 -0400
+
+    Add missing static
+
+commit 591f53a97139b289d27382978e02319e949a5ef1
+Author: Emanuele Petriglia <inbox@emanuelepetriglia.me>
+Date:   Sun Mar 18 18:31:54 2018 +0100
+
+    I18n: Update translation it (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit b4fcbc514426749b8754edc32a1ce6313437ab6d
+Author: Πέτρος Σαμαράς <psamaras1@gmail.com>
+Date:   Sun Mar 18 18:31:54 2018 +0100
+
+    I18n: Update translation el (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 558ef884097efb20b83f965af21bc2b59186baa3
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Tue Mar 13 21:35:55 2018 -0400
+
+    Add files to .gitignore
+
+commit 93462f3008826eb97d4f354d973db566551d29e0
+Merge: 4779448 e672bc0
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Tue Mar 13 21:13:35 2018 -0400
+
+    Merge remote-tracking branch 'ochosi/draw-active-last' into xfce-4.12
+
+commit 4779448c30576681c58a531a3712a9ba41c1f01a
+Author: Anonymous <noreply@xfce.org>
+Date:   Wed Mar 14 00:31:14 2018 +0100
+
+    I18n: Update translation da (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit e672bc0f2118f9b90c09f23b2e75272da600f0c5
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Mon Mar 12 23:20:38 2018 +0100
+
+    display: Always draw active display last so it's on top
+    
+    This is especially useful when multiple displays overlay and ensures
+    that the currently active output's name is clearly readable and
+    therefore distinguishable.
+    Also tweaked the alpha values of both displays as a result.
+
+commit 00b0f9e0349988f3dcfab9b042cbb702cd90246f
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Mon Mar 12 22:53:03 2018 +0100
+
+    display: Fix race condition on monitor dis/connecting
+
+commit 8441a949aadc6e2ef4fec011856c5aefb259eff3
+Merge: db0fcec 34396b2
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Mar 11 08:07:56 2018 -0400
+
+    Merge remote-tracking branch 'schuellerf/mirrored-cloned-inconsistent-4.12' into xfce-4.12
+
+commit db0fcec8f9cf48ff8363b8ef8c9be2eb4694edbd
+Author: abuyop <abuyop@gmail.com>
+Date:   Sun Mar 11 12:31:26 2018 +0100
+
+    I18n: Update translation ms (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 6494c64b2eeee74a00c01e6a5ef930ca02d48497
+Author: Erlend Østlie <erlendandreas12368@gmail.com>
+Date:   Sat Mar 10 18:31:33 2018 +0100
+
+    I18n: Update translation nb (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit bef17732eb8d6ef8b62c1db6010d6b1941622385
+Author: Zmicer Turok <zmicerturok@gmail.com>
+Date:   Sat Mar 10 00:31:33 2018 +0100
+
+    I18n: Add new translation be (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 436448a3ab9c448f4f8785b3c751d05bc6136170
+Author: Necdet Yücel <necdetyucel@gmail.com>
+Date:   Mon Mar 5 06:31:14 2018 +0100
+
+    I18n: Update translation tr (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 0e17dea042098f65dd0bc33da4f533c2492e396c
+Author: Florian Schüller <florian.schueller@gmail.com>
+Date:   Sun Mar 4 00:33:45 2018 +0100
+
+    display: Fix multimonitor position in extended mode
+    
+    When adding more than two monitors the widths should be added for all
+    subsequent monitors.
+
+commit 34396b237268d32959b1c28d297b9b574097446e
+Author: Florian Schüller <florian.schueller@gmail.com>
+Date:   Sun Mar 4 00:13:07 2018 +0100
+
+    Fixed multimonitor position in extended mode
+    
+    When adding more than two monitors the widths should be added for all subsequent monitors
+
+commit e42a9a3ef7b5af5532c08314ec52824536ffbba9
+Author: Florian Schüller <florian.schueller@gmail.com>
+Date:   Sat Mar 3 22:38:50 2018 +0100
+
+    Avoid Segfault on reconnect scenario
+    
+    I can reproduce a segfault with:
+     * Connect a monitor (Monitors "overlap" now)
+     * Select mirror mode
+     * Apply
+     * Disconnect monitor
+     * Connect monitor again
+
+commit 52d69f9e9509039cd76b4d231c7172438f5c3cf0
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Fri Mar 2 23:09:07 2018 +0100
+
+    Fix the mirror state machine by visualizing all three states
+    
+    The three states are:
+     0: not cloned
+     1: cloned (same x/y, same resolution)
+     2: mirrored (same x/y, different resolution)
+    
+    In the case of 2 I added some precautions to make both overlapping
+    displays visible, so the user knows what the current state is.
+    
+    TODO: Make sure the resolution combobox is updated correctly when the
+    mirror checkbox is clicked (currently it remains unaltered, even if the
+    resolution would change through enabling mirror mode).
+
+commit 8e6f47ba40e7e5186a86851df078923285c60c90
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Fri Mar 2 16:22:11 2018 +0100
+
+    display: Visually note if two displays overlap (mirrored) but are not cloned
+
+commit d02a6e0a9bdb58584f13f23e864647360f219f8b
+Author: Påvel Nicklasson <pavel2@frimix.se>
+Date:   Fri Mar 2 18:31:25 2018 +0100
+
+    I18n: Update translation sv (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 045fa132933ae11bbce65b778bc3afc33e982e57
+Author: Anonymous <noreply@xfce.org>
+Date:   Fri Mar 2 06:31:30 2018 +0100
+
+    I18n: Update translation pl (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 20b5c3f07c576f0c1cb65511d699141ba82fe045
+Author: Саша Петровић <salepetronije@gmail.com>
+Date:   Thu Mar 1 12:31:20 2018 +0100
+
+    I18n: Update translation sr (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 17a31c24497e53975c6969035b19e14d6e2a790b
+Author: Andre Miranda <andre42m@gmail.com>
+Date:   Thu Mar 1 06:31:30 2018 +0100
+
+    I18n: Update translation pt_BR (100%).
+    
+    359 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit b6919f87e7b9656ee5c3f8f7ea4378cce7105b44
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Wed Feb 28 19:18:07 2018 -0500
+
+    Updates for release
+
 commit bbce4f56ac9bb46e26f05aa47eade1a8074e3157
 Author: gabrieltandil <gabriel.tandil@gmail.com>
 Date:   Wed Feb 28 18:31:38 2018 +0100

NEWS

+4.12.3
+======
+- Improvements for multimonitor support:
+  - Visualize all three display configuration states
+  - Visually note if two displays overlap (mirrored) but are not cloned
+  - Always draw active display last so it's on top
+  - Fix: Correctly position monitors in extended mode
+  - Fix: Race condition with monitor connect and disconnect
+  - Fix: Segfault on monitor reconnect
+- Translation updates: Belarusian, Danish, Greek, Italian, Malay,
+  Norwegian Bokmål, Polish, Portuguese (Brazil), Serbian, Swedish, Turkish
+
 4.12.2
 ======
 - Fix: Leave monitors where they were if possible (Xfce #14096)

aclocal.m4

@@ -47,7 +47,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 #
 # Modified to require ngettext
 # Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
+
+# Increment this whenever this file is changed.
+#serial 1
+
 # We need this here as well, since someone might use autoconf-2.5x
 # to configure GLib then an older version to configure a package
 # using AM_GLIB_GNU_GETTEXT

config.sub

 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2017-11-23'
+timestamp='2018-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
 
     *local*)
        # First pass through any local machine types.
-       echo $1
+       echo "$1"
        exit ;;
 
     * )
@@ -112,7 +112,7 @@ esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
@@ -120,16 +120,16 @@ case $maybe_os in
   kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
   android-linux)
     os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     ;;
   *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+    if [ "$basic_machine" != "$1" ]
+    then os=`echo "$1" | sed 's/.*-/-/'`
     else os=; fi
     ;;
 esac
@@ -178,44 +178,44 @@ case $os in
 		;;
 	-sco6)
 		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
@@ -227,7 +227,7 @@ case $os in
 		os=-lynxos
 		;;
 	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
 		;;
 	-psos*)
 		os=-psos
@@ -296,7 +296,7 @@ case $basic_machine in
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
+	| pdp10 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pru \
 	| pyramid \
@@ -333,7 +333,7 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
 	ms1)
 		basic_machine=mt-unknown
@@ -362,7 +362,7 @@ case $basic_machine in
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
@@ -457,7 +457,7 @@ case $basic_machine in
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -491,7 +491,7 @@ case $basic_machine in
 		basic_machine=x86_64-pc
 		;;
 	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	amdahl)
 		basic_machine=580-amdahl
@@ -536,7 +536,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
@@ -544,13 +544,13 @@ case $basic_machine in
 		os=-cnk
 		;;
 	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
@@ -648,7 +648,7 @@ case $basic_machine in
 		os=$os"spe"
 		;;
 	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=$os"spe"
 		;;
 	ebmon29k)
@@ -740,9 +740,6 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	hppa-next)
-		os=-nextstep3
-		;;
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
@@ -755,26 +752,26 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
-	i386-vsta | vsta)
+	vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
@@ -793,19 +790,16 @@ case $basic_machine in
 		os=-sysv
 		;;
 	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
 		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
@@ -837,10 +831,10 @@ case $basic_machine in
 		os=-mint
 		;;
 	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
@@ -859,7 +853,7 @@ case $basic_machine in
 		os=-msdos
 		;;
 	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
 		basic_machine=i686-pc
@@ -946,6 +940,9 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsv-tandem)
+		basic_machine=nsv-tandem
+		;;
 	nsx-tandem)
 		basic_machine=nsx-tandem
 		;;
@@ -981,7 +978,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
@@ -997,7 +994,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		;;
 	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
@@ -1012,16 +1009,16 @@ case $basic_machine in
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -1031,23 +1028,23 @@ case $basic_machine in
 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
@@ -1101,17 +1098,10 @@ case $basic_machine in
 	sequent)
 		basic_machine=i386-sequent
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
+	simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -1130,7 +1120,7 @@ case $basic_machine in
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
@@ -1244,9 +1234,6 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
-	wasm32)
-		basic_machine=wasm32-unknown
-		;;
 	w65*)
 		basic_machine=w65-wdc
 		os=-none
@@ -1266,20 +1253,12 @@ case $basic_machine in
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1308,10 +1287,6 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
@@ -1321,9 +1296,6 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
@@ -1343,7 +1315,7 @@ case $basic_machine in
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1351,10 +1323,10 @@ esac
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@@ -1377,15 +1349,16 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-svr4*)
-		os=-sysv4
-		;;
 	-unixware*)
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
+	# es1800 is here to avoid being matched by es* (a different OS)
+	-es1800*)
+		os=-ose
+		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
@@ -1398,7 +1371,7 @@ case $os in
 	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
 	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -1409,14 +1382,15 @@ case $os in
 	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+	      | -midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1433,12 +1407,12 @@ case $os in
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	-sim | -xray | -os68k* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
@@ -1447,10 +1421,10 @@ case $os in
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
@@ -1461,12 +1435,6 @@ case $os in
 	-wince*)
 		os=-wince
 		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
 	-utek*)
 		os=-bsd
 		;;
@@ -1513,7 +1481,7 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
-	-svr4)
+	-svr4*)
 		os=-sysv4
 		;;
 	-svr3)
@@ -1528,18 +1496,9 @@ case $os in
 	-ose*)
 		os=-ose
 		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
-	-aros*)
-		os=-aros
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1568,7 +1527,7 @@ case $os in
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1664,9 +1623,6 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1721,9 +1677,6 @@ case $basic_machine in
 	i370-*)
 		os=-mvs
 		;;
-	*-next)
-		os=-nextstep3
-		;;
 	*-gould)
 		os=-sysv
 		;;
@@ -1833,11 +1786,11 @@ case $basic_machine in
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo $basic_machine$os
+echo "$basic_machine$os"
 exit
 
 # Local variables:

configure

 #! /bin/sh
-# From configure.ac bbce4f5.
+# From configure.ac 8ec7827.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-settings 4.12.2.
+# Generated by GNU Autoconf 2.69 for xfce4-settings 4.12.3.
 #
 # Report bugs to <http://bugzilla.xfce.org/>.
 #
@@ -594,8 +594,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xfce4-settings'
 PACKAGE_TARNAME='xfce4-settings'
-PACKAGE_VERSION='4.12.2'
-PACKAGE_STRING='xfce4-settings 4.12.2'
+PACKAGE_VERSION='4.12.3'
+PACKAGE_STRING='xfce4-settings 4.12.3'
 PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
 PACKAGE_URL=''
@@ -1527,7 +1527,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xfce4-settings 4.12.2 to adapt to many kinds of systems.
+\`configure' configures xfce4-settings 4.12.3 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1602,7 +1602,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xfce4-settings 4.12.2:";;
+     short | recursive ) echo "Configuration of xfce4-settings 4.12.3:";;
    esac
   cat <<\_ACEOF
@@ -1762,7 +1762,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xfce4-settings configure 4.12.2
+xfce4-settings configure 4.12.3
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2134,7 +2134,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-settings $as_me 4.12.2, which was
+It was created by xfce4-settings $as_me 4.12.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   $ $0 $@
@@ -3001,7 +3001,7 @@ fi
 # Define the identity of the package.
  PACKAGE='xfce4-settings'
- VERSION='4.12.2'
+ VERSION='4.12.3'
 cat >>confdefs.h <<_ACEOF
@@ -13821,7 +13821,7 @@ _ACEOF
-    ALL_LINGUAS="ar ast bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW "
+    ALL_LINGUAS="ar ast be bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW "
    for ac_header in locale.h
 do :
@@ -21143,7 +21143,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xfce4-settings $as_me 4.12.2, which was
+This file was extended by xfce4-settings $as_me 4.12.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -21209,7 +21209,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xfce4-settings config.status 4.12.2
+xfce4-settings config.status 4.12.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

configure.ac

@@ -16,9 +16,9 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [12])
-m4_define([xfce4_settings_version_micro], [2])
+m4_define([xfce4_settings_version_micro], [3])
 m4_define([xfce4_settings_version_nano], [])
-m4_define([xfce4_settings_version_build], [bbce4f5])
+m4_define([xfce4_settings_version_build], [8ec7827])
 m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
 m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
 
@@ -42,7 +42,7 @@ AC_COPYRIGHT([Copyright (c) 2008-2015
 AC_INIT([xfce4-settings], [xfce4_settings_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
 AC_CONFIG_MACRO_DIR([m4])
-AC_REVISION([bbce4f5])
+AC_REVISION([8ec7827])
 
 dnl ***************************
 dnl *** Initialize automake ***
@@ -83,7 +83,7 @@ AC_CHECK_FUNCS([daemon setsid])
 dnl ******************************
 dnl *** Check for i18n support ***
 dnl ******************************
-XDT_I18N([ar ast bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW ])
+XDT_I18N([ar ast be bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sr sv te th tr ug uk ur_PK ur zh_CN zh_HK zh_TW ])
 
 dnl ***********************************
 dnl *** Version string for the docs ***

debian/changelog

+xfce4-settings (4.12.3-1) unstable; urgency=medium
+
+  * d/gbp.conf added, following DEP-14
+  * New upstream version 4.12.3
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 13 Apr 2018 13:40:57 +0200
+
 xfce4-settings (4.12.2-1) unstable; urgency=medium
 
   * Moved the package to git on salsa.debian.org

debian/gbp.conf

+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/sid
+upstream-branch = upstream/sid

dialogs/accessibility-settings/find-cursor.c

@@ -47,6 +47,7 @@ gint workaround_offset = 1;
 
 
 
+static
 gboolean timeout (gpointer data) {
     GtkWidget *widget = GTK_WIDGET (data);
     gtk_widget_queue_draw (widget);

dialogs/display-settings/main.c

@@ -166,6 +166,8 @@ static void display_settings_minimal_only_display2_toggled   (GtkToggleButton *b
 static void display_setting_primary_toggled                  (GtkToggleButton *button,
                                                               GtkBuilder *builder);
 
+static void display_setting_mirror_displays_populate         (GtkBuilder *builder);
+
 static void
 display_settings_changed (void)
 {
@@ -176,14 +178,15 @@ static XfceOutputInfo*
 get_nth_xfce_output_info(gint id)
 {
     XfceOutputInfo *output = NULL;
+    GList * entry = NULL;
 
     if (current_outputs)
-        output = g_list_nth (current_outputs, id)->data;
+        entry = g_list_nth (current_outputs, id);
 
-    if (output)
-        return output;
+    if (entry)
+        output = entry->data;
 
-    return NULL;
+    return output;
 }
 
 static void
@@ -482,8 +485,12 @@ display_setting_refresh_rates_changed (GtkComboBox *combobox,
     /* Set new mode */
     xfce_randr->mode[active_output] = value;
 
+    /* In any case, check if we're now in mirror mode */
+    display_setting_mirror_displays_populate (builder);
+
     /* Apply the changes */
     display_settings_changed ();
+    foo_scroll_area_invalidate (FOO_SCROLL_AREA (randr_gui_area));
 }
 
 static void
@@ -549,6 +556,9 @@ display_setting_refresh_rates_populate (GtkBuilder *builder)
     if (gtk_combo_box_get_active (GTK_COMBO_BOX (combobox)) == -1)
         gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), &iter);
 
+    /* In any case, check if we're now in mirror mode */
+    display_setting_mirror_displays_populate (builder);
+
     /* Unblock the signal */
     g_signal_handlers_unblock_by_func (combobox, display_setting_refresh_rates_changed,
                                        builder);
@@ -877,6 +887,10 @@ display_setting_mirror_displays_toggled (GtkToggleButton *togglebutton,
     if (!xfce_randr)
         return;
 
+    /* reset the inconsistent state, since the mirror checkbutton is being toggled */
+    if (gtk_toggle_button_get_inconsistent(togglebutton))
+        gtk_toggle_button_set_inconsistent (togglebutton, FALSE);
+
     if (gtk_toggle_button_get_active (togglebutton))
     {
         /* Activate mirror-mode with a single mode for all of them */
@@ -905,7 +919,7 @@ display_setting_mirror_displays_toggled (GtkToggleButton *togglebutton,
             xfce_randr->position[n].x = pos;
             xfce_randr->position[n].y = 0;
 
-            pos = xfce_randr_mode_width (xfce_randr_find_mode_by_id (xfce_randr, n, xfce_randr->mode[n]), 0);
+            pos += xfce_randr_mode_width (xfce_randr_find_mode_by_id (xfce_randr, n, xfce_randr->mode[n]), 0);
         }
     }
 
@@ -913,12 +927,14 @@ display_setting_mirror_displays_toggled (GtkToggleButton *togglebutton,
     for (n = 0; n < xfce_randr->noutput; n++)
     {
         output = get_nth_xfce_output_info (n);
+        if (output) {
             output->rotation = xfce_randr->rotation[n];
             output->x = xfce_randr->position[n].x;
             output->y = xfce_randr->position[n].y;
             output->mirrored = xfce_randr->mirrored[n];
             output->width = xfce_randr_mode_width (xfce_randr_find_mode_by_id (xfce_randr, n, xfce_randr->mode[n]), 0);
             output->height = xfce_randr_mode_height (xfce_randr_find_mode_by_id (xfce_randr, n, xfce_randr->mode[n]), 0);
+        } /* else: some kind of racecondition during re-connect? - just ignore */
     }
 
     /* Apply the changes */
@@ -933,6 +949,7 @@ display_setting_mirror_displays_populate (GtkBuilder *builder)
     RRMode   mode = None;
     guint    n;
     gint     cloned = TRUE;
+    gint     mirrored;
 
     if (!xfce_randr)
         return;
@@ -970,12 +987,25 @@ display_setting_mirror_displays_populate (GtkBuilder *builder)
 
         cloned &= (xfce_randr->mode[n] == mode &&
                    xfce_randr->mirrored[n]);
+        mirrored = xfce_randr->mirrored[n];
 
         if (!cloned)
             break;
     }
 
+    /* if two displays are 'mirrored', i.e. their x and y positions are the same
+       we set the checkbutton to the inconsistent state */
+    if (mirrored == TRUE && cloned == FALSE)
+    {
+        gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (check), 1);
+    }
+    else
+    {
+        if (gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (check)))
+            gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (check), 0);
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cloned);
+    }
+
 
     /* Unblock the signal */
     g_signal_handlers_unblock_by_func (check, display_setting_mirror_displays_toggled,
@@ -1554,12 +1584,19 @@ screen_on_event (GdkXEvent *xevent,
 }
 
 /* Xfce RANDR GUI **TODO** Place these functions in a sensible location */
-static gboolean
+/* This function checks the status quo of more than one display with respect to
+   cloning and mirroring and returns:
+      0: not cloned
+      1: cloned (same x/y, same resolution)
+      2: mirrored (same x/y, different resolution)
+*/
+static gint
 get_mirrored_configuration (void)
 {
-    gboolean cloned = FALSE;
+    gboolean cloned = TRUE;
     RRMode   mode = None;
     guint    n;
+    gint     mirrored;
 
     if (!xfce_randr)
         return FALSE;
@@ -1572,7 +1609,7 @@ get_mirrored_configuration (void)
         mode = xfce_randr_clonable_mode (xfce_randr);
 
     if (mode == None)
-        return FALSE;
+        return 0;
 
     /* Check if mirror settings are on */
     for (n = 0; n < xfce_randr->noutput; n++)
@@ -1580,12 +1617,17 @@ get_mirrored_configuration (void)
         if (xfce_randr->mode[n] == None)
             continue;
 
-        cloned = xfce_randr->mirrored[n];
+        cloned &= (xfce_randr->mode[n] == mode &&
+                   xfce_randr->mirrored[n]);
+        mirrored = xfce_randr->mirrored[n];
 
         if (!cloned)
             break;
     }
 
+    if (mirrored == TRUE && cloned == FALSE)
+        return 2;
+    else
         return cloned;
 }
 
@@ -2224,14 +2266,16 @@ on_output_event (FooScrollArea      *area,
                  gpointer            data)
 {
     XfceOutputInfo *output = data;
+    gint            mirrored;
 
     //App *app = g_object_get_data (G_OBJECT (area), "app");
 
+    mirrored = get_mirrored_configuration();
     /* If the mouse is inside the outputs, set the cursor to "you can move me".  See
      * on_canvas_event() for where we reset the cursor to the default if it
      * exits the outputs' area.
      */
-    if (!get_mirrored_configuration() && get_n_connected() > 1)
+    if (!mirrored == 1 && get_n_connected() > 1)
         set_cursor (GTK_WIDGET (area), GDK_FLEUR);
 
     if (event->type == FOO_BUTTON_PRESS)
@@ -2240,7 +2284,7 @@ on_output_event (FooScrollArea      *area,
 
         gtk_combo_box_set_active (GTK_COMBO_BOX(randr_outputs_combobox), output->id);
 
-        if (!get_mirrored_configuration() && get_n_connected() > 1)
+        if (!mirrored == 1 && get_n_connected() > 1)
         {
             foo_scroll_area_begin_grab (area, on_output_event, data);
 
@@ -2344,29 +2388,6 @@ on_canvas_event (FooScrollArea      *area,
     set_cursor (GTK_WIDGET (area), GDK_BLANK_CURSOR);
 }
 
-static PangoLayout *
-get_display_name (XfceOutputInfo *output)
-{
-    const char *text;
-
-    if (get_mirrored_configuration())
-    {
-    /* Translators:  this is the feature where what you see on your laptop's
-     * screen is the same as your external monitor.  Here, "Mirror" is being
-     * used as an adjective, not as a verb.  For example, the Spanish
-     * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
-     */
-        text = _("Mirror Screens");
-    }
-    else
-    {
-        text = output->display_name;
-    }
-
-    return gtk_widget_create_pango_layout (
-    GTK_WIDGET (randr_gui_area), text);
-}
-
 static void
 paint_background (FooScrollArea *area,
                   cairo_t       *cr)
@@ -2409,20 +2430,31 @@ paint_output (cairo_t *cr, int i, double *snap_x, double *snap_y)
     double x, y, end_x, end_y;
     gint total_w, total_h;
     GList *connected_outputs = list_connected_outputs (&total_w, &total_h);
-    XfceOutputInfo *output = g_list_nth (connected_outputs, i)->data;
-    PangoLayout *layout = get_display_name (output);
+    XfceOutputInfo *output = NULL;
+    GList *entry = NULL;
+    PangoLayout *layout;
     PangoRectangle ink_extent, log_extent;
     GdkRectangle viewport;
     cairo_pattern_t *pat_lin = NULL, *pat_radial = NULL;
     double alpha = 1.0;
     double available_w;
     double factor = 1.0;
+    const char *text;
+    gint    mirrored;
+
+    mirrored = get_mirrored_configuration();
 
     cairo_save (cr);
 
     foo_scroll_area_get_viewport (FOO_SCROLL_AREA (randr_gui_area), &viewport);
 
+    entry = g_list_nth (connected_outputs, i);
+    if (entry)
+        output = entry->data;
+    if (output)
         get_geometry (output, &w, &h);
+    else
+        return;
 
     viewport.height -= 2 * MARGIN;
     viewport.width -= 2 * MARGIN;
@@ -2469,8 +2501,18 @@ paint_output (cairo_t *cr, int i, double *snap_x, double *snap_y)
 
     cairo_set_line_width (cr, 1.0);
 
-    if (output->id != active_output)
-        alpha = 0.8;
+    /* Make overlapping displays ('mirrored') more transparent so both displays can
+       be recognized more easily */
+    if (output->id != active_output && mirrored == 2)
+        alpha = 0.5;
+    /* When displays are mirrored it makes no sense to make them semi-transparent
+       because they overlay each other completely */
+    else if (mirrored == 1)
+        alpha = 1.0;
+    /* the inactive display should be more transparent and the overlapping one as
+       well */
+    else if (output->id != active_output || mirrored == 2)
+        alpha = 0.7;
 
     if (output->on)
     {
@@ -2521,6 +2563,20 @@ paint_output (cairo_t *cr, int i, double *snap_x, double *snap_y)
     cairo_fill (cr);
 
     /* Display name label*/
+    if (mirrored == 1)
+    {
+    /* Translators:  this is the feature where what you see on your laptop's
+     * screen is the same as your external monitor.  Here, "Mirror" is being
+     * used as an adjective, not as a verb.  For example, the Spanish
+     * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+     */
+        text = _("Mirror Screens");
+    }
+    else
+    {
+        text = output->display_name;
+    }
+    layout = gtk_widget_create_pango_layout (GTK_WIDGET (randr_gui_area), text);
     layout_set_font (layout, "Sans Bold 12");
     pango_layout_get_pixel_extents (layout, &ink_extent, &log_extent);
 
@@ -2538,6 +2594,10 @@ paint_output (cairo_t *cr, int i, double *snap_x, double *snap_y)
     cairo_move_to (cr,
                    x + ((w * scale + 0.5) - factor * log_extent.width) / 2,
                    y + ((h * scale + 0.5) - factor * log_extent.height) / 2 - 1);
+    /* Try to make the text as readable as possible for overlapping displays */
+    if (output->id == active_output && mirrored == 2)
+       cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, alpha);
+    else
         cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, alpha - 0.6);
 
     pango_cairo_show_layout (cr, layout);
@@ -2546,6 +2606,11 @@ paint_output (cairo_t *cr, int i, double *snap_x, double *snap_y)
                    x + ((w * scale + 0.5) - factor * log_extent.width) / 2,
                    y + ((h * scale + 0.5) - factor * log_extent.height) / 2);
 
+    /* Try to make the text as readable as possible for overlapping displays - the
+       currently selected one could be painted below the other display*/
+    if (output->id == active_output && mirrored == 2)
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0);
+    else
         cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, alpha);
 
     pango_cairo_show_layout (cr, layout);
@@ -2598,11 +2663,21 @@ on_area_paint (FooScrollArea *area,
 
     for (list = connected_outputs; list != NULL; list = list->next)
     {
-        paint_output (cr, g_list_position (connected_outputs, list), &x, &y);
+        gint i;
+
+        i = g_list_position (connected_outputs, list);
+        /* Always paint the currently selected display last, i.e. on top, so it's
+           visible and the name is readable */
+        if (i == active_output) {
+            continue;
+        }
+        paint_output (cr, i, &x, &y);
 
-        if (get_mirrored_configuration())
+        if (get_mirrored_configuration() == 1)
             break;
     }
+    /* Finally also paint the active output */
+    paint_output (cr, active_output, &x, &y);
 }
 
 static XfceOutputInfo *

po/da.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-26 18:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Linuxbruger <y.z@live.dk>, 2018\n"
+"Last-Translator: scootergrisen, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/xfce/teams/16840/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -219,15 +219,15 @@ msgstr "Tiden, i millisekunder, for at nå den maksimale hastighed"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:41
 msgid "Show location of pointer on keypress"
-msgstr "Vis lokation af viser på knap-pres "
+msgstr "Vis placering af markør ved tastetryk"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:42
 msgid ""
 "Bind a keyboard shortcut to xfce4-find-cursor to get visual feedback of the "
 "mouse pointer's current location"
 msgstr ""
-"Bind en tastatur genvej til xfce4-find- for at få visuelt tilbagemelding af "
-"mus-markørens nuværende lokation"
+"Bind en tastaturgenvej til xfce4-find-cursor for at få visuel tilbagemelding"
+" af musemarkørens nuværende placering"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:43
 msgid "Mouse Emulation"

po/el.po

@@ -72,7 +72,7 @@ msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "_Lock sticky keys"
-msgstr "Κ_λείδωμα κολλώδη πλήκτρων"
+msgstr "Κ_λείδωμα κολλωδών πλήκτρων"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid ""