kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

search: use qs' execdetached instead of executor proc

Browse Source
This commit is contained in:
end-4
2025-07-12 19:25:08 +07:00
parent c0a3a0d7d2
commit f6bb5385cf
1 changed files with 73 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/quickshell/ii/modules/overview/SearchWidget.qml
+73 -98
View File
@@ -4,14 +4,11 @@ import "root:/modules/common"
import "root:/modules/common/widgets"
import "root:/modules/common/functions/string_utils.js" as StringUtils
import Qt5Compat.GraphicalEffects
import Qt.labs.platform
import QtQuick
import QtQuick.Controls
import QtQuick.Effects
import QtQuick.Layouts
import Quickshell
import Quickshell.Io
import Quickshell.Hyprland
Item { // Wrapper
id: root
@@ -29,9 +26,9 @@ Item { // Wrapper
}
function cancelSearch() {
searchInput.selectAll()
root.searchingText = ""
searchWidthBehavior.enabled = true;
searchInput.selectAll();
root.searchingText = "";
searchWidthBehavior.enabled = true;
}
function setSearchingText(text) {
@@ -43,45 +40,44 @@ Item { // Wrapper
{
action: "dark",
execute: () => {
executor.executeCommand(`${Directories.wallpaperSwitchScriptPath} --mode dark --noswitch`)
Quickshell.execDetached([Directories.wallpaperSwitchScriptPath, "--mode", "dark", "--noswitch"]);
}
},
{
action: "light",
execute: () => {
executor.executeCommand(`${Directories.wallpaperSwitchScriptPath} --mode light --noswitch`)
Quickshell.execDetached([Directories.wallpaperSwitchScriptPath, "--mode", "light", "--noswitch"]);
}
},
{
action: "wall",
action: "wall",
execute: () => {
executor.executeCommand(Directories.wallpaperSwitchScriptPath)
Quickshell.execDetached([Directories.wallpaperSwitchScriptPath]);
}
},
{
action: "konachanwall",
action: "konachanwall",
execute: () => {
Quickshell.execDetached([Quickshell.configPath("scripts/colors/random_konachan_wall.sh")])
Quickshell.execDetached([Quickshell.configPath("scripts/colors/random_konachan_wall.sh")]);
}
},
{
action: "accentcolor",
execute: (args) => {
executor.executeCommand(
`${Directories.wallpaperSwitchScriptPath} --noswitch --color ${args != '' ? ("'"+args+"'") : ""}`
)
execute: args => {
Quickshell.execDetached([Directories.wallpaperSwitchScriptPath, "--noswitch", "--color", ...(args != '' ? [`${args}`] : [])]);
}
},
{
action: "todo",
execute: (args) => {
Todo.addTask(args)
execute: args => {
Todo.addTask(args);
}
},
]
function focusFirstItemIfNeeded() {
if (searchInput.focus) appResults.currentIndex = 0; // Focus the first item
if (searchInput.focus)
appResults.currentIndex = 0; // Focus the first item
}
Timer {
@@ -96,32 +92,22 @@ Item { // Wrapper
id: mathProcess
property list<string> baseCommand: ["qalc", "-t"]
function calculateExpression(expression) {
mathProcess.running = false
mathProcess.command = baseCommand.concat(expression)
mathProcess.running = true
mathProcess.running = false;
mathProcess.command = baseCommand.concat(expression);
mathProcess.running = true;
}
stdout: SplitParser {
onRead: data => {
root.mathResult = data
root.focusFirstItemIfNeeded()
root.mathResult = data;
root.focusFirstItemIfNeeded();
}
}
}
Process {
id: executor
property list<string> baseCommand: ["bash", "-c"]
function executeCommand(command) {
executor.command = baseCommand.concat(
`${command}`
)
executor.startDetached()
}
}
Keys.onPressed: (event) => {
Keys.onPressed: event => {
// Prevent Esc and Backspace from registering
if (event.key === Qt.Key_Escape) return;
if (event.key === Qt.Key_Escape)
return;
// Handle Backspace: focus and delete character if not focused
if (event.key === Qt.Key_Backspace) {
@@ -142,8 +128,7 @@ Item { // Wrapper
} else {
// Delete character before cursor if any
if (searchInput.cursorPosition > 0) {
searchInput.text = searchInput.text.slice(0, searchInput.cursorPosition - 1) +
searchInput.text.slice(searchInput.cursorPosition);
searchInput.text = searchInput.text.slice(0, searchInput.cursorPosition - 1) + searchInput.text.slice(searchInput.cursorPosition);
searchInput.cursorPosition -= 1;
}
}
@@ -156,19 +141,12 @@ Item { // Wrapper
}
// Only handle visible printable characters (ignore control chars, arrows, etc.)
if (
event.text &&
event.text.length === 1 &&
event.key !== Qt.Key_Enter &&
event.key !== Qt.Key_Return &&
event.text.charCodeAt(0) >= 0x20 // ignore control chars like Backspace, Tab, etc.
) {
if (event.text && event.text.length === 1 && event.key !== Qt.Key_Enter && event.key !== Qt.Key_Return && event.text.charCodeAt(0) >= 0x20) // ignore control chars like Backspace, Tab, etc.
{
if (!searchInput.activeFocus) {
searchInput.forceActiveFocus();
// Insert the character at the cursor position
searchInput.text = searchInput.text.slice(0, searchInput.cursorPosition) +
event.text +
searchInput.text.slice(searchInput.cursorPosition);
searchInput.text = searchInput.text.slice(0, searchInput.cursorPosition) + event.text + searchInput.text.slice(searchInput.cursorPosition);
searchInput.cursorPosition += 1;
event.accepted = true;
}
@@ -264,7 +242,8 @@ Item { // Wrapper
}
}
Rectangle { // Separator
Rectangle {
// Separator
visible: root.showResults
Layout.fillWidth: true
height: 1
@@ -281,10 +260,11 @@ Item { // Wrapper
bottomMargin: 10
spacing: 2
KeyNavigation.up: searchBar
highlightMoveDuration : 100
highlightMoveDuration: 100
onFocusChanged: {
if(focus) appResults.currentIndex = 1;
if (focus)
appResults.currentIndex = 1;
}
Connections {
@@ -297,12 +277,15 @@ Item { // Wrapper
model: ScriptModel {
id: model
values: { // Search results are handled here
values: {
// Search results are handled here
////////////////// Skip? //////////////////
if(root.searchingText == "") return [];
if (root.searchingText == "")
return [];
///////////// Special cases ///////////////
if (root.searchingText.startsWith(Config.options.search.prefix.clipboard)) { // Clipboard
if (root.searchingText.startsWith(Config.options.search.prefix.clipboard)) {
// Clipboard
const searchString = root.searchingText.slice(Config.options.search.prefix.clipboard.length);
return Cliphist.fuzzyQuery(searchString).map(entry => {
return {
@@ -311,14 +294,13 @@ Item { // Wrapper
clickActionName: "",
type: `#${entry.match(/^\s*(\S+)/)?.[1] || ""}`,
execute: () => {
Quickshell.execDetached(
["bash", "-c", `echo '${StringUtils.shellSingleQuoteEscape(entry)}' | cliphist decode | wl-copy`]
);
Quickshell.execDetached(["bash", "-c", `echo '${StringUtils.shellSingleQuoteEscape(entry)}' | cliphist decode | wl-copy`]);
}
};
}).filter(Boolean);
}
if (root.searchingText.startsWith(Config.options.search.prefix.emojis)) { // Clipboard
}
if (root.searchingText.startsWith(Config.options.search.prefix.emojis)) {
// Clipboard
const searchString = root.searchingText.slice(Config.options.search.prefix.emojis.length);
return Emojis.fuzzyQuery(searchString).map(entry => {
return {
@@ -328,12 +310,11 @@ Item { // Wrapper
clickActionName: "",
type: "Emoji",
execute: () => {
Quickshell.clipboardText = entry.match(/^\s*(\S+)/)?.[1]
Quickshell.clipboardText = entry.match(/^\s*(\S+)/)?.[1];
}
};
}).filter(Boolean);
}
}
////////////////// Init ///////////////////
nonAppResultsTimer.restart();
@@ -346,7 +327,7 @@ Item { // Wrapper
execute: () => {
Quickshell.clipboardText = root.mathResult;
}
}
};
const commandResultObject = {
name: searchingText.replace("file://", ""),
clickActionName: qsTr("Run"),
@@ -354,38 +335,34 @@ Item { // Wrapper
fontType: "monospace",
materialSymbol: 'terminal',
execute: () => {
executor.executeCommand(searchingText.startsWith('sudo') ? `${Config.options.apps.terminal} fish -C '${root.searchingText.replace("file://", "")}'` : root.searchingText.replace("file://", ""));
const cleanedCommand = root.searchingText.replace("file://", "");
Quickshell.execDetached(["bash", "-c", searchingText.startsWith('sudo') ? `${Config.options.apps.terminal} fish -C '${cleanedCommand}'` : cleanedCommand]);
}
}
const launcherActionObjects = root.searchActions
.map(action => {
const actionString = `${Config.options.search.prefix.action}${action.action}`;
if (actionString.startsWith(root.searchingText) || root.searchingText.startsWith(actionString)) {
return {
name: root.searchingText.startsWith(actionString) ? root.searchingText : actionString,
clickActionName: qsTr("Run"),
type: qsTr("Action"),
materialSymbol: 'settings_suggest',
execute: () => {
action.execute(root.searchingText.split(" ").slice(1).join(" "))
},
};
}
return null;
})
.filter(Boolean);
};
const launcherActionObjects = root.searchActions.map(action => {
const actionString = `${Config.options.search.prefix.action}${action.action}`;
if (actionString.startsWith(root.searchingText) || root.searchingText.startsWith(actionString)) {
return {
name: root.searchingText.startsWith(actionString) ? root.searchingText : actionString,
clickActionName: qsTr("Run"),
type: qsTr("Action"),
materialSymbol: 'settings_suggest',
execute: () => {
action.execute(root.searchingText.split(" ").slice(1).join(" "));
}
};
}
return null;
}).filter(Boolean);
let result = [];
//////////////// Apps //////////////////
result = result.concat(
AppSearch.fuzzyQuery(root.searchingText)
.map((entry) => {
entry.clickActionName = qsTr("Launch");
entry.type = qsTr("App");
return entry;
})
);
result = result.concat(AppSearch.fuzzyQuery(root.searchingText).map(entry => {
entry.clickActionName = qsTr("Launch");
entry.type = qsTr("App");
return entry;
}));
////////// Launcher actions ////////////
result = result.concat(launcherActionObjects);
@@ -407,7 +384,7 @@ Item { // Wrapper
type: qsTr("Search the web"),
materialSymbol: 'travel_explore',
execute: () => {
let url = Config.options.search.engineBaseUrl + root.searchingText
let url = Config.options.search.engineBaseUrl + root.searchingText;
for (let site of Config.options.search.excludedSites) {
url += ` -site:${site}`;
}
@@ -419,17 +396,15 @@ Item { // Wrapper
}
}
delegate: SearchItem { // The selectable item for each search result
delegate: SearchItem {
// The selectable item for each search result
required property var modelData
anchors.left: parent?.left
anchors.right: parent?.right
entry: modelData
query: root.searchingText.startsWith(Config.options.search.prefix.clipboard) ?
root.searchingText.slice(Config.options.search.prefix.clipboard.length) :
root.searchingText;
query: root.searchingText.startsWith(Config.options.search.prefix.clipboard) ? root.searchingText.slice(Config.options.search.prefix.clipboard.length) : root.searchingText
}
}
}
}
}
}