1351N/A #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
1351N/A+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
1351N/A+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
1351N/A-static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
1351N/A+static Bool vncHooksCloseScreen(ScreenPtr pScreen);
1351N/A static Bool vncHooksCreateGC(GCPtr pGC);
1351N/A static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
1351N/A ScreenPtr pScreen, CursorPtr cursor);
1351N/A-static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
1351N/A+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
1351N/A static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
1351N/A // CloseScreen - unwrap the screen functions and call the original CloseScreen
1351N/A-static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
1351N/A+static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
1351N/A SCREEN_UNWRAP(pScreen_, CloseScreen);
1351N/A DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
1351N/A- return (*pScreen->CloseScreen)(i, pScreen);
1351N/A+ return (*pScreen->CloseScreen)(pScreen);
1351N/A // CreateGC - wrap the "GC funcs"
1351N/A // BlockHandler - ignore any changes during the block handler - it's likely
1351N/A // these are just drawing the cursor.
1351N/A-static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
1351N/A+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
1351N/A+ SCREEN_UNWRAP(pScreen_, BlockHandler);
1351N/A vncHooksScreen->desktop->ignoreHooks(true);
1351N/A- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
1351N/A+ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
1351N/A vncHooksScreen->desktop->ignoreHooks(false);
1351N/A vncExtensionInitWithParams,
1351N/A+OsVendorFatalError(const char *f, va_list args)
1351N/A-vfbCloseScreen(int index, ScreenPtr pScreen)
1351N/A+vfbCloseScreen(ScreenPtr pScreen)
1351N/A- vfbScreenInfoPtr pvfb = &vfbScreens[index];
1351N/A+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
1351N/A pScreen->CloseScreen = pvfb->closeScreen;
1351N/A for (i = 0; i < MAXSCREENS; i++)
1351N/A- return pScreen->CloseScreen(index, pScreen);
1351N/A+ return pScreen->CloseScreen(pScreen);
1351N/A-vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
1351N/A+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
1351N/A- vfbScreenInfoPtr pvfb = &vfbScreens[index];
1351N/A+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
1351N/A pbits = vfbAllocateFramebufferMemory(&pvfb->fb);
1351N/A+ vncFbptr[pScreen->myNum] = pbits;