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

o Previous merge had too many issues. Hence all files in .../xorg/X11R7.6/rdp were copied

Browse Source 
from master branch and then astyle was run on the files
This commit is contained in:
Laxmikant Rashinkar 2012-09-22 18:12:40 -07:00
parent 70d535211b
commit 42a56cd33e
22 changed files with 726 additions and 578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
xorg/X11R7.6/rdp/rdpCopyArea.c
View File

@ -376,31 +376,13 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
LLOGLN(10, ("rdpCopyArea:")); LLOGLN(10, ("rdpCopyArea:"));
if (pSrc->type == DRAWABLE_WINDOW) if (pSrc->type == DRAWABLE_WINDOW)
{
pSrcWnd = (WindowPtr)pSrc;
if (pSrcWnd->viewable)
{ {
rdpup_check_dirty_screen(&g_screenPriv); rdpup_check_dirty_screen(&g_screenPriv);
if (pDst->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDst;
if (pDstWnd->viewable)
{
can_do_screen_blt = pGC->alu == GXcopy;
if (can_do_screen_blt)
{
return rdpCopyAreaWndToWnd(pSrcWnd, pDstWnd, pGC,
srcx, srcy, w, h, dstx, dsty);
}
}
}
else if (pDst->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDst;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
if (pDst->type == DRAWABLE_WINDOW) if (pDst->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDst; pDstWnd = (WindowPtr)pDst;
@ -442,6 +424,12 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
pSrcPriv = GETPIXPRIV(pSrcPixmap); pSrcPriv = GETPIXPRIV(pSrcPixmap);
if (XRDP_IS_OS(pSrcPriv)) if (XRDP_IS_OS(pSrcPriv))
{
if (pDst->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDst;
if (pDstWnd->viewable)
{ {
rdpup_check_dirty_screen(&g_screenPriv); rdpup_check_dirty_screen(&g_screenPriv);
rdpup_check_dirty(pSrcPixmap, pSrcPriv); rdpup_check_dirty(pSrcPixmap, pSrcPriv);
@ -449,6 +437,26 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
srcx, srcy, w, h, dstx, dsty); srcx, srcy, w, h, dstx, dsty);
} }
} }
else if (pDst->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDst;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
if (g_can_do_pix_to_pix)
{
rdpup_check_dirty(pSrcPixmap, pSrcPriv);
rdpup_check_dirty(pDstPixmap, pDstPriv);
return rdpCopyAreaPixmapToPixmap(pSrcPixmap, pSrcPriv,
pDstPixmap, pDstPriv,
pGC, srcx, srcy, w, h,
dstx, dsty);
}
}
}
}
}
/* do original call */ /* do original call */
rv = rdpCopyAreaOrg(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty); rv = rdpCopyAreaOrg(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty);
@ -485,26 +493,6 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
} }
} }
else else
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpCopyArea: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLL;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{ {
if (pDst->type == DRAWABLE_WINDOW) if (pDst->type == DRAWABLE_WINDOW)
{ {
@ -528,6 +516,7 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {
@ -615,4 +604,3 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
return rv; return rv;
} }
}

3
xorg/X11R7.6/rdp/rdpCopyPlane.c
View File

@ -126,6 +126,8 @@ rdpCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
} }
} }
else else
{
if (pDst->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDst; pDstWnd = (WindowPtr)pDst;
@ -147,6 +149,7 @@ rdpCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

3
xorg/X11R7.6/rdp/rdpFillPolygon.c
View File

@ -165,6 +165,8 @@ rdpFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
else else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -186,6 +188,7 @@ rdpFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

23
xorg/X11R7.6/rdp/rdpFillSpans.c
View File

@ -81,6 +81,27 @@ rdpFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nInit,
pDstPriv = GETPIXPRIV(pDstPixmap); pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv)) if (XRDP_IS_OS(pDstPriv))
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
}
if (!got_id)
{ {
return; return;
} }
@ -98,5 +119,3 @@ rdpFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nInit,
RegionUninit(&clip_reg); RegionUninit(&clip_reg);
rdpup_switch_os_surface(-1); rdpup_switch_os_surface(-1);
} }
}

