From 42a56cd33ed83a399784958ae4e5490ed21b0b7c Mon Sep 17 00:00:00 2001 From: Laxmikant Rashinkar Date: Sat, 22 Sep 2012 18:12:40 -0700 Subject: o Previous merge had too many issues. Hence all files in .../xorg/X11R7.6/rdp were copied from master branch and then astyle was run on the files --- xorg/X11R7.6/rdp/rdpImageText16.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'xorg/X11R7.6/rdp/rdpImageText16.c') diff --git a/xorg/X11R7.6/rdp/rdpImageText16.c b/xorg/X11R7.6/rdp/rdpImageText16.c index 6e3b5262..4e204421 100644 --- a/xorg/X11R7.6/rdp/rdpImageText16.c +++ b/xorg/X11R7.6/rdp/rdpImageText16.c @@ -97,22 +97,25 @@ rdpImageText16(DrawablePtr pDrawable, GCPtr pGC, if (pDrawable->type == DRAWABLE_PIXMAP) { - pDstWnd = (WindowPtr)pDrawable; + pDstPixmap = (PixmapPtr)pDrawable; + pDstPriv = GETPIXPRIV(pDstPixmap); - if (pDstWnd->viewable) + if (XRDP_IS_OS(pDstPriv)) { post_process = 1; - if (g_do_dirty_ons) + if (g_do_dirty_os) { - LLOGLN(0, ("rdpImageText16: gettig dirty")); - g_screenPriv.is_dirty = 1; - pDirtyPriv = &g_screenPriv; - dirty_type = RDI_IMGLL; + LLOGLN(10, ("rdpImageText16: gettig dirty")); + pDstPriv->is_dirty = 1; + pDirtyPriv = pDstPriv; + dirty_type = RDI_IMGLY; } else { - rdpup_get_screen_image_rect(&id); + rdpup_switch_os_surface(pDstPriv->rdpindex); + reset_surface = 1; + rdpup_get_pixmap_image_rect(pDstPixmap, &id); got_id = 1; } } @@ -126,8 +129,19 @@ rdpImageText16(DrawablePtr pDrawable, GCPtr pGC, if (pDstWnd->viewable) { post_process = 1; - rdpup_get_screen_image_rect(&id); - got_id = 1; + + if (g_do_dirty_ons) + { + LLOGLN(0, ("rdpImageText16: gettig dirty")); + g_screenPriv.is_dirty = 1; + pDirtyPriv = &g_screenPriv; + dirty_type = RDI_IMGLL; + } + else + { + rdpup_get_screen_image_rect(&id); + got_id = 1; + } } } } -- cgit v1.2.1