leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: leyoda:6b5a7ee8c8d1ef55055466530ec76ef7b5e04b75
Branches Tags
leyoda:local/yoda-main
leyoda:post-1.10-merge-20261011
leyoda:pre-1.10-merge-20261011
leyoda:post-1.9-merge-20260924
leyoda:pre-1.9-merge-20260924
leyoda:post-1.8-merge-20260910
leyoda:pre-1.8-merge-20260910
leyoda:post-1.7-merge-20260827
leyoda:pre-1.7-merge-20260827
leyoda:post-1.6-merge-20260819
leyoda:pre-1.6-merge-20260819
..
compare: leyoda:24fb50083e9f11d4c1ca3a63f959b2a37506bd73
Branches Tags
leyoda:local/yoda-main
leyoda:post-1.10-merge-20261011
leyoda:pre-1.10-merge-20261011
leyoda:post-1.9-merge-20260924
leyoda:pre-1.9-merge-20260924
leyoda:post-1.8-merge-20260910
leyoda:pre-1.8-merge-20260910
leyoda:post-1.7-merge-20260827
leyoda:pre-1.7-merge-20260827
leyoda:post-1.6-merge-20260819
leyoda:pre-1.6-merge-20260819

No commits in common. "6b5a7ee8c8d1ef55055466530ec76ef7b5e04b75" and "24fb50083e9f11d4c1ca3a63f959b2a37506bd73" have entirely different histories.
6b5a7ee8c8 ... 24fb50083e

39 changed files with 1708 additions and 2057 deletions
Download patch file Download diff file Expand all files Collapse all files

40
.github/workflows/rust-checks.yml vendored
View file

@ -24,43 +24,3 @@ jobs:
- name: Check formatting - name: Check formatting
run: cargo fmt --all -- --check run: cargo fmt --all -- --check
clippy:
name: Clippy
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y pkg-config libxkbcommon-dev libfontconfig1-dev libfreetype6-dev libglvnd-dev libinput-dev libvulkan-dev libwayland-dev libx11-dev libxcursor-dev libxi-dev libxrandr-dev libasound2-dev libdbus-1-dev
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- name: Run Clippy
run: cargo clippy --all-targets --all-features -- -D warnings
test:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y pkg-config libxkbcommon-dev libfontconfig1-dev libfreetype6-dev libglvnd-dev libinput-dev libvulkan-dev libwayland-dev libx11-dev libxcursor-dev libxi-dev libxrandr-dev libasound2-dev libdbus-1-dev
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- name: Run Tests
run: cargo test --all-targets --all-features

1919
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

