Osc implementation (#517)

* fix(compatibility): implement most osc methods * style(fmt): rustfmt * style(fmt): remove cargo warnings * style(fmt): make clippy happy * style(fmt): fix formatting after my clippy fixes broke it again ;P * fix(grid): fix tests
zellij-org · May 17, 2021 · a3f42b1 · a3f42b1
1 parent 8491161
commit a3f42b1
Show file tree

Hide file tree

Showing 18 changed files with 419 additions and 113 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
@@ -72,55 +72,61 @@ pub struct ColoredElements {
 // that can be defined in the config perhaps
 fn color_elements(palette: Palette) -> ColoredElements {
     match palette.source {
+        // "cyan" here is used as a background as a dirty hack
+        // this is because the Palette struct doesn't have a "gray" section
+        // and we can't use its "bg" because that is now dynamically taken from the terminal
+        // and might often not actually fit the rest of the colorscheme
+        //
+        // to fix this, we need to restructure the Palette struct
         PaletteSource::Default => ColoredElements {
-            selected_prefix_separator: style!(palette.bg, palette.green),
+            selected_prefix_separator: style!(palette.cyan, palette.green),
             selected_char_left_separator: style!(palette.black, palette.green).bold(),
             selected_char_shortcut: style!(palette.red, palette.green).bold(),
             selected_char_right_separator: style!(palette.black, palette.green).bold(),
             selected_styled_text: style!(palette.black, palette.green).bold(),
-            selected_suffix_separator: style!(palette.green, palette.bg).bold(),
-            unselected_prefix_separator: style!(palette.bg, palette.fg),
+            selected_suffix_separator: style!(palette.green, palette.cyan).bold(),
+            unselected_prefix_separator: style!(palette.cyan, palette.fg),
             unselected_char_left_separator: style!(palette.black, palette.fg).bold(),
             unselected_char_shortcut: style!(palette.red, palette.fg).bold(),
             unselected_char_right_separator: style!(palette.black, palette.fg).bold(),
             unselected_styled_text: style!(palette.black, palette.fg).bold(),
-            unselected_suffix_separator: style!(palette.fg, palette.bg),
-            disabled_prefix_separator: style!(palette.bg, palette.fg),
-            disabled_styled_text: style!(palette.bg, palette.fg).dimmed(),
-            disabled_suffix_separator: style!(palette.fg, palette.bg),
-            selected_single_letter_prefix_separator: style!(palette.bg, palette.green),
+            unselected_suffix_separator: style!(palette.fg, palette.cyan),
+            disabled_prefix_separator: style!(palette.cyan, palette.fg),
+            disabled_styled_text: style!(palette.cyan, palette.fg).dimmed(),
+            disabled_suffix_separator: style!(palette.fg, palette.cyan),
+            selected_single_letter_prefix_separator: style!(palette.cyan, palette.green),
             selected_single_letter_char_shortcut: style!(palette.red, palette.green).bold(),
-            selected_single_letter_suffix_separator: style!(palette.green, palette.bg),
-            unselected_single_letter_prefix_separator: style!(palette.bg, palette.fg),
+            selected_single_letter_suffix_separator: style!(palette.green, palette.cyan),
+            unselected_single_letter_prefix_separator: style!(palette.cyan, palette.fg),
             unselected_single_letter_char_shortcut: style!(palette.red, palette.fg).bold(),
-            unselected_single_letter_suffix_separator: style!(palette.fg, palette.bg),
-            superkey_prefix: style!(palette.white, palette.bg).bold(),
-            superkey_suffix_separator: style!(palette.bg, palette.bg),
+            unselected_single_letter_suffix_separator: style!(palette.fg, palette.cyan),
+            superkey_prefix: style!(palette.white, palette.cyan).bold(),
+            superkey_suffix_separator: style!(palette.cyan, palette.cyan),
         },
         PaletteSource::Xresources => ColoredElements {
-            selected_prefix_separator: style!(palette.bg, palette.green),
+            selected_prefix_separator: style!(palette.cyan, palette.green),
             selected_char_left_separator: style!(palette.fg, palette.green).bold(),
             selected_char_shortcut: style!(palette.red, palette.green).bold(),
             selected_char_right_separator: style!(palette.fg, palette.green).bold(),
-            selected_styled_text: style!(palette.bg, palette.green).bold(),
-            selected_suffix_separator: style!(palette.green, palette.bg).bold(),
-            unselected_prefix_separator: style!(palette.bg, palette.fg),
-            unselected_char_left_separator: style!(palette.bg, palette.fg).bold(),
+            selected_styled_text: style!(palette.cyan, palette.green).bold(),
+            selected_suffix_separator: style!(palette.green, palette.cyan).bold(),
+            unselected_prefix_separator: style!(palette.cyan, palette.fg),
+            unselected_char_left_separator: style!(palette.cyan, palette.fg).bold(),
             unselected_char_shortcut: style!(palette.red, palette.fg).bold(),
-            unselected_char_right_separator: style!(palette.bg, palette.fg).bold(),
-            unselected_styled_text: style!(palette.bg, palette.fg).bold(),
-            unselected_suffix_separator: style!(palette.fg, palette.bg),
-            disabled_prefix_separator: style!(palette.bg, palette.fg),
-            disabled_styled_text: style!(palette.bg, palette.fg).dimmed(),
-            disabled_suffix_separator: style!(palette.fg, palette.bg),
+            unselected_char_right_separator: style!(palette.cyan, palette.fg).bold(),
+            unselected_styled_text: style!(palette.cyan, palette.fg).bold(),
+            unselected_suffix_separator: style!(palette.fg, palette.cyan),
+            disabled_prefix_separator: style!(palette.cyan, palette.fg),
+            disabled_styled_text: style!(palette.cyan, palette.fg).dimmed(),
+            disabled_suffix_separator: style!(palette.fg, palette.cyan),
             selected_single_letter_prefix_separator: style!(palette.fg, palette.green),
             selected_single_letter_char_shortcut: style!(palette.red, palette.green).bold(),
             selected_single_letter_suffix_separator: style!(palette.green, palette.fg),
-            unselected_single_letter_prefix_separator: style!(palette.fg, palette.bg),
+            unselected_single_letter_prefix_separator: style!(palette.fg, palette.cyan),
             unselected_single_letter_char_shortcut: style!(palette.red, palette.fg).bold(),
-            unselected_single_letter_suffix_separator: style!(palette.fg, palette.bg),
-            superkey_prefix: style!(palette.bg, palette.fg).bold(),
-            superkey_suffix_separator: style!(palette.fg, palette.bg),
+            unselected_single_letter_suffix_separator: style!(palette.fg, palette.cyan),
+            superkey_prefix: style!(palette.cyan, palette.fg).bold(),
+            superkey_suffix_separator: style!(palette.fg, palette.cyan),
         },
     }
 }
@@ -155,7 +161,7 @@ impl ZellijPlugin for State {
 
         // [48;5;238m is gray background, [0K is so that it fills the rest of the line
         // [m is background reset, [0K is so that it clears the rest of the line
-        match self.mode_info.palette.bg {
+        match self.mode_info.palette.cyan {
             PaletteColor::Rgb((r, g, b)) => {
                 println!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", first_line, r, g, b);
             }

diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs
@@ -62,11 +62,11 @@ fn left_more_message(tab_count_to_the_left: usize, palette: Palette, separator:
     };
     // 238
     let more_text_len = more_text.chars().count() + 2; // 2 for the arrows
-    let left_separator = style!(palette.bg, palette.orange).paint(separator);
+    let left_separator = style!(palette.cyan, 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(separator);
+    let right_separator = style!(palette.orange, palette.cyan).paint(separator);
     let more_styled_text = format!(
         "{}",
         ANSIStrings(&[left_separator, more_styled_text, right_separator,])
@@ -94,11 +94,11 @@ fn right_more_message(
         " +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(separator);
+    let left_separator = style!(palette.cyan, 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(separator);
+    let right_separator = style!(palette.orange, palette.cyan).paint(separator);
     let more_styled_text = format!(
         "{}",
         ANSIStrings(&[left_separator, more_styled_text, right_separator,])
@@ -147,7 +147,9 @@ fn add_next_tabs_msg(
 fn tab_line_prefix(palette: Palette) -> LinePart {
     let prefix_text = " Zellij ".to_string();
     let prefix_text_len = prefix_text.chars().count();
-    let prefix_styled_text = style!(palette.white, palette.bg).bold().paint(prefix_text);
+    let prefix_styled_text = style!(palette.white, palette.cyan)
+        .bold()
+        .paint(prefix_text);
     LinePart {
         part: format!("{}", prefix_styled_text),
         len: prefix_text_len,

diff --git a/default-plugins/tab-bar/src/main.rs b/default-plugins/tab-bar/src/main.rs
@@ -75,7 +75,7 @@ impl ZellijPlugin for State {
         for bar_part in tab_line {
             s = format!("{}{}", s, bar_part.part);
         }
-        match self.mode_info.palette.bg {
+        match self.mode_info.palette.cyan {
             PaletteColor::Rgb((r, g, b)) => {
                 println!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", s, r, g, b);
             }

diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
@@ -4,12 +4,12 @@ use zellij_tile::prelude::*;
 use zellij_tile_utils::style;
 
 pub fn active_tab(text: String, palette: Palette, separator: &str) -> LinePart {
-    let left_separator = style!(palette.bg, palette.green).paint(separator);
+    let left_separator = style!(palette.cyan, 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(separator);
+    let right_separator = style!(palette.green, palette.cyan).paint(separator);
     let tab_styled_text = format!(
         "{}",
         ANSIStrings(&[left_separator, tab_styled_text, right_separator,])
@@ -21,12 +21,12 @@ pub fn active_tab(text: String, palette: Palette, separator: &str) -> LinePart {
 }
 
 pub fn non_active_tab(text: String, palette: Palette, separator: &str) -> LinePart {
-    let left_separator = style!(palette.bg, palette.fg).paint(separator);
+    let left_separator = style!(palette.cyan, 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(separator);
+    let right_separator = style!(palette.fg, palette.cyan).paint(separator);
     let tab_styled_text = format!(
         "{}",
         ANSIStrings(&[left_separator, tab_styled_text, right_separator,])

diff --git a/src/tests/fakes.rs b/src/tests/fakes.rs
@@ -219,6 +219,9 @@ impl ClientOsApi for FakeInputOutput {
         }
     }
     fn connect_to_server(&self, _path: &std::path::Path) {}
+    fn load_palette(&self) -> Palette {
+        default_palette()
+    }
 }
 
 impl ServerOsApi for FakeInputOutput {

diff --git a/src/tests/utils.rs b/src/tests/utils.rs
@@ -1,4 +1,5 @@
 use zellij_server::{panes::TerminalPane, tab::Pane};
+use zellij_tile::data::Palette;
 use zellij_utils::pane_size::PositionAndSize;
 
 pub fn get_output_frame_snapshots(
@@ -7,7 +8,7 @@ pub fn get_output_frame_snapshots(
 ) -> Vec<String> {
     let mut vte_parser = vte::Parser::new();
     let main_pid = 0;
-    let mut terminal_output = TerminalPane::new(main_pid, *win_size);
+    let mut terminal_output = TerminalPane::new(main_pid, *win_size, Palette::default());
 
     let mut snapshots = vec![];
     for frame in output_frames.iter() {

diff --git a/zellij-client/Cargo.toml b/zellij-client/Cargo.toml
@@ -16,6 +16,7 @@ signal-hook = "0.3"
 nix = "0.19.1"
 interprocess = "1.1.1"
 libc = "0.2"
+termbg = "0.2.0"
 
 [features]
 test = ["zellij-utils/test"]