Apple-2gs-SW/VNCviewGS
1
0
Fork 0
mirror of https://github.com/sheumann/VNCviewGS.git synced 2024-11-25 06:31:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix issues with local cursor code. It seems to work OK now.

Browse Source
This commit is contained in:
Stephen Heumann 2015-09-24 01:33:01 -05:00
parent ebf5297779
commit b9dba4ac26
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mouse.cc
View File

@ -95,7 +95,7 @@ void DoPointerEvent (void) {
/* If no modifiers, just send a normal left click. */ /* If no modifiers, just send a normal left click. */
if (pointerEventStruct.buttonMask == 0x00) if (pointerEventStruct.buttonMask == 0x00)
pointerEventStruct.buttonMask = 0x01; pointerEventStruct.buttonMask = 0x01;
} }
if ((myEvent.modifiers & btn1State) == 0x00) /* If 2nd (right) */ if ((myEvent.modifiers & btn1State) == 0x00) /* If 2nd (right) */
pointerEventStruct.buttonMask |= 0x04; /* button is pressed */ pointerEventStruct.buttonMask |= 0x04; /* button is pressed */
@ -168,13 +168,20 @@ void DoCursor (void) {
else /* hRez == 320 */ else /* hRez == 320 */
lineWords = (rectWidth + 3) / 4 + 1; lineWords = (rectWidth + 3) / 4 + 1;
/* Don't overflow loop indices, and don't use ridiculously large cursors.
* (Is there a limit to the cursor sizes QuickDraw II can handle?) */
if ((lineWords > 16) || (rectHeight > 128)) {
InitCursor();
goto done;
}
cursor = malloc(8 + 4 * lineWords * rectHeight); cursor = malloc(8 + 4 * lineWords * rectHeight);
/* Sub-optimal error handling */ /* Sub-optimal error handling */
if (cursor == NULL) if (cursor == NULL) {
return; InitCursor();
/* Don't overflow loop indices */ goto done;
if ((lineWords > UINT_MAX) || (rectHeight > UINT_MAX)) }
return;
cursorHeightPtr = (unsigned int *)(void *)cursor; cursorHeightPtr = (unsigned int *)(void *)cursor;
cursorWidthPtr = cursorHeightPtr + 1; cursorWidthPtr = cursorHeightPtr + 1;
cursorImage = cursor + 4; cursorImage = cursor + 4;
@ -253,7 +260,7 @@ void DoCursor (void) {
} }
*((unsigned int *)maskLine + lineWords - 1) = 0; *((unsigned int *)maskLine + lineWords - 1) = 0;
for (n = 0; n < lineWords * 2 - 4; n++) { for (n = 0; n < rectWidth / 4; n++) {
*(imageLine + n) = coltab640[*(dataPtr++)] & 0xC0; *(imageLine + n) = coltab640[*(dataPtr++)] & 0xC0;
*(imageLine + n) += coltab640[*(dataPtr++)] & 0x30; *(imageLine + n) += coltab640[*(dataPtr++)] & 0x30;
*(imageLine + n) += coltab640[*(dataPtr++)] & 0x0C; *(imageLine + n) += coltab640[*(dataPtr++)] & 0x0C;
@ -261,23 +268,20 @@ void DoCursor (void) {
*(imageLine + n) ^= 0xFF; /* Reverse color */ *(imageLine + n) ^= 0xFF; /* Reverse color */
*(imageLine + n) &= *(maskLine + n); *(imageLine + n) &= *(maskLine + n);
} }
if (rectWidth % 4) {
*(imageLine + n) = 0; *(imageLine + n) = 0;
j = cursorPixels + rectWidth * (line + 1) - dataPtr; switch (rectWidth - n * 4) {
if (j-- > 0) { case 3: *(imageLine + n) += coltab640[*(dataPtr++)] & 0x0C;
*(imageLine + n) += coltab640[*(dataPtr++)] & 0xC0; case 2: *(imageLine + n) += coltab640[*(dataPtr++)] & 0x30;
if (j-- > 0) { case 1: *(imageLine + n) += coltab640[*(dataPtr++)] & 0xC0;
*(imageLine + n) += coltab640[*(dataPtr++)] & 0x30;
if (j-- > 0) {
*(imageLine + n) += coltab640[*(dataPtr++)] & 0x0C;
if (j-- > 0) {
*(imageLine + n) += coltab640[*(dataPtr++)] & 0x03;
}
}
}
} }
*(imageLine + n) ^= 0xFF; /* Reverse color */ *(imageLine + n) ^= 0xFF; /* Reverse color */
*(imageLine + n) &= *(maskLine + n); *(imageLine + n) &= *(maskLine + n);
*(unsigned int *)(imageLine + n + 1) = 0; n++;
}
*(unsigned int *)(imageLine + n) = 0;
*((unsigned int *)imageLine + lineWords - 1) = 0;
} }
} }
@ -298,6 +302,7 @@ void DoCursor (void) {
fprintf(foo, "\n"); fprintf(foo, "\n");
for (k = cursor; k < cursorImage; k++) for (k = cursor; k < cursorImage; k++)
fprintf(foo, "%02X ", *k); fprintf(foo, "%02X ", *k);
fprintf(foo, "\n");
for (j = 0; j < lineWords * rectHeight * 4; j++) { for (j = 0; j < lineWords * rectHeight * 4; j++) {
fprintf(foo, "%02X", *(cursorImage + j)); fprintf(foo, "%02X", *(cursorImage + j));
if ((j+1) % (lineWords * 2) == 0) if ((j+1) % (lineWords * 2) == 0)
@ -312,10 +317,11 @@ void DoCursor (void) {
//} //}
fprintf(foo, "\n"); fprintf(foo, "\n");
fclose(foo); fclose(foo);
} }
/***************/ /***************/
#endif #endif
done:
displayInProgress = FALSE; displayInProgress = FALSE;
NextRect(); /* Prepare for next rect */ NextRect(); /* Prepare for next rect */
} }

1
vncview.cc
View File

@ -146,6 +146,7 @@ void DoClose (GrafPortPtr wPtr) {
if (cursor) { if (cursor) {
InitCursor(); InitCursor();
free(cursor); free(cursor);
cursor = NULL;
} }
}; };
} }