diff options
| author | Aram Drevekenin <aram@poor.dev> | 2024-07-17 16:08:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-17 16:08:31 +0200 |
| commit | 84ff29dd024c73e94f3e65d56d907ae903fe3752 (patch) | |
| tree | b3f01370b3b1af71f018eeb27a1437b75e959721 /zellij-utils/src/plugin_api | |
| parent | docs(changelog): scroll region fix (diff) | |
| download | sl0ppij-84ff29dd024c73e94f3e65d56d907ae903fe3752.tar.gz sl0ppij-84ff29dd024c73e94f3e65d56d907ae903fe3752.tar.xz sl0ppij-84ff29dd024c73e94f3e65d56d907ae903fe3752.zip | |
feat(ui): configuration screen + configure non-colliding keys at runtime (#3502)
* rebind => reconfigure
* persist keybinds and mode info to new tabs
* add configuration plugin
* make tests pass
* remove warnings
* style(fmt): rustfmt
Diffstat (limited to 'zellij-utils/src/plugin_api')
| -rw-r--r-- | zellij-utils/src/plugin_api/plugin_command.proto | 4 | ||||
| -rw-r--r-- | zellij-utils/src/plugin_api/plugin_command.rs | 14 | ||||
| -rw-r--r-- | zellij-utils/src/plugin_api/plugin_permission.proto | 2 | ||||
| -rw-r--r-- | zellij-utils/src/plugin_api/plugin_permission.rs | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/zellij-utils/src/plugin_api/plugin_command.proto b/zellij-utils/src/plugin_api/plugin_command.proto index 14ab3045..5442909e 100644 --- a/zellij-utils/src/plugin_api/plugin_command.proto +++ b/zellij-utils/src/plugin_api/plugin_command.proto @@ -98,7 +98,7 @@ enum CommandName { DumpSessionLayout = 84; CloseSelf = 85; NewTabsWithLayoutInfo = 86; - RebindKeys = 87; + Reconfigure = 87; } message PluginCommand { @@ -156,7 +156,7 @@ message PluginCommand { KillSessionsPayload kill_sessions_payload = 60; string scan_host_folder_payload = 61; NewTabsWithLayoutInfoPayload new_tabs_with_layout_info_payload = 62; - string rebind_keys_payload = 63; + string reconfigure_payload = 63; } } diff --git a/zellij-utils/src/plugin_api/plugin_command.rs b/zellij-utils/src/plugin_api/plugin_command.rs index aeafc1d4..a6514b1b 100644 --- a/zellij-utils/src/plugin_api/plugin_command.rs +++ b/zellij-utils/src/plugin_api/plugin_command.rs @@ -888,11 +888,11 @@ impl TryFrom<ProtobufPluginCommand> for PluginCommand { }, _ => Err("Mismatched payload for NewTabsWithLayoutInfo"), }, - Some(CommandName::RebindKeys) => match protobuf_plugin_command.payload { - Some(Payload::RebindKeysPayload(rebind_keys_payload)) => { - Ok(PluginCommand::RebindKeys(rebind_keys_payload)) + Some(CommandName::Reconfigure) => match protobuf_plugin_command.payload { + Some(Payload::ReconfigurePayload(reconfigure_payload)) => { + Ok(PluginCommand::Reconfigure(reconfigure_payload)) }, - _ => Err("Mismatched payload for RebindKeys"), + _ => Err("Mismatched payload for Reconfigure"), }, None => Err("Unrecognized plugin command"), } @@ -1426,9 +1426,9 @@ impl TryFrom<PluginCommand> for ProtobufPluginCommand { )), }) }, - PluginCommand::RebindKeys(rebind_keys_payload) => Ok(ProtobufPluginCommand { - name: CommandName::RebindKeys as i32, - payload: Some(Payload::RebindKeysPayload(rebind_keys_payload)), + PluginCommand::Reconfigure(reconfigure_payload) => Ok(ProtobufPluginCommand { + name: CommandName::Reconfigure as i32, + payload: Some(Payload::ReconfigurePayload(reconfigure_payload)), }), } } diff --git a/zellij-utils/src/plugin_api/plugin_permission.proto b/zellij-utils/src/plugin_api/plugin_permission.proto index cc1fda6a..399ebba5 100644 --- a/zellij-utils/src/plugin_api/plugin_permission.proto +++ b/zellij-utils/src/plugin_api/plugin_permission.proto @@ -12,5 +12,5 @@ enum PermissionType { WebAccess = 6; ReadCliPipes = 7; MessageAndLaunchOtherPlugins = 8; - RebindKeys = 9; + Reconfigure = 9; } diff --git a/zellij-utils/src/plugin_api/plugin_permission.rs b/zellij-utils/src/plugin_api/plugin_permission.rs index 968de917..5ea70157 100644 --- a/zellij-utils/src/plugin_api/plugin_permission.rs +++ b/zellij-utils/src/plugin_api/plugin_permission.rs @@ -24,7 +24,7 @@ impl TryFrom<ProtobufPermissionType> for PermissionType { ProtobufPermissionType::MessageAndLaunchOtherPlugins => { Ok(PermissionType::MessageAndLaunchOtherPlugins) }, - ProtobufPermissionType::RebindKeys => Ok(PermissionType::RebindKeys), + ProtobufPermissionType::Reconfigure => Ok(PermissionType::Reconfigure), } } } @@ -50,7 +50,7 @@ impl TryFrom<PermissionType> for ProtobufPermissionType { PermissionType::MessageAndLaunchOtherPlugins => { Ok(ProtobufPermissionType::MessageAndLaunchOtherPlugins) }, - PermissionType::RebindKeys => Ok(ProtobufPermissionType::RebindKeys), + PermissionType::Reconfigure => Ok(ProtobufPermissionType::Reconfigure), } } } |
