1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
#!/usr/bin/env python3
"""Resizing two boundaries at once, where a row boundary crosses a column one.
The two never overlap in the tree -- a column boundary stops where the row
boundary begins, because they belong to different splits -- so the corner is
found by adjacency, and it has to move every boundary that meets there or the
line it looks like would come apart.
"""
import os
import sys
import tempfile
import time
from harness import Session, check, report
SH = ["/bin/sh", "-c", 'printf "\\033]2;p\\007"; stty raw -echo; cat']
CROSS, CROSS_ON = "\u253c", "\u256c"
GRID = (
'layout {\n tab name="t" {\n pane split="rows" {\n'
' pane split="cols" { pane\n pane }\n'
' pane split="cols" { pane\n pane }\n }\n }\n}\n'
)
COLUMNS = 'layout {\n tab name="t" {\n pane\n pane\n }\n}\n'
# The other nesting: a full-height column boundary with row boundaries running
# into it from the sides, rather than the other way round.
GRID2 = (
'layout {\n tab name="t" {\n pane split="cols" {\n'
' pane split="rows" { pane\n pane }\n'
' pane split="rows" { pane\n pane }\n }\n }\n}\n'
)
def lay(text):
f = tempfile.NamedTemporaryFile("w", suffix=".kdl", delete=False)
f.write(text)
f.close()
return f.name
def corners(s):
return [h for h in s.snapshot().hits if h["action"].startswith("corner:")]
def rects(s):
return {p["id"]: (p["x"], p["y"], p["w"], p["h"]) for p in s.panes()}
def test_a_grid_has_a_corner_where_the_boundaries_cross():
l = lay(GRID)
with Session(SH, cols=60, rows=20, layout=l) as s:
s.settle(30)
c = corners(s)
check("the crossing is a target of its own", len(c) == 1, str(c))
if not c:
return
gaps = [h for h in s.snapshot().hits if h["action"].startswith("edge:")]
h_gap = [g for g in gaps if g["h"] == 1][0]
v_gap = [g for g in gaps if g["h"] > 1][0]
check("it sits on the row boundary", c[0]["y"] == h_gap["y"], str(c[0]))
check(
"and in the column boundary's columns",
c[0]["x"] == v_gap["x"] and c[0]["w"] == v_gap["w"],
str(c[0]),
)
# Registered after both gaps, so those cells resolve to the corner.
snap = s.snapshot()
check(
"and wins those cells from both of them",
snap.hit_at(c[0]["x"], c[0]["y"]) == c[0]["action"],
str(snap.hit_at(c[0]["x"], c[0]["y"])),
)
os.unlink(l)
def test_a_layout_with_no_crossing_has_no_corner():
l = lay(COLUMNS)
with Session(SH, cols=60, rows=20, layout=l) as s:
s.settle(30)
check("two columns cross nothing", corners(s) == [], str(corners(s)))
os.unlink(l)
def test_dragging_it_moves_both_boundaries():
l = lay(GRID)
with Session(SH, cols=60, rows=20, layout=l) as s:
s.settle(30)
c = corners(s)[0]
before = rects(s)
ids = sorted(before)
top_left, top_right, bot_left = ids[0], ids[1], ids[2]
s.send(rf"\e[<0;{c['x'] + 1};{c['y'] + 1}M")
s.send(rf"\e[<32;{c['x'] + 6};{c['y'] + 4}M")
s.send(rf"\e[<0;{c['x'] + 6};{c['y'] + 4}m")
s.settle(40)
after = rects(s)
check(
"the column boundary moved right",
after[top_left][2] > before[top_left][2]
and after[top_right][2] < before[top_right][2],
f"{before[top_left]} -> {after[top_left]}",
)
check(
"and the row boundary moved down",
after[top_left][3] > before[top_left][3],
f"{before[top_left]} -> {after[top_left]}",
)
# The two column boundaries are separate splits that happen to line up.
# Moving one without the other would put a step in one apparent line.
check(
"both column boundaries moved together, so the line is still one",
after[bot_left][2] == after[top_left][2],
f"top {after[top_left]} bottom {after[bot_left]}",
)
os.unlink(l)
def test_resting_on_it_arms_both_boundaries():
l = lay(GRID)
with Session(SH, cols=60, rows=20, layout=l) as s:
s.settle(30)
c = corners(s)[0]
screen = s.snapshot().screen()
check(
"nothing armed before the pointer rests",
CROSS not in screen and "\u250a" not in screen,
"",
)
s.send(rf"\e[<35;{c['x'] + 1};{c['y'] + 1}M")
time.sleep(0.35)
s.settle(60)
snap = s.snapshot()
check("the crossing is marked", CROSS in snap.screen(), repr(snap.line(c["y"])))
check("the column boundary is armed too", "\u250a" in snap.screen(), "")
check("and the row boundary", "\u2508" in snap.screen(), "")
s.send(rf"\e[<0;{c['x'] + 1};{c['y'] + 1}M")
s.send(rf"\e[<32;{c['x'] + 3};{c['y'] + 2}M")
s.settle(40)
check(
"and it reads differently once you have hold of it",
CROSS_ON in s.snapshot().screen(),
repr(s.snapshot().screen()[:200]),
)
s.send(rf"\e[<0;{c['x'] + 3};{c['y'] + 2}m")
s.settle(20)
os.unlink(l)
def test_the_hint_says_both_ways():
l = lay(GRID)
with Session(SH, cols=90, rows=20, layout=l) as s:
s.settle(30)
c = corners(s)[0]
s.send(rf"\e[<35;{c['x'] + 1};{c['y'] + 1}M")
s.settle(30)
check(
"the status line says what it would do",
"both ways" in s.snapshot().text[-2],
repr(s.snapshot().text[-2]),
)
os.unlink(l)
def test_a_drag_keeps_the_boundaries_it_grabbed():
"""The corner list is rebuilt from the layout every frame, and a drag is
the thing changing the layout. Holding an index into it would mean the
crossing you grabbed becoming a different entry halfway through -- picking
up panes you never touched, and dropping the ones you did."""
l = lay(GRID)
with Session(SH, cols=70, rows=22, layout=l) as s:
s.settle(30)
ids = sorted(rects(s))
# Put the two column boundaries out of line, so only one of them
# belongs to the crossing.
s.api("focus", id=ids[2])
s.settle(10)
for _ in range(4):
s.send(r"\x01L")
s.settle(30)
w0 = {p["id"]: p["w"] for p in s.panes()}
c = corners(s)[0]
s.send(rf"\e[<0;{c['x'] + 1};{c['y'] + 1}M")
for step in range(1, 9): # wander, so the layout keeps changing
s.send(rf"\e[<32;{c['x'] + 1 + step};{c['y'] + 1 + (step % 3)}M")
s.settle(15)
s.send(rf"\e[<0;{c['x'] + 9};{c['y'] + 3}m")
s.settle(30)
w1 = {p["id"]: p["w"] for p in s.panes()}
top, bottom = ids[:2], ids[2:]
check(
"the boundary it grabbed moved",
[w1[i] for i in top] != [w0[i] for i in top],
f"{[w0[i] for i in top]} -> {[w1[i] for i in top]}",
)
check(
"and the one out of line with it was never picked up",
[w1[i] for i in bottom] == [w0[i] for i in bottom],
f"{[w0[i] for i in bottom]} -> {[w1[i] for i in bottom]}",
)
os.unlink(l)
def test_the_crossing_shows_itself_before_you_rest_on_it():
l = lay(GRID)
with Session(SH, cols=60, rows=20, layout=l) as s:
s.settle(30)
c = corners(s)[0]
s.send(rf"\e[<35;{c['x'] + 1};{c['y'] + 1}M")
s.settle(40) # no dwell
check(
"a crossing two cells wide says it is there straight away",
CROSS in s.snapshot().screen(),
repr(s.snapshot().line(c["y"])),
)
check(
"without arming the boundaries yet",
"\u250a" not in s.snapshot().screen(),
"",
)
def test_boundaries_out_of_line_are_two_crossings():
"""Aligned, they are one crossing with two boundaries to move. Out of line,
they are two crossings each moving its own -- taking the first and
discarding anything unlike it only ever found the aligned case."""
l = lay(GRID)
with Session(SH, cols=70, rows=22, layout=l) as l_s:
s = l_s
s.settle(30)
check("aligned, there is one", len(corners(s)) == 1, str(corners(s)))
ids = sorted(rects(s))
s.api("focus", id=ids[0])
s.settle(10)
for _ in range(4):
s.send(r"\x01L")
s.settle(30)
c = sorted(corners(s), key=lambda h: h["x"])
check("moving one of them makes a second crossing", len(c) == 2, str(c))
if len(c) != 2:
return
check("at the two different columns", c[0]["x"] != c[1]["x"], str(c))
w0 = [p["w"] for p in s.panes()]
s.send(rf"\e[<0;{c[0]['x'] + 1};{c[0]['y'] + 1}M")
s.send(rf"\e[<32;{c[0]['x'] + 5};{c[0]['y'] + 1}M")
s.send(rf"\e[<0;{c[0]['x'] + 5};{c[0]['y'] + 1}m")
s.settle(30)
w1 = [p["w"] for p in s.panes()]
check(
"and each moves only the boundary that meets it",
w1[:2] == w0[:2] and w1[2:] != w0[2:],
f"{w0} -> {w1}",
)
os.unlink(l)
def test_it_finds_the_crossing_whichever_way_the_tree_is_nested():
"""Rows of columns stops the column boundary where the row one begins;
columns of rows stops the row boundary where the column one begins. The
crossing is in the same place on screen either way, and only one of the two
was being found."""
for name, kdl in (("rows of columns", GRID), ("columns of rows", GRID2)):
l = lay(kdl)
with Session(SH, cols=70, rows=22, layout=l) as s:
s.settle(30)
c = corners(s)
check(f"{name}: the crossing is found", len(c) == 1, str(c))
if not c:
os.unlink(l)
continue
before = rects(s)
x, y = c[0]["x"], c[0]["y"]
s.send(rf"\e[<0;{x + 1};{y + 1}M")
s.send(rf"\e[<32;{x + 5};{y + 3}M")
s.send(rf"\e[<0;{x + 5};{y + 3}m")
s.settle(30)
after = rects(s)
check(
f"{name}: dragging it moves both ways",
all(before[i] != after[i] for i in before),
f"{before} -> {after}",
)
os.unlink(l)
if __name__ == "__main__":
test_a_grid_has_a_corner_where_the_boundaries_cross()
test_a_layout_with_no_crossing_has_no_corner()
test_dragging_it_moves_both_boundaries()
test_resting_on_it_arms_both_boundaries()
test_the_hint_says_both_ways()
test_a_drag_keeps_the_boundaries_it_grabbed()
test_the_crossing_shows_itself_before_you_rest_on_it()
test_boundaries_out_of_line_are_two_crossings()
test_it_finds_the_crossing_whichever_way_the_tree_is_nested()
sys.exit(report())
|