diff options
Diffstat (limited to 'libvncclient')
| -rw-r--r-- | libvncclient/client_test.c | 44 | ||||
| -rw-r--r-- | libvncclient/rfbproto.c | 8 | ||||
| -rw-r--r-- | libvncclient/vncviewer.c | 4 |
3 files changed, 45 insertions, 11 deletions
diff --git a/libvncclient/client_test.c b/libvncclient/client_test.c index 94f6f58..16429b0 100644 --- a/libvncclient/client_test.c +++ b/libvncclient/client_test.c @@ -3,6 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> +#include <errno.h> #include <rfb/rfbclient.h> void PrintRect(rfbClient* client, int x, int y, int w, int h) { @@ -39,14 +40,33 @@ void SaveFramebufferAsPGM(rfbClient* client, int x, int y, int w, int h) { fputc(client->frameBuffer[j+i+bpp-2],f); fputc(client->frameBuffer[j+i+bpp-3],f); } else { - fputc(client->frameBuffer[j+i+bpp+0],f); - fputc(client->frameBuffer[j+i+bpp+1],f); - fputc(client->frameBuffer[j+i+bpp+2],f); + fputc(client->frameBuffer[j+i+0],f); + fputc(client->frameBuffer[j+i+1],f); + fputc(client->frameBuffer[j+i+2],f); } } fclose(f); } +int WaitForMessage(rfbClient* client,unsigned int usecs) +{ + fd_set fds; + struct timeval timeout; + int num; + + timeout.tv_sec=(usecs/1000000); + timeout.tv_usec=(usecs%1000000); + + FD_ZERO(&fds); + FD_SET(client->sock,&fds); + + num=select(client->sock+1, &fds, NULL, NULL, &timeout); + if(num<0) + rfbClientLog("Waiting for message failed: %d (%s)\n",errno,strerror(errno)); + + return num; +} + int main(int argc, char **argv) { @@ -54,9 +74,10 @@ main(int argc, char **argv) rfbClient* client = rfbGetClient(&argc,argv,8,3,4); const char* vncServerHost=""; int vncServerPort=5900; + time_t t=time(0); client->GotFrameBufferUpdate = PrintRect; - client->GotFrameBufferUpdate = SaveFramebufferAsPGM; + //client->GotFrameBufferUpdate = SaveFramebufferAsPGM; /* The -listen option is used to make us a daemon process which listens for incoming connections from servers, rather than actively connecting to a @@ -86,13 +107,22 @@ main(int argc, char **argv) } client->appData.encodingsString="tight"; - rfbInitClient(client,vncServerHost,vncServerPort); + if(!rfbInitClient(client,vncServerHost,vncServerPort)) { + rfbClientCleanup(client); + return 1; + } - while (1) { - if (!HandleRFBServerMessage(client)) + while (time(0)-t<5) { + static int i=0; + fprintf(stderr,"\r%d",i++); + if(WaitForMessage(client,500)<0) + break; + if(!HandleRFBServerMessage(client)) break; } + rfbClientCleanup(client); + return 0; } diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c index 389aa05..72d71d4 100644 --- a/libvncclient/rfbproto.c +++ b/libvncclient/rfbproto.c @@ -979,10 +979,10 @@ PrintPixelFormat(format) (format->bigEndian ? "Most" : "Least")); } if (format->trueColour) { - rfbClientLog(" TRUE colour: max red %d green %d blue %d", - format->redMax, format->greenMax, format->blueMax); - rfbClientLog(", shift red %d green %d blue %d\n", - format->redShift, format->greenShift, format->blueShift); + rfbClientLog(" TRUE colour: max red %d green %d blue %d" + ", shift red %d green %d blue %d\n", + format->redMax, format->greenMax, format->blueMax, + format->redShift, format->greenShift, format->blueShift); } else { rfbClientLog(" Colour map (not true colour).\n"); } diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c index c5f7c69..54fcb51 100644 --- a/libvncclient/vncviewer.c +++ b/libvncclient/vncviewer.c @@ -121,3 +121,7 @@ Bool rfbInitClient(rfbClient* client,const char* vncServerHost,int vncServerPort return TRUE; } + +void rfbClientCleanup(rfbClient* client) { + free(client); +} |