Skip to content

fix dragging windows with touch input #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KZDKM merged 4 commits into from
Mar 14, 2025
Merged

fix dragging windows with touch input #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a4414f
flake: update inputs
horriblename Feb 18, 2025
5d3fad4
input: fix wrong monitor on touch
horriblename Feb 18, 2025
7484edf
input: fix broken move animation on touch
horriblename Feb 18, 2025
63ec2a3
input: fix missing refocus on touch
horriblename Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 130 additions & 48 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 30 additions & 8 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pCloseLayerHook;
Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pMouseButtonHook;
Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pMouseAxisHook;
Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pTouchDownHook;
Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pTouchMoveHook;
Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pTouchUpHook;
Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pSwipeBeginHook;
Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pSwipeUpdateHook;
Expand Down Expand Up @@ -268,22 +269,42 @@ void onKeyPress(void* thisptr, SCallbackInfo& info, std::any args) {
}
}

PHLMONITOR g_pTouchedMonitor;

void onTouchDown(void* thisptr, SCallbackInfo& info, std::any args) {
const auto e = std::any_cast<ITouch::SDownEvent>(args);
const auto targetMonitor = g_pCompositor->getMonitorFromName(e.device ? e.device->deviceName : "");
auto targetMonitor = g_pCompositor->getMonitorFromName(!e.device->boundOutput.empty() ? e.device->boundOutput : "");
targetMonitor = targetMonitor ? targetMonitor : g_pCompositor->m_pLastMonitor.lock();

const auto widget = getWidgetForMonitor(targetMonitor);
if (widget != nullptr && targetMonitor != nullptr)
if (widget->isActive())
info.cancelled = !widget->buttonEvent(true, { targetMonitor->vecPosition.x + e.pos.x * targetMonitor->vecSize.x, targetMonitor->vecPosition.y + e.pos.y * targetMonitor->vecSize.y });
if (widget != nullptr && targetMonitor != nullptr) {
if (widget->isActive()) {
Vector2D pos = targetMonitor->vecPosition + e.pos * targetMonitor->vecSize;
info.cancelled = !widget->buttonEvent(true, pos);
if (info.cancelled) {
g_pTouchedMonitor = targetMonitor;
g_pCompositor->warpCursorTo(pos);
g_pInputManager->refocus();
}
}
}
}

void onTouchMove(void* thisptr, SCallbackInfo& info, std::any args) {
if (g_pTouchedMonitor == nullptr) return;

const auto e = std::any_cast<ITouch::SMotionEvent>(args);
g_pCompositor->warpCursorTo(g_pTouchedMonitor->vecPosition + g_pTouchedMonitor->vecSize * e.pos);
g_pInputManager->simulateMouseMovement();
}

void onTouchUp(void* thisptr, SCallbackInfo& info, std::any args) {
const auto e = std::any_cast<ITouch::SUpEvent>(args);
const auto targetMonitor = g_pCompositor->getMonitorFromID(e.touchID);
const auto widget = getWidgetForMonitor(targetMonitor);
if (widget != nullptr && targetMonitor != nullptr)
const auto widget = getWidgetForMonitor(g_pTouchedMonitor);
if (widget != nullptr && g_pTouchedMonitor != nullptr)
if (widget->isActive())
info.cancelled = !widget->buttonEvent(false, g_pInputManager->getMouseCoordsInternal());

g_pTouchedMonitor = nullptr;
}

static SDispatchResult dispatchToggleOverview(std::string arg) {
Expand Down Expand Up @@ -490,6 +511,7 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE inHandle) {
g_pMouseAxisHook = HyprlandAPI::registerCallbackDynamic(pHandle, "mouseAxis", onMouseAxis);

g_pTouchDownHook = HyprlandAPI::registerCallbackDynamic(pHandle, "touchDown", onTouchDown);
g_pTouchMoveHook = HyprlandAPI::registerCallbackDynamic(pHandle, "touchMove", onTouchMove);
g_pTouchUpHook = HyprlandAPI::registerCallbackDynamic(pHandle, "touchUp", onTouchUp);

g_pSwipeBeginHook = HyprlandAPI::registerCallbackDynamic(pHandle, "swipeBegin", onSwipeBegin);
Expand Down