Fix behaviour for clients that support soft cursor and rich cursor encodings (like krdc will soon): soft cursor has the higher priority

svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=204221
This commit is contained in:
Tim Jansen
2003-02-01 19:35:40 +00:00
parent f80311e260
commit 612e3b8aab

View File

@@ -721,6 +721,8 @@ rfbProcessClientNormalMessage(cl)
}
break;
case rfbEncodingXCursor:
if (cl->enableSoftCursorUpdates)
break;
if(!cl->screen->dontConvertRichCursorToXCursor) {
rfbLog("Enabling X-style cursor updates for client %s\n",
cl->host);
@@ -731,9 +733,11 @@ rfbProcessClientNormalMessage(cl)
case rfbEncodingRichCursor:
rfbLog("Enabling full-color cursor updates for client "
"%s\n", cl->host);
cl->enableCursorShapeUpdates = TRUE;
cl->useRichCursorEncoding = TRUE;
cl->cursorWasChanged = TRUE;
if (cl->enableSoftCursorUpdates)
break;
cl->enableCursorShapeUpdates = TRUE;
cl->useRichCursorEncoding = TRUE;
cl->cursorWasChanged = TRUE;
break;
case rfbEncodingSoftCursor:
rfbLog("Enabling soft cursor updates for client "
@@ -741,6 +745,8 @@ rfbProcessClientNormalMessage(cl)
cl->enableSoftCursorUpdates = TRUE;
cl->cursorWasChanged = TRUE;
cl->cursorWasMoved = TRUE;
cl->enableCursorShapeUpdates = FALSE;
cl->useRichCursorEncoding = FALSE;
break;
case rfbEncodingLastRect:
if (!cl->enableLastRectEncoding) {