jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ran astyle in vnc directory

Browse Source
This commit is contained in:
matt335672 2019-04-30 12:24:19 +01:00
parent 074cfdee4d
commit 79c8ed8579
2 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vnc/vnc.c
View File

@ -29,15 +29,15 @@
#define LLOG_LEVEL 1 #define LLOG_LEVEL 1
#define LLOGLN(_level, _args) \ #define LLOGLN(_level, _args) \
do \ do \
{ \
if (_level < LLOG_LEVEL) \
{ \ { \
g_write("xrdp:vnc [%10.10u]: ", g_time3()); \ if (_level < LLOG_LEVEL) \
g_writeln _args ; \ { \
g_write("xrdp:vnc [%10.10u]: ", g_time3()); \
g_writeln _args ; \
} \
} \ } \
} \ while (0)
while (0)
#define AS_LOG_MESSAGE log_message #define AS_LOG_MESSAGE log_message
@ -1026,7 +1026,7 @@ lib_mod_connect(struct vnc *v)
default: default:
v->server_msg(v, "VNC error - only supporting 8, 15, 16, 24 and 32 " v->server_msg(v, "VNC error - only supporting 8, 15, 16, 24 and 32 "
"bpp rdp connections", 0); "bpp rdp connections", 0);
return 1; return 1;
} }
if (g_strcmp(v->ip, "") == 0) if (g_strcmp(v->ip, "") == 0)
@ -1055,7 +1055,7 @@ lib_mod_connect(struct vnc *v)
v->server_msg(v, text, 0); v->server_msg(v, text, 0);
g_sleep(v->delay_ms); g_sleep(v->delay_ms);
} }
g_sprintf(text, "VNC connecting to %s %s", v->ip, con_port); g_sprintf(text, "VNC connecting to %s %s", v->ip, con_port);
v->server_msg(v, text, 0); v->server_msg(v, text, 0);
@ -1504,7 +1504,7 @@ lib_mod_check_wait_objs(struct vnc *v)
/******************************************************************************/ /******************************************************************************/
/* return error */ /* return error */
int int
lib_mod_frame_ack(struct vnc* v, int flags, int frame_id) lib_mod_frame_ack(struct vnc *v, int flags, int frame_id)
{ {
return 0; return 0;
} }
@ -1512,7 +1512,7 @@ lib_mod_frame_ack(struct vnc* v, int flags, int frame_id)
/******************************************************************************/ /******************************************************************************/
/* return error */ /* return error */
int int
lib_mod_suppress_output(struct vnc* v, int suppress, lib_mod_suppress_output(struct vnc *v, int suppress,
int left, int top, int right, int bottom) int left, int top, int right, int bottom)
{ {
int error; int error;

180
vnc/vnc.h
View File

@ -28,96 +28,96 @@
struct vnc struct vnc
{ {
int size; /* size of this struct */ int size; /* size of this struct */
int version; /* internal version */ int version; /* internal version */
/* client functions */ /* client functions */
int (*mod_start)(struct vnc* v, int w, int h, int bpp); int (*mod_start)(struct vnc *v, int w, int h, int bpp);
int (*mod_connect)(struct vnc* v); int (*mod_connect)(struct vnc *v);
int (*mod_event)(struct vnc* v, int msg, long param1, long param2, int (*mod_event)(struct vnc *v, int msg, long param1, long param2,
long param3, long param4); long param3, long param4);
int (*mod_signal)(struct vnc* v); int (*mod_signal)(struct vnc *v);
int (*mod_end)(struct vnc* v); int (*mod_end)(struct vnc *v);
int (*mod_set_param)(struct vnc *v, const char *name, const char *value); int (*mod_set_param)(struct vnc *v, const char *name, const char *value);
int (*mod_session_change)(struct vnc* v, int, int); int (*mod_session_change)(struct vnc *v, int, int);
int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount, int (*mod_get_wait_objs)(struct vnc *v, tbus *read_objs, int *rcount,
tbus* write_objs, int* wcount, int* timeout); tbus *write_objs, int *wcount, int *timeout);
int (*mod_check_wait_objs)(struct vnc* v); int (*mod_check_wait_objs)(struct vnc *v);
int (*mod_frame_ack)(struct vnc* v, int flags, int frame_id); int (*mod_frame_ack)(struct vnc *v, int flags, int frame_id);
int (*mod_suppress_output)(struct vnc* v, int suppress, int (*mod_suppress_output)(struct vnc *v, int suppress,
int left, int top, int right, int bottom); int left, int top, int right, int bottom);
tintptr mod_dumby[100 - 11]; /* align, 100 minus the number of mod tintptr mod_dumby[100 - 11]; /* align, 100 minus the number of mod
functions above */ functions above */
/* server functions */ /* server functions */
int (*server_begin_update)(struct vnc* v); int (*server_begin_update)(struct vnc *v);
int (*server_end_update)(struct vnc* v); int (*server_end_update)(struct vnc *v);
int (*server_fill_rect)(struct vnc* v, int x, int y, int cx, int cy); int (*server_fill_rect)(struct vnc *v, int x, int y, int cx, int cy);
int (*server_screen_blt)(struct vnc* v, int x, int y, int cx, int cy, int (*server_screen_blt)(struct vnc *v, int x, int y, int cx, int cy,
int srcx, int srcy); int srcx, int srcy);
int (*server_paint_rect)(struct vnc* v, int x, int y, int cx, int cy, int (*server_paint_rect)(struct vnc *v, int x, int y, int cx, int cy,
char* data, int width, int height, int srcx, int srcy); char *data, int width, int height, int srcx, int srcy);
int (*server_set_cursor)(struct vnc* v, int x, int y, char* data, char* mask); int (*server_set_cursor)(struct vnc *v, int x, int y, char *data, char *mask);
int (*server_palette)(struct vnc* v, int* palette); int (*server_palette)(struct vnc *v, int *palette);
int (*server_msg)(struct vnc* v, const char *msg, int code); int (*server_msg)(struct vnc *v, const char *msg, int code);
int (*server_is_term)(struct vnc* v); int (*server_is_term)(struct vnc *v);
int (*server_set_clip)(struct vnc* v, int x, int y, int cx, int cy); int (*server_set_clip)(struct vnc *v, int x, int y, int cx, int cy);
int (*server_reset_clip)(struct vnc* v); int (*server_reset_clip)(struct vnc *v);
int (*server_set_fgcolor)(struct vnc* v, int fgcolor); int (*server_set_fgcolor)(struct vnc *v, int fgcolor);
int (*server_set_bgcolor)(struct vnc* v, int bgcolor); int (*server_set_bgcolor)(struct vnc *v, int bgcolor);
int (*server_set_opcode)(struct vnc* v, int opcode); int (*server_set_opcode)(struct vnc *v, int opcode);
int (*server_set_mixmode)(struct vnc* v, int mixmode); int (*server_set_mixmode)(struct vnc *v, int mixmode);
int (*server_set_brush)(struct vnc* v, int x_origin, int y_origin, int (*server_set_brush)(struct vnc *v, int x_origin, int y_origin,
int style, char* pattern); int style, char *pattern);
int (*server_set_pen)(struct vnc* v, int style, int (*server_set_pen)(struct vnc *v, int style,
int width); int width);
int (*server_draw_line)(struct vnc* v, int x1, int y1, int x2, int y2); int (*server_draw_line)(struct vnc *v, int x1, int y1, int x2, int y2);
int (*server_add_char)(struct vnc* v, int font, int character, int (*server_add_char)(struct vnc *v, int font, int character,
int offset, int baseline, int offset, int baseline,
int width, int height, char* data); int width, int height, char *data);
int (*server_draw_text)(struct vnc* v, int font, int (*server_draw_text)(struct vnc *v, int font,
int flags, int mixmode, int clip_left, int clip_top, int flags, int mixmode, int clip_left, int clip_top,
int clip_right, int clip_bottom, int clip_right, int clip_bottom,
int box_left, int box_top, int box_left, int box_top,
int box_right, int box_bottom, int box_right, int box_bottom,
int x, int y, char* data, int data_len); int x, int y, char *data, int data_len);
int (*server_reset)(struct vnc* v, int width, int height, int bpp); int (*server_reset)(struct vnc *v, int width, int height, int bpp);
int (*server_query_channel)(struct vnc* v, int index, int (*server_query_channel)(struct vnc *v, int index,
char* channel_name, char *channel_name,
int* channel_flags); int *channel_flags);
int (*server_get_channel_id)(struct vnc* v, const char *name); int (*server_get_channel_id)(struct vnc *v, const char *name);
int (*server_send_to_channel)(struct vnc* v, int channel_id, int (*server_send_to_channel)(struct vnc *v, int channel_id,
char* data, int data_len, char *data, int data_len,
int total_data_len, int flags); int total_data_len, int flags);
int (*server_bell_trigger)(struct vnc* v); int (*server_bell_trigger)(struct vnc *v);
tintptr server_dumby[100 - 25]; /* align, 100 minus the number of server tintptr server_dumby[100 - 25]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
tintptr handle; /* pointer to self as long */ tintptr handle; /* pointer to self as long */
tintptr wm; tintptr wm;
tintptr painter; tintptr painter;
tintptr si; tintptr si;
/* mod data */ /* mod data */
int server_width; int server_width;
int server_height; int server_height;
int server_bpp; int server_bpp;
int mod_width; int mod_width;
int mod_height; int mod_height;
int mod_bpp; int mod_bpp;
char mod_name[256]; char mod_name[256];
int mod_mouse_state; int mod_mouse_state;
int palette[256]; int palette[256];
int vnc_desktop; int vnc_desktop;
char username[256]; char username[256];
char password[256]; char password[256];
char ip[256]; char ip[256];
char port[256]; char port[256];
int sck_closed; int sck_closed;
int shift_state; /* 0 up, 1 down */ int shift_state; /* 0 up, 1 down */
int keylayout; int keylayout;
int clip_chanid; int clip_chanid;
struct stream *clip_data_s; struct stream *clip_data_s;
int delay_ms; int delay_ms;
struct trans *trans; struct trans *trans;
int got_guid; int got_guid;
tui8 guid[16]; tui8 guid[16];
int suppress_output; int suppress_output;
}; };