diff options
Diffstat (limited to 'krfb/libvncserver')
| -rw-r--r-- | krfb/libvncserver/cursor.c | 16 | ||||
| -rw-r--r-- | krfb/libvncserver/rfb.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c index d943dc37..633cc0fe 100644 --- a/krfb/libvncserver/cursor.c +++ b/krfb/libvncserver/cursor.c @@ -36,7 +36,7 @@ rfbSendtqCursorShape(cl) rfbFramebufferUpdateRectHeader rect; rfbXCursorColors colors; int saved_ublen; - int bitmapRowBytes, tqmaskBytes, dataBytes; + int bitmapRowBytes, maskBytes, dataBytes; int i, j; CARD8 *bitmapData; CARD8 bitmapByte; @@ -85,21 +85,21 @@ rfbSendtqCursorShape(cl) /* Calculate data sizes. */ bitmapRowBytes = (pCursor->width + 7) / 8; - tqmaskBytes = bitmapRowBytes * pCursor->height; + maskBytes = bitmapRowBytes * pCursor->height; dataBytes = (cl->useRichCursorEncoding) ? (pCursor->width * pCursor->height * - (cl->format.bitsPerPixel / 8)) : tqmaskBytes; + (cl->format.bitsPerPixel / 8)) : maskBytes; /* Send buffer contents if needed. */ if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + - sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { + sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) { if (!rfbSendUpdateBuf(cl)) return FALSE; } if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + - sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { + sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) { return FALSE; /* FIXME. */ } @@ -347,7 +347,7 @@ void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap) /* Cursor creation. You "paint" a cursor and let these routines do the work */ -rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString) +rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString) { int i,j,w=(width+7)/8; rfbCursorPtr cursor = (rfbCursorPtr)calloc(1,sizeof(rfbCursor)); @@ -364,9 +364,9 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmask for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++) if(*cp!=' ') cursor->source[j*w+i/8]|=bit; - if(tqmaskString) { + if(maskString) { cursor->tqmask = (unsigned char*)calloc(w,height); - for(j=0,cp=tqmaskString;j<height;j++) + for(j=0,cp=maskString;j<height;j++) for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++) if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit; } else diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index aba56cfa..55051819 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -744,7 +744,7 @@ extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/); extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged); extern unsigned char rfbReverseByte[0x100]; extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap); -extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString); +extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString); extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString); extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); |