summaryrefslogtreecommitdiffstats
path: root/xorg/X11R7.6/rdp/rdpPolyText8.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg/X11R7.6/rdp/rdpPolyText8.c')
-rw-r--r--xorg/X11R7.6/rdp/rdpPolyText8.c267
1 files changed, 134 insertions, 133 deletions
diff --git a/xorg/X11R7.6/rdp/rdpPolyText8.c b/xorg/X11R7.6/rdp/rdpPolyText8.c
index 29fb1667..8ca7d695 100644
--- a/xorg/X11R7.6/rdp/rdpPolyText8.c
+++ b/xorg/X11R7.6/rdp/rdpPolyText8.c
@@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define LOG_LEVEL 1
#define LLOG(_level, _args) \
- do { if (_level < LOG_LEVEL) { ErrorF _args ; } } while (0)
+ do { if (_level < LOG_LEVEL) { ErrorF _args ; } } while (0)
#define LLOGLN(_level, _args) \
- do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
+ do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
extern rdpScreenInfoRec g_rdpScreen; /* from rdpmain.c */
extern DevPrivateKeyRec g_rdpGCIndex; /* from rdpmain.c */
@@ -48,158 +48,159 @@ extern int g_con_number; /* in rdpup.c */
/******************************************************************************/
int
rdpPolyText8Org(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int count, char* chars)
+ int x, int y, int count, char *chars)
{
- int rv;
- rdpGCPtr priv;
- GCFuncs* oldFuncs;
-
- GC_OP_PROLOGUE(pGC);
- rv = pGC->ops->PolyText8(pDrawable, pGC, x, y, count, chars);
- GC_OP_EPILOGUE(pGC);
- return rv;
+ int rv;
+ rdpGCPtr priv;
+ GCFuncs *oldFuncs;
+
+ GC_OP_PROLOGUE(pGC);
+ rv = pGC->ops->PolyText8(pDrawable, pGC, x, y, count, chars);
+ GC_OP_EPILOGUE(pGC);
+ return rv;
}
/******************************************************************************/
int
rdpPolyText8(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int count, char* chars)
+ int x, int y, int count, char *chars)
{
- RegionRec reg;
- RegionRec reg1;
- int num_clips;
- int cd;
- int j;
- int rv;
- int got_id;
- int dirty_type;
- int post_process;
- int reset_surface;
- BoxRec box;
- struct image_data id;
- WindowPtr pDstWnd;
- PixmapPtr pDstPixmap;
- rdpPixmapRec* pDstPriv;
- rdpPixmapRec* pDirtyPriv;
-
- LLOGLN(10, ("rdpPolyText8:"));
-
- if (count != 0)
- {
- GetTextBoundingBox(pDrawable, pGC->font, x, y, count, &box);
- }
-
- /* do original call */
- rv = rdpPolyText8Org(pDrawable, pGC, x, y, count, chars);
-
- dirty_type = 0;
- pDirtyPriv = 0;
- post_process = 0;
- reset_surface = 0;
- got_id = 0;
- if (pDrawable->type == DRAWABLE_PIXMAP)
- {
- pDstPixmap = (PixmapPtr)pDrawable;
- pDstPriv = GETPIXPRIV(pDstPixmap);
- if (XRDP_IS_OS(pDstPriv))
+ RegionRec reg;
+ RegionRec reg1;
+ int num_clips;
+ int cd;
+ int j;
+ int rv;
+ int got_id;
+ int dirty_type;
+ int post_process;
+ int reset_surface;
+ BoxRec box;
+ struct image_data id;
+ WindowPtr pDstWnd;
+ PixmapPtr pDstPixmap;
+ rdpPixmapRec *pDstPriv;
+ rdpPixmapRec *pDirtyPriv;
+
+ LLOGLN(10, ("rdpPolyText8:"));
+
+ if (count != 0)
{
- 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;
- }
+ GetTextBoundingBox(pDrawable, pGC->font, x, y, count, &box);
}
- }
- else
- {
- if (pDrawable->type == DRAWABLE_WINDOW)
+
+ /* do original call */
+ rv = rdpPolyText8Org(pDrawable, pGC, x, y, count, chars);
+
+ dirty_type = 0;
+ pDirtyPriv = 0;
+ post_process = 0;
+ reset_surface = 0;
+ got_id = 0;
+
+ if (pDrawable->type == DRAWABLE_PIXMAP)
{
- pDstWnd = (WindowPtr)pDrawable;
- if (pDstWnd->viewable)
- {
- post_process = 1;
- if (g_do_dirty_ons)
+ pDstWnd = (WindowPtr)pDrawable;
+
+ if (pDstWnd->viewable)
{
- LLOGLN(0, ("rdpPolyText8: gettig dirty"));
- g_screenPriv.is_dirty = 1;
- pDirtyPriv = &g_screenPriv;
- dirty_type = RDI_IMGLL;
+ post_process = 1;
+
+ if (g_do_dirty_ons)
+ {
+ LLOGLN(0, ("rdpPolyText8: gettig dirty"));
+ g_screenPriv.is_dirty = 1;
+ pDirtyPriv = &g_screenPriv;
+ dirty_type = RDI_IMGLL;
+ }
+ else
+ {
+ rdpup_get_screen_image_rect(&id);
+ got_id = 1;
+ }
}
- else
+ }
+ else
+ {
+ if (pDrawable->type == DRAWABLE_WINDOW)
{
- 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 rv;
- }
-
- RegionInit(&reg, NullBox, 0);
- if (count == 0)
- {
- cd = 0;
- }
- else
- {
- cd = rdp_get_clip(&reg, pDrawable, pGC);
- }
- if (cd == 1)
- {
- if (dirty_type != 0)
+
+ if (!post_process)
{
- RegionInit(&reg1, &box, 0);
- draw_item_add_img_region(pDirtyPriv, &reg1, GXcopy, dirty_type);
- RegionUninit(&reg1);
+ return rv;
}
- else if (got_id)
+
+ RegionInit(&reg, NullBox, 0);
+
+ if (count == 0)
{
- rdpup_begin_update();
- rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
- rdpup_end_update();
+ cd = 0;
}
- }
- else if (cd == 2)
- {
- RegionInit(&reg1, &box, 0);
- RegionIntersect(&reg, &reg, &reg1);
- num_clips = REGION_NUM_RECTS(&reg);
- if (num_clips > 0)
+ else
+ {
+ cd = rdp_get_clip(&reg, pDrawable, pGC);
+ }
+
+ if (cd == 1)
{
- if (dirty_type != 0)
- {
- draw_item_add_img_region(pDirtyPriv, &reg, GXcopy, dirty_type);
- }
- else if (got_id)
- {
- rdpup_begin_update();
- for (j = num_clips - 1; j >= 0; j--)
+ if (dirty_type != 0)
{
- box = REGION_RECTS(&reg)[j];
- rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
+ RegionInit(&reg1, &box, 0);
+ draw_item_add_img_region(pDirtyPriv, &reg1, GXcopy, dirty_type);
+ RegionUninit(&reg1);
}
- rdpup_end_update();
- }
+ else if (got_id)
+ {
+ rdpup_begin_update();
+ rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
+ rdpup_end_update();
+ }
+ }
+ else if (cd == 2)
+ {
+ RegionInit(&reg1, &box, 0);
+ RegionIntersect(&reg, &reg, &reg1);
+ num_clips = REGION_NUM_RECTS(&reg);
+
+ if (num_clips > 0)
+ {
+ if (dirty_type != 0)
+ {
+ draw_item_add_img_region(pDirtyPriv, &reg, GXcopy, dirty_type);
+ }
+ else if (got_id)
+ {
+ rdpup_begin_update();
+
+ for (j = num_clips - 1; j >= 0; j--)
+ {
+ box = REGION_RECTS(&reg)[j];
+ rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
+ }
+
+ rdpup_end_update();
+ }
+ }
+
+ RegionUninit(&reg1);
}
- RegionUninit(&reg1);
- }
- RegionUninit(&reg);
- if (reset_surface)
- {
- rdpup_switch_os_surface(-1);
- }
- return rv;
+
+ RegionUninit(&reg);
+
+ if (reset_surface)
+ {
+ rdpup_switch_os_surface(-1);
+ }
+
+ return rv;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 07:55:04 +0000