diff options
Diffstat (limited to 'xup/xup.h')
| -rw-r--r-- | xup/xup.h | 26 |
1 files changed, 13 insertions, 13 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 { @@ -45,8 +45,8 @@ struct mod 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); @@ -71,7 +71,7 @@ struct mod 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, @@ -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,10 +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; }; |