Add border select for popup, bump version to 0.1.4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tmux-menu"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 author = ["Ja-sonYun <[email protected]>"]
 

README.md

@@ -1,4 +1,4 @@
-# tmux-easy-menu v0.1.3
+# tmux-easy-menu v0.1.4
 
 ### Easy configurable tmux display-menu
 
@@ -43,6 +43,7 @@ To see more actual config files, checkout `./examples` folder.
 #       command: "command %%KEY%% --cwd %%PWD"    # Or run command, %%PWD will replaced with cwd
 #       background: false
 #       close_after_command: true
+#       border: none                  # Select popup border type, optional
 #       inputs:
 #         - KEY                       # This input will be replaced with '%%KEY%%' on command
 #       position:

examples/menu.yaml

@@ -28,6 +28,7 @@
 #       command: "command %%KEY%%"    # Or run command
 #       background: false
 #       close_after_command: true
+#       border: none                  # Select popup border type, optional
 #       inputs:
 #         - KEY                       # This input will be replaced with '%%KEY%%' on command
 #       position:

src/main.rs

@@ -44,6 +44,7 @@ fn cli() -> Command {
                 .arg(arg!(--y <Y> "Y position"))
                 .arg(arg!(--w <W> "Width"))
                 .arg(arg!(--h <H> "Height"))
+                .arg(arg!(--border <BORDER> "Border"))
                 .arg(arg!(--key <KEY> "Key to show").num_args(..))
                 .arg(arg!(-E --exit ... "Exit after command"))
                 .arg(
@@ -105,7 +106,9 @@ fn main() -> Result<()> {
             let (tx, rx) = channel::<()>();
             let reader = thread::spawn(move || pipe::read(rx).expect("Failed to read pipe"));
 
-            tmux.display_popup(cmd_to_run_input_of_this, &Position::wh(50, 3), true)
+            let border = sub_matches.get_one::<String>("border").unwrap().clone();
+
+            tmux.display_popup(cmd_to_run_input_of_this, &Position::wh(50, 3), &border, true)
                 .expect("Failed to run command");
 
             // Send the signal to stop reading
@@ -140,7 +143,7 @@ fn main() -> Result<()> {
 
             pipe::remove()?;
 
-            tmux.display_popup(cmd, &Position { x, y, w, h }, e)
+            tmux.display_popup(cmd, &Position { x, y, w, h }, &border, e)
                 .expect("Failed to display popup");
         }
         Some(("input", sub_matches)) => {

src/show/construct_menu.rs

@@ -47,6 +47,9 @@ pub enum MenuType {
 
         #[serde(default = "Position::new_xywh")]
         position: Position,
+
+        #[serde(default = "default_none")]
+        border: Option<String>,
     },
     NoDim {
         name: String,
@@ -96,6 +99,7 @@ impl MenuType {
                 close_after_command,
                 background,
                 position,
+                border,
                 inputs,
                 ..
             } => {
@@ -133,6 +137,13 @@ impl MenuType {
 
                     wrapped_command.extend(position.as_this_arguments());
 
+                    wrapped_command.push("--border".to_string());
+                    if let Some(border) = border {
+                        wrapped_command.push(border.to_string());
+                    } else {
+                        wrapped_command.push("simple".to_string());
+                    }
+
                     if *close_after_command {
                         wrapped_command.push("-E".to_string());
                     }

src/tmux/subcommand/display_popup.rs

@@ -11,10 +11,10 @@ impl Tmux {
         vec!["-b".to_string(), border.to_string()]
     }
 
-    pub fn display_popup(&self, command: String, position: &Position, exit: bool) -> Result<Child> {
+    pub fn display_popup(&self, command: String, position: &Position, border: &String, exit: bool) -> Result<Child> {
         let mut arguments = vec![DISPLAY_POPUP.to_string()];
 
-        arguments.append(&mut Self::construct_border_arguments("double"));
+        arguments.append(&mut Self::construct_border_arguments(border));
         arguments.append(&mut Self::construct_position_arguments(position));
         if exit {
             arguments.push("-E".to_string());