"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "module/rdp.h" between
xorgxrdp-0.2.11.tar.gz and xorgxrdp-0.2.12.tar.gz

About: xorgxrdp is a collection of modules to be used with a pre-existing X.Org install to make the X server act like X11rdp (requires "xrdp").

rdp.h  (xorgxrdp-0.2.11):rdp.h  (xorgxrdp-0.2.12)
skipping to change at line 44 skipping to change at line 44
#include "rdpPri.h" #include "rdpPri.h"
#include "xrdp_client_info.h" #include "xrdp_client_info.h"
#define XRDP_MODULE_NAME "XORGXRDP" #define XRDP_MODULE_NAME "XORGXRDP"
#define XRDP_DRIVER_NAME "XRDPDEV" #define XRDP_DRIVER_NAME "XRDPDEV"
#define XRDP_MOUSE_NAME "XRDPMOUSE" #define XRDP_MOUSE_NAME "XRDPMOUSE"
#define XRDP_KEYB_NAME "XRDPKEYB" #define XRDP_KEYB_NAME "XRDPKEYB"
#define XRDP_VERSION 1000 #define XRDP_VERSION 1000
#define RDP_MAX_TILES 4096
#define COLOR8(r, g, b) \ #define COLOR8(r, g, b) \
((((r) >> 5) << 0) | (((g) >> 5) << 3) | (((b) >> 6) << 6)) ((((r) >> 5) << 0) | (((g) >> 5) << 3) | (((b) >> 6) << 6))
#define COLOR15(r, g, b) \ #define COLOR15(r, g, b) \
((((r) >> 3) << 10) | (((g) >> 3) << 5) | (((b) >> 3) << 0)) ((((r) >> 3) << 10) | (((g) >> 3) << 5) | (((b) >> 3) << 0))
#define COLOR16(r, g, b) \ #define COLOR16(r, g, b) \
((((r) >> 3) << 11) | (((g) >> 2) << 5) | (((b) >> 3) << 0)) ((((r) >> 3) << 11) | (((g) >> 2) << 5) | (((b) >> 3) << 0))
#define COLOR24(r, g, b) \ #define COLOR24(r, g, b) \
((((r) >> 0) << 0) | (((g) >> 0) << 8) | (((b) >> 0) << 16)) ((((r) >> 0) << 0) | (((g) >> 0) << 8) | (((b) >> 0) << 16))
#define SPLITCOLOR32(r, g, b, c) \ #define SPLITCOLOR32(r, g, b, c) \
do { \ do { \
skipping to change at line 203 skipping to change at line 205
CARD32 rdpPolyText8CallCount; CARD32 rdpPolyText8CallCount;
CARD32 rdpPolyText16CallCount; CARD32 rdpPolyText16CallCount;
CARD32 rdpImageText8CallCount; CARD32 rdpImageText8CallCount;
CARD32 rdpImageText16CallCount; CARD32 rdpImageText16CallCount;
CARD32 rdpImageGlyphBltCallCount; CARD32 rdpImageGlyphBltCallCount;
CARD32 rdpPolyGlyphBltCallCount; CARD32 rdpPolyGlyphBltCallCount;
CARD32 rdpPushPixelsCallCount; /* 20 */ CARD32 rdpPushPixelsCallCount; /* 20 */
CARD32 rdpCompositeCallCount; CARD32 rdpCompositeCallCount;
CARD32 rdpCopyWindowCallCount; /* 22 */ CARD32 rdpCopyWindowCallCount; /* 22 */
CARD32 rdpTrapezoidsCallCount; CARD32 rdpTrapezoidsCallCount;
CARD32 callCount[64 - 23]; CARD32 rdpTrianglesCallCount;
CARD32 rdpCompositeRectsCallCount;
CARD32 callCount[64 - 25];
}; };
typedef int (*yuv_to_rgb32_proc)(const uint8_t *yuvs, int width, int height, int *rgbs); typedef int (*yuv_to_rgb32_proc)(const uint8_t *yuvs, int width, int height, int *rgbs);
typedef int (*copy_box_proc)(const uint8_t *s8, int src_stride, typedef int (*copy_box_proc)(const uint8_t *s8, int src_stride,
uint8_t *d8, int dst_stride, uint8_t *d8, int dst_stride,
int width, int height); int width, int height);
/* copy_box_proc but 2 dest */ /* copy_box_proc but 2 dest */
typedef int (*copy_box_dst2_proc)(const uint8_t *s8, int src_stride, typedef int (*copy_box_dst2_proc)(const uint8_t *s8, int src_stride,
uint8_t *d8_y, int dst_stride_y, uint8_t *d8_y, int dst_stride_y,
skipping to change at line 244 skipping to change at line 248
CopyWindowProcPtr CopyWindow; CopyWindowProcPtr CopyWindow;
CreateGCProcPtr CreateGC; CreateGCProcPtr CreateGC;
CreatePixmapProcPtr CreatePixmap; CreatePixmapProcPtr CreatePixmap;
DestroyPixmapProcPtr DestroyPixmap; DestroyPixmapProcPtr DestroyPixmap;
ModifyPixmapHeaderProcPtr ModifyPixmapHeader; ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
CloseScreenProcPtr CloseScreen; CloseScreenProcPtr CloseScreen;
CompositeProcPtr Composite; CompositeProcPtr Composite;
GlyphsProcPtr Glyphs; GlyphsProcPtr Glyphs;
TrapezoidsProcPtr Trapezoids; TrapezoidsProcPtr Trapezoids;
CreateScreenResourcesProcPtr CreateScreenResources;
TrianglesProcPtr Triangles;
CompositeRectsProcPtr CompositeRects;
/* keyboard and mouse */ /* keyboard and mouse */
miPointerScreenFuncPtr pCursorFuncs; miPointerScreenFuncPtr pCursorFuncs;
/* mouse */ /* mouse */
rdpPointer pointer; rdpPointer pointer;
/* keyboard */ /* keyboard */
rdpKeyboard keyboard; rdpKeyboard keyboard;
/* RandR */ /* RandR */
RRSetConfigProcPtr rrSetConfig; RRSetConfigProcPtr rrSetConfig;
skipping to change at line 265 skipping to change at line 272
RRScreenSetSizeProcPtr rrScreenSetSize; RRScreenSetSizeProcPtr rrScreenSetSize;
RRCrtcSetProcPtr rrCrtcSet; RRCrtcSetProcPtr rrCrtcSet;
RRCrtcSetGammaProcPtr rrCrtcSetGamma; RRCrtcSetGammaProcPtr rrCrtcSetGamma;
RRCrtcGetGammaProcPtr rrCrtcGetGamma; RRCrtcGetGammaProcPtr rrCrtcGetGamma;
RROutputSetPropertyProcPtr rrOutputSetProperty; RROutputSetPropertyProcPtr rrOutputSetProperty;
RROutputValidateModeProcPtr rrOutputValidateMode; RROutputValidateModeProcPtr rrOutputValidateMode;
RRModeDestroyProcPtr rrModeDestroy; RRModeDestroyProcPtr rrModeDestroy;
RROutputGetPropertyProcPtr rrOutputGetProperty; RROutputGetPropertyProcPtr rrOutputGetProperty;
RRGetPanningProcPtr rrGetPanning; RRGetPanningProcPtr rrGetPanning;
RRSetPanningProcPtr rrSetPanning; RRSetPanningProcPtr rrSetPanning;
int allow_screen_resize;
int listen_sck; int listen_sck;
char uds_data[256]; char uds_data[256];
int disconnect_sck; int disconnect_sck;
char disconnect_uds[256]; char disconnect_uds[256];
rdpClientCon *clientConHead; rdpClientCon *clientConHead;
rdpClientCon *clientConTail; rdpClientCon *clientConTail;
rdpPixmapRec screenPriv; rdpPixmapRec screenPriv;
int sendUpdateScheduled; /* boolean */ int sendUpdateScheduled; /* boolean */
skipping to change at line 310 skipping to change at line 318
int xv_timer_scheduled; int xv_timer_scheduled;
OsTimerPtr xv_timer; OsTimerPtr xv_timer;
copy_box_proc a8r8g8b8_to_a8b8g8r8_box; copy_box_proc a8r8g8b8_to_a8b8g8r8_box;
copy_box_dst2_proc a8r8g8b8_to_nv12_box; copy_box_dst2_proc a8r8g8b8_to_nv12_box;
/* multimon */ /* multimon */
struct monitor_info minfo[16]; /* client monitor data */ struct monitor_info minfo[16]; /* client monitor data */
int doMultimon; int doMultimon;
int monitorCount; int monitorCount;
/* glamor */
Bool glamor;
PixmapPtr screenSwPixmap;
void *xvPutImage;
/* dri */
int fd;
/* egl */
void *egl;
}; };
typedef struct _rdpRec rdpRec; typedef struct _rdpRec rdpRec;
typedef struct _rdpRec * rdpPtr; typedef struct _rdpRec * rdpPtr;
#define XRDPPTR(_p) ((rdpPtr)((_p)->driverPrivate)) #define XRDPPTR(_p) ((rdpPtr)((_p)->driverPrivate))
struct _rdpGCRec struct _rdpGCRec
{ {
/* changed to const in d89b42b */ /* changed to const in d89b42b */
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 15, 99, 901, 0) #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 15, 99, 901, 0)
GCFuncs *funcs; GCFuncs *funcs;
 End of changes. 5 change blocks. 
2 lines changed or deleted 17 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)