xfreerdp: remove duplicated drawing operations
Most of xfreerdp's hw gdi callbacks did the the same X11 drawing operation twice: Initially on the primary pixmap to keep the back buffer up to date and then directly on the window in order to see the result. This sequence is followed by a call to gdi_InvalidateRegion() to mark the rectangular area of the drawing operation. Since in xfreerdp's current design (or better current evolved state) the backbuffer pixmap is obligatory, all drawing operations directly targeting the window are redundant because of the subsequent EndPaint (mapped to xf_hw_end_paint) where the damaged region is copied from the backbuffer to the drawable. - removed X11 drawing operations which directly target the window drawable - fixed some errors in the calculation of the required update regions
This commit is contained in:
Norbert Federa
parent
3fa3384eb4
commit
85297fb343
@ -3,6 +3,8 @@
|
||||
* X11 GDI
|
||||
*
|
||||
* Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
* Copyright 2014 Thincast Technologies GmbH
|
||||
* Copyright 2014 Norbert Federa <norbert.federa@thincast.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -440,10 +442,6 @@ void xf_gdi_dstblt(rdpContext* context, DSTBLT_ORDER* dstblt)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XFillRectangle(xfc->display, xfc->drawable, xfc->gc, dstblt->nLeftRect, dstblt->nTopRect, dstblt->nWidth, dstblt->nHeight);
|
||||
}
|
||||
gdi_InvalidateRegion(xfc->hdc, dstblt->nLeftRect, dstblt->nTopRect, dstblt->nWidth, dstblt->nHeight);
|
||||
}
|
||||
|
||||
@ -531,11 +529,6 @@ void xf_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
XSetFunction(xfc->display, xfc->gc, GXcopy);
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XCopyArea(xfc->display, xfc->primary, xfc->drawable, xfc->gc, patblt->nLeftRect, patblt->nTopRect, patblt->nWidth, patblt->nHeight, patblt->nLeftRect, patblt->nTopRect);
|
||||
}
|
||||
gdi_InvalidateRegion(xfc->hdc, patblt->nLeftRect, patblt->nTopRect, patblt->nWidth, patblt->nHeight);
|
||||
}
|
||||
|
||||
@ -557,19 +550,6 @@ void xf_gdi_scrblt(rdpContext* context, SCRBLT_ORDER* scrblt)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
if (xfc->unobscured)
|
||||
{
|
||||
XCopyArea(xfc->display, xfc->drawable, xfc->drawable, xfc->gc, scrblt->nXSrc, scrblt->nYSrc,
|
||||
scrblt->nWidth, scrblt->nHeight, scrblt->nLeftRect, scrblt->nTopRect);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
XSetFunction(xfc->display, xfc->gc, GXcopy);
|
||||
XCopyArea(xfc->display, xfc->primary, xfc->drawable, xfc->gc, scrblt->nLeftRect, scrblt->nTopRect, scrblt->nWidth, scrblt->nHeight, scrblt->nLeftRect, scrblt->nTopRect);
|
||||
}
|
||||
gdi_InvalidateRegion(xfc->hdc, scrblt->nLeftRect, scrblt->nTopRect, scrblt->nWidth, scrblt->nHeight);
|
||||
}
|
||||
|
||||
@ -597,13 +577,6 @@ void xf_gdi_opaque_rect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XFillRectangle(xfc->display, xfc->drawable, xfc->gc,
|
||||
opaque_rect->nLeftRect, opaque_rect->nTopRect,
|
||||
opaque_rect->nWidth, opaque_rect->nHeight);
|
||||
}
|
||||
|
||||
gdi_InvalidateRegion(xfc->hdc, opaque_rect->nLeftRect, opaque_rect->nTopRect,
|
||||
opaque_rect->nWidth, opaque_rect->nHeight);
|
||||
}
|
||||
@ -636,12 +609,6 @@ void xf_gdi_multi_opaque_rect(rdpContext* context, MULTI_OPAQUE_RECT_ORDER* mult
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XFillRectangle(xfc->display, xfc->drawable, xfc->gc,
|
||||
rectangle->left, rectangle->top,
|
||||
rectangle->width, rectangle->height);
|
||||
}
|
||||
gdi_InvalidateRegion(xfc->hdc, rectangle->left, rectangle->top, rectangle->width, rectangle->height);
|
||||
}
|
||||
}
|
||||
@ -672,24 +639,15 @@ void xf_gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XDrawLine(xfc->display, xfc->drawable, xfc->gc,
|
||||
line_to->nXStart, line_to->nYStart, line_to->nXEnd, line_to->nYEnd);
|
||||
}
|
||||
int width, height;
|
||||
int x, y, w, h;
|
||||
|
||||
width = line_to->nXStart - line_to->nXEnd;
|
||||
height = line_to->nYStart - line_to->nYEnd;
|
||||
x = MIN(line_to->nXStart, line_to->nXEnd);
|
||||
y = MIN(line_to->nYStart, line_to->nYEnd);
|
||||
|
||||
if (width < 0)
|
||||
width *= (-1);
|
||||
|
||||
if (height < 0)
|
||||
height *= (-1);
|
||||
|
||||
gdi_InvalidateRegion(xfc->hdc, line_to->nXStart, line_to->nYStart, width, height);
|
||||
w = abs(line_to->nXEnd - line_to->nXStart) + 1;
|
||||
h = abs(line_to->nYEnd - line_to->nYStart) + 1;
|
||||
|
||||
gdi_InvalidateRegion(xfc->hdc, x, y, w, h);
|
||||
}
|
||||
|
||||
XSetFunction(xfc->display, xfc->gc, GXcopy);
|
||||
@ -697,16 +655,51 @@ void xf_gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to)
|
||||
xf_unlock_x11(xfc, FALSE);
|
||||
}
|
||||
|
||||
static void xf_gdi_invalidate_poly_region(xfContext* xfc, XPoint* points, int npoints, BOOL autoclose)
|
||||
{
|
||||
int i, x, y, x1, y1, x2, y2, w, h;
|
||||
|
||||
x1 = points[0].x;
|
||||
y1 = points[0].y;
|
||||
|
||||
for (i = 1; i <= npoints; i++)
|
||||
{
|
||||
if (i == npoints)
|
||||
{
|
||||
if (!autoclose)
|
||||
break;
|
||||
|
||||
x2 = points[0].x;
|
||||
y2 = points[0].y;
|
||||
|
||||
if (x2 == points[0].x && y2 == points[0].y)
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
x2 = points[i].x + x1;
|
||||
y2 = points[i].y + y1;
|
||||
}
|
||||
|
||||
x = MIN(x1, x2);
|
||||
y = MIN(y1, y2);
|
||||
|
||||
w = abs(x2 - x1) + 1;
|
||||
h = abs(y2 - y1) + 1;
|
||||
|
||||
x1 = x2;
|
||||
y1 = y2;
|
||||
|
||||
gdi_InvalidateRegion(xfc->hdc, x, y, w, h);
|
||||
}
|
||||
}
|
||||
|
||||
void xf_gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline)
|
||||
{
|
||||
int i;
|
||||
int x, y;
|
||||
int x1, y1;
|
||||
int x2, y2;
|
||||
int npoints;
|
||||
UINT32 color;
|
||||
XPoint* points;
|
||||
int width, height;
|
||||
xfContext* xfc = (xfContext*) context;
|
||||
|
||||
xf_lock_x11(xfc, FALSE);
|
||||
@ -733,29 +726,7 @@ void xf_gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XDrawLines(xfc->display, xfc->drawable, xfc->gc, points, npoints, CoordModePrevious);
|
||||
}
|
||||
x1 = points[0].x;
|
||||
y1 = points[0].y;
|
||||
|
||||
for (i = 1; i < npoints; i++)
|
||||
{
|
||||
x2 = points[i].x + x1;
|
||||
y2 = points[i].y + y1;
|
||||
|
||||
x = (x2 < x1) ? x2 : x1;
|
||||
width = (x2 > x1) ? x2 - x1 : x1 - x2;
|
||||
|
||||
y = (y2 < y1) ? y2 : y1;
|
||||
height = (y2 > y1) ? y2 - y1 : y1 - y2;
|
||||
|
||||
x1 = x2;
|
||||
y1 = y2;
|
||||
|
||||
gdi_InvalidateRegion(xfc->hdc, x, y, width, height);
|
||||
}
|
||||
xf_gdi_invalidate_poly_region(xfc, points, npoints, FALSE);
|
||||
}
|
||||
|
||||
XSetFunction(xfc->display, xfc->gc, GXcopy);
|
||||
@ -780,13 +751,6 @@ void xf_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XCopyArea(xfc->display, bitmap->pixmap, xfc->drawable, xfc->gc,
|
||||
memblt->nXSrc, memblt->nYSrc, memblt->nWidth, memblt->nHeight,
|
||||
memblt->nLeftRect, memblt->nTopRect);
|
||||
}
|
||||
|
||||
gdi_InvalidateRegion(xfc->hdc, memblt->nLeftRect, memblt->nTopRect, memblt->nWidth, memblt->nHeight);
|
||||
}
|
||||
|
||||
@ -852,12 +816,6 @@ void xf_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XCopyArea(xfc->display, bitmap->pixmap, xfc->drawable, xfc->gc,
|
||||
mem3blt->nXSrc, mem3blt->nYSrc, mem3blt->nWidth, mem3blt->nHeight,
|
||||
mem3blt->nLeftRect, mem3blt->nTopRect);
|
||||
}
|
||||
gdi_InvalidateRegion(xfc->hdc, mem3blt->nLeftRect, mem3blt->nTopRect, mem3blt->nWidth, mem3blt->nHeight);
|
||||
}
|
||||
|
||||
@ -919,8 +877,7 @@ void xf_gdi_polygon_sc(rdpContext* context, POLYGON_SC_ORDER* polygon_sc)
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
XFillPolygon(xfc->display, xfc->drawable, xfc->gc,
|
||||
points, npoints, Complex, CoordModePrevious);
|
||||
xf_gdi_invalidate_poly_region(xfc, points, npoints, TRUE);
|
||||
}
|
||||
|
||||
XSetFunction(xfc->display, xfc->gc, GXcopy);
|
||||
@ -981,20 +938,6 @@ void xf_gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb)
|
||||
|
||||
XSetFillStyle(xfc->display, xfc->gc, FillTiled);
|
||||
XSetTile(xfc->display, xfc->gc, pattern);
|
||||
XSetTSOrigin(xfc->display, xfc->gc, brush->x, brush->y);
|
||||
|
||||
XFillPolygon(xfc->display, xfc->drawing, xfc->gc,
|
||||
points, npoints, Complex, CoordModePrevious);
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
XFillPolygon(xfc->display, xfc->drawable, xfc->gc,
|
||||
points, npoints, Complex, CoordModePrevious);
|
||||
}
|
||||
|
||||
XSetFillStyle(xfc->display, xfc->gc, FillSolid);
|
||||
XSetTSOrigin(xfc->display, xfc->gc, 0, 0);
|
||||
XFreePixmap(xfc->display, pattern);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1009,20 +952,20 @@ void xf_gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb)
|
||||
XSetFillStyle(xfc->display, xfc->gc, FillOpaqueStippled);
|
||||
|
||||
XSetStipple(xfc->display, xfc->gc, pattern);
|
||||
XSetTSOrigin(xfc->display, xfc->gc, brush->x, brush->y);
|
||||
}
|
||||
|
||||
XFillPolygon(xfc->display, xfc->drawing, xfc->gc,
|
||||
points, npoints, Complex, CoordModePrevious);
|
||||
XSetTSOrigin(xfc->display, xfc->gc, brush->x, brush->y);
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
XFillPolygon(xfc->display, xfc->drawable, xfc->gc,
|
||||
points, npoints, Complex, CoordModePrevious);
|
||||
}
|
||||
XFillPolygon(xfc->display, xfc->drawing, xfc->gc,
|
||||
points, npoints, Complex, CoordModePrevious);
|
||||
|
||||
XSetFillStyle(xfc->display, xfc->gc, FillSolid);
|
||||
XSetTSOrigin(xfc->display, xfc->gc, 0, 0);
|
||||
XFreePixmap(xfc->display, pattern);
|
||||
XSetFillStyle(xfc->display, xfc->gc, FillSolid);
|
||||
XSetTSOrigin(xfc->display, xfc->gc, 0, 0);
|
||||
XFreePixmap(xfc->display, pattern);
|
||||
|
||||
if (xfc->drawing == xfc->primary)
|
||||
{
|
||||
xf_gdi_invalidate_poly_region(xfc, points, npoints, TRUE);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -1174,18 +1117,12 @@ void xf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* cmd)
|
||||
XFree(image);
|
||||
}
|
||||
|
||||
/* Copy the updated region from backstore to the window. */
|
||||
/* Invalidate the updated region */
|
||||
for (i = 0; i < message->numRects; i++)
|
||||
{
|
||||
tx = message->rects[i].x + cmd->destLeft;
|
||||
ty = message->rects[i].y + cmd->destTop;
|
||||
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XCopyArea(xfc->display, xfc->primary, xfc->drawable, xfc->gc,
|
||||
tx, ty, message->rects[i].width, message->rects[i].height, tx, ty);
|
||||
}
|
||||
|
||||
xf_gdi_surface_update_frame(xfc, tx, ty, message->rects[i].width, message->rects[i].height);
|
||||
}
|
||||
|
||||
@ -1224,13 +1161,6 @@ void xf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* cmd)
|
||||
|
||||
XFree(image);
|
||||
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XCopyArea(xfc->display, xfc->primary, xfc->window->handle, xfc->gc,
|
||||
cmd->destLeft, cmd->destTop, cmd->width, cmd->height,
|
||||
cmd->destLeft, cmd->destTop);
|
||||
}
|
||||
|
||||
xf_gdi_surface_update_frame(xfc, cmd->destLeft, cmd->destTop, cmd->width, cmd->height);
|
||||
|
||||
XSetClipMask(xfc->display, xfc->gc, None);
|
||||
@ -1263,13 +1193,6 @@ void xf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* cmd)
|
||||
cmd->width, cmd->height);
|
||||
XFree(image);
|
||||
|
||||
if (!xfc->remote_app)
|
||||
{
|
||||
XCopyArea(xfc->display, xfc->primary, xfc->window->handle, xfc->gc,
|
||||
cmd->destLeft, cmd->destTop,
|
||||
cmd->width, cmd->height, cmd->destLeft, cmd->destTop);
|
||||
}
|
||||
|
||||
xf_gdi_surface_update_frame(xfc, cmd->destLeft, cmd->destTop, cmd->width, cmd->height);
|
||||
|
||||
XSetClipMask(xfc->display, xfc->gc, None);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user