summaryrefslogtreecommitdiffstats
path: root/rfb.h
diff options
context:
space:
mode:
authordscho <dscho>2001-10-06 17:45:42 +0000
committerdscho <dscho>2001-10-06 17:45:42 +0000
commit446f334cc1ee67b280e218ae58fef34d5b063cea (patch)
treef238279505d71a241b20154a43aee10b7acde3fa /rfb.h
parent018e90db5918a75ceaf3835be084e2387f31a47e (diff)
downloadlibtdevnc-446f334cc1ee67b280e218ae58fef34d5b063cea.tar.gz
libtdevnc-446f334cc1ee67b280e218ae58fef34d5b063cea.zip
WIN32 compatibility, removed kbdptr.c
Diffstat (limited to 'rfb.h')
-rw-r--r--rfb.h65
1 files changed, 46 insertions, 19 deletions
diff --git a/rfb.h b/rfb.h
index c0ca7a9..26dde36 100644
--- a/rfb.h
+++ b/rfb.h
@@ -46,22 +46,18 @@ typedef CARD32 KeySym;
#define xrealloc realloc
#define xfree free
-int max(int,int);
-
#include <zlib.h>
-#include <rfbproto.h>
+#include "rfbproto.h"
#ifdef __linux__
#include <endian.h>
-#else
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#elif defined(__APPLE__) || defined(__FreeBSD__)
#include <sys/types.h>
#include <machine/endian.h>
#define _BYTE_ORDER BYTE_ORDER
#define _LITTLE_ENDIAN LITTLE_ENDIAN
-#else
-#ifdef sparc
+#elif sparc
#define _LITTLE_ENDIAN 1234
#define _BYTE_ORDER _LITTLE_ENDIAN
#undef Bool
@@ -69,11 +65,14 @@ int max(int,int);
#include <sys/types.h>
/* typedef unsigned int pthread_t; */
/* SUN cc seems to have problems with inclusion of sys/types! */
+#elif defined(WIN32)
+#define _LITTLE_ENDIAN 1234
+#define _BYTE_ORDER _LITTLE_ENDIAN
+#undef Bool
+#define Bool int
#else
#include <sys/endian.h>
#endif
-#endif
-#endif
#ifndef _BYTE_ORDER
#define _BYTE_ORDER __BYTE_ORDER
@@ -83,11 +82,20 @@ int max(int,int);
#define _LITTLE_ENDIAN __LITTLE_ENDIAN
#endif
+#ifdef WIN32
+#include <winsock.h>
+//#define sockaddr_in sockaddr*
+#undef SOCKET
+#define SOCKET int
+#else
+int max(int,int);
#include <netinet/in.h>
+#define SOCKET int
+#endif
#ifdef HAVE_PTHREADS
#include <pthread.h>
-#if 0
+#if 0 /* debugging */
#define LOCK(mutex) fprintf(stderr,"%s:%d LOCK(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex))
#define UNLOCK(mutex) fprintf(stderr,"%s:%d UNLOCK(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex))
#define MUTEX(mutex) int mutex
@@ -141,7 +149,7 @@ typedef Bool (*SetTranslateFunctionProcPtr)(struct rfbClientRec* cl);
typedef void (*NewClientHookPtr)(struct rfbClientRec* cl);
typedef struct {
- int count;
+ CARD32 count;
Bool is16; /* is the data format short? */
union {
CARD8* bytes;
@@ -149,6 +157,23 @@ typedef struct {
} data; /* there have to be count*3 entries */
} rfbColourMap;
+/* this is why windows and it's programs are so huge:
+ You can't do something like
+#define MUTEX(m)
+ struct {
+ int i;
+ MUTEX(m); // this evaluates to ";", and that is not acceptable
+ // to Visual C++
+ }
+*/
+
+#ifdef WIN32
+#undef MUTEX
+#define MUTEX(mutex) char dummy##mutex
+#undef COND
+#define COND(cont) char dummy##cond
+#endif
+
/*
* Per-screen (framebuffer) structure. There is only one of these, since we
* don't allow the X server to have multiple screens.
@@ -221,12 +246,12 @@ typedef struct
char rfbThisHost[255];
int rfbPort;
Bool socketInitDone;
- int inetdSock;
+ SOCKET inetdSock;
int maxSock;
int maxFd;
- int rfbListenSock;
+ SOCKET rfbListenSock;
int udpPort;
- int udpSock;
+ SOCKET udpSock;
struct rfbClientRec* udpClient;
Bool udpSockConnected;
struct sockaddr_in udpRemoteAddr;
@@ -237,8 +262,8 @@ typedef struct
Bool httpInitDone;
int httpPort;
char* httpDir;
- int httpListenSock;
- int httpSock;
+ SOCKET httpListenSock;
+ SOCKET httpSock;
FILE* httpFP;
char* rfbAuthPasswdFile;
@@ -255,8 +280,10 @@ typedef struct
Bool dontConvertRichCursorToXCursor;
struct rfbCursor* cursor;
MUTEX(cursorMutex);
-
- IF_PTHREADS(Bool backgroundLoop);
+
+#ifdef HAVE_PTHREADS
+ Bool backgroundLoop;
+#endif
/* the following members have to be supplied by the serving process */
char* frameBuffer;
@@ -319,7 +346,7 @@ typedef struct rfbClientRec {
void* clientData;
ClientGoneHookPtr clientGoneHook;
- int sock;
+ SOCKET sock;
char *host;
/* Possible client states: */
enum {