hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-02 19:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move entire area search to a function. Enable tablet to map 'entire'.

Browse source
This commit is contained in:
Agent_00Ming 2024-08-30 10:34:05 -04:00
parent fbd6354393
commit bc6f2eb96b
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/managers/PointerManager.cpp
View file

@ -668,6 +668,24 @@ Vector2D CPointerManager::closestValid(const Vector2D& pos) {
return hotBox.middle(); return hotBox.middle();
} }
CBox CPointerManager::getEntireMappableArea() {
// find x and y size of the entire space
Vector2D bottomRight = {-9999999, -9999999}, topLeft = {9999999, 9999999};
for (auto const& m : g_pCompositor->m_vMonitors) {
const auto EXTENT = m->logicalBox().extent();
const auto POS = m->logicalBox().pos();
if (EXTENT.x > bottomRight.x)
bottomRight.x = EXTENT.x;
if (EXTENT.y > bottomRight.y)
bottomRight.y = EXTENT.y;
if (POS.x < topLeft.x)
topLeft.x = POS.x;
if (POS.y < topLeft.y)
topLeft.y = POS.y;
}
return {topLeft, bottomRight - topLeft};
}
void CPointerManager::damageIfSoftware() { void CPointerManager::damageIfSoftware() {
auto b = getCursorBoxGlobal(); auto b = getCursorBoxGlobal();
@ -719,7 +737,9 @@ void CPointerManager::warpAbsolute(Vector2D abs, SP<IHID> dev) {
case HID_TYPE_TABLET: { case HID_TYPE_TABLET: {
CTablet* TAB = reinterpret_cast<CTablet*>(dev.get()); CTablet* TAB = reinterpret_cast<CTablet*>(dev.get());
if (!TAB->boundOutput.empty()) { if (!TAB->boundOutput.empty()) {
if (const auto PMONITOR = g_pCompositor->getMonitorFromString(TAB->boundOutput); PMONITOR) { if (TAB->boundOutput == "entire")
mappedArea = getEntireMappableArea();
else if (const auto PMONITOR = g_pCompositor->getMonitorFromString(TAB->boundOutput); PMONITOR) {
currentMonitor = PMONITOR->self.lock(); currentMonitor = PMONITOR->self.lock();
mappedArea = currentMonitor->logicalBox(); mappedArea = currentMonitor->logicalBox();
} }
@ -745,23 +765,9 @@ void CPointerManager::warpAbsolute(Vector2D abs, SP<IHID> dev) {
case HID_TYPE_POINTER: { case HID_TYPE_POINTER: {
IPointer* POINTER = reinterpret_cast<IPointer*>(dev.get()); IPointer* POINTER = reinterpret_cast<IPointer*>(dev.get());
if (!POINTER->boundOutput.empty()) { if (!POINTER->boundOutput.empty()) {
if (POINTER->boundOutput == "entire") { if (POINTER->boundOutput == "entire")
// find x and y size of the entire space mappedArea = getEntireMappableArea();
Vector2D bottomRight = {-9999999, -9999999}, topLeft = {9999999, 9999999}; else if (const auto PMONITOR = g_pCompositor->getMonitorFromString(POINTER->boundOutput); PMONITOR) {
for (auto const& m : g_pCompositor->m_vMonitors) {
const auto EXTENT = m->logicalBox().extent();
const auto POS = m->logicalBox().pos();
if (EXTENT.x > bottomRight.x)
bottomRight.x = EXTENT.x;
if (EXTENT.y > bottomRight.y)
bottomRight.y = EXTENT.y;
if (POS.x < topLeft.x)
topLeft.x = POS.x;
if (POS.y < topLeft.y)
topLeft.y = POS.y;
}
mappedArea = {topLeft, bottomRight - topLeft};
} else if (const auto PMONITOR = g_pCompositor->getMonitorFromString(POINTER->boundOutput); PMONITOR) {
currentMonitor = PMONITOR->self.lock(); currentMonitor = PMONITOR->self.lock();
mappedArea = currentMonitor->logicalBox(); mappedArea = currentMonitor->logicalBox();
} }

5
src/managers/PointerManager.hpp
View file

@ -82,8 +82,11 @@ class CPointerManager {
// returns the thing in logical coordinates of the monitor // returns the thing in logical coordinates of the monitor
CBox getCursorBoxLogicalForMonitor(SP<CMonitor> pMonitor); CBox getCursorBoxLogicalForMonitor(SP<CMonitor> pMonitor);
// returns the thing in global coords // returns the thing in global coords
CBox getCursorBoxGlobal(); CBox getCursorBoxGlobal();
// returns the area covered by all monitors
CBox getEntireMappableArea();
//
Vector2D transformedHotspot(SP<CMonitor> pMonitor); Vector2D transformedHotspot(SP<CMonitor> pMonitor);
SP<CTexture> getCurrentCursorTexture(); SP<CTexture> getCurrentCursorTexture();