casting context to xfContext in more lines and more code clarity

diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c
index 6977513..539f5ff 100644 (file)
--- a/client/X11/xf_gdi.c
+++ b/client/X11/xf_gdi.c
@@ -329,13 +329,14 @@ void xf_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt)
        rdpBrush* brush;
        uint32 foreColor;
        uint32 backColor;
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
        brush = &patblt->brush;
        xf_set_rop3(xfi, gdi_rop3_code(patblt->bRop));
 
-       foreColor = freerdp_color_convert_rgb(patblt->foreColor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
-       backColor = freerdp_color_convert_rgb(patblt->backColor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+       foreColor = freerdp_color_convert_rgb(patblt->foreColor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
+       backColor = freerdp_color_convert_rgb(patblt->backColor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        if (brush->style == GDI_BS_SOLID)
        {
@@ -436,9 +437,10 @@ void xf_gdi_scrblt(rdpContext* context, SCRBLT_ORDER* scrblt)
 void xf_gdi_opaque_rect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect)
 {
        uint32 color;
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
-       color = freerdp_color_convert_var(opaque_rect->color, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+       color = freerdp_color_convert_var(opaque_rect->color, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        XSetFunction(xfi->display, xfi->gc, GXcopy);
        XSetFillStyle(xfi->display, xfi->gc, FillSolid);
@@ -466,9 +468,10 @@ void xf_gdi_multi_opaque_rect(rdpContext* context, MULTI_OPAQUE_RECT_ORDER* mult
        int i;
        uint32 color;
        DELTA_RECT* rectangle;
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
-       color = freerdp_color_convert_var(multi_opaque_rect->color, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+       color = freerdp_color_convert_var(multi_opaque_rect->color, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        XSetFunction(xfi->display, xfi->gc, GXcopy);
        XSetFillStyle(xfi->display, xfi->gc, FillSolid);
@@ -503,10 +506,11 @@ void xf_gdi_draw_nine_grid(rdpContext* context, DRAW_NINE_GRID_ORDER* draw_nine_
 void xf_gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to)
 {
        uint32 color;
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
        xf_set_rop2(xfi, line_to->bRop2);
-       color = freerdp_color_convert_rgb(line_to->penColor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+       color = freerdp_color_convert_rgb(line_to->penColor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        XSetFillStyle(xfi->display, xfi->gc, FillSolid);
        XSetForeground(xfi->display, xfi->gc, color);
@@ -550,10 +554,11 @@ void xf_gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline)
        uint32 color;
        XPoint* points;
        int width, height;
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
        xf_set_rop2(xfi, polyline->bRop2);
-       color = freerdp_color_convert_var(polyline->penColor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+       color = freerdp_color_convert_var(polyline->penColor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        XSetFillStyle(xfi->display, xfi->gc, FillSolid);
        XSetForeground(xfi->display, xfi->gc, color);
@@ -636,13 +641,14 @@ void xf_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt)
        uint32 foreColor;
        uint32 backColor;
        Pixmap pattern = 0;
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
        brush = &mem3blt->brush;
        bitmap = (xfBitmap*) mem3blt->bitmap;
        xf_set_rop3(xfi, gdi_rop3_code(mem3blt->bRop));
-       foreColor = freerdp_color_convert_rgb(mem3blt->foreColor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
-       backColor = freerdp_color_convert_rgb(mem3blt->backColor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+       foreColor = freerdp_color_convert_rgb(mem3blt->foreColor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
+       backColor = freerdp_color_convert_rgb(mem3blt->backColor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        if (brush->style == GDI_BS_PATTERN)
        {

diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
index 7cb2487..ef4d1c3 100644 (file)
--- a/client/X11/xf_graphics.c
+++ b/client/X11/xf_graphics.c
@@ -35,7 +35,8 @@ void xf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap)
        uint8* data;
        Pixmap pixmap;
        XImage* image;
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
        XSetFunction(xfi->display, xfi->gc, GXcopy);
        pixmap = XCreatePixmap(xfi->display, xfi->drawable, bitmap->width, bitmap->height, xfi->depth);
@@ -43,7 +44,7 @@ void xf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap)
        if (bitmap->data != NULL)
        {
                data = freerdp_image_convert(bitmap->data, NULL,
-                               bitmap->width, bitmap->height, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+                               bitmap->width, bitmap->height, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
                if (bitmap->ephemeral != true)
                {
@@ -270,15 +271,16 @@ void xf_Glyph_Draw(rdpContext* context, rdpGlyph* glyph, int x, int y)
 
 void xf_Glyph_BeginDraw(rdpContext* context, int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor)
 {
-       xfInfo* xfi = ((xfContext*) context)->xfi;
+       xfContext* context_ = (xfContext*) context;
+       xfInfo* xfi = context_->xfi;
 
        bgcolor = (xfi->clrconv->invert)?
-               freerdp_color_convert_var_bgr(bgcolor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv):
-               freerdp_color_convert_var_rgb(bgcolor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+               freerdp_color_convert_var_bgr(bgcolor, context_->settings->color_depth, xfi->bpp, xfi->clrconv):
+               freerdp_color_convert_var_rgb(bgcolor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        fgcolor = (xfi->clrconv->invert)?
-               freerdp_color_convert_var_bgr(fgcolor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv):
-               freerdp_color_convert_var_rgb(fgcolor, ((xfContext*)context)->settings->color_depth, xfi->bpp, xfi->clrconv);
+               freerdp_color_convert_var_bgr(fgcolor, context_->settings->color_depth, xfi->bpp, xfi->clrconv):
+               freerdp_color_convert_var_rgb(fgcolor, context_->settings->color_depth, xfi->bpp, xfi->clrconv);
 
        XSetFunction(xfi->display, xfi->gc, GXcopy);
        XSetFillStyle(xfi->display, xfi->gc, FillSolid);