ruby/input: Add macOS mouse support

While keyboard and joypad input had already been present for some time,
mouse input for macOS remained unimplemented in ruby.

Until now, that is.
This commit is contained in:
Sintendo 2021-10-30 09:36:36 +02:00 committed by Screwtapello
parent 6df1807068
commit 74f6ffe89b
2 changed files with 91 additions and 4 deletions

View File

@ -0,0 +1,82 @@
#pragma once
struct InputMouseQuartz {
Input& input;
InputMouseQuartz(Input& input) : input(input) {}
shared_pointer<HID::Mouse> hid{new HID::Mouse};
bool mouseAcquired = false;
auto acquire() -> bool {
if(!mouseAcquired) {
CGError error = CGAssociateMouseAndMouseCursorPosition(NO);
if(error != kCGErrorSuccess) return false;
[NSCursor hide];
mouseAcquired = true;
}
return true;
}
auto acquired() -> bool {
return mouseAcquired;
}
auto release() -> bool {
if(mouseAcquired) {
CGError error = CGAssociateMouseAndMouseCursorPosition(YES);
if(error != kCGErrorSuccess) return false;
[NSCursor unhide];
mouseAcquired = false;
}
return true;
}
auto assign(uint groupID, uint inputID, int16_t value) -> void {
auto& group = hid->group(groupID);
if(group.input(inputID).value() == value) return;
input.doChange(hid, groupID, inputID, group.input(inputID).value(), value);
group.input(inputID).setValue(value);
}
auto poll(vector<shared_pointer<HID::Device>>& devices) -> void {
int deltaX, deltaY;
CGGetLastMouseDelta(&deltaX, &deltaY);
assign(HID::Mouse::GroupID::Axis, 0, deltaX);
assign(HID::Mouse::GroupID::Axis, 1, deltaY);
NSUInteger buttons = [NSEvent pressedMouseButtons];
assign(HID::Mouse::GroupID::Button, 0, !!(buttons & (1 << 0)));
assign(HID::Mouse::GroupID::Button, 2, !!(buttons & (1 << 1)));
assign(HID::Mouse::GroupID::Button, 1, !!(buttons & (1 << 2)));
assign(HID::Mouse::GroupID::Button, 4, !!(buttons & (1 << 3)));
assign(HID::Mouse::GroupID::Button, 3, !!(buttons & (1 << 4)));
devices.append(hid);
}
auto initialize() -> bool {
hid->setVendorID(HID::Mouse::GenericVendorID);
hid->setProductID(HID::Mouse::GenericProductID);
hid->setPathID(0);
hid->axes().append("X");
hid->axes().append("Y");
hid->buttons().append("Left");
hid->buttons().append("Middle");
hid->buttons().append("Right");
hid->buttons().append("Up");
hid->buttons().append("Down");
return true;
}
auto terminate() -> void {
release();
}
};

View File

@ -1,9 +1,10 @@
#include "keyboard/quartz.cpp" #include "keyboard/quartz.cpp"
#include "mouse/quartz.cpp"
#include "joypad/iokit.cpp" #include "joypad/iokit.cpp"
struct InputQuartz : InputDriver { struct InputQuartz : InputDriver {
InputQuartz& self = *this; InputQuartz& self = *this;
InputQuartz(Input& super) : InputDriver(super), keyboard(super), joypad(super) {} InputQuartz(Input& super) : InputDriver(super), keyboard(super), mouse(super), joypad(super) {}
~InputQuartz() { terminate(); } ~InputQuartz() { terminate(); }
auto create() -> bool override { auto create() -> bool override {
@ -13,13 +14,14 @@ struct InputQuartz : InputDriver {
auto driver() -> string override { return "Quartz"; } auto driver() -> string override { return "Quartz"; }
auto ready() -> bool override { return isReady; } auto ready() -> bool override { return isReady; }
auto acquired() -> bool override { return false; } auto acquired() -> bool override { return mouse.acquired(); }
auto acquire() -> bool override { return false; } auto acquire() -> bool override { return mouse.acquire(); }
auto release() -> bool override { return false; } auto release() -> bool override { return mouse.release(); }
auto poll() -> vector<shared_pointer<HID::Device>> override { auto poll() -> vector<shared_pointer<HID::Device>> override {
vector<shared_pointer<HID::Device>> devices; vector<shared_pointer<HID::Device>> devices;
keyboard.poll(devices); keyboard.poll(devices);
mouse.poll(devices);
joypad.poll(devices); joypad.poll(devices);
return devices; return devices;
} }
@ -32,6 +34,7 @@ private:
auto initialize() -> bool { auto initialize() -> bool {
terminate(); terminate();
if(!keyboard.initialize()) return false; if(!keyboard.initialize()) return false;
if(!mouse.initialize()) return false;
if(!joypad.initialize()) return false; if(!joypad.initialize()) return false;
return isReady = true; return isReady = true;
} }
@ -39,10 +42,12 @@ private:
auto terminate() -> void { auto terminate() -> void {
isReady = false; isReady = false;
keyboard.terminate(); keyboard.terminate();
mouse.terminate();
joypad.terminate(); joypad.terminate();
} }
bool isReady = false; bool isReady = false;
InputKeyboardQuartz keyboard; InputKeyboardQuartz keyboard;
InputMouseQuartz mouse;
InputJoypadIOKit joypad; InputJoypadIOKit joypad;
}; };