Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added support for Softcursor protocol extension

Browse Source 
svn path=/trunk/kdenetwork/krfb/; revision=162994
This commit is contained in:
Tim Jansen
2002-06-24 22:23:45 +00:00
parent cb19c577e7
commit 9f44b0dfee
6 changed files with 285 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libvncserver/rfbserver.c
View File

@@ -732,6 +732,13 @@ rfbProcessClientNormalMessage(cl)
cl->useRichCursorEncoding = TRUE;
cl->cursorWasChanged = TRUE;
break;
case rfbEncodingSoftCursor:
rfbLog("Enabling soft cursor updates for client "
"%s\n", cl->host);
cl->enableSoftCursorUpdates = TRUE;
cl->cursorWasChanged = TRUE;
cl->cursorWasMoved = TRUE;
break;
case rfbEncodingLastRect:
if (!cl->enableLastRectEncoding) {
rfbLog("Enabling LastRect protocol extension for client "
@@ -918,6 +925,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
sraRegionPtr updateRegion,updateCopyRegion,tmpRegion;
int dx, dy;
Bool sendCursorShape = FALSE;
int sendSoftCursorRects = 0;
if(cl->screen->displayHook)
cl->screen->displayHook(cl);
@@ -934,6 +942,15 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged &&
cl->readyForSetColourMapEntries)
sendCursorShape = TRUE;
}
else if (cl->enableSoftCursorUpdates) {
if (cl->screen->cursorIsDrawn) {
rfbUndrawCursor(cl->screen);
}
if (cl->cursorWasChanged)
sendSoftCursorRects=2;
else if (cl->cursorWasMoved)
sendSoftCursorRects=1;
} else {
if (!cl->screen->cursorIsDrawn) {
rfbDrawCursor(cl->screen);
@@ -959,7 +976,8 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
updateRegion = sraRgnCreateRgn(givenUpdateRegion);
sraRgnOr(updateRegion,cl->copyRegion);
if(!sraRgnAnd(updateRegion,cl->requestedRegion) && !sendCursorShape) {
if(!sraRgnAnd(updateRegion,cl->requestedRegion) &&
!(sendCursorShape || sendSoftCursorRects)) {
sraRgnDestroy(updateRegion);
UNLOCK(cl->updateMutex);
return TRUE;
@@ -1059,7 +1077,8 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
fu->type = rfbFramebufferUpdate;
if (nUpdateRegionRects != 0xFFFF) {
fu->nRects = Swap16IfLE((CARD16)(sraRgnCountRects(updateCopyRegion)
+ nUpdateRegionRects + !!sendCursorShape));
+ nUpdateRegionRects
+ !!sendCursorShape + sendSoftCursorRects));
} else {
fu->nRects = 0xFFFF;
}
@@ -1072,7 +1091,16 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
return FALSE;
}
}
if (sendSoftCursorRects) {
cl->cursorWasChanged = FALSE;
cl->cursorWasMoved = FALSE;
if (!rfbSendSoftCursor(cl)) {
sraRgnDestroy(updateRegion);
return FALSE;
}
}
if (!sraRgnEmpty(updateCopyRegion)) {
if (!rfbSendCopyRegion(cl,updateCopyRegion,dx,dy)) {
sraRgnDestroy(updateRegion);