diff options
Diffstat (limited to 'xup/xup.h')
| -rw-r--r-- | xup/xup.h | 35 |
1 files changed, 18 insertions, 17 deletions
@@ -1,7 +1,7 @@ /** * xrdp: A Remote Desktop Protocol server. * - * Copyright (C) Jay Sorg 2004-2014 + * 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. @@ -26,7 +26,7 @@ #include "xrdp_client_info.h" #include "xrdp_rail.h" -#define CURRENT_MOD_VER 2 +#define CURRENT_MOD_VER 3 struct mod { @@ -39,14 +39,14 @@ struct mod tbus param3, tbus param4); int (*mod_signal)(struct mod* v); int (*mod_end)(struct mod* v); - int (*mod_set_param)(struct mod* v, char* name, char* value); + int (*mod_set_param)(struct mod* v, const char *name, char* value); int (*mod_session_change)(struct mod* v, int, int); int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount, tbus* write_objs, int* wcount, int* timeout); int (*mod_check_wait_objs)(struct mod* v); int (*mod_frame_ack)(struct mod* v, int flags, int frame_id); - tbus mod_dumby[100 - 10]; /* align, 100 minus the number of mod - functions above */ + tintptr mod_dumby[100 - 10]; /* align, 100 minus the number of mod + functions above */ /* server functions */ int (*server_begin_update)(struct mod* v); int (*server_end_update)(struct mod* v); @@ -58,7 +58,7 @@ struct mod int srcx, int srcy); int (*server_set_cursor)(struct mod* v, int x, int y, char* data, char* mask); int (*server_palette)(struct mod* v, int* palette); - int (*server_msg)(struct mod* v, char* msg, int code); + int (*server_msg)(struct mod* v, const char *msg, int code); int (*server_is_term)(struct mod* v); int (*server_set_clip)(struct mod* v, int x, int y, int cx, int cy); int (*server_reset_clip)(struct mod* v); @@ -66,12 +66,12 @@ struct mod int (*server_set_bgcolor)(struct mod* v, int bgcolor); int (*server_set_opcode)(struct mod* v, int opcode); int (*server_set_mixmode)(struct mod* v, int mixmode); - int (*server_set_brush)(struct mod* v, int x_orgin, int y_orgin, + int (*server_set_brush)(struct mod* v, int x_origin, int y_origin, int style, char* pattern); int (*server_set_pen)(struct mod* v, int style, int width); int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2); - int (*server_add_char)(struct mod* v, int font, int charactor, + int (*server_add_char)(struct mod* v, int font, int character, int offset, int baseline, int width, int height, char* data); int (*server_draw_text)(struct mod* v, int font, @@ -84,7 +84,7 @@ struct mod int (*server_query_channel)(struct mod* v, int index, char* channel_name, int* channel_flags); - int (*server_get_channel_id)(struct mod* v, char* name); + int (*server_get_channel_id)(struct mod* v, const char *name); int (*server_send_to_channel)(struct mod* v, int channel_id, char* data, int data_len, int total_data_len, int flags); @@ -121,7 +121,7 @@ struct mod int flags); int (*server_set_cursor_ex)(struct mod* v, int x, int y, char* data, char* mask, int bpp); - int (*server_add_char_alpha)(struct mod* v, int font, int charactor, + int (*server_add_char_alpha)(struct mod* v, int font, int character, int offset, int baseline, int width, int height, char* data); int (*server_create_os_surface_bpp)(struct mod* v, int rdpindex, @@ -140,13 +140,13 @@ struct mod char *data, int width, int height, int flags, int frame_id); - tbus server_dumby[100 - 43]; /* align, 100 minus the number of server - functions above */ + tintptr server_dumby[100 - 43]; /* align, 100 minus the number of server + functions above */ /* common */ - tbus handle; /* pointer to self as long */ - tbus wm; - tbus painter; - int sck; + tintptr handle; /* pointer to self as long */ + tintptr wm; + tintptr painter; + tintptr si; /* mod data */ int width; int height; @@ -156,9 +156,10 @@ struct mod char password[256]; char ip[256]; char port[256]; - tbus sck_obj; int shift_state; struct xrdp_client_info client_info; int screen_shmem_id; + int screen_shmem_id_mapped; /* boolean */ char *screen_shmem_pixels; + struct trans *trans; }; |