Skip to content

refactor(terminal): log scroll region as tuple rather than Option<tuple> #4082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imsnif merged 6 commits into from
Mar 22, 2025
Merged

refactor(terminal): log scroll region as tuple rather than Option<tuple> #4082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
530d993
initial go over
imsnif Mar 21, 2025
9cbd2f7
do not pad scroll region by default
imsnif Mar 21, 2025
52595cd
some cleanups
imsnif Mar 21, 2025
952b98b
moar cleanups
imsnif Mar 21, 2025
7eb7fc2
style(fmt): rustfmt
imsnif Mar 21, 2025
ad1f7d6
docs(changelog): add PR
imsnif Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]
* refactor(terminal): track scroll_region as tuple rather than Option (https://github.com/zellij-org/zellij/pull/4082)

## [0.42.1] - 2025-03-21
* fix(mouse): fix mouse handling in windows terminal (https://github.com/zellij-org/zellij/pull/4076)
Expand Down
284 changes: 112 additions & 172 deletions zellij-server/src/panes/grid.rs
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions ...hots/zellij_server__panes__grid__grid_tests__full_screen_scroll_region_and_scroll_up.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
source: zellij-server/src/panes/./unit/grid_tests.rs
expression: "format!(\"{:?}\", grid)"

---
00 (C): line5
01 (C): line6
Expand Down Expand Up @@ -52,9 +51,8 @@ expression: "format!(\"{:?}\", grid)"
46 (C): line51
47 (C): line52
48 (C): line53
49 (C): line54
50 (C): line55
51 (C): line56
52 (C): line57
53 (C): line58

49 (C): line54
50 (C): line55
51 (C): line56
52 (C): line57
53 (C): line58
18 changes: 8 additions & 10 deletions ...it/snapshots/zellij_server__panes__grid__grid_tests__move_cursor_below_scroll_region.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
source: zellij-server/src/panes/./unit/grid_tests.rs
expression: "format!(\"{:?}\", grid)"

---
00 (C): 7foo
01 (C): 8foo
Expand All @@ -26,16 +25,15 @@ expression: "format!(\"{:?}\", grid)"
20 (C): 27foo
21 (C): 28foo
22 (C): 29foo
23 (C): 30foo
24 (C): 31foo
25 (C): 32foo
26 (C): 33foo
27 (C): 34foo
28 (C): 35foo
29 (C):
23 (C): 30foo
24 (C): 31foo
25 (C): 32foo
26 (C): 33foo
27 (C): 34foo
28 (C): 35foo
29 (C):
30 (C):
31 (C):
32 (C):
33 (C): 5zzr
34 (C):

34 (C):
6 changes: 2 additions & 4 deletions .../panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vim_scroll_region_down.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
source: zellij-server/src/panes/./unit/grid_tests.rs
expression: "format!(\"{:?}\", grid)"

---
00 (C): 22 line2
01 (C): 21 line3
Expand All @@ -28,7 +27,6 @@ expression: "format!(\"{:?}\", grid)"
22 (C): 24 line24
23 (C): 1 line25
24 (C): 2 line26
25 (C): 3 line27
25 (C): 3 line27
26 (C): NORMAL testfile.rs unix | utf-8 | rust 57% 24:1
27 (C):

27 (C):
42 changes: 20 additions & 22 deletions ...ij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
---
source: zellij-server/src/panes/./unit/grid_tests.rs
expression: "format!(\"{:?}\", grid)"

---
00 (C): Test of autowrap, mixing control and print characters.
01 (C): The left/right margins should have letters in order:
02 (C): I iJ
03 (C): j
04 (C): K K k
05 (C): L l
06 (C): M mN
07 (C): n
08 (C): O O o
09 (C): P p
10 (C): Q qR
11 (C): r
12 (C): S S s
13 (C): T t
14 (C): U uV
15 (C): v
16 (C): W W w
17 (C): X x
18 (C): Y yZ
19 (C): z
20 (C):
02 (C): I iJ
03 (C): j
04 (C): K K k
05 (C): L l
06 (C): M mN
07 (C): n
08 (C): O O o
09 (C): P p
10 (C): Q qR
11 (C): r
12 (C): S S s
13 (C): T t
14 (C): U uV
15 (C): v
16 (C): W W w
17 (C): X x
18 (C): Y yZ
19 (C): z
20 (C):
21 (C): Push <RETURN>
22 (C):
23 (C):
Expand All @@ -43,5 +42,4 @@ expression: "format!(\"{:?}\", grid)"
37 (C):
38 (C):
39 (C):
40 (C):

40 (C):
6 changes: 2 additions & 4 deletions ...ij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: zellij-server/src/panes/./unit/grid_tests.rs
assertion_line: 148
expression: "format!(\"{:?}\", grid)"
---
00 (C): Test of autowrap, mixing control and print characters.
Expand All @@ -23,7 +22,7 @@ expression: "format!(\"{:?}\", grid)"
17 (C): X x
18 (C): Y y
19 (W): Z z
20 (C):
20 (C):
21 (C): Push <RETURN>
22 (C):
23 (C):
Expand All @@ -43,5 +42,4 @@ expression: "format!(\"{:?}\", grid)"
37 (C):
38 (C):
39 (C):
40 (C):

40 (C):
24 changes: 11 additions & 13 deletions ...ij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_6.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: zellij-server/src/panes/./unit/grid_tests.rs
assertion_line: 305
expression: "format!(\"{:?}\", grid)"
---
00 (C): Push <RETURN>
Expand Down Expand Up @@ -33,15 +32,14 @@ expression: "format!(\"{:?}\", grid)"
27 (C): Soft scroll down region [12..13] size 2 Line 3
28 (C): Soft scroll down region [12..13] size 2 Line 2
29 (C): Soft scroll down region [12..13] size 2 Line 1
30 (C): Soft scroll up region [12..13] size 2 Line 7
31 (C): Soft scroll up region [12..13] size 2 Line 8
32 (C): Soft scroll up region [12..13] size 2 Line 9
33 (C): Soft scroll up region [12..13] size 2 Line 10
34 (C): Soft scroll up region [12..13] size 2 Line 11
35 (C): Soft scroll up region [12..13] size 2 Line 12
36 (C): Soft scroll up region [12..13] size 2 Line 13
37 (C): Soft scroll up region [12..13] size 2 Line 14
38 (C): Soft scroll up region [12..13] size 2 Line 15
39 (C): Soft scroll up region [12..13] size 2 Line 16
40 (C): Soft scroll up region [12..13] size 2 Line 17

30 (C): Soft scroll up region [12..13] size 2 Line 7
31 (C): Soft scroll up region [12..13] size 2 Line 8
32 (C): Soft scroll up region [12..13] size 2 Line 9
33 (C): Soft scroll up region [12..13] size 2 Line 10
34 (C): Soft scroll up region [12..13] size 2 Line 11
35 (C): Soft scroll up region [12..13] size 2 Line 12
36 (C): Soft scroll up region [12..13] size 2 Line 13
37 (C): Soft scroll up region [12..13] size 2 Line 14
38 (C): Soft scroll up region [12..13] size 2 Line 15
39 (C): Soft scroll up region [12..13] size 2 Line 16
40 (C): Soft scroll up region [12..13] size 2 Line 17
24 changes: 11 additions & 13 deletions ...ij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_8.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: zellij-server/src/panes/./unit/grid_tests.rs
assertion_line: 349
expression: "format!(\"{:?}\", grid)"
---
00 (C): Push <RETURN>
Expand Down Expand Up @@ -33,15 +32,14 @@ expression: "format!(\"{:?}\", grid)"
27 (C): Jump scroll down region [12..13] size 2 Line 3
28 (C): Jump scroll down region [12..13] size 2 Line 2
29 (C): Jump scroll down region [12..13] size 2 Line 1
30 (C): Jump scroll up region [12..13] size 2 Line 7
31 (C): Jump scroll up region [12..13] size 2 Line 8
32 (C): Jump scroll up region [12..13] size 2 Line 9
33 (C): Jump scroll up region [12..13] size 2 Line 10
34 (C): Jump scroll up region [12..13] size 2 Line 11
35 (C): Jump scroll up region [12..13] size 2 Line 12
36 (C): Jump scroll up region [12..13] size 2 Line 13
37 (C): Jump scroll up region [12..13] size 2 Line 14
38 (C): Jump scroll up region [12..13] size 2 Line 15
39 (C): Jump scroll up region [12..13] size 2 Line 16
40 (C): Jump scroll up region [12..13] size 2 Line 17

30 (C): Jump scroll up region [12..13] size 2 Line 7
31 (C): Jump scroll up region [12..13] size 2 Line 8
32 (C): Jump scroll up region [12..13] size 2 Line 9
33 (C): Jump scroll up region [12..13] size 2 Line 10
34 (C): Jump scroll up region [12..13] size 2 Line 11
35 (C): Jump scroll up region [12..13] size 2 Line 12
36 (C): Jump scroll up region [12..13] size 2 Line 13
37 (C): Jump scroll up region [12..13] size 2 Line 14
38 (C): Jump scroll up region [12..13] size 2 Line 15
39 (C): Jump scroll up region [12..13] size 2 Line 16
40 (C): Jump scroll up region [12..13] size 2 Line 17