diff --git a/README.md b/README.md
index 1015c34..2a57f8d 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
# Why another terminal?
-Tess was mainly built in order to offer you a new, intuitive, fully customizable and blazing fast terminal app, by using the power of web technologies.
+Tess was mainly built in order to offer you a new, intuitive, fully customizable, and blazing fast terminal app by using the power of web technologies.
-Why should you not test it? We work for more than 2 years on this, and we've been relied on by thousands of users.
+Why should you not test it? We've worked on this for more than 2 years, and we've been relied on by thousands of users.
-Tess is currently officially tested on Windows & Linux, but it should work also on other platform.
-If you cannot have access to Tess yet, fill an issue, we'll try to provide you the best cross-platform experience by making new packages or helping you manually installing Tess.
+Tess is currently officially tested on Windows and Linux, but it should also work on other platforms.
+If you do not have access to Tess yet, fill out an issue, and we'll try to provide you with the best cross-platform experience by making new packages or helping you manually install Tess.
>>) -> Result {
Ok(option.lock().unwrap().clone())
diff --git a/src-tauri/src/command/term.rs b/src-tauri/src/command/term.rs
index 73b23f2..9959ee9 100644
--- a/src-tauri/src/command/term.rs
+++ b/src-tauri/src/command/term.rs
@@ -1,3 +1,4 @@
+use crate::configuration::deserialized::Option;
use crate::state::pty_manager::PtyManager;
use std::sync::{Arc, Mutex};
@@ -10,7 +11,7 @@ pub async fn terminal_input(
content: String,
) -> Result<(), PtyError> {
if let Ok(mut pty_manager) = pty_manager.lock() {
- pty_manager.write(id, content)?;
+ pty_manager.write(&id, content)?;
Ok(())
} else {
Err(PtyError::ManagerUnresponding)
@@ -24,17 +25,28 @@ pub async fn create_terminal(
cols: u16,
rows: u16,
id: String,
- command: String,
+ profile_uuid: String,
+ option: tauri::State<'_, Arc>>,
) -> Result<(), PtyError> {
- if let Ok(mut pty_manager) = pty_manager.lock() {
- if let None = pty_manager.app {
- pty_manager.app = Some(Arc::new(app));
- }
+ if let Some(profile) = option
+ .lock()
+ .unwrap()
+ .profiles
+ .iter()
+ .find(|profile| profile.uuid == profile_uuid)
+ {
+ if let Ok(mut pty_manager) = pty_manager.lock() {
+ if pty_manager.app.is_none() {
+ pty_manager.app = Some(Arc::new(app));
+ }
- pty_manager.create_pty(cols, rows, id, &command)?;
- Ok(())
+ pty_manager.create_pty(cols, rows, id, profile.clone())?;
+ Ok(())
+ } else {
+ Err(PtyError::ManagerUnresponding)
+ }
} else {
- Err(PtyError::ManagerUnresponding)
+ todo!()
}
}
@@ -46,7 +58,7 @@ pub async fn resize_terminal(
rows: u16,
) -> Result<(), PtyError> {
if let Ok(mut pty_manager) = pty_manager.lock() {
- pty_manager.resize(id, cols, rows)?;
+ pty_manager.resize(&id, cols, rows)?;
Ok(())
} else {
Err(PtyError::ManagerUnresponding)
@@ -59,7 +71,7 @@ pub async fn close_terminal(
id: String,
) -> Result<(), PtyError> {
if let Ok(mut pty_manager) = pty_manager.lock() {
- pty_manager.close(id)?;
+ pty_manager.close(&id)?;
Ok(())
} else {
Err(PtyError::ManagerUnresponding)
diff --git a/src-tauri/src/common/payloads.rs b/src-tauri/src/common/payloads.rs
index 1db6a1c..f451f11 100644
--- a/src-tauri/src/common/payloads.rs
+++ b/src-tauri/src/common/payloads.rs
@@ -3,3 +3,9 @@ pub struct PtySendData {
pub id: String,
pub data: String,
}
+
+#[derive(serde::Serialize, Clone)]
+pub struct PtyTitleChanged {
+ pub id: String,
+ pub title: String,
+}
diff --git a/src-tauri/src/common/utils.rs b/src-tauri/src/common/utils.rs
index 8782f2a..befbec4 100644
--- a/src-tauri/src/common/utils.rs
+++ b/src-tauri/src/common/utils.rs
@@ -1,5 +1,8 @@
use crate::configuration::deserialized::TerminalTheme;
+#[cfg(target_os = "windows")]
+use std::ffi::OsString;
+
pub fn parse_theme(location: String) -> (Option, Option) {
let theme_path = if std::path::Path::new(&format!(
"{}/tess/themes/{}",
@@ -20,11 +23,65 @@ pub fn parse_theme(location: String) -> (Option, Option)
};
if let Some(theme_path) = theme_path {
- let app_theme = if std::path::Path::new(&format!("{}/style.css", theme_path)).exists() { Some(format!("{}/style.css", theme_path)) } else { None };
- let terminal_theme = if std::path::Path::new(&format!("{}/terminal.json", theme_path)).exists() { Some(serde_json::from_str(&std::fs::read_to_string(std::path::Path::new(&format!("{}/terminal.json", theme_path))).unwrap_or_default()).unwrap_or_default()) } else { None };
+ let app_theme = if std::path::Path::new(&format!("{}/style.css", theme_path)).exists() {
+ Some(format!("{}/style.css", theme_path))
+ } else {
+ None
+ };
+ let terminal_theme =
+ if std::path::Path::new(&format!("{}/terminal.json", theme_path)).exists() {
+ Some(
+ serde_json::from_str(
+ &std::fs::read_to_string(std::path::Path::new(&format!(
+ "{}/terminal.json",
+ theme_path
+ )))
+ .unwrap_or_default(),
+ )
+ .unwrap_or_default(),
+ )
+ } else {
+ None
+ };
(app_theme, terminal_theme)
} else {
(None, None)
}
-}
\ No newline at end of file
+}
+
+#[cfg(target_os = "windows")]
+pub fn get_leader_process_name(process: remoteprocess::Process) -> Option {
+ if let Ok(childs) = process.child_processes() {
+ let mut childs = childs
+ .iter()
+ .filter(|tmp| {
+ tmp.1 == process.pid
+ && remoteprocess::Process::new(tmp.0)
+ .is_ok_and(|sub_process| sub_process.exe().is_ok())
+ })
+ .collect::>();
+
+ if childs.is_empty() {
+ std::path::Path::new(&process.exe().ok().unwrap_or_default())
+ .file_name()
+ .map(|x| x.to_owned())
+ } else {
+ childs.sort();
+
+ if let Ok(child_process) =
+ remoteprocess::Process::new(childs.as_slice().last().unwrap().0)
+ {
+ get_leader_process_name(child_process)
+ } else {
+ std::path::Path::new(&process.exe().ok().unwrap_or_default())
+ .file_name()
+ .map(|x| x.to_owned())
+ }
+ }
+ } else {
+ std::path::Path::new(&process.exe().ok().unwrap_or_default())
+ .file_name()
+ .map(|x| x.to_owned())
+ }
+}
diff --git a/src-tauri/src/configuration/deserialized.rs b/src-tauri/src/configuration/deserialized.rs
index 9c8fa05..3549720 100644
--- a/src-tauri/src/configuration/deserialized.rs
+++ b/src-tauri/src/configuration/deserialized.rs
@@ -1,14 +1,12 @@
-use serde::{Serialize, Serializer, ser::SerializeSeq};
-use serde::Deserialize;
-use crate::configuration::types::RangedInt;
-use crate::configuration::types::CursorType;
-use crate::configuration::types::BackgroundType;
use crate::configuration::partial::PartialOption;
+use crate::configuration::types::CursorType;
+use crate::configuration::types::RangedInt;
+use crate::configuration::types::{BackgroundMedia, BackgroundType};
+use serde::Deserialize;
+use serde::{ser::SerializeSeq, Serialize, Serializer};
use crate::common::utils::parse_theme;
-
-
#[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Option {
@@ -25,7 +23,7 @@ pub struct Option {
pub default_profile: Profile,
#[serde(skip_serializing)]
- theme: String
+ theme: String,
}
impl Default for Option {
@@ -45,7 +43,7 @@ impl Default for Option {
macros: Vec::default(),
default_profile: default_profile(uuid),
- theme: String::default()
+ theme: String::default(),
}
}
}
@@ -58,23 +56,23 @@ impl<'de> serde::Deserialize<'de> for Option {
let app_theme = app_theme.unwrap_or_default();
let terminal_theme = terminal_theme.unwrap_or_default();
-
let mut profiles = vec![];
if partial_option.profiles.is_empty() {
- profiles.push(
- Profile {
- name: String::from("Default profile"),
- terminal_options: partial_option.terminal.clone(),
- theme: terminal_theme.clone(),
- background_transparency: RangedInt::default(),
- uuid: uuid::Uuid::new_v4().to_string(),
- #[cfg(target_family = "unix")]
- command: String::from("sh -c $SHELL"),
- #[cfg(target_os = "windows")]
- command: String::from("%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"),
- }
- )
+ profiles.push(Profile {
+ name: String::from("Default profile"),
+ terminal_options: partial_option.terminal.clone(),
+ theme: terminal_theme.clone(),
+ background_transparency: RangedInt::default(),
+ uuid: uuid::Uuid::new_v4().to_string(),
+ #[cfg(target_family = "unix")]
+ command: String::from("sh -c $SHELL"),
+ #[cfg(target_os = "windows")]
+ command: String::from(
+ "%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+ ),
+ background: None,
+ })
} else {
for partial_profile in partial_option.profiles {
let profile_option = TerminalOption {
@@ -120,24 +118,30 @@ impl<'de> serde::Deserialize<'de> for Option {
.unwrap_or(partial_option.terminal.title_is_running_process),
};
- let profile_theme = if let Some(partial_profile_theme) = partial_profile.theme { parse_theme(partial_profile_theme).1.unwrap_or(terminal_theme.clone()) } else { terminal_theme.clone() };
-
+ let profile_theme = if let Some(partial_profile_theme) = partial_profile.theme {
+ parse_theme(partial_profile_theme)
+ .1
+ .unwrap_or(terminal_theme.clone())
+ } else {
+ terminal_theme.clone()
+ };
+
profiles.push(Profile {
name: partial_profile.name,
terminal_options: profile_option,
theme: profile_theme,
background_transparency: partial_profile
.background_transparency
- .unwrap_or(RangedInt::default()),
+ .unwrap_or(partial_option.background_transparency),
uuid: uuid::Uuid::parse_str(partial_profile.uuid.unwrap_or_default().as_str())
.unwrap_or(uuid::Uuid::new_v4())
.to_string(),
- command: partial_profile.command
+ command: partial_profile.command,
+ background: partial_profile.background,
})
}
}
-
let mut macros = vec![];
if let Some(partial_macros) = partial_option.macros {
@@ -151,7 +155,6 @@ impl<'de> serde::Deserialize<'de> for Option {
}
}
-
let shortcuts = if let Some(partial_option_shortcuts) = partial_option.shortcuts {
let mut shortcuts = vec![];
@@ -177,12 +180,13 @@ impl<'de> serde::Deserialize<'de> for Option {
action: ShortcutAction::ExecuteMacro(macro_command.uuid.clone()),
})
}
- },
- _ => {
- shortcuts.push(Shortcut { shortcut: partial_shortcut.shortcut, action: partial_shortcut.action })
}
+ _ => shortcuts.push(Shortcut {
+ shortcut: partial_shortcut.shortcut,
+ action: partial_shortcut.action,
+ }),
};
- };
+ }
shortcuts
} else {
@@ -192,23 +196,25 @@ impl<'de> serde::Deserialize<'de> for Option {
Ok(Option {
theme: partial_option.theme.clone(),
- terminal_theme: terminal_theme,
- app_theme: app_theme,
+ terminal_theme,
+ app_theme,
background: partial_option.background,
custom_titlebar: partial_option.custom_titlebar,
terminal: partial_option.terminal,
profiles: profiles.clone(),
close_confirmation: partial_option.close_confirmation,
background_transparency: partial_option.background_transparency,
- shortcuts: shortcuts,
- macros: macros,
- default_profile: profiles.iter().find(|&profile| {profile.uuid == partial_option.default_profile}).unwrap_or(&profiles[0]).clone()
+ shortcuts,
+ macros,
+ default_profile: profiles
+ .iter()
+ .find(|&profile| profile.uuid == partial_option.default_profile)
+ .unwrap_or(&profiles[0])
+ .clone(),
})
}
}
-
-
#[derive(Deserialize, Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")]
pub struct TerminalOption {
@@ -239,7 +245,7 @@ pub struct TerminalOption {
#[serde(default)]
font_weight_bold: RangedInt<1, 9, 6>,
#[serde(default = "default_to_true")]
- title_is_running_process: bool,
+ pub title_is_running_process: bool,
}
impl Default for TerminalOption {
@@ -263,24 +269,18 @@ impl Default for TerminalOption {
}
}
-
-
#[derive(Deserialize, Debug, Serialize, Clone)]
pub struct Macro {
pub content: String,
pub uuid: String,
}
-
-
#[derive(Debug, Serialize, Clone)]
pub struct Shortcut {
pub shortcut: String,
pub action: ShortcutAction,
}
-
-
#[derive(Debug, Clone, Deserialize)]
pub enum ShortcutAction {
CloseFocusedTab,
@@ -334,23 +334,20 @@ impl Serialize for ShortcutAction {
}
}
-
-
#[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Profile {
// TODO: Add Icon
- // TODO: Add background_media
name: String,
- terminal_options: TerminalOption,
+ pub terminal_options: TerminalOption,
theme: TerminalTheme,
- background_transparency: RangedInt<0, 100, 0>,
- uuid: String,
- command: String
+ background_transparency: RangedInt<0, 100, 100>,
+ background: std::option::Option,
+ pub uuid: String,
+ pub command: String,
}
-
#[derive(Debug, Clone, Serialize)]
pub struct TerminalTheme {
foreground: String,
@@ -372,10 +369,9 @@ pub struct TerminalTheme {
bright_cyan: String,
bright_white: String,
cursor: String,
- cursor_accent: String
+ cursor_accent: String,
}
-
impl Default for TerminalTheme {
fn default() -> Self {
Self {
@@ -398,7 +394,7 @@ impl Default for TerminalTheme {
bright_cyan: String::from("#4DE8FE"),
bright_white: String::from("#ABB4D6"),
cursor: String::from("#DEEAF8"),
- cursor_accent: String::from("#141A29")
+ cursor_accent: String::from("#141A29"),
}
}
}
@@ -446,54 +442,94 @@ impl<'de> Deserialize<'de> for TerminalTheme {
#[serde(default)]
pub cursor: std::option::Option,
#[serde(default)]
- pub cursor_accent: std::option::Option
+ pub cursor_accent: std::option::Option,
}
- let partial_terminal_theme = PartialTerminalTheme::deserialize(deserializer).unwrap_or_default();
+ let partial_terminal_theme =
+ PartialTerminalTheme::deserialize(deserializer).unwrap_or_default();
let default_terminal_theme = TerminalTheme::default();
-
+
Ok(TerminalTheme {
- foreground: partial_terminal_theme.foreground.unwrap_or(default_terminal_theme.foreground),
- background: partial_terminal_theme.background.unwrap_or(default_terminal_theme.background),
- black: partial_terminal_theme.black.unwrap_or(default_terminal_theme.black),
- red: partial_terminal_theme.red.unwrap_or(default_terminal_theme.red),
- green: partial_terminal_theme.green.unwrap_or(default_terminal_theme.green),
- yellow: partial_terminal_theme.yellow.unwrap_or(default_terminal_theme.yellow),
- blue: partial_terminal_theme.blue.unwrap_or(default_terminal_theme.blue),
- magenta: partial_terminal_theme.magenta.unwrap_or(default_terminal_theme.magenta),
- cyan: partial_terminal_theme.cyan.unwrap_or(default_terminal_theme.cyan),
- white: partial_terminal_theme.white.unwrap_or(default_terminal_theme.white),
- bright_black: partial_terminal_theme.bright_black.unwrap_or(default_terminal_theme.bright_black),
- bright_red: partial_terminal_theme.bright_red.unwrap_or(default_terminal_theme.bright_red),
- bright_green: partial_terminal_theme.bright_green.unwrap_or(default_terminal_theme.bright_green),
- bright_yellow: partial_terminal_theme.bright_yellow.unwrap_or(default_terminal_theme.bright_yellow),
- bright_blue: partial_terminal_theme.bright_blue.unwrap_or(default_terminal_theme.bright_blue),
- bright_magenta: partial_terminal_theme.bright_magenta.unwrap_or(default_terminal_theme.bright_magenta),
- bright_cyan: partial_terminal_theme.bright_cyan.unwrap_or(default_terminal_theme.bright_cyan),
- bright_white: partial_terminal_theme.bright_white.unwrap_or(default_terminal_theme.bright_white),
- cursor: partial_terminal_theme.cursor.unwrap_or(default_terminal_theme.cursor),
- cursor_accent: partial_terminal_theme.cursor_accent.unwrap_or(default_terminal_theme.cursor_accent),
+ foreground: partial_terminal_theme
+ .foreground
+ .unwrap_or(default_terminal_theme.foreground),
+ background: partial_terminal_theme
+ .background
+ .unwrap_or(default_terminal_theme.background),
+ black: partial_terminal_theme
+ .black
+ .unwrap_or(default_terminal_theme.black),
+ red: partial_terminal_theme
+ .red
+ .unwrap_or(default_terminal_theme.red),
+ green: partial_terminal_theme
+ .green
+ .unwrap_or(default_terminal_theme.green),
+ yellow: partial_terminal_theme
+ .yellow
+ .unwrap_or(default_terminal_theme.yellow),
+ blue: partial_terminal_theme
+ .blue
+ .unwrap_or(default_terminal_theme.blue),
+ magenta: partial_terminal_theme
+ .magenta
+ .unwrap_or(default_terminal_theme.magenta),
+ cyan: partial_terminal_theme
+ .cyan
+ .unwrap_or(default_terminal_theme.cyan),
+ white: partial_terminal_theme
+ .white
+ .unwrap_or(default_terminal_theme.white),
+ bright_black: partial_terminal_theme
+ .bright_black
+ .unwrap_or(default_terminal_theme.bright_black),
+ bright_red: partial_terminal_theme
+ .bright_red
+ .unwrap_or(default_terminal_theme.bright_red),
+ bright_green: partial_terminal_theme
+ .bright_green
+ .unwrap_or(default_terminal_theme.bright_green),
+ bright_yellow: partial_terminal_theme
+ .bright_yellow
+ .unwrap_or(default_terminal_theme.bright_yellow),
+ bright_blue: partial_terminal_theme
+ .bright_blue
+ .unwrap_or(default_terminal_theme.bright_blue),
+ bright_magenta: partial_terminal_theme
+ .bright_magenta
+ .unwrap_or(default_terminal_theme.bright_magenta),
+ bright_cyan: partial_terminal_theme
+ .bright_cyan
+ .unwrap_or(default_terminal_theme.bright_cyan),
+ bright_white: partial_terminal_theme
+ .bright_white
+ .unwrap_or(default_terminal_theme.bright_white),
+ cursor: partial_terminal_theme
+ .cursor
+ .unwrap_or(default_terminal_theme.cursor),
+ cursor_accent: partial_terminal_theme
+ .cursor_accent
+ .unwrap_or(default_terminal_theme.cursor_accent),
})
}
}
-
-
fn default_to_true() -> bool {
true
}
fn default_profile(uuid: String) -> Profile {
Profile {
- name: String::from("Default profile"),
- terminal_options: TerminalOption::default(),
- theme: TerminalTheme::default(),
- background_transparency: RangedInt::default(),
- uuid,
+ name: String::from("Default profile"),
+ terminal_options: TerminalOption::default(),
+ theme: TerminalTheme::default(),
+ background_transparency: RangedInt::default(),
+ uuid,
#[cfg(target_family = "unix")]
command: String::from("sh -c $SHELL"),
#[cfg(target_os = "windows")]
command: String::from("%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"),
+ background: None,
}
}
@@ -528,4 +564,4 @@ fn default_shortcuts() -> Vec {
action: ShortcutAction::FocusPrevTab,
},
]
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/configuration/mod.rs b/src-tauri/src/configuration/mod.rs
index b6d6941..fe6466c 100644
--- a/src-tauri/src/configuration/mod.rs
+++ b/src-tauri/src/configuration/mod.rs
@@ -1,3 +1,3 @@
-pub mod partial;
pub mod deserialized;
-pub mod types;
\ No newline at end of file
+pub mod partial;
+pub mod types;
diff --git a/src-tauri/src/configuration/partial.rs b/src-tauri/src/configuration/partial.rs
index 6f55efa..c662026 100644
--- a/src-tauri/src/configuration/partial.rs
+++ b/src-tauri/src/configuration/partial.rs
@@ -1,10 +1,10 @@
-use crate::configuration::types::RangedInt;
use crate::configuration::deserialized::ShortcutAction;
use crate::configuration::deserialized::TerminalOption;
use crate::configuration::types::CursorType;
-use crate::configuration::types::BackgroundType;
+use crate::configuration::types::RangedInt;
+use crate::configuration::types::{BackgroundMedia, BackgroundType};
use serde::Deserialize;
-
+use serde::Deserializer;
#[derive(Deserialize, Debug)]
pub struct PartialOption {
@@ -31,7 +31,7 @@ pub struct PartialOption {
pub close_confirmation: bool,
#[serde(default)]
- pub default_profile: String
+ pub default_profile: String,
}
impl Default for PartialOption {
@@ -46,13 +46,11 @@ impl Default for PartialOption {
background_transparency: RangedInt::default(),
shortcuts: Some(Vec::default()),
macros: Some(Vec::default()),
- default_profile: String::new()
+ default_profile: String::new(),
}
}
}
-
-
#[derive(Deserialize, Debug)]
pub struct PartialProfile {
pub name: String,
@@ -65,7 +63,7 @@ pub struct PartialProfile {
pub show_picture: std::option::Option,
pub bell: std::option::Option,
pub theme: std::option::Option,
- pub background_transparency: std::option::Option>,
+ pub background_transparency: std::option::Option>,
pub cursor_blink: std::option::Option,
pub draw_bold_in_bright: std::option::Option,
pub show_unread_data_indicator: std::option::Option,
@@ -74,31 +72,48 @@ pub struct PartialProfile {
pub font_weight: std::option::Option>,
pub font_weight_bold: std::option::Option>,
pub title_is_running_process: std::option::Option,
+ #[serde(deserialize_with = "deserialize_profile_background")]
+ #[serde(default)]
+ pub background: std::option::Option,
}
-
-
#[derive(Deserialize, Debug)]
pub struct PartialMacro {
pub content: String,
pub uuid: Option,
}
-
-
#[derive(Deserialize, Debug)]
pub struct PartialShortcut {
pub shortcut: String,
pub action: ShortcutAction,
}
+fn deserialize_profile_background<'de, D>(
+ data: D,
+) -> Result, D::Error>
+where
+ D: Deserializer<'de>,
+{
+ #[derive(Deserialize, Debug)]
+ #[serde(untagged)]
+ enum Representation {
+ Simple(String),
+ Complex(BackgroundMedia),
+ }
-
-
-
-
-
+ Ok(
+ if let Ok(name_to_find) = Representation::deserialize(data) {
+ match name_to_find {
+ Representation::Simple(path) => BackgroundMedia::deserialize_from_string(path),
+ Representation::Complex(background) => Some(background),
+ }
+ } else {
+ None
+ },
+ )
+}
fn default_to_true() -> bool {
true
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/configuration/types.rs b/src-tauri/src/configuration/types.rs
index 5c9b89c..f0e76b6 100644
--- a/src-tauri/src/configuration/types.rs
+++ b/src-tauri/src/configuration/types.rs
@@ -1,6 +1,6 @@
-use serde::{Serializer, Serialize};
use serde::de::Error;
use serde::Deserialize;
+use serde::{Serialize, Serializer};
#[derive(Debug, Clone, Copy)]
pub struct RangedInt {
@@ -46,13 +46,13 @@ impl<'de, const MIN: u32, const MAX: u32, const DEF: u32> serde::Serialize
}
}
-
#[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")]
pub enum BackgroundType {
Opaque,
Media(BackgroundMedia),
Transparent,
+ #[cfg(target_family = "unix")]
Blurred,
#[cfg(target_os = "windows")]
Acrylic,
@@ -84,6 +84,7 @@ impl<'de> serde::Deserialize<'de> for BackgroundType {
match option_value.to_lowercase().as_str() {
"opaque" => BackgroundType::Opaque,
"transparent" => BackgroundType::Transparent,
+ #[cfg(target_family = "unix")]
"blurred" => BackgroundType::Blurred,
#[cfg(target_os = "windows")]
"acrylic" => BackgroundType::Acrylic,
@@ -127,13 +128,13 @@ impl Default for CursorType {
#[derive(Debug, Serialize, Clone)]
pub struct BackgroundMedia {
blur: RangedInt<0, 20, 0>,
- location: String,
+ pub location: String,
}
impl BackgroundMedia {
- fn deserialize_from_string(value: String) -> Option {
+ pub fn deserialize_from_string(value: String) -> Option {
if let Ok(file) = std::fs::read(&value) {
- if infer::is_image(&file) || infer::is_video(&file) {
+ if infer::is_image(&file) {
Some(Self {
location: value,
blur: RangedInt::default(),
@@ -156,18 +157,15 @@ impl<'de> serde::Deserialize<'de> for BackgroundMedia {
}
let partial_background_media = PartialBackgroundMedia::deserialize(deserializer)?;
-
- if let Ok(file) = std::fs::read(&partial_background_media.location) {
- if infer::is_image(&file) || infer::is_video(&file) {
- Ok(Self {
- blur: partial_background_media.blur.unwrap_or_default(),
- location: partial_background_media.location,
- })
- } else {
- Err(D::Error::custom("Format not supported"))
- }
+ if std::fs::read(&partial_background_media.location)
+ .is_ok_and(|file| infer::is_image(&file))
+ {
+ Ok(Self {
+ blur: partial_background_media.blur.unwrap_or_default(),
+ location: partial_background_media.location,
+ })
} else {
- Err(D::Error::custom("Cannot read file"))
+ Err(D::Error::custom("File not found or format not supported"))
}
}
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 51d4b15..3fae476 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,6 +1,6 @@
pub mod command;
-pub mod configuration;
pub mod common;
+pub mod configuration;
pub mod logger;
pub mod pty;
pub mod state;
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index c974264..2027321 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -7,13 +7,14 @@ use notify::Watcher;
use tauri::Manager;
use tess::command::{option::*, term::*, window::*};
use tess::configuration::deserialized::Option;
+use tess::configuration::types::BackgroundType;
use tess::logger::Logger;
use std::sync::{Arc, Mutex};
fn main() {
let start = std::time::Instant::now();
- let logger = Arc::from(Logger {});
+ let logger = Logger{};
#[cfg(target_family = "unix")]
let config_file = std::fs::read_to_string(format!(
@@ -26,7 +27,6 @@ fn main() {
dirs_next::config_dir().unwrap_or_default().display()
));
-
let option = Arc::from(Mutex::from(if let Ok(config_file) = config_file {
// TODO: Log error
serde_json::from_str(&config_file).unwrap_or_default()
@@ -51,11 +51,40 @@ fn main() {
let app_handle = app.as_ref().unwrap().app_handle();
+ match &option.lock().unwrap().background {
+ BackgroundType::Media(media) => {
+ app_handle.fs_scope().allow_file(&media.location);
+ }
+ #[cfg(target_family = "unix")]
+ BackgroundType::Blurred => {
+ todo!()
+ }
+ #[cfg(target_os = "windows")]
+ BackgroundType::Mica => {
+ if let Err(_) = window_vibrancy::apply_mica(app_handle.get_window("main").unwrap()) {
+ logger.warn("Cannot apply mica background effect. Switching back to transparent background");
+ }
+ }
+ #[cfg(target_os = "windows")]
+ BackgroundType::Acrylic => {
+ if let Err(_) = window_vibrancy::apply_acrylic(app_handle.get_window("main").unwrap(), None) {
+ logger.warn("Cannot apply acrylic background effect. Switching back to transparent background");
+ }
+ }
+ #[cfg(target_os = "macos")]
+ BackgroundType::Vibrancy => {
+ todo!()
+ }
+ _ => {}
+ }
+
+ app_handle.get_window("main").unwrap().set_decorations(true);
+
+
app_handle
.fs_scope()
.allow_file(&option.lock().unwrap().app_theme);
- let logger_clone = logger.clone();
let mut watcher =
notify::recommended_watcher(move |res: Result| {
@@ -77,7 +106,7 @@ fn main() {
*reff = option;
- logger_clone.info("Refreshing config...");
+ logger.info("Refreshing config...");
app_handle.emit_all("global_config_updated", format!("{:?}", reff));
}
diff --git a/src-tauri/src/pty.rs b/src-tauri/src/pty.rs
index 97e7570..aaf4da8 100644
--- a/src-tauri/src/pty.rs
+++ b/src-tauri/src/pty.rs
@@ -1,23 +1,35 @@
-use portable_pty::{native_pty_system, CommandBuilder, PtySize};
use portable_pty::Child;
-use std::sync::{Arc, Mutex};
+use portable_pty::{native_pty_system, CommandBuilder, PtySize};
+use std::sync::{Arc, Mutex, RwLock};
use crate::common::errors::PtyError;
-use std::sync::mpsc::{Receiver, Sender, TryRecvError};
+use crate::configuration::deserialized::Profile;
use tauri::{AppHandle, Manager};
-use crate::common::payloads::PtySendData;
+use crate::common::payloads::{PtySendData, PtyTitleChanged};
+#[cfg(target_os = "windows")]
+use crate::common::utils::get_leader_process_name;
#[cfg(target_os = "windows")]
use lazy_static::lazy_static;
#[cfg(target_os = "windows")]
-use regex::{Regex, Captures};
+use regex::{Captures, Regex};
+#[cfg(target_os = "windows")]
+use remoteprocess::Process;
+#[cfg(target_os = "windows")]
+use std::ffi::OsString;
pub struct Pty {
pub app: Arc,
- pair: Arc,
- close_channel_sender: Sender<()>,
+ pair: Arc>,
child: Option>>>,
+ #[cfg(target_family = "unix")]
+ current_leader: Arc>,
+ #[cfg(target_os = "windows")]
+ leader_programm_name: Arc>,
+ writer: Option>,
+ is_running: Arc>,
+ title_is_running_process: Arc>,
}
unsafe impl Send for Pty {}
@@ -26,31 +38,35 @@ unsafe impl Sync for Pty {}
impl Pty {
pub fn new(
app: Arc,
- cmd: &str,
+ profile: Profile,
cols: u16,
rows: u16,
id: String,
) -> Result {
let pty_system = native_pty_system();
- let pair = pty_system.openpty(PtySize {
- rows: rows,
- cols: cols,
+ if let Ok(pair) = pty_system.openpty(PtySize {
+ rows,
+ cols,
pixel_width: 0,
pixel_height: 0,
- });
-
- let (sender, receiver) = std::sync::mpsc::channel::<()>();
-
- if let Ok(pair) = pair {
+ }) {
let mut pty = Pty {
- app: app,
- pair: Arc::new(pair),
+ app,
+ pair: Arc::new(Mutex::from(pair)),
child: None,
- close_channel_sender: sender,
+ #[cfg(target_family = "unix")]
+ current_leader: Arc::new(RwLock::new(0)),
+ #[cfg(target_os = "windows")]
+ leader_programm_name: Arc::new(Mutex::from(OsString::new())),
+ writer: None,
+ is_running: Arc::new(RwLock::new(true)),
+ title_is_running_process: Arc::new(RwLock::new(
+ profile.terminal_options.title_is_running_process,
+ )),
};
- pty.run(cmd, id, receiver)?;
+ pty.run(profile, id)?;
Ok(pty)
} else {
@@ -60,77 +76,161 @@ impl Pty {
}
}
- pub fn run(
- &mut self,
- cmd: &str,
- id: String,
- close_channel_receiver: Receiver<()>,
- ) -> Result<(), PtyError> {
+ pub fn run(&mut self, profile: Profile, id: String) -> Result<(), PtyError> {
#[cfg(target_os = "windows")]
lazy_static! {
static ref PROGRAMM_PARSING_REGEX: Regex = Regex::new("%([[:word:]]*)%").unwrap();
}
#[cfg(target_os = "windows")]
- let cmd: String = PROGRAMM_PARSING_REGEX.replace_all(&cmd, |env_variable: &Captures| {
- std::env::var(&env_variable[1]).unwrap_or_default()
- }).into();
+ let cmd: String = PROGRAMM_PARSING_REGEX
+ .replace_all(&profile.command, |env_variable: &Captures| {
+ std::env::var(&env_variable[1]).unwrap_or_default()
+ })
+ .into();
+ #[cfg(target_family = "unix")]
+ let cmd = profile.command;
+
+ #[allow(unused_mut)]
let mut command_builder = CommandBuilder::from_argv(Vec::from_iter(
- cmd.split(' ').map(|s| std::ffi::OsString::from(s)),
+ cmd.split(' ')
+ .map(std::ffi::OsString::from),
));
#[cfg(target_family = "unix")]
command_builder.env("TERM", "xterm-256color");
- if let Ok(child) = self.pair.slave.spawn_command(command_builder) {
+ let locked_pair = self.pair.lock().unwrap();
+
+ if let Ok(child) = locked_pair.slave.spawn_command(command_builder) {
+ #[cfg(target_os = "windows")]
+ let tmp_pty_pid = child.process_id().unwrap();
+
let child = Arc::from(Mutex::from(child));
let child_clone = child.clone();
- if let Ok(mut reader) = self.pair.clone().master.try_clone_reader() {
+ if let Ok(mut reader) = locked_pair.master.try_clone_reader() {
let app = self.app.as_ref().clone();
let cloned_app = app.clone();
let id_cloned = id.clone();
- std::thread::spawn(move || loop {
- match close_channel_receiver.try_recv() {
- Err(TryRecvError::Empty) => {
- let mut buffer = [0; 4096];
-
- if reader.read(&mut buffer).is_ok() {
- app.emit_all(
- "terminalData",
- PtySendData {
- data: String::from_utf8(buffer.to_vec())
- .unwrap_or_default(),
- id: id.clone(),
- },
- )
- .ok();
- }
- }
- _ => {
- break;
+ self.child = Some(child);
+ self.writer = Some(locked_pair.master.take_writer().unwrap());
+
+ let is_running = self.is_running.clone();
+ let is_running_cloned = is_running.clone();
+
+ let title_is_running_process = self.title_is_running_process.clone();
+
+ #[cfg(target_os = "windows")]
+ let leader_programm_name = self.leader_programm_name.clone();
+
+ #[cfg(target_family = "unix")]
+ let cloned_pair = self.pair.clone();
+ #[cfg(target_family = "unix")]
+ let current_process_leader_pid = self.current_leader.clone();
+
+ std::thread::spawn(move || {
+ while *is_running.read().unwrap() {
+ let mut buffer = [0; 4096];
+
+ if reader.read(&mut buffer).is_ok() {
+ app.emit_all(
+ "terminalData",
+ PtySendData {
+ data: String::from_utf8(buffer.to_vec()).unwrap_or_default(),
+ id: id.clone(),
+ },
+ )
+ .ok();
}
}
});
- std::thread::spawn(move || loop {
- if let Ok(Some(_)) = child_clone.as_ref().lock().unwrap().try_wait() {
- cloned_app
- .emit_all("terminal_closed", id_cloned.clone())
- .ok();
+ std::thread::spawn(move || {
+ while *is_running_cloned.read().unwrap() {
+ if let Ok(Some(_)) = child_clone.as_ref().lock().unwrap().try_wait() {
+ *is_running_cloned.write().unwrap() = false;
- break;
- }
+ cloned_app
+ .emit_all("terminal_closed", id_cloned.clone())
+ .ok();
+
+ break;
+ } else if *title_is_running_process.read().unwrap() {
+ #[cfg(target_os = "windows")]
+ {
+ let leader_process_name =
+ get_leader_process_name(Process::new(tmp_pty_pid).unwrap());
+
+ if let Some(new_leader_process_name) = leader_process_name {
+ let mut leader_programm_name_locked =
+ leader_programm_name.lock().unwrap();
+
+ if new_leader_process_name != *leader_programm_name_locked {
+ *leader_programm_name_locked = new_leader_process_name;
+
+ cloned_app
+ .emit_all(
+ "terminalTitleChanged",
+ PtyTitleChanged {
+ id: id_cloned.clone(),
+ title: leader_programm_name_locked
+ .clone()
+ .into_string()
+ .unwrap(),
+ },
+ )
+ .ok();
+ }
+ }
+ }
+
+ #[cfg(target_family = "unix")]
+ {
+ let cloned_locked_pair = cloned_pair.lock().unwrap();
+
+ if let Some(process_leader_pid) =
+ cloned_locked_pair.master.process_group_leader()
+ {
+ if process_leader_pid
+ != *current_process_leader_pid.read().unwrap()
+ {
+ std::thread::sleep(std::time::Duration::from_millis(5));
+
+ *current_process_leader_pid.write().unwrap() =
+ process_leader_pid;
+
+ if let Ok(mut process_leader_title) =
+ std::fs::read_to_string(format!(
+ "/proc/{}/comm",
+ process_leader_pid
+ ))
+ {
+ process_leader_title.pop();
+
+ cloned_app
+ .emit_all(
+ "terminalTitleChanged",
+ PtyTitleChanged {
+ id: id_cloned.clone(),
+ title: process_leader_title,
+ },
+ )
+ .ok();
+ }
+ }
+ }
+ }
+ }
- std::thread::sleep(std::time::Duration::from_millis(5));
+ std::thread::sleep(std::time::Duration::from_millis(10));
+ }
});
};
- self.child = Some(child);
-
Ok(())
} else {
Err(PtyError::Create(String::from(
@@ -140,11 +240,7 @@ impl Pty {
}
pub fn write(&mut self, content: String) -> Result<(), PtyError> {
- if let Ok(()) = write!(
- self.pair.clone().master.try_clone_writer().unwrap(),
- "{}",
- content
- ) {
+ if let Ok(()) = write!(self.writer.as_mut().unwrap(), "{}", content) {
Ok(())
} else {
Err(PtyError::Write(String::from(
@@ -154,12 +250,18 @@ impl Pty {
}
pub fn resize(&self, cols: u16, rows: u16) -> Result<(), PtyError> {
- if let Ok(()) = self.pair.master.resize(portable_pty::PtySize {
- cols,
- rows,
- pixel_height: 0,
- pixel_width: 0,
- }) {
+ if let Ok(()) = self
+ .pair
+ .lock()
+ .unwrap()
+ .master
+ .resize(portable_pty::PtySize {
+ cols,
+ rows,
+ pixel_height: 0,
+ pixel_width: 0,
+ })
+ {
Ok(())
} else {
Err(PtyError::Resize(String::from(
@@ -170,37 +272,21 @@ impl Pty {
pub fn close(&mut self) -> Result<(), PtyError> {
if let Some(child) = self.child.as_deref() {
+ *self.is_running.write().unwrap() = false;
+
if let Ok(mut child) = child.lock() {
- if let Ok(()) = child.kill() {
- if let Ok(()) = self.close_channel_sender.send(()) {
- Ok(())
- } else {
- Err(PtyError::Kill(String::from(
- "process didn't terminate correctly.",
- )))
- }
- } else if let Ok(_) = child.try_wait() {
- if let Ok(()) = self.close_channel_sender.send(()) {
- Ok(())
- } else {
- Err(PtyError::Kill(String::from(
- "process didn't terminate correctly.",
- )))
- }
+ if child.try_wait().is_ok_and(|x| x.is_some()) {
+ Ok(())
+ } else if let Ok(()) = child.kill() {
+ Ok(())
} else {
- Err(PtyError::Kill(String::from(
- "process didn't terminate correctly.",
- )))
+ todo!()
}
} else {
- Err(PtyError::Kill(String::from(
- "doesn't have access to the pty.",
- )))
+ todo!()
}
} else {
- Err(PtyError::Kill(String::from(
- "doesn't have access to the pty.",
- )))
+ todo!()
}
}
}
diff --git a/src-tauri/src/state/pty_manager.rs b/src-tauri/src/state/pty_manager.rs
index 846ccaf..61139f5 100644
--- a/src-tauri/src/state/pty_manager.rs
+++ b/src-tauri/src/state/pty_manager.rs
@@ -1,6 +1,7 @@
use std::collections::HashMap;
use std::sync::Arc;
+use crate::configuration::deserialized::Profile;
use crate::pty::Pty;
use crate::common::errors::PtyError;
@@ -23,10 +24,10 @@ impl PtyManager {
cols: u16,
rows: u16,
id: String,
- cmd: &str,
+ profile: Profile,
) -> Result<(), PtyError> {
if let Some(app_ref) = self.app.as_ref() {
- let pty = Pty::new(app_ref.clone(), cmd, cols, rows, id.clone())?;
+ let pty = Pty::new(app_ref.clone(), profile, cols, rows, id.clone())?;
self.ptys.insert(id, pty);
@@ -38,33 +39,32 @@ impl PtyManager {
}
}
- pub fn write(&mut self, id: String, content: String) -> Result<(), PtyError> {
+ pub fn write(&mut self, id: &str, content: String) -> Result<(), PtyError> {
self.ptys
- .get_mut(&id)
- .ok_or(PtyError::Write(String::from(
+ .get_mut(id)
+ .ok_or_else(|| PtyError::Write(String::from(
"Unable to access to the terminal.",
)))?
.write(content)?;
Ok(())
}
- pub fn resize(&mut self, id: String, cols: u16, rows: u16) -> Result<(), PtyError> {
+ pub fn resize(&mut self, id: &str, cols: u16, rows: u16) -> Result<(), PtyError> {
self.ptys
- .get_mut(&id)
- .ok_or(PtyError::Resize(String::from(
+ .get_mut(id)
+ .ok_or_else(|| PtyError::Resize(String::from(
"Unable to access to the terminal.",
)))?
.resize(cols, rows)?;
Ok(())
}
- pub fn close(&mut self, id: String) -> Result<(), PtyError> {
+ pub fn close(&mut self, id: &str) -> Result<(), PtyError> {
self.ptys
- .get_mut(&id)
- .ok_or(PtyError::Kill(String::from(
+ .remove(id)
+ .ok_or_else(|| PtyError::Kill(String::from(
"Unable to access to the terminal.",
)))?
- .close()?;
- Ok(())
+ .close()
}
}
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index ac7157f..1fc66d4 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -62,7 +62,9 @@
"height": 720,
"resizable": true,
"title": "Tess",
- "width": 1280
+ "width": 1280,
+ "transparent": true,
+ "decorations": false
}
]
}
diff --git a/src/style/style.scss b/src/style/style.scss
index 4c3c7cf..2867b6a 100644
--- a/src/style/style.scss
+++ b/src/style/style.scss
@@ -46,6 +46,7 @@ body {
background: var(--app-background);
}
+
::-webkit-scrollbar {
height: 4px;
width: 4px;
@@ -54,4 +55,16 @@ body {
::-webkit-scrollbar-thumb {
background:rgba(212, 212, 212, 0.14);
border-radius: 6px;
+}
+
+
+.background-image {
+ height: 100%;
+ width: 100%;
+ z-index: -4;
+ object-fit: cover;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ position: absolute;
}
\ No newline at end of file
diff --git a/src/style/tab.scss b/src/style/tab.scss
index 99f3e67..35a379d 100644
--- a/src/style/tab.scss
+++ b/src/style/tab.scss
@@ -48,6 +48,7 @@
width: calc(100% - 64px);
text-align: center;
font-weight: 600;
+ line-height: 12px;
}
.close {
diff --git a/src/style/target/linux.scss b/src/style/target/linux.scss
index 729e375..15481f1 100644
--- a/src/style/target/linux.scss
+++ b/src/style/target/linux.scss
@@ -1,3 +1,7 @@
.views .view .pane .internal-term canvas {
will-change: transform;
+}
+
+.background-image {
+ will-change: transform; // Require to force GPU acceleration to improve blur performance.
}
\ No newline at end of file
diff --git a/src/style/term.scss b/src/style/term.scss
index c5adc2f..56a215b 100644
--- a/src/style/term.scss
+++ b/src/style/term.scss
@@ -18,10 +18,24 @@
width: 100%;
height: 100%;
display: flex;
+ position: relative;
+
+ .background-image {
+ z-index: -2;
+ }
.internal-term {
height: calc(100% - 30px);
width: 100%;
+
+ &::before {
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ content: "";
+ background: var(--profile-background);
+ opacity: var(--profile-background-transparency);
+ }
}
}
}
diff --git a/src/ts/class/panes.ts b/src/ts/class/panes.ts
index 7d8bdeb..9a58ade 100644
--- a/src/ts/class/panes.ts
+++ b/src/ts/class/panes.ts
@@ -1,16 +1,21 @@
-import { invoke } from '@tauri-apps/api/tauri';
+import { invoke, convertFileSrc } from '@tauri-apps/api/tauri';
import { Terminal } from "./terminal";
import { Profile } from 'ts/schema/option';
export class TerminalPane {
element: Element;
id: string;
+ profile: Profile;
term: Terminal | null = null;
- constructor(id: string) {
+ title: String
+
+ constructor(id: string, profile: Profile) {
+ this.profile = profile
this.element = this.generateComponents();
this.id = id;
+ this.title = profile.name;
}
generateComponents() : Element {
@@ -18,16 +23,29 @@ export class TerminalPane {
element.classList.add("pane");
let internalTerm = document.createElement("div");
- internalTerm.classList.add("internal-term")
+ internalTerm.classList.add("internal-term");
+
+ if (this.profile.background) {
+ let background = document.createElement("img");
+ background.src = convertFileSrc(this.profile.background.location);
+ background.classList.add("background-image");
+ element.appendChild(background);
+
+ internalTerm.style.setProperty("-webkit-backdrop-filter", `blur(${this.profile.background.blur}px)`)
+ }
+
+ internalTerm.style.setProperty("--profile-background", this.profile.theme.background);
+ internalTerm.style.setProperty("--profile-background-transparency", `${this.profile.backgroundTransparency}%`);
+
element.appendChild(internalTerm);
return element
}
- async initializeTerm(profile: Profile) {
- let terminal = new Terminal(this.id, profile.terminalOptions, profile.theme);
+ async initializeTerm() {
+ let terminal = new Terminal(this.id, this.profile.terminalOptions, this.profile.theme);
- await terminal.launch(this.element.querySelector(".internal-term")!, profile.command);
+ await terminal.launch(this.element.querySelector(".internal-term")!, this.profile.uuid);
this.term = terminal;
}
@@ -61,10 +79,13 @@ export class PagePane {
id: string
element: Element | null = null;
+ title: String
+
constructor(id: string) {
// TODO: Implement
this.id = id;
+ this.title = "";
}
async close() {
diff --git a/src/ts/class/tab.ts b/src/ts/class/tab.ts
index f65cb11..ee333eb 100644
--- a/src/ts/class/tab.ts
+++ b/src/ts/class/tab.ts
@@ -48,8 +48,6 @@ export class Tab {
}
private generateComponents() : HTMLElement {
- // TODO: Finish implementing this
-
let tab = document.createElement("div");
let title = document.createElement("span");
diff --git a/src/ts/class/terminal.ts b/src/ts/class/terminal.ts
index b9a86cb..baf1403 100644
--- a/src/ts/class/terminal.ts
+++ b/src/ts/class/terminal.ts
@@ -8,17 +8,21 @@ import { TerminalOptions, TerminalTheme } from "ts/schema/option";
export class Terminal {
id: string;
term: Xterm;
- fitAddon: FitAddon
+ fitAddon: FitAddon;
+
constructor(id: string, options: TerminalOptions, theme: TerminalTheme) {
// TODO: Finish
// TODO: Load all addons
+ theme = Object.assign({}, theme);
+ theme.background = "transparent";
this.id = id;
this.term = new Xterm({
allowProposedApi: true,
fontFamily: "Fira Code, monospace",
+ allowTransparency: true,
fontSize: options.fontSize,
drawBoldTextInBrightColors: options.drawBoldInBright,
cursorBlink: options.cursorBlink,
@@ -33,16 +37,6 @@ export class Terminal {
this.fitAddon = new FitAddon();
- addEventListener("resize", () => {
- this.fitAddon.fit();
- invoke("resize_terminal", {cols: this.term.cols, rows: this.term.rows, id: this.id}).catch((error) => {
- // TODO: Send notification with error message
-
- console.error(error);
- });
- })
-
-
this.term.attachCustomKeyEventHandler((e) => {
if (e.key == "F10") {
invoke("terminal_input", {content: "\x1b[21~", id: id});
@@ -54,8 +48,17 @@ export class Terminal {
})
}
- async launch(target: HTMLElement, command: string) {
- await invoke("create_terminal", {cols: this.term.cols, rows: this.term.rows, id: this.id, command: command})
+ async launch(target: HTMLElement, profile_id: string) {
+ target.addEventListener("resize", () => {
+ this.fitAddon.fit();
+ invoke("resize_terminal", {cols: this.term.cols, rows: this.term.rows, id: this.id}).catch((error) => {
+ // TODO: Send notification with error message
+
+ console.error(error);
+ });
+ })
+
+ await invoke("create_terminal", {cols: this.term.cols, rows: this.term.rows, id: this.id, profileUuid: profile_id})
this.term.open(target);
diff --git a/src/ts/class/views.ts b/src/ts/class/views.ts
index 4508c08..56e2842 100644
--- a/src/ts/class/views.ts
+++ b/src/ts/class/views.ts
@@ -11,18 +11,17 @@ export class View {
panes: (TerminalPane|PagePane)[] = []
closedEvent: ((id: string) => void) | undefined;
+ focusedPaneTitleChangedEvent: ((title: string) => void) | undefined;
- async buildNew(viewId: string, paneId: string, closedEvent: ((id: string) => void), profile: Profile) {
+ async buildNew(viewId: string, paneId: string, closedEvent: ((id: string) => void), profile: Profile, focusedPaneTitleChangedEvent: ((title: string) => void)) {
this.id = viewId;
this.element = this.generateComponents();
this.closedEvent = closedEvent;
+ this.focusedPaneTitleChangedEvent = focusedPaneTitleChangedEvent;
-
-
- let pane = new TerminalPane(paneId);
-
- await pane.initializeTerm(profile);
+ let pane = new TerminalPane(paneId, profile);
+ await pane.initializeTerm();
this.panes.push(pane)
this.element.appendChild(pane.element);
@@ -59,8 +58,6 @@ export class View {
if (this.panes.length == 0) {
this.closedEvent!(this.id!);
}
-
- // TODO: Implement
}
writeToTerm(termId: string, data: string) {
@@ -97,6 +94,14 @@ export class View {
})
}
+ updatePaneTitle(id: string, title: string) {
+ let pane = this.panes.find((pane) => pane.id == id);
+ if (pane) {
+ pane.title = title;
+ this.focusedPaneTitleChangedEvent!(title)
+ }
+ }
+
/*openPane(split: "horizontaly" | "vertically", paneId: string, subviewToSplit: string) {
// TODO: Implement
}*/
diff --git a/src/ts/main.ts b/src/ts/main.ts
index 858da0b..ad0da92 100644
--- a/src/ts/main.ts
+++ b/src/ts/main.ts
@@ -9,21 +9,32 @@ window.addEventListener("contextmenu", (e) => {
})
invoke("get_configuration").then((option) => {
+ if (option.background != "opaque" && !(option.background instanceof Object)) {
+ document.body.style.background = "transparent";
+ } else if (option.background instanceof Object) {
+ let background = document.createElement("img");
+ background.src = convertFileSrc(option.background.media.location);
+ background.classList.add("background-image");
+ background.style.setProperty("-webkit-filter", `blur(${option.background.media.blur}px)`);
+ document.body.appendChild(background)
+ }
+
+
let stylesheet = document.createElement("link");
stylesheet.type = "text/css";
stylesheet.rel = "stylesheet";
stylesheet.href = convertFileSrc(option.appTheme);
document.head.appendChild(stylesheet);
- let viewsManager = new ViewsManager(document.querySelector(".views")!, document.querySelector(".tabs")!, document.querySelector(".toasts")!, option);
+ let viewsManager = new ViewsManager(document.querySelector(".views")!, document.querySelector(".tabs")!, document.querySelector(".toasts")!, option);
viewsManager.openProfile(option.defaultProfile.uuid, true)
-
document.querySelector(".open")!.addEventListener("click", () => {
viewsManager.openProfile(option.defaultProfile.uuid, true);
})
+
listen("global_config_updated", (e) => {
console.log("Updated config:", e.payload);
});
diff --git a/src/ts/manager/view.ts b/src/ts/manager/view.ts
index 294c102..05d702b 100644
--- a/src/ts/manager/view.ts
+++ b/src/ts/manager/view.ts
@@ -3,7 +3,7 @@ import { listen, Event } from '@tauri-apps/api/event'
import { v4 as uuid } from 'uuid';
import { invoke } from '@tauri-apps/api/tauri'
-import { terminalDataPayload } from "../schema/term";
+import { terminalDataPayload, terminalTitleChangedPayload } from "../schema/term";
import { View } from "../class/views";
import { Toaster } from "./toast";
import { Option } from "ts/schema/option";
@@ -28,6 +28,7 @@ export class ViewsManager {
this.tabsManager.addEventListener("tabFocused", (id) => { this.onTabFocused(id); });
listen("terminalData", (e) => { this.onTerminalReceiveData(e); });
+ listen("terminalTitleChanged", (e) => { this.onTerminalTitleChanged(e); })
listen("terminal_closed", (e) => { this.onTerminalProcessExited(e); });
this.toaster = new Toaster(toastTarget);
@@ -80,6 +81,14 @@ export class ViewsManager {
})
}
+ private onTerminalTitleChanged(e: Event) {
+ this.views.forEach((view) => {
+ if (view.getTerm(e.payload.id)) {
+ view.updatePaneTitle(e.payload.id, e.payload.title)
+ }
+ })
+ }
+
private onTerminalPaneInput(id: string, data: string) {
invoke("terminal_input", {content: data, id: id});
}
@@ -103,7 +112,7 @@ export class ViewsManager {
let profile = this.option.profiles.find(profile => profile.uuid == profileId);
if (profile) {
- view.buildNew(viewId, paneId, (id) => {this.tabsManager.closeTab(id)}, profile).then(() => {
+ view.buildNew(viewId, paneId, (id) => {this.tabsManager.closeTab(id)}, profile, (title) => {this.tabsManager.setTitle(viewId, title)}).then(() => {
this.views.push(view);
this.target.appendChild(view.element!);
diff --git a/src/ts/schema/option.ts b/src/ts/schema/option.ts
index f5cdfa5..a45ab33 100644
--- a/src/ts/schema/option.ts
+++ b/src/ts/schema/option.ts
@@ -2,11 +2,11 @@ export type Option = {
appTheme : string,
closeConfirmation: boolean,
customTitlebar: boolean,
- backgroundTransparency: Number,
profiles: Profile[],
macros: Macro[],
shortcuts: Shortcut[],
- defaultProfile: Profile
+ defaultProfile: Profile,
+ background: "transparent" | "opaque" | "blurred" | "mica" | "acrylic" | "vibrancy" | {media: BackgroundMedia}
}
type Shortcut = {
@@ -42,6 +42,7 @@ export type Profile = {
theme: TerminalTheme,
uuid: string,
backgroundTransparency: number,
+ background: BackgroundMedia | null,
command: string
}
@@ -66,4 +67,9 @@ export type TerminalTheme = {
brightWhite: string,
cursor: string,
cursorAccent: string
+}
+
+export type BackgroundMedia = {
+ blur: number,
+ location: string
}
\ No newline at end of file
diff --git a/src/ts/schema/term.ts b/src/ts/schema/term.ts
index c4702c3..3951d21 100644
--- a/src/ts/schema/term.ts
+++ b/src/ts/schema/term.ts
@@ -1,4 +1,9 @@
export type terminalDataPayload = {
data: string,
id: string
+}
+
+export type terminalTitleChangedPayload = {
+ title: string,
+ id: string
}
\ No newline at end of file