jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patblt opcode fix

Browse Source
This commit is contained in:
jsorg71 2006-03-07 03:58:41 +00:00
parent 05178d0733
commit b5efd2034e
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xrdp/xrdp_painter.c
View File

@ -236,6 +236,7 @@ xrdp_painter_fill_rect(struct xrdp_painter* self,
int k; int k;
int dx; int dx;
int dy; int dy;
int rop;
if (self == 0) if (self == 0)
{ {
@ -286,12 +287,32 @@ xrdp_painter_fill_rect(struct xrdp_painter* self,
else else
{ {
k = 0; k = 0;
rop = self->rop;
/* if opcode is in the form 0x00, 0x11, 0x22, ... convert it */
if (((rop & 0xf0) >> 4) == (rop & 0xf))
{
switch (rop)
{
case 0x66: /* xor */
rop = 0x5a;
break;
case 0xaa: /* noop */
rop = 0xfb;
break;
case 0xcc: /* copy */
rop = 0xf0;
break;
case 0x88: /* and */
rop = 0xc0;
break;
}
}
while (xrdp_region_get_rect(region, k, &rect) == 0) while (xrdp_region_get_rect(region, k, &rect) == 0)
{ {
if (rect_intersect(&rect, &clip_rect, &draw_rect)) if (rect_intersect(&rect, &clip_rect, &draw_rect))
{ {
libxrdp_orders_pat_blt(self->session, x, y, cx, cy, libxrdp_orders_pat_blt(self->session, x, y, cx, cy,
self->rop, self->bg_color, self->fg_color, rop, self->bg_color, self->fg_color,
&self->brush, &draw_rect); &self->brush, &draw_rect);
} }
k++; k++;