summaryrefslogtreecommitdiffstats
path: root/krfb/libvncserver
diff options
context:
space:
mode:
Diffstat (limited to 'krfb/libvncserver')
-rw-r--r--krfb/libvncserver/cursor.c54
-rw-r--r--krfb/libvncserver/example.c2
-rw-r--r--krfb/libvncserver/fontsel.c2
-rw-r--r--krfb/libvncserver/main.c4
-rw-r--r--krfb/libvncserver/rfb.h18
-rw-r--r--krfb/libvncserver/rfbproto.h24
-rw-r--r--krfb/libvncserver/rfbserver.c26
-rw-r--r--krfb/libvncserver/stats.c2
-rw-r--r--krfb/libvncserver/tight.c16
-rw-r--r--krfb/libvncserver/vncev.c2
-rw-r--r--krfb/libvncserver/x11vnc.c20
-rw-r--r--krfb/libvncserver/zlib.c2
12 files changed, 86 insertions, 86 deletions
diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c
index a27a2fef..d943dc37 100644
--- a/krfb/libvncserver/cursor.c
+++ b/krfb/libvncserver/cursor.c
@@ -1,5 +1,5 @@
/*
- * cursor.c - support for cursor shape updates.
+ * cursor.c - support for cursor tqshape updates.
*/
/*
@@ -25,18 +25,18 @@
#include "rfb.h"
/*
- * Send cursor shape either in X-style format or in client pixel format.
+ * Send cursor tqshape either in X-style format or in client pixel format.
*/
Bool
-rfbSendCursorShape(cl)
+rfbSendtqCursorShape(cl)
rfbClientPtr cl;
{
rfbCursorPtr pCursor;
rfbFramebufferUpdateRectHeader rect;
rfbXCursorColors colors;
int saved_ublen;
- int bitmapRowBytes, maskBytes, dataBytes;
+ int bitmapRowBytes, tqmaskBytes, dataBytes;
int i, j;
CARD8 *bitmapData;
CARD8 bitmapByte;
@@ -58,7 +58,7 @@ rfbSendCursorShape(cl)
if ( pCursor && pCursor->width == 1 &&
pCursor->height == 1 &&
- pCursor->mask[0] == 0 ) {
+ pCursor->tqmask[0] == 0 ) {
pCursor = NULL;
}
@@ -85,21 +85,21 @@ rfbSendCursorShape(cl)
/* Calculate data sizes. */
bitmapRowBytes = (pCursor->width + 7) / 8;
- maskBytes = bitmapRowBytes * pCursor->height;
+ tqmaskBytes = bitmapRowBytes * pCursor->height;
dataBytes = (cl->useRichCursorEncoding) ?
(pCursor->width * pCursor->height *
- (cl->format.bitsPerPixel / 8)) : maskBytes;
+ (cl->format.bitsPerPixel / 8)) : tqmaskBytes;
/* Send buffer contents if needed. */
if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader +
- sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) {
+ sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) {
if (!rfbSendUpdateBuf(cl))
return FALSE;
}
if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader +
- sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) {
+ sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) {
return FALSE; /* FIXME. */
}
@@ -150,9 +150,9 @@ rfbSendCursorShape(cl)
cl->ublen += pCursor->width*bpp2*pCursor->height;
}
- /* Prepare transparency mask. */
+ /* Prepare transparency tqmask. */
- bitmapData = (CARD8 *)pCursor->mask;
+ bitmapData = (CARD8 *)pCursor->tqmask;
for (i = 0; i < pCursor->height; i++) {
for (j = 0; j < bitmapRowBytes; j++) {
@@ -199,7 +199,7 @@ rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged)
if ( pCursor && pCursor->width <= 1 &&
pCursor->height <= 1 &&
- pCursor->mask[0] == 0 ) {
+ pCursor->tqmask[0] == 0 ) {
pCursor = NULL;
}
@@ -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* maskString)
+rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString)
{
int i,j,w=(width+7)/8;
rfbCursorPtr cursor = (rfbCursorPtr)calloc(1,sizeof(rfbCursor));
@@ -364,13 +364,13 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt
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(maskString) {
- cursor->mask = (unsigned char*)calloc(w,height);
- for(j=0,cp=maskString;j<height;j++)
+ if(tqmaskString) {
+ cursor->tqmask = (unsigned char*)calloc(w,height);
+ for(j=0,cp=tqmaskString;j<height;j++)
for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++)
- if(*cp!=' ') cursor->mask[j*w+i/8]|=bit;
+ if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit;
} else
- cursor->mask = (unsigned char*)rfbMakeMaskForXCursor(width,height,cursor->source);
+ cursor->tqmask = (unsigned char*)rfbMakeMaskForXCursor(width,height,cursor->source);
return(cursor);
}
@@ -378,7 +378,7 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt
char* rfbMakeMaskForXCursor(int width,int height,char* source)
{
int i,j,w=(width+7)/8;
- char* mask=(char*)calloc(w,height);
+ char* tqmask=(char*)calloc(w,height);
unsigned char c;
for(j=0;j<height;j++)
@@ -388,14 +388,14 @@ char* rfbMakeMaskForXCursor(int width,int height,char* source)
if(j<height-1) c|=source[(j+1)*w+i];
if(i>0 && (c&0x80))
- mask[j*w+i-1]|=0x01;
+ tqmask[j*w+i-1]|=0x01;
if(i<w-1 && (c&0x01))
- mask[j*w+i+1]|=0x80;
+ tqmask[j*w+i+1]|=0x80;
- mask[j*w+i]|=(c<<1)|c|(c>>1);
+ tqmask[j*w+i]|=(c<<1)|c|(c>>1);
}
- return(mask);
+ return(tqmask);
}
void rfbFreeCursor(rfbCursorPtr cursor)
@@ -404,7 +404,7 @@ void rfbFreeCursor(rfbCursorPtr cursor)
if(cursor->richSource)
free(cursor->richSource);
free(cursor->source);
- free(cursor->mask);
+ free(cursor->tqmask);
free(cursor);
}
@@ -497,7 +497,7 @@ void MakeSoftCursor(rfbClientPtr cl, rfbCursorPtr cursor)
for(j=0;j<cursor->height;j++)
for(i=0,bit=0x80;i<cursor->width;i++,bit=(bit&1)?0x80:bit>>1)
- if(cursor->mask[j*w+i/8]&bit) {
+ if(cursor->tqmask[j*w+i/8]&bit) {
if (state) {
memcpy(cp,sp,bpp);
cp += bpp;
@@ -634,7 +634,7 @@ void rfbDrawCursor(rfbScreenInfoPtr s)
/* now the cursor has to be drawn */
for(j=0;j<y2;j++)
for(i=0;i<x2;i++)
- if((c->mask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80)
+ if((c->tqmask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80)
memcpy(s->frameBuffer+(j+y1)*rowstride+(i+x1)*bpp,
c->richSource+(j+j1)*c->width*bpp+(i+i1)*bpp,bpp);
@@ -655,7 +655,7 @@ void rfbPrintXCursor(rfbCursorPtr cursor)
if(cursor->source[j*w+i]&bit) putchar('#'); else putchar(' ');
putchar(':');
for(i=0,i1=0,bit=0x80;i1<cursor->width;i1++,i+=(bit&1)?1:0,bit=(bit&1)?0x80:bit>>1)
- if(cursor->mask[j*w+i]&bit) putchar('#'); else putchar(' ');
+ if(cursor->tqmask[j*w+i]&bit) putchar('#'); else putchar(' ');
putchar('\n');
}
}
diff --git a/krfb/libvncserver/example.c b/krfb/libvncserver/example.c
index 1cdda701..63f58e21 100644
--- a/krfb/libvncserver/example.c
+++ b/krfb/libvncserver/example.c
@@ -252,7 +252,7 @@ int main(int argc,char** argv)
initBuffer(rfbScreen->frameBuffer);
rfbDrawString(rfbScreen,&radonFont,20,100,"Hello, World!",0xffffff);
- /* This call creates a mask and then a cursor: */
+ /* This call creates a tqmask and then a cursor: */
/* rfbScreen->defaultCursor =
rfbMakeXCursor(exampleCursorWidth,exampleCursorHeight,exampleCursor,0);
*/
diff --git a/krfb/libvncserver/fontsel.c b/krfb/libvncserver/fontsel.c
index 100db817..5d7664de 100644
--- a/krfb/libvncserver/fontsel.c
+++ b/krfb/libvncserver/fontsel.c
@@ -54,7 +54,7 @@ int main(int argc,char** argv)
rfbScreen = s;
font=rfbLoadConsoleFont(DEFAULTFONT);
if(!font) {
- fprintf(stderr,"Couldn't find %s\n",DEFAULTFONT);
+ fprintf(stderr,"Couldn't tqfind %s\n",DEFAULTFONT);
exit(1);
}
diff --git a/krfb/libvncserver/main.c b/krfb/libvncserver/main.c
index 207e512d..c9bde3fe 100644
--- a/krfb/libvncserver/main.c
+++ b/krfb/libvncserver/main.c
@@ -413,12 +413,12 @@ static rfbCursor myCursor =
static rfbCursor myCursor =
{
source: "\000\102\044\030\044\102\000",
- mask: "\347\347\176\074\176\347\347",
+ tqmask: "\347\347\176\074\176\347\347",
width: 8, height: 7, xhot: 3, yhot: 3,
/*
width: 8, height: 7, xhot: 0, yhot: 0,
source: "\000\074\176\146\176\074\000",
- mask: "\176\377\377\377\377\377\176",
+ tqmask: "\176\377\377\377\377\377\176",
*/
foreRed: 0, foreGreen: 0, foreBlue: 0,
backRed: 0xffff, backGreen: 0xffff, backBlue: 0xffff,
diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index b715ca8a..aba56cfa 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -263,7 +263,7 @@ typedef struct _rfbScreenInfo
themselves end up invoking drawing routines.
Removing the cursor (rfbUndrawCursor) is eventually achieved by
- doing a CopyArea from a pixmap to the screen, where the pixmap contains
+ doing a CopyArea from a pixmap to the screen, where the pixmap tqcontains
the saved contents of the screen under the cursor. Before doing this,
however, we set cursorIsDrawn to FALSE. Then, when CopyArea is called,
it sees that cursorIsDrawn is FALSE and so doesn't feel the need to
@@ -542,10 +542,10 @@ typedef struct _rfbClientRec {
Bool enableLastRectEncoding; /* client supports LastRect encoding */
Bool enableSoftCursorUpdates; /* client supports softcursor updates */
Bool disableBackground; /* client wants to disable background */
- Bool enableCursorShapeUpdates; /* client supports cursor shape updates */
+ Bool enabletqCursorShapeUpdates; /* client supports cursor tqshape updates */
Bool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */
- Bool cursorWasChanged; /* cursor shape update should be sent */
- Bool cursorWasMoved; /* cursor move shape update should be sent */
+ Bool cursorWasChanged; /* cursor tqshape update should be sent */
+ Bool cursorWasMoved; /* cursor move tqshape update should be sent */
#ifdef BACKCHANNEL
Bool enableBackChannel;
#endif
@@ -576,8 +576,8 @@ typedef struct _rfbClientRec {
*/
#define FB_UPDATE_PENDING(cl) \
- ((!(cl)->enableCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \
- ((cl)->enableCursorShapeUpdates && (cl)->cursorWasChanged) || \
+ ((!(cl)->enabletqCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \
+ ((cl)->enabletqCursorShapeUpdates && (cl)->cursorWasChanged) || \
!sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion))
/*
@@ -733,18 +733,18 @@ extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h);
typedef struct rfbCursor {
unsigned char *source; /* points to bits */
- unsigned char *mask; /* points to bits */
+ unsigned char *tqmask; /* points to bits */
unsigned short width, height, xhot, yhot; /* metrics */
unsigned short foreRed, foreGreen, foreBlue; /* device-independent colour */
unsigned short backRed, backGreen, backBlue; /* device-independent colour */
unsigned char *richSource; /* source bytes for a rich cursor */
} rfbCursor, *rfbCursorPtr;
-extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
+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* maskString);
+extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString);
extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString);
extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);
extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);
diff --git a/krfb/libvncserver/rfbproto.h b/krfb/libvncserver/rfbproto.h
index cd619dff..70ad2a1a 100644
--- a/krfb/libvncserver/rfbproto.h
+++ b/krfb/libvncserver/rfbproto.h
@@ -30,7 +30,7 @@
*
* All multiple byte integers are in big endian (network) order (most
* significant byte first). Unless noted otherwise there is no special
- * alignment of protocol structures.
+ * tqalignment of protocol structures.
*
*
* Once the initial handshaking is done, all messages start with a type byte,
@@ -56,7 +56,7 @@
/*-----------------------------------------------------------------------------
* Structure used to specify a rectangle. This structure is a multiple of 4
* bytes so that it can be interspersed with 32-bit pixel data without
- * affecting alignment.
+ * affecting tqalignment.
*/
typedef struct {
@@ -306,7 +306,7 @@ typedef struct {
/*
* Special encoding numbers:
* 0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels;
- * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape data;
+ * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape data;
* 0xFFFFFF20 .. 0xFFFFFF2F -- various protocol extensions;
* 0xFFFFFF30 .. 0xFFFFFFDF -- not allocated yet;
* 0xFFFFFFE0 .. 0xFFFFFFEF -- quality level for JPEG compressor;
@@ -356,7 +356,7 @@ typedef struct {
* This message consists of a header giving the number of rectangles of pixel
* data followed by the rectangles themselves. The header is padded so that
* together with the type byte it is an exact multiple of 4 bytes (to help
- * with alignment of 32-bit pixels):
+ * with tqalignment of 32-bit pixels):
*/
typedef struct {
@@ -442,11 +442,11 @@ typedef struct {
* the last tile in each row will be correspondingly smaller. Similarly if the
* height is not an exact multiple of 16 then the height of each tile in the
* final row will also be smaller. Each tile begins with a "subencoding" type
- * byte, which is a mask made up of a number of bits. If the Raw bit is set
+ * byte, which is a tqmask made up of a number of bits. If the Raw bit is set
* then the other bits are irrelevant; w*h pixel values follow (where w and h
* are the width and height of the tile). Otherwise the tile is encoded in a
* similar way to RRE, except that the position and size of each subrectangle
- * can be specified in just two bytes. The other bits in the mask are as
+ * can be specified in just two bytes. The other bits in the tqmask are as
* follows:
*
* BackgroundSpecified - if set, a pixel value follows which specifies
@@ -517,7 +517,7 @@ typedef struct {
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* XCursor encoding. This is a special encoding used to transmit X-style
- * cursor shapes from server to clients. Note that for this encoding,
+ * cursor tqshapes from server to clients. Note that for this encoding,
* coordinates in rfbFramebufferUpdateRectHeader structure hold hotspot
* position (r.x, r.y) and cursor size (r.w, r.h). If (w * h != 0), two RGB
* samples are sent after header in the rfbXCursorColors structure. They
@@ -548,7 +548,7 @@ typedef struct {
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* RichCursor encoding. This is a special encoding used to transmit cursor
- * shapes from server to clients. It is similar to the XCursor encoding but
+ * tqshapes from server to clients. It is similar to the XCursor encoding but
* uses client pixel format instead of two RGB colors to represent cursor
* image. For this encoding, coordinates in rfbFramebufferUpdateRectHeader
* structure hold hotspot position (r.x, r.y) and cursor size (r.w, r.h).
@@ -589,10 +589,10 @@ typedef struct {
CARD16 imageLength;
/*
* Followed by an image of the cursor in the client's image format
- * with the following RLE mask compression. It begins with CARD8 that
- * specifies the number of mask'ed pixels that will be NOT transmitted.
- * Then follows a CARD8 that specified by the number of unmask'd pixels
- * that will be transmitted next. Then a CARD8 with the number of mask'd
+ * with the following RLE tqmask compression. It begins with CARD8 that
+ * specifies the number of tqmask'ed pixels that will be NOT transmitted.
+ * Then follows a CARD8 that specified by the number of untqmask'd pixels
+ * that will be transmitted next. Then a CARD8 with the number of tqmask'd
* pixels and so on.
*/
} rfbSoftCursorSetImage;
diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c
index 66cc4ee3..22c9202d 100644
--- a/krfb/libvncserver/rfbserver.c
+++ b/krfb/libvncserver/rfbserver.c
@@ -270,7 +270,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
for (i = 0; i < 4; i++)
cl->zsActive[i] = FALSE;
- cl->enableCursorShapeUpdates = FALSE;
+ cl->enabletqCursorShapeUpdates = FALSE;
cl->useRichCursorEncoding = FALSE;
cl->enableLastRectEncoding = FALSE;
cl->disableBackground = FALSE;
@@ -663,7 +663,7 @@ rfbProcessClientNormalMessage(cl)
cl->preferredEncoding = -1;
cl->useCopyRect = FALSE;
- cl->enableCursorShapeUpdates = FALSE;
+ cl->enabletqCursorShapeUpdates = FALSE;
cl->enableLastRectEncoding = FALSE;
cl->disableBackground = FALSE;
@@ -729,7 +729,7 @@ rfbProcessClientNormalMessage(cl)
if(!cl->screen->dontConvertRichCursorToXCursor) {
rfbLog("Enabling X-style cursor updates for client %s\n",
cl->host);
- cl->enableCursorShapeUpdates = TRUE;
+ cl->enabletqCursorShapeUpdates = TRUE;
cl->cursorWasChanged = TRUE;
}
break;
@@ -738,7 +738,7 @@ rfbProcessClientNormalMessage(cl)
"%s\n", cl->host);
if (cl->enableSoftCursorUpdates)
break;
- cl->enableCursorShapeUpdates = TRUE;
+ cl->enabletqCursorShapeUpdates = TRUE;
cl->useRichCursorEncoding = TRUE;
cl->cursorWasChanged = TRUE;
break;
@@ -748,7 +748,7 @@ rfbProcessClientNormalMessage(cl)
cl->enableSoftCursorUpdates = TRUE;
cl->cursorWasChanged = TRUE;
cl->cursorWasMoved = TRUE;
- cl->enableCursorShapeUpdates = FALSE;
+ cl->enabletqCursorShapeUpdates = FALSE;
cl->useRichCursorEncoding = FALSE;
break;
case rfbEncodingLastRect:
@@ -959,24 +959,24 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf;
sraRegionPtr updateRegion,updateCopyRegion,tmpRegion;
int dx, dy;
- Bool sendCursorShape = FALSE;
+ Bool sendtqCursorShape = FALSE;
int sendSoftCursorRects = 0;
if(cl->screen->displayHook)
cl->screen->displayHook(cl);
/*
- * If this client understands cursor shape updates, cursor should be
+ * If this client understands cursor tqshape updates, cursor should be
* removed from the framebuffer. Otherwise, make sure it's put up.
*/
- if (cl->enableCursorShapeUpdates) {
+ if (cl->enabletqCursorShapeUpdates) {
if (cl->screen->cursorIsDrawn) {
rfbUndrawCursor(cl->screen);
}
if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged &&
cl->readyForSetColourMapEntries)
- sendCursorShape = TRUE;
+ sendtqCursorShape = TRUE;
}
else if (cl->enableSoftCursorUpdates) {
if (cl->screen->cursorIsDrawn) {
@@ -1012,7 +1012,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
updateRegion = sraRgnCreateRgn(givenUpdateRegion);
sraRgnOr(updateRegion,cl->copyRegion);
if(!sraRgnAnd(updateRegion,cl->requestedRegion) &&
- !(sendCursorShape || sendSoftCursorRects)) {
+ !(sendtqCursorShape || sendSoftCursorRects)) {
sraRgnDestroy(updateRegion);
UNLOCK(cl->updateMutex);
return TRUE;
@@ -1113,15 +1113,15 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
if (nUpdateRegionRects != 0xFFFF) {
fu->nRects = Swap16IfLE((CARD16)(sraRgnCountRects(updateCopyRegion)
+ nUpdateRegionRects
- + !!sendCursorShape + sendSoftCursorRects));
+ + !!sendtqCursorShape + sendSoftCursorRects));
} else {
fu->nRects = 0xFFFF;
}
cl->ublen = sz_rfbFramebufferUpdateMsg;
- if (sendCursorShape) {
+ if (sendtqCursorShape) {
cl->cursorWasChanged = FALSE;
- if (!rfbSendCursorShape(cl)) {
+ if (!rfbSendtqCursorShape(cl)) {
sraRgnDestroy(updateRegion);
return FALSE;
}
diff --git a/krfb/libvncserver/stats.c b/krfb/libvncserver/stats.c
index 954e6d14..86934011 100644
--- a/krfb/libvncserver/stats.c
+++ b/krfb/libvncserver/stats.c
@@ -82,7 +82,7 @@ rfbPrintStats(rfbClientPtr cl)
cl->rfbLastRectMarkersSent, cl->rfbLastRectBytesSent);
if (cl->rfbCursorUpdatesSent != 0)
- rfbLog(" cursor shape updates %d, bytes %d\n",
+ rfbLog(" cursor tqshape updates %d, bytes %d\n",
cl->rfbCursorUpdatesSent, cl->rfbCursorBytesSent);
for (i = 0; i < MAX_ENCODINGS; i++) {
diff --git a/krfb/libvncserver/tight.c b/krfb/libvncserver/tight.c
index 9dd743ac..bef8f825 100644
--- a/krfb/libvncserver/tight.c
+++ b/krfb/libvncserver/tight.c
@@ -1239,7 +1239,7 @@ EncodeMonoRect##bpp(buf, w, h) \
{ \
CARD##bpp *ptr; \
CARD##bpp bg; \
- unsigned int value, mask; \
+ unsigned int value, tqmask; \
int aligned_width; \
int x, y, bg_bits; \
\
@@ -1257,27 +1257,27 @@ EncodeMonoRect##bpp(buf, w, h) \
*buf++ = 0; \
continue; \
} \
- mask = 0x80 >> bg_bits; \
- value = mask; \
+ tqmask = 0x80 >> bg_bits; \
+ value = tqmask; \
for (bg_bits++; bg_bits < 8; bg_bits++) { \
- mask >>= 1; \
+ tqmask >>= 1; \
if (*ptr++ != bg) { \
- value |= mask; \
+ value |= tqmask; \
} \
} \
*buf++ = (CARD8)value; \
} \
\
- mask = 0x80; \
+ tqmask = 0x80; \
value = 0; \
if (x >= w) \
continue; \
\
for (; x < w; x++) { \
if (*ptr++ != bg) { \
- value |= mask; \
+ value |= tqmask; \
} \
- mask >>= 1; \
+ tqmask >>= 1; \
} \
*buf++ = (CARD8)value; \
} \
diff --git a/krfb/libvncserver/vncev.c b/krfb/libvncserver/vncev.c
index ba00f9c8..e2d9bf99 100644
--- a/krfb/libvncserver/vncev.c
+++ b/krfb/libvncserver/vncev.c
@@ -78,7 +78,7 @@ void doptr(int buttonMask,int x,int y,rfbClientPtr cl)
{
char buffer[1024];
if(buttonMask) {
- sprintf(buffer,"Ptr: mouse button mask 0x%x at %d,%d",buttonMask,x,y);
+ sprintf(buffer,"Ptr: mouse button tqmask 0x%x at %d,%d",buttonMask,x,y);
output(cl->screen,buffer);
}
diff --git a/krfb/libvncserver/x11vnc.c b/krfb/libvncserver/x11vnc.c
index 4e298f4a..47d46ae8 100644
--- a/krfb/libvncserver/x11vnc.c
+++ b/krfb/libvncserver/x11vnc.c
@@ -263,7 +263,7 @@ int probeX=0,probeY=0;
void probeScreen(rfbScreenInfoPtr s,int xscreen)
{
int i,j,/*pixel,i1,*/j1,
- bpp=s->rfbServerFormat.bitsPerPixel/8,/*mask=(1<<bpp)-1,*/
+ bpp=s->rfbServerFormat.bitsPerPixel/8,/*tqmask=(1<<bpp)-1,*/
rstride=s->paddedWidthInBytes;
XImage* im;
//fprintf(stderr,"/%d,%d",probeX,probeY);
@@ -433,20 +433,20 @@ int main(int argc,char** argv)
}
} else {
screen->rfbServerFormat.redShift = 0;
- if ( framebufferImage->red_mask )
- while ( ! ( framebufferImage->red_mask & (1 << screen->rfbServerFormat.redShift) ) )
+ if ( framebufferImage->red_tqmask )
+ while ( ! ( framebufferImage->red_tqmask & (1 << screen->rfbServerFormat.redShift) ) )
screen->rfbServerFormat.redShift++;
screen->rfbServerFormat.greenShift = 0;
- if ( framebufferImage->green_mask )
- while ( ! ( framebufferImage->green_mask & (1 << screen->rfbServerFormat.greenShift) ) )
+ if ( framebufferImage->green_tqmask )
+ while ( ! ( framebufferImage->green_tqmask & (1 << screen->rfbServerFormat.greenShift) ) )
screen->rfbServerFormat.greenShift++;
screen->rfbServerFormat.blueShift = 0;
- if ( framebufferImage->blue_mask )
- while ( ! ( framebufferImage->blue_mask & (1 << screen->rfbServerFormat.blueShift) ) )
+ if ( framebufferImage->blue_tqmask )
+ while ( ! ( framebufferImage->blue_tqmask & (1 << screen->rfbServerFormat.blueShift) ) )
screen->rfbServerFormat.blueShift++;
- screen->rfbServerFormat.redMax = framebufferImage->red_mask >> screen->rfbServerFormat.redShift;
- screen->rfbServerFormat.greenMax = framebufferImage->green_mask >> screen->rfbServerFormat.greenShift;
- screen->rfbServerFormat.blueMax = framebufferImage->blue_mask >> screen->rfbServerFormat.blueShift;
+ screen->rfbServerFormat.redMax = framebufferImage->red_tqmask >> screen->rfbServerFormat.redShift;
+ screen->rfbServerFormat.greenMax = framebufferImage->green_tqmask >> screen->rfbServerFormat.greenShift;
+ screen->rfbServerFormat.blueMax = framebufferImage->blue_tqmask >> screen->rfbServerFormat.blueShift;
}
backupImage = malloc(screen->height*screen->paddedWidthInBytes);
diff --git a/krfb/libvncserver/zlib.c b/krfb/libvncserver/zlib.c
index 5661d265..d1b300b0 100644
--- a/krfb/libvncserver/zlib.c
+++ b/krfb/libvncserver/zlib.c
@@ -89,7 +89,7 @@ rfbSendOneRectEncodingZlib(cl, x, y, w, h)
int result;
/* The translation function (used also by the in raw encoding)
- * requires 4/2/1 byte alignment in the output buffer (which is
+ * requires 4/2/1 byte tqalignment in the output buffer (which is
* updateBuf for the raw encoding) based on the bitsPerPixel of
* the viewer/client. This prevents SIGBUS errors on some
* architectures like SPARC, PARISC...
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-13 12:57:07 +0000