CVS: rdesktop constants.h,1.31,1.32 rdesktop.c,1.102,1.103 rdpdr.c,1.26,1.27 xwin.c,1.160,1.161
Peter ?strand <[email protected]>
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10238
Modified Files:
constants.h rdesktop.c rdpdr.c xwin.c
Log Message:
Indent fixes
Index: constants.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/constants.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** constants.h 15 Mar 2004 14:49:12 -0000 1.31
--- constants.h 15 Apr 2004 20:12:31 -0000 1.32
***************
*** 250,254 ****
#define RDP5_NO_THEMING 0x08
#define RDP5_NO_CURSOR_SHADOW 0x20
! #define RDP5_NO_CURSORSETTINGS 0x40 /* disables cursor blinking */
/* Keymap flags */
--- 250,254 ----
#define RDP5_NO_THEMING 0x08
#define RDP5_NO_CURSOR_SHADOW 0x20
! #define RDP5_NO_CURSORSETTINGS 0x40 /* disables cursor blinking */
/* Keymap flags */
Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** rdesktop.c 10 Apr 2004 09:34:52 -0000 1.102
--- rdesktop.c 15 Apr 2004 20:12:31 -0000 1.103
***************
*** 70,76 ****
BOOL g_numlock_sync = False;
BOOL g_owncolmap = False;
! BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */
uint32 g_embed_wnd;
! uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
#ifdef WITH_RDPSND
--- 70,77 ----
BOOL g_numlock_sync = False;
BOOL g_owncolmap = False;
! BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */
uint32 g_embed_wnd;
! uint32 g_rdp5_performanceflags =
! RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
#ifdef WITH_RDPSND
***************
*** 80,84 ****
extern RDPDR_DEVICE g_rdpdr_device[];
extern uint32 g_num_devices;
! extern char * g_rdpdr_clientname;
#ifdef RDP2VNC
--- 81,85 ----
extern RDPDR_DEVICE g_rdpdr_device[];
extern uint32 g_num_devices;
! extern char *g_rdpdr_clientname;
#ifdef RDP2VNC
***************
*** 124,128 ****
fprintf(stderr, " -X: embed into another window with a given id.\n");
fprintf(stderr, " -a: connection colour depth\n");
! fprintf(stderr, " -x: RDP5 experience (m[odem 28.8], b[roadband], l[an] or hex number)\n");
fprintf(stderr, " -r: enable specified device redirection (this flag can be repeated)\n");
fprintf(stderr,
--- 125,130 ----
fprintf(stderr, " -X: embed into another window with a given id.\n");
fprintf(stderr, " -a: connection colour depth\n");
! fprintf(stderr,
! " -x: RDP5 experience (m[odem 28.8], b[roadband], l[an] or hex number)\n");
fprintf(stderr, " -r: enable specified device redirection (this flag can be repeated)\n");
fprintf(stderr,
***************
*** 413,417 ****
g_embed_wnd = strtol(optarg, NULL, 10);
break;
!
case 'a':
g_server_bpp = strtol(optarg, NULL, 10);
--- 415,419 ----
g_embed_wnd = strtol(optarg, NULL, 10);
break;
!
case 'a':
g_server_bpp = strtol(optarg, NULL, 10);
***************
*** 425,432 ****
case 'x':
!
if (strncmp("modem", optarg, 1) == 0)
{
! g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING;
}
else if (strncmp("broadband", optarg, 1) == 0)
--- 427,436 ----
case 'x':
!
if (strncmp("modem", optarg, 1) == 0)
{
! g_rdp5_performanceflags =
! RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG |
! RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING;
}
else if (strncmp("broadband", optarg, 1) == 0)
***************
*** 443,447 ****
}
break;
!
case 'r':
--- 447,451 ----
}
break;
!
case 'r':
***************
*** 499,503 ****
else if (strncmp("clientname", optarg, 7) == 0)
{
! g_rdpdr_clientname = xmalloc(strlen(optarg+11)+1);
strcpy(g_rdpdr_clientname, optarg + 11);
}
--- 503,507 ----
else if (strncmp("clientname", optarg, 7) == 0)
{
! g_rdpdr_clientname = xmalloc(strlen(optarg + 11) + 1);
strcpy(g_rdpdr_clientname, optarg + 11);
}
Index: rdpdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpdr.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rdpdr.c 15 Apr 2004 20:11:19 -0000 1.26
--- rdpdr.c 15 Apr 2004 20:12:31 -0000 1.27
***************
*** 35,39 ****
/* Table with information about rdpdr devices */
RDPDR_DEVICE g_rdpdr_device[RDPDR_MAX_DEVICES];
! char * g_rdpdr_clientname = NULL;
/* Used to store incoming io request, until they are ready to be completed */
--- 35,39 ----
/* Table with information about rdpdr devices */
RDPDR_DEVICE g_rdpdr_device[RDPDR_MAX_DEVICES];
! char *g_rdpdr_clientname = NULL;
/* Used to store incoming io request, until they are ready to be completed */
***************
*** 168,173 ****
uint32 hostlen;
! if (NULL == g_rdpdr_clientname) {
! g_rdpdr_clientname = hostname;
}
hostlen = (strlen(g_rdpdr_clientname) + 1) * 2;
--- 168,174 ----
uint32 hostlen;
! if (NULL == g_rdpdr_clientname)
! {
! g_rdpdr_clientname = hostname;
}
hostlen = (strlen(g_rdpdr_clientname) + 1) * 2;
Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** xwin.c 10 Apr 2004 09:34:52 -0000 1.160
--- xwin.c 15 Apr 2004 20:12:31 -0000 1.161
***************
*** 58,62 ****
static BOOL g_focused;
static BOOL g_mouse_in_wnd;
! static BOOL g_arch_match = False; /* set to True if RGB XServer and little endian */
/* endianness */
--- 58,62 ----
static BOOL g_focused;
static BOOL g_mouse_in_wnd;
! static BOOL g_arch_match = False; /* set to True if RGB XServer and little endian */
/* endianness */
***************
*** 957,964 ****
}
! if ( g_embed_wnd )
! {
! XReparentWindow(g_display, g_wnd, (Window)g_embed_wnd, 0, 0);
! }
input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
--- 957,964 ----
}
! if (g_embed_wnd)
! {
! XReparentWindow(g_display, g_wnd, (Window) g_embed_wnd, 0, 0);
! }
input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click