summaryrefslogtreecommitdiffstats
path: root/krfb/libvncserver
diff options
context:
space:
mode:
Diffstat (limited to 'krfb/libvncserver')
-rw-r--r--krfb/libvncserver/cursor.c6
-rw-r--r--krfb/libvncserver/rfb.h12
-rw-r--r--krfb/libvncserver/rfbproto.h12
-rw-r--r--krfb/libvncserver/rfbserver.c26
-rw-r--r--krfb/libvncserver/stats.c2
-rw-r--r--krfb/libvncserver/zlib.c2
6 files changed, 30 insertions, 30 deletions
diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c
index f13eaaf9..a27a2fef 100644
--- a/krfb/libvncserver/cursor.c
+++ b/krfb/libvncserver/cursor.c
@@ -1,5 +1,5 @@
/*
- * cursor.c - support for cursor tqshape updates.
+ * cursor.c - support for cursor shape updates.
*/
/*
@@ -25,11 +25,11 @@
#include "rfb.h"
/*
- * Send cursor tqshape either in X-style format or in client pixel format.
+ * Send cursor shape either in X-style format or in client pixel format.
*/
Bool
-rfbSendtqCursorShape(cl)
+rfbSendCursorShape(cl)
rfbClientPtr cl;
{
rfbCursorPtr pCursor;
diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index 56dce45e..e8dbfb65 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -535,10 +535,10 @@ typedef struct _rfbClientRec {
Bool enableLastRectEncoding; /* client supports LastRect encoding */
Bool enableSoftCursorUpdates; /* client supports softcursor updates */
Bool disableBackground; /* client wants to disable background */
- Bool enabletqCursorShapeUpdates; /* client supports cursor tqshape updates */
+ Bool enableCursorShapeUpdates; /* client supports cursor shape updates */
Bool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */
- Bool cursorWasChanged; /* cursor tqshape update should be sent */
- Bool cursorWasMoved; /* cursor move tqshape update should be sent */
+ Bool cursorWasChanged; /* cursor shape update should be sent */
+ Bool cursorWasMoved; /* cursor move shape update should be sent */
#ifdef BACKCHANNEL
Bool enableBackChannel;
#endif
@@ -569,8 +569,8 @@ typedef struct _rfbClientRec {
*/
#define FB_UPDATE_PENDING(cl) \
- ((!(cl)->enabletqCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \
- ((cl)->enabletqCursorShapeUpdates && (cl)->cursorWasChanged) || \
+ ((!(cl)->enableCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \
+ ((cl)->enableCursorShapeUpdates && (cl)->cursorWasChanged) || \
!sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion))
/*
@@ -733,7 +733,7 @@ typedef struct rfbCursor {
unsigned char *richSource; /* source bytes for a rich cursor */
} rfbCursor, *rfbCursorPtr;
-extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
+extern Bool rfbSendCursorShape(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);
diff --git a/krfb/libvncserver/rfbproto.h b/krfb/libvncserver/rfbproto.h
index e511006e..cd619dff 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
- * tqalignment of protocol structures.
+ * alignment 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 tqalignment.
+ * affecting alignment.
*/
typedef struct {
@@ -306,7 +306,7 @@ typedef struct {
/*
* Special encoding numbers:
* 0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels;
- * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape data;
+ * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape 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 tqalignment of 32-bit pixels):
+ * with alignment of 32-bit pixels):
*/
typedef struct {
@@ -517,7 +517,7 @@ typedef struct {
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* XCursor encoding. This is a special encoding used to transmit X-style
- * cursor tqshapes from server to clients. Note that for this encoding,
+ * cursor shapes 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
- * tqshapes from server to clients. It is similar to the XCursor encoding but
+ * shapes 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).
diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c
index 22c9202d..66cc4ee3 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->enabletqCursorShapeUpdates = FALSE;
+ cl->enableCursorShapeUpdates = FALSE;
cl->useRichCursorEncoding = FALSE;
cl->enableLastRectEncoding = FALSE;
cl->disableBackground = FALSE;
@@ -663,7 +663,7 @@ rfbProcessClientNormalMessage(cl)
cl->preferredEncoding = -1;
cl->useCopyRect = FALSE;
- cl->enabletqCursorShapeUpdates = FALSE;
+ cl->enableCursorShapeUpdates = 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->enabletqCursorShapeUpdates = TRUE;
+ cl->enableCursorShapeUpdates = TRUE;
cl->cursorWasChanged = TRUE;
}
break;
@@ -738,7 +738,7 @@ rfbProcessClientNormalMessage(cl)
"%s\n", cl->host);
if (cl->enableSoftCursorUpdates)
break;
- cl->enabletqCursorShapeUpdates = TRUE;
+ cl->enableCursorShapeUpdates = TRUE;
cl->useRichCursorEncoding = TRUE;
cl->cursorWasChanged = TRUE;
break;
@@ -748,7 +748,7 @@ rfbProcessClientNormalMessage(cl)
cl->enableSoftCursorUpdates = TRUE;
cl->cursorWasChanged = TRUE;
cl->cursorWasMoved = TRUE;
- cl->enabletqCursorShapeUpdates = FALSE;
+ cl->enableCursorShapeUpdates = 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 sendtqCursorShape = FALSE;
+ Bool sendCursorShape = FALSE;
int sendSoftCursorRects = 0;
if(cl->screen->displayHook)
cl->screen->displayHook(cl);
/*
- * If this client understands cursor tqshape updates, cursor should be
+ * If this client understands cursor shape updates, cursor should be
* removed from the framebuffer. Otherwise, make sure it's put up.
*/
- if (cl->enabletqCursorShapeUpdates) {
+ if (cl->enableCursorShapeUpdates) {
if (cl->screen->cursorIsDrawn) {
rfbUndrawCursor(cl->screen);
}
if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged &&
cl->readyForSetColourMapEntries)
- sendtqCursorShape = TRUE;
+ sendCursorShape = 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) &&
- !(sendtqCursorShape || sendSoftCursorRects)) {
+ !(sendCursorShape || 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
- + !!sendtqCursorShape + sendSoftCursorRects));
+ + !!sendCursorShape + sendSoftCursorRects));
} else {
fu->nRects = 0xFFFF;
}
cl->ublen = sz_rfbFramebufferUpdateMsg;
- if (sendtqCursorShape) {
+ if (sendCursorShape) {
cl->cursorWasChanged = FALSE;
- if (!rfbSendtqCursorShape(cl)) {
+ if (!rfbSendCursorShape(cl)) {
sraRgnDestroy(updateRegion);
return FALSE;
}
diff --git a/krfb/libvncserver/stats.c b/krfb/libvncserver/stats.c
index 86934011..954e6d14 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 tqshape updates %d, bytes %d\n",
+ rfbLog(" cursor shape updates %d, bytes %d\n",
cl->rfbCursorUpdatesSent, cl->rfbCursorBytesSent);
for (i = 0; i < MAX_ENCODINGS; i++) {
diff --git a/krfb/libvncserver/zlib.c b/krfb/libvncserver/zlib.c
index d1b300b0..5661d265 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 tqalignment in the output buffer (which is
+ * requires 4/2/1 byte alignment 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-26 05:55:54 +0000