diff --git a/dots/.config/quickshell/ii/modules/ii/bar/UtilButtons.qml b/dots/.config/quickshell/ii/modules/ii/bar/UtilButtons.qml index abda8a63b..615ed6539 100644 --- a/dots/.config/quickshell/ii/modules/ii/bar/UtilButtons.qml +++ b/dots/.config/quickshell/ii/modules/ii/bar/UtilButtons.qml @@ -107,9 +107,9 @@ Item { Layout.alignment: Qt.AlignVCenter onClicked: event => { if (Appearance.m3colors.darkmode) { - Hyprland.dispatch(`exec ${Directories.wallpaperSwitchScriptPath} --mode light --noswitch`); + Quickshell.execDetached(["bash", "-c", `${Directories.wallpaperSwitchScriptPath} --mode light --noswitch`]) } else { - Hyprland.dispatch(`exec ${Directories.wallpaperSwitchScriptPath} --mode dark --noswitch`); + Quickshell.execDetached(["bash", "-c", `${Directories.wallpaperSwitchScriptPath} --mode dark --noswitch`]) } } MaterialSymbol { diff --git a/dots/.config/quickshell/ii/modules/ii/bar/Workspaces.qml b/dots/.config/quickshell/ii/modules/ii/bar/Workspaces.qml index 36c488730..ec845be1a 100644 --- a/dots/.config/quickshell/ii/modules/ii/bar/Workspaces.qml +++ b/dots/.config/quickshell/ii/modules/ii/bar/Workspaces.qml @@ -88,9 +88,9 @@ Item { WheelHandler { onWheel: (event) => { if (event.angleDelta.y < 0) - Hyprland.dispatch(`workspace r+1`); + Hyprland.dispatch(`hl.dsp.focus({workspace = "r+1"})`); else if (event.angleDelta.y > 0) - Hyprland.dispatch(`workspace r-1`); + Hyprland.dispatch(`hl.dsp.focus({workspace = "r-1"})`); } acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad } @@ -100,7 +100,7 @@ Item { acceptedButtons: Qt.BackButton onPressed: (event) => { if (event.button === Qt.BackButton) { - Hyprland.dispatch(`togglespecialworkspace`); + Hyprland.dispatch(`hl.dsp.workspace.toggle_special("special")`); } } } @@ -199,9 +199,9 @@ Item { property int workspaceValue: workspaceGroup * root.workspacesShown + index + 1 implicitHeight: vertical ? Appearance.sizes.verticalBarWidth : Appearance.sizes.barHeight implicitWidth: vertical ? Appearance.sizes.verticalBarWidth : Appearance.sizes.verticalBarWidth - onPressed: Hyprland.dispatch(`workspace ${workspaceValue}`) - width: vertical ? undefined : workspaceButtonWidth - height: vertical ? workspaceButtonWidth : undefined + onPressed: Hyprland.dispatch(`hl.dsp.focus({ workspace = ${workspaceValue}})`) + width: vertical ? undefined : root.workspaceButtonWidth + height: vertical ? root.workspaceButtonWidth : undefined background: Item { id: workspaceButtonBackground diff --git a/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml b/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml index fe3df64a3..b28ff5a46 100644 --- a/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml +++ b/dots/.config/quickshell/ii/modules/ii/overview/Overview.qml @@ -80,12 +80,6 @@ Scope { Keys.onPressed: event => { if (event.key === Qt.Key_Escape) { GlobalStates.overviewOpen = false; - } else if (event.key === Qt.Key_Left) { - if (!panelWindow.searchingText) - Hyprland.dispatch("workspace r-1"); - } else if (event.key === Qt.Key_Right) { - if (!panelWindow.searchingText) - Hyprland.dispatch("workspace r+1"); } } diff --git a/dots/.config/quickshell/ii/modules/ii/overview/OverviewWidget.qml b/dots/.config/quickshell/ii/modules/ii/overview/OverviewWidget.qml index 4fa2bef67..3bd504c76 100644 --- a/dots/.config/quickshell/ii/modules/ii/overview/OverviewWidget.qml +++ b/dots/.config/quickshell/ii/modules/ii/overview/OverviewWidget.qml @@ -142,7 +142,7 @@ Item { onPressed: { if (root.draggingTargetWorkspace === -1) { GlobalStates.overviewOpen = false - Hyprland.dispatch(`workspace ${workspace.workspaceValue}`) + Hyprland.dispatch(`hl.dsp.focus({ workspace = ${workspace.workspaceValue} })`) } } } @@ -266,7 +266,7 @@ Item { window.Drag.active = false root.draggingFromWorkspace = -1 if (targetWorkspace !== -1 && targetWorkspace !== windowData?.workspace.id) { - Hyprland.dispatch(`movetoworkspacesilent ${targetWorkspace}, address:${window.windowData?.address}`) + Hyprland.dispatch(`hl.dsp.window.move({ workspace = ${targetWorkspace}, follow = false, window = "address:${window.windowData?.address}" })`) updateWindowPosition.restart() } else { @@ -274,9 +274,9 @@ Item { updateWindowPosition.restart() return } - const percentageX = Math.round((window.x - xOffset) / root.workspaceImplicitWidth * 100) - const percentageY = Math.round((window.y - yOffset) / root.workspaceImplicitHeight * 100) - Hyprland.dispatch(`movewindowpixel exact ${percentageX}% ${percentageY}%, address:${window.windowData?.address}`) + const percentageX = (window.x - xOffset) / root.workspaceImplicitWidth + const percentageY = (window.y - yOffset) / root.workspaceImplicitHeight + Hyprland.dispatch(`hl.dsp.window.move({ x = "${percentageX * root.screen.width}", y = "${percentageY * root.screen.height}", window = "address:${window.windowData?.address}" })`) } } onClicked: (event) => { @@ -284,10 +284,10 @@ Item { if (event.button === Qt.LeftButton) { GlobalStates.overviewOpen = false - Hyprland.dispatch(`focuswindow address:${windowData.address}`) + Hyprland.dispatch(`hl.dsp.focus({window = "address:${windowData.address}"})`) event.accepted = true } else if (event.button === Qt.MiddleButton) { - Hyprland.dispatch(`closewindow address:${windowData.address}`) + Hyprland.dispatch(`hl.dsp.window.close({window = "address:${windowData.address}"})`) event.accepted = true } } diff --git a/dots/.config/quickshell/ii/modules/ii/sidebarLeft/anime/BooruImage.qml b/dots/.config/quickshell/ii/modules/ii/sidebarLeft/anime/BooruImage.qml index ef0d7540e..9447abf88 100644 --- a/dots/.config/quickshell/ii/modules/ii/sidebarLeft/anime/BooruImage.qml +++ b/dots/.config/quickshell/ii/modules/ii/sidebarLeft/anime/BooruImage.qml @@ -147,9 +147,9 @@ Button { buttonText: Translation.tr("Open file link") onClicked: { root.showActions = false - Hyprland.dispatch("keyword cursor:no_warps true") + Hyprland.dispatch("hl.config({cursor = {no_warps = true}})") Qt.openUrlExternally(root.imageData.file_url) - Hyprland.dispatch("keyword cursor:no_warps false") + Hyprland.dispatch("hl.config({cursor = {no_warps = false}})") } } MenuButton { @@ -160,9 +160,9 @@ Button { enabled: root.imageData.source && root.imageData.source.length > 0 onClicked: { root.showActions = false - Hyprland.dispatch("keyword cursor:no_warps true") + Hyprland.dispatch("hl.config({cursor = {no_warps = true}})") Qt.openUrlExternally(root.imageData.source) - Hyprland.dispatch("keyword cursor:no_warps false") + Hyprland.dispatch("hl.config({cursor = {no_warps = false}})") } } MenuButton { diff --git a/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRightContent.qml b/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRightContent.qml index 0f733ed82..412912ed7 100644 --- a/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRightContent.qml +++ b/dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRightContent.qml @@ -268,7 +268,7 @@ Item { toggled: false buttonIcon: "restart_alt" onClicked: { - Hyprland.dispatch("reload"); + Quickshell.execDetached(["hyprctl", "reload"]) Quickshell.reload(true); } StyledToolTip { diff --git a/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewContent.qml b/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewContent.qml index 6828098cf..6a403dfe5 100644 --- a/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewContent.qml +++ b/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewContent.qml @@ -186,7 +186,7 @@ Rectangle { } else { root.draggingWindow = false; if (root.hoveredWorkspace !== null && root.hoveredWorkspace.workspace !== windowItem.hyprlandClient.workspace.id) { - Hyprland.dispatch(`movetoworkspacesilent ${root.hoveredWorkspace.workspace}, address:${windowItem.hyprlandClient.address}`); + Hyprland.dispatch(`hl.dsp.window.move({ workspace = ${root.hoveredWorkspace.workspace}, follow = false, window = "address:${windowItem.hyprlandClient.address}" })`) } else { windowItem.openedX = 0; windowItem.openedY = 0; @@ -292,7 +292,7 @@ Rectangle { onClicked: { GlobalStates.overviewOpen = false; root.closed(); // Close immediately to avoid weird animations - Hyprland.dispatch(`workspace ${workspaceItem.workspace}`); + Hyprland.dispatch(`hl.dsp.focus({workspace = ${workspaceItem.workspace}})`); } } } diff --git a/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewWindow.qml b/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewWindow.qml index b91655097..0450dcd79 100644 --- a/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewWindow.qml +++ b/dots/.config/quickshell/ii/modules/waffle/taskView/TaskViewWindow.qml @@ -62,14 +62,14 @@ WMouseAreaButton { } function closeWindow() { - Hyprland.dispatch(`closewindow address:${root.hyprlandClient?.address}`); + Hyprland.dispatch(`hl.dsp.window.close({window = "address:${root.hyprlandClient?.address}"})`) } acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton onClicked: event => { if (event.button === Qt.LeftButton) { GlobalStates.overviewOpen = false; - Hyprland.dispatch(`focuswindow address:${root.hyprlandClient?.address}`); + Hyprland.dispatch(`hl.dsp.focus({window = "address:${root.hyprlandClient?.address}"})`) GlobalStates.overviewOpen = false; } else if (event.button === Qt.MiddleButton) { root.closeWindow(); @@ -143,7 +143,7 @@ WMouseAreaButton { icon.name: isPinned ? "checkmark" : "empty" text: Translation.tr("Show this window on all desktops") onTriggered: { - Hyprland.dispatch(`pin address:${root.hyprlandClient?.address}`); + Hyprland.dispatch(`hl.dsp.window.pin({window = "address:${root.hyprlandClient?.address}"})`); } } Action { diff --git a/dots/.config/quickshell/ii/services/LauncherSearch.qml b/dots/.config/quickshell/ii/services/LauncherSearch.qml index 38287460e..25701fb6c 100644 --- a/dots/.config/quickshell/ii/services/LauncherSearch.qml +++ b/dots/.config/quickshell/ii/services/LauncherSearch.qml @@ -109,7 +109,7 @@ Singleton { { action: "wallpaper", execute: () => { - Hyprland.dispatch("global quickshell:wallpaperSelectorToggle") + Hyprland.dispatch(`hl.dsp.global("quickshell:wallpaperSelectorToggle")`) } }, { diff --git a/dots/.config/quickshell/ii/services/hyprlandAntiFlashbangShader/anti-flashbang.glsl b/dots/.config/quickshell/ii/services/hyprlandAntiFlashbangShader/anti-flashbang.glsl index 32e6ad2ed..5828185bb 100644 --- a/dots/.config/quickshell/ii/services/hyprlandAntiFlashbangShader/anti-flashbang.glsl +++ b/dots/.config/quickshell/ii/services/hyprlandAntiFlashbangShader/anti-flashbang.glsl @@ -12,8 +12,8 @@ float overlayOpacityForBrightness(float x) { // float y = pow(x, 2.0) * 0.75; // float y = (1.0 - exp(-x))*1.15; // float y = (1.0 - exp(-pow((x-0.15), 0.6)))*1.18; - float y = x*0.75; + float y = x*0.75; return min(max(y, 0.001), 1.0); }