From 6c5c358805e9df6d43a6929d644a7c2131f10ce4 Mon Sep 17 00:00:00 2001 From: Hannah Lynn Lindrob Date: Wed, 18 Mar 2026 21:33:44 +0100 Subject: [PATCH] Added DbusGlobalShortcutsWayland as a jitpack module --- server/core/build.gradle.kts | 2 +- .../core/src/main/java/dev/slimevr/Keybinding.kt | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/server/core/build.gradle.kts b/server/core/build.gradle.kts index f9a9071dc..91505b8ee 100644 --- a/server/core/build.gradle.kts +++ b/server/core/build.gradle.kts @@ -80,7 +80,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") implementation("com.mayakapps.kache:kache:2.1.1") - implementation("dev.hannahpadd:dbusglobalshortcutskotlin:0.1.0") + implementation("com.github.HannahPadd:DbusGlobalShortcutsWayland:f1c203a7f0") api("com.github.loucass003:EspflashKotlin:v0.11.0") diff --git a/server/core/src/main/java/dev/slimevr/Keybinding.kt b/server/core/src/main/java/dev/slimevr/Keybinding.kt index 8703c36ca..ff7f2564c 100644 --- a/server/core/src/main/java/dev/slimevr/Keybinding.kt +++ b/server/core/src/main/java/dev/slimevr/Keybinding.kt @@ -56,11 +56,11 @@ class Keybinding @AWTThread constructor(val server: VRServer) : HotkeyListener { if (currentPlatform == OperatingSystem.LINUX) { val portalManager = PortalManager(SLIMEVR_IDENTIFIER) val shortcutsList = mutableListOf( - ShortcutTuple("FULL_RESET", mapOf("description" to Variant("Full Reset"), "trigger_description" to Variant("CTRL+ALT+SHIFT+Y"))), - ShortcutTuple("YAW_RESET", mapOf("description" to Variant("Yaw Reset"), "trigger_description" to Variant("CTRL+ALT+SHIFT+U"))), - ShortcutTuple("MOUNTING_RESET", mapOf("description" to Variant("Mounting Reset"), "trigger_description" to Variant("CTRL+ALT+SHIFT+I"))), - ShortcutTuple("FEET_MOUNTING_RESET", mapOf("description" to Variant("Feet Mounting Reset"), "trigger_description" to Variant("CTRL+ALT+SHIFT+P"))), - ShortcutTuple("PAUSE_TRACKING", mapOf("description" to Variant("Pause Tracking"), "trigger_description" to Variant("CTRL+ALT+SHIFT+O")))) + ShortcutTuple("FULL_RESET", mapOf("description" to Variant("Full Reset"), "preferred_trigger" to Variant("CTRL+ALT+SHIFT+Y"))), + ShortcutTuple("YAW_RESET", mapOf("description" to Variant("Yaw Reset"), "preferred_trigger" to Variant("CTRL+ALT+SHIFT+U"))), + ShortcutTuple("MOUNTING_RESET", mapOf("description" to Variant("Mounting Reset"), "preferred_trigger" to Variant("CTRL+ALT+SHIFT+I"))), + ShortcutTuple("FEET_MOUNTING_RESET", mapOf("description" to Variant("Feet Mounting Reset"), "preferred_trigger" to Variant("CTRL+ALT+SHIFT+P"))), + ShortcutTuple("PAUSE_TRACKING", mapOf("description" to Variant("Pause Tracking"), "preferred_trigger" to Variant("CTRL+ALT+SHIFT+O")))) val globalShortcutsHandler = portalManager.globalShortcutsRequest(shortcutsList) Runtime.getRuntime().addShutdownHook(Thread { println("Closing connection") @@ -70,22 +70,18 @@ class Keybinding @AWTThread constructor(val server: VRServer) : HotkeyListener { globalShortcutsHandler.onShortcutActivated = { shortcutId -> when (shortcutId) { "FULL_RESET" -> { - println("Full reset triggered") server.scheduleResetTrackersFull(RESET_SOURCE_NAME, config.fullResetDelay.toLong()) } "YAW_RESET" -> { - println("Yaw reset triggered") server.scheduleResetTrackersYaw(RESET_SOURCE_NAME, config.yawResetDelay.toLong()) } "MOUNTING_RESET" -> { - println("Mounting reset triggered") server.scheduleResetTrackersMounting( RESET_SOURCE_NAME, config.mountingResetDelay.toLong(), ) } "FEET_MOUNTING_RESET" -> { - println("Feet mounting reset triggered") server.scheduleResetTrackersMounting( RESET_SOURCE_NAME, config.feetMountingResetDelay.toLong(), @@ -93,7 +89,6 @@ class Keybinding @AWTThread constructor(val server: VRServer) : HotkeyListener { ) } "PAUSE_TRACKING" -> { - println("Pause tracking triggered") server.scheduleTogglePauseTracking( RESET_SOURCE_NAME, config.pauseTrackingDelay.toLong(),