diff options
| author | Pierre Ossman <ossman@cendio.se> | 2013-08-19 14:36:26 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2013-08-19 14:36:26 +0000 |
| commit | eef02d4940c0d0c0ca646b0327566507f46975b4 (patch) | |
| tree | 67cfc42264e34f64660da742a83784f85fbefa45 | |
| parent | 74d412c23bf69fbe6525d0047786ff67fddb95bd (diff) | |
| download | tigervnc-eef02d4940c0d0c0ca646b0327566507f46975b4.tar.gz tigervnc-eef02d4940c0d0c0ca646b0327566507f46975b4.zip | |
The screen index was removed in 1.13, not 1.12.
Bug found and patched by Koichiro IWAO.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5130 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | unix/xserver/hw/vnc/vncHooks.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc index 426c29f4..6756da7a 100644 --- a/unix/xserver/hw/vnc/vncHooks.cc +++ b/unix/xserver/hw/vnc/vncHooks.cc @@ -119,7 +119,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec; // screen functions -#if XORG < 112 +#if XORG <= 112 static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen); #else static Bool vncHooksCloseScreen(ScreenPtr pScreen); @@ -140,7 +140,7 @@ static Bool vncHooksDisplayCursor( DeviceIntPtr pDev, #endif ScreenPtr pScreen, CursorPtr cursor); -#if XORG < 112 +#if XORG <= 112 static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask); #else @@ -367,7 +367,7 @@ Bool vncHooksInit(ScreenPtr pScreen, XserverDesktop* desktop) // CloseScreen - unwrap the screen functions and call the original CloseScreen // function -#if XORG < 112 +#if XORG <= 112 static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_) #else static Bool vncHooksCloseScreen(ScreenPtr pScreen_) @@ -405,7 +405,7 @@ static Bool vncHooksCloseScreen(ScreenPtr pScreen_) DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n")); -#if XORG < 112 +#if XORG <= 112 return (*pScreen->CloseScreen)(i, pScreen); #else return (*pScreen->CloseScreen)(pScreen); @@ -574,7 +574,7 @@ static Bool vncHooksDisplayCursor( // BlockHandler - ignore any changes during the block handler - it's likely // these are just drawing the cursor. -#if XORG < 112 +#if XORG <= 112 static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) #else @@ -582,7 +582,7 @@ static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, pointer pReadmask) #endif { -#if XORG < 112 +#if XORG <= 112 SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler); #else SCREEN_UNWRAP(pScreen_, BlockHandler); @@ -590,7 +590,7 @@ static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, vncHooksScreen->desktop->ignoreHooks(true); -#if XORG < 112 +#if XORG <= 112 (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); #else (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); |