Adapted vfbPointerFuncs to match modern InitOutput.c.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@222 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
index 64d95dc..91a654f 100644
--- a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+++ b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
@@ -877,26 +877,32 @@
}
static Bool vfbRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) {
- return TRUE;
+ return TRUE;
}
+
static Bool vfbUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) {
- return TRUE;
+ return TRUE;
}
-static void vfbSetCursor(ScreenPtr pScreen, CursorPtr pCursor,
- int x, int y) {}
-static void vfbMoveCursor(ScreenPtr pScreen, int x, int y) {}
+
+static void vfbSetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
+{
+}
+
+static void vfbMoveCursor(ScreenPtr pScreen, int x, int y)
+{
+}
static miPointerSpriteFuncRec vfbPointerSpriteFuncs = {
- vfbRealizeCursor,
- vfbUnrealizeCursor,
- vfbSetCursor,
- vfbMoveCursor
+ vfbRealizeCursor,
+ vfbUnrealizeCursor,
+ vfbSetCursor,
+ vfbMoveCursor
};
-static miPointerScreenFuncRec vfbPointerScreenFuncs = {
- vfbCursorOffScreen,
- vfbCrossScreen,
- miPointerWarpCursor
+static miPointerScreenFuncRec vfbPointerCursorFuncs = {
+ vfbCursorOffScreen,
+ vfbCrossScreen,
+ miPointerWarpCursor
};
static Bool vfbScreenInit(int index, ScreenPtr pScreen, int argc, char** argv)
@@ -935,7 +941,7 @@
pScreen->SaveScreen = vfbSaveScreen;
pScreen->StoreColors = vfbStoreColors;
- miPointerInitialize(pScreen, &vfbPointerSpriteFuncs, &vfbPointerScreenFuncs,
+ miPointerInitialize(pScreen, &vfbPointerSpriteFuncs, &vfbPointerCursorFuncs,
FALSE);
vfbWriteXWDFileHeader(pScreen);