summaryrefslogtreecommitdiffstats
path: root/xorg/X11R7.6/rdp/rdpSetSpans.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg/X11R7.6/rdp/rdpSetSpans.c')
-rw-r--r--xorg/X11R7.6/rdp/rdpSetSpans.c105
1 files changed, 55 insertions, 50 deletions
diff --git a/xorg/X11R7.6/rdp/rdpSetSpans.c b/xorg/X11R7.6/rdp/rdpSetSpans.c
index 734d67ac..34d3ec84 100644
--- a/xorg/X11R7.6/rdp/rdpSetSpans.c
+++ b/xorg/X11R7.6/rdp/rdpSetSpans.c
@@ -73,7 +73,7 @@ rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
rdpPixmapRec *pDstPriv;
rdpPixmapRec *pDirtyPriv;
- LLOGLN(10, ("rdpSetSpans: todo"));
+ LLOGLN(0, ("rdpSetSpans: todo"));
/* do original call */
rdpSetSpansOrg(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
@@ -91,70 +91,75 @@ rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
if (XRDP_IS_OS(pDstPriv))
{
- post_process = 1;
+ pDstPixmap = (PixmapPtr)pDrawable;
+ pDstPriv = GETPIXPRIV(pDstPixmap);
- if (g_do_dirty_os)
+ if (XRDP_IS_OS(pDstPriv))
{
- LLOGLN(10, ("rdpSetSpans: 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;
+ post_process = 1;
+
+ if (g_do_dirty_os)
+ {
+ LLOGLN(10, ("rdpSetSpans: 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)
+ else
{
- pDstWnd = (WindowPtr)pDrawable;
-
- if (pDstWnd->viewable)
+ if (pDrawable->type == DRAWABLE_WINDOW)
{
- post_process = 1;
- rdpup_get_screen_image_rect(&id);
- got_id = 1;
+ pDstWnd = (WindowPtr)pDrawable;
+
+ if (pDstWnd->viewable)
+ {
+ post_process = 1;
+ rdpup_get_screen_image_rect(&id);
+ got_id = 1;
+ }
}
}
- }
- if (!post_process)
- {
- return;
- }
-
- RegionInit(&clip_reg, NullBox, 0);
- cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
-
- if (cd == 1)
- {
- if (dirty_type != 0)
- {
- }
- else if (got_id)
+ if (!post_process)
{
+ return;
}
- }
- else if (cd == 2)
- {
- if (dirty_type != 0)
+
+ RegionInit(&clip_reg, NullBox, 0);
+ cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
+
+ if (cd == 1)
{
+ if (dirty_type != 0)
+ {
+ }
+ else if (got_id)
+ {
+ }
}
- else if (got_id)
+ else if (cd == 2)
{
+ if (dirty_type != 0)
+ {
+ }
+ else if (got_id)
+ {
+ }
}
- }
- RegionUninit(&clip_reg);
+ RegionUninit(&clip_reg);
- if (reset_surface)
- {
- rdpup_switch_os_surface(-1);
+ if (reset_surface)
+ {
+ rdpup_switch_os_surface(-1);
+ }
}
-}