diff options
| author | steven_carr <steven_carr> | 2006-05-15 05:37:39 +0000 |
|---|---|---|
| committer | steven_carr <steven_carr> | 2006-05-15 05:37:39 +0000 |
| commit | ccdbe8f3256c3c776a1cc1a0517a38437b9e2c65 (patch) | |
| tree | 9853559d1c965946b196cccd03ce0f466d524950 /libvncserver/hextile.c | |
| parent | 347c4a98475d1dba8030efe33aa0b35856c4d17f (diff) | |
| download | libtdevnc-ccdbe8f3.tar.gz libtdevnc-ccdbe8f3.zip | |
The great UltraVNC Compatibility Commit
Diffstat (limited to 'libvncserver/hextile.c')
| -rwxr-xr-x | libvncserver/hextile.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libvncserver/hextile.c b/libvncserver/hextile.c index cd598ac..52920d8 100755 --- a/libvncserver/hextile.c +++ b/libvncserver/hextile.c @@ -44,7 +44,7 @@ rfbSendRectEncodingHextile(rfbClientPtr cl, int h) { rfbFramebufferUpdateRectHeader rect; - + if (cl->ublen + sz_rfbFramebufferUpdateRectHeader > UPDATE_BUF_SIZE) { if (!rfbSendUpdateBuf(cl)) return FALSE; @@ -60,8 +60,9 @@ rfbSendRectEncodingHextile(rfbClientPtr cl, sz_rfbFramebufferUpdateRectHeader); cl->ublen += sz_rfbFramebufferUpdateRectHeader; - cl->rectanglesSent[rfbEncodingHextile]++; - cl->bytesSent[rfbEncodingHextile] += sz_rfbFramebufferUpdateRectHeader; + rfbStatRecordEncodingSent(cl, rfbEncodingHextile, + sz_rfbFramebufferUpdateRectHeader, + sz_rfbFramebufferUpdateRectHeader + w * (cl->format.bitsPerPixel / 8) * h); switch (cl->format.bitsPerPixel) { case 8: @@ -136,6 +137,7 @@ sendHextiles##bpp(rfbClientPtr cl, int rx, int ry, int rw, int rh) { startUblen = cl->ublen; \ cl->updateBuf[startUblen] = 0; \ cl->ublen++; \ + rfbStatRecordEncodingSentAdd(cl, rfbEncodingHextile, 1); \ \ testColours##bpp(clientPixelData, w * h, \ &mono, &solid, &newBg, &newFg); \ @@ -148,7 +150,6 @@ sendHextiles##bpp(rfbClientPtr cl, int rx, int ry, int rw, int rh) { } \ \ if (solid) { \ - cl->bytesSent[rfbEncodingHextile] += cl->ublen - startUblen; \ continue; \ } \ \ @@ -175,15 +176,15 @@ sendHextiles##bpp(rfbClientPtr cl, int rx, int ry, int rw, int rh) { (*cl->translateFn)(cl->translateLookupTable, \ &(cl->screen->serverFormat), &cl->format, fbptr, \ (char *)clientPixelData, \ - cl->scaledScreen->paddedWidthInBytes, w, h); \ + cl->scaledScreen->paddedWidthInBytes, w, h); \ \ memcpy(&cl->updateBuf[cl->ublen], (char *)clientPixelData, \ w * h * (bpp/8)); \ \ cl->ublen += w * h * (bpp/8); \ + rfbStatRecordEncodingSentAdd(cl, rfbEncodingHextile, \ + w * h * (bpp/8)); \ } \ - \ - cl->bytesSent[rfbEncodingHextile] += cl->ublen - startUblen; \ } \ } \ \ @@ -210,6 +211,7 @@ subrectEncode##bpp(rfbClientPtr cl, uint##bpp##_t *data, int w, int h, \ nSubrectsUblen = cl->ublen; \ cl->ublen++; \ + rfbStatRecordEncodingSentAdd(cl, rfbEncodingHextile, 1); \ \ for (y=0; y<h; y++) { \ line = data+(y*w); \ @@ -268,6 +270,7 @@ subrectEncode##bpp(rfbClientPtr cl, uint##bpp##_t *data, int w, int h, \ cl->updateBuf[cl->ublen++] = rfbHextilePackXY(thex,they); \ cl->updateBuf[cl->ublen++] = rfbHextilePackWH(thew,theh); \ + rfbStatRecordEncodingSentAdd(cl, rfbEncodingHextile, 1); \ \ /* \ * Now mark the subrect as done. \ |