hyprwm/aquamarine
1
0
Fork 0
mirror of https://github.com/hyprwm/aquamarine.git synced 2026-05-08 08:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

libinput: method to get libinput_tablet_tool from ITabletTool (#278)

Browse source 
* libinput: method to get `libinput_tablet_tool` from ITabletTool

Libinput has some configuration specific to the tablet tool that could
be interesting to set for Tablet users. However there's currently no
way of getting the required `libinput_tablet_tool` ptr from
`ITabletTool`. Meaning it's not possible to build the configuration on
Hyprland (or anything else using aquamarine).

This change adds the virtual function `getLibinputTool()` to
`ITabletTool` as well as an implementation for `CLibInputTabletTool`

* Run clang-format
This commit is contained in:
Marcello Haddeman 2026-04-16 19:18:49 +02:00 • committed by GitHub
parent 24f1db3c06
commit 981132ce0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/aquamarine/backend/Session.hpp
View file

@ -149,8 +149,9 @@ namespace Aquamarine {
CLibinputTabletTool(Hyprutils::Memory::CSharedPointer<CLibinputDevice> dev, libinput_tablet_tool* tool);
virtual ~CLibinputTabletTool();
virtual libinput_device* getLibinputHandle();
virtual const std::string& getName();
virtual libinput_device* getLibinputHandle();
virtual libinput_tablet_tool* getLibinputTool();
virtual const std::string& getName();
private:
Hyprutils::Memory::CWeakPointer<CLibinputDevice> device;

6
include/aquamarine/input/Input.hpp
View file

@ -4,6 +4,7 @@
#include <hyprutils/math/Vector2D.hpp>
struct libinput_device;
struct libinput_tablet_tool;
namespace Aquamarine {
class ITabletTool;
@ -291,8 +292,9 @@ namespace Aquamarine {
events.destroy.emit();
}
virtual libinput_device* getLibinputHandle();
virtual const std::string& getName() = 0;
virtual libinput_device* getLibinputHandle();
virtual libinput_tablet_tool* getLibinputTool();
virtual const std::string& getName() = 0;
enum eTabletToolType : uint32_t {
AQ_TABLET_TOOL_TYPE_INVALID = 0,

6
src/backend/Session.cpp
View file

@ -689,7 +689,7 @@ void Aquamarine::CSession::handleLibinputEvent(libinput_event* e) {
case LIBINPUT_SWITCH_LID: hlDevice->switchy->type = ISwitch::AQ_SWITCH_TYPE_LID; break;
case LIBINPUT_SWITCH_TABLET_MODE: hlDevice->switchy->type = ISwitch::AQ_SWITCH_TYPE_TABLET_MODE; break;
default: break;
}
}
hlDevice->switchy->events.fire.emit(ISwitch::SFireEvent{
.timeMs = (uint32_t)(libinput_event_switch_get_time_usec(se) / 1000),
@ -1066,6 +1066,10 @@ libinput_device* Aquamarine::CLibinputTabletTool::getLibinputHandle() {
return device->device;
}
libinput_tablet_tool* Aquamarine::CLibinputTabletTool::getLibinputTool() {
return libinputTool;
}
const std::string& Aquamarine::CLibinputTabletTool::getName() {
if (!device)
return AQ_UNKNOWN_DEVICE_NAME;

4
src/input/Input.cpp
View file

@ -20,6 +20,10 @@ libinput_device* Aquamarine::ITabletTool::getLibinputHandle() {
return nullptr;
}
libinput_tablet_tool* Aquamarine::ITabletTool::getLibinputTool() {
return nullptr;
}
libinput_device* Aquamarine::ITablet::getLibinputHandle() {
return nullptr;
}