diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-10-05 11:15:27 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2016-10-05 11:15:27 +0200 |
| commit | 3fed95eda27dfbeee6535f987f5d14a66f64749b (patch) | |
| tree | 78e23a32d35c8fa43634a61a4ed43d886d6ca69b /unix/xserver/hw/vnc/vncHooks.c | |
| parent | 1349e42e395a0a88b67447580d526daf31dba591 (diff) | |
| download | tigervnc-3fed95eda27dfbeee6535f987f5d14a66f64749b.tar.gz tigervnc-3fed95eda27dfbeee6535f987f5d14a66f64749b.zip | |
Add xorg-xserver 1.19 support
Diffstat (limited to 'unix/xserver/hw/vnc/vncHooks.c')
| -rw-r--r-- | unix/xserver/hw/vnc/vncHooks.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/unix/xserver/hw/vnc/vncHooks.c b/unix/xserver/hw/vnc/vncHooks.c index 22ea9ea8..29f3f8b8 100644 --- a/unix/xserver/hw/vnc/vncHooks.c +++ b/unix/xserver/hw/vnc/vncHooks.c @@ -128,9 +128,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev, #if XORG <= 112 static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask); -#else +#elif XORG <= 118 static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout, void * pReadmask); +#else +static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout); #endif #ifdef RENDER static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -716,9 +718,11 @@ out: #if XORG <= 112 static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) -#else +#elif XORG <= 118 static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout, void * pReadmask) +#else +static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout) #endif { #if XORG <= 112 @@ -731,8 +735,10 @@ static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout, #if XORG <= 112 (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); -#else +#elif XORG <= 118 (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); +#else + (*pScreen->BlockHandler) (pScreen, pTimeout); #endif vncHooksScreen->ignoreHooks--; @@ -1033,12 +1039,21 @@ static void vncHooksCopyClip(GCPtr dst, GCPtr src) { // Unwrap and rewrap helpers +#if XORG >= 116 +#define GC_OP_PROLOGUE(pGC, name)\ + vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\ + const GCFuncs *oldFuncs = pGC->funcs;\ + pGC->funcs = pGCPriv->wrappedFuncs;\ + pGC->ops = pGCPriv->wrappedOps; \ + DBGPRINT((stderr,"vncHooks" #name " called\n")) +#else #define GC_OP_PROLOGUE(pGC, name)\ vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\ GCFuncs *oldFuncs = pGC->funcs;\ pGC->funcs = pGCPriv->wrappedFuncs;\ pGC->ops = pGCPriv->wrappedOps; \ DBGPRINT((stderr,"vncHooks" #name " called\n")) +#endif #define GC_OP_EPILOGUE(pGC)\ pGCPriv->wrappedOps = pGC->ops;\ |