From 525a91ae7c72444867fcf52f033e50047bda2628 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Sat, 4 Jan 2020 06:59:18 +1100
Subject: [PATCH] Revert 228e9091af79a76819292467f17ad1ad7c6483c3 (#153)
 upstream. Bug #1787612.

---
 xorgxrdp-0.2.12-xrandr-resize-revert.patch | 48 ++++++++++++++++++++++
 xorgxrdp.spec                              |  7 +++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 xorgxrdp-0.2.12-xrandr-resize-revert.patch

diff --git a/xorgxrdp-0.2.12-xrandr-resize-revert.patch b/xorgxrdp-0.2.12-xrandr-resize-revert.patch
new file mode 100644
index 0000000..08b34eb
--- /dev/null
+++ b/xorgxrdp-0.2.12-xrandr-resize-revert.patch
@@ -0,0 +1,48 @@
+--- b/module/rdp.h
++++ a/module/rdp.h
+@@ -270,7 +270,6 @@
+     RROutputGetPropertyProcPtr rrOutputGetProperty;
+     RRGetPanningProcPtr rrGetPanning;
+     RRSetPanningProcPtr rrSetPanning;
+-    int allow_screen_resize;
+ 
+     int listen_sck;
+     char uds_data[256];
+--- b/module/rdpClientCon.c
++++ a/module/rdpClientCon.c
+@@ -746,9 +746,7 @@
+ 
+     if ((dev->width != width) || (dev->height != height))
+     {
+-        dev->allow_screen_resize = 1;
+         ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
+-        dev->allow_screen_resize = 0;
+         LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: RRScreenSizeSet ok=[%d]", ok));
+         RRTellChanged(dev->pScreen);
+     }
+--- b/module/rdpRandR.c
++++ a/module/rdpRandR.c
+@@ -127,11 +127,6 @@
+     LLOGLN(0, ("rdpRRScreenSetSize: width %d height %d mmWidth %d mmHeight %d",
+            width, height, (int)mmWidth, (int)mmHeight));
+     dev = rdpGetDevFromScreen(pScreen);
+-    if (dev->allow_screen_resize == 0)
+-    {
+-        LLOGLN(0, ("rdpRRScreenSetSize: not allowing resize"));
+-        return FALSE;
+-    }
+     root = rdpGetRootWindowPtr(pScreen);
+     if ((width < 1) || (height < 1))
+     {
+--- b/xrdpdev/xrdpdev.c
++++ a/xrdpdev/xrdpdev.c
+@@ -359,9 +359,7 @@
+     if ((dev->width != width) || (dev->height != height))
+     {
+         LLOGLN(0, ("  calling RRScreenSizeSet"));
+-        dev->allow_screen_resize = 1;
+         ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
+-        dev->allow_screen_resize = 0;
+         LLOGLN(0, ("  RRScreenSizeSet ok %d", ok));
+     }
+     return ok;
diff --git a/xorgxrdp.spec b/xorgxrdp.spec
index de6303f..1fc9aa5 100644
--- a/xorgxrdp.spec
+++ b/xorgxrdp.spec
@@ -2,12 +2,13 @@
 
 Name:           xorgxrdp
 Version:        0.2.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Implementation of xrdp backend as Xorg modules
 
 License:        MIT
 URL:            https://github.com/neutrinolabs/xorgxrdp
 Source0:        https://github.com/neutrinolabs/xorgxrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Patch0:         xorgxrdp-0.2.12-xrandr-resize-revert.patch
 
 BuildRequires:  nasm
 BuildRequires:  xorg-x11-server-devel
@@ -55,6 +56,10 @@ for screen resizing and multiple monitors.
 
 
 %changelog
+* Sat Jan  4 2020 Bojan Smojver <bojan@rexursive.com> - 0.2.12-2
+- Revert 228e9091af79a76819292467f17ad1ad7c6483c3 (#153) upstream
+- Bug #1787612
+
 * Wed Dec 11 2019 Bojan Smojver <bojan@rexursive.com> - 0.2.12-1
 - Bump up to 0.2.12