Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] don't allocate LGMP_Q_POINTER_LEN cursor shape buffers

Browse Source 
There is no need to allocate a buffer for each message as the client is
only required to show the latest version of the cursor. Whie the logic
should prevent cursor corruption, it's not guaranteed, however this is
not a problem as this can only happen if the client is lagging behind
and as such when it gets another update message it will re-read the
now new shape anyway.
This commit is contained in:
Geoffrey McRae 2020-11-10 23:29:04 +11:00
parent cd4dfd7252
commit b942085e6c
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
host/src/app.c
View File

@ -40,6 +40,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <string.h> #include <string.h>
#define CONFIG_FILE "looking-glass-host.ini" #define CONFIG_FILE "looking-glass-host.ini"
#define POINTER_SHAPE_BUFFERS 3
#define ALIGN_DN(x) ((uintptr_t)(x) & ~0x7F) #define ALIGN_DN(x) ((uintptr_t)(x) & ~0x7F)
#define ALIGN_UP(x) ALIGN_DN(x + 0x7F) #define ALIGN_UP(x) ALIGN_DN(x + 0x7F)
@ -73,7 +74,7 @@ struct app
PLGMPHost lgmp; PLGMPHost lgmp;
PLGMPHostQueue pointerQueue; PLGMPHostQueue pointerQueue;
PLGMPMemory pointerMemory[LGMP_Q_POINTER_LEN]; PLGMPMemory pointerMemory[POINTER_SHAPE_BUFFERS];
LG_Lock pointerLock; LG_Lock pointerLock;
CapturePointer pointerInfo; CapturePointer pointerInfo;
PLGMPMemory pointerShape; PLGMPMemory pointerShape;
@ -285,14 +286,6 @@ static bool captureRestart()
bool captureGetPointerBuffer(void ** data, uint32_t * size) bool captureGetPointerBuffer(void ** data, uint32_t * size)
{ {
// spin until there is room
while(lgmpHostQueuePending(app.pointerQueue) == LGMP_Q_POINTER_LEN)
{
usleep(1);
if (app.state == APP_STATE_RUNNING)
return false;
}
PLGMPMemory mem = app.pointerMemory[app.pointerIndex]; PLGMPMemory mem = app.pointerMemory[app.pointerIndex];
*data = ((uint8_t*)lgmpHostMemPtr(mem)) + sizeof(KVMFRCursor); *data = ((uint8_t*)lgmpHostMemPtr(mem)) + sizeof(KVMFRCursor);
*size = MAX_POINTER_SIZE - sizeof(KVMFRCursor); *size = MAX_POINTER_SIZE - sizeof(KVMFRCursor);
@ -318,7 +311,7 @@ static void sendPointer(bool newClient)
else else
mem = app.pointerMemory[app.pointerIndex]; mem = app.pointerMemory[app.pointerIndex];
if (++app.pointerIndex == LGMP_Q_POINTER_LEN) if (++app.pointerIndex == POINTER_SHAPE_BUFFERS)
app.pointerIndex = 0; app.pointerIndex = 0;
uint32_t flags = 0; uint32_t flags = 0;
@ -489,7 +482,7 @@ int app_main(int argc, char * argv[])
goto fail; goto fail;
} }
for(int i = 0; i < LGMP_Q_POINTER_LEN; ++i) for(int i = 0; i < POINTER_SHAPE_BUFFERS; ++i)
{ {
if ((status = lgmpHostMemAlloc(app.lgmp, MAX_POINTER_SIZE, &app.pointerMemory[i])) != LGMP_OK) if ((status = lgmpHostMemAlloc(app.lgmp, MAX_POINTER_SIZE, &app.pointerMemory[i])) != LGMP_OK)
{ {