Skip to content

Terminal Support #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nab138 wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Terminal Support #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b2e4c1
terminal
nab138 Nov 8, 2025
77a4923
Merge branch 'main' into terminal
nab138 Nov 15, 2025
c471f7d
Fix terminal
nab138 Nov 15, 2025
7fdd6fc
Allow changing font and shell
nab138 Nov 16, 2025
5893e4d
Properly resize term
nab138 Nov 16, 2025
132982a
Actually properly resize terminal
nab138 Nov 16, 2025
c85a278
more terminal work
nab138 Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 52 additions & 44 deletions bun.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@mui/icons-material": "^7.0.2",
"@mui/joy": "^5.0.0-beta.52",
"@mui/material": "^7.0.2",
"@tauri-apps/api": "^2",
"@tauri-apps/api": "^2.9.0",
"@tauri-apps/plugin-cli": "^2.4.0",
"@tauri-apps/plugin-dialog": "^2",
"@tauri-apps/plugin-fs": "^2",
Expand All @@ -39,6 +39,7 @@
"@tauri-apps/plugin-shell": "^2",
"@tauri-apps/plugin-store": "^2",
"@tauri-apps/plugin-updater": "^2",
"@xterm/xterm": "^5.5.0",
"ansi-to-html": "^0.7.2",
"async-mutex": "^0.5.0",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~20.2.1",
Expand All @@ -50,10 +51,11 @@
"react-toast-plus": "^0.1.2",
"react-virtuoso": "^4.12.6",
"vscode": "npm:@codingame/monaco-vscode-extension-api@~20.2.1",
"vscode-ws-jsonrpc": "^3.4.0"
"vscode-ws-jsonrpc": "^3.4.0",
"xterm-addon-fit": "^0.8.0"
},
"devDependencies": {
"@tauri-apps/cli": "^2",
"@tauri-apps/cli": "^2.9.4",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@types/vscode": "^1.102.0",
Expand Down
95 changes: 91 additions & 4 deletions src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
tauri-build = { version = "2.4.0", features = [] }

[dependencies]
tauri = { version = "2.8.3", features = ["devtools"] }
tauri = { version = "2.9.0", features = ["devtools"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri-plugin-shell = "2.3.0"
Expand Down Expand Up @@ -42,6 +42,7 @@ image = "0.25.6"
unxip-rs = "0.1.1"
tokio-tungstenite = "0.28.0"
fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }
portable-pty = "0.9.0"

[target.'cfg(unix)'.dependencies]
sdkmover = { path = "../sdkmover" }
Expand Down
9 changes: 9 additions & 0 deletions src-tauri/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ mod sideloader;
mod sourcekit_lsp;
#[macro_use]
mod lsp_utils;
#[macro_use]
mod terminal;

use builder::crossplatform::{linux_path, windows_path};
use builder::icon::import_icon;
Expand Down Expand Up @@ -42,6 +44,7 @@ use tauri::Manager;
use tauri_plugin_cli::CliExt;
use tauri_plugin_store::StoreExt;
use templates::create_template;
use terminal::{close_terminal, create_terminal, resize_terminal, write_terminal, TermManager};
use tokio::sync::Mutex;
use windows::{has_wsl, install_wsl, is_windows};

Expand All @@ -58,6 +61,7 @@ fn main() {

let syslog_stream: SyslogStream = SyslogStream(Arc::new(Mutex::new(None)));
let stdout_stream: StdoutStream = Arc::new(Mutex::new(None));
let terminal_state: TermManager = TermManager::new();

tauri::Builder::default()
.plugin(tauri_plugin_updater::Builder::new().build())
Expand All @@ -72,6 +76,7 @@ fn main() {
.manage(sourcekit_lsp::create_server_state())
.manage(syslog_stream)
.manage(stdout_stream)
.manage(terminal_state)
.setup(|app| {
match app.cli().matches() {
Ok(matches) => {
Expand Down Expand Up @@ -155,6 +160,10 @@ fn main() {
is_ddi_mounted,
mount_ddi,
take_screenshot,
create_terminal,
write_terminal,
close_terminal,
resize_terminal,
])
.run(tauri::generate_context!())
.expect("error while running tauri application");
Expand Down
Loading