Revert 228e9091af79a76819292467f17ad1ad7c6483c3 (#153) upstream.

Bug #1787612.
epel8
Bojan Smojver 5 years ago
parent 0cbc50a21a
commit 525a91ae7c

@ -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;

@ -2,12 +2,13 @@
Name: xorgxrdp Name: xorgxrdp
Version: 0.2.12 Version: 0.2.12
Release: 1%{?dist} Release: 2%{?dist}
Summary: Implementation of xrdp backend as Xorg modules Summary: Implementation of xrdp backend as Xorg modules
License: MIT License: MIT
URL: https://github.com/neutrinolabs/xorgxrdp URL: https://github.com/neutrinolabs/xorgxrdp
Source0: https://github.com/neutrinolabs/xorgxrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz 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: nasm
BuildRequires: xorg-x11-server-devel BuildRequires: xorg-x11-server-devel
@ -55,6 +56,10 @@ for screen resizing and multiple monitors.
%changelog %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 * Wed Dec 11 2019 Bojan Smojver <bojan@rexursive.com> - 0.2.12-1
- Bump up to 0.2.12 - Bump up to 0.2.12

Loading…
Cancel
Save