40
xorg/X11R7.6/rdp/rdpImageGlyphBlt.c
View File

@ -98,6 +98,33 @@ rdpImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
got_id = 0; got_id = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpImageGlyphBlt: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLL;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -119,19 +146,6 @@ rdpImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
} }
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
} }
if (!post_process) if (!post_process)

40
xorg/X11R7.6/rdp/rdpImageText16.c
View File

@ -96,6 +96,33 @@ rdpImageText16(DrawablePtr pDrawable, GCPtr pGC,
got_id = 0; got_id = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpImageText16: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLY;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -117,19 +144,6 @@ rdpImageText16(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
} }
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
} }
if (!post_process) if (!post_process)

40
xorg/X11R7.6/rdp/rdpImageText8.c
View File

@ -96,6 +96,33 @@ rdpImageText8(DrawablePtr pDrawable, GCPtr pGC,
got_id = 0; got_id = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpImageText8: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLL;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -117,19 +144,6 @@ rdpImageText8(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
} }
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
} }
if (!post_process) if (!post_process)

20
xorg/X11R7.6/rdp/rdpPolyArc.c
View File

@ -145,19 +145,6 @@ rdpPolyArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
}
if (!post_process)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable) if (pDstWnd->viewable)
{ {
post_process = 1; post_process = 1;
@ -176,6 +163,13 @@ rdpPolyArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
} }
} }
} }
}
if (!post_process)
{
g_free(rects);
return;
}
RegionInit(&clip_reg, NullBox, 0); RegionInit(&clip_reg, NullBox, 0);
cd = rdp_get_clip(&clip_reg, pDrawable, pGC); cd = rdp_get_clip(&clip_reg, pDrawable, pGC);

20
xorg/X11R7.6/rdp/rdpPolyFillArc.c
View File

@ -145,19 +145,6 @@ rdpPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
}
if (!post_process)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable) if (pDstWnd->viewable)
{ {
post_process = 1; post_process = 1;
@ -176,6 +163,13 @@ rdpPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
} }
} }
} }
}
if (!post_process)
{
g_free(rects);
return;
}
RegionInit(&clip_reg, NullBox, 0); RegionInit(&clip_reg, NullBox, 0);
cd = rdp_get_clip(&clip_reg, pDrawable, pGC); cd = rdp_get_clip(&clip_reg, pDrawable, pGC);

9
xorg/X11R7.6/rdp/rdpPolyFillRect.c
View File

@ -95,6 +95,11 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
reset_surface = 0; reset_surface = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{ {
post_process = 1; post_process = 1;
@ -113,7 +118,10 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
got_id = 1; got_id = 1;
} }
} }
}
else else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -135,6 +143,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

40
xorg/X11R7.6/rdp/rdpPolyGlyphBlt.c
View File

@ -98,6 +98,33 @@ rdpPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
got_id = 0; got_id = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpPolyGlyphBlt: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLY;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -119,19 +146,6 @@ rdpPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
} }
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
} }
if (!post_process) if (!post_process)

50
xorg/X11R7.6/rdp/rdpPolyPoint.c
View File

