pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip: the only way to make the default look like on main is to make more customizable colored elements

Browse source
This commit is contained in:
denis 2021-04-24 10:21:25 +03:00
parent 47a918a53c
commit fef466c74b
4 changed files with 345 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

174
default-plugins/status-bar/src/first_line.rs
View file

@ -1,8 +1,11 @@
use ansi_term::{ANSIStrings, Color::RGB, Style};
use zellij_tile::prelude::*;
use crate::colors::{BLACK, BRIGHT_GRAY, GRAY, GREEN, RED, WHITE};
use crate::{LinePart, ARROW_SEPARATOR};
use crate::{
color_elements,
colors::{BLACK, BRIGHT_GRAY, GRAY, GREEN, RED, WHITE},
};
use crate::{ColoredElements, LinePart, ARROW_SEPARATOR};
struct CtrlKeyShortcut {
mode: CtrlKeyMode,
@ -63,38 +66,13 @@ impl CtrlKeyShortcut {
}
}
fn unselected_mode_shortcut(letter: char, text: &str, palette: Palette) -> LinePart {
let prefix_separator = Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.paint(ARROW_SEPARATOR);
let char_left_separator = Style::new()
.bold()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold()
.paint(" <");
let char_shortcut = Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold()
.paint(letter.to_string());
let char_right_separator = Style::new()
.bold()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold()
.paint(">");
let styled_text = Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold()
.paint(format!("{} ", text));
let suffix_separator = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.paint(ARROW_SEPARATOR);
fn unselected_mode_shortcut(letter: char, text: &str, palette: ColoredElements) -> LinePart {
let prefix_separator = palette.unselected_prefix_separator.paint(ARROW_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);
LinePart {
part: ANSIStrings(&[
prefix_separator,
@ -109,36 +87,13 @@ fn unselected_mode_shortcut(letter: char, text: &str, palette: Palette) -> LineP
}
}
fn selected_mode_shortcut(letter: char, text: &str, palette: Palette) -> LinePart {
let prefix_separator = Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.paint(ARROW_SEPARATOR);
let char_left_separator = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold()
.paint(format!(" <"));
let char_shortcut = Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold()
.paint(format!("{}", letter));
let char_right_separator = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold()
.paint(format!(">"));
let styled_text = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold()
.paint(format!("{} ", text));
let suffix_separator = Style::new()
.fg(RGB(palette.green.0, palette.green.1, palette.green.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.paint(ARROW_SEPARATOR);
fn selected_mode_shortcut(letter: char, text: &str, palette: ColoredElements) -> LinePart {
let prefix_separator = palette.selected_prefix_separator.paint(ARROW_SEPARATOR);
let char_left_separator = palette.selected_char_left_separator.paint(format!(" <"));
let char_shortcut = palette.selected_char_shortcut.paint(format!("{}", letter));
let char_right_separator = palette.selected_char_right_separator.paint(format!(">"));
let styled_text = palette.selected_styled_text.paint(format!("{} ", text));
let suffix_separator = palette.selected_suffix_separator.paint(ARROW_SEPARATOR);
LinePart {
part: ANSIStrings(&[
prefix_separator,
@ -153,42 +108,27 @@ fn selected_mode_shortcut(letter: char, text: &str, palette: Palette) -> LinePar
}
}
fn disabled_mode_shortcut(text: &str, palette: Palette) -> LinePart {
let prefix_separator = Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.paint(ARROW_SEPARATOR);
let styled_text = Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.dimmed()
.paint(format!("{} ", text));
let suffix_separator = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.paint(ARROW_SEPARATOR);
fn disabled_mode_shortcut(text: &str, palette: ColoredElements) -> LinePart {
let prefix_separator = palette.disabled_prefix_separator.paint(ARROW_SEPARATOR);
let styled_text = palette.disabled_styled_text.paint(format!("{} ", text));
let suffix_separator = palette.disabled_suffix_separator.paint(ARROW_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: Palette) -> LinePart {
fn selected_mode_shortcut_single_letter(letter: char, palette: ColoredElements) -> 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 = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
let prefix_separator = palette
.selected_single_letter_prefix_separator
.paint(ARROW_SEPARATOR);
let char_shortcut = Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold()
let char_shortcut = palette
.selected_single_letter_char_shortcut
.paint(char_shortcut_text);
let suffix_separator = Style::new()
.fg(RGB(palette.green.0, palette.green.1, palette.green.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
let suffix_separator = palette
.selected_single_letter_suffix_separator
.paint(ARROW_SEPARATOR);
LinePart {
part: ANSIStrings(&[prefix_separator, char_shortcut, suffix_separator]).to_string(),
@ -196,22 +136,17 @@ fn selected_mode_shortcut_single_letter(letter: char, palette: Palette) -> LineP
}
}
fn unselected_mode_shortcut_single_letter(letter: char, palette: Palette) -> LinePart {
fn unselected_mode_shortcut_single_letter(letter: char, palette: ColoredElements) -> 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 = Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
let prefix_separator = palette
.unselected_single_letter_prefix_separator
.paint(ARROW_SEPARATOR);
let char_shortcut = Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold()
let char_shortcut = palette
.unselected_single_letter_char_shortcut
.paint(char_shortcut_text);
let suffix_separator = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
let suffix_separator = palette
.unselected_single_letter_suffix_separator
.paint(ARROW_SEPARATOR);
LinePart {
part: ANSIStrings(&[prefix_separator, char_shortcut, suffix_separator]).to_string(),
@ -219,7 +154,7 @@ fn unselected_mode_shortcut_single_letter(letter: char, palette: Palette) -> Lin
}
}
fn full_ctrl_key(key: &CtrlKeyShortcut, palette: Palette) -> LinePart {
fn full_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements) -> LinePart {
let full_text = key.full_text();
let letter_shortcut = key.letter_shortcut();
match key.mode {
@ -235,7 +170,7 @@ fn full_ctrl_key(key: &CtrlKeyShortcut, palette: Palette) -> LinePart {
}
}
fn shortened_ctrl_key(key: &CtrlKeyShortcut, palette: Palette) -> LinePart {
fn shortened_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements) -> LinePart {
let shortened_text = key.shortened_text();
let letter_shortcut = key.letter_shortcut();
let shortened_text = match key.action {
@ -258,7 +193,7 @@ fn shortened_ctrl_key(key: &CtrlKeyShortcut, palette: Palette) -> LinePart {
}
}
fn single_letter_ctrl_key(key: &CtrlKeyShortcut, palette: Palette) -> LinePart {
fn single_letter_ctrl_key(key: &CtrlKeyShortcut, palette: ColoredElements) -> LinePart {
let letter_shortcut = key.letter_shortcut();
match key.mode {
CtrlKeyMode::Unselected => unselected_mode_shortcut_single_letter(letter_shortcut, palette),
@ -267,7 +202,7 @@ fn single_letter_ctrl_key(key: &CtrlKeyShortcut, palette: Palette) -> LinePart {
}
}
fn key_indicators(max_len: usize, keys: &[CtrlKeyShortcut], palette: Palette) -> LinePart {
fn key_indicators(max_len: usize, keys: &[CtrlKeyShortcut], palette: ColoredElements) -> LinePart {
let mut line_part = LinePart::default();
for ctrl_key in keys {
let key = full_ctrl_key(ctrl_key, palette);
@ -299,18 +234,10 @@ fn key_indicators(max_len: usize, keys: &[CtrlKeyShortcut], palette: Palette) ->
line_part
}
pub fn superkey(palette: Palette) -> LinePart {
pub fn superkey(palette: ColoredElements) -> LinePart {
let prefix_text = " Ctrl + ";
let prefix = Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold()
.paint(prefix_text);
let suffix_separator = Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.paint(ARROW_SEPARATOR);
let prefix = palette.superkey_prefix.paint(prefix_text);
let suffix_separator = palette.superkey_suffix_separator.paint(ARROW_SEPARATOR);
LinePart {
part: ANSIStrings(&[prefix, suffix_separator]).to_string(),
len: prefix_text.chars().count(),
@ -318,6 +245,7 @@ pub fn superkey(palette: Palette) -> LinePart {
}
pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
let colored_elements = color_elements(help.palette);
match &help.mode {
InputMode::Locked => key_indicators(
max_len,
@ -329,7 +257,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Disabled, CtrlKeyAction::Scroll),
CtrlKeyShortcut::new(CtrlKeyMode::Disabled, CtrlKeyAction::Quit),
],
help.palette,
colored_elements,
),
InputMode::Resize => key_indicators(
max_len,
@ -341,7 +269,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Scroll),
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
help.palette,
colored_elements,
),
InputMode::Pane => key_indicators(
max_len,
@ -353,7 +281,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Scroll),
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
help.palette,
colored_elements,
),
InputMode::Tab | InputMode::RenameTab => key_indicators(
max_len,
@ -365,7 +293,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Scroll),
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
help.palette,
colored_elements,
),
InputMode::Scroll => key_indicators(
max_len,
@ -377,7 +305,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Selected, CtrlKeyAction::Scroll),
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
help.palette,
colored_elements,
),
InputMode::Normal => key_indicators(
max_len,
@ -389,7 +317,7 @@ pub fn ctrl_keys(help: &ModeInfo, max_len: usize) -> LinePart {
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Scroll),
CtrlKeyShortcut::new(CtrlKeyMode::Unselected, CtrlKeyAction::Quit),
],
help.palette,
colored_elements,
),
}
}

284
default-plugins/status-bar/src/main.rs
View file

@ -1,12 +1,17 @@
mod first_line;
mod second_line;
use std::fmt::{Display, Error, Formatter};
use zellij_tile::{data::Theme, prelude::*};
use ansi_term::{Color::RGB, Style};
use std::{
fmt::{Display, Error, Formatter},
};
use zellij_tile::{prelude::*};
use first_line::{ctrl_keys, superkey};
use second_line::keybinds;
pub mod colors {
use ansi_term::Colour::{self, Fixed};
pub const WHITE: Colour = Fixed(255);
@ -41,6 +46,278 @@ impl Display for LinePart {
}
}
#[derive(Clone, Copy)]
pub struct ColoredElements {
// slected mode
pub selected_prefix_separator: Style,
pub selected_char_left_separator: Style,
pub selected_char_shortcut: Style,
pub selected_char_right_separator: Style,
pub selected_styled_text: Style,
pub selected_suffix_separator: Style,
// unselected mode
pub unselected_prefix_separator: Style,
pub unselected_char_left_separator: Style,
pub unselected_char_shortcut: Style,
pub unselected_char_right_separator: Style,
pub unselected_styled_text: Style,
pub unselected_suffix_separator: Style,
// disabled mode
pub disabled_prefix_separator: Style,
pub disabled_styled_text: Style,
pub disabled_suffix_separator: Style,
// selected single letter
pub selected_single_letter_prefix_separator: Style,
pub selected_single_letter_char_shortcut: Style,
pub selected_single_letter_suffix_separator: Style,
// unselected single letter
pub unselected_single_letter_prefix_separator: Style,
pub unselected_single_letter_char_shortcut: Style,
pub unselected_single_letter_suffix_separator: Style,
// superkey
pub superkey_prefix: Style,
pub superkey_suffix_separator: Style,
}
impl ColoredElements {
pub fn new(
selected_prefix_separator: Style,
selected_char_left_separator: Style,
selected_char_shortcut: Style,
selected_char_right_separator: Style,
selected_styled_text: Style,
selected_suffix_separator: Style,
unselected_prefix_separator: Style,
unselected_char_left_separator: Style,
unselected_char_shortcut: Style,
unselected_char_right_separator: Style,
unselected_styled_text: Style,
unselected_suffix_separator: Style,
disabled_prefix_separator: Style,
disabled_styled_text: Style,
disabled_suffix_separator: Style,
selected_single_letter_prefix_separator: Style,
selected_single_letter_char_shortcut: Style,
selected_single_letter_suffix_separator: Style,
unselected_single_letter_prefix_separator: Style,
unselected_single_letter_char_shortcut: Style,
unselected_single_letter_suffix_separator: Style,
superkey_prefix: Style,
superkey_suffix_separator: Style,
) -> Self {
Self {
selected_prefix_separator,
selected_char_left_separator,
selected_char_shortcut,
selected_char_right_separator,
selected_styled_text,
selected_suffix_separator,
unselected_prefix_separator,
unselected_char_left_separator,
unselected_char_shortcut,
unselected_char_right_separator,
unselected_styled_text,
unselected_suffix_separator,
disabled_prefix_separator,
disabled_styled_text,
disabled_suffix_separator,
selected_single_letter_prefix_separator,
selected_single_letter_char_shortcut,
selected_single_letter_suffix_separator,
unselected_single_letter_prefix_separator,
unselected_single_letter_char_shortcut,
unselected_single_letter_suffix_separator,
superkey_prefix,
superkey_suffix_separator,
}
}
}
fn color_elements(palette: Palette) -> ColoredElements {
match palette.source {
PaletteSource::Default => ColoredElements::new(
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2)),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.bold()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.bold()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.dimmed(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2)),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.green.0, palette.green.1, palette.green.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
),
PaletteSource::Xresources => ColoredElements::new(
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2)),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.bold()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.bold()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.dimmed(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2)),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.green.0, palette.green.1, palette.green.2))
.bold(),
Style::new()
.fg(RGB(palette.green.0, palette.green.1, palette.green.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)),
Style::new()
.bold()
.fg(RGB(palette.red.0, palette.red.1, palette.red.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
Style::new()
.fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2))
.on(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.bold(),
Style::new()
.fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2))
.on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)),
),
}
}
impl ZellijPlugin for State {
fn load(&mut self) {
set_selectable(false);
@ -56,7 +333,8 @@ impl ZellijPlugin for State {
}
fn render(&mut self, _rows: usize, cols: usize) {
let superkey = superkey(self.mode_info.palette);
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 first_line = format!("{}{}", superkey, ctrl_keys);

7
src/common/utils/shared.rs
View file

@ -6,7 +6,7 @@ use strip_ansi_escapes::strip;
use colors_transform::{Color, Rgb};
use xrdb::Colors;
use zellij_tile::data::{Palette, Theme};
use zellij_tile::data::{Palette, Theme, PaletteSource};
fn ansi_len(s: &str) -> usize {
from_utf8(&strip(s.as_bytes()).unwrap())
@ -51,6 +51,7 @@ pub fn hex_to_rgb(hex: &Option<String>) -> (u8, u8, u8) {
(rgb.0 as u8, rgb.1 as u8, rgb.2 as u8)
}
// Dark magic
pub fn detect_theme(bg: (u8, u8, u8)) -> Theme {
let (r, g, b) = bg;
// HSP, P stands for perceived brightness
@ -72,6 +73,7 @@ pub fn load_palette() -> Palette {
let colors: Vec<(u8, u8, u8)> = palette.colors.iter().map(|c| hex_to_rgb(c)).collect();
let theme = detect_theme(bg);
Palette {
source: PaletteSource::Xresources,
theme,
fg,
bg,
@ -86,9 +88,10 @@ pub fn load_palette() -> Palette {
}
}
None => Palette {
source: PaletteSource::Default,
theme: Theme::Dark,
fg: colors::BRIGHT_GRAY,
bg: colors::BLACK,
bg: colors::GRAY,
black: colors::BLACK,
red: colors::RED,
green: colors::GREEN,

8
zellij-tile/src/data.rs
View file

@ -70,6 +70,12 @@ pub enum Theme {
Light,
Dark,
}
#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
pub enum PaletteSource {
Default,
Xresources
}
pub mod colors {
pub const WHITE: (u8, u8, u8) = (238, 238, 238);
pub const GREEN: (u8, u8, u8) = (175, 255, 0);
@ -81,6 +87,7 @@ pub mod colors {
#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
pub struct Palette {
pub source: PaletteSource,
pub theme: Theme,
pub fg: (u8, u8, u8),
pub bg: (u8, u8, u8),
@ -97,6 +104,7 @@ pub struct Palette {
impl Default for Palette {
fn default() -> Palette {
Palette {
source: PaletteSource::Default,
theme: Theme::Dark,
fg: colors::BRIGHT_GRAY,
bg: colors::BLACK,