CVS: rdesktop cache.c, 1.31, 1.32 orders.c, 1.57, 1.58 rdp.c, 1.108, 1.109 types.h, 1.37, 1.38 xwin.c, 1.236, 1.237
"Peter ??strand" <[email protected]> Tue, 25 Nov 2008 08:05:28 +0000
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23580
Modified Files:
cache.c orders.c rdp.c types.h xwin.c
Log Message:
Ran indent-all
Index: cache.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/cache.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** cache.c 1 Nov 2008 02:37:10 -0000 1.31
--- cache.c 25 Nov 2008 08:05:25 -0000 1.32
***************
*** 454,458 ****
cache_put_brush_data(uint8 colour_code, uint8 idx, BRUSHDATA * brush_data)
{
! BRUSHDATA * bd;
colour_code = colour_code == 1 ? 0 : 1;
--- 454,458 ----
cache_put_brush_data(uint8 colour_code, uint8 idx, BRUSHDATA * brush_data)
{
! BRUSHDATA *bd;
colour_code = colour_code == 1 ? 0 : 1;
Index: orders.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/orders.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** orders.c 1 Nov 2008 02:37:10 -0000 1.57
--- orders.c 25 Nov 2008 08:05:25 -0000 1.58
***************
*** 1153,1157 ****
{
int x, y, pal_index, in_index, shift, do2, i;
! uint8 * pal;
in_index = 0;
--- 1153,1157 ----
{
int x, y, pal_index, in_index, shift, do2, i;
! uint8 *pal;
in_index = 0;
***************
*** 1188,1192 ****
BRUSHDATA brush_data;
uint8 cache_idx, colour_code, width, height, size, type;
! uint8 * comp_brush;
int index;
int Bpp;
--- 1188,1192 ----
BRUSHDATA brush_data;
uint8 cache_idx, colour_code, width, height, size, type;
! uint8 *comp_brush;
int index;
int Bpp;
***************
*** 1219,1224 ****
else
{
! warning("incompatible brush, colour_code %d size %d\n", colour_code, size);
! }
cache_put_brush_data(1, cache_idx, &brush_data);
}
--- 1219,1225 ----
else
{
! warning("incompatible brush, colour_code %d size %d\n", colour_code,
! size);
! }
cache_put_brush_data(1, cache_idx, &brush_data);
}
Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** rdp.c 1 Nov 2008 02:37:10 -0000 1.108
--- rdp.c 25 Nov 2008 08:05:25 -0000 1.109
***************
*** 859,864 ****
RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL +
RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE +
! RDP_CAPLEN_BRUSHCACHE +
! 0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ +
4 /* w2k fix, why? */ ;
--- 859,863 ----
RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL +
RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE +
! RDP_CAPLEN_BRUSHCACHE + 0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ +
4 /* w2k fix, why? */ ;
Index: types.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/types.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** types.h 1 Nov 2008 02:37:10 -0000 1.37
--- types.h 25 Nov 2008 08:05:25 -0000 1.38
***************
*** 85,89 ****
uint32 colour_code;
uint32 data_size;
! uint8 * data;
}
BRUSHDATA;
--- 85,89 ----
uint32 colour_code;
uint32 data_size;
! uint8 *data;
}
BRUSHDATA;
***************
*** 95,99 ****
uint8 style;
uint8 pattern[8];
! BRUSHDATA * bd;
}
BRUSH;
--- 95,99 ----
uint8 style;
uint8 pattern[8];
! BRUSHDATA *bd;
}
BRUSH;
Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -C2 -d -r1.236 -r1.237
*** xwin.c 1 Nov 2008 02:37:10 -0000 1.236
--- xwin.c 25 Nov 2008 08:05:25 -0000 1.237
***************
*** 3071,3075 ****
case 3: /* Pattern */
! if (brush->bd == 0) /* rdp4 brush */
{
for (i = 0; i != 8; i++)
--- 3071,3075 ----
case 3: /* Pattern */
! if (brush->bd == 0) /* rdp4 brush */
{
for (i = 0; i != 8; i++)
***************
*** 3086,3090 ****
ui_destroy_glyph((RD_HGLYPH) fill);
}
! else if (brush->bd->colour_code > 1) /* > 1 bpp */
{
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
--- 3086,3090 ----
ui_destroy_glyph((RD_HGLYPH) fill);
}
! else if (brush->bd->colour_code > 1) /* > 1 bpp */
{
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
***************
*** 3272,3276 ****
case 3: /* Pattern */
! if (brush->bd == 0) /* rdp4 brush */
{
for (i = 0; i != 8; i++)
--- 3272,3276 ----
case 3: /* Pattern */
! if (brush->bd == 0) /* rdp4 brush */
{
for (i = 0; i != 8; i++)
***************
*** 3287,3291 ****
ui_destroy_glyph((RD_HGLYPH) fill);
}
! else if (brush->bd->colour_code > 1) /* > 1 bpp */
{
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
--- 3287,3291 ----
ui_destroy_glyph((RD_HGLYPH) fill);
}
! else if (brush->bd->colour_code > 1) /* > 1 bpp */
{
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
***************
*** 3377,3381 ****
case 3: /* Pattern */
! if (brush->bd == 0) /* rdp4 brush */
{
for (i = 0; i != 8; i++)
--- 3377,3381 ----
case 3: /* Pattern */
! if (brush->bd == 0) /* rdp4 brush */
{
for (i = 0; i != 8; i++)
***************
*** 3392,3396 ****
ui_destroy_glyph((RD_HGLYPH) fill);
}
! else if (brush->bd->colour_code > 1) /* > 1 bpp */
{
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
--- 3392,3396 ----
ui_destroy_glyph((RD_HGLYPH) fill);
}
! else if (brush->bd->colour_code > 1) /* > 1 bpp */
{
fill = (Pixmap) ui_create_bitmap(8, 8, brush->bd->data);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/