Add tabs to layouts

CHANGELOG.md

@@ -16,6 +16,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
   * Bound by default to `^c` in `scroll` mode, scrolls to bottom and exists the scroll mode
 * Simplify deserialization slightly (https://github.com/zellij-org/zellij/pull/633)
 * Fix update plugin attributes on inactive tab (https://github.com/zellij-org/zellij/pull/634)
+* New pane UI: draw pane frames - can be disabled with ctrl-p + z, or through configuration (https://github.com/zellij-org/zellij/pull/643)
+* Terminal compatibility: support changing index colors through OSC 4 and similar (https://github.com/zellij-org/zellij/pull/646)
+* Fix various shells (eg. nushell) unexpectedly exiting when the user presses ctrl-c (https://github.com/zellij-org/zellij/pull/648)
+* Fix line wrapping while scrolling (https://github.com/zellij-org/zellij/pull/650)
+* Indicate to the user when text is copied to the clipboard with the mouse (https://github.com/zellij-org/zellij/pull/642)
+* Terminal compatibility: fix progress bar line overflow (http://github.com/zellij-org/zellij/pull/656)
+* Add action to toggle between tabs `ToggleTab`, bound by default to [TAB] in tab mode (https://github.com/zellij-org/zellij/pull/622)
 
 ## [0.15.0] - 2021-07-19
 * Kill children properly (https://github.com/zellij-org/zellij/pull/601)

GOVERNANCE.md

@@ -12,12 +12,24 @@ In case of ties, one member designated as Arbiter can break the tie. For reasons
 
 Some decisions that should always be brought to the quorum of members:
 * Adding new members to the organization
+* Removing existing members from the organization
 * Any decision involving money or finances
 * Collaborations with outside organizations
 
 ## Role of the Arbiter
 The Arbiter is a member of the quorum who serves as a tie breaker in votes and also has veto privileges for the votes themselves. Both of these should be used as seldom as possible and preferably not at all.
-Once the organization reaches 10 members, a reasonable and achievable process must be established in order to replace the Arbiter if the need arises (for example: a majority vote of members can replace the Arbiter with another candidate). In any case, the Arbiter has to be an organization member.
+
+### Arbiter no-confidence vote
+It is preferable that any conflict with the Arbiter, no matter how severe, be resolved amicably. However, it is acknowledged that this is not always possible. For those cases, and for the health of Zellij and its community, this is the process in order to remove a sitting Arbiter against their will:
+
+1. Find another willing candidate from the existing organization members
+2. Email all the organization members to the addresses specified in this document, letting them know about the vote and the replacement candidate
+3. All the maintainers have 2 weeks to reply (privately) with a yes (remove the Arbiter) or no (do not remove the Arbiter) vote - the sitting Arbiter does not get a vote
+4. The votes should be tallied and verified by the vote initiator as well as another organization member who is not the sitting Arbiter
+5. If at least two thirds (rounded up) of the respondents vote to remove - the vote succeeds and the new Arbiter is instated in place of the sitting one
+6. The sitting Arbiter remains an organization member unless explicitly removed by a normal majority vote
+
+For the removal of doubt: changing this rule itself requires a two thirds majority of maintainers as well.
 
 ## Current Organization Members
 * Aram Drevekenin <aram@poor.dev> (Arbiter)
@@ -29,4 +41,4 @@ Once the organization reaches 10 members, a reasonable and achievable process mu
 * Roee Shapira <ro33.sha@gmail.com>
 * Alex Kenji Berthold <aks.kenji@protonmail.com>
 * Kyle Sutherland-Cash <kyle.sutherlandcash@gmail.com>
-* Dante Pippi <dante.dpf@gmail.com>
+* Dante Pippi <dante.dpf@gmail.com>

default-plugins/status-bar/src/main.rs

@@ -8,7 +8,7 @@ use zellij_tile::prelude::*;
 use zellij_tile_utils::style;
 
 use first_line::{ctrl_keys, superkey};
-use second_line::keybinds;
+use second_line::{keybinds, text_copied_hint};
 
 // for more of these, copy paste from: https://en.wikipedia.org/wiki/Box-drawing_character
 static ARROW_SEPARATOR: &str = "";
@@ -17,6 +17,7 @@ static MORE_MSG: &str = " ... ";
 #[derive(Default)]
 struct State {
     mode_info: ModeInfo,
+    diplay_text_copied_hint: bool,
 }
 
 register_plugin!(State);
@@ -136,12 +137,25 @@ impl ZellijPlugin for State {
         set_selectable(false);
         set_invisible_borders(true);
         set_fixed_height(2);
-        subscribe(&[EventType::ModeUpdate]);
+        subscribe(&[
+            EventType::ModeUpdate,
+            EventType::CopyToClipboard,
+            EventType::InputReceived,
+        ]);
     }
 
     fn update(&mut self, event: Event) {
-        if let Event::ModeUpdate(mode_info) = event {
-            self.mode_info = mode_info;
+        match event {
+            Event::ModeUpdate(mode_info) => {
+                self.mode_info = mode_info;
+            }
+            Event::CopyToClipboard => {
+                self.diplay_text_copied_hint = true;
+            }
+            Event::InputReceived => {
+                self.diplay_text_copied_hint = false;
+            }
+            _ => {}
         }
     }
 
@@ -154,10 +168,18 @@ impl ZellijPlugin for State {
 
         let colored_elements = color_elements(self.mode_info.palette);
         let superkey = superkey(colored_elements, separator);
-        let ctrl_keys = ctrl_keys(&self.mode_info, cols - superkey.len, separator);
+        let ctrl_keys = ctrl_keys(
+            &self.mode_info,
+            cols.saturating_sub(superkey.len),
+            separator,
+        );
 
         let first_line = format!("{}{}", superkey, ctrl_keys);
-        let second_line = keybinds(&self.mode_info, cols);
+        let second_line = if self.diplay_text_copied_hint {
+            text_copied_hint(&self.mode_info.palette)
+        } else {
+            keybinds(&self.mode_info, cols)
+        };
 
         // [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

default-plugins/status-bar/src/second_line.rs

@@ -375,3 +375,15 @@ pub fn keybinds(help: &ModeInfo, max_width: usize) -> LinePart {
     }
     best_effort_shortcut_list(help, max_width)
 }
+
+pub fn text_copied_hint(palette: &Palette) -> LinePart {
+    let hint = " Text copied to clipboard";
+    let green_color = match palette.green {
+        PaletteColor::Rgb((r, g, b)) => RGB(r, g, b),
+        PaletteColor::EightBit(color) => Fixed(color),
+    };
+    LinePart {
+        part: format!("{}", Style::new().fg(green_color).bold().paint(hint)),
+        len: hint.len(),
+    }
+}

default-plugins/strider/src/state.rs

@@ -47,10 +47,10 @@ impl FsEntry {
             FsEntry::Dir(_, s) => s.to_string(),
             FsEntry::File(_, s) => pb::convert(*s as f64),
         };
-        let space = width - info.len();
+        let space = width.saturating_sub(info.len());
         let name = self.name();
-        if space - 1 < name.len() {
-            [&name[..space - 2], &info].join("~ ")
+        if space.saturating_sub(1) < name.len() {
+            [&name[..space.saturating_sub(2)], &info].join("~ ")
         } else {
             let padding = " ".repeat(space - name.len());
             [name, padding, info].concat()

default-plugins/tab-bar/src/line.rs

@@ -191,7 +191,7 @@ pub fn tab_line(
         &mut tabs_before_active,
         &mut tabs_after_active,
         &mut tabs_to_render,
-        cols - prefix.len,
+        cols.saturating_sub(prefix.len),
     );
 
     let mut tab_line: Vec<LinePart> = vec![];
@@ -200,7 +200,7 @@ pub fn tab_line(
             &mut tabs_before_active,
             &mut tabs_to_render,
             &mut tab_line,
-            cols - prefix.len,
+            cols.saturating_sub(prefix.len),
             palette,
             tab_separator(capabilities),
         );
@@ -210,7 +210,7 @@ pub fn tab_line(
         add_next_tabs_msg(
             &mut tabs_after_active,
             &mut tab_line,
-            cols - prefix.len,
+            cols.saturating_sub(prefix.len),
             palette,
             tab_separator(capabilities),
         );

example/layouts/multiple_tabs_layout.yaml

@@ -0,0 +1,87 @@
+---
+template:
+  direction: Horizontal
+  parts:
+    - direction: Vertical
+      split_size:
+        Fixed: 1
+      run:
+        plugin: tab-bar
+      borderless: true
+    - direction: Vertical
+      body: true
+    - direction: Vertical
+      split_size:
+        Fixed: 2
+      run:
+        plugin: status-bar
+      borderless: true
+
+tabs:
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 50
+  - direction: Vertical
+    split_size:
+      Percent: 50
+- direction: Vertical
+- direction: Vertical
+  parts:
+    - direction: Vertical
+      split_size:
+        Percent: 50
+    - direction: Vertical
+      split_size:
+        Percent: 50
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 50
+  - direction: Horizontal
+    split_size:
+      Percent: 50
+    parts:
+      - direction: Vertical
+        split_size:
+          Percent: 50
+      - direction: Vertical
+        split_size:
+          Percent: 50
+- direction: Vertical
+- direction: Vertical
+- direction: Vertical
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 20
+    run:
+      plugin: strider
+  - direction: Horizontal
+    split_size:
+      Percent: 80
+    parts:
+      - direction: Vertical
+        split_size:
+          Percent: 50
+      - direction: Vertical
+        split_size:
+          Percent: 50
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 40
+  - direction: Horizontal
+    split_size:
+      Percent: 60
+    parts:
+      - direction: Vertical
+        split_size:
+          Percent: 50
+      - direction: Vertical
+        split_size:
+          Percent: 50

example/layouts/multiple_tabs_layout_htop_command.yaml

@@ -0,0 +1,90 @@
+---
+template:
+  direction: Horizontal
+  parts:
+    - direction: Vertical
+      split_size:
+        Fixed: 1
+      run:
+        plugin: tab-bar
+      borderless: true
+    - direction: Vertical
+      body: true
+    - direction: Vertical
+      split_size:
+        Fixed: 2
+      run:
+        plugin: status-bar
+      borderless: true
+
+tabs:
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 50
+    run:
+      command: {cmd: htop}
+  - direction: Vertical
+    split_size:
+      Percent: 50
+- direction: Vertical
+  parts:
+    - direction: Vertical
+      split_size:
+        Percent: 50
+    - direction: Vertical
+      split_size:
+        Percent: 50
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 50
+  - direction: Horizontal
+    split_size:
+      Percent: 50
+    parts:
+      - direction: Vertical
+        split_size:
+          Percent: 50
+      - direction: Vertical
+        split_size:
+          Percent: 50
+- direction: Vertical
+- direction: Vertical
+  run:
+    command: {cmd: htop, args: ["-C"]}
+- direction: Vertical
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 20
+    run:
+      plugin: strider
+  - direction: Horizontal
+    split_size:
+      Percent: 80
+    parts:
+      - direction: Vertical
+        split_size:
+          Percent: 50
+      - direction: Vertical
+        split_size:
+          Percent: 50
+- direction: Vertical
+  parts:
+  - direction: Vertical
+    split_size:
+      Percent: 40
+  - direction: Horizontal
+    split_size:
+      Percent: 60
+    parts:
+      - direction: Vertical
+        split_size:
+          Percent: 50
+      - direction: Vertical
+        split_size:
+          Percent: 50

example/layouts/run_htop_layout.yaml

@@ -0,0 +1,21 @@
+---
+tabs:
+  - direction: Vertical
+    parts:
+      - direction: Horizontal
+        split_size:
+          Percent: 50
+        parts:
+          - direction: Vertical
+            split_size:
+              Percent: 50
+          - direction: Vertical
+            split_size:
+              Percent: 50
+            run:
+              command: {cmd: htop}
+      - direction: Horizontal
+        split_size:
+          Percent: 50
+        run:
+          command: {cmd: htop}