diff options
| author | Aram Drevekenin <aram@poor.dev> | 2025-12-11 14:25:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-11 14:25:42 +0100 |
| commit | 693fa082def5ef0fe030cd7fdc3b1df051b35dc6 (patch) | |
| tree | b3f651462bbc1cd2fa5b2d79207343413ef6b83c /src/main.rs | |
| parent | fix(zellij-server): unblock building on 32bit targets (#4484) (diff) | |
| download | sl0ppij-693fa082def5ef0fe030cd7fdc3b1df051b35dc6.tar.gz sl0ppij-693fa082def5ef0fe030cd7fdc3b1df051b35dc6.tar.xz sl0ppij-693fa082def5ef0fe030cd7fdc3b1df051b35dc6.zip | |
Command Sequences, Blocking CLI Commands, New Plugin APIs (#4546)
* fix deadlocks
* initial logging to plugin implementation
* only log actions, include keys as Action::Write
* send actions to plugins as a new Event::UserAction
* add Action::Write metadata to plugin API
* run_action plugin command and permission
* block-until-exit/success/failure in the cli
* fix tests
* add NewBlockingPane to the plugin API
* run actions in a different thread so as not to block plugin execution
* add custom context to run_action flow
* fixes for floating pane z_index sorting and unknown protobuf events not crashing plugins
* always render the frame of pinned panes
* macros module
* add macros to config
* KDL macro parsing
* thread macros to the plugin thread
* get/update/delete macros from plugins
* add macros updated event
* add ability to rename macros
* fix deadlock
* fix z_indices with pinned unselectable panes bug
* allow plugins to opt-in to show_cursor
* change show_cursor(bool) to show_cursor(Option<coordinates>)
* test
* upgrade strum to allow proper enum iteration and case insensitive fromstr implementation for Actions
* better cwd tracking for exited command panes
* add initial panes to NewTab Action (no-op for now)
* add initial panes to cli newtab action
* make initial panes work
* add close_on_exit and start_suspended to the cli
* properly convert newtab action (potentially breaking for plugins)
* allow first pane in tab to block
* make distinction between opening panes with the last active client and the current pane in the cli
* improve some apis
* fix fixed size closing pane bug
* fix plugin cursor coordinates
* fix issues with launch-or-focus-plugin having to do with in-place and suppressed panes
* fix: set affected pane in replace pane
* allow setting a pane in place when it is suppressed and being focused (tests failing)
* fix tests
* some fixes for unsuppression of panes
* some fixes for completion_tx in new tab action
* allow replace/suppressed rather than replace/close only
* fixes for inserting suppressed panes without conflicts
* pane focus history and explicit unsuppress plugin api
* fix: prefer explicitly provided pane id in placement in actions that provide it
* fix floating pane coordinate change and z_index
* fix plugin cache dir to persist between sessions
* fix some stack focusing issues when adding panes without a client id
* make sure pinned panes are always above non-pinned floating panes
* allow plugins to copy to clipboard
* initial text styling additions implementations - buggy
* fix dimming issues
* remove extras, stay with just dim and unbold
* unbold and dim as indices
* allow ui components to render success/error colors
* allow plugins to send sigint/sigkill to processes, as well as receive their pid
* ui component fixes and send originating plugin context with run_action
* originating plugin for new tab too
* make plugn show pane command also expand stacked panes
* add sequence plugin
* remove macros
* remove snapshots
* add shortcut for sequence plugin
* fix plugin tests
* plugin tests for new apis
* update snapshots for sequence shortcut
* cleanups and formatting
* Event::CwdChanged
* moar cleanups
* remove some warnings
* remove mroe warnings
* remove dead code
* remove more dead code
* fix minor bugs in sequence plugin
* update sequence help and format codebase
* fix conditional blocking cli commands
* fix initial-command new-tab cli flag
* add client_ids to CwdChanged Event
* last fixes
* add pr
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/main.rs b/src/main.rs index f077c199..2a5db3c5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,6 +6,7 @@ use clap::Parser; use zellij_utils::{ cli::{CliAction, CliArgs, Command, Sessions}, consts::{create_config_and_cache_folders, VERSION}, + data::UnblockCondition, envs, input::config::Config, logging::*, @@ -40,10 +41,26 @@ fn main() { pinned, stacked, blocking, + block_until_exit_success, + block_until_exit_failure, + block_until_exit, + near_current_pane, })) = opts.command { let cwd = cwd.or_else(|| std::env::current_dir().ok()); let skip_plugin_cache = false; // N/A for this action + + // Compute the unblock condition + let unblock_condition = if block_until_exit_success { + Some(UnblockCondition::OnExitSuccess) + } else if block_until_exit_failure { + Some(UnblockCondition::OnExitFailure) + } else if block_until_exit { + Some(UnblockCondition::OnAnyExit) + } else { + None + }; + let command_cli_action = CliAction::NewPane { command, plugin: None, @@ -63,6 +80,8 @@ fn main() { pinned, stacked, blocking, + unblock_condition, + near_current_pane, }; commands::send_action_to_session(command_cli_action, opts.session, config); std::process::exit(0); @@ -83,6 +102,7 @@ fn main() { let cwd = None; let stacked = false; let blocking = false; + let unblock_condition = None; let command_cli_action = CliAction::NewPane { command: vec![], plugin: Some(url), @@ -102,6 +122,8 @@ fn main() { pinned, stacked, blocking, + unblock_condition, + near_current_pane: false, }; commands::send_action_to_session(command_cli_action, opts.session, config); std::process::exit(0); @@ -118,6 +140,7 @@ fn main() { width, height, pinned, + near_current_pane, })) = opts.command { let mut file = file; @@ -139,6 +162,7 @@ fn main() { width, height, pinned, + near_current_pane, }; commands::send_action_to_session(command_cli_action, opts.session, config); std::process::exit(0); @@ -224,6 +248,13 @@ fn main() { layout_dir: options.as_ref().and_then(|o| o.layout_dir.clone()), name: None, cwd: options.as_ref().and_then(|o| o.default_cwd.clone()), + initial_command: vec![], + initial_plugin: None, + close_on_exit: Default::default(), + start_suspended: Default::default(), + block_until_exit_success: false, + block_until_exit_failure: false, + block_until_exit: false, }; commands::send_action_to_session(new_layout_cli_action, Some(session_name), config); } else { |
