diff options
| author | Laxmikant Rashinkar <lk@Ubuntu-12.04-32bit> | 2014-10-11 14:49:46 -0700 |
|---|---|---|
| committer | Laxmikant Rashinkar <lk@Ubuntu-12.04-32bit> | 2014-10-11 14:49:46 -0700 |
| commit | 8c316b46b8d6b1cb3cf32165daf817030aac1a47 (patch) | |
| tree | 089c5741cb2a914501e5ab28898a5c71c4c4103b /xrdp/xrdp.h | |
| parent | 5b6b74577fda4bbcd0a02a585d783c59d68953da (diff) | |
| parent | bc7a6b9bc66afe4adf7c232c94e41694319d4155 (diff) | |
| download | xrdp-proprietary-8c316b46b8d6b1cb3cf32165daf817030aac1a47.tar.gz xrdp-proprietary-8c316b46b8d6b1cb3cf32165daf817030aac1a47.zip | |
Merge branch 'devel'
Diffstat (limited to 'xrdp/xrdp.h')
| -rw-r--r-- | xrdp/xrdp.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h index a778058f..67488a60 100644 --- a/xrdp/xrdp.h +++ b/xrdp/xrdp.h @@ -1,7 +1,7 @@ /** * xrdp: A Remote Desktop Protocol server. * - * Copyright (C) Jay Sorg 2004-2013 + * Copyright (C) Jay Sorg 2004-2014 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ #include "parse.h" #include "trans.h" #include "list.h" +#include "list16.h" #include "libxrdpinc.h" #include "xrdp_constants.h" #include "xrdp_types.h" @@ -137,6 +138,8 @@ callback(long id, int msg, long param1, long param2, long param3, long param4); int APP_CC xrdp_wm_delete_all_childs(struct xrdp_wm* self); int APP_CC +xrdp_wm_show_log(struct xrdp_wm *self); +int APP_CC xrdp_wm_log_msg(struct xrdp_wm* self, char* msg); int APP_CC xrdp_wm_get_wait_objs(struct xrdp_wm* self, tbus* robjs, int* rc, @@ -206,6 +209,8 @@ xrdp_bitmap_copy_box(struct xrdp_bitmap* self, struct xrdp_bitmap* dest, int x, int y, int cx, int cy); int APP_CC +xrdp_bitmap_hash_crc(struct xrdp_bitmap *self); +int APP_CC xrdp_bitmap_copy_box_with_crc(struct xrdp_bitmap* self, struct xrdp_bitmap* dest, int x, int y, int cx, int cy); @@ -213,9 +218,6 @@ int APP_CC xrdp_bitmap_compare(struct xrdp_bitmap* self, struct xrdp_bitmap* b); int APP_CC -xrdp_bitmap_compare_with_crc(struct xrdp_bitmap* self, - struct xrdp_bitmap* b); -int APP_CC xrdp_bitmap_invalidate(struct xrdp_bitmap* self, struct xrdp_rect* rect); int APP_CC xrdp_bitmap_def_proc(struct xrdp_bitmap* self, int msg, @@ -404,7 +406,8 @@ server_composite(struct xrdp_mod* mod, int srcidx, int srcformat, int srcwidth, int DEFAULT_CC server_paint_rects(struct xrdp_mod* mod, int num_drects, short *drects, int num_crects, short *crects, - char *data, int width, int height, int flags); + char *data, int width, int height, + int flags, int frame_id); int DEFAULT_CC server_set_pointer(struct xrdp_mod* mod, int x, int y, char* data, char* mask); |