50
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "cosmic-term" name = "cosmic-term"
version = "1.0.13" version = "1.0.8"
authors = ["Jeremy Soller <jeremy@system76.com>"] authors = ["Jeremy Soller <jeremy@system76.com>"]
edition = "2024" edition = "2024"
license = "GPL-3.0-only" license = "GPL-3.0-only"
@ -36,20 +36,18 @@ thiserror = { version = "2.0", optional = true }
secstr = { version = "0.5", optional = true } secstr = { version = "0.5", optional = true }
[dependencies.cosmic-files] [dependencies.cosmic-files]
path = "../cosmic-files" git = "https://github.com/pop-os/cosmic-files.git"
default-features = false default-features = false
[dependencies.cosmic-text] [dependencies.cosmic-text]
git = "https://forge.aditua.com/leyoda/cosmic-text.git" git = "https://github.com/pop-os/cosmic-text.git"
branch = "local/pr-503"
features = ["monospace_fallback", "shape-run-cache"] features = ["monospace_fallback", "shape-run-cache"]
[dependencies.cosmic] [dependencies.libcosmic]
package = "libcosmic-yoda" git = "https://github.com/pop-os/libcosmic.git"
path = "../libcosmic"
default-features = false default-features = false
#TODO: a11y feature crashes file chooser dialog #TODO: a11y feature crashes file chooser dialog
features = ["about", "autosize", "multi-window", "tokio", "winit", "surface-message"] features = ["about", "multi-window", "tokio", "winit", "surface-message"]
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
fork = "0.4" fork = "0.4"
@ -59,9 +57,9 @@ xdgen = "0.1"
[features] [features]
default = ["dbus-config", "wgpu", "wayland", "password_manager"] default = ["dbus-config", "wgpu", "wayland", "password_manager"]
dbus-config = ["cosmic/dbus-config"] dbus-config = ["libcosmic/dbus-config"]
wgpu = ["cosmic/wgpu", "cosmic-files/wgpu"] wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
wayland = ["cosmic/wayland", "cosmic-files/wayland"] wayland = ["libcosmic/wayland", "cosmic-files/wayland"]
password_manager = ["secret-service", "thiserror", "secstr"] password_manager = ["secret-service", "thiserror", "secstr"]
[profile.release-with-debug] [profile.release-with-debug]
@ -69,29 +67,7 @@ inherits = "release"
debug = true debug = true
[patch.'https://github.com/pop-os/libcosmic'] #[patch.'https://github.com/pop-os/libcosmic']
cosmic-config = { path = "../libcosmic/cosmic-config" } #libcosmic = { path = "../libcosmic" }
cosmic-theme = { path = "../libcosmic/cosmic-theme" } #cosmic-config = { path = "../libcosmic/cosmic-config" }
iced = { path = "../libcosmic/iced" } #cosmic-theme = { path = "../libcosmic/cosmic-theme" }
iced_accessibility = { path = "../libcosmic/iced/accessibility" }
iced_core = { path = "../libcosmic/iced/core" }
iced_futures = { path = "../libcosmic/iced/futures" }
iced_graphics = { path = "../libcosmic/iced/graphics" }
iced_renderer = { path = "../libcosmic/iced/renderer" }
iced_runtime = { path = "../libcosmic/iced/runtime" }
iced_tiny_skia = { path = "../libcosmic/iced/tiny_skia" }
iced_wgpu = { path = "../libcosmic/iced/wgpu" }
iced_widget = { path = "../libcosmic/iced/widget" }
iced_winit = { path = "../libcosmic/iced/winit" }
[patch.'https://github.com/pop-os/cosmic-protocols']
cosmic-protocols = { path = "../cosmic-protocols" }
cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
[patch.'https://github.com/pop-os/cosmic-text.git']
cosmic-text = { git = "https://forge.aditua.com/leyoda/cosmic-text.git", branch = "local/pr-503" }
[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
window_clipboard = { path = "../window_clipboard" }
dnd = { path = "../window_clipboard/dnd" }
mime = { path = "../window_clipboard/mime" }

24
debian/changelog vendored
View file

@ -1,27 +1,3 @@
cosmic-term (1.0.13) noble; urgency=medium
* Epoch 1.0.13 version update
-- Jeremy Soller <jeremy@system76.com> Tue, 12 May 2026 09:39:57 -0600
cosmic-term (1.0.12) noble; urgency=medium
* Epoch 1.0.12 version update
-- Jeremy Soller <jeremy@system76.com> Tue, 05 May 2026 10:25:04 -0600
cosmic-term (1.0.11) noble; urgency=medium
* Epoch 1.0.11 version update
-- Jeremy Soller <jeremy@system76.com> Tue, 14 Apr 2026 11:11:05 -0600
cosmic-term (1.0.9) noble; urgency=medium
* Epoch 1.0.9 version update
-- Jeremy Soller <jeremy@system76.com> Mon, 06 Apr 2026 15:10:35 -0600
cosmic-term (1.0.8) noble; urgency=medium cosmic-term (1.0.8) noble; urgency=medium
* Epoch 1.0.8 version update * Epoch 1.0.8 version update

6
i18n/ar/cosmic_term.ftl
View file

@ -30,7 +30,7 @@ tab-title-description = تجاوز عنوان اللسان المبدئي
add-profile = أضف ملف تعريف add-profile = أضف ملف تعريف
new-profile = ملف تعريف جديد new-profile = ملف تعريف جديد
make-default = اجعله المبدئي make-default = اجعله المبدئي
working-directory = المجلَّد الحالي working-directory = مجلد العمل
hold = التعليق hold = التعليق
remain-open = البقاء مفتوحًا بعد خروج العملية الفرعية. remain-open = البقاء مفتوحًا بعد خروج العملية الفرعية.
@ -138,12 +138,10 @@ shortcut-group-clipboard = الحافظة
shortcut-group-other = أخرى shortcut-group-other = أخرى
shortcut-group-tabs = ألسنة shortcut-group-tabs = ألسنة
shortcut-group-window = نافذة shortcut-group-window = نافذة
shortcut-group-zoom = تكبير shortcut-group-zoom = كبِّر
shortcut-replace-body = عُيِّن { $binding } بالفعل لـ { $existing }. أتريد استبداله بـ { $new_action }؟ shortcut-replace-body = عُيِّن { $binding } بالفعل لـ { $existing }. أتريد استبداله بـ { $new_action }؟
shortcut-replace-title = استبدل الاختصار؟ shortcut-replace-title = استبدل الاختصار؟
tab-activate = نشّط لسان { $number } tab-activate = نشّط لسان { $number }
toggle-fullscreen = بدّل ملء الشاشة toggle-fullscreen = بدّل ملء الشاشة
type-to-search = اكتب للبحث... type-to-search = اكتب للبحث...
copy-link = انسخ الرابط copy-link = انسخ الرابط
tab-new-inherit-working-directory = الألسنة الجديدة تستخدم المجلد الحالي
tab-new-inherit-working-directory-description = افتح ألسنة جديدة في مجلد العمل الخاص باللسان النشط

3
i18n/ca/cosmic_term.ftl
View file

@ -1,3 +0,0 @@
cancel = Cancel·lar
settings = Configuració
quit = Surt

6
i18n/cs/cosmic_term.ftl
View file

@ -41,7 +41,7 @@ default-font-stretch = Šířka písma
default-font-weight = Normální tloušťka písma default-font-weight = Normální tloušťka písma
default-dim-font-weight = Tenká tloušťka písma default-dim-font-weight = Tenká tloušťka písma
default-bold-font-weight = Tučná tloušťka písma default-bold-font-weight = Tučná tloušťka písma
use-bright-bold = Světlejší tučný text use-bright-bold = Zvýraznit tučný text
splits = Rozdělení splits = Rozdělení
focus-follow-mouse = Zaměření psaní sleduje myš focus-follow-mouse = Zaměření psaní sleduje myš
advanced = Pokročilé advanced = Pokročilé
@ -86,7 +86,7 @@ disable = Zakázat
keyboard-shortcuts = Klávesové zkratky keyboard-shortcuts = Klávesové zkratky
menu-keyboard-shortcuts = Klávesové zkratky... menu-keyboard-shortcuts = Klávesové zkratky...
no-shortcuts = Žádné zkratky no-shortcuts = Žádné zkratky
password-manager = Správce hesel password-manager = Manažer hesel
replace = Nahradit replace = Nahradit
reset-to-default = Obnovit výchozí reset-to-default = Obnovit výchozí
shortcut-group-clipboard = Schránka shortcut-group-clipboard = Schránka
@ -107,5 +107,3 @@ shortcut-replace-body = { $binding } je již přiřazena k „{ $existing }“.
shortcut-capture-hint = Stiskněte kombinaci kláves shortcut-capture-hint = Stiskněte kombinaci kláves
paste-primary = Vložit primární paste-primary = Vložit primární
copy-link = Kopírovat odkaz copy-link = Kopírovat odkaz
tab-new-inherit-working-directory = Nové karty používají aktuální adresář
tab-new-inherit-working-directory-description = Otevírat nové karty v pracovním adresáři aktivní karty

14
i18n/de/cosmic_term.ftl
View file

@ -28,7 +28,7 @@ new-profile = Neues Profil
make-default = Als Standard festlegen make-default = Als Standard festlegen
working-directory = Arbeitsverzeichnis working-directory = Arbeitsverzeichnis
hold = Halten hold = Halten
remain-open = Nach Beendigung des untergeordneten Prozesses geöffnet lassen. remain-open = Nach Beendigung des Kindprozesses offen bleiben.
## Einstellungen ## Einstellungen
@ -38,7 +38,7 @@ settings = Einstellungen
appearance = Aussehen appearance = Aussehen
theme = Thema theme = Thema
match-desktop = An Desktop anpassen match-desktop = An System anpassen
dark = Dunkel dark = Dunkel
light = Hell light = Hell
syntax-dark = Dunkles Farbschema syntax-dark = Dunkles Farbschema
@ -67,7 +67,7 @@ focus-follow-mouse = Tippfokus folgt Maus
advanced = Erweitert advanced = Erweitert
show-headerbar = Kopfzeile anzeigen show-headerbar = Kopfzeile anzeigen
show-header-description = Kopfzeile über das Rechtsklick-Menü aufzeigen show-header-description = Kopfzeile über das Rechtsklickmenü einblenden.
# Suchen # Suchen
find-placeholder = Suchen... find-placeholder = Suchen...
find-previous = Vorherigen suchen find-previous = Vorherigen suchen
@ -141,11 +141,3 @@ type-to-search = Zum Suchen tippen...
close-window = Fenster schließen close-window = Fenster schließen
copy-or-sigint = Kopieren oder SIGINT copy-or-sigint = Kopieren oder SIGINT
toggle-fullscreen = Vollbild umschalten toggle-fullscreen = Vollbild umschalten
shortcut-group-zoom = Zoom
comment = Terminalemulator für den COSMIC Desktop
paste-primary = Primär einfügen
add-another-keybinding = Weitere Tastenbelegung hinzufügen
shortcut-replace-body = { $binding } ist bereits { $existing } zugeordnet. Durch { $new_action } ersetzen?
keywords = Befehl;Shell;Terminal;CLI;
tab-new-inherit-working-directory = Neue Tabs verwenden das aktuelle Verzeichnis
tab-new-inherit-working-directory-description = Neue Tabs im Arbeitsverzeichnis des aktiven Tabs öffnen

107
i18n/el/cosmic_term.ftl
View file

@ -1,5 +1,5 @@
cosmic-terminal = Τερματικό COSMIC cosmic-terminal = Τερματικός COSMIC
new-terminal = Νέο τερματικό new-terminal = Νέος Τερματικός
# Context Pages # Context Pages
@ -14,7 +14,7 @@ rename = Μετονομασία
export = Εξαγωγή export = Εξαγωγή
delete = Διαγραφή delete = Διαγραφή
import = Εισαγωγή import = Εισαγωγή
import-errors = Σφάλματα εισαγωγής import-errors = Προβλήματα Εισαγωγής
## Profiles ## Profiles
@ -22,16 +22,16 @@ profiles = Προφίλ
name = Όνομα name = Όνομα
command-line = Γραμμή εντολών command-line = Γραμμή εντολών
tab-title = Τίτλος καρτέλας tab-title = Τίτλος καρτέλας
tab-title-description = Παράκαμψη του προεπιλεγμένου τίτλου καρτέλας tab-title-description = Μετονομασία του προεπιλεγμένου τίτλου καρτέλας
add-profile = Προσθήκη προφίλ add-profile = Προσθήκη προφίλ
new-profile = Νέο προφίλ new-profile = Νέο προφίλ
make-default = Ορισμός ως προεπιλογή make-default = Κάντο προεπιλογή
working-directory = Κατάλογος εργασίας working-directory = Τρέχων κατάλογος
## alt: Παύση ## alt: Παύση
hold = Διατήρηση hold = Κράτηση
remain-open = Παραμένει ανοικτό μετά την έξοδο από τη θυγατρική διεργασία. remain-open = Παραμένει ανοιχτό μετά την έξοδο της θυγατρικής διεργασίας
## Settings ## Settings
@ -41,13 +41,13 @@ settings = Ρυθμίσεις
appearance = Εμφάνιση appearance = Εμφάνιση
theme = Θέμα theme = Θέμα
match-desktop = Συμφωνία με την επιφάνεια εργασίας match-desktop = Αυτόματο
dark = Σκουρόχρωμο dark = Σκοτεινό
light = Ανοιχτόχρωμο light = Φωτεινό
syntax-dark = Σκουρόχρωμος χρωματικός συνδυασμός syntax-dark = Σκοτεινός χρωματικός συνδυασμός
syntax-light = Ανοιχτόχρωμος χρωματικός συνδυασμός syntax-light = Φωτεινός χρωματικός συνδυασμός
default-zoom-step = Βήματα ζουμ default-zoom-step = Βήματα μεγέθυνσης
opacity = Αδιαφάνεια φόντου opacity = Αδιαφάνια υπόβαθρου
### Font ### Font
@ -56,21 +56,21 @@ advanced-font-settings = Προηγμένες ρυθμίσεις γραμματ
default-font = Γραμματοσειρά default-font = Γραμματοσειρά
default-font-size = Μέγεθος γραμματοσειράς default-font-size = Μέγεθος γραμματοσειράς
default-font-stretch = Τέντωμα γραμματοσειράς default-font-stretch = Τέντωμα γραμματοσειράς
default-font-weight = Πάχος κανονικής γραμματοσειράς default-font-weight = Βάρος κανονικής γραμματοσειράς
default-dim-font-weight = Πάχος θαμπής γραμματοσειράς default-dim-font-weight = Βάρος θαμπής γραμματοσειράς
default-bold-font-weight = Πάχος έντονης γραμματοσειράς default-bold-font-weight = Βάρος έντονης γραμματοσειράς
use-bright-bold = Να εμφανίζεται πιο φωτεινό το κείμενο με έντονη γραφή use-bright-bold = Κάνε το έντονο κείμενο πιο φωτεινό
### Splits ### Splits
splits = Διαχωρισμοί splits = Διαχωρισμός
focus-follow-mouse = Να ακολουθεί η εστίαση πληκτρολόγησης το ποντίκι focus-follow-mouse = H πληκτρολόγηση να ακολουθεί το ποντίκι
### Advanced ### Advanced
advanced = Σύνθετες επιλογές advanced = Προχωρημένα
show-headerbar = Εμφάνιση κεφαλίδας show-headerbar = Εμφάνιση κεφαλίδας
show-header-description = Εμφάνιση της κεφαλίδας από το μενού δεξιού κλικ show-header-description = Εμφανήστε την κεφαλίδα από το μενού δεξιού κλικ.
# Find # Find
find-placeholder = Εύρεση... find-placeholder = Εύρεση...
find-previous = Εύρεση προηγούμενου find-previous = Εύρεση προηγούμενου
@ -82,12 +82,12 @@ find-next = Εύρεση επόμενου
## File ## File
file = Αρχείο file = Αρχείο
new-tab = Νέα καρτέλα new-tab = Νέα ταμπέλα
new-window = Νέο παράθυρο new-window = Νέο παράθυρο
profile = Προφίλ profile = Προφίλ
menu-profiles = Προφίλ... menu-profiles = Περισσότερα Προφίλ...
close-tab = Κλείσιμο καρτέλας close-tab = Κλείσιμο καρτέλας
quit = Έξοδος quit = Τερματισμός
## Edit ## Edit
@ -99,56 +99,19 @@ find = Εύρεση
## View ## View
view = Προβολή view = Εμφάνιση
zoom-in = Μεγαλύτερο κείμενο zoom-in = Μεγέθυνση κείμενου
zoom-reset = Προεπιλεγμένο μέγεθος κειμένου zoom-reset = Επαναφορά κειμένου
zoom-out = Μικρότερο κείμενο zoom-out = Σμίκρυνση κείμενου
next-tab = Επόμενη καρτέλα next-tab = Επόμενη ταμπέλα
previous-tab = Προηγούμενη καρτέλα previous-tab = Προηγούμενη ταμπέλα
split-horizontal = Οριζόντιος διαχωρισμός split-horizontal = Οριζόντιος διαχωρισμός
split-vertical = Κάθετος διαχωρισμός split-vertical = Κάθετος διαχωρισμός
pane-toggle-maximize = Εναλλαγή μεγιστοποίησης pane-toggle-maximize = Εναλλαγή μεγέθυνσης
menu-color-schemes = Χρωματικοί συνδυασμοί... menu-color-schemes = Χρωματικοί συνδυασμοί...
menu-settings = Ρυθμίσεις... menu-settings = Ρυθμίσεις...
menu-about = Σχετικά με το Τερματικό COSMIC... menu-about = Σχετικά με τον τερματικό COSMIC...
repository = Αποθετήριο repository = Αποθετήριο
support = Υποστήριξη support = Υποστήριξη
cancel = Ακύρωση cancel = Ακύρωση
menu-keyboard-shortcuts = Συντομεύσεις πληκτρολογίου... menu-keyboard-shortcuts = Συντομεύσεις πλήκτρων...
replace = Αντικατάσταση
passwords-title = Κωδικοί πρόσβασης
password-input = Κωδικός πρόσβασης
password-input-description = Περιγραφή
add-password = Προσθήκη κωδικού πρόσβασης
menu-password-manager = Κωδικοί πρόσβασης...
clear-scrollback = Απαλοιφή ιστορικού κύλισης
open-link = Άνοιγμα συνδέσμου
comment = Εξομοιωτής τερματικού για το περιβάλλον επιφάνειας εργασίας COSMIC
keyboard-shortcuts = Συντομεύσεις πληκτρολογίου
keywords = Εντολή;Κέλυφος;Τερματικό;Command;Shell;Terminal;CLI;
close-window = Κλείσιμο παραθύρου
disable = Απενεργοποίηση
shortcut-group-clipboard = Πρόχειρο
shortcut-group-tabs = Καρτέλες
shortcut-group-window = Παράθυρο
copy-link = Αντιγραφή συνδέσμου
type-to-search = Πληκτρολογήστε για αναζήτηση...
password-manager = Διαχείριση κωδικών πρόσβασης
shortcut-replace-title = Αντικατάσταση συντόμευσης;
tab-activate = Ενεργοποίηση καρτέλας { $number }
reset-to-default = Επαναφορά προεπιλογών
shortcut-capture-hint = Πατήστε τον συνδυασμό πλήκτρων
toggle-fullscreen = Εναλλαγή πλήρους οθόνης
add-another-keybinding = Προσθήκη άλλου συνδυασμού πλήκτρων
copy-or-sigint = Αντιγραφή ή SIGINT
focus-pane-down = Εστίαση στην κάτω περιοχή
focus-pane-left = Εστίαση στην αριστερή περιοχή
focus-pane-right = Εστίαση στη δεξιά περιοχή
focus-pane-up = Εστίαση στην πάνω περιοχή
no-shortcuts = Δεν υπάρχουν συντομεύσεις
paste-primary = Πρωτεύουσα επικόλληση
shortcut-group-other = Άλλες
shortcut-group-zoom = Ζουμ
shortcut-replace-body = Ο συνδυασμός { $binding } έχει ήδη αντιστοιχιστεί στην ενέργεια «{ $existing }». Θέλετε να αντικατασταθεί με την ενέργεια «{ $new_action }»;
tab-new-inherit-working-directory = Οι νέες καρτέλες χρησιμοποιούν τον τρέχοντα κατάλογο
tab-new-inherit-working-directory-description = Άνοιγμα νέων καρτελών στον τρέχοντα κατάλογο της ενεργής καρτέλας

7
i18n/en/cosmic_term.ftl
View file

@ -63,14 +63,11 @@ focus-follow-mouse = Typing focus follows mouse
advanced = Advanced advanced = Advanced
show-headerbar = Show header show-headerbar = Show header
show-header-description = Reveal the header from the right-click menu show-header-description = Reveal the header from the right-click menu
tab-new-inherit-working-directory = New tabs use current directory
tab-new-inherit-working-directory-description = Open new tabs in the active tab's working directory
### Keyboard shortcuts ### Keyboard shortcuts
add-another-keybinding = Add another keybinding add-another-keybinding = Add another keybinding
cancel = Cancel cancel = Cancel
close-window = Close window close-window = Close window
confirm = Confirm
copy-or-sigint = Copy or SIGINT copy-or-sigint = Copy or SIGINT
disable = Disable disable = Disable
focus-pane-down = Focus pane down focus-pane-down = Focus pane down
@ -84,7 +81,6 @@ password-manager = Password manager
paste-primary = Paste primary paste-primary = Paste primary
replace = Replace replace = Replace
reset-to-default = Reset to default reset-to-default = Reset to default
reset = Reset
shortcut-capture-hint = Press the key combination shortcut-capture-hint = Press the key combination
shortcut-group-clipboard = Clipboard shortcut-group-clipboard = Clipboard
shortcut-group-other = Other shortcut-group-other = Other
@ -94,9 +90,6 @@ shortcut-group-zoom = Zoom
shortcut-replace-body = { $binding } is already assigned to { $existing }. Replace it with { $new_action }? shortcut-replace-body = { $binding } is already assigned to { $existing }. Replace it with { $new_action }?
shortcut-replace-title = Replace shortcut? shortcut-replace-title = Replace shortcut?
tab-activate = Activate tab { $number } tab-activate = Activate tab { $number }
rename-tab = Rename tab
tab-name-placeholder = Tab name
tab-rename-title = Rename tab
toggle-fullscreen = Toggle fullscreen toggle-fullscreen = Toggle fullscreen
type-to-search = Type to search... type-to-search = Type to search...

2
i18n/es-419/cosmic_term.ftl
View file

@ -68,8 +68,6 @@ focus-follow-mouse = El enfoque de escritura sigue al mouse
advanced = Avanzado advanced = Avanzado
show-headerbar = Mostrar encabezado show-headerbar = Mostrar encabezado
show-header-description = Mostrar el encabezado desde el menú contextual. show-header-description = Mostrar el encabezado desde el menú contextual.
tab-new-inherit-working-directory = Las pestañas nuevas usan el directorio actual
tab-new-inherit-working-directory-description = Abrir pestañas nuevas en el directorio de trabajo de la pestaña activa
# Find # Find
find-placeholder = Buscar... find-placeholder = Buscar...
find-previous = Buscar anterior find-previous = Buscar anterior

2
i18n/es-ES/cosmic_term.ftl
View file

@ -70,8 +70,6 @@ focus-follow-mouse = Enfoque del tecleo sigue el ratón
advanced = Avanzado advanced = Avanzado
show-headerbar = Mostrar encabezado show-headerbar = Mostrar encabezado
show-header-description = Mostrar encabezado desde el menú del clic secundario. show-header-description = Mostrar encabezado desde el menú del clic secundario.
tab-new-inherit-working-directory = Las pestañas nuevas usan el directorio actual
tab-new-inherit-working-directory-description = Abrir pestañas nuevas en el directorio de trabajo de la pestaña activa
# Find # Find
find-placeholder = Buscar... find-placeholder = Buscar...
find-previous = Buscar previo find-previous = Buscar previo

0
i18n/eu/cosmic_term.ftl
View file

43
i18n/fi/cosmic_term.ftl
View file

@ -14,7 +14,7 @@ rename = Nimeä uudelleen
export = Vie export = Vie
delete = Poista delete = Poista
import = Tuo import = Tuo
import-errors = Tuotaessa tapahtuneet virheet import-errors = Tuo virheet
## Profiles ## Profiles
@ -26,9 +26,9 @@ tab-title-description = Ylikirjoita välilehden oletusotsikko
add-profile = Lisää profiili add-profile = Lisää profiili
new-profile = Uusi profiili new-profile = Uusi profiili
make-default = Aseta oletukseksi make-default = Aseta oletukseksi
working-directory = Työhakemisto working-directory = Työkansio
hold = Pidä hold = Pidä
remain-open = Pysy avoinna lapsiprosessin sulkeutumisen jälkeen. remain-open = Pysy auki lapsiprosessin sulkeutumisen jälkeen.
## Settings ## Settings
@ -38,13 +38,13 @@ settings = Asetukset
appearance = Ulkoasu appearance = Ulkoasu
theme = Teema theme = Teema
match-desktop = Sovita työpöytään match-desktop = Sovita työpöydän kanssa
dark = Tumma dark = Tumma
light = Vaalea light = Vaalea
syntax-dark = Tumma väriteema syntax-dark = Tumma väriteema
syntax-light = Vaalea väriteema syntax-light = Vaalea väriteema
default-zoom-step = Zoomauksen askeleet default-zoom-step = Zoomausaskeleet
opacity = Taustan peittävyys opacity = Taustan läpinäkyvyys
### Font ### Font
@ -52,11 +52,11 @@ font = Fontti
advanced-font-settings = Fontin lisäasetukset advanced-font-settings = Fontin lisäasetukset
default-font = Fontti default-font = Fontti
default-font-size = Fontin koko default-font-size = Fontin koko
default-font-stretch = Fontin venyvyys default-font-stretch = Kirjasimen venyvyys
default-font-weight = Fontin normaalipaino default-font-weight = Oletuskirjasimen paino
default-dim-font-weight = Himmennetyn fontin paino default-dim-font-weight = Kirjasimen painon himmennys
default-bold-font-weight = Lihavoidun fontin paino default-bold-font-weight = Paksun kirjasimen paino
use-bright-bold = Näytä lihavoitu teksti kirkkaampana use-bright-bold = Näytä paksu kirjasin kirkkaana
### Splits ### Splits
@ -67,7 +67,7 @@ focus-follow-mouse = Kirjoituksen kohdistus seuraa hiirtä
advanced = Lisäasetukset advanced = Lisäasetukset
show-headerbar = Näytä otsake show-headerbar = Näytä otsake
show-header-description = Paljasta otsake hiiren oikean painikkeen valikosta show-header-description = Paljasta otsake hiiren oikean painikkeen valikosta.
# Find # Find
@ -107,7 +107,7 @@ next-tab = Seuraava välilehti
previous-tab = Edellinen välilehti previous-tab = Edellinen välilehti
split-horizontal = Halkaise näkymä vaakasuunnassa split-horizontal = Halkaise näkymä vaakasuunnassa
split-vertical = Halkaise näkymä pystysuunnassa split-vertical = Halkaise näkymä pystysuunnassa
pane-toggle-maximize = Suurennus päällä tai pois pane-toggle-maximize = Maksimointi päälle tai pois päältä
menu-color-schemes = Väriteemat… menu-color-schemes = Väriteemat…
menu-settings = Asetukset… menu-settings = Asetukset…
menu-about = Tietoa COSMICin päätteestä… menu-about = Tietoa COSMICin päätteestä…
@ -134,20 +134,3 @@ menu-keyboard-shortcuts = Pikanäppäimet…
tab-activate = Aktivoi välilehti { $number } tab-activate = Aktivoi välilehti { $number }
type-to-search = Etsi kirjoittamalla… type-to-search = Etsi kirjoittamalla…
password-manager = Salasanahallinta password-manager = Salasanahallinta
reset-to-default = Palauta oletukseksi
menu-password-manager = Salasanat…
add-another-keybinding = Lisää toinen näppäinsidos
focus-pane-down = Kohdista alempaan ruutuun
focus-pane-left = Kohdista vasemmanpuoleiseen ruutuun
focus-pane-right = Kohdista oikeanpuoleiseen ruutuun
focus-pane-up = Kohdista ylempään ruutuun
paste-primary = Liitä ensisijainen
shortcut-capture-hint = Paina näppäinyhdistelmää
shortcut-replace-body = { $binding } on jo kytketty toimintoon { $existing }. Korvataanko se toiminnolla { $new_action }?
shortcut-replace-title = Korvataanko pikanäppäin?
copy-or-sigint = Kopioi tai SIGINT
shortcut-group-zoom = Lähennä
toggle-fullscreen = Koko näyttö päällä tai pois
shortcut-group-other = Muut
tab-new-inherit-working-directory = Uudet välilehdet käyttävät nykyistä hakemistoa
tab-new-inherit-working-directory-description = Avaa uudet välilehdet aktiivisen välilehden työskentelyhakemistossa

7
i18n/fr/cosmic_term.ftl
View file

@ -121,7 +121,6 @@ copy-link = Copier le lien
add-another-keybinding = Ajouter un autre raccourci clavier add-another-keybinding = Ajouter un autre raccourci clavier
cancel = Annuler cancel = Annuler
close-window = Fermer la fenêtre close-window = Fermer la fenêtre
confirm = Confirmer
copy-or-sigint = Copier ou SIGINT copy-or-sigint = Copier ou SIGINT
disable = Désactiver disable = Désactiver
keyboard-shortcuts = Raccourcis clavier keyboard-shortcuts = Raccourcis clavier
@ -145,12 +144,6 @@ focus-pane-left = Passer au panneau de gauche
focus-pane-right = Passer au panneau de droite focus-pane-right = Passer au panneau de droite
focus-pane-up = Passer au panneau du dessus focus-pane-up = Passer au panneau du dessus
reset-to-default = Rétablir les paramètres par défaut reset-to-default = Rétablir les paramètres par défaut
reset = Réinitialiser
toggle-fullscreen = Basculer en plein écran toggle-fullscreen = Basculer en plein écran
rename-tab = Renommer l'onglet
tab-name-placeholder = Nom de l'onglet
tab-rename-title = Renommer l'onglet
comment = Émulateur de terminal pour le bureau COSMIC comment = Émulateur de terminal pour le bureau COSMIC
keywords = Commande;Shell;Terminal;CLI; keywords = Commande;Shell;Terminal;CLI;
tab-new-inherit-working-directory = Les nouveaux onglets utilisent le répertoire actuel
tab-new-inherit-working-directory-description = Ouvrir les nouveaux onglets dans le répertoire de travail de l'onglet actif

4
i18n/hu/cosmic_term.ftl
View file

@ -58,7 +58,7 @@ default-font = Betűtípus
default-font-size = Betűméret default-font-size = Betűméret
default-font-stretch = Betűszélesség default-font-stretch = Betűszélesség
default-font-weight = Normál betűsúly default-font-weight = Normál betűsúly
default-dim-font-weight = Vékony betűsúly default-dim-font-weight = Halvány betűsúly
default-bold-font-weight = Félkövér betűsúly default-bold-font-weight = Félkövér betűsúly
use-bright-bold = Félkövér szöveg világosítása use-bright-bold = Félkövér szöveg világosítása
@ -147,5 +147,3 @@ tab-activate = { $number }. lap aktiválása
toggle-fullscreen = Teljes képernyő váltása toggle-fullscreen = Teljes képernyő váltása
type-to-search = Gépelj a kereséshez… type-to-search = Gépelj a kereséshez…
copy-link = Hivatkozás másolása copy-link = Hivatkozás másolása
tab-new-inherit-working-directory = Az új lapok az aktuális könyvtárat használják
tab-new-inherit-working-directory-description = Az új lapok az aktív lap munkakönyvtárában nyílnak meg

2
i18n/id/cosmic_term.ftl
View file

@ -107,5 +107,3 @@ focus-pane-up = Fokuskan panel ke atas
comment = Emulator terminal untuk desktop COSMIC comment = Emulator terminal untuk desktop COSMIC
keywords = Perintah;Shell;Terminal;CLI; keywords = Perintah;Shell;Terminal;CLI;
copy-link = Salin Tautan copy-link = Salin Tautan
tab-new-inherit-working-directory = Tab baru menggunakan direktori saat ini
tab-new-inherit-working-directory-description = Buka tab baru di direktori pekerjaan tab aktif

2
i18n/it/cosmic_term.ftl
View file

@ -70,8 +70,6 @@ focus-follow-mouse = Il focus di scrittura segue il mouse
advanced = Avanzate advanced = Avanzate
show-headerbar = Mostra intestazione show-headerbar = Mostra intestazione
show-header-description = Mostra intestazione dal menu click destro. show-header-description = Mostra intestazione dal menu click destro.
tab-new-inherit-working-directory = Le nuove schede usano la cartella corrente
tab-new-inherit-working-directory-description = Apri nuove schede nella directory di lavoro della scheda attiva
# Find # Find
find-placeholder = Trova... find-placeholder = Trova...
find-previous = Trova precedente find-previous = Trova precedente

107
i18n/kab/cosmic_term.ftl
View file

@ -1,107 +0,0 @@
cancel = Sefsex
name = Isem
delete = kkes
rename = Snifel isem
quit = Tuffɣa
support = Tallalt
repository = Asarsay
settings = Iɣewwaṛen
appearance = Timeẓri
theme = Asentel
dark = Aɣmayan
light = Aceɛlal
paste = Senteḍ
select-all = Fren akk
view = Wali
menu-settings = Iɣewwaṛen…
match-desktop = Amṣada d tnarit
file = Afaylu
new-window = Asfaylu amaynut
edit = Ẓreg
copy = Nɣel
default-zoom-step = Isurifen n usemɣer
find = Af-d
find-placeholder = Af-d…
find-previous = Af-d uzwir
find-next = Af-d uḍfir
replace = Semselsi
keyboard-shortcuts = Inegzumen n unasiw
menu-keyboard-shortcuts = Inegzumen n unasiw…
new-tab = Iccer amaynut
close-tab = Mdel iccer
import = Kter
export = Sifeḍ
reset-to-default = Ales awennez ɣer umezwer
type-to-search = Aru iwakken ad tnadiḍ…
add-another-keybinding = Rnu yiwen n unegzum n unasiw nniḍen
font = Tasefsit
default-font = Tasefsit
password-input = Awal uffir
password-input-description = Aglam
close-window = Mdel asfaylu
copy-or-sigint = Nɣel neɣ SIGINT
disable = Kkes armad
no-shortcuts = Ulac inegzumen
password-manager = Amsefrak n wawal n uɛeddi
shortcut-group-other = Ayen nniḍen
shortcut-group-tabs = Iccaren
shortcut-group-window = Asfaylu
shortcut-replace-title = Semselsi anegzum?
toggle-fullscreen = Qluqel ɣer ugdil aččuran
shortcut-group-clipboard = Tacfawit
shortcut-group-zoom = Asimɣeṛ
show-header-description = Err-d inixef seg wumuɣ n usiti ayeffus
new-terminal = Ixf amaynut
color-schemes = Azenziɣ n yiniten
import-errors = Kter tuccḍiwin
profiles = imaɣnuten
command-line = Izirig n tladna
tab-title = Azwel n yiccer
tab-title-description = Snifel azwel n yiccer amezwer
add-profile = Rnu amaɣnu
new-profile = Amaɣnu amaynut
make-default = Err-it d amezwer
working-directory = Akaram n umahil
hold = Ṭṭef
syntax-dark = Azenziɣ n yini aɣmayan
syntax-light = Azenziɣ n yini aceɛlal
opacity = Tiḍullest n ugilal
advanced-font-settings = Iɣewwaṛen inaẓiyen n tsefsit
default-font-size = Tiddi n tsefsit
default-font-stretch = Ajbad n tsefsit
default-font-weight = Taẓeyt n tsefsit tamagnut
default-dim-font-weight = Taẓeyt n tsefsit tafessast
default-bold-font-weight = Taẓeyt n tsefsit n tira tazurant
use-bright-bold = Err aḍris azuran yettfeǧǧiǧ
show-headerbar = Sken inixef
profile = Amaɣnu
menu-profiles = imaɣnuten…
remain-open = Qqim teldiḍ deffir n tuffɣa n ukala aqrur.
focus-follow-mouse = Asaḍas n tira yettḍafar taɣerdayt
advanced = Leqqayen
clear-scrollback = Sfeḍ adrurem ɣer deffir
open-link = Ldi aseɣwen
zoom-in = Aḍris ahrawan
zoom-reset = Tiddi n uḍris amezwer
zoom-out = Aḍris wezzilen ugar
next-tab = Iccer uḍfir
previous-tab = Iccer uzwir
split-horizontal = Ẓun s wudem aglawan
split-vertical = Ẓun s wudem ubdid
pane-toggle-maximize = Qluqel asemɣer
menu-about = Ɣef ixf COSMIC…
menu-password-manager = Awalen uffiren...
passwords-title = Awalen uffiren
add-password = Rnu awal uffir
splits = Tiẓunin
menu-color-schemes = Azenziɣ n yini...
comment = Amtellal n yixef i tnarit COSMIC
keywords = Taladna; Ajeɣlal; Ixf; CLI;
focus-pane-down = Err asaḍas ɣer ugalis ukessar
focus-pane-left = Err asaḍas ɣer ugalis uzelmaḍ
focus-pane-right = Err asaḍas ɣer ugalis uyeffus
focus-pane-up = Err asaḍas ɣer ugalis uksawen
paste-primary = Senṭeḍ agejdan
shortcut-capture-hint = Sit ɣef usuddes n tqeffalin
tab-activate = Sermed iccer { $number }
copy-link = Nɣel aseɣwen

2
i18n/kk/cosmic_term.ftl
View file

@ -107,5 +107,3 @@ type-to-search = Іздеу үшін теріңіз...
comment = COSMIC жұмыс үстелі үшін терминал эмуляторы comment = COSMIC жұмыс үстелі үшін терминал эмуляторы
keywords = Command;Shell;Terminal;CLI;Команда;Қоршам;Терминал; keywords = Command;Shell;Terminal;CLI;Команда;Қоршам;Терминал;
copy-link = Сілтемені көшіру copy-link = Сілтемені көшіру
tab-new-inherit-working-directory = Жаңа беттерде ағымдағы буманы қолдану
tab-new-inherit-working-directory-description = Жаңа беттерді белсенді беттің жұмыс бумасында ашу

22
i18n/ko/cosmic_term.ftl
View file

@ -51,7 +51,7 @@ default-dim-font-weight = 희미한 글꼴 굵기
advanced = 고급 advanced = 고급
use-bright-bold = 굵은 텍스트를 더 밝게 표시 use-bright-bold = 굵은 텍스트를 더 밝게 표시
default-bold-font-weight = 굵은 글꼴 굵기 default-bold-font-weight = 굵은 글꼴 굵기
show-header-description = 우클릭 메뉴를 통해 헤더를 나타냅니다 show-header-description = 오른쪽 클릭 메뉴를 통해 헤더를 나타냅니다.
password-input-description = 설명 password-input-description = 설명
default-font = 글꼴 default-font = 글꼴
paste = 붙여넣기 paste = 붙여넣기
@ -78,23 +78,3 @@ find = 찾기
profile = 프로필 profile = 프로필
new-tab = 새 탭 new-tab = 새 탭
comment = COSMIC 데스크톱용 터미널 에뮬레이터 comment = COSMIC 데스크톱용 터미널 에뮬레이터
menu-keyboard-shortcuts = 단축키...
keywords = 명령어;셸;터미널;CLI;
cancel = 취소
close-window = 창 닫기
disable = 비활성화
keyboard-shortcuts = 단축키
password-manager = 암호 관리자
replace = 대체
shortcut-group-clipboard = 클립보드
shortcut-group-tabs = 탭
shortcut-group-window = 창
shortcut-replace-title = 단축키를 대체할까요?
tab-activate = 활성 탭 { $number }
toggle-fullscreen = 전체 화면 전환
type-to-search = 입력하여 검색…
copy-link = 링크 복사
no-shortcuts = 단축키 없음
reset-to-default = 기본값으로 되돌리기
shortcut-group-other = 기타
shortcut-group-zoom = 확대

0
i18n/lo/cosmic_term.ftl
View file

25
i18n/lt/cosmic_term.ftl
View file

@ -19,11 +19,11 @@ make-default = Padaryti numatytu
working-directory = Darbinis katalogas working-directory = Darbinis katalogas
hold = Laikyti hold = Laikyti
remain-open = Palikti atidarytą išsijungus vaikiniam procesui. remain-open = Palikti atidarytą išsijungus vaikiniam procesui.
settings = Nuostatos settings = Nustatymai
appearance = Išvaizda appearance = Išvaizda
theme = Stilius theme = Stilius
match-desktop = Pagal darbalaukio temą match-desktop = Pagal darbalaukio temą
default-zoom-step = Artinimo žingsniai default-zoom-step = Priartinimo žingsniai
opacity = Fono skaidrumas opacity = Fono skaidrumas
font = Šriftas font = Šriftas
advanced-font-settings = Išplėstiniai šrifto nustatymai advanced-font-settings = Išplėstiniai šrifto nustatymai
@ -38,9 +38,9 @@ focus-follow-mouse = Teksto laukelio aktyvavimas sekant žymeklį
advanced = Išplėstiniai advanced = Išplėstiniai
show-headerbar = Rodyti antraštę show-headerbar = Rodyti antraštę
show-header-description = Rodyti antraštę kontekstiname meniu atidaromu dešiniu klavišu show-header-description = Rodyti antraštę kontekstiname meniu atidaromu dešiniu klavišu
find-placeholder = Rasti... find-placeholder = Surasti...
find-previous = Ieškoti ankstesnio find-previous = Atgalinis ieškojimas
find-next = Ieškoti tolesnio find-next = Ieškoti sekančio
file = Failas file = Failas
new-tab = Naujas skirtukas new-tab = Naujas skirtukas
new-window = Naujas langas new-window = Naujas langas
@ -50,9 +50,9 @@ close-tab = Uždaryti skirtuką
quit = Išeiti quit = Išeiti
edit = Redaguoti edit = Redaguoti
copy = Kopijuoti copy = Kopijuoti
paste = Įdėti paste = Įklijuoti
select-all = Žymėti viską select-all = Pažymėti viską
find = Rasti find = Surasti
clear-scrollback = Išvalyti scrollback clear-scrollback = Išvalyti scrollback
open-link = Atidaryti Nuorodą open-link = Atidaryti Nuorodą
view = Rodymas view = Rodymas
@ -65,7 +65,7 @@ split-horizontal = Skaidyti horizontaliai
split-vertical = Skaidyti vertikaliai split-vertical = Skaidyti vertikaliai
pane-toggle-maximize = Perjungti maksimalų padidinimą pane-toggle-maximize = Perjungti maksimalų padidinimą
menu-color-schemes = Spalvų schemos... menu-color-schemes = Spalvų schemos...
menu-settings = Nuostatos... menu-settings = Nustatymai...
menu-about = Apie COSMIC Terminal... menu-about = Apie COSMIC Terminal...
menu-password-manager = Slaptažodžiai... menu-password-manager = Slaptažodžiai...
passwords-title = Slaptažodžiai passwords-title = Slaptažodžiai
@ -82,12 +82,12 @@ cancel = Atšaukti
close-window = Uždaryti langą close-window = Uždaryti langą
copy-or-sigint = Kopijuoti arba SIGINT copy-or-sigint = Kopijuoti arba SIGINT
disable = Išjungti disable = Išjungti
keyboard-shortcuts = Spartieji klavišai keyboard-shortcuts = Klaviatūros greitieji klavišai
menu-keyboard-shortcuts = Spartieji klavišai... menu-keyboard-shortcuts = Klaviatūros greitieji klavišai...
no-shortcuts = Nėra nustatytų klaviatūros derinių no-shortcuts = Nėra nustatytų klaviatūros derinių
password-manager = Slaptažodžių tvarkyklė password-manager = Slaptažodžių tvarkyklė
paste-primary = Įklijuotiį pirminį paste-primary = Įklijuotiį pirminį
replace = Keisti replace = Pakeisti
reset-to-default = Nustatyti į numatytąjį reset-to-default = Nustatyti į numatytąjį
shortcut-capture-hint = Nuspauskite klavišų derinį shortcut-capture-hint = Nuspauskite klavišų derinį
shortcut-group-clipboard = Iškarpinė shortcut-group-clipboard = Iškarpinė
@ -101,4 +101,3 @@ tab-activate = Aktyvuoti skirtuką { $number }
toggle-fullscreen = Įjungti/išjungti viso ekrano režimą toggle-fullscreen = Įjungti/išjungti viso ekrano režimą
type-to-search = Norint ieškoti, pradėkite rašyti… type-to-search = Norint ieškoti, pradėkite rašyti…
copy-link = Kopijuoti Nuorodą copy-link = Kopijuoti Nuorodą
syntax-dark = Tamsi spalvų paletė

1
i18n/nb-NO/cosmic_term.ftl
View file

@ -71,4 +71,3 @@ syntax-light = Fargeskjema lyst
default-zoom-step = Zoom steg default-zoom-step = Zoom steg
focus-follow-mouse = Skrivefokus følger musen focus-follow-mouse = Skrivefokus følger musen
hold = Hold hold = Hold
cancel = Avbryt

2
i18n/pl/cosmic_term.ftl
View file

@ -147,5 +147,3 @@ focus-pane-left = Aktywuj lewy panel
focus-pane-right = Aktywuj prawy panel focus-pane-right = Aktywuj prawy panel
focus-pane-up = Aktywuj panel wyżej focus-pane-up = Aktywuj panel wyżej
copy-link = Skopiuj Odnośnik copy-link = Skopiuj Odnośnik
tab-new-inherit-working-directory = Nowe karty użyją obecnego katalogu
tab-new-inherit-working-directory-description = Otwieraj nowe karty w katalogu roboczym aktywnej karty

18
i18n/pt-BR/cosmic_term.ftl
View file

@ -113,10 +113,10 @@ pane-toggle-maximize = Alternar maximização
menu-color-schemes = Esquemas de cores... menu-color-schemes = Esquemas de cores...
menu-settings = Configurações... menu-settings = Configurações...
menu-about = Sobre o Terminal... menu-about = Sobre o Terminal...
open-link = Abrir link open-link = Abrir Link
menu-password-manager = Senhas... menu-password-manager = Senhas...
passwords-title = Senhas passwords-title = Senhas
add-password = Adicionar senha add-password = Adicionar Senha
password-input = Senha password-input = Senha
password-input-description = Descrição password-input-description = Descrição
add-another-keybinding = Adicionar outra combinação de teclas add-another-keybinding = Adicionar outra combinação de teclas
@ -124,15 +124,15 @@ cancel = Cancelar
close-window = Fechar janela close-window = Fechar janela
copy-or-sigint = Copiar ou SIGINT copy-or-sigint = Copiar ou SIGINT
disable = Desabilitar disable = Desabilitar
focus-pane-down = Focar o quadro abaixo focus-pane-down = Focar painel abaixo
focus-pane-left = Focar o quadro à esquerda focus-pane-left = Focar painel à esquerda
focus-pane-right = Focar o quadro à direita focus-pane-right = Focar painel à direita
focus-pane-up = Focar o quadro acima focus-pane-up = Focar painel acima
keyboard-shortcuts = Atalhos de teclado keyboard-shortcuts = Atalhos de teclado
menu-keyboard-shortcuts = Atalhos de teclado... menu-keyboard-shortcuts = Atalhos de teclado...
no-shortcuts = Sem atalhos no-shortcuts = Sem atalhos
password-manager = Gerenciador de senhas password-manager = Gerenciador de senhas
paste-primary = Colar primário paste-primary = Colar
replace = Substituir replace = Substituir
reset-to-default = Restaurar padrão reset-to-default = Restaurar padrão
shortcut-capture-hint = Pressione a combinação de teclas shortcut-capture-hint = Pressione a combinação de teclas
@ -146,6 +146,4 @@ shortcut-replace-title = Substituir atalho?
tab-activate = Ativar aba { $number } tab-activate = Ativar aba { $number }
toggle-fullscreen = Alternar para tela cheia toggle-fullscreen = Alternar para tela cheia
type-to-search = Digite para pesquisar... type-to-search = Digite para pesquisar...
copy-link = Copiar link copy-link = Copiar Link
tab-new-inherit-working-directory = Novas abas usam o diretório atual
tab-new-inherit-working-directory-description = Abrir novas abas no diretório de trabalho da aba ativa

2
i18n/ru/cosmic_term.ftl
View file

@ -141,5 +141,3 @@ tab-activate = Активировать вкладку { $number }
toggle-fullscreen = Вкл./выкл. полноэкранный режим toggle-fullscreen = Вкл./выкл. полноэкранный режим
type-to-search = Введите для поиска... type-to-search = Введите для поиска...
copy-link = Копировать ссылку copy-link = Копировать ссылку
tab-new-inherit-working-directory = В новых вкладках исп. текущий каталог
tab-new-inherit-working-directory-description = Открывать новые вкладки в рабочем каталоге активной вкладки

111
i18n/sr/cosmic_term.ftl
View file

@ -1,111 +0,0 @@
quit = Изађи
cancel = Откажи
import = Увези
export = Извези
appearance = Изглед
light = Светла
dark = Тамна
settings = Подешавања
reset-to-default = Врати на подразумевано
type-to-search = Куцајте за претрагу...
add-another-keybinding = Додај још једну комбинацију тастера
replace = Замени
syntax-light = Светла шема боја
default-font-weight = Нормална тежина фонта
add-profile = Додај профил
find-next = Нађи следеће
splits = Подељено
import-errors = Грешке при увозу
zoom-in = Већи текст
select-all = Означи све
previous-tab = Претходни језичак
show-headerbar = Прикажи заглавље
new-window = Нови прозор
zoom-out = Мањи текст
split-vertical = Усправна подела
syntax-dark = Тамна шема боја
menu-profiles = Профили...
new-terminal = Нови терминал
tab-title-description = Замените подразумевани наслов језичка
menu-about = О програму Космик Терминал...
remain-open = Остани отворен након што се дечији процес заврши.
menu-color-schemes = Шеме боја...
working-directory = Радни директоријум
profiles = Профили
opacity = Непровидност позадине
tab-title = Наслов језичка
zoom-reset = Подразумевана величина текста
rename = Преименуј
passwords-title = Лозинке
edit = Уреди
copy = Умножи
pane-toggle-maximize = Окини увећање
theme = Тема
password-input = Лозинка
close-tab = Затвори језичак
color-schemes = Шеме боја
name = Назив
default-dim-font-weight = Пригушена тежина фонта
advanced = Напредно
delete = Обриши
repository = Ризница
use-bright-bold = Учини подебљани текст светлијим
support = Подршка
default-bold-font-weight = Тежина подебљаног фонта
password-input-description = Опис
default-font = Фонт
paste = Залепи
menu-settings = Подешавања...
add-password = Додај лозинку
command-line = Линија наредби
view = Преглед
default-font-stretch = Развлачење писма
hold = Задржи
menu-password-manager = Лозинке...
match-desktop = Прати радну површину
find-previous = Нађи претходно
default-font-size = Величина фонта
cosmic-terminal = Космик терминал
split-horizontal = Водоравна подела
find-placeholder = Пронађи...
focus-follow-mouse = Фокус куцања прати миша
advanced-font-settings = Напредна подешавања фонта
font = Фонт
next-tab = Следећи језичак
default-zoom-step = Кораци увећања
clear-scrollback = Очисти историју помицања
open-link = Отвори везу
file = Датотека
make-default = Постави као подразумеван
new-profile = Нови профил
find = Пронађи
profile = Профил
new-tab = Нови језичак
keyboard-shortcuts = Пречице тастатуре
menu-keyboard-shortcuts = Пречице на тастатури...
comment = Емулатор терминала за Космик радну површину
keywords = Command;Shell;Terminal;CLI;Наредба;Шкољка;Терминал;CLI;naredba;školjka;terminal;cli;
show-header-description = Прикажи заглавље из менија са десним кликом
close-window = Затвори прозор
copy-or-sigint = Копирај или SIGINT
disable = Онемогући
focus-pane-down = Усредсреди површ испод
focus-pane-left = Усредсреди површ лево
focus-pane-right = Усредсреди површ десно
focus-pane-up = Усредсреди површ изнад
no-shortcuts = Нема пречица
password-manager = Управник лозинки
paste-primary = Убаци примарно
shortcut-capture-hint = Притисните комбинацију тастера
shortcut-group-clipboard = Остава
shortcut-group-other = Друго
shortcut-group-tabs = Језичци
shortcut-group-window = Прозор
shortcut-group-zoom = Увећање
shortcut-replace-body = { $binding } је већ додељена за { $existing }. Заменити је са { $new_action }?
shortcut-replace-title = Заменити пречицу?
tab-activate = Активирај језичак { $number }
toggle-fullscreen = Цео екран
copy-link = Копирај везу
tab-new-inherit-working-directory = Нови језичци користе тренутни директоријум
tab-new-inherit-working-directory-description = Отвара нове језичке у радном директоријуму активног језичка

2
i18n/sv-SE/cosmic_term.ftl
View file

@ -151,5 +151,3 @@ shortcut-group-other = Andra
shortcut-group-tabs = Flikar shortcut-group-tabs = Flikar
shortcut-group-zoom = Zooma shortcut-group-zoom = Zooma
copy-link = Kopiera länk copy-link = Kopiera länk
tab-new-inherit-working-directory-description = Öppna nya flikar i den aktiva flikens arbetskatalog
tab-new-inherit-working-directory = Nya flikar använder aktuell katalog

2
i18n/uk/cosmic_term.ftl
View file

@ -147,5 +147,3 @@ focus-pane-up = Фокус на верхню панель
comment = Емулятор терміналу для середовища COSMIC comment = Емулятор терміналу для середовища COSMIC
keywords = Команда;Оболонка;Термінал;Інтерфейс;CLI; keywords = Команда;Оболонка;Термінал;Інтерфейс;CLI;
copy-link = Копіювати ланку copy-link = Копіювати ланку
tab-new-inherit-working-directory = У нових вкладках використовується поточний каталог
tab-new-inherit-working-directory-description = Відкривати нові вкладки в робочому каталозі активної вкладки

14
i18n/zh-CN/cosmic_term.ftl
View file

@ -69,7 +69,7 @@ advanced = 高级
show-headerbar = 显示标题栏 show-headerbar = 显示标题栏
show-header-description = 右键菜单提供显示标题栏选项 show-header-description = 右键菜单提供显示标题栏选项
# Find # Find
find-placeholder = 查找… find-placeholder = 查找...
find-previous = 查找上一个 find-previous = 查找上一个
find-next = 查找下一个 find-next = 查找下一个
@ -82,7 +82,7 @@ file = 文件
new-tab = 新建标签 new-tab = 新建标签
new-window = 新建窗口 new-window = 新建窗口
profile = 配置 profile = 配置
menu-profiles = 配置文件… menu-profiles = 配置文件...
close-tab = 关闭标签 close-tab = 关闭标签
quit = 退出 quit = 退出
@ -106,9 +106,9 @@ previous-tab = 上一个标签
split-horizontal = 水平分割 split-horizontal = 水平分割
split-vertical = 垂直分割 split-vertical = 垂直分割
pane-toggle-maximize = 切换最大化 pane-toggle-maximize = 切换最大化
menu-color-schemes = 配色方案… menu-color-schemes = 配色方案...
menu-settings = 设置… menu-settings = 设置...
menu-about = 关于 COSMIC 终端… menu-about = 关于 COSMIC 终端...
repository = 仓库 repository = 仓库
support = 支持 support = 支持
open-link = 打开链接 open-link = 打开链接
@ -132,7 +132,7 @@ shortcut-group-clipboard = 剪切板
shortcut-group-other = 其他 shortcut-group-other = 其他
shortcut-group-tabs = 标签 shortcut-group-tabs = 标签
shortcut-group-zoom = 缩放 shortcut-group-zoom = 缩放
type-to-search = 输入即可搜索… type-to-search = 输入即可搜索...
copy-or-sigint = 复制或 SIGINT copy-or-sigint = 复制或 SIGINT
focus-pane-down = 聚焦下方窗格 focus-pane-down = 聚焦下方窗格
focus-pane-left = 聚焦左侧窗格 focus-pane-left = 聚焦左侧窗格
@ -147,5 +147,3 @@ toggle-fullscreen = 切换全屏
comment = COSMIC 桌面的终端模拟器 comment = COSMIC 桌面的终端模拟器
keywords = 指令;外壳;终端;命令行界面; keywords = 指令;外壳;终端;命令行界面;
copy-link = 复制链接 copy-link = 复制链接
tab-new-inherit-working-directory = 新标签使用当前目录
tab-new-inherit-working-directory-description = 在活动标签的工作目录中打开新标签

97
i18n/zh-TW/cosmic_term.ftl
View file

@ -1,5 +1,5 @@
cosmic-terminal = COSMIC 終端機 cosmic-terminal = COSMIC 終端機
new-terminal = 新建終端機 new-terminal = 新增 終端機
# Context Pages # Context Pages
@ -9,7 +9,7 @@ new-terminal = 新建終端機
## Color schemes ## Color schemes
color-schemes = 配色方案 color-schemes = 主題
rename = 重命名 rename = 重命名
export = 匯出 export = 匯出
delete = 刪除 delete = 刪除
@ -38,36 +38,36 @@ settings = 設定
appearance = 外觀 appearance = 外觀
theme = 主題 theme = 主題
match-desktop = 符合桌面 match-desktop = 配合桌面
dark = 深色 dark = 暗色
light = 淺色 light = 亮色
syntax-dark = 暗色調 syntax-dark = 暗色調
syntax-light = 亮色調 syntax-light = 亮色調
default-zoom-step = 縮放步進 default-zoom-step = 縮放步進
opacity = 背景不透明度 opacity = 背景透明度
### Font ### Font
font = 字型 font = 字體
advanced-font-settings = 進階字型設定 advanced-font-settings = 進階字體設定
default-font = 字型 default-font = 字體
default-font-size = 字型大小 default-font-size = 字體大小
default-font-stretch = 字型伸展 default-font-stretch = 字體延伸
default-font-weight = 正常字型粗細 default-font-weight = 字體粗細
default-dim-font-weight = 黯淡字型粗細 default-dim-font-weight = 淡色字體粗細
default-bold-font-weight = 粗體字型粗細 default-bold-font-weight = 粗字體粗細
use-bright-bold = 使粗體文字更亮 use-bright-bold = 使粗體字更亮
### Splits ### Splits
splits = 分割 splits = 終端介面分割
focus-follow-mouse = 輸入焦點追隨滑鼠 focus-follow-mouse = 滑鼠點擊選擇輸入窗口
### Advanced ### Advanced
advanced = 進階 advanced = 進階
show-headerbar = 顯示標題列 show-headerbar = 顯示標題列
show-header-description = 右鍵選單提供標題列選項 show-header-description = 右鍵選單提供標題列選項。
# Find # Find
find-placeholder = 尋找... find-placeholder = 尋找...
find-previous = 上一個 find-previous = 上一個
@ -79,12 +79,12 @@ find-next = 下一個
## File ## File
file = 檔案 file = 檔案
new-tab = 新建分頁 new-tab = 新增分頁
new-window = 新建視窗 new-window = 新增視窗
profile = 設定檔案 profile = 設定檔
menu-profiles = 設定檔案... menu-profiles = 設定檔...
close-tab = 關閉分頁 close-tab = 關閉分頁
quit = 退出 quit = 結束
## Edit ## Edit
@ -97,55 +97,14 @@ find = 尋找
## View ## View
view = 檢視 view = 檢視
zoom-in = 較大文字 zoom-in = 放大文字
zoom-reset = 預設文字大小 zoom-reset = 重設文字大小
zoom-out = 較小文字 zoom-out = 縮小文字
next-tab = 下個分頁 next-tab = 下個分頁
previous-tab = 上個分頁 previous-tab = 上個分頁
split-horizontal = 水平分割 split-horizontal = 水平分割
split-vertical = 垂直分割 split-vertical = 垂直分割
pane-toggle-maximize = 切換最大化 pane-toggle-maximize = 切換最大化
menu-color-schemes = 配色方案... menu-color-schemes = 主題...
menu-settings = 設定... menu-settings = 設定...
menu-about = 關於 COSMIC 終端機… menu-about = 關於 COSMIC 終端機...
cancel = 取消
repository = 軟體庫源
support = 支援
keyboard-shortcuts = 鍵盤快速鍵
keywords = 指令;殼層;終端;指令行介面CLI;
add-another-keybinding = 添加另一個按鍵組合
close-window = 關閉視窗
copy-or-sigint = 複製或 SIGINT
disable = 停用
menu-keyboard-shortcuts = 鍵盤快速鍵...
no-shortcuts = 無快速鍵
password-manager = 密碼管理器
paste-primary = 貼上主要
replace = 取代
reset-to-default = 重新設定至預設
shortcut-capture-hint = 按下組合鍵
shortcut-group-clipboard = 剪貼簿
shortcut-group-other = 其它
shortcut-group-tabs = 分頁
shortcut-group-window = 視窗
shortcut-group-zoom = 縮放
focus-pane-down = 聚焦下方窗格
focus-pane-left = 聚焦左側窗格
focus-pane-right = 聚焦右側窗格
focus-pane-up = 聚焦上方窗格
open-link = 開啟連結
menu-password-manager = 密碼…
passwords-title = 密碼
add-password = 添增密碼
password-input = 密碼
password-input-description = 描述
shortcut-replace-title = 取代快速鍵？
tab-activate = 啟用分頁 { $number }
toggle-fullscreen = 切換全螢幕
type-to-search = 輸入進行搜尋...
copy-link = 複製連結
shortcut-replace-body = { $binding } 已經分配至 { $existing }。 要取代它為 { $new_action }?
clear-scrollback = 清除捲動回朔
comment = COSMIC 桌面終端機模擬器
tab-new-inherit-working-directory = 新分頁使用目前目錄
tab-new-inherit-working-directory-description = 在作用中分頁的工作目錄開啟新分頁

3
src/config.rs
View file

@ -235,8 +235,6 @@ pub struct Config {
pub syntax_theme_dark: String, pub syntax_theme_dark: String,
pub syntax_theme_light: String, pub syntax_theme_light: String,
pub focus_follow_mouse: bool, pub focus_follow_mouse: bool,
#[serde(default)]
pub tab_new_inherit_working_directory: bool,
pub default_profile: Option<ProfileId>, pub default_profile: Option<ProfileId>,
#[serde(default)] #[serde(default)]
pub shortcuts_custom: Shortcuts, pub shortcuts_custom: Shortcuts,
@ -251,7 +249,6 @@ impl Default for Config {
color_schemes_light: BTreeMap::new(), color_schemes_light: BTreeMap::new(),
dim_font_weight: Weight::NORMAL.0, dim_font_weight: Weight::NORMAL.0,
focus_follow_mouse: false, focus_follow_mouse: false,
tab_new_inherit_working_directory: false,
font_name: "Noto Sans Mono".to_string(), font_name: "Noto Sans Mono".to_string(),
font_size: 14, font_size: 14,
font_size_zoom_step_mul_100: 100, font_size_zoom_step_mul_100: 100,

521
src/main.rs
View file

@ -3,7 +3,7 @@
use alacritty_terminal::{event::Event as TermEvent, term, term::color::Colors as TermColors, tty}; use alacritty_terminal::{event::Event as TermEvent, term, term::color::Colors as TermColors, tty};
use cosmic::iced::clipboard::dnd::DndAction; use cosmic::iced::clipboard::dnd::DndAction;
use cosmic::iced::core::keyboard::key::Named; use cosmic::iced_core::keyboard::key::Named;
use cosmic::widget::menu::action::MenuAction; use cosmic::widget::menu::action::MenuAction;
use cosmic::widget::menu::key_bind::KeyBind; use cosmic::widget::menu::key_bind::KeyBind;
use cosmic::widget::pane_grid::Pane; use cosmic::widget::pane_grid::Pane;
@ -177,7 +177,11 @@ fn main() -> Result<(), Box<dyn Error>> {
let shortcuts_config = shortcuts::ShortcutsConfig::new(config.shortcuts_custom.clone()); let shortcuts_config = shortcuts::ShortcutsConfig::new(config.shortcuts_custom.clone());
let shell = shell_program_opt.map(|shell_program| tty::Shell::new(shell_program, shell_args)); let shell = if let Some(shell_program) = shell_program_opt {
Some(tty::Shell::new(shell_program, shell_args))
} else {
None
};
let startup_options = Some(tty::Options { let startup_options = Some(tty::Options {
shell, shell,
working_directory, working_directory,
@ -277,7 +281,6 @@ pub enum Action {
TabNewNoProfile, TabNewNoProfile,
TabNext, TabNext,
TabPrev, TabPrev,
TabRename,
ToggleFullscreen, ToggleFullscreen,
WindowClose, WindowClose,
WindowNew, WindowNew,
@ -331,7 +334,6 @@ impl Action {
Self::TabNewNoProfile => Message::TabNewNoProfile, Self::TabNewNoProfile => Message::TabNewNoProfile,
Self::TabNext => Message::TabNext, Self::TabNext => Message::TabNext,
Self::TabPrev => Message::TabPrev, Self::TabPrev => Message::TabPrev,
Self::TabRename => Message::TabRenameOpen(entity_opt),
Self::ToggleFullscreen => Message::ToggleFullscreen, Self::ToggleFullscreen => Message::ToggleFullscreen,
Self::WindowClose => Message::WindowClose, Self::WindowClose => Message::WindowClose,
Self::WindowNew => Message::WindowNew, Self::WindowNew => Message::WindowNew,
@ -365,7 +367,7 @@ pub enum Message {
ColorSchemeRename(ColorSchemeKind, ColorSchemeId, String), ColorSchemeRename(ColorSchemeKind, ColorSchemeId, String),
ColorSchemeRenameSubmit, ColorSchemeRenameSubmit,
ColorSchemeTabActivate(widget::segmented_button::Entity), ColorSchemeTabActivate(widget::segmented_button::Entity),
Config(Box<Config>), Config(Config),
Copy(Option<segmented_button::Entity>), Copy(Option<segmented_button::Entity>),
CopyOrSigint(Option<segmented_button::Entity>), CopyOrSigint(Option<segmented_button::Entity>),
CopyPrimary(Option<segmented_button::Entity>), CopyPrimary(Option<segmented_button::Entity>),
@ -377,7 +379,7 @@ pub enum Message {
DefaultFontStretch(usize), DefaultFontStretch(usize),
DefaultFontWeight(usize), DefaultFontWeight(usize),
DefaultZoomStep(usize), DefaultZoomStep(usize),
DialogMessage(Box<DialogMessage>), // DialogMessage is huge, so we use a box to make the size of this enum smaller on the stack DialogMessage(DialogMessage),
Drop(Option<(pane_grid::Pane, segmented_button::Entity, DndDrop)>), Drop(Option<(pane_grid::Pane, segmented_button::Entity, DndDrop)>),
Find(bool), Find(bool),
FindNext, FindNext,
@ -429,7 +431,6 @@ pub enum Message {
ShowHeaderBar(bool), ShowHeaderBar(bool),
SyntaxTheme(ColorSchemeKind, usize), SyntaxTheme(ColorSchemeKind, usize),
SystemThemeChange, SystemThemeChange,
TabNewInheritWorkingDirectory(bool),
TabActivate(segmented_button::Entity), TabActivate(segmented_button::Entity),
TabActivateJump(usize), TabActivateJump(usize),
TabClose(Option<segmented_button::Entity>), TabClose(Option<segmented_button::Entity>),
@ -439,12 +440,6 @@ pub enum Message {
TabNewNoProfile, TabNewNoProfile,
TabNext, TabNext,
TabPrev, TabPrev,
TabRenameOpenForPane(pane_grid::Pane, segmented_button::Entity),
TabRenameOpen(Option<segmented_button::Entity>),
TabRenameInput(String),
TabRenameCommit,
TabRenameCancel,
TabRenameResetToDefault,
TermEvent(pane_grid::Pane, segmented_button::Entity, TermEvent), TermEvent(pane_grid::Pane, segmented_button::Entity, TermEvent),
TermEventTx(mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, TermEvent)>), TermEventTx(mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, TermEvent)>),
ToggleFullscreen, ToggleFullscreen,
@ -458,7 +453,6 @@ pub enum Message {
ZoomIn, ZoomIn,
ZoomOut, ZoomOut,
ZoomReset, ZoomReset,
ContextMenuPopupClosed(window::Id),
} }
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
@ -518,8 +512,6 @@ pub struct App {
color_scheme_expanded: Option<(ColorSchemeKind, Option<ColorSchemeId>)>, color_scheme_expanded: Option<(ColorSchemeKind, Option<ColorSchemeId>)>,
color_scheme_renaming: Option<(ColorSchemeKind, ColorSchemeId, String)>, color_scheme_renaming: Option<(ColorSchemeKind, ColorSchemeId, String)>,
color_scheme_rename_id: widget::Id, color_scheme_rename_id: widget::Id,
rename_tab: Option<(segmented_button::Entity, String)>,
rename_tab_id: widget::Id,
color_scheme_tab_model: widget::segmented_button::SingleSelectModel, color_scheme_tab_model: widget::segmented_button::SingleSelectModel,
profile_expanded: Option<ProfileId>, profile_expanded: Option<ProfileId>,
show_advanced_font_settings: bool, show_advanced_font_settings: bool,
@ -531,14 +523,6 @@ pub struct App {
shortcut_search_regex: Option<regex::Regex>, shortcut_search_regex: Option<regex::Regex>,
shortcut_search_value: String, shortcut_search_value: String,
modifiers: Modifiers, modifiers: Modifiers,
context_menu_popup: Option<(
window::Id,
pane_grid::Pane,
segmented_button::Entity,
Option<String>,
widget::Id,
cosmic::iced::Point,
)>,
#[cfg(feature = "password_manager")] #[cfg(feature = "password_manager")]
password_mgr: password_manager::PasswordManager, password_mgr: password_manager::PasswordManager,
} }
@ -561,7 +545,8 @@ impl App {
.config .config
.color_schemes(color_scheme_kind) .color_schemes(color_scheme_kind)
.get(&color_scheme_id) .get(&color_scheme_id)
&& self {
if self
.themes .themes
.insert( .insert(
(color_scheme_name.clone(), color_scheme_kind), (color_scheme_name.clone(), color_scheme_kind),
@ -577,6 +562,7 @@ impl App {
} }
} }
} }
}
self.theme_names_dark.clear(); self.theme_names_dark.clear();
self.theme_names_light.clear(); self.theme_names_light.clear();
@ -607,18 +593,6 @@ impl App {
} }
} }
fn reset_active_pane_zoom(&mut self) {
if let Some(tab_model) = self.pane_model.active() {
for entity in tab_model.iter() {
if tab_model.is_active(entity)
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
{
terminal.lock().unwrap().set_zoom_adj(0);
}
}
}
}
fn save_shortcuts_custom(&mut self) { fn save_shortcuts_custom(&mut self) {
self.config.shortcuts_custom = self.shortcuts_config.custom.clone(); self.config.shortcuts_custom = self.shortcuts_config.custom.clone();
match &self.config_handler { match &self.config_handler {
@ -716,9 +690,8 @@ impl App {
// but only for the active pane/tab // but only for the active pane/tab
if let Some(tab_model) = self.pane_model.active() { if let Some(tab_model) = self.pane_model.active() {
for entity in tab_model.iter() { for entity in tab_model.iter() {
if tab_model.is_active(entity) if tab_model.is_active(entity) {
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
{
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
let current_zoom_adj = terminal.zoom_adj(); let current_zoom_adj = terminal.zoom_adj();
match zoom_message { match zoom_message {
@ -734,22 +707,23 @@ impl App {
} }
} }
} }
}
Task::none() Task::none()
} }
fn save_color_schemes(&mut self, color_scheme_kind: ColorSchemeKind) -> Task<Message> { fn save_color_schemes(&mut self, color_scheme_kind: ColorSchemeKind) -> Task<Message> {
// Optimized for just saving color_schemes // Optimized for just saving color_schemes
if let Some(ref config_handler) = self.config_handler if let Some(ref config_handler) = self.config_handler {
&& let Err(err) = config_handler.set( if let Err(err) = config_handler.set(
match color_scheme_kind { match color_scheme_kind {
ColorSchemeKind::Dark => "color_schemes_dark", ColorSchemeKind::Dark => "color_schemes_dark",
ColorSchemeKind::Light => "color_schemes_light", ColorSchemeKind::Light => "color_schemes_light",
}, },
self.config.color_schemes(color_scheme_kind), self.config.color_schemes(color_scheme_kind),
) ) {
{
log::error!("failed to save config: {}", err); log::error!("failed to save config: {}", err);
} }
}
self.update_color_schemes(); self.update_color_schemes();
Task::none() Task::none()
} }
@ -768,21 +742,19 @@ impl App {
} }
fn update_focus(&self) -> Task<Message> { fn update_focus(&self) -> Task<Message> {
if self.rename_tab.is_some() { if self.find {
widget::text_input::focus(self.rename_tab_id.clone())
} else if self.find {
widget::text_input::focus(self.find_search_id.clone()) widget::text_input::focus(self.find_search_id.clone())
} else if self.core.window.show_context { } else if self.core.window.show_context {
// Right now we only care about the KeyboardShortcuts context page, so we use a simple if. match self.context_page {
// In the future if we are to care about other conext pages, we could switch this to a match ContextPage::KeyboardShortcuts => {
// statement instead to be cleaner. if self.shortcut_search_focus.get() {
if self.context_page == ContextPage::KeyboardShortcuts
&& self.shortcut_search_focus.get()
{
self.shortcut_search_focus.set(false); self.shortcut_search_focus.set(false);
return widget::text_input::focus(self.shortcut_search_id.clone()); return widget::text_input::focus(self.shortcut_search_id.clone());
} }
}
// TODO focus for other context pages?
_ => {}
}
Task::none() Task::none()
} else if let Some(terminal_id) = self.terminal_ids.get(&self.pane_model.focused()).cloned() } else if let Some(terminal_id) = self.terminal_ids.get(&self.pane_model.focused()).cloned()
{ {
@ -1045,11 +1017,11 @@ impl App {
let mut found_actions = false; let mut found_actions = false;
for action in group.actions { for action in group.actions {
let action_label = shortcuts::action_label(action); let action_label = shortcuts::action_label(action);
if let Some(regex) = &self.shortcut_search_regex if let Some(regex) = &self.shortcut_search_regex {
&& regex.find(&action_label).is_none() if regex.find(&action_label).is_none() {
{
continue; continue;
} }
}
found_actions = true; found_actions = true;
let (bindings, changed) = self.shortcuts_config.bindings_for_action(action); let (bindings, changed) = self.shortcuts_config.bindings_for_action(action);
@ -1511,20 +1483,10 @@ impl App {
.toggler(self.config.focus_follow_mouse, Message::FocusFollowMouse), .toggler(self.config.focus_follow_mouse, Message::FocusFollowMouse),
); );
let advanced_section = widget::settings::section() let advanced_section = widget::settings::section().title(fl!("advanced")).add(
.title(fl!("advanced"))
.add(
widget::settings::item::builder(fl!("show-headerbar")) widget::settings::item::builder(fl!("show-headerbar"))
.description(fl!("show-header-description")) .description(fl!("show-header-description"))
.toggler(self.config.show_headerbar, Message::ShowHeaderBar), .toggler(self.config.show_headerbar, Message::ShowHeaderBar),
)
.add(
widget::settings::item::builder(fl!("tab-new-inherit-working-directory"))
.description(fl!("tab-new-inherit-working-directory-description"))
.toggler(
self.config.tab_new_inherit_working_directory,
Message::TabNewInheritWorkingDirectory,
),
); );
widget::settings::view_column(vec![ widget::settings::view_column(vec![
@ -1539,23 +1501,11 @@ impl App {
self.config.default_profile self.config.default_profile
} }
fn active_terminal_working_directory(&self) -> Option<PathBuf> {
let tab_model = self.pane_model.active()?;
let entity = tab_model.active();
let terminal = tab_model.data::<Mutex<Terminal>>(entity)?;
let terminal = terminal.lock().unwrap();
terminal.working_directory()
}
fn create_and_focus_new_terminal( fn create_and_focus_new_terminal(
&mut self, &mut self,
pane: pane_grid::Pane, pane: pane_grid::Pane,
profile_id_opt: Option<ProfileId>, profile_id_opt: Option<ProfileId>,
inherit_working_directory: bool,
) -> Task<Message> { ) -> Task<Message> {
let inherited_working_directory = inherit_working_directory
.then(|| self.active_terminal_working_directory())
.flatten();
self.pane_model.set_focus(pane); self.pane_model.set_focus(pane);
match &self.term_event_tx_opt { match &self.term_event_tx_opt {
Some(term_event_tx) => { Some(term_event_tx) => {
@ -1584,21 +1534,20 @@ impl App {
self.startup_options.take().unwrap_or_default(); self.startup_options.take().unwrap_or_default();
let options = tty::Options { let options = tty::Options {
shell: startup_options.shell.or_else(|| { shell: startup_options.shell.or_else(|| {
if let Some(mut args) = shlex::split(&profile.command) if let Some(mut args) = shlex::split(&profile.command) {
&& !args.is_empty() if !args.is_empty() {
{
let command = args.remove(0); let command = args.remove(0);
return Some(tty::Shell::new(command, args)); return Some(tty::Shell::new(command, args));
} }
None }
return None;
}), }),
working_directory: startup_options working_directory: startup_options.working_directory.or_else(
.working_directory || {
.or_else(|| inherited_working_directory.clone())
.or_else(|| {
(!profile.working_directory.is_empty()) (!profile.working_directory.is_empty())
.then(|| profile.working_directory.clone().into()) .then(|| profile.working_directory.clone().into())
}), },
),
drain_on_exit: startup_options.drain_on_exit drain_on_exit: startup_options.drain_on_exit
|| profile.drain_on_exit, || profile.drain_on_exit,
..startup_options ..startup_options
@ -1610,11 +1559,7 @@ impl App {
}; };
(options, tab_title_override) (options, tab_title_override)
} else { } else {
let mut options = self.startup_options.take().unwrap_or_default(); (self.startup_options.take().unwrap_or_default(), None)
if options.working_directory.is_none() {
options.working_directory = inherited_working_directory.clone();
}
(options, None)
}; };
let entity = tab_model let entity = tab_model
@ -1884,8 +1829,6 @@ impl Application for App {
color_scheme_expanded: None, color_scheme_expanded: None,
color_scheme_renaming: None, color_scheme_renaming: None,
color_scheme_rename_id: widget::Id::unique(), color_scheme_rename_id: widget::Id::unique(),
rename_tab: None,
rename_tab_id: widget::Id::unique(),
color_scheme_tab_model: widget::segmented_button::Model::default(), color_scheme_tab_model: widget::segmented_button::Model::default(),
profile_expanded: None, profile_expanded: None,
show_advanced_font_settings: false, show_advanced_font_settings: false,
@ -1897,7 +1840,6 @@ impl Application for App {
shortcut_search_regex: None, shortcut_search_regex: None,
shortcut_search_value: String::new(), shortcut_search_value: String::new(),
modifiers: Modifiers::empty(), modifiers: Modifiers::empty(),
context_menu_popup: None,
#[cfg(feature = "password_manager")] #[cfg(feature = "password_manager")]
password_mgr: Default::default(), password_mgr: Default::default(),
}; };
@ -2004,13 +1946,13 @@ impl Application for App {
.get(&color_scheme_id) .get(&color_scheme_id)
.map(|color_scheme| color_scheme.name.clone()), .map(|color_scheme| color_scheme.name.clone()),
None => Some(format!("COSMIC {:?}", color_scheme_kind)), None => Some(format!("COSMIC {:?}", color_scheme_kind)),
} && self.dialog_opt.is_none() } {
{ if self.dialog_opt.is_none() {
let (dialog, command) = Dialog::new( let (dialog, command) = Dialog::new(
DialogSettings::new().kind(DialogKind::SaveFile { DialogSettings::new().kind(DialogKind::SaveFile {
filename: format!("{}.ron", color_scheme_name), filename: format!("{}.ron", color_scheme_name),
}), }),
|msg| Message::DialogMessage(Box::new(msg)), Message::DialogMessage,
move |result| { move |result| {
Message::ColorSchemeExportResult( Message::ColorSchemeExportResult(
color_scheme_kind, color_scheme_kind,
@ -2023,6 +1965,7 @@ impl Application for App {
return command; return command;
} }
} }
}
Message::ColorSchemeExportResult(color_scheme_kind, color_scheme_id_opt, result) => { Message::ColorSchemeExportResult(color_scheme_kind, color_scheme_id_opt, result) => {
//TODO: show errors in UI //TODO: show errors in UI
self.dialog_opt = None; self.dialog_opt = None;
@ -2108,7 +2051,7 @@ impl Application for App {
self.color_scheme_errors.clear(); self.color_scheme_errors.clear();
let (dialog, command) = Dialog::new( let (dialog, command) = Dialog::new(
DialogSettings::new().kind(DialogKind::OpenMultipleFiles), DialogSettings::new().kind(DialogKind::OpenMultipleFiles),
|msg| Message::DialogMessage(Box::new(msg)), Message::DialogMessage,
move |result| Message::ColorSchemeImportResult(color_scheme_kind, result), move |result| Message::ColorSchemeImportResult(color_scheme_kind, result),
); );
self.dialog_opt = Some(dialog); self.dialog_opt = Some(dialog);
@ -2162,7 +2105,8 @@ impl Application for App {
Message::ColorSchemeRenameSubmit => { Message::ColorSchemeRenameSubmit => {
if let Some((color_scheme_kind, color_scheme_id, color_scheme_name)) = if let Some((color_scheme_kind, color_scheme_id, color_scheme_name)) =
self.color_scheme_renaming.take() self.color_scheme_renaming.take()
&& let Some(color_scheme) = self {
if let Some(color_scheme) = self
.config .config
.color_schemes_mut(color_scheme_kind) .color_schemes_mut(color_scheme_kind)
.get_mut(&color_scheme_id) .get_mut(&color_scheme_id)
@ -2171,6 +2115,7 @@ impl Application for App {
return self.save_color_schemes(color_scheme_kind); return self.save_color_schemes(color_scheme_kind);
} }
} }
}
Message::ColorSchemeTabActivate(entity) => { Message::ColorSchemeTabActivate(entity) => {
if let Some(color_scheme_kind) = if let Some(color_scheme_kind) =
self.color_scheme_tab_model.data::<ColorSchemeKind>(entity) self.color_scheme_tab_model.data::<ColorSchemeKind>(entity)
@ -2182,11 +2127,11 @@ impl Application for App {
} }
} }
Message::Config(config) => { Message::Config(config) => {
if *config != self.config { if config != self.config {
let shortcuts_changed = config.shortcuts_custom != self.config.shortcuts_custom; let shortcuts_changed = config.shortcuts_custom != self.config.shortcuts_custom;
log::info!("update config"); log::info!("update config");
//TODO: update syntax theme by clearing tabs, only if needed //TODO: update syntax theme by clearing tabs, only if needed
self.config = *config; self.config = config;
if shortcuts_changed { if shortcuts_changed {
self.shortcuts_config = self.shortcuts_config =
shortcuts::ShortcutsConfig::new(self.config.shortcuts_custom.clone()); shortcuts::ShortcutsConfig::new(self.config.shortcuts_custom.clone());
@ -2350,8 +2295,7 @@ impl Application for App {
}, },
Message::DialogMessage(dialog_message) => { Message::DialogMessage(dialog_message) => {
if let Some(dialog) = &mut self.dialog_opt { if let Some(dialog) = &mut self.dialog_opt {
// DialogMessage is boxed, so we need to dereference it before updating return dialog.update(dialog_message);
return dialog.update(*dialog_message);
} }
} }
Message::Drop(Some((pane, entity, data))) => { Message::Drop(Some((pane, entity, data))) => {
@ -2390,29 +2334,29 @@ impl Application for App {
return self.update_focus(); return self.update_focus();
} }
Message::FindNext => { Message::FindNext => {
if !self.find_search_value.is_empty() if !self.find_search_value.is_empty() {
&& let Some(tab_model) = self.pane_model.active() if let Some(tab_model) = self.pane_model.active() {
{
let entity = tab_model.active(); let entity = tab_model.active();
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
terminal.search(&self.find_search_value, true); terminal.search(&self.find_search_value, true);
} }
} }
}
// Focus correct input // Focus correct input
return self.update_focus(); return self.update_focus();
} }
Message::FindPrevious => { Message::FindPrevious => {
if !self.find_search_value.is_empty() if !self.find_search_value.is_empty() {
&& let Some(tab_model) = self.pane_model.active() if let Some(tab_model) = self.pane_model.active() {
{
let entity = tab_model.active(); let entity = tab_model.active();
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
terminal.search(&self.find_search_value, false); terminal.search(&self.find_search_value, false);
} }
} }
}
// Focus correct input // Focus correct input
return self.update_focus(); return self.update_focus();
@ -2487,6 +2431,7 @@ impl Application for App {
if let Some(tab_model) = self.pane_model.active() { if let Some(tab_model) = self.pane_model.active() {
let entity = tab_model.active(); let entity = tab_model.active();
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
// Update context menu position
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
if let Some(url) = if let Some(url) =
terminal.context_menu.as_ref().and_then(|m| m.link.as_ref()) terminal.context_menu.as_ref().and_then(|m| m.link.as_ref())
@ -2505,13 +2450,15 @@ impl Application for App {
if let Some(tab_model) = self.pane_model.active() { if let Some(tab_model) = self.pane_model.active() {
let entity = tab_model.active(); let entity = tab_model.active();
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
// Update context menu position
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
if let Some(url) = if let Some(url) =
terminal.context_menu.as_ref().and_then(|m| m.link.as_ref()) terminal.context_menu.as_ref().and_then(|m| m.link.as_ref())
&& let Err(err) = open::that_detached(url)
{ {
if let Err(err) = open::that_detached(url) {
log::warn!("failed to open {:?}: {}", url, err); log::warn!("failed to open {:?}: {}", url, err);
} }
}
terminal.context_menu = None; terminal.context_menu = None;
terminal.active_regex_match = None; terminal.active_regex_match = None;
terminal.needs_update = true; terminal.needs_update = true;
@ -2594,7 +2541,7 @@ impl Application for App {
if let Some((pane, _)) = result { if let Some((pane, _)) = result {
self.terminal_ids.insert(pane, widget::Id::unique()); self.terminal_ids.insert(pane, widget::Id::unique());
let command = let command =
self.create_and_focus_new_terminal(pane, self.get_default_profile(), false); self.create_and_focus_new_terminal(pane, self.get_default_profile());
self.pane_model.panes_created += 1; self.pane_model.panes_created += 1;
return command; return command;
} }
@ -2706,11 +2653,8 @@ impl Application for App {
return self.save_profiles(); return self.save_profiles();
} }
Message::ProfileOpen(profile_id) => { Message::ProfileOpen(profile_id) => {
return self.create_and_focus_new_terminal( return self
self.pane_model.focused(), .create_and_focus_new_terminal(self.pane_model.focused(), Some(profile_id));
Some(profile_id),
false,
);
} }
Message::ProfileRemove(profile_id) => { Message::ProfileRemove(profile_id) => {
// Reset matching terminals to default profile // Reset matching terminals to default profile
@ -2776,12 +2720,6 @@ impl Application for App {
return self.update_config(); return self.update_config();
} }
} }
Message::TabNewInheritWorkingDirectory(tab_new_inherit_working_directory) => {
config_set!(
tab_new_inherit_working_directory,
tab_new_inherit_working_directory
);
}
Message::UseBrightBold(use_bright_bold) => { Message::UseBrightBold(use_bright_bold) => {
if use_bright_bold != self.config.use_bright_bold { if use_bright_bold != self.config.use_bright_bold {
config_set!(use_bright_bold, use_bright_bold); config_set!(use_bright_bold, use_bright_bold);
@ -2872,19 +2810,9 @@ impl Application for App {
return self.update_title(None); return self.update_title(None);
} }
Message::TabContextAction(entity, action) => { Message::TabContextAction(entity, action) => {
// Close context menu popup if let Some(tab_model) = self.pane_model.active() {
let mut tasks = Vec::new(); if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
if let Some((_popup_id, _, _, _, _, _)) = self.context_menu_popup.take() { // Close context menu
#[cfg(feature = "wayland")]
if is_wayland() {
tasks.push(cosmic::task::message(Message::Surface(
cosmic::surface::action::destroy_popup(_popup_id),
)));
}
}
// Close terminal context menu state
if let Some(tab_model) = self.pane_model.active()
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
{ {
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
//Some actions need the menu_state, //Some actions need the menu_state,
@ -2900,110 +2828,45 @@ impl Application for App {
} }
} }
} }
tasks.push(self.update(action.message(Some(entity)))); // Run action's message
return cosmic::Task::batch(tasks); return self.update(action.message(Some(entity)));
}
}
} }
Message::TabContextMenu(pane, menu_state) => { Message::TabContextMenu(pane, menu_state) => {
#[allow(unused_mut)] // Close any existing context menues
let mut tasks = Vec::new(); let panes: Vec<_> = self.pane_model.panes.iter().collect();
for (_pane, tab_model) in panes {
// Close existing context menu popup if any let entity = tab_model.active();
if let Some((_popup_id, _, _, _, _, _)) = self.context_menu_popup.take() {
#[cfg(feature = "wayland")]
if is_wayland() {
tasks.push(cosmic::task::message(Message::Surface(
cosmic::surface::action::destroy_popup(_popup_id),
)));
}
}
// Clear all terminal context_menu state
for (_, tab_model) in self.pane_model.panes.iter() {
for entity in tab_model.iter() {
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
terminal.context_menu = None; terminal.context_menu = None;
} }
} }
}
if let Some(menu_state) = menu_state { // Show the context menu on the correct pane / terminal
if let Some(_position) = menu_state.position {
let local_position = menu_state.local_position.unwrap_or(_position);
if let Some(tab_model) = self.pane_model.panes.get(pane) { if let Some(tab_model) = self.pane_model.panes.get(pane) {
let entity = tab_model.active(); let entity = tab_model.active();
let link = menu_state.link.clone();
let popup_id = window::Id::unique();
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
// Update context menu position
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
terminal.context_menu = Some(menu_state); terminal.context_menu = menu_state;
}
} }
self.context_menu_popup = Some(( // Shift focus to the pane / terminal
popup_id, // with the context menu
pane,
entity,
link,
widget::Id::unique(),
local_position,
));
#[cfg(feature = "wayland")]
if is_wayland() {
let main_window = self.core.main_window_id().unwrap();
let pos_x = _position.x as i32;
let pos_y = _position.y as i32;
tasks.push(cosmic::task::message(Message::Surface(
cosmic::surface::action::app_popup(move |_app: &mut Self| {
use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity};
use cosmic::iced::runtime::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner};
SctkPopupSettings {
parent: main_window,
id: popup_id,
positioner: SctkPositioner {
size: None,
anchor_rect: cosmic::iced::Rectangle {
x: pos_x,
y: pos_y,
width: 1,
height: 1,
},
anchor: Anchor::None,
gravity: Gravity::BottomRight,
reactive: true,
..Default::default()
},
parent_size: None,
grab: true,
close_with_children: false,
input_zone: None,
}
}, None),
)));
}
}
}
self.pane_model.set_focus(pane); self.pane_model.set_focus(pane);
} return self.update_title(Some(pane));
return cosmic::Task::batch(tasks);
} }
Message::TabNew => { Message::TabNew => {
return self.create_and_focus_new_terminal( return self.create_and_focus_new_terminal(
self.pane_model.focused(), self.pane_model.focused(),
self.get_default_profile(), self.get_default_profile(),
self.config.tab_new_inherit_working_directory,
); );
} }
Message::TabNewNoProfile => { Message::TabNewNoProfile => {
return self.create_and_focus_new_terminal( return self.create_and_focus_new_terminal(self.pane_model.focused(), None);
self.pane_model.focused(),
None,
self.config.tab_new_inherit_working_directory,
);
} }
Message::TabNext => { Message::TabNext => {
if let Some(tab_model) = self.pane_model.active() { if let Some(tab_model) = self.pane_model.active() {
@ -3025,7 +2888,9 @@ impl Application for App {
let pos = tab_model let pos = tab_model
.position(tab_model.active()) .position(tab_model.active())
.and_then(|i| (i as usize).checked_sub(1)) .and_then(|i| (i as usize).checked_sub(1))
.unwrap_or_else(|| tab_model.iter().count().saturating_sub(1)); .unwrap_or_else(|| {
tab_model.iter().count().checked_sub(1).unwrap_or_default()
});
let entity = tab_model.iter().nth(pos); let entity = tab_model.iter().nth(pos);
if let Some(entity) = entity { if let Some(entity) = entity {
@ -3033,64 +2898,6 @@ impl Application for App {
} }
} }
} }
Message::TabRenameOpenForPane(pane, entity) => {
self.pane_model.set_focus(pane);
return self.update(Message::TabRenameOpen(Some(entity)));
}
Message::TabRenameOpen(entity_opt) => {
if let Some(tab_model) = self.pane_model.active() {
let entity = entity_opt.unwrap_or_else(|| tab_model.active());
let initial = tab_model
.text(entity)
.map(|s| s.to_string())
.unwrap_or_default();
self.rename_tab = Some((entity, initial));
self.pane_model.unfocus_all_terminals();
return self.update_focus();
}
}
Message::TabRenameInput(value) => {
if let Some((_, buffer)) = self.rename_tab.as_mut() {
*buffer = value;
}
}
Message::TabRenameCommit => {
if let Some((entity, value)) = self.rename_tab.take() {
let trimmed = value.trim().to_string();
if let Some(tab_model) = self.pane_model.active_mut() {
if trimmed.is_empty() {
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
terminal.lock().unwrap().tab_title_override = None;
}
tab_model.text_set(entity, fl!("new-terminal"));
} else {
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
terminal.lock().unwrap().tab_title_override = Some(trimmed.clone());
}
tab_model.text_set(entity, trimmed);
}
}
self.pane_model.update_terminal_focus();
return self.update_title(None);
}
}
Message::TabRenameCancel => {
self.rename_tab = None;
self.pane_model.update_terminal_focus();
}
Message::TabRenameResetToDefault => {
if let Some((entity, _)) = self.rename_tab.take()
&& let Some(tab_model) = self.pane_model.active_mut()
{
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
terminal.lock().unwrap().tab_title_override = None;
}
tab_model.text_set(entity, fl!("new-terminal"));
self.pane_model.update_terminal_focus();
return self.update_title(None);
}
self.pane_model.update_terminal_focus();
}
Message::TermEvent(pane, entity, event) => { Message::TermEvent(pane, entity, event) => {
match event { match event {
TermEvent::Bell => { TermEvent::Bell => {
@ -3122,15 +2929,15 @@ impl Application for App {
} }
}, },
TermEvent::ColorRequest(index, f) => { TermEvent::ColorRequest(index, f) => {
if let Some(tab_model) = self.pane_model.panes.get(pane) if let Some(tab_model) = self.pane_model.panes.get(pane) {
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
{
let terminal = terminal.lock().unwrap(); let terminal = terminal.lock().unwrap();
let rgb = terminal.colors()[index].unwrap_or_default(); let rgb = terminal.colors()[index].unwrap_or_default();
let text = f(rgb); let text = f(rgb);
terminal.input_no_scroll(text.into_bytes()); terminal.input_no_scroll(text.into_bytes());
} }
} }
}
TermEvent::CursorBlinkingChange => { TermEvent::CursorBlinkingChange => {
//TODO: should we blink the cursor? //TODO: should we blink the cursor?
} }
@ -3138,13 +2945,13 @@ impl Application for App {
return self.update(Message::TabClose(Some(entity))); return self.update(Message::TabClose(Some(entity)));
} }
TermEvent::PtyWrite(text) => { TermEvent::PtyWrite(text) => {
if let Some(tab_model) = self.pane_model.panes.get(pane) if let Some(tab_model) = self.pane_model.panes.get(pane) {
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
{
let terminal = terminal.lock().unwrap(); let terminal = terminal.lock().unwrap();
terminal.input_no_scroll(text.into_bytes()); terminal.input_no_scroll(text.into_bytes());
} }
} }
}
TermEvent::ResetTitle => { TermEvent::ResetTitle => {
if let Some(tab_model) = self.pane_model.panes.get_mut(pane) { if let Some(tab_model) = self.pane_model.panes.get_mut(pane) {
let tab_title_override = let tab_title_override =
@ -3162,14 +2969,14 @@ impl Application for App {
return self.update_title(Some(pane)); return self.update_title(Some(pane));
} }
TermEvent::TextAreaSizeRequest(f) => { TermEvent::TextAreaSizeRequest(f) => {
if let Some(tab_model) = self.pane_model.panes.get(pane) if let Some(tab_model) = self.pane_model.panes.get(pane) {
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
{
let terminal = terminal.lock().unwrap(); let terminal = terminal.lock().unwrap();
let text = f(terminal.size().into()); let text = f(terminal.size().into());
terminal.input_no_scroll(text.into_bytes()); terminal.input_no_scroll(text.into_bytes());
} }
} }
}
TermEvent::Title(title) => { TermEvent::Title(title) => {
if let Some(tab_model) = self.pane_model.panes.get_mut(pane) { if let Some(tab_model) = self.pane_model.panes.get_mut(pane) {
let has_override = let has_override =
@ -3186,13 +2993,13 @@ impl Application for App {
return self.update_title(Some(pane)); return self.update_title(Some(pane));
} }
TermEvent::MouseCursorDirty | TermEvent::Wakeup => { TermEvent::MouseCursorDirty | TermEvent::Wakeup => {
if let Some(tab_model) = self.pane_model.panes.get(pane) if let Some(tab_model) = self.pane_model.panes.get(pane) {
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
{
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
terminal.needs_update = true; terminal.needs_update = true;
} }
} }
}
TermEvent::ChildExit(_error_code) => { TermEvent::ChildExit(_error_code) => {
//Ignore this for now //Ignore this for now
} }
@ -3323,25 +3130,9 @@ impl Application for App {
return self.update_render_active_pane_zoom(message); return self.update_render_active_pane_zoom(message);
} }
Message::ZoomReset => { Message::ZoomReset => {
self.reset_active_pane_zoom(); self.reset_terminal_panes_zoom();
return self.update_config(); return self.update_config();
} }
Message::ContextMenuPopupClosed(id) => {
if let Some((popup_id, pane, entity, _, _, _)) = &self.context_menu_popup
&& id == *popup_id
{
// Clear link underline on the terminal
if let Some(tab_model) = self.pane_model.panes.get(*pane)
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(*entity)
{
let mut terminal = terminal.lock().unwrap();
terminal.context_menu = None;
terminal.active_regex_match = None;
terminal.needs_update = true;
}
self.context_menu_popup = None;
}
}
Message::Surface(a) => { Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic( return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a), cosmic::app::Action::Surface(a),
@ -3407,31 +3198,6 @@ impl Application for App {
} }
fn dialog(&self) -> Option<Element<'_, Message>> { fn dialog(&self) -> Option<Element<'_, Message>> {
if let Some((_, buffer)) = self.rename_tab.as_ref() {
let input = widget::text_input(fl!("tab-name-placeholder"), buffer)
.id(self.rename_tab_id.clone())
.on_input(Message::TabRenameInput)
.on_submit(|_| Message::TabRenameCommit);
return Some(
widget::dialog()
.title(fl!("tab-rename-title"))
.control(input)
.primary_action(
widget::button::suggested(fl!("confirm"))
.on_press(Message::TabRenameCommit),
)
.secondary_action(
widget::button::standard(fl!("cancel")).on_press(Message::TabRenameCancel),
)
.tertiary_action(
widget::button::text(fl!("reset"))
.on_press(Message::TabRenameResetToDefault),
)
.into(),
);
}
let conflict = self.shortcut_conflict.as_ref()?; let conflict = self.shortcut_conflict.as_ref()?;
let binding = shortcuts::binding_display(&conflict.binding); let binding = shortcuts::binding_display(&conflict.binding);
let existing = shortcuts::action_label(conflict.existing_action); let existing = shortcuts::action_label(conflict.existing_action);
@ -3473,26 +3239,7 @@ impl Application for App {
] ]
} }
fn on_close_requested(&self, id: window::Id) -> Option<Self::Message> {
if let Some((popup_id, _, _, _, _, _)) = &self.context_menu_popup
&& id == *popup_id
{
return Some(Message::ContextMenuPopupClosed(id));
}
None
}
fn view_window(&self, window_id: window::Id) -> Element<'_, Message> { fn view_window(&self, window_id: window::Id) -> Element<'_, Message> {
if let Some((popup_id, _pane, entity, ref link, ref autosize_id, _)) =
self.context_menu_popup
&& window_id == popup_id
{
return widget::autosize::autosize(
menu::context_menu(&self.config, &self.key_binds, entity, link.clone()),
autosize_id.clone(),
)
.into();
}
match &self.dialog_opt { match &self.dialog_opt {
Some(dialog) => dialog.view(window_id), Some(dialog) => dialog.view(window_id),
None => widget::text("Unknown window ID").into(), None => widget::text("Unknown window ID").into(),
@ -3506,6 +3253,7 @@ impl Application for App {
let pane_grid = PaneGrid::new(&self.pane_model.panes, |pane, tab_model, _is_maximized| { let pane_grid = PaneGrid::new(&self.pane_model.panes, |pane, tab_model, _is_maximized| {
let mut tab_column = widget::column::with_capacity(1); let mut tab_column = widget::column::with_capacity(1);
if tab_model.iter().count() > 1 {
tab_column = tab_column.push( tab_column = tab_column.push(
widget::container( widget::container(
widget::tab_bar::horizontal(tab_model) widget::tab_bar::horizontal(tab_model)
@ -3515,15 +3263,16 @@ impl Application for App {
.button_height(32) .button_height(32)
.button_spacing(space_xxs) .button_spacing(space_xxs)
.on_activate(Message::TabActivate) .on_activate(Message::TabActivate)
.on_close(|entity| Message::TabClose(Some(entity))) .on_close(|entity| Message::TabClose(Some(entity))),
.on_context(move |entity| Message::TabRenameOpenForPane(pane, entity)),
) )
.class(style::Container::Custom(Box::new(|theme| { .class(style::Container::Custom(Box::new(|theme| {
let cosmic = theme.cosmic(); let cosmic = theme.cosmic();
cosmic::iced::widget::container::Style { cosmic::iced_widget::container::Style {
icon_color: Some(Color::from(cosmic.background.on)), icon_color: Some(Color::from(cosmic.background.on)),
text_color: Some(Color::from(cosmic.background.on)), text_color: Some(Color::from(cosmic.background.on)),
background: Some(iced::Background::Color(cosmic.background.base.into())), background: Some(iced::Background::Color(
cosmic.background.base.into(),
)),
border: iced::Border::default(), border: iced::Border::default(),
shadow: iced::Shadow::default(), shadow: iced::Shadow::default(),
snap: true, snap: true,
@ -3531,6 +3280,7 @@ impl Application for App {
}))) })))
.width(Length::Fill), .width(Length::Fill),
); );
}
let entity = tab_model.active(); let entity = tab_model.active();
let entity_middle_click = tab_model.active(); let entity_middle_click = tab_model.active();
@ -3542,7 +3292,7 @@ impl Application for App {
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
let mut terminal_box = terminal_box(terminal, &self.key_binds) let mut terminal_box = terminal_box(terminal, &self.key_binds)
.id(terminal_id) .id(terminal_id)
.disabled(self.core.window.show_context || self.rename_tab.is_some()) .disabled(self.core.window.show_context)
.on_context_menu(move |menu_state| Message::TabContextMenu(pane, menu_state)) .on_context_menu(move |menu_state| Message::TabContextMenu(pane, menu_state))
.on_middle_click(move || Message::MiddleClick(pane, Some(entity_middle_click))) .on_middle_click(move || Message::MiddleClick(pane, Some(entity_middle_click)))
.on_open_hyperlink(Some(Box::new(Message::LaunchUrl))) .on_open_hyperlink(Some(Box::new(Message::LaunchUrl)))
@ -3557,48 +3307,25 @@ impl Application for App {
terminal_box = terminal_box.on_mouse_enter(move || Message::MouseEnter(pane)); terminal_box = terminal_box.on_mouse_enter(move || Message::MouseEnter(pane));
} }
// If a context menu popup is active for this pane, inform the let context_menu = {
// terminal_box so it will emit on_context_menu(None) on click let terminal = terminal.lock().unwrap();
// to dismiss the popup. terminal.context_menu.clone()
if self.context_menu_popup.is_some() {
terminal_box = terminal_box.context_menu(cosmic::iced::Point::ORIGIN);
}
let use_wayland_popup = {
#[cfg(feature = "wayland")]
{
is_wayland()
}
#[cfg(not(feature = "wayland"))]
{
false
}
}; };
let tab_element: Element<'_, Message> = if !use_wayland_popup { let tab_element: Element<'_, Message> = match context_menu {
// Fallback: render context menu as an inline popover Some(menu_state) => match menu_state.position {
if let Some((_, popup_pane, popup_entity, ref link, _, point)) = Some(point) => widget::popover(terminal_box.context_menu(point))
self.context_menu_popup
{
if pane == popup_pane {
let mut popover = widget::popover(terminal_box.context_menu(point));
popover = popover
.popup(menu::context_menu( .popup(menu::context_menu(
&self.config, &self.config,
&self.key_binds, &self.key_binds,
popup_entity, entity,
link.clone(), menu_state.link,
)) ))
.position(widget::popover::Position::Point(point)); .position(widget::popover::Position::Point(point))
popover.into() .into(),
} else { None => terminal_box.into(),
terminal_box.into() },
} None => terminal_box.into(),
} else {
terminal_box.into()
}
} else {
terminal_box.into()
}; };
tab_column = tab_column.push(tab_element); tab_column = tab_column.push(tab_element);
} }
@ -3744,7 +3471,7 @@ impl Application for App {
update.errors update.errors
); );
} }
Message::Config(Box::new(update.config)) Message::Config(update.config)
}), }),
match &self.dialog_opt { match &self.dialog_opt {
Some(dialog) => dialog.subscription(), Some(dialog) => dialog.subscription(),
@ -3753,11 +3480,3 @@ impl Application for App {
]) ])
} }
} }
#[cfg(feature = "wayland")]
fn is_wayland() -> bool {
matches!(
cosmic::app::cosmic::windowing_system(),
Some(cosmic::app::cosmic::WindowingSystem::Wayland)
)
}

6
src/menu.rs
View file

@ -7,8 +7,8 @@ use cosmic::widget::{Column, space};
use cosmic::{ use cosmic::{
Element, Element,
app::Core, app::Core,
iced::core::Border,
iced::{Background, Length, advanced::widget::text::Style as TextStyle}, iced::{Background, Length, advanced::widget::text::Style as TextStyle},
iced_core::Border,
theme, theme,
widget::{ widget::{
self, divider, self, divider,
@ -26,7 +26,6 @@ static MENU_ID: LazyLock<cosmic::widget::Id> =
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct MenuState { pub struct MenuState {
pub position: Option<Point>, pub position: Option<Point>,
pub local_position: Option<Point>,
pub link: Option<String>, pub link: Option<String>,
} }
@ -94,9 +93,7 @@ pub fn context_menu<'a>(
)), )),
Element::from(divider::horizontal::light()), Element::from(divider::horizontal::light()),
Element::from(menu_item(fl!("new-tab"), Action::TabNew)), Element::from(menu_item(fl!("new-tab"), Action::TabNew)),
Element::from(menu_item(fl!("rename-tab"), Action::TabRename)),
Element::from(menu_item(fl!("menu-settings"), Action::Settings)), Element::from(menu_item(fl!("menu-settings"), Action::Settings)),
Element::from(menu_item(fl!("menu-about"), Action::About)),
]; ];
#[cfg(feature = "password_manager")] #[cfg(feature = "password_manager")]
{ {
@ -226,7 +223,6 @@ pub fn menu_bar<'a>(
MenuItem::Folder(fl!("profile"), profile_items), MenuItem::Folder(fl!("profile"), profile_items),
MenuItem::Button(fl!("menu-profiles"), None, Action::Profiles), MenuItem::Button(fl!("menu-profiles"), None, Action::Profiles),
MenuItem::Divider, MenuItem::Divider,
MenuItem::Button(fl!("rename-tab"), None, Action::TabRename),
MenuItem::Button(fl!("close-tab"), None, Action::TabClose), MenuItem::Button(fl!("close-tab"), None, Action::TabClose),
MenuItem::Divider, MenuItem::Divider,
MenuItem::Button(fl!("quit"), None, Action::WindowClose), MenuItem::Button(fl!("quit"), None, Action::WindowClose),

29
src/password_manager.rs
View file

@ -234,11 +234,11 @@ impl PasswordManager {
} }
// Don't do anything if nothing have changed // Don't do anything if nothing have changed
if let Some(original) = &original if let Some(original) = &original {
&& original == &input_state.input if original == &input_state.input {
{
return Task::none(); return Task::none();
} }
}
cosmic::task::future(async move { cosmic::task::future(async move {
if let Err(err) = store::add_password(identifier.clone(), password.clone()).await { if let Err(err) = store::add_password(identifier.clone(), password.clone()).await {
@ -246,14 +246,19 @@ impl PasswordManager {
"Failed to add password {identifier}: {err}" "Failed to add password {identifier}: {err}"
))) )))
} else { } else {
if let Some(original) = original if let Some(original) = original {
&& original.identifier != identifier if original.identifier != identifier {
&& let Err(err) = store::delete_password(original.identifier.clone()).await if let Err(err) =
store::delete_password(original.identifier.clone()).await
{ {
return Message::PasswordManager(PasswordManagerMessage::Error(format!( return Message::PasswordManager(PasswordManagerMessage::Error(
format!(
"Failed to delete password {}: {err}", "Failed to delete password {}: {err}",
original.identifier original.identifier
))); ),
));
}
}
} }
Message::PasswordManager(PasswordManagerMessage::None) Message::PasswordManager(PasswordManagerMessage::None)
} }
@ -310,7 +315,8 @@ impl PasswordManager {
.spacing(space_xxs), .spacing(space_xxs),
); );
if expanded && let Some(input_state) = &self.input_state { if expanded {
if let Some(input_state) = &self.input_state {
let expanded_section: Section<'_, Message> = widget::settings::section().add( let expanded_section: Section<'_, Message> = widget::settings::section().add(
widget::column::with_children(vec![ widget::column::with_children(vec![
widget::column::with_children(vec![ widget::column::with_children(vec![
@ -353,7 +359,9 @@ impl PasswordManager {
PasswordManagerMessage::PasswordInputAndUpdate(text), PasswordManagerMessage::PasswordInputAndUpdate(text),
) )
}) })
.on_unfocus(Message::PasswordManager(PasswordManagerMessage::Update)) .on_unfocus(Message::PasswordManager(
PasswordManagerMessage::Update,
))
.into(), .into(),
]) ])
.spacing(space_xxxs) .spacing(space_xxxs)
@ -374,6 +382,7 @@ impl PasswordManager {
passwords_section.add(widget::container(expanded_section).padding(padding)) passwords_section.add(widget::container(expanded_section).padding(padding))
} }
} }
}
sections.push(passwords_section.into()); sections.push(passwords_section.into());
let add_password = widget::row::with_children(vec![ let add_password = widget::row::with_children(vec![

13
src/shortcuts.rs
View file

@ -2,8 +2,8 @@
use cosmic::widget::menu::key_bind::{KeyBind, Modifier}; use cosmic::widget::menu::key_bind::{KeyBind, Modifier};
use cosmic::{ use cosmic::{
iced::core::keyboard::key::Named,
iced::keyboard::{Key, Modifiers}, iced::keyboard::{Key, Modifiers},
iced_core::keyboard::key::Named,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
@ -87,7 +87,6 @@ pub enum KeyBindAction {
TabNew, TabNew,
TabNext, TabNext,
TabPrev, TabPrev,
TabRename,
ToggleFullscreen, ToggleFullscreen,
WindowClose, WindowClose,
WindowNew, WindowNew,
@ -128,7 +127,6 @@ impl KeyBindAction {
Self::TabNew => Some(Action::TabNew), Self::TabNew => Some(Action::TabNew),
Self::TabNext => Some(Action::TabNext), Self::TabNext => Some(Action::TabNext),
Self::TabPrev => Some(Action::TabPrev), Self::TabPrev => Some(Action::TabPrev),
Self::TabRename => Some(Action::TabRename),
Self::ToggleFullscreen => Some(Action::ToggleFullscreen), Self::ToggleFullscreen => Some(Action::ToggleFullscreen),
Self::WindowClose => Some(Action::WindowClose), Self::WindowClose => Some(Action::WindowClose),
Self::WindowNew => Some(Action::WindowNew), Self::WindowNew => Some(Action::WindowNew),
@ -247,12 +245,12 @@ impl ShortcutsConfig {
// Remove any matching bindings // Remove any matching bindings
return false; return false;
} }
if let Some(default_action) = self.defaults.0.get(binding) if let Some(default_action) = self.defaults.0.get(binding) {
&& *default_action == reset_action if *default_action == reset_action {
{
// Remove binding that overrode a default // Remove binding that overrode a default
return false; return false;
} }
}
true true
}); });
} }
@ -290,7 +288,6 @@ pub fn action_label(action: KeyBindAction) -> String {
KeyBindAction::TabNew => fl!("new-tab"), KeyBindAction::TabNew => fl!("new-tab"),
KeyBindAction::TabNext => fl!("next-tab"), KeyBindAction::TabNext => fl!("next-tab"),
KeyBindAction::TabPrev => fl!("previous-tab"), KeyBindAction::TabPrev => fl!("previous-tab"),
KeyBindAction::TabRename => fl!("rename-tab"),
KeyBindAction::ToggleFullscreen => fl!("toggle-fullscreen"), KeyBindAction::ToggleFullscreen => fl!("toggle-fullscreen"),
KeyBindAction::WindowClose => fl!("close-window"), KeyBindAction::WindowClose => fl!("close-window"),
KeyBindAction::WindowNew => fl!("new-window"), KeyBindAction::WindowNew => fl!("new-window"),
@ -323,7 +320,6 @@ pub fn shortcut_groups() -> Vec<ShortcutGroup> {
actions: vec![ actions: vec![
KeyBindAction::TabNew, KeyBindAction::TabNew,
KeyBindAction::TabClose, KeyBindAction::TabClose,
KeyBindAction::TabRename,
KeyBindAction::TabNext, KeyBindAction::TabNext,
KeyBindAction::TabPrev, KeyBindAction::TabPrev,
KeyBindAction::TabActivate0, KeyBindAction::TabActivate0,
@ -458,7 +454,6 @@ fn fallback_shortcuts() -> Shortcuts {
bind!([Ctrl, Shift], "V", Paste); bind!([Ctrl, Shift], "V", Paste);
bind!([Shift], "Insert", PastePrimary); bind!([Shift], "Insert", PastePrimary);
bind!([Ctrl, Shift], "W", TabClose); bind!([Ctrl, Shift], "W", TabClose);
bind!([Ctrl, Shift], "R", TabRename);
bind!([Ctrl], ",", Settings); bind!([Ctrl], ",", Settings);
bind!([], "F11", ToggleFullscreen); bind!([], "F11", ToggleFullscreen);

72
src/terminal.rs
View file

@ -28,8 +28,7 @@ use indexmap::IndexSet;
use std::{ use std::{
borrow::Cow, borrow::Cow,
collections::HashMap, collections::HashMap,
fs, io, mem, io, mem,
path::PathBuf,
sync::{ sync::{
Arc, Mutex, Weak, Arc, Mutex, Weak,
atomic::{AtomicU32, Ordering}, atomic::{AtomicU32, Ordering},
@ -198,7 +197,7 @@ impl TerminalPaneGrid {
} }
pub fn unfocus_all_terminals(&self) { pub fn unfocus_all_terminals(&self) {
for (_pane, tab_model) in self.panes.panes.iter() { for (_pane, tab_model) in self.panes.panes.iter() {
for entity in tab_model.iter() { let entity = tab_model.active();
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
terminal.is_focused = false; terminal.is_focused = false;
@ -206,7 +205,6 @@ impl TerminalPaneGrid {
} }
} }
} }
}
} }
#[derive(Debug, PartialEq, Eq, Hash, Clone)] #[derive(Debug, PartialEq, Eq, Hash, Clone)]
@ -259,7 +257,6 @@ pub struct Terminal {
notifier: Notifier, notifier: Notifier,
search_regex_opt: Option<RegexSearch>, search_regex_opt: Option<RegexSearch>,
search_value: String, search_value: String,
shell_pid: Option<u32>,
size: Size, size: Size,
use_bright_bold: bool, use_bright_bold: bool,
zoom_adj: i8, zoom_adj: i8,
@ -267,7 +264,6 @@ pub struct Terminal {
impl Terminal { impl Terminal {
//TODO: error handling //TODO: error handling
#[allow(clippy::too_many_arguments)]
pub fn new( pub fn new(
pane: pane_grid::Pane, pane: pane_grid::Pane,
entity: segmented_button::Entity, entity: segmented_button::Entity,
@ -307,13 +303,13 @@ impl Terminal {
let (cell_width, cell_height) = { let (cell_width, cell_height) = {
let mut font_system = font_system().write().unwrap(); let mut font_system = font_system().write().unwrap();
let font_system = font_system.raw(); let font_system = font_system.raw();
buffer.set_wrap(Wrap::None); buffer.set_wrap(font_system, Wrap::None);
// Use size of space to determine cell size // Use size of space to determine cell size
buffer.set_text(" ", &default_attrs, Shaping::Advanced, None); buffer.set_text(font_system, " ", &default_attrs, Shaping::Advanced, None);
let layout = buffer.line_layout(font_system, 0).unwrap(); let layout = buffer.line_layout(font_system, 0).unwrap();
let w = layout[0].w; let w = layout[0].w;
buffer.set_monospace_width(Some(w)); buffer.set_monospace_width(font_system, Some(w));
(w, metrics.line_height) (w, metrics.line_height)
}; };
@ -332,10 +328,6 @@ impl Terminal {
let window_id = 0; let window_id = 0;
let pty = tty::new(&options, size.into(), window_id)?; let pty = tty::new(&options, size.into(), window_id)?;
#[cfg(not(windows))]
let shell_pid = Some(pty.child().id());
#[cfg(windows)]
let shell_pid = pty.child_watcher().pid().map(|pid| pid.get());
let pty_event_loop = let pty_event_loop =
EventLoop::new(term.clone(), event_proxy, pty, options.drain_on_exit, false)?; EventLoop::new(term.clone(), event_proxy, pty, options.drain_on_exit, false)?;
@ -360,7 +352,6 @@ impl Terminal {
profile_id_opt, profile_id_opt,
search_regex_opt: None, search_regex_opt: None,
search_value: String::new(), search_value: String::new(),
shell_pid,
size, size,
tab_title_override, tab_title_override,
term, term,
@ -416,19 +407,6 @@ impl Terminal {
self.notifier.notify(input); self.notifier.notify(input);
} }
pub fn working_directory(&self) -> Option<PathBuf> {
#[cfg(target_os = "linux")]
{
let shell_pid = self.shell_pid?;
fs::read_link(format!("/proc/{shell_pid}/cwd")).ok()
}
#[cfg(not(target_os = "linux"))]
{
None
}
}
pub fn input_scroll<I: Into<Cow<'static, [u8]>>>(&self, input: I) { pub fn input_scroll<I: Into<Cow<'static, [u8]>>>(&self, input: I) {
self.input_no_scroll(input); self.input_no_scroll(input);
self.scroll(TerminalScroll::Bottom); self.scroll(TerminalScroll::Bottom);
@ -470,7 +448,8 @@ impl Terminal {
self.term.lock().resize(self.size); self.term.lock().resize(self.size);
self.with_buffer_mut(|buffer| { self.with_buffer_mut(|buffer| {
buffer.set_size(Some(width as f32), Some(height as f32)); let mut font_system = font_system().write().unwrap();
buffer.set_size(font_system.raw(), Some(width as f32), Some(height as f32));
}); });
self.needs_update = true; self.needs_update = true;
@ -653,7 +632,10 @@ impl Terminal {
let metrics = config.metrics(zoom_adj); let metrics = config.metrics(zoom_adj);
if metrics != self.buffer.metrics() { if metrics != self.buffer.metrics() {
self.with_buffer_mut(|buffer| buffer.set_metrics(metrics)); {
let mut font_system = font_system().write().unwrap();
self.with_buffer_mut(|buffer| buffer.set_metrics(font_system.raw(), metrics));
}
update_cell_size = true; update_cell_size = true;
} }
@ -710,13 +692,19 @@ impl Terminal {
let (cell_width, cell_height) = { let (cell_width, cell_height) = {
let mut font_system = font_system().write().unwrap(); let mut font_system = font_system().write().unwrap();
self.with_buffer_mut(|buffer| { self.with_buffer_mut(|buffer| {
buffer.set_wrap(Wrap::None); buffer.set_wrap(font_system.raw(), Wrap::None);
// Use size of space to determine cell size // Use size of space to determine cell size
buffer.set_text(" ", &default_attrs, Shaping::Advanced, None); buffer.set_text(
font_system.raw(),
" ",
&default_attrs,
Shaping::Advanced,
None,
);
let layout = buffer.line_layout(font_system.raw(), 0).unwrap(); let layout = buffer.line_layout(font_system.raw(), 0).unwrap();
let w = layout[0].w; let w = layout[0].w;
buffer.set_monospace_width(Some(w)); buffer.set_monospace_width(font_system.raw(), Some(w));
(w, buffer.metrics().line_height) (w, buffer.metrics().line_height)
}) })
}; };
@ -880,13 +868,14 @@ impl Terminal {
} }
// Change color if selected // Change color if selected
if let Some(selection) = &term.selection if let Some(selection) = &term.selection {
&& let Some(range) = selection.to_range(&term) if let Some(range) = selection.to_range(&term) {
&& range.contains(indexed.point) if range.contains(indexed.point) {
{
//TODO: better handling of selection //TODO: better handling of selection
mem::swap(&mut fg, &mut bg); mem::swap(&mut fg, &mut bg);
} }
}
}
// Convert foreground to linear // Convert foreground to linear
attrs = attrs.color(fg); attrs = attrs.color(fg);
@ -899,11 +888,11 @@ impl Terminal {
let mut flags = indexed.cell.flags; let mut flags = indexed.cell.flags;
if let Some(active_match) = &self.active_regex_match if let Some(active_match) = &self.active_regex_match {
&& active_match.contains(&indexed.point) if active_match.contains(&indexed.point) {
{
flags |= Flags::UNDERLINE; flags |= Flags::UNDERLINE;
} }
}
if let Some(active_id) = &self.active_hyperlink_id { if let Some(active_id) = &self.active_hyperlink_id {
let mut matches_active = indexed let mut matches_active = indexed
.cell .cell
@ -1211,13 +1200,14 @@ impl<'a, T> Iterator for HintPostProcessor<'a, T> {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
let next_match = self.next_match.take()?; let next_match = self.next_match.take()?;
if self.start <= self.end if self.start <= self.end {
&& let Some(rm) = self if let Some(rm) = self
.term .term
.regex_search_right(self.regex, self.start, self.end) .regex_search_right(self.regex, self.start, self.end)
{ {
self.next_processed_match(rm); self.next_processed_match(rm);
} }
}
Some(next_match) Some(next_match)
} }

128
src/terminal_box.rs
View file

@ -10,10 +10,17 @@ use alacritty_terminal::{
use cosmic::{ use cosmic::{
Renderer, Renderer,
cosmic_theme::palette::{WithAlpha, blend::Compose}, cosmic_theme::palette::{WithAlpha, blend::Compose},
iced::core::{ iced::{
Color, Element, Length, Padding, Point, Rectangle, Size, Vector,
advanced::graphics::text::Raw,
event::{Event, Status},
keyboard::{Event as KeyEvent, Key, Modifiers},
mouse::{self, Button, Event as MouseEvent, ScrollDelta},
window::RedrawRequest,
},
iced_core::{
Border, Shell, Border, Shell,
clipboard::Clipboard, clipboard::Clipboard,
input_method::{self, InputMethod},
keyboard::key::Named, keyboard::key::Named,
layout::{self, Layout}, layout::{self, Layout},
renderer::{self, Quad, Renderer as _}, renderer::{self, Quad, Renderer as _},
@ -24,16 +31,9 @@ use cosmic::{
tree, tree,
}, },
}, },
iced::{
Color, Element, Length, Padding, Point, Rectangle, Size, Vector,
advanced::graphics::text::Raw,
event::Event,
keyboard::{Event as KeyEvent, Key, Modifiers},
mouse::{self, Button, Event as MouseEvent, ScrollDelta},
},
theme::Theme, theme::Theme,
}; };
use cosmic::{iced::core::SmolStr, widget::menu::key_bind::KeyBind}; use cosmic::{iced_core::SmolStr, widget::menu::key_bind::KeyBind};
use cosmic_text::LayoutGlyph; use cosmic_text::LayoutGlyph;
use indexmap::IndexSet; use indexmap::IndexSet;
use std::{ use std::{
@ -234,49 +234,6 @@ where
self.disabled = disabled; self.disabled = disabled;
self self
} }
fn input_method<'b>(
&self,
state: &'b State,
layout: Layout<'_>,
terminal: &std::sync::MutexGuard<'_, Terminal>,
) -> InputMethod<&'b str> {
if !state.is_focused {
return InputMethod::Disabled;
}
if self.context_menu.is_some() {
return InputMethod::Disabled;
}
let view_position = layout.position() + [self.padding.left, self.padding.top].into();
// Draw cursor
let cursor = terminal.term.lock().renderable_content().cursor;
let mut col = cursor.point.column.0;
let line = cursor.point.line.0;
let width = terminal.size().cell_width;
let mut cursor_position = Vector::<f32>::ZERO;
let mut line_height = 0.0;
terminal.with_buffer(|buffer| {
let layout = buffer.layout_runs().nth(line as usize).unwrap();
for glyph in layout.glyphs {
cursor_position.x += glyph.w;
let ch_width = if glyph.w > width { 2 } else { 1 };
if ch_width > col {
break;
}
col -= ch_width;
}
cursor_position.y = layout.line_top;
line_height = layout.line_height;
});
InputMethod::Enabled {
cursor: Rectangle::new(view_position + cursor_position, Size::new(1.0, line_height)),
purpose: input_method::Purpose::Normal,
preedit: state.preedit.as_ref().map(input_method::Preedit::as_ref),
}
}
} }
pub fn terminal_box<'a, Message>( pub fn terminal_box<'a, Message>(
@ -906,8 +863,8 @@ where
if is_mouse_mode { if is_mouse_mode {
state.autoscroll.stop(); state.autoscroll.stop();
} else { } else {
if let Some((pointer, multiplier)) = state.autoscroll.next_due() if let Some((pointer, multiplier)) = state.autoscroll.next_due() {
&& update_buffer_drag( if update_buffer_drag(
state, state,
&mut terminal, &mut terminal,
buffer_size, buffer_size,
@ -915,15 +872,14 @@ where
layout.bounds(), layout.bounds(),
self.padding, self.padding,
multiplier, multiplier,
) ) {
{
shell.capture_event(); shell.capture_event();
} }
}
if state.autoscroll.is_active() { if state.autoscroll.is_active() {
shell.request_redraw(); shell.request_redraw();
} }
} }
shell.request_input_method(&self.input_method(state, layout, &terminal));
} }
cosmic::iced::window::Event::Unfocused => { cosmic::iced::window::Event::Unfocused => {
state.is_focused = false; state.is_focused = false;
@ -1205,28 +1161,6 @@ where
} }
} }
} }
Event::InputMethod(event) => match event {
input_method::Event::Opened | input_method::Event::Closed => {
state.preedit = matches!(event, input_method::Event::Opened)
.then(input_method::Preedit::new);
}
input_method::Event::Preedit(content, selection) => {
if state.is_focused {
let metrics = terminal.with_buffer(|buffer| buffer.metrics());
state.preedit = Some(input_method::Preedit {
content: content.to_owned(),
selection: selection.clone(),
text_size: Some(metrics.font_size.into()),
})
}
}
input_method::Event::Commit(text) => {
if state.is_focused {
terminal.paste(text.to_string());
shell.capture_event();
}
}
},
Event::Mouse(MouseEvent::ButtonPressed(button)) => { Event::Mouse(MouseEvent::ButtonPressed(button)) => {
if let Some(p) = cursor_position.position_in(layout.bounds()) { if let Some(p) = cursor_position.position_in(layout.bounds()) {
let x = p.x - self.padding.left; let x = p.x - self.padding.left;
@ -1366,13 +1300,8 @@ where
None, None,
); );
let link = get_hyperlink(&terminal, location); let link = get_hyperlink(&terminal, location);
let abs = cosmic::iced::Point::new(
layout.bounds().x + p.x,
layout.bounds().y + p.y,
);
shell.publish(on_context_menu(Some(MenuState { shell.publish(on_context_menu(Some(MenuState {
position: Some(abs), position: Some(p),
local_position: Some(p),
link, link,
}))); })));
} }
@ -1381,14 +1310,12 @@ where
} }
shell.capture_event(); shell.capture_event();
} }
} else {
state.is_focused = false;
} }
} }
Event::Mouse(MouseEvent::ButtonReleased(Button::Left)) => { Event::Mouse(MouseEvent::ButtonReleased(Button::Left)) => {
state.autoscroll.stop(); state.autoscroll.stop();
if let Some(dragging) = state.dragging.take() if let Some(dragging) = state.dragging.take() {
&& let Dragging::Buffer { if let Dragging::Buffer {
last_point, last_point,
last_side, last_side,
.. ..
@ -1402,6 +1329,7 @@ where
} }
terminal.needs_update = true; terminal.needs_update = true;
} }
}
if let Some(p) = cursor_position.position_in(layout.bounds()) { if let Some(p) = cursor_position.position_in(layout.bounds()) {
let x = p.x - self.padding.left; let x = p.x - self.padding.left;
let y = p.y - self.padding.top; let y = p.y - self.padding.top;
@ -1411,13 +1339,14 @@ where
let location = terminal let location = terminal
.viewport_to_point(TermPoint::new(row as usize, TermColumn(col as usize))); .viewport_to_point(TermPoint::new(row as usize, TermColumn(col as usize)));
if state.modifiers.control() if state.modifiers.control() {
&& let Some(on_open_hyperlink) = &self.on_open_hyperlink if let Some(on_open_hyperlink) = &self.on_open_hyperlink {
&& let Some(hyperlink) = get_hyperlink(&terminal, location) if let Some(hyperlink) = get_hyperlink(&terminal, location) {
{
shell.publish(on_open_hyperlink(hyperlink)); shell.publish(on_open_hyperlink(hyperlink));
shell.capture_event(); shell.capture_event();
} }
}
}
if is_mouse_mode { if is_mouse_mode {
terminal.report_mouse( terminal.report_mouse(
@ -1429,6 +1358,8 @@ where
} else { } else {
shell.capture_event(); shell.capture_event();
} }
} else {
shell.capture_event();
} }
} }
Event::Mouse(MouseEvent::ButtonReleased(_button)) => { Event::Mouse(MouseEvent::ButtonReleased(_button)) => {
@ -1719,11 +1650,11 @@ fn update_active_regex_match(
.find(|bounds| bounds.contains(&location)) .find(|bounds| bounds.contains(&location))
{ {
'update: { 'update: {
if let Some(active_match) = &terminal.active_regex_match if let Some(active_match) = &terminal.active_regex_match {
&& active_match == match_ if active_match == match_ {
{
break 'update; break 'update;
} }
}
terminal.active_regex_match = Some(match_.clone()); terminal.active_regex_match = Some(match_.clone());
terminal.needs_update = true; terminal.needs_update = true;
} }
@ -1783,7 +1714,6 @@ enum EdgeScrollDirection {
Bottom, Bottom,
} }
#[allow(clippy::too_many_arguments)]
fn edge_scroll_adjustment( fn edge_scroll_adjustment(
y: f32, y: f32,
buffer_height: f32, buffer_height: f32,
@ -1936,7 +1866,6 @@ pub struct State {
scroll_pixels: f32, scroll_pixels: f32,
scrollbar_rect: Cell<Rectangle<f32>>, scrollbar_rect: Cell<Rectangle<f32>>,
autoscroll: DragAutoscroll, autoscroll: DragAutoscroll,
preedit: Option<input_method::Preedit>,
} }
impl State { impl State {
@ -1950,7 +1879,6 @@ impl State {
scroll_pixels: 0.0, scroll_pixels: 0.0,
scrollbar_rect: Cell::new(Rectangle::default()), scrollbar_rect: Cell::new(Rectangle::default()),
autoscroll: DragAutoscroll::new(AUTOSCROLL_INTERVAL), autoscroll: DragAutoscroll::new(AUTOSCROLL_INTERVAL),
preedit: None,
} }
} }
} }