aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2021-05-09 16:44:05 +0200
committera-kenji <aks.kenji@protonmail.com>2021-05-10 16:03:06 +0200
commit088bcf3dd8aab4e522cface84c0a260b5b37a87c (patch)
tree5ed94988521c3caa2eefc00277569345e0f0d8f6
parentREADME: shortening + add explanation (#470) (diff)
downloadsl0ppij-088bcf3dd8aab4e522cface84c0a260b5b37a87c.tar.gz
sl0ppij-088bcf3dd8aab4e522cface84c0a260b5b37a87c.tar.xz
sl0ppij-088bcf3dd8aab4e522cface84c0a260b5b37a87c.zip
Add Option for Simplified Layout
* the simplified layout omits the Nerdfonts characters that are not found in every Fontset * add an optional config option to opt into the simplified ui `simplified_ui: bool` * add a config flag that allows opting into the simplified ui `zellij options --simplified-ui` * move the `clean` flag to the `setup` subcommand
-rw-r--r--default-plugins/status-bar/src/first_line.rs138
-rw-r--r--default-plugins/status-bar/src/main.rs10
-rw-r--r--default-plugins/tab-bar/src/line.rs37
-rw-r--r--default-plugins/tab-bar/src/main.rs9
-rw-r--r--default-plugins/tab-bar/src/tab.rs20
-rw-r--r--example/config.yaml1
-rw-r--r--example/default.yaml1
-rw-r--r--src/cli.rs17
-rw-r--r--src/client/mod.rs6
-rw-r--r--src/common/input/config.rs16
-rw-r--r--src/common/input/handler.rs4
-rw-r--r--src/common/input/keybinds.rs6
-rw-r--r--src/common/input/mod.rs1
-rw-r--r--src/common/input/options.rs19
-rw-r--r--src/server/mod.rs19
-rw-r--r--zellij-tile/src/data.rs6
16 files changed, 225 insertions, 85 deletions
diff --git a/default-plugins/status-bar/src/first_line.rs b/default-plugins/status-bar/src/first_line.rs
index f679e863..37175e3f 100644
--- a/default-plugins/status-bar/src/first_line.rs
+++ b/default-plugins/status-bar/src/first_line.rs
@@ -2,7 +2,7 @@ use ansi_term::ANSIStrings;
use zellij_tile::prelude::*;
use crate::color_elements;
-use crate::{ColoredElements, LinePart, ARROW_SEPARATOR};
+use crate::{ColoredElements, LinePart};
struct CtrlKeyShortcut {
mode: CtrlKeyMode,
@@ -63,13 +63,18 @@ impl CtrlKeyShortcut {
}
}
-fn unselected_mode_shortcut(letter: char, text: &str, palette: ColoredElements) -> LinePart {
- let prefix_separator = palette.unselected_prefix_separator.paint(ARROW_SEPARATOR);
+fn unselected_mode_shortcut(
+ letter: char,
+ text: &str,
+ palette: ColoredElements,
+ separator: &str,
+) -> LinePart {
+ let prefix_separator = palette.unselected_prefix_separator.paint(separator);
let char_left_separator = palette.unselected_char_left_separator.paint(" <");
let char_shortcut = palette.unselected_char_shortcut.paint(letter.to_string());
let char_right_separator = palette.unselected_char_right_separator.paint(">");
let styled_text = palette.unselected_styled_text.paint(format!("{} ", text));
- let suffix_separator = palette.unselected_suffix_separator.paint(ARROW_SEPARATOR);
+ let suffix_separator = palette.unselected_suffix_separator.paint(separator);
LinePart {
part: ANSIStrings(&[
prefix_separator,
@@ -84,13 +89,18 @@ fn unselected_mode_shortcut(letter: char, text: &str, palette: ColoredElements)
}
}
-fn selected_mode_shortcut(letter: char, text: &str, palette: ColoredElements) -> LinePart {
- let prefix_separator = palette.selected_prefix_separator.paint(ARROW_SEPARATOR);
+fn selected_mode_shortcut(
+ letter: char,
+ text: &str,
+ palette: ColoredElements,
+ separator: &str,
+) -> LinePart {
+ let prefix_separator = palette.selected_prefix_separator.paint(separator);
let char_left_separator = palette.selected_char_left_separator.paint(" <".to_string());
let char_shortcut = palette.selected_char_shortcut.paint(format!("{}", letter));
let char_right_separator = palette.selected_char_right_separator.paint(">".to_string());
let styled_text = palette.selected_styled_text.paint(format!("{} ", text));
- let suffix_separator = palette.selected_suffix_separator.paint(ARROW_SEPARATOR);
+ let suffix_separator = palette.selected_suffix_separator.paint(separator);
LinePart {
part: ANSIStrings(&[
prefix_separator,
@@ -105,69 +115,89 @@ fn selected_mode_shortcut(letter: char, text: &str, palette: ColoredElements) ->
}
}
-fn disabled_mode_shortcut(text: &str, palette: ColoredElements) -> LinePart {
- let prefix_separator = palette.disabled_prefix_separator.paint(ARROW_SEPARATOR);
+fn disabled_mode_shortcut(text: &str, palette: ColoredElements, separator: &str) -> LinePart {
+ let prefix_separator = palette.disabled_prefix_separator.paint(separator);
let styled_text = palette.disabled_styled_text.paint(format!("{} ", text));
- let suffix_separator = palette.disabled_suffix_separator.paint(ARROW_SEPARATOR);
+ let suffix_separator = palette.disabled_suffix_separator.paint(separator);
LinePart {
part: format!("{}{}{}", prefix_separator, styled_text, suffix_separator),
len: text.chars().count() + 2 + 1, // 2 for the arrows, 1 for the padding in the end
}
}
-fn selected_mode_shortcut_single_letter(letter: char, palette: ColoredElements) -> LinePart {
+fn selected_mode_shortcut_single_letter(
+ letter: char,
+ palette: ColoredElements,
+ separator: &str,
+) -> LinePart {
let char_shortcut_text = format!(" {} ", letter);
let len = char_shortcut_text.chars().count() + 4; // 2 for the arrows, 2 for the padding
let prefix_separator = palette
.selected_single_letter_prefix_separator
- .paint(ARROW_SEPARATOR);
+ .paint(separator);
let char_shortcut = palette
.selected_single_letter_char_shortcut
.paint(char_shortcut_text);
let suffix_separator = palette
.selected_single_letter_suffix_separator
- .paint(ARROW_SEPARATOR);
+ .paint(separator);
LinePart {
part: ANSIStrings(&[prefix_separator, char_shortcut, suffix_separator]).to_string(),
len,
}
}
-fn unselected_mode_shortcut_single_letter(letter: char, palette: ColoredElements) -> LinePart {
+fn unselected_mode_shortcut_single_letter(
+ letter: char,
+ palette: ColoredElements,
+ separator: &str,
+) -> LinePart {
let char_shortcut_text = format!(" {} ", letter);
let len = char_shortcut_text.chars().count() + 4; // 2 for the arrows, 2 for the padding
let prefix_separator = palette
.unselected_single_letter_prefix_separator
- .paint(ARROW_SEPARATOR);
+ .paint(separator);
let char_shortcut = palette
.unselected_single_letter_char_shortcut
.paint(char_shortcut_text);
let suffix_separator = palette
.unselected_single_letter_suffix_separator
- .paint(ARROW_SEPARATOR);
+ .paint(separator);
LinePart {
part: ANSIStrings(&[prefix_separator, char_shortcut, suffix_separator]).to_string(),
len,
}
}
-fn full_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements) -> LinePart {
+fn full_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements, separator: &str) -> LinePart {
let full_text = key.full_text();
let letter_shortcut = key.letter_shortcut();
match key.mode {
- CtrlKeyMode::Unselected => {
- unselected_mode_shortcut(letter_shortcut, &format!(" {}", full_text), palette)
- }
- CtrlKeyMode::Selected => {
- selected_mode_shortcut(letter_shortcut, &format!(" {}", full_text), palette)
- }
- CtrlKeyMode::Disabled => {
- disabled_mode_shortcut(&format!(" <{}> {}", letter_shortcut, full_text), palette)
- }
+ CtrlKeyMode::Unselected => unselected_mode_shortcut(
+ letter_shortcut,
+ &format!(" {}", full_text),
+ palette,
+ separator,
+ ),
+ CtrlKeyMode::Selected => selected_mode_shortcut(
+ letter_shortcut,
+ &format!(" {}", full_text),
+ palette,
+ separator,
+ ),
+ CtrlKeyMode::Disabled => disabled_mode_shortcut(
+ &format!(" <{}> {}", letter_shortcut, full_text),
+ palette,
+ separator,
+ ),
}
}
-fn shortened_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements) -> LinePart {
+fn shortened_ctrl_key(
+ key: &CtrlKeyShortcut,
+ palette: ColoredElements,
+ separator: &str,
+) -> LinePart {
let shortened_text = key.shortened_text();
let letter_shortcut = key.letter_shortcut();
let shortened_text = match key.action {
@@ -176,33 +206,47 @@ fn shortened_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements) -> LinePa
};
match key.mode {
CtrlKeyMode::Unselected => {
- unselected_mode_shortcut(letter_shortcut, &shortened_text, palette)
+ unselected_mode_shortcut(letter_shortcut, &shortened_text, palette, separator)
+ }
+ CtrlKeyMode::Selected => {
+ selected_mode_shortcut(letter_shortcut, &shortened_text, palette, separator)
}
- CtrlKeyMode::Selected => selected_mode_shortcut(letter_shortcut, &shortened_text, palette),
- CtrlKeyMode::Disabled => disabled_mode_shortcut(
- &format!(" <{}>{}", letter_shortcut, shortened_text),
- palette,
- ),
CtrlKeyMode::Disabled => disabled_mode_shortcut(
&format!(" <{}>{}", letter_shortcut, shortened_text),
palette,
+ separator,
),
}
}
-fn single_letter_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements) -> LinePart {
+fn single_letter_ctrl_key(
+ key: &CtrlKeyShortcut,
+ palette: ColoredElements,
+ separator: &str,
+) -> LinePart {
let letter_shortcut = key.letter_shortcut();
match key.mode {
- CtrlKeyMode::Unselected => unselected_mode_shortcut_single_letter(letter_shortcut, palette),
- CtrlKeyMode::Selected => selected_mode_shortcut_single_letter(letter_shortcut, palette),
- CtrlKeyMode::Disabled => disabled_mode_shortcut(&format!(" {}", letter_shortcut), palette),
+ CtrlKeyMode::Unselected => {
+ unselected_mode_shortcut_single_letter(letter_shortcut, palette, separator)
+ }
+ CtrlKeyMode::Selected => {
+ selected_mode_shortcut_single_letter(letter_shortcut, palette, separator)
+ }
+ CtrlKeyMode::Disabled => {
+ disabled_mode_shortcut(&format!(" {}", letter_shortcut), palette, separator)
+ }
}
}
-fn key_indicators(max_len: usize, keys: &[CtrlKeyShortcut], palette: ColoredElements) -> LinePart {
+fn key_indicators(
+ max_len: usize,
+ keys: &[CtrlKeyShortcut],
+ palette: ColoredElements,
+ separator: &str,
+) -> LinePart {
let mut line_part = LinePart::default();
for ctrl_key in keys {
- let key = full_ctrl_key(ctrl_key, palette);
+ let key = full_ctrl_key(ctrl_key, palette, separator);
line_part.part = format!("{}{}", line_part.part, key.part);
line_part.len += key.len;
}
@@ -211,7 +255,7 @@ fn key_indicators(max_len: usize, keys: &[CtrlKeyShortcut], palette: ColoredElem
}
line_part = LinePart::default();
for ctrl_key in keys {
- let key = shortened_ctrl_key(ctrl_key, palette);
+ let key = shortened_ctrl_key(ctrl_key, palette, separator);
line_part.part = format!("{}{}", line_part.part, key.part);
line_part.len += key.len;
}
@@ -220,7 +264,7 @@ fn key_indicators(max_len: usize, keys: &[CtrlKeyShortcut], palette: ColoredElem
}
line_part = LinePart::default();
for ctrl_key in keys {
- let key = single_letter_ctrl_key(ctrl_key, palette);
+ let key = single_letter_ctrl_key(ctrl_key, palette, separator);
line_part.part = format!("{}{}", line_part.part, key.part);
line_part.len += key.len;
}
@@ -231,17 +275,17 @@ fn key_indicators(max_len: usize, keys: &[CtrlKeyShortcut], palette: ColoredElem
line_part
}
-pub fn superkey(palette: ColoredElements) -> LinePart {
+pub fn superkey(palette: ColoredElements, separator: &str) -> LinePart {
let prefix_text = " Ctrl +";
let prefix = palette.superkey_prefix.paint(prefix_text);
- let suffix_separator = palette.superkey_suffix_separator.paint(ARROW_SEPARATOR);
+ let suffix_separator = palette.superkey_suffix_separator.paint(separator);
LinePart {
part: ANSIStrings(&[prefix, suffix_separator]).to_string(),
len: prefix_text.chars().count(),
}
}
-pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
+pub fn ctrl_keys(help: &ModeInfo, max_len: usize, separator: &str) -> LinePart {
let colored_elements = color_elements(help.palette);
match &help.mode {
InputMode::Locked => key_indicators(
@@ -255,6 +299,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Disabled, CtrlKeyAction::Quit),
],
colored_elements,
+ separator,
),
InputMode::Resize => key_indicators(
max_len,
@@ -267,6 +312,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
colored_elements,
+ separator,
),
InputMode::Pane => key_indicators(
max_len,
@@ -279,6 +325,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
colored_elements,
+ separator,
),
InputMode::Tab | InputMode::RenameTab => key_indicators(
max_len,
@@ -291,6 +338,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
colored_elements,
+ separator,
),
InputMode::Scroll => key_indicators(
max_len,
@@ -303,6 +351,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
colored_elements,
+ separator,
),
InputMode::Normal => key_indicators(
max_len,
@@ -315,6 +364,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
colored_elements,
+ separator,
),
}
}
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index e1a79d49..bb56c279 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -140,9 +140,15 @@ impl ZellijPlugin for State {
}
fn render(&mut self, _rows: usize, cols: usize) {
+ let separator = if !self.mode_info.capabilities.arrow_fonts {
+ ARROW_SEPARATOR
+ } else {
+ &""
+ };
+
let colored_elements = color_elements(self.mode_info.palette);
- let superkey = superkey(colored_elements);
- let ctrl_keys = ctrl_keys(&self.mode_info, cols - superkey.len);
+ let superkey = superkey(colored_elements, separator);
+ let ctrl_keys = ctrl_keys(&self.mode_info, cols - superkey.len, separator);
let first_line = format!("{}{}", superkey, ctrl_keys);
let second_line = keybinds(&self.mode_info, cols);
diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs
index 89a7aa1b..574edb78 100644
--- a/default-plugins/tab-bar/src/line.rs
+++ b/default-plugins/tab-bar/src/line.rs
@@ -48,7 +48,7 @@ fn populate_tabs_in_tab_line(
}
}
-fn left_more_message(tab_count_to_the_left: usize, palette: Palette) -> LinePart {
+fn left_more_message(tab_count_to_the_left: usize, palette: Palette, separator: &str) -> LinePart {
if tab_count_to_the_left == 0 {
return LinePart {
part: String::new(),
@@ -62,11 +62,11 @@ fn left_more_message(tab_count_to_the_left: usize, palette: Palette) -> LinePart
};
// 238
let more_text_len = more_text.chars().count() + 2; // 2 for the arrows
- let left_separator = style!(palette.bg, palette.orange).paint(ARROW_SEPARATOR);
+ let left_separator = style!(palette.bg, palette.orange).paint(separator);
let more_styled_text = style!(palette.black, palette.orange)
.bold()
.paint(more_text);
- let right_separator = style!(palette.orange, palette.bg).paint(ARROW_SEPARATOR);
+ let right_separator = style!(palette.orange, palette.bg).paint(separator);
let more_styled_text = format!(
"{}",
ANSIStrings(&[left_separator, more_styled_text, right_separator,])
@@ -77,7 +77,11 @@ fn left_more_message(tab_count_to_the_left: usize, palette: Palette) -> LinePart
}
}
-fn right_more_message(tab_count_to_the_right: usize, palette: Palette) -> LinePart {
+fn right_more_message(
+ tab_count_to_the_right: usize,
+ palette: Palette,
+ separator: &str,
+) -> LinePart {
if tab_count_to_the_right == 0 {
return LinePart {
part: String::new(),
@@ -90,11 +94,11 @@ fn right_more_message(tab_count_to_the_right: usize, palette: Palette) -> LinePa
" +many → ".to_string()
};
let more_text_len = more_text.chars().count() + 1; // 2 for the arrow
- let left_separator = style!(palette.bg, palette.orange).paint(ARROW_SEPARATOR);
+ let left_separator = style!(palette.bg, palette.orange).paint(separator);
let more_styled_text = style!(palette.black, palette.orange)
.bold()
.paint(more_text);
- let right_separator = style!(palette.orange, palette.bg).paint(ARROW_SEPARATOR);
+ let right_separator = style!(palette.orange, palette.bg).paint(separator);
let more_styled_text = format!(
"{}",
ANSIStrings(&[left_separator, more_styled_text, right_separator,])
@@ -111,14 +115,15 @@ fn add_previous_tabs_msg(
title_bar: &mut Vec<LinePart>,
cols: usize,
palette: Palette,
+ separator: &str,
) {
while get_current_title_len(&tabs_to_render)
- + left_more_message(tabs_before_active.len(), palette).len
+ + left_more_message(tabs_before_active.len(), palette, separator).len
>= cols
{
tabs_before_active.push(tabs_to_render.remove(0));
}
- let left_more_message = left_more_message(tabs_before_active.len(), palette);
+ let left_more_message = left_more_message(tabs_before_active.len(), palette, separator);
title_bar.push(left_more_message);
}
@@ -127,14 +132,15 @@ fn add_next_tabs_msg(
title_bar: &mut Vec<LinePart>,
cols: usize,
palette: Palette,
+ separator: &str,
) {
while get_current_title_len(&title_bar)
- + right_more_message(tabs_after_active.len(), palette).len
+ + right_more_message(tabs_after_active.len(), palette, separator).len
>= cols
{
tabs_after_active.insert(0, title_bar.pop().unwrap());
}
- let right_more_message = right_more_message(tabs_after_active.len(), palette);
+ let right_more_message = right_more_message(tabs_after_active.len(), palette, separator);
title_bar.push(right_more_message);
}
@@ -148,11 +154,20 @@ fn tab_line_prefix(palette: Palette) -> LinePart {
}
}
+pub fn tab_separator(capabilities: PluginCapabilities) -> &'static str {
+ if !capabilities.arrow_fonts {
+ ARROW_SEPARATOR
+ } else {
+ &""
+ }
+}
+
pub fn tab_line(
mut all_tabs: Vec<LinePart>,
active_tab_index: usize,
cols: usize,
palette: Palette,
+ capabilities: PluginCapabilities,
) -> Vec<LinePart> {
let mut tabs_to_render: Vec<LinePart> = vec![];
let mut tabs_after_active = all_tabs.split_off(active_tab_index);
@@ -180,6 +195,7 @@ pub fn tab_line(
&mut tab_line,
cols - prefix.len,
palette,
+ tab_separator(capabilities),
);
}
tab_line.append(&mut tabs_to_render);
@@ -189,6 +205,7 @@ pub fn tab_line(
&mut tab_line,
cols - prefix.len,
palette,
+ tab_separator(capabilities),
);
}
tab_line.insert(0, prefix);
diff --git a/default-plugins/tab-bar/src/main.rs b/default-plugins/tab-bar/src/main.rs
index c6277013..00ff4bd9 100644
--- a/default-plugins/tab-bar/src/main.rs
+++ b/default-plugins/tab-bar/src/main.rs
@@ -60,10 +60,17 @@ impl ZellijPlugin for State {
t.position,
t.is_sync_panes_active,
self.mode_info.palette,
+ self.mode_info.capabilities,
);
all_tabs.push(tab);
}
- let tab_line = tab_line(all_tabs, active_tab_index, cols, self.mode_info.palette);
+ let tab_line = tab_line(
+ all_tabs,
+ active_tab_index,
+ cols,
+ self.mode_info.palette,
+ self.mode_info.capabilities,
+ );
let mut s = String::new();
for bar_part in tab_line {
s = format!("{}{}", s, bar_part.part);
diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index 7c1fe6b3..85e2c378 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -1,15 +1,15 @@
-use crate::{LinePart, ARROW_SEPARATOR};
+use crate::{line::tab_separator, LinePart};
use ansi_term::ANSIStrings;
use zellij_tile::prelude::*;
use zellij_tile_utils::style;
-pub fn active_tab(text: String, palette: Palette) -> LinePart {
- let left_separator = style!(palette.bg, palette.green).paint(ARROW_SEPARATOR);
+pub fn active_tab(text: String, palette: Palette, separator: &str) -> LinePart {
+ let left_separator = style!(palette.bg, palette.green).paint(separator);
let tab_text_len = text.chars().count() + 4; // 2 for left and right separators, 2 for the text padding
let tab_styled_text = style!(palette.black, palette.green)
.bold()
.paint(format!(" {} ", text));
- let right_separator = style!(palette.green, palette.bg).paint(ARROW_SEPARATOR);
+ let right_separator = style!(palette.green, palette.bg).paint(separator);
let tab_styled_text = format!(
"{}",
ANSIStrings(&[left_separator, tab_styled_text, right_separator,])
@@ -20,13 +20,13 @@ pub fn active_tab(text: String, palette: Palette) -> LinePart {
}
}
-pub fn non_active_tab(text: String, palette: Palette) -> LinePart {
- let left_separator = style!(palette.bg, palette.fg).paint(ARROW_SEPARATOR);
+pub fn non_active_tab(text: String, palette: Palette, separator: &str) -> LinePart {
+ let left_separator = style!(palette.bg, palette.fg).paint(separator);
let tab_text_len = text.chars().count() + 4; // 2 for left and right separators, 2 for the padding
let tab_styled_text = style!(palette.black, palette.fg)
.bold()
.paint(format!(" {} ", text));
- let right_separator = style!(palette.fg, palette.bg).paint(ARROW_SEPARATOR);
+ let right_separator = style!(palette.fg, palette.bg).paint(separator);
let tab_styled_text = format!(
"{}",
ANSIStrings(&[left_separator, tab_styled_text, right_separator,])
@@ -43,7 +43,9 @@ pub fn tab_style(
position: usize,
is_sync_panes_active: bool,
palette: Palette,
+ capabilities: PluginCapabilities,
) -> LinePart {
+ let separator = tab_separator(capabilities);
let mut tab_text = if text.is_empty() {
format!("Tab #{}", position + 1)
} else {
@@ -53,8 +55,8 @@ pub fn tab_style(
tab_text.push_str(" (Sync)");
}
if is_active_tab {
- active_tab(tab_text, palette)
+ active_tab(tab_text, palette, separator)
} else {
- non_active_tab(tab_text, palette)
+ non_active_tab(tab_text, palette, separator)
}
}
diff --git a/example/config.yaml b/example/config.yaml
index 3bb4fbfa..962822db 100644
--- a/example/config.yaml
+++ b/example/config.yaml
@@ -1,6 +1,7 @@
---
keybinds:
normal:
+ - unbind : true
- action: [GoToTab: 1,]
key: [F: 1,]
- action: [GoToTab: 2,]
diff --git a/example/default.yaml b/example/default.yaml
index 578f4ebf..032ddac9 100644
--- a/example/default.yaml
+++ b/example/default.yaml
@@ -1,4 +1,5 @@
---
+simplified_ui: false
keybinds:
unbind: true
normal:
diff --git a/src/cli.rs b/src/cli.rs
index 91b0ed39..870af1d1 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -10,6 +10,10 @@ pub struct CliArgs {
#[structopt(long)]
pub max_panes: Option<usize>,
+ /// Speficy, if a simplified layout should be used that is compatible with more fonts
+ #[structopt(long)]
+ pub simplified: bool,
+
/// Change where zellij looks for layouts and plugins
#[structopt(long)]
pub data_dir: Option<PathBuf>,
@@ -36,11 +40,11 @@ pub struct CliArgs {
#[derive(Debug, StructOpt, Clone, Serialize, Deserialize)]
pub enum ConfigCli {
/// Change the behaviour of zellij
- #[structopt(name = "option")]
- Config {
- /// Disables loading of configuration file at default location
+ #[structopt(name = "options")]
+ Options {
#[structopt(long)]
- clean: bool,
+ /// Allow plugins to use a more compatible font type
+ simplified_ui: bool,
},
#[structopt(name = "generate-completion")]
@@ -48,9 +52,12 @@ pub enum ConfigCli {
#[structopt(name = "setup")]
Setup {
- /// Disables loading of configuration file at default location
/// Dump the default configuration file to stdout
#[structopt(long)]
dump_config: bool,
+ /// Disables loading of configuration file at default location,
+ /// loads the defaults that zellij ships with
+ #[structopt(long)]
+ clean: bool,
},
}
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 8a5834f0..5ebf8cec 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -42,7 +42,11 @@ pub fn start_client(mut os_input: Box<dyn ClientOsApi>, opts: CliArgs, config: C
let full_screen_ws = os_input.get_terminal_size_using_fd(0);
os_input.connect_to_server();
- os_input.send_to_server(ServerInstruction::NewClient(full_screen_ws, opts));
+ os_input.send_to_server(ServerInstruction::NewClient(
+ full_screen_ws,
+ opts,
+ config.options.clone(),
+ ));
os_input.set_raw_mode(0);
let (send_client_instructions, receive_client_instructions): SyncChannelWithContext<
diff --git a/src/common/input/config.rs b/src/common/input/config.rs
index 3263b571..019d1c4c 100644
--- a/src/common/input/config.rs
+++ b/src/common/input/config.rs
@@ -6,10 +6,11 @@ use std::io::{self, Read};
use std::path::{Path, PathBuf};
use super::keybinds::{Keybinds, KeybindsFromYaml};
+use super::options::Options;
use crate::cli::{CliArgs, ConfigCli};
use crate::common::setup;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
use std::convert::TryFrom;
const DEFAULT_CONFIG_FILE_NAME: &str = "config.yaml";
@@ -19,13 +20,16 @@ type ConfigResult = Result<Config, ConfigError>;
/// Intermediate deserialization config struct
#[derive(Debug, Deserialize)]
pub struct ConfigFromYaml {
+ #[serde(flatten)]
+ pub options: Option<Options>,
pub keybinds: Option<KeybindsFromYaml>,
}
/// Main configuration.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
pub struct Config {
pub keybinds: Keybinds,
+ pub options: Options,
}
#[derive(Debug)]
@@ -43,7 +47,8 @@ pub enum ConfigError {
impl Default for Config {
fn default() -> Self {
let keybinds = Keybinds::default();
- Config { keybinds }
+ let options = Options::default();
+ Config { keybinds, options }
}
}
@@ -55,7 +60,7 @@ impl TryFrom<&CliArgs> for Config {
return Config::new(&path);
}
- if let Some(ConfigCli::Config { clean, .. }) = opts.option {
+ if let Some(ConfigCli::Setup { clean, .. }) = opts.option {
if clean {
return Config::from_default_assets();
}
@@ -84,7 +89,8 @@ impl Config {
pub fn from_yaml(yaml_config: &str) -> ConfigResult {
let config_from_yaml: ConfigFromYaml = serde_yaml::from_str(&yaml_config)?;
let keybinds = Keybinds::get_default_keybinds_with_config(config_from_yaml.keybinds);
- Ok(Config { keybinds })
+ let options = Options::from_yaml(config_from_yaml.options);
+ Ok(Config { keybinds, options })
}
/// Deserializes from given path.
diff --git a/src/common/input/handler.rs b/src/common/input/handler.rs
index a4293220..6238a3ee 100644
--- a/src/common/input/handler.rs
+++ b/src/common/input/handler.rs
@@ -11,7 +11,7 @@ use crate::server::ServerInstruction;
use crate::CommandIsExecuting;
use termion::input::{TermRead, TermReadEventsAndRaw};
-use zellij_tile::data::{InputMode, Key, ModeInfo, Palette};
+use zellij_tile::data::{InputMode, Key, ModeInfo, Palette, PluginCapabilities};
/// Handles the dispatching of [`Action`]s according to the current
/// [`InputMode`], and keep tracks of the current [`InputMode`].
@@ -148,6 +148,7 @@ impl InputHandler {
// TODO this should probably be automatically generated in some way
pub fn get_mode_info(mode: InputMode, palette: Palette) -> ModeInfo {
let mut keybinds: Vec<(String, String)> = vec![];
+ let capabilities = PluginCapabilities { arrow_fonts: true };
match mode {
InputMode::Normal | InputMode::Locked => {}
InputMode::Resize => {
@@ -181,6 +182,7 @@ pub fn get_mode_info(mode: InputMode, palette: Palette) -> ModeInfo {
mode,
keybinds,
palette,
+ capabilities,
}
}
diff --git a/src/common/input/keybinds.rs b/src/common/input/keybinds.rs
index 823ca264..8bef47fd 100644
--- a/src/common/input/keybinds.rs
+++ b/src/common/input/keybinds.rs
@@ -4,14 +4,14 @@ use std::collections::HashMap;
use super::actions::Action;
use super::config;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
use strum::IntoEnumIterator;
use zellij_tile::data::*;
/// Used in the config struct
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct Keybinds(HashMap<InputMode, ModeKeybinds>);
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct ModeKeybinds(HashMap<Key, Vec<Action>>);
/// Intermediate struct used for deserialisation
diff --git a/src/common/input/mod.rs b/src/common/input/mod.rs
index 6589cac2..f30ccf23 100644
--- a/src/common/input/mod.rs
+++ b/src/common/input/mod.rs
@@ -4,3 +4,4 @@ pub mod actions;
pub mod config;
pub mod handler;
pub mod keybinds;
+pub mod options;
diff --git a/src/common/input/options.rs b/src/common/input/options.rs
new file mode 100644
index 00000000..4c2dd861
--- /dev/null
+++ b/src/common/input/options.rs
@@ -0,0 +1,19 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Deserialize, Serialize)]
+/// Options that can be set either through the config file,
+/// or cli flags
+pub struct Options {
+ /// Allow plugins to use a more compatible font type
+ pub simplified_ui: bool,
+}
+
+impl Options {
+ pub fn from_yaml(from_yaml: Option<Options>) -> Options {
+ if let Some(opts) = from_yaml {
+ opts
+ } else {
+ Options::default()
+ }
+ }
+}
diff --git a/src/server/mod.rs b/src/server/mod.rs
index a90831d9..6b9c52b5 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -11,13 +11,14 @@ use std::{
};
use wasmer::{ChainableNamedResolver, Instance, Module, Store, Value};
use wasmer_wasi::{Pipe, WasiState};
-use zellij_tile::data::{Event, EventType, InputMode, ModeInfo};
+use zellij_tile::data::{Event, EventType, InputMode, ModeInfo, PluginCapabilities};
-use crate::cli::CliArgs;
+use crate::cli::{CliArgs, ConfigCli};
use crate::client::ClientInstruction;
use crate::common::{
errors::{ContextType, PluginContext, PtyContext, ScreenContext, ServerContext},
input::actions::{Action, Direction},
+ input::options::Options,
input::handler::get_mode_info,
os_input_output::{set_permissions, ServerOsApi},
pty_bus::{PtyBus, PtyInstruction},
@@ -36,7 +37,7 @@ use crate::panes::PositionAndSize;
#[derive(Serialize, Deserialize, Debug, Clone)]
pub enum ServerInstruction {
TerminalResize(PositionAndSize),
- NewClient(PositionAndSize, CliArgs),
+ NewClient(PositionAndSize, CliArgs, Options),
Action(Action),
Render(Option<String>),
UnblockInputThread,
@@ -112,10 +113,11 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>) -> thread::JoinHandle<()> {
let (instruction, mut err_ctx) = receive_server_instructions.recv().unwrap();
err_ctx.add_call(ContextType::IPCServer(ServerContext::from(&instruction)));
match instruction {
- ServerInstruction::NewClient(full_screen_ws, opts) => {
+ ServerInstruction::NewClient(full_screen_ws, opts, config_options) => {
let session_data = init_session(
os_input.clone(),
opts,
+ config_options,
send_server_instructions.clone(),
full_screen_ws,
);
@@ -190,6 +192,7 @@ fn handle_client(
fn init_session(
os_input: Box<dyn ServerOsApi>,
opts: CliArgs,
+ config_options: Options,
send_server_instructions: SenderWithContext<ServerInstruction>,
full_screen_ws: PositionAndSize,
) -> SessionMetaData {
@@ -303,6 +306,11 @@ fn init_session(
let send_pty_instructions = send_pty_instructions.clone();
let send_server_instructions = send_server_instructions;
let max_panes = opts.max_panes;
+ let capabilities = if let Some(ConfigCli::Options { simplified_ui }) = opts.option {
+ simplified_ui
+ } else {
+ config_options.simplified_ui
+ };
let colors = os_input.load_palette();
move || {
@@ -316,6 +324,9 @@ fn init_session(
max_panes,
ModeInfo {
palette: colors,
+ capabilities: PluginCapabilities {
+ arrow_fonts: capabilities,
+ },
..ModeInfo::default()
},
InputMode::Normal,
diff --git a/zellij-tile/src/data.rs b/zellij-tile/src/data.rs
index 63c031ab..4ff44eac 100644
--- a/zellij-tile/src/data.rs
+++ b/zellij-tile/src/data.rs
@@ -125,6 +125,7 @@ pub struct ModeInfo {
// FIXME: This should probably return Keys and Actions, then sort out strings plugin-side
pub keybinds: Vec<(String, String)>, // <shortcut> => <shortcut description>
pub palette: Palette,
+ pub capabilities: PluginCapabilities,
}
#[derive(Debug, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
@@ -141,3 +142,8 @@ pub struct PluginIds {
pub plugin_id: u32,
pub zellij_pid: u32,
}
+
+#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub struct PluginCapabilities {
+ pub arrow_fonts: bool,
+}