diff options
| author | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2012-12-26 18:58:31 -0800 |
|---|---|---|
| committer | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2012-12-26 18:58:31 -0800 |
| commit | f3cc2a5154e79afcebed79b9dc85205fdd950043 (patch) | |
| tree | f4f67a024422401b66c8839f526c9db385d3e001 /xorg/X11R7.6/rdp/rdp.h | |
| parent | cae2adb75e2b339017746436c63f7d2b8c35fb63 (diff) | |
| parent | cce4f773d858a2b131a026fa82136743155ad12b (diff) | |
| download | xrdp-proprietary-f3cc2a5154e79afcebed79b9dc85205fdd950043.tar.gz xrdp-proprietary-f3cc2a5154e79afcebed79b9dc85205fdd950043.zip | |
Merge branch 'master' of https://github.com/FreeRDP/xrdp
Diffstat (limited to 'xorg/X11R7.6/rdp/rdp.h')
| -rw-r--r-- | xorg/X11R7.6/rdp/rdp.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h index 572bc6f4..57de4432 100644 --- a/xorg/X11R7.6/rdp/rdp.h +++ b/xorg/X11R7.6/rdp/rdp.h @@ -256,7 +256,6 @@ struct _rdpPixmapRec { int status; int rdpindex; - int allocBytes; int con_number; int is_dirty; int pad0; @@ -338,7 +337,7 @@ draw_item_remove(rdpPixmapRec* priv, struct rdp_draw_item* di); int draw_item_remove_all(rdpPixmapRec* priv); int -draw_item_pack(rdpPixmapRec* priv); +draw_item_pack(PixmapPtr pix, rdpPixmapRec* priv); int draw_item_add_img_region(rdpPixmapRec* priv, RegionPtr reg, int opcode, int type); @@ -359,7 +358,8 @@ rdpCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint); Bool rdpDestroyPixmap(PixmapPtr pPixmap); - +int +xrdp_is_os(PixmapPtr pix, rdpPixmapPtr priv); Bool rdpCreateWindow(WindowPtr pWindow); Bool @@ -420,7 +420,6 @@ rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr* glyphs); - /* rdpinput.c */ int rdpKeybdProc(DeviceIntPtr pDevice, int onoff); |