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

[client] opengl: fix cursor location when the source is downsampled

Browse Source
This commit is contained in:
Geoffrey McRae 2023-11-08 14:54:05 +11:00
parent c54a09ca25
commit dcde981a17
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/renderers/OpenGL/opengl.c
View File

@ -84,10 +84,10 @@ struct IntPoint
int y; int y;
}; };
struct IntRect struct MouseRect
{ {
int x; float x;
int y; float y;
int w; int w;
int h; int h;
}; };
@ -124,6 +124,7 @@ struct Inst
GLuint dataFormat; GLuint dataFormat;
size_t texSize; size_t texSize;
size_t texPos; size_t texPos;
float scaleX, scaleY;
const FrameBuffer * frame; const FrameBuffer * frame;
uint64_t drawStart; uint64_t drawStart;
@ -157,7 +158,7 @@ struct Inst
bool newShape; bool newShape;
LG_RendererCursor mouseType; LG_RendererCursor mouseType;
bool mouseVisible; bool mouseVisible;
struct IntRect mousePos; struct MouseRect mousePos;
}; };
static bool _checkGLError(unsigned int line, const char * name); static bool _checkGLError(unsigned int line, const char * name);
@ -356,12 +357,17 @@ bool opengl_onMouseEvent(LG_Renderer * renderer, const bool visible,
{ {
struct Inst * this = UPCAST(struct Inst, renderer); struct Inst * this = UPCAST(struct Inst, renderer);
if (this->mousePos.x == x && this->mousePos.y == y && this->mouseVisible == visible) float fx = (float)x * this->scaleX;
float fy = (float)y * this->scaleY;
if (this->mousePos.x == fx &&
this->mousePos.y == fy &&
this->mouseVisible == visible)
return true; return true;
this->mouseVisible = visible; this->mouseVisible = visible;
this->mousePos.x = x; this->mousePos.x = fx;
this->mousePos.y = y; this->mousePos.y = fy;
this->mouseUpdate = true; this->mouseUpdate = true;
return false; return false;
} }
@ -372,6 +378,10 @@ bool opengl_onFrameFormat(LG_Renderer * renderer, const LG_RendererFormat format
LG_LOCK(this->formatLock); LG_LOCK(this->formatLock);
memcpy(&this->format, &format, sizeof(LG_RendererFormat)); memcpy(&this->format, &format, sizeof(LG_RendererFormat));
this->scaleX = (float)this->format.frameWidth / this->format.screenWidth;
this->scaleY = (float)this->format.frameHeight / this->format.screenHeight;
this->reconfigure = true; this->reconfigure = true;
LG_UNLOCK(this->formatLock); LG_UNLOCK(this->formatLock);
return true; return true;