From: Michael Jumper Date: Mon, 27 Feb 2012 18:36:14 +0000 (-0800) Subject: Changed tabs to spaces, removed execute permissions from source. X-Git-Url: http://git.alex.org.uk Changed tabs to spaces, removed execute permissions from source. --- diff --git a/src/client.c b/src/client.c old mode 100755 new mode 100644 index 2aed214..267eebf --- a/src/client.c +++ b/src/client.c @@ -69,24 +69,24 @@ const char* GUAC_CLIENT_ARGS[] = { "hostname", "port", - "username", - "password", - "width", - "height", - "initial_program", - "color_depth", + "username", + "password", + "width", + "height", + "initial_program", + "color_depth", NULL }; enum ARGS_IDX { - IDX_HOSTNAME, - IDX_PORT, - IDX_USERNAME, - IDX_PASSWORD, - IDX_WIDTH, - IDX_HEIGHT, - IDX_INITIAL_PROGRAM, - IDX_COLOR_DEPTH + IDX_HOSTNAME, + IDX_PORT, + IDX_USERNAME, + IDX_PASSWORD, + IDX_WIDTH, + IDX_HEIGHT, + IDX_INITIAL_PROGRAM, + IDX_COLOR_DEPTH }; boolean rdp_freerdp_pre_connect(freerdp* instance) { @@ -208,7 +208,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) { rdp_guac_client_data* guac_client_data; freerdp* rdp_inst; - rdpSettings* settings; + rdpSettings* settings; char* hostname; int port = RDP_DEFAULT_PORT; @@ -256,37 +256,37 @@ int guac_client_init(guac_client* client, int argc, char** argv) { settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; /* session width */ - settings->width = 1024; - if (argv[IDX_WIDTH][0] != '\0') - settings->width = atoi(argv[IDX_WIDTH]); - if (settings->width == 0) - settings->width = 1024; - - /* session height */ - settings->height = 768; - if (argv[IDX_HEIGHT][0] != '\0') - settings->height = atoi(argv[IDX_HEIGHT]); - if (settings->height == 0) - settings->height = 768; + settings->width = 1024; + if (argv[IDX_WIDTH][0] != '\0') + settings->width = atoi(argv[IDX_WIDTH]); + if (settings->width == 0) + settings->width = 1024; + + /* session height */ + settings->height = 768; + if (argv[IDX_HEIGHT][0] != '\0') + settings->height = atoi(argv[IDX_HEIGHT]); + if (settings->height == 0) + settings->height = 768; /* Set hostname */ settings->hostname = strdup(hostname); - settings->window_title = strdup(hostname); - - /* username */ - settings->username = "guest"; - if (argv[IDX_USERNAME][0] != '\0') - settings->username = strdup (argv[IDX_USERNAME]); - - /* password */ - if (argv[IDX_PASSWORD][0] != '\0') { - settings->password = strdup (argv[IDX_PASSWORD]); - settings->autologon = 1; - } - - /* initial program */ - if (argv[IDX_INITIAL_PROGRAM][0] != '\0') - settings->shell = strdup (argv[IDX_INITIAL_PROGRAM]); + settings->window_title = strdup(hostname); + + /* username */ + settings->username = "guest"; + if (argv[IDX_USERNAME][0] != '\0') + settings->username = strdup (argv[IDX_USERNAME]); + + /* password */ + if (argv[IDX_PASSWORD][0] != '\0') { + settings->password = strdup (argv[IDX_PASSWORD]); + settings->autologon = 1; + } + + /* initial program */ + if (argv[IDX_INITIAL_PROGRAM][0] != '\0') + settings->shell = strdup (argv[IDX_INITIAL_PROGRAM]); /* Order support */ bitmap_cache = settings->bitmap_cache; diff --git a/src/rdp_gdi.c b/src/rdp_gdi.c old mode 100755 new mode 100644 index a9ca292..1b65574 --- a/src/rdp_gdi.c +++ b/src/rdp_gdi.c @@ -97,17 +97,17 @@ void guac_rdp_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) { guac_socket* socket = client->socket; guac_rdp_bitmap* bitmap = (guac_rdp_bitmap*) memblt->bitmap; - guac_composite_mode cmode = GUAC_COMP_OVER; - - if (memblt->bRop == 204) cmode = GUAC_COMP_OVER; - else if (memblt->bRop == 238) cmode = GUAC_COMP_OR; - else if (memblt->bRop == 136) cmode = GUAC_COMP_AND; - else if (memblt->bRop == 102) cmode = GUAC_COMP_XOR2; - else if (memblt->bRop == 187) cmode = GUAC_COMP_NOR; - else - { - guac_client_log_info (client, "guac_rdp_gdi_memblt: UNSUPPORTED opcode = %d (0x%02X)", memblt->bRop, memblt->bRop); - } + guac_composite_mode cmode = GUAC_COMP_OVER; + + if (memblt->bRop == 204) cmode = GUAC_COMP_OVER; + else if (memblt->bRop == 238) cmode = GUAC_COMP_OR; + else if (memblt->bRop == 136) cmode = GUAC_COMP_AND; + else if (memblt->bRop == 102) cmode = GUAC_COMP_XOR2; + else if (memblt->bRop == 187) cmode = GUAC_COMP_NOR; + else + { + guac_client_log_info (client, "guac_rdp_gdi_memblt: UNSUPPORTED opcode = %d (0x%02X)", memblt->bRop, memblt->bRop); + } if (bitmap->layer != NULL) guac_protocol_send_copy(socket, diff --git a/src/rdp_glyph.c b/src/rdp_glyph.c old mode 100755 new mode 100644