Skip to content

Commit

Permalink
chore(release): v0.38.0
Browse files Browse the repository at this point in the history
  • Loading branch information
har7an committed Aug 27, 2023
1 parent 462f36f commit ba3d0d3
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 36 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ rust-version = "1.60"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
zellij-client = { path = "zellij-client/", version = "0.38.0" }
zellij-server = { path = "zellij-server/", version = "0.38.0" }
zellij-utils = { path = "zellij-utils/", version = "0.38.0" }
zellij-client = { path = "zellij-client/", version = "0.38.0", registry = "alexandrie" }
zellij-server = { path = "zellij-server/", version = "0.38.0", registry = "alexandrie" }
zellij-utils = { path = "zellij-utils/", version = "0.38.0", registry = "alexandrie" }
thiserror = "1.0.40"
names = { version = "0.14.0", default-features = false }
log = "0.4.17"
Expand Down
11 changes: 11 additions & 0 deletions example/default.kdl
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ keybinds {
bind "n" { NewTab; SwitchToMode "Normal"; }
bind "x" { CloseTab; SwitchToMode "Normal"; }
bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
bind "b" { BreakPane; SwitchToMode "Normal"; }
bind "]" { BreakPaneRight; SwitchToMode "Normal"; }
bind "[" { BreakPaneLeft; SwitchToMode "Normal"; }
bind "1" { GoToTab 1; SwitchToMode "Normal"; }
bind "2" { GoToTab 2; SwitchToMode "Normal"; }
bind "3" { GoToTab 3; SwitchToMode "Normal"; }
Expand Down Expand Up @@ -110,6 +113,13 @@ keybinds {
bind "Ctrl o" { SwitchToMode "Normal"; }
bind "Ctrl s" { SwitchToMode "Scroll"; }
bind "d" { Detach; }
bind "w" {
LaunchOrFocusPlugin "zellij:session-manager" {
floating true
move_to_focused_tab true
};
SwitchToMode "Normal"
}
}
tmux {
bind "[" { SwitchToMode "Scroll"; }
Expand Down Expand Up @@ -178,6 +188,7 @@ plugins {
status-bar { path "status-bar"; }
strider { path "strider"; }
compact-bar { path "compact-bar"; }
session-manager { path "session-manager"; }
}

// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
Expand Down
2 changes: 1 addition & 1 deletion zellij-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ serde = { version = "1.0", features = ["derive"] }
url = { version = "2.2.2", features = ["serde"] }
serde_yaml = "0.8"
serde_json = "1.0"
zellij-utils = { path = "../zellij-utils/", version = "0.38.0" }
zellij-utils = { path = "../zellij-utils/", version = "0.38.0", registry = "alexandrie" }
log = "0.4.17"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion zellij-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ url = "2.2.2"
wasmer = "2.3.0"
wasmer-wasi = "2.3.0"
cassowary = "0.3.0"
zellij-utils = { path = "../zellij-utils/", version = "0.38.0" }
zellij-utils = { path = "../zellij-utils/", version = "0.38.0", registry = "alexandrie" }
log = "0.4.17"
typetag = "0.1.7"
chrono = "0.4.19"
Expand Down
2 changes: 1 addition & 1 deletion zellij-tile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
strum = "0.20.0"
strum_macros = "0.20.0"
zellij-utils = { path = "../zellij-utils/", version = "0.38.0" }
zellij-utils = { path = "../zellij-utils/", version = "0.38.0", registry = "alexandrie" }
Binary file modified zellij-utils/assets/plugins/compact-bar.wasm
Binary file not shown.
Binary file modified zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm
Binary file not shown.
Binary file modified zellij-utils/assets/plugins/session-manager.wasm
Binary file not shown.
Binary file modified zellij-utils/assets/plugins/status-bar.wasm
Binary file not shown.
Binary file modified zellij-utils/assets/plugins/strider.wasm
Binary file not shown.
Binary file modified zellij-utils/assets/plugins/tab-bar.wasm
Binary file not shown.
4 changes: 3 additions & 1 deletion zellij-utils/assets/prost/api.action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ pub struct PaneIdAndShouldFloat {
#[prost(uint32, tag = "1")]
pub pane_id: u32,
#[prost(bool, tag = "2")]
pub should_float_if_hidden: bool,
pub should_float: bool,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand All @@ -135,6 +135,8 @@ pub struct LaunchOrFocusPluginPayload {
pub should_float: bool,
#[prost(message, optional, tag = "3")]
pub plugin_configuration: ::core::option::Option<PluginConfiguration>,
#[prost(bool, tag = "4")]
pub move_to_focused_tab: bool,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand Down
44 changes: 15 additions & 29 deletions zellij-utils/assets/prost/api.plugin_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub mod plugin_command {
#[prost(bool, tag = "16")]
ShowSelfPayload(bool),
#[prost(message, tag = "17")]
SwitchToModePayload(super::SwitchToModePayload),
SwitchToModePayload(super::super::action::SwitchToModePayload),
#[prost(string, tag = "18")]
NewTabsWithLayoutPayload(::prost::alloc::string::String),
#[prost(message, tag = "19")]
Expand All @@ -66,18 +66,18 @@ pub mod plugin_command {
GoToTabNamePayload(::prost::alloc::string::String),
#[prost(string, tag = "27")]
FocusOrCreateTabPayload(::prost::alloc::string::String),
#[prost(int32, tag = "28")]
GoToTabPayload(i32),
#[prost(uint32, tag = "28")]
GoToTabPayload(u32),
#[prost(string, tag = "29")]
StartOrReloadPluginPayload(::prost::alloc::string::String),
#[prost(int32, tag = "30")]
CloseTerminalPanePayload(i32),
#[prost(int32, tag = "31")]
ClosePluginPanePayload(i32),
#[prost(uint32, tag = "30")]
CloseTerminalPanePayload(u32),
#[prost(uint32, tag = "31")]
ClosePluginPanePayload(u32),
#[prost(message, tag = "32")]
FocusTerminalPanePayload(super::PaneIdAndShouldFloat),
FocusTerminalPanePayload(super::super::action::PaneIdAndShouldFloat),
#[prost(message, tag = "33")]
FocusPluginPanePayload(super::PaneIdAndShouldFloat),
FocusPluginPanePayload(super::super::action::PaneIdAndShouldFloat),
#[prost(message, tag = "34")]
RenameTerminalPanePayload(super::IdAndNewName),
#[prost(message, tag = "35")]
Expand Down Expand Up @@ -141,14 +141,14 @@ pub struct OpenCommandPanePayload {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct SwitchTabToPayload {
#[prost(int32, tag = "1")]
pub tab_index: i32,
#[prost(uint32, tag = "1")]
pub tab_index: u32,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct SetTimeoutPayload {
#[prost(float, tag = "1")]
pub seconds: f32,
#[prost(double, tag = "1")]
pub seconds: f64,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand All @@ -164,12 +164,6 @@ pub struct PluginMessagePayload {
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct SwitchToModePayload {
#[prost(message, optional, tag = "1")]
pub input_mode: ::core::option::Option<super::input_mode::InputModeMessage>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ResizePayload {
#[prost(message, optional, tag = "1")]
pub resize: ::core::option::Option<super::resize::Resize>,
Expand All @@ -182,18 +176,10 @@ pub struct MovePayload {
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct PaneIdAndShouldFloat {
#[prost(int32, tag = "1")]
pub pane_id: i32,
#[prost(bool, tag = "2")]
pub should_float: bool,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct IdAndNewName {
/// pane id or tab index
#[prost(int32, tag = "1")]
pub id: i32,
#[prost(uint32, tag = "1")]
pub id: u32,
#[prost(string, tag = "2")]
pub new_name: ::prost::alloc::string::String,
}
Expand Down

0 comments on commit ba3d0d3

Please sign in to comment.