flea-qml 0.1.0 → 0.2.0

package/ui/TabBar.qml

@@ -128,7 +128,7 @@ Item {
 
     // A lift captures the tab payload before the pane can change.
     function tabLiftBegan(index) {
-        if (!Tabs.canLift(root.pane)) {
+        if (!Tabs.canLift(root.pane) || (root.tabs && root.tabs.items[index]?.terminalId)) {
             root.dragFrom = -1
             root.dropAt = -1
             return
@@ -397,7 +397,7 @@ Item {
                 readonly property bool current: root.currentIndex === tab.index
                 readonly property Item focusFrame: tabFrame
                 // Every input named, so the label re-reads when a tab opens or the pane navigates.
-                readonly property string title: Tabs.label(
+                readonly property string title: (root.tabs && root.tabs.items[tab.index]?.terminalId ? "Terminal · " : "") + Tabs.label(
                     Tabs.pathAt(root.tabs, root.currentIndex, tab.index, root.path),
                     pane ? pane.home : "")
 
@@ -412,7 +412,7 @@ Item {
                 Flea.DropInto {
                     anchors.fill: parent
                     pane: root.pane
-                    enabled: DragOut.searchTabEnabled(root.pane ? root.pane.searchMode : "", tab.current)
+                    enabled: !(root.tabs && root.tabs.items[tab.index]?.terminalId) && DragOut.searchTabEnabled(root.pane ? root.pane.searchMode : "", tab.current)
                     switchesOnHover: true
                     refuseLoading: DragOut.refuseLoading(root.pane && root.pane.listInFlight, true, tab.current)
                     // The pane's drop path, not its drawn one: a tab selected by the hover switch is

package/ui/TerminalService.qml

@@ -0,0 +1,69 @@
+pragma Singleton
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+// All terminal views share this one server; each has its own reconnect token/PTY.
+QtObject {
+    id: root
+    property var tabs: ({})
+    property int serial: 0
+    property bool ready: false
+    property bool stopping: false
+    function acquire(path) {
+        var id = "terminal-" + (++serial)
+        var next = Object.assign({}, tabs)
+        next[id] = { path: path, url: "", error: "" }
+        tabs = next
+        if (!server.running && !stopping) server.running = true
+        if (ready) server.write(JSON.stringify({id:id,path:path}) + "\n")
+        return id
+    }
+    function release(id) {
+        var next = Object.assign({}, tabs)
+        delete next[id]
+        tabs = next
+        if (Object.keys(next).length === 0) {
+            ready = false
+            if (server.running && !stopping) {
+                stopping = true
+                server.write(JSON.stringify({shutdown:true}) + "\n")
+            }
+        } else if (ready) server.write(JSON.stringify({id:id,close:true}) + "\n")
+    }
+    function fail(message) {
+        ready = false
+        var next = {}
+        for (var id in tabs) next[id] = { path: tabs[id].path, url: "", error: message }
+        tabs = next
+    }
+    property var process: Process {
+        id: server
+        stdinEnabled: true
+        command: [Quickshell.env("BUNINU_BUN") || "bun", Quickshell.shellDir + "/../../src/terminal-server.js"]
+        stdout: SplitParser {
+            onRead: function(line) {
+                try {
+                    var result = JSON.parse(line)
+                    if (result.ready) {
+                        if (root.stopping) return
+                        root.ready = true
+                        for (var id in root.tabs) if (!root.tabs[id].error) server.write(JSON.stringify({id:id,path:root.tabs[id].path}) + "\n")
+                    } else if (result.id && root.tabs[result.id]) {
+                        var next = Object.assign({}, root.tabs)
+                        next[result.id] = { path: next[result.id].path, url: result.url || "", error: result.error || "" }
+                        root.tabs = next
+                    } else if (!result.id && result.error) root.fail(result.error)
+                } catch(e) { root.fail("Invalid terminal server response.") }
+            }
+        }
+        onExited: {
+            if (root.stopping) {
+                root.stopping = false
+                root.ready = false
+                // A tab opened during shutdown waits for the old listener to exit.
+                if (Object.keys(root.tabs).length) Qt.callLater(function() { server.running = true })
+            } else root.fail("Terminal server exited.")
+        }
+    }
+}

package/ui/TerminalTab.qml

@@ -0,0 +1,48 @@
+import QtQuick
+import QtWebEngine
+import Quickshell
+import "." as Flea
+import Quickshell.Io
+import qs.Commons
+
+// Kept alive while another tab is selected; destroyed only when this tab closes.
+Item {
+    id: root
+    property string directory: ""
+    property string sessionId: ""
+    readonly property var session: Flea.TerminalService.tabs[sessionId] || ({})
+    readonly property string address: session.url || ""
+    readonly property string status: session.error || "Starting terminal…"
+    property bool selected: false
+    function focusTerminal() {
+        if (selected && address.length) Qt.callLater(function() {
+            if (root.selected && root.address.length) web.forceActiveFocus()
+        })
+    }
+    onSelectedChanged: focusTerminal()
+    onAddressChanged: focusTerminal()
+    visible: selected
+    anchors.fill: parent
+    Rectangle { anchors.fill: parent; color: Theme.color.background }
+    WebEngineView {
+        id: web
+        anchors.fill: parent
+        visible: root.address.length > 0
+        url: root.address
+        backgroundColor: Theme.color.background
+        settings.javascriptEnabled: true
+        onLoadingChanged: function(info) { if(info.errorCode) console.warn("Terminal WebEngineView:", info.errorString) }
+    }
+    Text {
+        anchors.centerIn: parent
+        width: Math.max(0, parent.width - 32)
+        horizontalAlignment: Text.AlignHCenter
+        wrapMode: Text.Wrap
+        textFormat: Text.PlainText
+        color: Theme.color.foreground
+        font.family: Theme.font.family
+        font.pixelSize: Theme.font.body
+        visible: root.address.length === 0
+        text: root.status
+    }
+}

package/ui/TerminalTabs.qml

@@ -0,0 +1,27 @@
+import QtQuick
+import "." as Flea
+
+// Dynamic objects preserve each iframe/PTY when tab order or selection changes.
+Item {
+    id: root
+    property var pane: null
+    property var sessions: ({})
+    function open(directory) {
+        var component = Qt.createComponent("TerminalTab.qml")
+        if (component.status !== Component.Ready) {
+            pane.message(component.errorString(), true)
+            return ""
+        }
+        var key = Flea.TerminalService.acquire(directory)
+        var item = component.createObject(root, { directory: directory, sessionId: key })
+        if (!item) { Flea.TerminalService.release(key); pane.message("Could not create the terminal view.", true); return "" }
+        item.selected = Qt.binding(function() { return root.pane.terminalId === key })
+        sessions[key] = item
+        return key
+    }
+    Component.onDestruction: { for (var key in sessions) Flea.TerminalService.release(key) }
+    function close(key) {
+        var item = sessions[key]
+        if (item) { Flea.TerminalService.release(key); delete sessions[key]; item.destroy() }
+    }
+}

package/ui/WindowBody.qml

@@ -342,6 +342,7 @@ Rectangle {
             view.openArchiveCards().askCompressPassword(primaryPane, paths, menuId)
         }
         onExtractPasswordRequested: function (path, dest, err) { view.openArchiveCards().openExtractPassword({ path: path, dest: dest }, primaryPane, err) }
+        onExtractHereRequested: function(path, entries) { view.openArchiveCards().askExtractHere(primaryPane, path, entries) }
         onPermissionsRequested: function (path) { permissionsDialog.open(path, primaryPane) }
         // Permissions040: the whole selection's paths for the multi-row card.
         onPermissionsBatchRequested: function (paths) { permissionsDialog.openMany(paths, primaryPane) }
@@ -405,6 +406,7 @@ Rectangle {
                     view.openArchiveCards().askCompressPassword(otherPane, paths, menuId)
                 }
                 onExtractPasswordRequested: function (path, dest, err) { view.openArchiveCards().openExtractPassword({ path: path, dest: dest }, otherPane, err) }
+                onExtractHereRequested: function(path, entries) { view.openArchiveCards().askExtractHere(otherPane, path, entries) }
                 onPermissionsRequested: function(path) { permissionsDialog.open(path, otherPane) }
                 onPermissionsBatchRequested: function (paths) { permissionsDialog.openMany(paths, otherPane) }
                 onBulkRenameRequested: function (paths) { view.openBulkRename(paths, otherPane) }

package/ui/boot/shell.qml

@@ -45,7 +45,16 @@ ShellRoot {
 
         // This directory cannot reach ui/js/Format.js through qs:, so its one call is written out.
         function fileUrl(path) {
-            return "file://" + encodeURI(path).replace(/#/g, "%23").replace(/\?/g, "%3F")
+            path = String(path)
+            // Only Windows paths use backslashes as separators; POSIX filenames may contain them.
+            var drive = /^[A-Za-z]:[\\/]/.test(path)
+            var unc = /^\\\\[^\\]/.test(path)
+            if (drive || unc) path = path.replace(/\\/g, "/")
+            var parts = path.split("/")
+            for (var i = 0; i < parts.length; i++) {
+                if (!(drive && i === 0)) parts[i] = encodeURIComponent(parts[i])
+            }
+            return (drive ? "file:///" : path.indexOf("//") === 0 ? "file:" : "file://") + parts.join("/")
         }
 
         // Before the first frame, so the window maps holding its chrome; see AGENTS.md "The first window".

package/ui/js/Archive.js

@@ -8,7 +8,7 @@
 var SEVEN_TAILS = [".appimage", ".cpio", ".cab", ".jar", ".apk", ".rpm", ".deb", ".iso"]
 
 // Longest form first, so ".tar.gz" matches before ".gz"; .rar is read here and never offered to write (src/backend/archive.rs).
-var EXTENSIONS = [".tar.zst", ".tar.bz2", ".tar.gz", ".tar.xz", ".tgz", ".tar", ".zip", ".7z", ".rar"].concat(SEVEN_TAILS)
+var EXTENSIONS = [".tar.zst", ".tar.bz2", ".tar.gz", ".tar.xz", ".tgz", ".tzst", ".tar", ".zip", ".7z", ".rar"].concat(SEVEN_TAILS)
 
 // A disk image lists in the archive preview and is never extracted.
 var LIST_ONLY = [".iso"]

package/ui/js/Drag.js

@@ -217,11 +217,7 @@ function isOwnDrag(payload) {
 // A path as a file:// URI. Each component is encoded on its own: encodeURIComponent would escape the
 // separators too, and encodeURI would leave a "#" or a "?" in a filename unescaped.
 function uriFor(path) {
-    var parts = path.split("/")
-    for (var i = 0; i < parts.length; i++) {
-        parts[i] = encodeURIComponent(parts[i])
-    }
-    return "file://" + parts.join("/")
+    return Format.fileUri(path)
 }
 
 // What the drag puts on the wire: the marker naming this drag as Flea's own, which the backend

package/ui/js/Focus.js

@@ -368,6 +368,8 @@ function sequenceAction(action, root) {
 
 // Lifted whole from Pane.qml's Keys.onPressed, which had grown past its file's 400-line cap; returns whether the key was consumed.
 function handleKey(event, root, sidebar, field) {
+    // Embedded terminals own ordinary keys; never turn shell typing into file operations.
+    if (root.terminalId && !field && !(sidebar && sidebar.activeFocus)) return false
     if (root.selectionBand) {
         if (event.key === Qt.Key_Escape)
             root.selectionBand.cancel()

package/ui/js/Format.js

@@ -94,7 +94,16 @@ function isExecutable(mode) {
 // Shared by Row.qml's iconSource and PreviewMedia.qml's player source: encodeURI leaves # and ?
 // literal, which Qt then reads as a URL fragment or query rather than path bytes.
 function fileUri(path) {
-    return "file://" + encodeURI(path).replace(/#/g, "%23").replace(/\?/g, "%3F")
+    path = String(path)
+    // Only Windows paths use backslashes as separators; POSIX filenames may contain them.
+    var drive = /^[A-Za-z]:[\\/]/.test(path)
+    var unc = /^\\\\[^\\]/.test(path)
+    if (drive || unc) path = path.replace(/\\/g, "/")
+    var parts = path.split("/")
+    for (var i = 0; i < parts.length; i++) {
+        if (!(drive && i === 0)) parts[i] = encodeURIComponent(parts[i])
+    }
+    return (drive ? "file:///" : path.indexOf("//") === 0 ? "file:" : "file://") + parts.join("/")
 }
 
 // "3:05", or "1:03:05" once an hour is on the clock; mm/ss are always two digits, matching a media player's own clock rather than Format.date's prose.

package/ui/js/Keymap.js

@@ -31,8 +31,8 @@ var PRESET_KEYS = [
     {"mods":"ctrl","key":"N","keys":"ctrl-n","action":"windowNew","label":"New window","frontend":"gui","context":"listing,rail","preset":"default","code":"Key_N","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_N,"mask":(Qt.ControlModifier)},
     {"mods":"ctrl","key":"N","keys":"ctrl-n","action":"windowNew","label":"New window","frontend":"gui","context":"listing,rail","preset":"vim","code":"Key_N","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_N,"mask":(Qt.ControlModifier)},
     {"mods":"ctrl","key":"N","keys":"ctrl-n","action":"windowNew","label":"New window","frontend":"gui","context":"listing,rail","preset":"windows","code":"Key_N","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_N,"mask":(Qt.ControlModifier)},
-    {"mods":"ctrl","key":"T","keys":"ctrl-t","action":"tabNew","label":"New tab","frontend":"all","context":"listing,rail","preset":"mac","code":"Key_T","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_T,"mask":(Qt.ControlModifier)},
-    {"mods":"ctrl","key":"T","keys":"ctrl-t","action":"tabNew","label":"New tab","frontend":"all","context":"listing,rail","preset":"windows","code":"Key_T","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_T,"mask":(Qt.ControlModifier)},
+    {"mods":"ctrl","key":"T","keys":"ctrl-t","action":"openTerminal","label":"Open terminal","frontend":"all","context":"listing,rail","preset":"mac","code":"Key_T","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_T,"mask":(Qt.ControlModifier)},
+    {"mods":"ctrl","key":"T","keys":"ctrl-t","action":"openTerminal","label":"Open terminal","frontend":"all","context":"listing,rail","preset":"windows","code":"Key_T","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_T,"mask":(Qt.ControlModifier)},
     {"mods":"shift","key":"Delete","keys":"shift-delete","action":"deletePermanently","label":"Delete permanently","frontend":"all","context":"listing","preset":"all","code":"Key_Delete","text":"","ctrl":false,"shift":true,"alt":false,"super":false,"keycode":Qt.Key_Delete,"mask":(Qt.ShiftModifier)},
     {"mods":"alt","key":"P","keys":"alt-p","action":"togglePreview","label":"Preview column","frontend":"all","context":"listing","preset":"all","code":"Key_P","text":"","ctrl":false,"shift":false,"alt":true,"super":false,"keycode":Qt.Key_P,"mask":(Qt.AltModifier)},
     {"mods":"ctrl","key":"Space","keys":"ctrl-space","action":"loadPreview","label":"Preview","frontend":"all","context":"listing","preset":"all","code":"Key_Space","text":"","ctrl":true,"shift":false,"alt":false,"super":false,"keycode":Qt.Key_Space,"mask":(Qt.ControlModifier)},

package/ui/js/Messages.js

@@ -112,7 +112,7 @@ function route(root, message) {
         root.fontLooked(message)
     } else if (message.t === "meta") {
         root.metaResult(message)
-        root.meta(message.row, message.w, message.h, message.orient || 1, message.ms, message.rate, message.entries, message.unpacked, message.afailed, message.names, message.lines, message.partial, message.lfailed === true, message.target, message.targetdir, message.owner || "")
+        root.meta(message.row, message.w, message.h, message.orient || 1, message.ms, message.rate, message.entries, message.unpacked, message.afailed, message.names, message.lines, message.partial, message.lfailed === true, message.target, message.targetdir, message.owner || "", typeof message.topEntries === "number" ? message.topEntries : -1)
     } else if (message.t === "code") {
         root.codeResult(message)
     } else if (message.t === "html") {

package/ui/js/Nav.js

@@ -246,7 +246,7 @@ function openCursor(pane, opener) {
     opener.open(path)
 }
 
-// The run card's entrances always reach the opener, so Run asks through flea --open like Enter does.
+// The run card's open action uses the same xdg-open route as Enter.
 function runCursor(pane, opener, verb) {
     var row = openableRow(pane)
     if (!row) return

package/ui/js/Tabs.js

@@ -42,6 +42,7 @@ function snapshot(pane, path, identity, dropped) {
     var elsewhere = where !== pane.path || Search.live(pane) || dropped === true
     return {
         tabIdentity: identity || ++nextTabIdentity,
+        terminalId: pane.terminalId || "",
         path: where,
         history: pane.history.slice(),
         forwardHistory: (pane.forwardHistory || []).slice(),
@@ -180,6 +181,7 @@ function restoreSelection(pane, selected, follows) {
 }
 
 function apply(pane, item, dropped, cursor) {
+    pane.terminalId = item.terminalId || ""
     // Issue 93: rows from a search dropped onto its scope, or a listing still out, are not the rows this tab left.
     var same = pane.path === item.path && pane.showHidden === item.showHidden && dropped !== true && cursor === undefined && !pane.listInFlight
     if (pane.tabs) pane.tabs.pendingCursorName = cursor === undefined ? null : cursor
@@ -305,6 +307,7 @@ function openNew(pane, where) {
     var items = currentItems(pane, here)
     var index = currentIndex(pane)
     items[index] = snapshot(pane, here, items[index].tabIdentity, dropped)
+    pane.terminalId = ""
     items.push(snapshot(pane, target, undefined, dropped))
     pane.tabs = pack(items, items.length - 1)
     dropCount(pane)
@@ -315,6 +318,17 @@ function openNew(pane, where) {
 
 // Ctrl+Return on the cursor row, the keyboard twin of Tap.tappedTab's middle
 // click: that directory in a new tab, leaving the cursor and selection alone.
+function openTerminal(pane, path) {
+    if (count(pane) >= MAX) { sayCount(pane, "Nine tabs is the most."); return }
+    var id = pane.terminalHost.open(path)
+    if (!id) return
+    openNew(pane, path)
+    pane.terminalId = id
+    var items = pane.tabs.items.slice()
+    items[pane.tabs.index].terminalId = id
+    pane.tabs = pack(items, pane.tabs.index, pane.tabs)
+}
+
 function openCursorTab(pane) {
     var row = pane.rowFor ? pane.rowFor(pane.cursorIndex) : null
     if (!row || !row.d || typeof row.n !== "string") {
@@ -353,6 +367,7 @@ function closeAt(pane, i) {
         return
     }
     var index = currentIndex(pane)
+    if (items[i].terminalId && pane.terminalHost) pane.terminalHost.close(items[i].terminalId)
     items.splice(i, 1)
     var next = index
     if (i < index)

package/ui/js/Tap.js

@@ -7,9 +7,15 @@
 // (ui/js/Focus.js leavesLine): the filter keeps its query standing and gives up its caret, and a Find
 // line hands the keys to the results without running. Otherwise the next Space or letter is typed
 // into the line the pointer has just left.
+function focusListing(root) {
+    if (root.renameEditor && root.renameEditor()) return
+    root.focusView = "list"
+    if (root.listArea) root.listArea.forceActiveFocus()
+}
 function releaseLines(root) {
     if (root.filterTyping) Filter.commit(root)
     if (root.searchMode === Search.TYPING) root.searchMode = Search.RESULTS
+    focusListing(root)
 }
 
 // Hit the drawn label instead of the whole name slot, including centered grid captions.

package/ui/js/Trash.js

@@ -70,7 +70,10 @@ function confirmTitle(snapshot) {
 
 function confirmBody(snapshot, scope) {
     if (!filled(snapshot)) return ""
-    return snapshot.all ? Ops.deleteAllLine(snapshot.count, Format.size(snapshot.bytes || 0)) : Ops.deleteScopeLine(scope, snapshot.count)
+    var body = snapshot.all ? Ops.deleteAllLine(snapshot.count, Format.size(snapshot.bytes || 0)) : Ops.deleteScopeLine(scope, snapshot.count)
+    if (snapshot.count === 1 && typeof snapshot.name === "string" && snapshot.name.length > 0)
+        body = "“" + snapshot.name + "”\n\n" + body
+    return body
 }
 
 // Where m opens: the cursor row's menu when no row is marked or the only mark is the cursor row, the marked rows' menu otherwise, the whole-Trash menu when nothing is listed.

package/ui/qmldir

@@ -226,3 +226,5 @@ PickerLifecycle 1.0 PickerLifecycle.qml
 ArchiveCompressDialog 1.0 ArchiveCompressDialog.qml
 ArchivePasswordDialog 1.0 ArchivePasswordDialog.qml
 ArchiveCards 1.0 ArchiveCards.qml
+
+singleton TerminalService 1.0 TerminalService.qml