mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-24 12:38:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[all] make cursor visible a flag and send it seperate to position

Browse source
This commit is contained in:
Geoffrey McRae 2020-01-27 02:07:32 +11:00
parent 9d7f773b9c
commit bced5f95ff
5 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
B1-115-gfea0a98b9e+1 B1-116-g9d7f773b9c+1

18
c-host/platform/Windows/capture/DXGI/src/dxgi.c
View file

@ -710,19 +710,21 @@ static CaptureResult dxgi_capture()
frameInfo.PointerPosition.Visible != this->lastPointerVisible frameInfo.PointerPosition.Visible != this->lastPointerVisible
) )
{ {
pointer.positionUpdate = true;
/* the pointer position is invalid if the pointer is not visible */ /* the pointer position is invalid if the pointer is not visible */
if (frameInfo.PointerPosition.Visible) if (frameInfo.PointerPosition.Visible)
{ {
this->lastPointerX = frameInfo.PointerPosition.Position.x; pointer.positionUpdate = true;
this->lastPointerY = frameInfo.PointerPosition.Position.y; pointer.x =
this->lastPointerX =
frameInfo.PointerPosition.Position.x;
pointer.y =
this->lastPointerY =
frameInfo.PointerPosition.Position.y;
} }
this->lastPointerVisible = frameInfo.PointerPosition.Visible;
pointer.x = this->lastPointerX; pointer.visible =
pointer.y = this->lastPointerY; this->lastPointerVisible =
pointer.visible = this->lastPointerVisible; frameInfo.PointerPosition.Visible;
postPointer = true; postPointer = true;
} }
} }

4
c-host/src/app.c
View file

@ -327,9 +327,11 @@ void capturePostPointerBuffer(CapturePointer pointer)
flags |= CURSOR_FLAG_POSITION; flags |= CURSOR_FLAG_POSITION;
cursor->x = pointer.x; cursor->x = pointer.x;
cursor->y = pointer.y; cursor->y = pointer.y;
cursor->visible = pointer.visible;
} }
if (pointer.visible)
flags |= CURSOR_FLAG_VISIBLE;
if (pointer.shapeUpdate) if (pointer.shapeUpdate)
{ {
// remember which slot has the latest shape // remember which slot has the latest shape

4
client/src/main.c
View file

@ -300,11 +300,13 @@ static int cursorThread(void * unused)
KVMFRCursor * cursor = (KVMFRCursor *)msg.mem; KVMFRCursor * cursor = (KVMFRCursor *)msg.mem;
state.cursorVisible =
msg.udata & CURSOR_FLAG_VISIBLE;
if (msg.udata & CURSOR_FLAG_POSITION) if (msg.udata & CURSOR_FLAG_POSITION)
{ {
state.cursor.x = cursor->x; state.cursor.x = cursor->x;
state.cursor.y = cursor->y; state.cursor.y = cursor->y;
state.cursorVisible = cursor->visible;
state.haveCursorPos = true; state.haveCursorPos = true;
if (!state.haveAligned && state.haveSrcSize && state.haveCurLocal) if (!state.haveAligned && state.haveSrcSize && state.haveCurLocal)

4
common/include/common/KVMFR.h
View file

@ -37,7 +37,8 @@ FrameType;
enum enum
{ {
CURSOR_FLAG_POSITION = 0x1, CURSOR_FLAG_POSITION = 0x1,
CURSOR_FLAG_SHAPE = 0x2 CURSOR_FLAG_VISIBLE = 0x2,
CURSOR_FLAG_SHAPE = 0x4
}; };
typedef uint32_t KVMFRCursorFlags; typedef uint32_t KVMFRCursorFlags;
@ -52,7 +53,6 @@ CursorType;
typedef struct KVMFRCursor typedef struct KVMFRCursor
{ {
int16_t x, y; // cursor x & y position int16_t x, y; // cursor x & y position
bool visible; // cursor visible
CursorType type; // shape buffer data type CursorType type; // shape buffer data type
uint32_t width; // width of the shape uint32_t width; // width of the shape
uint32_t height; // height of the shape uint32_t height; // height of the shape