10l: really fix preferredEncoding set from outside

pull/1/head
dscho 19 years ago
parent bbab31583e
commit 914f7b71c5

@ -5,7 +5,6 @@ VisualNaCro testing
test IRIX -overlay (x11vnc) test IRIX -overlay (x11vnc)
java vncviewer doesn't do colour cursors? java vncviewer doesn't do colour cursors?
MinGW32 doesn't do fcntl on sockets; use setsockopt instead... MinGW32 doesn't do fcntl on sockets; use setsockopt instead...
if preferredEncoding is set outside of libvncserver, don't override it.
make libvncclient threadsafe (static zlib buffer -> rfbClient*) make libvncclient threadsafe (static zlib buffer -> rfbClient*)
make corre work again (libvncclient or libvncserver?) make corre work again (libvncclient or libvncserver?)
implement zrle in libvncclient implement zrle in libvncclient

@ -283,7 +283,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
cl->reverseConnection = FALSE; cl->reverseConnection = FALSE;
cl->readyForSetColourMapEntries = FALSE; cl->readyForSetColourMapEntries = FALSE;
cl->useCopyRect = FALSE; cl->useCopyRect = FALSE;
cl->preferredEncoding = rfbEncodingRaw; cl->preferredEncoding = -1;
cl->correMaxWidth = 48; cl->correMaxWidth = 48;
cl->correMaxHeight = 48; cl->correMaxHeight = 48;
#ifdef LIBVNCSERVER_HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
@ -1331,6 +1331,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
+ w * (cl->format.bitsPerPixel / 8) * h); + w * (cl->format.bitsPerPixel / 8) * h);
switch (cl->preferredEncoding) { switch (cl->preferredEncoding) {
case -1:
case rfbEncodingRaw: case rfbEncodingRaw:
if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) if (!rfbSendRectEncodingRaw(cl, x, y, w, h))
goto updateFailed; goto updateFailed;

Loading…
Cancel
Save