diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-05-19 19:25:08 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-05-19 19:25:08 -0700 |
| commit | aa3fad894db4e9b02999b229eb7e63fd8e91bdf6 (patch) | |
| tree | 409c10184c95a2305edc6b7d04e6116aaa30a936 /xorg/X11R7.6/rdp/rdpCopyArea.c | |
| parent | cc3754a2bdd6801179751d45f1df3b5816e189fc (diff) | |
| download | xrdp-proprietary-aa3fad894db4e9b02999b229eb7e63fd8e91bdf6.tar.gz xrdp-proprietary-aa3fad894db4e9b02999b229eb7e63fd8e91bdf6.zip | |
xorg: work on offscreen bitmaps
Diffstat (limited to 'xorg/X11R7.6/rdp/rdpCopyArea.c')
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpCopyArea.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xorg/X11R7.6/rdp/rdpCopyArea.c b/xorg/X11R7.6/rdp/rdpCopyArea.c index 3c3d371b..27ddab28 100644 --- a/xorg/X11R7.6/rdp/rdpCopyArea.c +++ b/xorg/X11R7.6/rdp/rdpCopyArea.c @@ -158,7 +158,7 @@ rdpCopyAreaWndToPixmap(WindowPtr pSrcWnd, ldsty = pDstPixmap->drawable.y + dsty; if (cd == 1) { - rdpup_switch_os_surface(pDstPriv->rdpid); + rdpup_switch_os_surface(pDstPriv->rdpindex); rdpup_begin_update(); rdpup_screen_blt(ldstx, ldsty, w, h, lsrcx, lsrcy); rdpup_end_update(); @@ -169,7 +169,7 @@ rdpCopyAreaWndToPixmap(WindowPtr pSrcWnd, num_clips = REGION_NUM_RECTS(&clip_reg); if (num_clips > 0) { - rdpup_switch_os_surface(pDstPriv->rdpid); + rdpup_switch_os_surface(pDstPriv->rdpindex); rdpup_begin_update(); dx = dstx - srcx; dy = dsty - srcy; @@ -232,7 +232,7 @@ rdpCopyAreaPixmapToWnd(PixmapPtr pSrcPixmap, rdpPixmapRec* pSrcPriv, if (cd == 1) { rdpup_begin_update(); - rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpid, lsrcx, lsrcy); + rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpindex, lsrcx, lsrcy); rdpup_end_update(); } else if (cd == 2) @@ -246,7 +246,7 @@ rdpCopyAreaPixmapToWnd(PixmapPtr pSrcPixmap, rdpPixmapRec* pSrcPriv, box = REGION_RECTS(&clip_reg)[j]; LLOGLN(10, ("rdpCopyAreaPixmapToWnd: %d %d %d %d", box.x1, box.y1, box.x2, box.y2)); rdpup_set_clip(box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1); - rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpid, lsrcx, lsrcy); + rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpindex, lsrcx, lsrcy); } rdpup_reset_clip(); rdpup_end_update(); @@ -287,9 +287,9 @@ rdpCopyAreaPixmapToPixmap(PixmapPtr pSrcPixmap, rdpPixmapRec* pSrcPriv, lsrcy = pSrcPixmap->drawable.y + srcy; if (cd == 1) { - rdpup_switch_os_surface(pDstPriv->rdpid); + rdpup_switch_os_surface(pDstPriv->rdpindex); rdpup_begin_update(); - rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpid, lsrcx, lsrcy); + rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpindex, lsrcx, lsrcy); rdpup_end_update(); rdpup_switch_os_surface(-1); } @@ -298,13 +298,13 @@ rdpCopyAreaPixmapToPixmap(PixmapPtr pSrcPixmap, rdpPixmapRec* pSrcPriv, num_clips = REGION_NUM_RECTS(&clip_reg); if (num_clips > 0) { - rdpup_switch_os_surface(pDstPriv->rdpid); + rdpup_switch_os_surface(pDstPriv->rdpindex); rdpup_begin_update(); for (j = 0; j < num_clips; j++) { box = REGION_RECTS(&clip_reg)[j]; rdpup_set_clip(box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1); - rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpid, lsrcx, lsrcy); + rdpup_paint_rect_os(ldstx, ldsty, w, h, pSrcPriv->rdpindex, lsrcx, lsrcy); } rdpup_reset_clip(); rdpup_end_update(); @@ -414,7 +414,7 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, pDstPriv = GETPIXPRIV(pDstPixmap); if (XRDP_IS_OS(pDstPriv)) { - rdpup_switch_os_surface(pDstPriv->rdpid); + rdpup_switch_os_surface(pDstPriv->rdpindex); rdpup_get_pixmap_image_rect(pDstPixmap, &id); got_id = 1; } |