Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-09 20:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[all] fix missing cursor when client reconnects

Browse Source
This commit is contained in:
Geoffrey McRae
2019-05-28 14:06:15 +10:00
parent b31e8e1cee
commit 3d426ccef8
6 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c-host/platform/Windows/capture/DXGI/src/dxgi.c
View File

@@ -806,11 +806,8 @@ static CaptureResult dxgi_getPointer(CapturePointer * pointer)
assert(this);
assert(this->initialized);
if (!os_waitEvent(this->pointerEvent, TIMEOUT_INFINITE))
{
DEBUG_ERROR("Failed to wait on the pointer event");
return CAPTURE_RESULT_ERROR;
}
if (!os_waitEvent(this->pointerEvent, 1000))
return CAPTURE_RESULT_TIMEOUT;
if (this->stop)
return CAPTURE_RESULT_REINIT;

7
c-host/platform/Windows/capture/NVFBC/src/nvfbc.c
View File

@@ -277,11 +277,8 @@ static CaptureResult nvfbc_getPointer(CapturePointer * pointer)
{
osEventHandle * events[2];
memcpy(&events, &this->cursorEvents, sizeof(osEventHandle *) * 2);
if (!os_waitEvents(events, this->seperateCursor ? 2 : 1, false, TIMEOUT_INFINITE))
{
DEBUG_ERROR("Failed to wait on the cursor events");
return CAPTURE_RESULT_ERROR;
}
if (!os_waitEvents(events, this->seperateCursor ? 2 : 1, false, 1000))
return CAPTURE_RESULT_TIMEOUT;
if (this->stop)
return CAPTURE_RESULT_REINIT;

62
c-host/src/app.c
View File

@@ -38,6 +38,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
struct app
{
unsigned int clientInstance;
KVMFRHeader * shmHeader;
uint8_t * pointerData;
unsigned int pointerDataSize;
@@ -63,25 +65,50 @@ static int pointerThread(void * opaque)
DEBUG_INFO("Pointer thread started");
volatile KVMFRCursor * ci = &(app.shmHeader->cursor);
uint8_t flags;
uint8_t flags;
bool pointerValid = false;
bool shapeValid = false;
unsigned int clientInstance = 0;
CapturePointer pointer = { 0 };
while(app.running)
{
CaptureResult result;
CapturePointer pointer = { 0 };
result = app.iface->getPointer(&pointer);
if (result == CAPTURE_RESULT_REINIT)
bool resend = false;
switch(app.iface->getPointer(&pointer))
{
app.reinit = true;
break;
case CAPTURE_RESULT_OK:
{
pointerValid = true;
break;
}
case CAPTURE_RESULT_REINIT:
{
app.reinit = true;
break;
}
case CAPTURE_RESULT_ERROR:
{
DEBUG_ERROR("Failed to get the pointer");
break;
}
case CAPTURE_RESULT_TIMEOUT:
{
// if the pointer is valid and the client has restarted, send it
if (pointerValid && clientInstance != app.clientInstance)
{
resend = true;
break;
}
continue;
}
}
if (result == CAPTURE_RESULT_ERROR)
{
DEBUG_ERROR("Failed to get the pointer");
break;
}
clientInstance = app.clientInstance;
// wait for the client to finish with the previous update
while((ci->flags & ~KVMFR_CURSOR_FLAG_UPDATE) != 0 && app.running)
@@ -95,7 +122,7 @@ static int pointerThread(void * opaque)
flags |= KVMFR_CURSOR_FLAG_VISIBLE;
// if we have shape data
if (pointer.shapeUpdate)
if (pointer.shapeUpdate || (shapeValid && resend))
{
switch(pointer.format)
{
@@ -112,6 +139,7 @@ static int pointerThread(void * opaque)
ci->pitch = pointer.pitch;
ci->dataPos = app.pointerOffset;
++ci->version;
shapeValid = true;
flags |= KVMFR_CURSOR_FLAG_SHAPE;
}
@@ -367,7 +395,11 @@ int app_main(int argc, char * argv[])
while(app.running)
{
INTERLOCKED_AND8(flags, ~(KVMFR_HEADER_FLAG_RESTART));
if (INTERLOCKED_AND8(flags, ~(KVMFR_HEADER_FLAG_RESTART)) & KVMFR_HEADER_FLAG_RESTART)
{
DEBUG_INFO("Client restarted");
++app.clientInstance;
}
if (app.reinit && !captureRestart())
{