Skip to content

Fix mixed input leaving the virtual mouse unresponsive for 2 seconds #939

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

Open
lfbusta wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −4
Open

Fix mixed input leaving the virtual mouse unresponsive for 2 seconds #939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 23 additions & 4 deletions src/main/java/dev/isxander/controlify/Controlify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public class Controlify implements ControlifyApi {
private double lastInputSwitchTime = 0;

private int showMouseTicks = 0;
private boolean mouseUsedThisTick = false;

/**
* Called at usual fabric client entrypoint and in NeoForge mod constructor
Expand Down Expand Up @@ -472,10 +473,7 @@ public void tick(Minecraft client) {
if (currentInputMode() == InputMode.MIXED && showMouseTicks > 0) {
showMouseTicks--;
if (showMouseTicks == 0) {
hideMouse(true, false);
if (virtualMouseHandler().requiresVirtualMouse()) {
virtualMouseHandler().enableVirtualMouse();
}
restoreVirtualCursor();
}
}

Expand All @@ -497,6 +495,8 @@ public void tick(Minecraft client) {
controller
);
}

mouseUsedThisTick = false;
}

/**
Expand Down Expand Up @@ -530,6 +530,10 @@ private void tickActiveController(ControllerEntity controller, boolean outOfFocu
}
}

if (showMouseTicks > 0 && !mouseUsedThisTick && state.isGivingInput()) {
this.endTemporaryCursor();
}

if (consecutiveInputSwitches > 100) {
CUtil.LOGGER.warn("Controlify detected current controller to be constantly giving input and has been disabled.");
MinecraftUtil.sendToast(
Expand Down Expand Up @@ -726,6 +730,7 @@ public void hideMouse(boolean hide, boolean moveMouse) {

public void showCursorTemporarily() {
if (currentInputMode() == InputMode.MIXED && !minecraft.mouseHandler.isMouseGrabbed()) {
mouseUsedThisTick = true;
hideMouse(false, false);
showMouseTicks = 20 * 2;
if (virtualMouseHandler().isVirtualMouseEnabled()) {
Expand All @@ -734,6 +739,20 @@ public void showCursorTemporarily() {
}
}

public void endTemporaryCursor() {
if (currentInputMode() != InputMode.MIXED || showMouseTicks <= 0) return;

showMouseTicks = 0;
restoreVirtualCursor();
}

private void restoreVirtualCursor() {
hideMouse(true, false);
if (virtualMouseHandler().requiresVirtualMouse()) {
virtualMouseHandler().enableVirtualMouse();
}
}

public InputFontMapper inputFontMapper() {
return inputFontMapper;
}
Expand Down