@ -100,25 +100,40 @@ rdpPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode,
for (i = 0; i < npt; i++) for (i = 0; i < npt; i++)
{ {
pDstWnd = (WindowPtr)pDrawable; pts[i].x = pDrawable->x + in_pts[i].x;
pts[i].y = pDrawable->y + in_pts[i].y;
if (pDstWnd->viewable) if (i == 0)
{ {
post_process = 1; total_box.x1 = pts[0].x;
total_box.y1 = pts[0].y;
if (g_do_dirty_ons) total_box.x2 = pts[0].x;
{ total_box.y2 = pts[0].y;
LLOGLN(0, ("rdpPolyPoint: gettig dirty"));
g_screenPriv.is_dirty = 1;
pDirtyPriv = &g_screenPriv;
dirty_type = RDI_IMGLL;
} }
else else
{ {
rdpup_get_screen_image_rect(&id); if (pts[i].x < total_box.x1)
got_id = 1; {
total_box.x1 = pts[i].x;
}
if (pts[i].y < total_box.y1)
{
total_box.y1 = pts[i].y;
}
if (pts[i].x > total_box.x2)
{
total_box.x2 = pts[i].x;
}
if (pts[i].y > total_box.y2)
{
total_box.y2 = pts[i].y;
} }
} }
/* todo, use this total_box */
} }
/* do original call */ /* do original call */
@ -164,11 +179,22 @@ rdpPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode,
if (pDstWnd->viewable) if (pDstWnd->viewable)
{ {
post_process = 1; post_process = 1;
if (g_do_dirty_ons)
{
LLOGLN(0, ("rdpPolyPoint: gettig dirty"));
g_screenPriv.is_dirty = 1;
pDirtyPriv = &g_screenPriv;
dirty_type = RDI_IMGLL;
}
else
{
rdpup_get_screen_image_rect(&id); rdpup_get_screen_image_rect(&id);
got_id = 1; got_id = 1;
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

40
xorg/X11R7.6/rdp/rdpPolyRectangle.c
View File

@ -108,6 +108,33 @@ rdpPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nrects,
got_id = 0; got_id = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpPolyRectangle: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLL;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -129,19 +156,6 @@ rdpPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nrects,
} }
} }
} }
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
} }
if (!post_process) if (!post_process)

20
xorg/X11R7.6/rdp/rdpPolySegment.c
View File

@ -135,19 +135,6 @@ rdpPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
}
if (!post_process)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable) if (pDstWnd->viewable)
{ {
post_process = 1; post_process = 1;
@ -166,6 +153,13 @@ rdpPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)
} }
} }
} }
}
if (!post_process)
{
g_free(segs);
return;
}
RegionInit(&clip_reg, NullBox, 0); RegionInit(&clip_reg, NullBox, 0);
cd = rdp_get_clip(&clip_reg, pDrawable, pGC); cd = rdp_get_clip(&clip_reg, pDrawable, pGC);

40
xorg/X11R7.6/rdp/rdpPolyText16.c
View File

@ -99,6 +99,33 @@ rdpPolyText16(DrawablePtr pDrawable, GCPtr pGC,
got_id = 0; got_id = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpPolyText16: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLY;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -120,19 +147,6 @@ rdpPolyText16(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
} }
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
} }
if (!post_process) if (!post_process)

40
xorg/X11R7.6/rdp/rdpPolyText8.c
View File

@ -99,6 +99,33 @@ rdpPolyText8(DrawablePtr pDrawable, GCPtr pGC,
got_id = 0; got_id = 0;
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
post_process = 1;
if (g_do_dirty_os)
{
LLOGLN(10, ("rdpPolyText8: gettig dirty"));
pDstPriv->is_dirty = 1;
pDirtyPriv = pDstPriv;
dirty_type = RDI_IMGLY;
}
else
{
rdpup_switch_os_surface(pDstPriv->rdpindex);
reset_surface = 1;
rdpup_get_pixmap_image_rect(pDstPixmap, &id);
got_id = 1;
}
}
}
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -120,19 +147,6 @@ rdpPolyText8(DrawablePtr pDrawable, GCPtr pGC,
} }
} }
} }
else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
pDstWnd = (WindowPtr)pDrawable;
if (pDstWnd->viewable)
{
post_process = 1;
rdpup_get_screen_image_rect(&id);
got_id = 1;
}
}
} }
if (!post_process) if (!post_process)

3
xorg/X11R7.6/rdp/rdpPolylines.c
View File

