Indent fixes
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@650 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
7aa2393028
commit
eb4245b24c
@ -249,7 +249,7 @@ enum RDP_INPUT_DEVICE
|
||||
#define RDP5_NO_MENUANIMATIONS 0x04
|
||||
#define RDP5_NO_THEMING 0x08
|
||||
#define RDP5_NO_CURSOR_SHADOW 0x20
|
||||
#define RDP5_NO_CURSORSETTINGS 0x40 /* disables cursor blinking */
|
||||
#define RDP5_NO_CURSORSETTINGS 0x40 /* disables cursor blinking */
|
||||
|
||||
/* Keymap flags */
|
||||
#define MapRightShiftMask (1<<0)
|
||||
|
16
rdesktop.c
16
rdesktop.c
@ -69,9 +69,10 @@ BOOL g_use_rdp5 = True;
|
||||
BOOL g_console_session = False;
|
||||
BOOL g_numlock_sync = False;
|
||||
BOOL g_owncolmap = False;
|
||||
BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */
|
||||
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;
|
||||
uint32 g_rdp5_performanceflags =
|
||||
RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
|
||||
|
||||
#ifdef WITH_RDPSND
|
||||
BOOL g_rdpsnd = False;
|
||||
@ -79,7 +80,7 @@ BOOL g_rdpsnd = False;
|
||||
|
||||
extern RDPDR_DEVICE g_rdpdr_device[];
|
||||
extern uint32 g_num_devices;
|
||||
extern char * g_rdpdr_clientname;
|
||||
extern char *g_rdpdr_clientname;
|
||||
|
||||
#ifdef RDP2VNC
|
||||
extern int rfb_port;
|
||||
@ -123,7 +124,8 @@ usage(char *program)
|
||||
fprintf(stderr, " -N: enable numlock syncronization\n");
|
||||
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,
|
||||
" -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,
|
||||
" '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
|
||||
@ -427,7 +429,9 @@ main(int argc, char *argv[])
|
||||
|
||||
if (strncmp("modem", optarg, 1) == 0)
|
||||
{
|
||||
g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING;
|
||||
g_rdp5_performanceflags =
|
||||
RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG |
|
||||
RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING;
|
||||
}
|
||||
else if (strncmp("broadband", optarg, 1) == 0)
|
||||
{
|
||||
@ -498,7 +502,7 @@ main(int argc, char *argv[])
|
||||
}
|
||||
else if (strncmp("clientname", optarg, 7) == 0)
|
||||
{
|
||||
g_rdpdr_clientname = xmalloc(strlen(optarg+11)+1);
|
||||
g_rdpdr_clientname = xmalloc(strlen(optarg + 11) + 1);
|
||||
strcpy(g_rdpdr_clientname, optarg + 11);
|
||||
}
|
||||
else
|
||||
|
7
rdpdr.c
7
rdpdr.c
@ -34,7 +34,7 @@ uint32 g_num_devices;
|
||||
|
||||
/* Table with information about rdpdr devices */
|
||||
RDPDR_DEVICE g_rdpdr_device[RDPDR_MAX_DEVICES];
|
||||
char * g_rdpdr_clientname = NULL;
|
||||
char *g_rdpdr_clientname = NULL;
|
||||
|
||||
/* Used to store incoming io request, until they are ready to be completed */
|
||||
/* using a linked list ensures that they are processed in the right order, */
|
||||
@ -167,8 +167,9 @@ rdpdr_send_name(void)
|
||||
STREAM s;
|
||||
uint32 hostlen;
|
||||
|
||||
if (NULL == g_rdpdr_clientname) {
|
||||
g_rdpdr_clientname = hostname;
|
||||
if (NULL == g_rdpdr_clientname)
|
||||
{
|
||||
g_rdpdr_clientname = hostname;
|
||||
}
|
||||
hostlen = (strlen(g_rdpdr_clientname) + 1) * 2;
|
||||
|
||||
|
@ -75,7 +75,7 @@ static rfbScreenInfoPtr server = NULL;
|
||||
static vncBuffer *frameBuffer = NULL;
|
||||
static uint8_t reverseByte[0x100];
|
||||
BOOL g_enable_compose = False;
|
||||
int g_display=0;
|
||||
int g_display = 0;
|
||||
|
||||
/* ignored */
|
||||
BOOL owncolmap = False;
|
||||
@ -486,7 +486,8 @@ ui_destroy_cursor(HCURSOR cursor)
|
||||
rfbFreeCursor((rfbCursorPtr) cursor);
|
||||
}
|
||||
|
||||
void ui_set_null_cursor(void)
|
||||
void
|
||||
ui_set_null_cursor(void)
|
||||
{
|
||||
rfbSetCursor(server, 0, FALSE);
|
||||
}
|
||||
|
10
xwin.c
10
xwin.c
@ -57,7 +57,7 @@ static HCURSOR g_null_cursor = NULL;
|
||||
static Atom g_protocol_atom, g_kill_atom;
|
||||
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 */
|
||||
static BOOL g_arch_match = False; /* set to True if RGB XServer and little endian */
|
||||
|
||||
/* endianness */
|
||||
static BOOL g_host_be;
|
||||
@ -956,10 +956,10 @@ ui_create_window(void)
|
||||
XFree(sizehints);
|
||||
}
|
||||
|
||||
if ( g_embed_wnd )
|
||||
{
|
||||
XReparentWindow(g_display, g_wnd, (Window)g_embed_wnd, 0, 0);
|
||||
}
|
||||
if (g_embed_wnd)
|
||||
{
|
||||
XReparentWindow(g_display, g_wnd, (Window) g_embed_wnd, 0, 0);
|
||||
}
|
||||
|
||||
input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
|
||||
VisibilityChangeMask | FocusChangeMask;
|
||||
|
Loading…
Reference in New Issue
Block a user