1 files changed, 2 insertions, 118 deletions

diff --git a/krdc/vnc/vncviewer.h b/krdc/vnc/vncviewer.h
index 285357b9..02e3c635 100644
--- a/krdc/vnc/vncviewer.h
+++ b/krdc/vnc/vncviewer.h
@@ -36,28 +36,14 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xmu/StdSel.h>
-#include "vnctypes.h" 
 
 #if(defined __cplusplus)
 extern "C"
 {
 #endif
 
-#include "rfbproto.h"
-
-extern int endianTest;
-
-#define Swap16IfLE(s) \
-    (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
-
-#define Swap32IfLE(l) \
-    (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \
-			     (((l) & 0x00ff0000) >> 8)  | \
-			     (((l) & 0x0000ff00) << 8)  | \
-			     (((l) & 0x000000ff) << 24))  : (l))
-
-#define MAX_ENCODINGS 20
-
+#include "rfb/rfbclient.h"
+#include "rfb/rfbproto.h"
 
 /** kvncview.cpp **/
 
@@ -78,108 +64,6 @@ extern void beep();
 extern void newServerCut(char *bytes, int len);
 extern void postMouseEvent(int x, int y, int buttonMask);
 
-/** threads.cpp **/
-
-extern void queueIncrementalUpdateRequest();
-extern void announceIncrementalUpdateRequest();
-
-/* colour.c */
-
-extern unsigned long BGR233ToPixel[];
-
-extern Colormap cmap;
-extern Visual *vis;
-extern unsigned int visdepth, visbpp;
-
-extern void SetVisualAndCmap(void);
-
-/* desktop.c */
-
-extern Widget form, viewport, desktop;
-extern GC gc;
-extern GC srcGC, dstGC;
-extern Dimension dpyWidth, dpyHeight;
-
-extern void DesktopInit(Window win);
-extern void ToplevelInit(void);
-extern void SendRFBEvent(XEvent *event, String *params, Cardinal *num_params);
-extern void CopyDataToScreen(char *buf, int x, int y, int width, int height);
-extern void CopyDataFromScreen(char *buf, int x, int y, int width, int height);
-extern void FillRectangle8(CARD8, int x, int y, int width, int height);
-extern void FillRectangle16(CARD16, int x, int y, int width, int height);
-extern void FillRectangle32(CARD32, int x, int y, int width, int height);
-extern void CopyArea(int srcX, int srcY, int width, int height, int x, int y);
-extern void SyncScreenRegion(int x, int y, int width, int height);
-extern void SyncScreenRegionX11Thread(int x, int y, int width, int height);
-extern void drawCursor(void);
-extern void DrawCursorX11Thread(int x, int y);
-extern void undrawCursor(void);
-extern void getBoundingRectCursor(int cx, int cy, int _imageIndex,
-				  int *x, int *y, int *w, int *h);
-extern int rectsIntersect(int x, int y, int w, int h, 
-			  int x2, int y2, int w2, int h2);
-extern int rectContains(int outX, int outY, int outW, int outH, 
-			int inX, int inY, int inW, int inH);
-extern void rectsJoin(int *nx1, int *ny1, int *nw1, int *nh1, 
-		      int x2, int y2, int w2, int h2);
-extern void DrawZoomedScreenRegionX11Thread(Window win, int zwidth, 
-					    int zheight, 
-					    int x, int y, 
-					    int width, int height);
-extern void DrawScreenRegionX11Thread(Window win, int x, int y, 
-				      int width, int height);
-extern void Cleanup(void);
-extern XImage *CreateShmZoomImage(void);
-extern XImage *CreateShmImage(void);
-extern void ShmCleanup(void);
-extern void freeDesktopResources(void);
-
-/* rfbproto.c */
-
-extern int rfbsock;
-extern Bool canUseCoRRE;
-extern Bool canUseHextile;
-extern char *desktopName;
-extern rfbPixelFormat myFormat;
-extern rfbServerInitMsg si;
-
-extern int cursorX, cursorY;
-extern int imageIndex;
-typedef struct {
-  int set;
-  int w, h;
-  int hotX, hotY;
-  int len;
-  char *image;
-} PointerImage;
-extern PointerImage pointerImages[];
-
-extern int ConnectToRFBServer(const char *hostname, int port);
-extern enum InitStatus InitialiseRFBConnection(void);
-extern Bool SetFormatAndEncodings(void);
-extern Bool SendIncrementalFramebufferUpdateRequest(void);
-extern Bool SendFramebufferUpdateRequest(int x, int y, int w, int h,
-					 Bool incremental);
-extern Bool SendPointerEvent(int x, int y, int buttonMask);
-extern Bool SendKeyEvent(CARD32 key, Bool down);
-extern Bool SendClientCutText(const char *str, int len);
-extern Bool HandleRFBServerMessage(void);
-
-extern void PrintPixelFormat(rfbPixelFormat *format);
-extern void freeRFBProtoResources(void);
-extern void freeResources(void);
-
-/* sockets.c */
-
-extern Bool errorMessageOnReadFailure;
-
-extern Bool ReadFromRFBServer(char *out, unsigned int n);
-extern Bool WriteExact(int sock, const char *buf, int n);
-extern int ConnectToTcpAddr(unsigned int host, int port);
-
-extern int StringToIPAddr(const char *str, unsigned int *addr);
-extern void freeSocketsResources(void);
-
 #if(defined __cplusplus)
 }
 #endif