pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ui): change resize binding to Ctrl-n

Browse source 
* fix(ui): change resize binding to Ctrl-n

* Fix tests?

* Actually update the keybind in tests

* Cowardly refuse to fix the E2E testing issue
This commit is contained in:
Brooks Rady 2021-08-30 18:02:14 +01:00 • committed by GitHub
parent 588fcc69be
commit a51f500c17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.toml
View file

@ -128,7 +128,7 @@ args = ["build", "--verbose", "--release", "--target", "${CARGO_MAKE_TASK_ARGS}"
# Build e2e asset # Build e2e asset
[tasks.build-e2e] [tasks.build-e2e]
workspace = false workspace = false
dependencies = ["build-plugins"] dependencies = ["build-plugins", "build-dev-data-dir"]
command = "cargo" command = "cargo"
args = ["build", "--verbose", "--target", "x86_64-unknown-linux-musl"] args = ["build", "--verbose", "--target", "x86_64-unknown-linux-musl"]

BIN
assets/plugins/status-bar.wasm
View file

Binary file not shown.

BIN
assets/plugins/strider.wasm
View file

Binary file not shown.

BIN
assets/plugins/tab-bar.wasm
View file

Binary file not shown.

2
default-plugins/status-bar/src/first_line.rs
View file

@ -48,7 +48,7 @@ impl CtrlKeyShortcut {
CtrlKeyAction::Lock => 'g', CtrlKeyAction::Lock => 'g',
CtrlKeyAction::Pane => 'p', CtrlKeyAction::Pane => 'p',
CtrlKeyAction::Tab => 't', CtrlKeyAction::Tab => 't',
CtrlKeyAction::Resize => 'r', CtrlKeyAction::Resize => 'n',
CtrlKeyAction::Scroll => 's', CtrlKeyAction::Scroll => 's',
CtrlKeyAction::Quit => 'q', CtrlKeyAction::Quit => 'q',
CtrlKeyAction::Session => 'o', CtrlKeyAction::Session => 'o',

2
src/tests/e2e/cases.rs
View file

@ -35,7 +35,7 @@ pub const SCROLL_DOWN_IN_SCROLL_MODE: [u8; 1] = [106]; // j
pub const SCROLL_PAGE_UP_IN_SCROLL_MODE: [u8; 1] = [2]; // ctrl-b pub const SCROLL_PAGE_UP_IN_SCROLL_MODE: [u8; 1] = [2]; // ctrl-b
pub const SCROLL_PAGE_DOWN_IN_SCROLL_MODE: [u8; 1] = [6]; // ctrl-f pub const SCROLL_PAGE_DOWN_IN_SCROLL_MODE: [u8; 1] = [6]; // ctrl-f
pub const RESIZE_MODE: [u8; 1] = [18]; // ctrl-r pub const RESIZE_MODE: [u8; 1] = [14]; // ctrl-n
pub const RESIZE_DOWN_IN_RESIZE_MODE: [u8; 1] = [106]; // j pub const RESIZE_DOWN_IN_RESIZE_MODE: [u8; 1] = [106]; // j
pub const RESIZE_UP_IN_RESIZE_MODE: [u8; 1] = [107]; // k pub const RESIZE_UP_IN_RESIZE_MODE: [u8; 1] = [107]; // k
pub const RESIZE_LEFT_IN_RESIZE_MODE: [u8; 1] = [104]; // h pub const RESIZE_LEFT_IN_RESIZE_MODE: [u8; 1] = [104]; // h

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__close_pane.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ │ │ │
│ │ │ │
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__detach_and_attach_session.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ ││ │ │ ││ │
│ ││ │ │ ││ │
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__focus_pane_with_mouse.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ ││ │ │ ││ │
│ ││ │ │ ││ │
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__lock_mode.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ │ │ │
│ │ │ │
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
-- INTERFACE LOCKED -- -- INTERFACE LOCKED --

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__open_new_tab.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ │ │ │
│ │ │ │
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_pane.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ ││ │ │ ││ │
│ ││ │ │ ││ │
└────────────────────────────────────────────────────┘└────────────────────────────────────────────────────────────────┘ └────────────────────────────────────────────────────┘└────────────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_terminal_window.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ ││ │ │ ││ │
│ ││ │ │ ││ │
└────────────────────────────────────────────────┘└────────────────────────────────────────────────┘ └────────────────────────────────────────────────┘└────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ ││line18 000000000000000000000000000000000000000000000000000│ │ ││line18 000000000000000000000000000000000000000000000000000│
│ ││line19 00000000000000000000000000000000000000000000000000█│ │ ││line19 00000000000000000000000000000000000000000000000000█│
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
<↓↑> Scroll / <PgUp/PgDn> Scroll Page / <ENTER> Select pane <↓↑> Scroll / <PgUp/PgDn> Scroll Page / <ENTER> Select pane

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane_with_mouse.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ ││line18 000000000000000000000000000000000000000000000000000│ │ ││line18 000000000000000000000000000000000000000000000000000│
│ ││line19 00000000000000000000000000000000000000000000000000█│ │ ││line19 00000000000000000000000000000000000000000000000000█│
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__split_terminals_vertically.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ ││ │ │ ││ │
│ ││ │ │ ││ │
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__start_without_pane_frames.snap
View file

@ -25,5 +25,5 @@ $ │$ █
│ │
│ │
│ │
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__starts_with_one_terminal.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ │ │ │
│ │ │ │
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_pane_fullscreen.snap
View file

@ -25,5 +25,5 @@ expression: last_snapshot
│ │ │ │
│ │ │ │
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT  Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes. Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.

8
zellij-utils/assets/config/default.yaml
View file

@ -7,7 +7,7 @@ keybinds:
- action: [SwitchToMode: Pane,] - action: [SwitchToMode: Pane,]
key: [Ctrl: 'p',] key: [Ctrl: 'p',]
- action: [SwitchToMode: Resize,] - action: [SwitchToMode: Resize,]
key: [Ctrl: 'r',] key: [Ctrl: 'n',]
- action: [SwitchToMode: Tab,] - action: [SwitchToMode: Tab,]
key: [Ctrl: 't',] key: [Ctrl: 't',]
- action: [SwitchToMode: Scroll,] - action: [SwitchToMode: Scroll,]
@ -74,7 +74,7 @@ keybinds:
- action: [SwitchToMode: Locked,] - action: [SwitchToMode: Locked,]
key: [Ctrl: 'g'] key: [Ctrl: 'g']
- action: [SwitchToMode: Resize,] - action: [SwitchToMode: Resize,]
key: [Ctrl: 'r',] key: [Ctrl: 'n',]
- action: [SwitchToMode: Tab,] - action: [SwitchToMode: Tab,]
key: [Ctrl: 't',] key: [Ctrl: 't',]
- action: [SwitchToMode: Normal,] - action: [SwitchToMode: Normal,]
@ -117,7 +117,7 @@ keybinds:
- action: [SwitchToMode: Pane,] - action: [SwitchToMode: Pane,]
key: [Ctrl: 'p',] key: [Ctrl: 'p',]
- action: [SwitchToMode: Resize,] - action: [SwitchToMode: Resize,]
key: [Ctrl: 'r',] key: [Ctrl: 'n',]
- action: [SwitchToMode: Normal,] - action: [SwitchToMode: Normal,]
key: [Ctrl: 't', Char: "\n", Char: ' ',] key: [Ctrl: 't', Char: "\n", Char: ' ',]
- action: [SwitchToMode: Scroll,] - action: [SwitchToMode: Scroll,]
@ -233,7 +233,7 @@ keybinds:
- action: [SwitchToMode: Locked,] - action: [SwitchToMode: Locked,]
key: [Ctrl: 'g'] key: [Ctrl: 'g']
- action: [SwitchToMode: Resize,] - action: [SwitchToMode: Resize,]
key: [Ctrl: 'r',] key: [Ctrl: 'n',]
- action: [SwitchToMode: Pane,] - action: [SwitchToMode: Pane,]
key: [Ctrl: 'p',] key: [Ctrl: 'p',]
- action: [SwitchToMode: Tab,] - action: [SwitchToMode: Tab,]