From 2bc1d72869b62af05ae4feafd878203b526da8c5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- krfb/libvncserver/cursor.c | 32 ++++++++++++++++---------------- krfb/libvncserver/example.c | 2 +- krfb/libvncserver/main.c | 4 ++-- krfb/libvncserver/rfb.h | 2 +- krfb/libvncserver/rfbproto.h | 12 ++++++------ krfb/libvncserver/tight.c | 16 ++++++++-------- krfb/libvncserver/vncev.c | 2 +- krfb/libvncserver/x11vnc.c | 20 ++++++++++---------- 8 files changed, 45 insertions(+), 45 deletions(-) (limited to 'krfb/libvncserver') diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c index 633cc0fe..f13eaaf9 100644 --- a/krfb/libvncserver/cursor.c +++ b/krfb/libvncserver/cursor.c @@ -58,7 +58,7 @@ rfbSendtqCursorShape(cl) if ( pCursor && pCursor->width == 1 && pCursor->height == 1 && - pCursor->tqmask[0] == 0 ) { + pCursor->mask[0] == 0 ) { pCursor = NULL; } @@ -150,9 +150,9 @@ rfbSendtqCursorShape(cl) cl->ublen += pCursor->width*bpp2*pCursor->height; } - /* Prepare transparency tqmask. */ + /* Prepare transparency mask. */ - bitmapData = (CARD8 *)pCursor->tqmask; + bitmapData = (CARD8 *)pCursor->mask; 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->tqmask[0] == 0 ) { + pCursor->mask[0] == 0 ) { pCursor = NULL; } @@ -365,12 +365,12 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt if(*cp!=' ') cursor->source[j*w+i/8]|=bit; if(maskString) { - cursor->tqmask = (unsigned char*)calloc(w,height); + cursor->mask = (unsigned char*)calloc(w,height); for(j=0,cp=maskString;j>1,cp++) - if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit; + if(*cp!=' ') cursor->mask[j*w+i/8]|=bit; } else - cursor->tqmask = (unsigned char*)rfbMakeMaskForXCursor(width,height,cursor->source); + cursor->mask = (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* tqmask=(char*)calloc(w,height); + char* mask=(char*)calloc(w,height); unsigned char c; for(j=0;j0 && (c&0x80)) - tqmask[j*w+i-1]|=0x01; + mask[j*w+i-1]|=0x01; if(i>1); + mask[j*w+i]|=(c<<1)|c|(c>>1); } - return(tqmask); + return(mask); } void rfbFreeCursor(rfbCursorPtr cursor) @@ -404,7 +404,7 @@ void rfbFreeCursor(rfbCursorPtr cursor) if(cursor->richSource) free(cursor->richSource); free(cursor->source); - free(cursor->tqmask); + free(cursor->mask); free(cursor); } @@ -497,7 +497,7 @@ void MakeSoftCursor(rfbClientPtr cl, rfbCursorPtr cursor) for(j=0;jheight;j++) for(i=0,bit=0x80;iwidth;i++,bit=(bit&1)?0x80:bit>>1) - if(cursor->tqmask[j*w+i/8]&bit) { + if(cursor->mask[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;jtqmask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80) + if((c->mask[(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;i1width;i1++,i+=(bit&1)?1:0,bit=(bit&1)?0x80:bit>>1) - if(cursor->tqmask[j*w+i]&bit) putchar('#'); else putchar(' '); + if(cursor->mask[j*w+i]&bit) putchar('#'); else putchar(' '); putchar('\n'); } } diff --git a/krfb/libvncserver/example.c b/krfb/libvncserver/example.c index 63f58e21..1cdda701 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 tqmask and then a cursor: */ + /* This call creates a mask and then a cursor: */ /* rfbScreen->defaultCursor = rfbMakeXCursor(exampleCursorWidth,exampleCursorHeight,exampleCursor,0); */ diff --git a/krfb/libvncserver/main.c b/krfb/libvncserver/main.c index c9bde3fe..207e512d 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", - tqmask: "\347\347\176\074\176\347\347", + mask: "\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", - tqmask: "\176\377\377\377\377\377\176", + mask: "\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 ef79227c..2131c7a8 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -733,7 +733,7 @@ extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h); typedef struct rfbCursor { unsigned char *source; /* points to bits */ - unsigned char *tqmask; /* points to bits */ + unsigned char *mask; /* 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 */ diff --git a/krfb/libvncserver/rfbproto.h b/krfb/libvncserver/rfbproto.h index 70ad2a1a..e511006e 100644 --- a/krfb/libvncserver/rfbproto.h +++ b/krfb/libvncserver/rfbproto.h @@ -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 tqmask made up of a number of bits. If the Raw bit is set + * byte, which is a mask 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 tqmask are as + * can be specified in just two bytes. The other bits in the mask are as * follows: * * BackgroundSpecified - if set, a pixel value follows which specifies @@ -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 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 + * 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 * pixels and so on. */ } rfbSoftCursorSetImage; diff --git a/krfb/libvncserver/tight.c b/krfb/libvncserver/tight.c index bef8f825..9dd743ac 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, tqmask; \ + unsigned int value, mask; \ int aligned_width; \ int x, y, bg_bits; \ \ @@ -1257,27 +1257,27 @@ EncodeMonoRect##bpp(buf, w, h) \ *buf++ = 0; \ continue; \ } \ - tqmask = 0x80 >> bg_bits; \ - value = tqmask; \ + mask = 0x80 >> bg_bits; \ + value = mask; \ for (bg_bits++; bg_bits < 8; bg_bits++) { \ - tqmask >>= 1; \ + mask >>= 1; \ if (*ptr++ != bg) { \ - value |= tqmask; \ + value |= mask; \ } \ } \ *buf++ = (CARD8)value; \ } \ \ - tqmask = 0x80; \ + mask = 0x80; \ value = 0; \ if (x >= w) \ continue; \ \ for (; x < w; x++) { \ if (*ptr++ != bg) { \ - value |= tqmask; \ + value |= mask; \ } \ - tqmask >>= 1; \ + mask >>= 1; \ } \ *buf++ = (CARD8)value; \ } \ diff --git a/krfb/libvncserver/vncev.c b/krfb/libvncserver/vncev.c index e2d9bf99..ba00f9c8 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 tqmask 0x%x at %d,%d",buttonMask,x,y); + sprintf(buffer,"Ptr: mouse button mask 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 47d46ae8..4e298f4a 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,/*tqmask=(1<rfbServerFormat.bitsPerPixel/8,/*mask=(1<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_tqmask ) - while ( ! ( framebufferImage->red_tqmask & (1 << screen->rfbServerFormat.redShift) ) ) + if ( framebufferImage->red_mask ) + while ( ! ( framebufferImage->red_mask & (1 << screen->rfbServerFormat.redShift) ) ) screen->rfbServerFormat.redShift++; screen->rfbServerFormat.greenShift = 0; - if ( framebufferImage->green_tqmask ) - while ( ! ( framebufferImage->green_tqmask & (1 << screen->rfbServerFormat.greenShift) ) ) + if ( framebufferImage->green_mask ) + while ( ! ( framebufferImage->green_mask & (1 << screen->rfbServerFormat.greenShift) ) ) screen->rfbServerFormat.greenShift++; screen->rfbServerFormat.blueShift = 0; - if ( framebufferImage->blue_tqmask ) - while ( ! ( framebufferImage->blue_tqmask & (1 << screen->rfbServerFormat.blueShift) ) ) + if ( framebufferImage->blue_mask ) + while ( ! ( framebufferImage->blue_mask & (1 << screen->rfbServerFormat.blueShift) ) ) 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; + 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; } backupImage = malloc(screen->height*screen->paddedWidthInBytes); -- cgit v1.2.1