From dec268d1abbdd2b3c4bf73bba638b50e68a5c090 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 4 Oct 2016 09:00:00 +0200 Subject: [PATCH] Reformatted file. --- client/X11/xf_graphics.c | 61 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index 7cfc267..a716892 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -43,7 +43,7 @@ #define TAG CLIENT_TAG("x11") BOOL xf_decode_color(rdpGdi* gdi, const UINT32 srcColor, - UINT32* color, UINT32* format) + UINT32* color, UINT32* format) { xfContext* xfc; UINT32 DstFormat; @@ -54,14 +54,14 @@ BOOL xf_decode_color(rdpGdi* gdi, const UINT32 srcColor, xfc = (xfContext*)gdi->context; SrcFormat = gdi_get_pixel_format(gdi->context->settings->ColorDepth, - FALSE); + FALSE); if (format) *format = SrcFormat; DstFormat = xf_get_local_color_format(xfc, FALSE); *color = ConvertColor(srcColor, SrcFormat, - DstFormat, &gdi->palette); + DstFormat, &gdi->palette); return TRUE; } @@ -80,7 +80,7 @@ static BOOL xf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap) data = bitmap->data; depth = GetBitsPerPixel(bitmap->format); pixmap = XCreatePixmap(xfc->display, xfc->drawable, bitmap->width, - bitmap->height, xfc->depth); + bitmap->height, xfc->depth); if (bitmap->data) { @@ -96,19 +96,19 @@ static BOOL xf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap) SrcFormat = bitmap->format; freerdp_image_copy(data, gdi->dstFormat, 0, 0, 0, - bitmap->width, bitmap->height, - bitmap->data, SrcFormat, - 0, 0, 0, &context->gdi->palette); + bitmap->width, bitmap->height, + bitmap->data, SrcFormat, + 0, 0, 0, &context->gdi->palette); _aligned_free(bitmap->data); bitmap->data = data; bitmap->format = gdi->dstFormat; } image = XCreateImage(xfc->display, xfc->visual, xfc->depth, - ZPixmap, 0, (char*) bitmap->data, bitmap->width, bitmap->height, - xfc->scanline_pad, 0); + ZPixmap, 0, (char*) bitmap->data, bitmap->width, bitmap->height, + xfc->scanline_pad, 0); XPutImage(xfc->display, pixmap, xfc->gc, image, 0, 0, 0, 0, bitmap->width, - bitmap->height); + bitmap->height); XFree(image); } @@ -139,10 +139,10 @@ static BOOL xf_Bitmap_Paint(rdpContext* context, rdpBitmap* bitmap) xf_lock_x11(xfc, FALSE); XSetFunction(xfc->display, xfc->gc, GXcopy); image = XCreateImage(xfc->display, xfc->visual, xfc->depth, - ZPixmap, 0, (char*) bitmap->data, bitmap->width, bitmap->height, - xfc->scanline_pad, 0); + ZPixmap, 0, (char*) bitmap->data, bitmap->width, bitmap->height, + xfc->scanline_pad, 0); XPutImage(xfc->display, xfc->primary, xfc->gc, - image, 0, 0, bitmap->left, bitmap->top, width, height); + image, 0, 0, bitmap->left, bitmap->top, width, height); XFree(image); ret = gdi_InvalidateRegion(xfc->hdc, bitmap->left, bitmap->top, width, height); xf_unlock_x11(xfc, FALSE); @@ -150,7 +150,7 @@ static BOOL xf_Bitmap_Paint(rdpContext* context, rdpBitmap* bitmap) } static BOOL xf_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, - BOOL primary) + BOOL primary) { xfContext* xfc = (xfContext*) context; xf_lock_x11(xfc, FALSE); @@ -188,6 +188,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) ci.xhot = pointer->xPos; ci.yhot = pointer->yPos; size = ci.height * ci.width * GetBytesPerPixel(CursorFormat); + if (!(ci.pixels = (XcursorPixel*) _aligned_malloc(size, 16))) { xf_unlock_x11(xfc, FALSE); @@ -195,11 +196,11 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) } if (freerdp_image_copy_from_pointer_data( - (BYTE*) ci.pixels, CursorFormat, - 0, 0, 0, pointer->width, pointer->height, - pointer->xorMaskData, pointer->lengthXorMask, - pointer->andMaskData, pointer->lengthAndMask, - pointer->xorBpp, &context->gdi->palette) < 0) + (BYTE*) ci.pixels, CursorFormat, + 0, 0, 0, pointer->width, pointer->height, + pointer->xorMaskData, pointer->lengthXorMask, + pointer->andMaskData, pointer->lengthAndMask, + pointer->xorBpp, &context->gdi->palette) < 0) { _aligned_free(ci.pixels); xf_unlock_x11(xfc, FALSE); @@ -227,7 +228,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) } static BOOL xf_Pointer_Set(rdpContext* context, - const rdpPointer* pointer) + const rdpPointer* pointer) { #ifdef WITH_XCURSOR xfContext* xfc = (xfContext*) context; @@ -307,7 +308,7 @@ static BOOL xf_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y) tmp.event_mask = (current.your_event_mask & ~(PointerMotionMask)); if (XChangeWindowAttributes(xfc->display, xfc->window->handle, CWEventMask, - &tmp) == 0) + &tmp) == 0) goto out; XWarpPointer(xfc->display, None, xfc->window->handle, 0, 0, 0, 0, x, y); @@ -330,14 +331,14 @@ static BOOL xf_Glyph_New(rdpContext* context, const rdpGlyph* glyph) xf_lock_x11(xfc, FALSE); scanline = (glyph->cx + 7) / 8; xf_glyph->pixmap = XCreatePixmap(xfc->display, xfc->drawing, glyph->cx, - glyph->cy, 1); + glyph->cy, 1); image = XCreateImage(xfc->display, xfc->visual, 1, - ZPixmap, 0, (char*) glyph->aj, glyph->cx, glyph->cy, 8, scanline); + ZPixmap, 0, (char*) glyph->aj, glyph->cx, glyph->cy, 8, scanline); image->byte_order = MSBFirst; image->bitmap_bit_order = MSBFirst; XInitImage(image); XPutImage(xfc->display, xf_glyph->pixmap, xfc->gc_mono, image, 0, 0, 0, 0, - glyph->cx, glyph->cy); + glyph->cx, glyph->cy); XFree(image); xf_unlock_x11(xfc, FALSE); return TRUE; @@ -357,8 +358,8 @@ static void xf_Glyph_Free(rdpContext* context, rdpGlyph* glyph) } static BOOL xf_Glyph_Draw(rdpContext* context, const rdpGlyph* glyph, UINT32 x, - UINT32 y, UINT32 w, UINT32 h, UINT32 sx, UINT32 sy, - BOOL fOpRedundant) + UINT32 y, UINT32 w, UINT32 h, UINT32 sx, UINT32 sy, + BOOL fOpRedundant) { xfGlyph* xf_glyph; xfContext* xfc = (xfContext*) context; @@ -385,8 +386,8 @@ static BOOL xf_Glyph_Draw(rdpContext* context, const rdpGlyph* glyph, UINT32 x, } static BOOL xf_Glyph_BeginDraw(rdpContext* context, UINT32 x, UINT32 y, - UINT32 width, UINT32 height, UINT32 bgcolor, - UINT32 fgcolor, BOOL fOpRedundant) + UINT32 width, UINT32 height, UINT32 bgcolor, + UINT32 fgcolor, BOOL fOpRedundant) { xfContext* xfc = (xfContext*) context; XRectangle rect; @@ -418,8 +419,8 @@ static BOOL xf_Glyph_BeginDraw(rdpContext* context, UINT32 x, UINT32 y, } static BOOL xf_Glyph_EndDraw(rdpContext* context, UINT32 x, UINT32 y, - UINT32 width, UINT32 height, - UINT32 bgcolor, UINT32 fgcolor) + UINT32 width, UINT32 height, + UINT32 bgcolor, UINT32 fgcolor) { xfContext* xfc = (xfContext*) context; BOOL ret = TRUE; -- 2.7.4