@ -181,6 +181,8 @@ rdpPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode,
} }
} }
else else
{
if (pDrawable->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDrawable; pDstWnd = (WindowPtr)pDrawable;
@ -202,6 +204,7 @@ rdpPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

9
xorg/X11R7.6/rdp/rdpPushPixels.c
View File

@ -92,6 +92,11 @@ rdpPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
got_id = 0; got_id = 0;
if (pDst->type == DRAWABLE_PIXMAP) if (pDst->type == DRAWABLE_PIXMAP)
{
pDstPixmap = (PixmapPtr)pDst;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{ {
post_process = 1; post_process = 1;
@ -110,7 +115,10 @@ rdpPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
got_id = 1; got_id = 1;
} }
} }
}
else else
{
if (pDst->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDst; pDstWnd = (WindowPtr)pDst;
@ -132,6 +140,7 @@ rdpPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

3
xorg/X11R7.6/rdp/rdpPutImage.c
View File

@ -119,6 +119,8 @@ rdpPutImage(DrawablePtr pDst, GCPtr pGC, int depth, int x, int y,
} }
} }
else else
{
if (pDst->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)pDst; pDstWnd = (WindowPtr)pDst;
@ -140,6 +142,7 @@ rdpPutImage(DrawablePtr pDst, GCPtr pGC, int depth, int x, int y,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

7
xorg/X11R7.6/rdp/rdpSetSpans.c
View File

@ -89,11 +89,6 @@ rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
pDstPixmap = (PixmapPtr)pDrawable; pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap); pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv))
{
pDstPixmap = (PixmapPtr)pDrawable;
pDstPriv = GETPIXPRIV(pDstPixmap);
if (XRDP_IS_OS(pDstPriv)) if (XRDP_IS_OS(pDstPriv))
{ {
post_process = 1; post_process = 1;
@ -163,5 +158,3 @@ rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
rdpup_switch_os_surface(-1); rdpup_switch_os_surface(-1);
} }
} }
}

3
xorg/X11R7.6/rdp/rdpdraw.c
View File

@ -1246,6 +1246,8 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
} }
} }
else else
{
if (p->type == DRAWABLE_WINDOW)
{ {
pDstWnd = (WindowPtr)p; pDstWnd = (WindowPtr)p;
@ -1268,6 +1270,7 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
} }
} }
} }
}
if (!post_process) if (!post_process)
{ {

11
xorg/X11R7.6/rdp/rdpup.c
View File

@ -1684,6 +1684,15 @@ rdpup_create_window(WindowPtr pWindow, rdpWindowRec *priv)
LLOGLN(10, ("rdpup_create_window: id 0x%8.8x", pWindow->drawable.id)); LLOGLN(10, ("rdpup_create_window: id 0x%8.8x", pWindow->drawable.id));
if (g_connected) if (g_connected)
{
root_id = pWindow->drawable.pScreen->root->drawable.id;
if (pWindow->overrideRedirect)
{
style = XR_STYLE_TOOLTIP;
ext_style = XR_EXT_STYLE_TOOLTIP;
}
else
{ {
style = XR_STYLE_NORMAL; style = XR_STYLE_NORMAL;
ext_style = XR_EXT_STYLE_NORMAL; ext_style = XR_EXT_STYLE_NORMAL;
@ -1762,6 +1771,7 @@ rdpup_create_window(WindowPtr pWindow, rdpWindowRec *priv)
out_uint32_le(g_out_s, flags); /* flags */ out_uint32_le(g_out_s, flags); /* flags */
} }
}
/******************************************************************************/ /******************************************************************************/
void void
@ -1894,7 +1904,6 @@ rdpup_check_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec *pDirtyPriv)
rdpup_reset_clip(); rdpup_reset_clip();
rdpup_set_opcode(GXcopy); rdpup_set_opcode(GXcopy);
break; break;
case RDI_SCRBLT: case RDI_SCRBLT:
LLOGLN(10, (" RDI_SCRBLT")); LLOGLN(10, (" RDI_SCRBLT"));
break; break;