summaryrefslogtreecommitdiffstats
path: root/xorg/server/module/rdpClientCon.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-04-23 21:03:28 -0700
committerJay Sorg <jay.sorg@gmail.com>2014-04-23 21:03:28 -0700
commit30375962d6f4ae24cf6b42f3dd4da2020824d338 (patch)
tree1d2141af4b07ca1705b9e6b72e4faf2b0f9db3a0 /xorg/server/module/rdpClientCon.c
parente65c2375031c017e027d8dce5c6a460ae9dfdce7 (diff)
downloadxrdp-proprietary-30375962d6f4ae24cf6b42f3dd4da2020824d338.tar.gz
xrdp-proprietary-30375962d6f4ae24cf6b42f3dd4da2020824d338.zip
xorg: minor change to capture
Diffstat (limited to 'xorg/server/module/rdpClientCon.c')
-rw-r--r--xorg/server/module/rdpClientCon.c38
1 files changed, 24 insertions, 14 deletions
diff --git a/xorg/server/module/rdpClientCon.c b/xorg/server/module/rdpClientCon.c
index 97012428..e375b4e2 100644
--- a/xorg/server/module/rdpClientCon.c
+++ b/xorg/server/module/rdpClientCon.c
@@ -1874,7 +1874,8 @@ rdpClientConCheckDirtyScreen(rdpPtr dev, rdpClientCon *clientCon)
static int
rdpClientConSendPaintRectShmEx(rdpPtr dev, rdpClientCon *clientCon,
struct image_data *id,
- RegionPtr dirtyReg, RegionPtr copyReg)
+ RegionPtr dirtyReg,
+ BoxPtr copyRects, int numCopyRects)
{
int index;
int size;
@@ -1890,7 +1891,7 @@ rdpClientConSendPaintRectShmEx(rdpPtr dev, rdpClientCon *clientCon,
rdpClientConBeginUpdate(dev, clientCon);
num_rects_d = REGION_NUM_RECTS(dirtyReg);
- num_rects_c = REGION_NUM_RECTS(copyReg);
+ num_rects_c = numCopyRects;
if ((num_rects_c < 1) || (num_rects_d < 1))
{
LLOGLN(0, ("rdpClientConSendPaintRectShmEx: nothing to send"));
@@ -1922,7 +1923,7 @@ rdpClientConSendPaintRectShmEx(rdpPtr dev, rdpClientCon *clientCon,
out_uint16_le(s, num_rects_c);
for (index = 0; index < num_rects_c; index++)
{
- box = REGION_RECTS(copyReg)[index];
+ box = copyRects[index];
x = box.x1;
y = box.y1;
cx = box.x2 - box.x1;
@@ -1951,7 +1952,8 @@ static CARD32
rdpDeferredUpdateCallback(OsTimerPtr timer, CARD32 now, pointer arg)
{
rdpClientCon *clientCon;
- RegionRec reg;
+ BoxPtr rects;
+ int num_rects;
struct image_data id;
LLOGLN(10, ("rdpDeferredUpdateCallback:"));
@@ -1977,18 +1979,26 @@ rdpDeferredUpdateCallback(OsTimerPtr timer, CARD32 now, pointer arg)
clientCon->rdp_width, clientCon->rdp_height, clientCon->rdp_Bpp,
id.width, id.height));
clientCon->updateSchedualed = FALSE;
- rdpRegionInit(&reg, NullBox, 0);
- rdpCapture(clientCon->dirtyRegion, &reg,
- id.pixels, id.width, id.height,
- id.lineBytes, XRDP_a8r8g8b8, id.shmem_pixels,
- clientCon->rdp_width, clientCon->rdp_height,
- clientCon->rdp_width * clientCon->rdp_Bpp,
- clientCon->rdp_format, 0);
- rdpClientConSendPaintRectShmEx(clientCon->dev, clientCon, &id,
- clientCon->dirtyRegion, &reg);
+ rects = 0;
+ num_rects = 0;
+ if (rdpCapture(clientCon->dirtyRegion, &rects, &num_rects,
+ id.pixels, id.width, id.height,
+ id.lineBytes, XRDP_a8r8g8b8, id.shmem_pixels,
+ clientCon->rdp_width, clientCon->rdp_height,
+ clientCon->rdp_width * clientCon->rdp_Bpp,
+ clientCon->rdp_format, 0))
+ {
+ rdpClientConSendPaintRectShmEx(clientCon->dev, clientCon, &id,
+ clientCon->dirtyRegion,
+ rects, num_rects);
+ g_free(rects);
+ }
+ else
+ {
+ LLOGLN(0, ("rdpDeferredUpdateCallback: rdpCapture failed"));
+ }
rdpRegionDestroy(clientCon->dirtyRegion);
clientCon->dirtyRegion = rdpRegionCreate(NullBox, 0);
- rdpRegionUninit(&reg);
return 0;
}