AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-11 16:45:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Add XBUTTON1/2 mouse button support

Browse Source
This commit is contained in:
UnknownShadow200 2022-08-01 19:27:05 +10:00
parent 3bbe889177
commit 59b70501fa
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Window_Carbon.c
View File

@ -243,6 +243,16 @@ static OSStatus Window_ProcessWindowEvent(EventRef inEvent) {
return eventNotHandledErr; return eventNotHandledErr;
} }
static int MapNativeMouse(EventMouseButton button) {
if (button == kEventMouseButtonPrimary) return KEY_LMOUSE;
if (button == kEventMouseButtonSecondary) return KEY_RMOUSE;
if (button == kEventMouseButtonTertiary) return KEY_MMOUSE;
if (button == 4) return KEY_XBUTTON1;
if (button == 5) return KEY_XBUTTON2;
return 0;
}
static OSStatus Window_ProcessMouseEvent(EventRef inEvent) { static OSStatus Window_ProcessMouseEvent(EventRef inEvent) {
int mouseX, mouseY; int mouseX, mouseY;
HIPoint pt, raw; HIPoint pt, raw;
@ -251,6 +261,7 @@ static OSStatus Window_ProcessMouseEvent(EventRef inEvent) {
EventMouseButton button; EventMouseButton button;
SInt32 delta; SInt32 delta;
OSStatus res; OSStatus res;
int btn;
res = GetEventParameter(inEvent, kEventParamMouseLocation, typeHIPoint, res = GetEventParameter(inEvent, kEventParamMouseLocation, typeHIPoint,
NULL, sizeof(HIPoint), NULL, &pt); NULL, sizeof(HIPoint), NULL, &pt);
@ -287,14 +298,9 @@ static OSStatus Window_ProcessMouseEvent(EventRef inEvent) {
NULL, sizeof(EventMouseButton), NULL, &button); NULL, sizeof(EventMouseButton), NULL, &button);
if (res) Logger_Abort2(res, "Getting mouse button"); if (res) Logger_Abort2(res, "Getting mouse button");
switch (button) { btn = MapNativeMouse(button);
case kEventMouseButtonPrimary: if (btn) Input_Set(btn, down); break;
Input_Set(KEY_LMOUSE, down); break;
case kEventMouseButtonSecondary:
Input_Set(KEY_RMOUSE, down); break;
case kEventMouseButtonTertiary:
Input_Set(KEY_MMOUSE, down); break;
}
return eventNotHandledErr; return eventNotHandledErr;
case kEventMouseWheelMoved: case kEventMouseWheelMoved:

2
src/interop_cocoa.m
View File

@ -356,6 +356,8 @@ static int MapNativeMouse(int button) {
if (button == 0) return KEY_LMOUSE; if (button == 0) return KEY_LMOUSE;
if (button == 1) return KEY_RMOUSE; if (button == 1) return KEY_RMOUSE;
if (button == 2) return KEY_MMOUSE; if (button == 2) return KEY_MMOUSE;
if (button == 3) return KEY_XBUTTON1;
if (button == 4) return KEY_XBUTTON2;
return 0; return 0;
} }