cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow binding tablets to outputs

Browse source
This commit is contained in:
vaxerski 2022-12-21 15:11:39 +00:00
parent fc37ce4a72
commit 41cdfb7420
6 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/managers/input/InputManager.cpp
View file

@ -1147,10 +1147,10 @@ void CInputManager::setTouchDeviceConfigs() {
const auto LIBINPUTDEV = (libinput_device*)wlr_libinput_get_device_handle(m.pWlrDevice);
const int ROTATION =
std::clamp(HASCONFIG ? g_pConfigManager->getDeviceInt(PTOUCHDEV->name, "touch_transform") : g_pConfigManager->getInt("input:touchdevice:transform"), 0, 7);
std::clamp(HASCONFIG ? g_pConfigManager->getDeviceInt(PTOUCHDEV->name, "transform") : g_pConfigManager->getInt("input:touchdevice:transform"), 0, 7);
libinput_device_config_calibration_set_matrix(LIBINPUTDEV, MATRICES[ROTATION]);
const auto OUTPUT = HASCONFIG ? g_pConfigManager->getDeviceString(PTOUCHDEV->name, "touch_output") : g_pConfigManager->getString("input:touchdevice:output");
const auto OUTPUT = HASCONFIG ? g_pConfigManager->getDeviceString(PTOUCHDEV->name, "output") : g_pConfigManager->getString("input:touchdevice:output");
if (!OUTPUT.empty() && OUTPUT != STRVAL_EMPTY)
PTOUCHDEV->boundOutput = OUTPUT;
else
@ -1159,6 +1159,22 @@ void CInputManager::setTouchDeviceConfigs() {
}
}
void CInputManager::setTabletConfigs() {
for (auto& t : m_lTablets) {
const auto HASCONFIG = g_pConfigManager->deviceConfigExists(t.name);
if (HASCONFIG) {
const auto OUTPUT = g_pConfigManager->getDeviceString(t.name, "output");
const auto PMONITOR = g_pCompositor->getMonitorFromString(OUTPUT);
if (PMONITOR) {
wlr_cursor_map_input_to_output(g_pCompositor->m_sWLRCursor, t.wlrDevice, PMONITOR->output);
wlr_cursor_map_input_to_region(g_pCompositor->m_sWLRCursor, t.wlrDevice, nullptr);
}
}
}
}
void CInputManager::destroyTouchDevice(STouchDevice* pDevice) {
Debug::log(LOG, "Touch device at %x removed", pDevice);

1
src/managers/input/InputManager.hpp
View file

@ -60,6 +60,7 @@ class CInputManager {
void setKeyboardLayout();
void setPointerConfigs();
void setTouchDeviceConfigs();
void setTabletConfigs();
void updateDragIcon();
void updateCapabilities();

3
src/managers/input/Tablets.cpp
View file

@ -137,6 +137,8 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) {
}
},
PNEWTABLET, "Tablet");
setTabletConfigs();
}
STabletTool* CInputManager::ensureTabletToolPresent(wlr_tablet_tool* pTool) {
@ -176,6 +178,7 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) {
}
PNEWPAD->wlrTabletPadV2 = wlr_tablet_pad_create(g_pCompositor->m_sWLRTabletManager, g_pCompositor->m_sSeat.seat, pDevice);
PNEWPAD->pWlrDevice = pDevice;
PNEWPAD->hyprListener_Button.initCallback(
&wlr_tablet_pad_from_input_device(pDevice)->events.button,