1*4882a593SmuzhiyunFrom 29c87ee9c3aac4811880d3a0d844ba311813be4f Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com>
3*4882a593SmuzhiyunDate: Fri, 9 Aug 2019 10:01:15 +0800
4*4882a593SmuzhiyunSubject: [PATCH 5/5] client: X11: Disable complex regions by default
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunDoing complex regions update is very slow with xserver 2d
7*4882a593Smuzhiyunaccels(exa/glamor), let's disable it by default.
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunUse "XFREERDP_COMPLEX_REGIONS" environment to enable it.
10*4882a593Smuzhiyun
11*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
12*4882a593Smuzhiyun---
13*4882a593Smuzhiyun client/X11/xf_client.c | 3 +++
14*4882a593Smuzhiyun client/X11/xf_gdi.c    | 5 +++++
15*4882a593Smuzhiyun 2 files changed, 8 insertions(+)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/client/X11/xf_client.c b/client/X11/xf_client.c
18*4882a593Smuzhiyunindex bd3eb0d..c846642 100644
19*4882a593Smuzhiyun--- a/client/X11/xf_client.c
20*4882a593Smuzhiyun+++ b/client/X11/xf_client.c
21*4882a593Smuzhiyun@@ -1939,6 +1939,9 @@ static BOOL xfreerdp_client_new(freerdp* instance, rdpContext* context)
22*4882a593Smuzhiyun 	xfc->_NET_SUPPORTED = XInternAtom(xfc->display, "_NET_SUPPORTED", True);
23*4882a593Smuzhiyun 	xfc->_NET_SUPPORTING_WM_CHECK = XInternAtom(xfc->display, "_NET_SUPPORTING_WM_CHECK", True);
24*4882a593Smuzhiyun
25*4882a593Smuzhiyun+	if (!getenv("XFREERDP_COMPLEX_REGIONS"))
26*4882a593Smuzhiyun+		xfc->complex_regions = FALSE;
27*4882a593Smuzhiyun+
28*4882a593Smuzhiyun 	if ((xfc->_NET_SUPPORTED != None) && (xfc->_NET_SUPPORTING_WM_CHECK != None))
29*4882a593Smuzhiyun 	{
30*4882a593Smuzhiyun 		Atom actual_type = 0;
31*4882a593Smuzhiyundiff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c
32*4882a593Smuzhiyunindex 4f52853..cde6904 100644
33*4882a593Smuzhiyun--- a/client/X11/xf_gdi.c
34*4882a593Smuzhiyun+++ b/client/X11/xf_gdi.c
35*4882a593Smuzhiyun@@ -994,6 +994,11 @@ static BOOL xf_gdi_update_screen(xfContext* xfc, const BYTE* pSrcData, UINT32 sc
36*4882a593Smuzhiyun 	XSetFunction(xfc->display, xfc->gc, GXcopy);
37*4882a593Smuzhiyun 	XSetFillStyle(xfc->display, xfc->gc, FillSolid);
38*4882a593Smuzhiyun
39*4882a593Smuzhiyun+	if (!xfc->complex_regions) {
40*4882a593Smuzhiyun+		nbRects = 1;
41*4882a593Smuzhiyun+		rects = region16_extents(pRegion);
42*4882a593Smuzhiyun+	}
43*4882a593Smuzhiyun+
44*4882a593Smuzhiyun 	for (i = 0; i < nbRects; i++)
45*4882a593Smuzhiyun 	{
46*4882a593Smuzhiyun 		UINT32 left = rects[i].left;
47*4882a593Smuzhiyun--
48*4882a593Smuzhiyun2.20.1
49*4882a593Smuzhiyun
50