Ran indent-all
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1484 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
a42c5895f6
commit
c7feab2840
2
cache.c
2
cache.c
@ -453,7 +453,7 @@ cache_get_brush_data(uint8 colour_code, uint8 idx)
|
||||
void
|
||||
cache_put_brush_data(uint8 colour_code, uint8 idx, BRUSHDATA * brush_data)
|
||||
{
|
||||
BRUSHDATA * bd;
|
||||
BRUSHDATA *bd;
|
||||
|
||||
colour_code = colour_code == 1 ? 0 : 1;
|
||||
if (idx < NUM_ELEMENTS(g_brushcache[0]))
|
||||
|
9
orders.c
9
orders.c
@ -1152,7 +1152,7 @@ static void
|
||||
process_compressed_8x8_brush_data(uint8 * in, uint8 * out, int Bpp)
|
||||
{
|
||||
int x, y, pal_index, in_index, shift, do2, i;
|
||||
uint8 * pal;
|
||||
uint8 *pal;
|
||||
|
||||
in_index = 0;
|
||||
pal = in + 16;
|
||||
@ -1187,7 +1187,7 @@ process_brushcache(STREAM s, uint16 flags)
|
||||
{
|
||||
BRUSHDATA brush_data;
|
||||
uint8 cache_idx, colour_code, width, height, size, type;
|
||||
uint8 * comp_brush;
|
||||
uint8 *comp_brush;
|
||||
int index;
|
||||
int Bpp;
|
||||
|
||||
@ -1218,8 +1218,9 @@ process_brushcache(STREAM s, uint16 flags)
|
||||
}
|
||||
else
|
||||
{
|
||||
warning("incompatible brush, colour_code %d size %d\n", colour_code, size);
|
||||
}
|
||||
warning("incompatible brush, colour_code %d size %d\n", colour_code,
|
||||
size);
|
||||
}
|
||||
cache_put_brush_data(1, cache_idx, &brush_data);
|
||||
}
|
||||
else if ((colour_code >= 3) && (colour_code <= 6))
|
||||
|
3
rdp.c
3
rdp.c
@ -858,8 +858,7 @@ rdp_send_confirm_active(void)
|
||||
RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE +
|
||||
RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL +
|
||||
RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE +
|
||||
RDP_CAPLEN_BRUSHCACHE +
|
||||
0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ +
|
||||
RDP_CAPLEN_BRUSHCACHE + 0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ +
|
||||
4 /* w2k fix, why? */ ;
|
||||
|
||||
s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE));
|
||||
|
4
types.h
4
types.h
@ -84,7 +84,7 @@ typedef struct _BRUSHDATA
|
||||
{
|
||||
uint32 colour_code;
|
||||
uint32 data_size;
|
||||
uint8 * data;
|
||||
uint8 *data;
|
||||
}
|
||||
BRUSHDATA;
|
||||
|
||||
@ -94,7 +94,7 @@ typedef struct _BRUSH
|
||||
uint8 yorigin;
|
||||
uint8 style;
|
||||
uint8 pattern[8];
|
||||
BRUSHDATA * bd;
|
||||
BRUSHDATA *bd;
|
||||
}
|
||||
BRUSH;
|
||||
|
||||
|
12
xwin.c
12
xwin.c
@ -3070,7 +3070,7 @@ ui_patblt(uint8 opcode,
|
||||
break;
|
||||
|
||||
case 3: /* Pattern */
|
||||
if (brush->bd == 0) /* rdp4 brush */
|
||||
if (brush->bd == 0) /* rdp4 brush */
|
||||
{
|
||||
for (i = 0; i != 8; i++)
|
||||
ipattern[7 - i] = brush->pattern[i];
|
||||
@ -3085,7 +3085,7 @@ ui_patblt(uint8 opcode,
|
||||
XSetTSOrigin(g_display, g_gc, 0, 0);
|
||||
ui_destroy_glyph((RD_HGLYPH) fill);
|
||||
}
|
||||
else if (brush->bd->colour_code > 1) /* > 1 bpp */
|
||||
else if (brush->bd->colour_code > 1) /* > 1 bpp */
|
||||
{
|
||||
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
|
||||
XSetFillStyle(g_display, g_gc, FillTiled);
|
||||
@ -3271,7 +3271,7 @@ ui_polygon(uint8 opcode,
|
||||
break;
|
||||
|
||||
case 3: /* Pattern */
|
||||
if (brush->bd == 0) /* rdp4 brush */
|
||||
if (brush->bd == 0) /* rdp4 brush */
|
||||
{
|
||||
for (i = 0; i != 8; i++)
|
||||
ipattern[7 - i] = brush->pattern[i];
|
||||
@ -3286,7 +3286,7 @@ ui_polygon(uint8 opcode,
|
||||
XSetTSOrigin(g_display, g_gc, 0, 0);
|
||||
ui_destroy_glyph((RD_HGLYPH) fill);
|
||||
}
|
||||
else if (brush->bd->colour_code > 1) /* > 1 bpp */
|
||||
else if (brush->bd->colour_code > 1) /* > 1 bpp */
|
||||
{
|
||||
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
|
||||
XSetFillStyle(g_display, g_gc, FillTiled);
|
||||
@ -3376,7 +3376,7 @@ ui_ellipse(uint8 opcode,
|
||||
break;
|
||||
|
||||
case 3: /* Pattern */
|
||||
if (brush->bd == 0) /* rdp4 brush */
|
||||
if (brush->bd == 0) /* rdp4 brush */
|
||||
{
|
||||
for (i = 0; i != 8; i++)
|
||||
ipattern[7 - i] = brush->pattern[i];
|
||||
@ -3391,7 +3391,7 @@ ui_ellipse(uint8 opcode,
|
||||
XSetTSOrigin(g_display, g_gc, 0, 0);
|
||||
ui_destroy_glyph((RD_HGLYPH) fill);
|
||||
}
|
||||
else if (brush->bd->colour_code > 1) /* > 1 bpp */
|
||||
else if (brush->bd->colour_code > 1) /* > 1 bpp */
|
||||
{
|
||||
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
|
||||
XSetFillStyle(g_display, g_gc, FillTiled);
|
||||
|
Loading…
Reference in New Issue
Block a user