kdotool is very cool

Author: not-coded

CHANGES.md

@@ -1,4 +1,3 @@
 changes:
-- fix auto gui scaling looking broken with weird window sizes
-- make the .desktop file not show up in the applications menu (specifically on GNOME)
-  - [Pull Request by Eggmanplant](https://github.com/not-coded/WayFix/pull/18)
+- if you're on kde plasma, minecraft will fullscreen correctly without using the fullscreen config options (basically like x11)
+  - only if **[kdotool](https://github.com/jinliu/kdotool)** is installed!!!!!

README.md

@@ -14,6 +14,8 @@ Fixes multiple issues regarding Wayland compatibility for Minecraft.
 **Recommended to be used with [glfw-wayland](https://github.com/BoyOrigin/glfw-wayland).**
 <br>
 **With the [Cursor Fix](https://www.reddit.com/r/kde/comments/13ddktm/mouse_cursor_changing_when_over_some_apps_when/).**
+<br>
+**And [kdotool](https://github.com/jinliu/kdotool)** ***(only if on KDE Plasma)***.
 
 </div>
 
@@ -33,6 +35,7 @@ Fixes multiple issues regarding Wayland compatibility for Minecraft.
 
 > [!NOTE]
 > By default Minecraft sometimes full-screens on the wrong monitor due to Wayland window limitations (unable to get X and Y position).
+> This is automatically **fixed only on KDE Plasma** without specifying the monitor by installing **[kdotool](https://github.com/jinliu/kdotool)**.
 
 ## Building
 - Clone the repository

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Mod Information
-mod.version=1.0.3
+mod.version=1.0.4
 mod.name=wayfix
 mod.maven_group=net.notcoded
 

src/main/java/net/notcoded/wayfix/WayFix.java

@@ -4,6 +4,7 @@
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
 import net.notcoded.wayfix.config.ModConfig;
+import net.notcoded.wayfix.util.WindowHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
@@ -16,6 +17,14 @@ public class WayFix implements ClientModInitializer {
     public void onInitializeClient() {
         AutoConfig.register(ModConfig.class, GsonConfigSerializer::new);
         WayFix.config = AutoConfig.getConfigHolder(ModConfig.class).getConfig();
+
+        WindowHelper.checkIfCanUseWindowHelper();
+        if(WindowHelper.canUseWindowHelper) {
+            WayFix.config.fullscreen.monitorName = "";
+            WayFix.config.fullscreen.useMonitorName = false;
+            WayFix.config.fullscreen.monitorSelector.monitors.clear();
+            WayFix.config.fullscreen.monitorSelector.monitors.add(new ModConfig.Monitors("You do not need to use this as it is automatically fixed.", 0)); // most users probably won't understand this, but I'll include it anyway
+        }
     }
 
     public static boolean isWayland() {

src/main/java/net/notcoded/wayfix/mixin/MonitorTrackerMixin.java

@@ -5,6 +5,7 @@
 import net.minecraft.client.util.MonitorTracker;
 import net.notcoded.wayfix.WayFix;
 import net.notcoded.wayfix.config.ModConfig;
+import net.notcoded.wayfix.util.WindowHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -21,7 +22,7 @@ public class MonitorTrackerMixin {
 
     @Inject(method = {"handleMonitorEvent", "<init>"}, at = @At("TAIL"))
     private void handleConfigAdditions(CallbackInfo ci) {
-        this.refreshMonitors();
+        if(!WindowHelper.canUseWindowHelper) this.refreshMonitors();
     }
 
     @Unique

src/main/java/net/notcoded/wayfix/mixin/WindowMixin.java

@@ -8,8 +8,11 @@
 import net.notcoded.wayfix.WayFix;
 import net.notcoded.wayfix.config.ModConfig;
 import net.notcoded.wayfix.util.DesktopFileInjector;
+import net.notcoded.wayfix.util.WindowHelper;
 import org.lwjgl.glfw.GLFW;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -39,21 +42,24 @@
 */
 
 @Mixin(Window.class)
-public class WindowMixin {
+public abstract class WindowMixin {
+    @Shadow protected abstract void onWindowPosChanged(long window, int x, int y);
+
+    @Shadow @Final private long handle;
+
     @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwDefaultWindowHints()V", shift = At.Shift.AFTER, remap = false))
     private void onWindowHints(WindowEventHandler windowEventHandler, MonitorTracker monitorTracker, WindowSettings windowSettings, String string, String string2, CallbackInfo ci) {
         if (isWayland()) {
             GLFW.glfwWindowHint(GLFW.GLFW_FOCUS_ON_SHOW, GLFW.GLFW_FALSE);
 
-            if(!WayFix.config.injectIcon) return; // assuming that user wants wayland icon and not broken icon (mc launcher)
-            DesktopFileInjector.inject();
+            if(WayFix.config.injectIcon) DesktopFileInjector.inject();
             GLFW.glfwWindowHintString(GLFW.GLFW_WAYLAND_APP_ID, DesktopFileInjector.APP_ID);
         }
     }
 
     @Redirect(method = "updateWindowRegion", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/MonitorTracker;getMonitor(Lnet/minecraft/client/util/Window;)Lnet/minecraft/client/util/Monitor;"))
     private Monitor fixWrongMonitor(MonitorTracker instance, Window window) {
-        return WayFix.config.fullscreen.useMonitorName ? getMonitor(instance) : instance.getMonitor(window);
+        return WayFix.config.fullscreen.useMonitorName && !WindowHelper.canUseWindowHelper ? getMonitor(instance) : instance.getMonitor(window);
     }
 
     @Unique
@@ -69,6 +75,18 @@ private Monitor getMonitor(MonitorTracker instance) {
 
         return instance.getMonitor(monitorID);
     }
+
+
+    // KDE Plasma ONLY
+    @Inject(method = "updateWindowRegion", at = @At("HEAD"))
+    private void fixWrongMonitor(CallbackInfo ci) {
+        if(!WindowHelper.canUseWindowHelper) return;
+
+        int[] pos = WindowHelper.getWindowPos();
+        if(pos == null) return;
+
+        onWindowPosChanged(this.handle, pos[0], pos[1]);
+    }
 
     @Inject(method = "setIcon", at = @At("HEAD"), cancellable = true)
     //? if >=1.20 {

src/main/java/net/notcoded/wayfix/util/WindowHelper.java

@@ -0,0 +1,69 @@
+package net.notcoded.wayfix.util;
+
+import net.minecraft.client.MinecraftClient;
+import net.notcoded.wayfix.WayFix;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class WindowHelper {
+
+    public static boolean canUseWindowHelper = false;
+
+    public static void checkIfCanUseWindowHelper() {
+        if(!System.getenv("XDG_CURRENT_DESKTOP").contains("KDE")) return; // kdotool only works with KDE and I haven't found an alternative.
+
+        try {
+            new ProcessBuilder("kdotool").start();
+            canUseWindowHelper = true;
+        } catch (IOException ignored) {
+            WayFix.LOGGER.warn("WayFix recommends installing 'kdotool' to properly fix the minecraft full-screening functionality.");
+        }
+    }
+
+    private static String windowID = "";
+
+    public static int[] getWindowPos() {
+        if(windowID.trim().isEmpty() && !setWindowID()) return null;
+
+        String[] command = new String[]{"kdotool", "getwindowgeometry", windowID};
+
+        ProcessBuilder builder = new ProcessBuilder(command);
+
+        try {
+            Process process = builder.start();
+            String result = new String(process.getInputStream().readAllBytes());
+            Pattern pattern = Pattern.compile("Position:\\s*(\\d+),(\\d+)");
+            Matcher matcher = pattern.matcher(result);
+            if (matcher.find()) {
+                return new int[]{Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))};
+            } else {
+                return null;
+            }
+        } catch (IOException ignored) {
+            return null;
+        }
+    }
+
+    public static boolean setWindowID() {
+        if(!MinecraftClient.getInstance().isWindowFocused()) return false;
+        String[] command = new String[]{"kdotool", "getactivewindow", "getwindowgeometry"};
+
+        ProcessBuilder builder = new ProcessBuilder(command);
+
+        try {
+            Process process = builder.start();
+            String result = new String(process.getInputStream().readAllBytes());
+            Pattern pattern = Pattern.compile("Window \\{(\\w+-\\w+-\\w+-\\w+-\\w+)}");
+            Matcher matcher = pattern.matcher(result);
+            if (matcher.find()) {
+                windowID = "{" + matcher.group(1) + "}"; // let's just hope this is the minecraft window 🙏
+                return true;
+            }
+            return false;
+        } catch (IOException ignored) {
+            return false;
+        }
+    }
+}