Remove RFB dependencies from X server (crashes, though).

[rdpsrv] / Xserver / programs / Xserver / hw / vnc / rfb.h

diff --git a/Xserver/programs/Xserver/hw/vnc/rfb.h b/Xserver/programs/Xserver/hw/vnc/rfb.h
index ebc70a0649e11c1023df27c0c7db25638a24b979..51efa39685158b4ce7427e2d4d71a6f5e13277f4 100644 (file)
--- a/Xserver/programs/Xserver/hw/vnc/rfb.h
+++ b/Xserver/programs/Xserver/hw/vnc/rfb.h
@@ -26,8 +26,6 @@
 #include "colormapst.h"
 #include "gcstruct.h"
 #include "osdep.h"
-#include <rfb/rfbproto.h>
-#include <rfb/vncauth.h>
 
 #define MAX_ENCODINGS 20
 
@@ -105,17 +103,6 @@ typedef struct
 } rfbScreenInfo, *rfbScreenInfoPtr;
 
 
-/*
- * rfbTranslateFnType is the type of translation functions.
- */
-
-struct rfbClientRec;
-typedef void (*rfbTranslateFnType)(char *table, rfbPixelFormat *in,
-                                  rfbPixelFormat *out,
-                                  char *iptr, char *optr,
-                                  int bytesBetweenInputLines,
-                                  int width, int height);
-
 
 /*
  * Per-client structure.
@@ -142,10 +129,6 @@ typedef struct rfbClientRec {
     int correMaxWidth, correMaxHeight;
     void* zrleData;
 
-    /* The following member is only used during VNC authentication */
-
-    CARD8 authChallenge[CHALLENGESIZE];
-
     /* The following members represent the update needed to get the client's
        framebuffer from its present state to the current state of our
        framebuffer.
@@ -191,15 +174,8 @@ typedef struct rfbClientRec {
     Bool deferredUpdateScheduled;
     OsTimerPtr deferredUpdateTimer;
 
-    /* translateFn points to the translation function which is used to copy
-       and translate a rectangle from the framebuffer to an output buffer. */
-
-    rfbTranslateFnType translateFn;
-
     char *translateLookupTable;
 
-    rfbPixelFormat format;
-
     /* statistics */
 
     int rfbBytesSent[MAX_ENCODINGS];
@@ -392,13 +368,7 @@ extern void rfbSendServerCutText(char *str, int len);
 /* translate.c */
 
 extern Bool rfbEconomicTranslate;
-extern rfbPixelFormat rfbServerFormat;
 
-extern void rfbTranslateNone(char *table, rfbPixelFormat *in,
-                            rfbPixelFormat *out,
-                            char *iptr, char *optr,
-                            int bytesBetweenInputLines,
-                            int width, int height);
 extern Bool rfbSetTranslateFunction(rfbClientPtr cl);
 extern void rfbSetClientColourMaps(int firstColour, int nColours);
 extern Bool rfbSetClientColourMap(rfbClientPtr cl, int firstColour,