diff options
Diffstat (limited to 'krfb/libvncserver/rfbserver.c')
-rw-r--r-- | krfb/libvncserver/rfbserver.c | 26 |
1 files changed, 13 insertions, 13 deletions
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; } |