diff options
Diffstat (limited to 'vnc/vnc.h')
| -rw-r--r-- | vnc/vnc.h | 38 |
1 files changed, 19 insertions, 19 deletions
@@ -1,7 +1,7 @@ /** * xrdp: A Remote Desktop Protocol server. * - * Copyright (C) Jay Sorg 2004-2013 + * Copyright (C) Jay Sorg 2004-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,9 @@ #include "arch.h" #include "parse.h" #include "os_calls.h" -#include "d3des.h" #include "defines.h" -#define CURRENT_MOD_VER 2 +#define CURRENT_MOD_VER 3 struct vnc { @@ -38,13 +37,13 @@ struct vnc long param3, long param4); int (*mod_signal)(struct vnc* v); int (*mod_end)(struct vnc* v); - int (*mod_set_param)(struct vnc* v, char* name, char* value); + int (*mod_set_param)(struct vnc* v, const char *name, char* value); int (*mod_session_change)(struct vnc* v, int, int); int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount, tbus* write_objs, int* wcount, int* timeout); int (*mod_check_wait_objs)(struct vnc* v); - long mod_dumby[100 - 9]; /* align, 100 minus the number of mod - functions above */ + tintptr mod_dumby[100 - 9]; /* align, 100 minus the number of mod + functions above */ /* server functions */ int (*server_begin_update)(struct vnc* v); int (*server_end_update)(struct vnc* v); @@ -55,7 +54,7 @@ struct vnc 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_palette)(struct vnc* v, int* palette); - int (*server_msg)(struct vnc* v, char* msg, int code); + int (*server_msg)(struct vnc* v, const char *msg, int code); int (*server_is_term)(struct vnc* v); int (*server_set_clip)(struct vnc* v, int x, int y, int cx, int cy); int (*server_reset_clip)(struct vnc* v); @@ -63,12 +62,12 @@ struct vnc int (*server_set_bgcolor)(struct vnc* v, int bgcolor); int (*server_set_opcode)(struct vnc* v, int opcode); int (*server_set_mixmode)(struct vnc* v, int mixmode); - int (*server_set_brush)(struct vnc* v, int x_orgin, int y_orgin, + int (*server_set_brush)(struct vnc* v, int x_origin, int y_origin, int style, char* pattern); int (*server_set_pen)(struct vnc* v, int style, int width); 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 charactor, + int (*server_add_char)(struct vnc* v, int font, int character, int offset, int baseline, int width, int height, char* data); int (*server_draw_text)(struct vnc* v, int font, @@ -81,18 +80,18 @@ struct vnc int (*server_query_channel)(struct vnc* v, int index, char* channel_name, int* channel_flags); - int (*server_get_channel_id)(struct vnc* v, char* name); + int (*server_get_channel_id)(struct vnc* v, const char *name); int (*server_send_to_channel)(struct vnc* v, int channel_id, char* data, int data_len, int total_data_len, int flags); int (*server_bell_trigger)(struct vnc* v); - long server_dumby[100 - 25]; /* align, 100 minus the number of server - functions above */ + tintptr server_dumby[100 - 25]; /* align, 100 minus the number of server + functions above */ /* common */ - long handle; /* pointer to self as long */ - long wm; - long painter; - int sck; + tintptr handle; /* pointer to self as long */ + tintptr wm; + tintptr painter; + tintptr si; /* mod data */ int server_width; int server_height; @@ -112,8 +111,9 @@ struct vnc int shift_state; /* 0 up, 1 down */ int keylayout; int clip_chanid; - char* clip_data; - int clip_data_size; - tbus sck_obj; + struct stream *clip_data_s; int delay_ms; + struct trans *trans; + int got_guid; + tui8 guid[16]; }; |