diff options
Diffstat (limited to 'test/functional/ui/float_spec.lua')
| -rw-r--r-- | test/functional/ui/float_spec.lua | 952 |
1 files changed, 601 insertions, 351 deletions
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index 8dfe36c799..958c56334a 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -67,7 +67,7 @@ describe('floating windows', function() local buf = meths.create_buf(false,false) local win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5}) local expected_pos = { - [3]={{id=1001}, 'NW', 1, 2, 5, true}, + [4]={{id=1001}, 'NW', 1, 2, 5, true}, } if multigrid then @@ -79,7 +79,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -88,6 +88,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -105,8 +107,8 @@ describe('floating windows', function() meths.win_set_config(win, {relative='editor', row=0, col=10}) - expected_pos[3][4] = 0 - expected_pos[3][5] = 10 + expected_pos[4][4] = 0 + expected_pos[4][5] = 10 if multigrid then screen:expect{grid=[[ ## grid 1 @@ -116,7 +118,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -125,6 +127,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -150,7 +154,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -158,6 +162,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -182,7 +188,7 @@ describe('floating windows', function() local buf = meths.create_buf(false,false) local win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5}) local expected_pos = { - [3]={{id=1001}, 'NW', 1, 2, 5, true}, + [4]={{id=1001}, 'NW', 1, 2, 5, true}, } if multigrid then @@ -194,7 +200,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -203,6 +209,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -220,8 +228,8 @@ describe('floating windows', function() meths.win_set_config(win, {relative='editor', row=0, col=10}) - expected_pos[3][4] = 0 - expected_pos[3][5] = 10 + expected_pos[4][4] = 0 + expected_pos[4][5] = 10 if multigrid then screen:expect{grid=[[ ## grid 1 @@ -231,7 +239,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -240,6 +248,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -265,7 +275,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -273,6 +283,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -315,7 +327,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {14: 1 }^x | {14: 2 }y | @@ -324,11 +336,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {18: 1 }{15:x }| {18: 2 }{15:y }| {18: 3 }{15: }| {16:~ }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ {14: 1 }^x | @@ -352,7 +366,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {14: 1 }^x | {14: 2 }y | @@ -361,11 +375,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {18: 1 }{15: }| {16:~ }| {16:~ }| {16:~ }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ {14: 1 }^x | @@ -396,7 +412,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {19: }{20: 1 }{21:^x }| {19: }{14: 2 }y | @@ -405,11 +421,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {15:x }| {15:y }| {15: }| {15: }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect{grid=[[ {19: }{20: 1 }{21:^x }| @@ -434,7 +452,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20: 1 }{21:^x }| {19: }{14: 2 }y | @@ -443,11 +461,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{15:x }| {19: }{15:y }| {19: }{15: }| {15: }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ @@ -473,7 +493,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {19: }{20: 1 }{21:^x }| {19: }{14: 2 }y | @@ -482,11 +502,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {15: }| {15: }| {15: }| {15: }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ {19: }{20: 1 }{21:^x }| @@ -514,7 +536,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 the background tex^t | {0:~ }| @@ -522,10 +544,12 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:x}| ]], float_pos={ - [4] = {{id = 1002}, "NW", 2, 0, 4, false} + [5] = {{id = 1002}, "NW", 2, 0, 4, false} }} else screen:expect([[ @@ -549,7 +573,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 the background tex^t | {0:~ }| @@ -557,10 +581,12 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:x}| ]], float_pos={ - [4] = {{id = 1002}, "NW", 2, 0, 15, false} + [5] = {{id = 1002}, "NW", 2, 0, 15, false} }} else screen:expect([[ @@ -584,7 +610,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 the background tex^t | {0:~ }| @@ -592,6 +618,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -643,16 +671,18 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| @@ -681,24 +711,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 3, 0, 10, true} + [5] = {{id = 1002}, "NW", 4, 0, 10, true} }} else screen:expect([[ @@ -722,24 +754,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 3, 1, 1, true} + [5] = {{id = 1002}, "NW", 4, 1, 1, true} }} else screen:expect([[ @@ -763,24 +797,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "SW", 3, 0, 3, true} + [5] = {{id = 1002}, "SW", 4, 0, 3, true} }} else screen:expect([[ @@ -805,24 +841,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 2, 1, 10, true} + [5] = {{id = 1002}, "NW", 2, 1, 10, true} }} else screen:expect([[ @@ -846,24 +884,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "SE", 2, 3, 39, true} + [5] = {{id = 1002}, "SE", 2, 3, 39, true} }} else screen:expect([[ @@ -887,24 +927,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NE", 3, 0, 50, true} + [5] = {{id = 1002}, "NE", 4, 0, 50, true} }} else screen:expect([[ @@ -932,12 +974,14 @@ describe('floating windows', function() [2:------------------------------]| [2:------------------------------]| [2:------------------------------]| - | + [3:------------------------------]| ## grid 2 that is wider than the windo^w | {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -959,16 +1003,18 @@ describe('floating windows', function() [2:------------------------------]| [2:------------------------------]| [2:------------------------------]| - | + [3:------------------------------]| ## grid 2 that is wider than the windo^w | {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:some floaty text }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 1, 3, 1, true} + [5] = {{id = 1002}, "NW", 1, 3, 1, true} }} else screen:expect([[ @@ -1024,7 +1070,7 @@ describe('floating windows', function() meths.buf_set_lines(buf, 0, -1, true, {'such', 'very', 'float'}) local win = meths.open_win(buf, false, {relative='editor', width=15, height=4, row=2, col=10}) local expected_pos = { - [4]={{id=1002}, 'NW', 1, 2, 10, true}, + [5]={{id=1002}, 'NW', 1, 2, 10, true}, } if multigrid then screen:expect{grid=[[ @@ -1035,7 +1081,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -1043,7 +1089,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1069,13 +1117,15 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1098,12 +1148,14 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1124,11 +1176,13 @@ describe('floating windows', function() ## grid 1 [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1147,11 +1201,13 @@ describe('floating windows', function() ## grid 1 [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:^float }| @@ -1175,7 +1231,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1183,7 +1239,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:^float }| @@ -1212,7 +1270,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1220,7 +1278,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1247,7 +1307,7 @@ describe('floating windows', function() [2:--------------------------]| [2:--------------------------]| [2:--------------------------]| - | + [3:--------------------------]| ## grid 2 | {0:~ }| @@ -1255,7 +1315,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1282,7 +1344,7 @@ describe('floating windows', function() [2:-------------------------]| [2:-------------------------]| [2:-------------------------]| - | + [3:-------------------------]| ## grid 2 | {0:~ }| @@ -1290,7 +1352,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1317,7 +1381,7 @@ describe('floating windows', function() [2:------------------------]| [2:------------------------]| [2:------------------------]| - | + [3:------------------------]| ## grid 2 | {0:~ }| @@ -1325,7 +1389,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1352,7 +1418,7 @@ describe('floating windows', function() [2:----------------]| [2:----------------]| [2:----------------]| - | + [3:----------------]| ## grid 2 | {0:~ }| @@ -1360,7 +1426,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1387,7 +1455,7 @@ describe('floating windows', function() [2:---------------]| [2:---------------]| [2:---------------]| - | + [3:---------------]| ## grid 2 | {0:~ }| @@ -1395,7 +1463,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1422,7 +1492,7 @@ describe('floating windows', function() [2:--------------]| [2:--------------]| [2:--------------]| - | + [3:--------------]| ## grid 2 | {0:~ }| @@ -1430,7 +1500,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1457,7 +1529,7 @@ describe('floating windows', function() [2:------------]| [2:------------]| [2:------------]| - | + [3:------------]| ## grid 2 | {0:~ }| @@ -1465,7 +1537,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1488,10 +1562,12 @@ describe('floating windows', function() screen:expect{grid=[[ ## grid 1 [2:------------]| - | + [3:------------]| ## grid 2 | - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1513,7 +1589,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1521,7 +1597,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1541,7 +1619,7 @@ describe('floating windows', function() it('does not crash with inccommand #9379', function() local expected_pos = { - [3]={{id=1001}, 'NW', 1, 2, 0, true}, + [4]={{id=1001}, 'NW', 1, 2, 0, true}, } command("set inccommand=split") @@ -1564,7 +1642,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] }| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1572,6 +1650,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:foo }| {1:bar }| {1:^ }| @@ -1599,10 +1679,12 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[Preview] }| - :%s/.^ | + [3:----------------------------------------]| ## grid 2 | ## grid 3 + :%s/.^ | + ## grid 4 {17:f}{1:oo }| {17:b}{1:ar }| {1: }| @@ -1630,7 +1712,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] }| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1638,6 +1720,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:foo }| {1:bar }| {1:^ }| @@ -1676,7 +1760,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1685,12 +1769,14 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {7:^ }| {12:~ }| {12:~ }| {12:~ }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, }} else screen:expect([[ @@ -1717,7 +1803,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1726,17 +1812,19 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {7:x aa^ }| {12:~ }| {12:~ }| {12:~ }| - ## grid 4 + ## grid 5 {13: aa }| {1: word }| {1: longtext }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, - [4] = {{ id = -1 }, "NW", 3, 1, 1, false} + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [5] = {{ id = -1 }, "NW", 4, 1, 1, false} }} else screen:expect([[ @@ -1760,7 +1848,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1769,12 +1857,14 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {7:x a^a }| {12:~ }| {12:~ }| {12:~ }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, }} else @@ -1800,7 +1890,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 xx^ | {0:~ }| @@ -1809,17 +1899,19 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {7:x aa }| {12:~ }| {12:~ }| {12:~ }| - ## grid 4 + ## grid 5 {13:xx }| {1:yy }| {1:zz }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, - [4] = {{ id = -1 }, "NW", 2, 1, 0, false} + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [5] = {{ id = -1 }, "NW", 2, 1, 0, false} }} else screen:expect([[ @@ -1843,7 +1935,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 xx^ | {0:~ }| @@ -1852,12 +1944,14 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {7:x aa }| {12:~ }| {12:~ }| {12:~ }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, }} else screen:expect([[ @@ -1886,7 +1980,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1895,14 +1989,16 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {7:x aa^ }| {12:~ }| {12:~ }| {12:~ }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, }, popupmenu={ - anchor = {3, 0, 2}, items = items, pos = 0 + anchor = {4, 0, 2}, items = items, pos = 0 }} else screen:expect{grid=[[ @@ -1928,7 +2024,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1937,12 +2033,14 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {7:x a^a }| {12:~ }| {12:~ }| {12:~ }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, }} else screen:expect([[ @@ -1968,7 +2066,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 xx^ | {0:~ }| @@ -1977,12 +2075,14 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {7:x aa }| {12:~ }| {12:~ }| {12:~ }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, }, popupmenu={ anchor = {2, 0, 0}, items = items, pos = 0 }} @@ -2010,7 +2110,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 xx^ | {0:~ }| @@ -2019,12 +2119,14 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {7:x aa }| {12:~ }| {12:~ }| {12:~ }| ]], float_pos={ - [3] = {{ id = 1001 }, "NW", 1, 2, 5, true}, + [4] = {{ id = 1001 }, "NW", 1, 2, 5, true}, }} else screen:expect([[ @@ -2055,7 +2157,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 aa^ | {0:~ }| @@ -2064,11 +2166,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {13:aa }| {1:word }| {1:longtext }| ]], float_pos={ - [3] = {{id = -1}, "NW", 2, 1, 0, false}} + [4] = {{id = -1}, "NW", 2, 1, 0, false}} } else screen:expect([[ @@ -2094,7 +2198,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 aa^ | {0:~ }| @@ -2103,15 +2207,17 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {13:aa }| {1:word }| {1:longtext }| - ## grid 5 + ## grid 6 {15:some info }| {15:about item }| ]], float_pos={ - [3] = {{id = -1}, "NW", 2, 1, 0, false}, - [5] = {{id = 1002}, "NW", 2, 1, 12, true}, + [4] = {{id = -1}, "NW", 2, 1, 0, false}, + [6] = {{id = 1002}, "NW", 2, 1, 12, true}, }} else screen:expect([[ @@ -2137,7 +2243,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 aa^ | {0:~ }| @@ -2145,11 +2251,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 5 + ## grid 3 + {3:-- INSERT --} | + ## grid 6 {15:some info }| {15:about item }| ]], float_pos={ - [5] = {{id = 1002}, "NW", 2, 1, 12, true}, + [6] = {{id = 1002}, "NW", 2, 1, 12, true}, }} else screen:expect([[ @@ -2173,7 +2281,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 aa^ | {0:~ }| @@ -2181,6 +2289,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + {3:-- INSERT --} | ]]) else screen:expect([[ @@ -2206,7 +2316,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 aa^ | {0:~ }| @@ -2215,11 +2325,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {13:aa }| {1:word }| {1:longtext }| ]], float_pos={ - [3] = {{id = -1}, "NW", 2, 1, 0, false}, + [4] = {{id = -1}, "NW", 2, 1, 0, false}, }} else screen:expect([[ @@ -2243,7 +2355,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 aa^ | {0:~ }| @@ -2251,6 +2363,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + {3:-- INSERT --} | ]]) else screen:expect([[ @@ -2278,7 +2392,7 @@ describe('floating windows', function() win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5}) meths.buf_set_lines(buf,0,-1,true,{"y"}) expected_pos = { - [3]={{id=1001}, 'NW', 1, 2, 5, true} + [4]={{id=1001}, 'NW', 1, 2, 5, true} } if multigrid then screen:expect{grid=[[ @@ -2289,7 +2403,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2298,6 +2412,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2325,7 +2441,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2334,6 +2450,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -2359,7 +2477,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2368,6 +2486,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2386,7 +2506,7 @@ describe('floating windows', function() it("w with focusable=false", function() meths.win_set_config(win, {focusable=false}) - expected_pos[3][6] = false + expected_pos[4][6] = false feed("<c-w>wi") -- i to provoke redraw if multigrid then screen:expect{grid=[[ @@ -2397,7 +2517,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2406,6 +2526,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2431,7 +2553,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2440,6 +2562,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2467,7 +2591,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2476,6 +2600,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -2501,7 +2627,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2510,6 +2636,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2528,7 +2656,7 @@ describe('floating windows', function() it("focus by mouse", function() if multigrid then - meths.input_mouse('left', 'press', '', 3, 0, 0) + meths.input_mouse('left', 'press', '', 4, 0, 0) screen:expect{grid=[[ ## grid 1 [2:----------------------------------------]| @@ -2537,7 +2665,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2546,6 +2674,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -2572,7 +2702,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2581,6 +2711,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2601,9 +2733,9 @@ describe('floating windows', function() it("focus by mouse (focusable=false)", function() meths.win_set_config(win, {focusable=false}) meths.buf_set_lines(0, -1, -1, true, {"a"}) - expected_pos[3][6] = false + expected_pos[4][6] = false if multigrid then - meths.input_mouse('left', 'press', '', 3, 0, 0) + meths.input_mouse('left', 'press', '', 4, 0, 0) screen:expect{grid=[[ ## grid 1 [2:----------------------------------------]| @@ -2612,7 +2744,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | a | @@ -2621,6 +2753,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2647,7 +2781,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | a | @@ -2656,6 +2790,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos, unchanged=true} @@ -2685,7 +2821,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2694,6 +2830,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2719,7 +2857,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2728,6 +2866,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -2753,7 +2893,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -2762,6 +2902,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -2790,7 +2932,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2799,6 +2941,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -2824,7 +2968,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2833,6 +2977,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| {2:~ }| @@ -2859,7 +3005,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2868,6 +3014,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| ]], float_pos=expected_pos} else @@ -2892,7 +3040,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2901,6 +3049,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| {2:~ }| @@ -2928,7 +3078,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2937,6 +3087,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| {2:~ }| @@ -2968,7 +3120,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -2977,6 +3129,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -3002,7 +3156,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3011,6 +3165,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -3036,7 +3192,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3045,6 +3201,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -3070,7 +3228,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3079,6 +3237,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -3104,7 +3264,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3113,6 +3273,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -3134,20 +3296,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {4:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^x | {0:~ }| ]], float_pos=expected_pos} @@ -3167,20 +3331,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {5:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 x | {0:~ }| ]], float_pos=expected_pos} @@ -3200,20 +3366,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {5:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| - ## grid 4 + ## grid 5 x | {0:~ }| ]], float_pos=expected_pos} @@ -3234,20 +3402,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {4:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^x | {0:~ }| ]], float_pos=expected_pos} @@ -3269,20 +3439,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {4:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^y | {0:~ }| ]], float_pos=expected_pos} @@ -3302,20 +3474,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {5:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 y | {0:~ }| ]], float_pos=expected_pos} @@ -3335,20 +3509,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {5:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {4:[No Name] [+] }| - {3:-- INSERT --} | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| ## grid 3 + {3:-- INSERT --} | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 y | {0:~ }| ]], float_pos=expected_pos} @@ -3370,20 +3546,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {4:[No Name] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - :new | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + :new | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| ]], float_pos=expected_pos} @@ -3405,20 +3583,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {4:[No Name] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - :new | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + :new | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| ]], float_pos=expected_pos} @@ -3440,13 +3620,13 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| {4:[No Name] [+] }{5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3454,9 +3634,11 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^x | {0:~ }| {0:~ }| @@ -3481,13 +3663,13 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| {4:[No Name] }{5:[No Name] [+] }| - :vnew | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3495,9 +3677,11 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + :vnew | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| {0:~ }| @@ -3522,13 +3706,13 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| - [4:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| + [5:--------------------]{5:│}[2:-------------------]| {4:[No Name] }{5:[No Name] [+] }| - :vnew | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3536,9 +3720,11 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + :vnew | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| {0:~ }| @@ -3594,7 +3780,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3603,14 +3789,16 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 {1:^y }| {2:~ }| ]], float_pos={ - [3] = {{id = 1001}, "NW", 1, 2, 5, true}, - [4] = {{id = 1002}, "NW", 1, 4, 8, true} + [4] = {{id = 1001}, "NW", 1, 2, 5, true}, + [5] = {{id = 1002}, "NW", 1, 4, 8, true} }} else screen:expect([[ @@ -3634,7 +3822,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - :quit | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3642,10 +3830,12 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + :quit | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos={ - [3] = {{id = 1001}, "NW", 1, 2, 5, true}, + [4] = {{id = 1001}, "NW", 1, 2, 5, true}, }} else screen:expect([[ @@ -3669,7 +3859,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - :quit | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -3677,6 +3867,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + :quit | ]]) else screen:expect([[ @@ -3704,7 +3896,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -3712,6 +3904,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]} else screen:expect([[ @@ -3734,10 +3928,10 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {4: }| - {7:E5601: Cannot close window, only floatin}| - {7:g window would remain} | - {8:Press ENTER or type command to continue}^ | + [2:----------------------------------------]| + [3:----------------------------------------]| + [3:----------------------------------------]| + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3746,6 +3940,10 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + {7:E5601: Cannot close window, only floatin}| + {7:g window would remain} | + {8:Press ENTER or type command to continue}^ | + ## grid 4 {1:y }| {2:~ }| ]], float_pos=expected_pos} @@ -3772,7 +3970,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3781,6 +3979,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| ]], float_pos=expected_pos} @@ -3802,20 +4002,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {4:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^x | {0:~ }| ]], float_pos=expected_pos} @@ -3835,14 +4037,16 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [3:----------------------------------------]| + ## grid 3 | - ## grid 4 + ## grid 5 ^x | {0:~ }| {0:~ }| @@ -3868,20 +4072,22 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {5:[No Name] [+] }| [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 {1:^y }| {2:~ }| - ## grid 4 + ## grid 5 x | {0:~ }| ]], float_pos=expected_pos} @@ -3901,20 +4107,24 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [4:----------------------------------------]| - [4:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| {5:[No Name] [+] }| - {4: }| - {7:E5601: Cannot close window, only floatin}| - {7:g window would remain} | - {8:Press ENTER or type command to continue}^ | + [2:----------------------------------------]| + [3:----------------------------------------]| + [3:----------------------------------------]| + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + {7:E5601: Cannot close window, only floatin}| + {7:g window would remain} | + {8:Press ENTER or type command to continue}^ | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 x | {0:~ }| ]], float_pos=expected_pos} @@ -3939,14 +4149,16 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 ^y | {0:~ }| ]]} @@ -3964,7 +4176,7 @@ describe('floating windows', function() if multigrid then meths.win_set_config(0, {external=true, width=30, height=2}) - expected_pos = {[3]={external=true}} + expected_pos = {[4]={external=true}} screen:expect{grid=[[ ## grid 1 [2:----------------------------------------]| @@ -3973,7 +4185,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| @@ -3981,6 +4193,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 ^y | {0:~ }| ]], float_pos=expected_pos} @@ -3997,14 +4211,16 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 ^y | {0:~ }| ]]) @@ -4017,26 +4233,28 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [5:--------------------]{5:│}[4:-------------------]| - [5:--------------------]{5:│}[4:-------------------]| + [6:--------------------]{5:│}[5:-------------------]| + [6:--------------------]{5:│}[5:-------------------]| {5:[No Name] [+] [No Name] [+] }| - [6:--------------------]{5:│}[2:-------------------]| - [6:--------------------]{5:│}[2:-------------------]| + [7:--------------------]{5:│}[2:-------------------]| + [7:--------------------]{5:│}[2:-------------------]| {4:[No Name] [+] }{5:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 x | {0:~ }| ## grid 3 + | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 + ## grid 5 x | {0:~ }| - ## grid 5 + ## grid 6 x | {0:~ }| - ## grid 6 + ## grid 7 ^x | {0:~ }| ]], float_pos=expected_pos} @@ -4062,26 +4280,28 @@ describe('floating windows', function() if multigrid then screen:expect{grid=[[ ## grid 1 - [5:-------------------]{5:│}[4:--------------------]| - [5:-------------------]{5:│}[4:--------------------]| + [6:-------------------]{5:│}[5:--------------------]| + [6:-------------------]{5:│}[5:--------------------]| {5:[No Name] [+] [No Name] [+] }| - [6:-------------------]{5:│}[2:--------------------]| - [6:-------------------]{5:│}[2:--------------------]| + [7:-------------------]{5:│}[2:--------------------]| + [7:-------------------]{5:│}[2:--------------------]| {5:[No Name] [+] [No Name] [+] }| - :enew | + [3:----------------------------------------]| ## grid 2 4 | {0:~ }| ## grid 3 + :enew | + ## grid 4 {1:^5 }| {2:~ }| - ## grid 4 + ## grid 5 2 | {0:~ }| - ## grid 5 + ## grid 6 1 | {0:~ }| - ## grid 6 + ## grid 7 3 | {0:~ }| ]], float_pos=expected_pos} @@ -4138,12 +4358,12 @@ describe('floating windows', function() screen:expect{grid=[[ ## grid 1 {9: }{10:2}{9:+ [No Name] }{3: [No Name] }{5: }{9:X}| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - :tabnew | + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [3:----------------------------------------]| ## grid 2 (hidden) x | {0:~ }| @@ -4151,10 +4371,12 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 3 (hidden) + ## grid 3 + :tabnew | + ## grid 4 (hidden) {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| {0:~ }| @@ -4183,7 +4405,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - :tabnext | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -4191,9 +4413,11 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + :tabnext | + ## grid 4 {1:y }| {2:~ }| - ## grid 4 (hidden) + ## grid 5 (hidden) | {0:~ }| {0:~ }| @@ -4217,22 +4441,24 @@ describe('floating windows', function() screen:expect{grid=[[ ## grid 1 {9: }{10:2}{9:+ [No Name] }{3: [No Name] }{5: }{9:X}| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - :tabnext | + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [3:----------------------------------------]| ## grid 2 (hidden) x | {0:~ }| {0:~ }| {0:~ }| {0:~ }| - ## grid 3 (hidden) + ## grid 3 + :tabnext | + ## grid 4 (hidden) {1:y }| {2:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| {0:~ }| @@ -4256,17 +4482,17 @@ describe('floating windows', function() if multigrid then -- also test external window wider than main screen meths.win_set_config(win, {external=true, width=65, height=4}) - expected_pos = {[3]={external=true}} + expected_pos = {[4]={external=true}} feed(":tabnew<cr>") screen:expect{grid=[[ ## grid 1 {9: + [No Name] }{3: }{11:2}{3:+ [No Name] }{5: }{9:X}| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - :tabnew | + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [3:----------------------------------------]| ## grid 2 (hidden) x | {0:~ }| @@ -4275,11 +4501,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + :tabnew | + ## grid 4 y | {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| {0:~ }| @@ -4301,7 +4529,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - :tabnext | + [3:----------------------------------------]| ## grid 2 ^x | {0:~ }| @@ -4309,11 +4537,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + :tabnext | + ## grid 4 y | {0:~ }| {0:~ }| {0:~ }| - ## grid 4 (hidden) + ## grid 5 (hidden) | {0:~ }| {0:~ }| @@ -4327,12 +4557,12 @@ describe('floating windows', function() screen:expect{grid=[[ ## grid 1 {9: + [No Name] }{3: }{11:2}{3:+ [No Name] }{5: }{9:X}| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - [4:----------------------------------------]| - :tabnext | + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [5:----------------------------------------]| + [3:----------------------------------------]| ## grid 2 (hidden) x | {0:~ }| @@ -4340,11 +4570,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + :tabnext | + ## grid 4 y | {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 5 ^ | {0:~ }| {0:~ }| @@ -4397,7 +4629,7 @@ describe('floating windows', function() [2:--------------------------------------------------]| [2:--------------------------------------------------]| [2:--------------------------------------------------]| - | + [3:--------------------------------------------------]| ## grid 2 Ut enim ad minim veniam, quis nostrud | exercitation ullamco laboris nisi ut aliquip ex | @@ -4407,11 +4639,13 @@ describe('floating windows', function() occaecat cupidatat non proident, sunt in culpa | qui officia deserunt mollit anim id est | laborum^. | - ## grid 4 + ## grid 3 + | + ## grid 5 {1:test }| {1: }| {1:popup text }| - ]], float_pos={[4] = {{id = 1002}, "NW", 1, 2, 5, true}}} + ]], float_pos={[5] = {{id = 1002}, "NW", 1, 2, 5, true}}} else screen:expect([[ Ut enim ad minim veniam, quis nostrud | @@ -4438,7 +4672,7 @@ describe('floating windows', function() [2:--------------------------------------------------]| [2:--------------------------------------------------]| [2:--------------------------------------------------]| - | + [3:--------------------------------------------------]| ## grid 2 Ut enim ad minim veniam, quis nostrud | exercitation ullamco laboris nisi ut aliquip ex | @@ -4448,11 +4682,13 @@ describe('floating windows', function() occaecat cupidatat non proident, sunt in culpa | qui officia deserunt mollit anim id est | laborum^. | - ## grid 4 + ## grid 3 + | + ## grid 5 {9:test }| {9: }| {9:popup text }| - ]], float_pos={[4] = {{id = 1002}, "NW", 1, 2, 5, true}}, unchanged=true} + ]], float_pos={[5] = {{id = 1002}, "NW", 1, 2, 5, true}}, unchanged=true} else screen:expect([[ Ut enim ad minim veniam, quis nostrud | @@ -4480,7 +4716,7 @@ describe('floating windows', function() [2:--------------------------------------------------]| [2:--------------------------------------------------]| [2:--------------------------------------------------]| - | + [3:--------------------------------------------------]| ## grid 2 Ut enim ad minim veniam, quis nostrud | exercitation ullamco laboris nisi ut aliquip ex | @@ -4490,11 +4726,13 @@ describe('floating windows', function() occaecat cupidatat non proident, sunt in culpa | qui officia deserunt mollit anim id est | laborum^. | - ## grid 4 + ## grid 3 + | + ## grid 5 {9:test }| {9: }| {10:popup text}{9: }| - ]], float_pos={[4] = {{id = 1002}, "NW", 1, 2, 5, true}}} + ]], float_pos={[5] = {{id = 1002}, "NW", 1, 2, 5, true}}} else screen:expect([[ Ut enim ad minim veniam, quis nostrud | @@ -4521,7 +4759,7 @@ describe('floating windows', function() [2:--------------------------------------------------]| [2:--------------------------------------------------]| [2:--------------------------------------------------]| - | + [3:--------------------------------------------------]| ## grid 2 Ut enim ad minim veniam, quis nostrud | exercitation ullamco laboris nisi ut aliquip ex | @@ -4531,11 +4769,13 @@ describe('floating windows', function() occaecat cupidatat non proident, sunt in culpa | qui officia deserunt mollit anim id est | laborum^. | - ## grid 4 + ## grid 3 + | + ## grid 5 {9:test }| {9: }| {11:popup text}{9: }| - ]], float_pos={[4] = {{id = 1002}, "NW", 1, 2, 5, true}}, unchanged=true} + ]], float_pos={[5] = {{id = 1002}, "NW", 1, 2, 5, true}}, unchanged=true} else screen:expect([[ Ut enim ad minim veniam, quis nostrud | @@ -4552,7 +4792,7 @@ describe('floating windows', function() -- Test scrolling by mouse if multigrid then - meths.input_mouse('wheel', 'down', '', 4, 2, 2) + meths.input_mouse('wheel', 'down', '', 5, 2, 2) screen:expect{grid=[[ ## grid 1 [2:--------------------------------------------------]| @@ -4563,7 +4803,7 @@ describe('floating windows', function() [2:--------------------------------------------------]| [2:--------------------------------------------------]| [2:--------------------------------------------------]| - | + [3:--------------------------------------------------]| ## grid 2 Ut enim ad minim veniam, quis nostrud | exercitation ullamco laboris nisi ut aliquip ex | @@ -4573,11 +4813,13 @@ describe('floating windows', function() occaecat cupidatat non proident, sunt in culpa | qui officia deserunt mollit anim id est | laborum^. | - ## grid 4 + ## grid 3 + | + ## grid 5 {11:popup text}{9: }| {12:~ }| {12:~ }| - ]], float_pos={[4] = {{id = 1002}, "NW", 1, 2, 5, true}}} + ]], float_pos={[5] = {{id = 1002}, "NW", 1, 2, 5, true}}} else meths.input_mouse('wheel', 'down', '', 0, 4, 7) screen:expect([[ @@ -4609,7 +4851,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 # TODO: 测试字典信息的准确性 | # FIXME: 测试字典信息的准确^性 | @@ -4618,10 +4860,12 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {1: }| {1: }| - ]], float_pos={ [3] = { { id = 1001 }, "NW", 1, 0, 11, true } }} + ]], float_pos={ [4] = { { id = 1001 }, "NW", 1, 0, 11, true } }} else screen:expect([[ # TODO: 测 {1: }信息的准确性 | @@ -4644,7 +4888,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 # TODO: 测试字典信息的准确性 | # FIXME: 测试字典信息的准确^性 | @@ -4652,6 +4896,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -4687,7 +4933,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 # TODO: 测试字典信息的准确性 | # FIXME: 测试字典信息的准确^性 | @@ -4695,12 +4941,14 @@ describe('floating windows', function() {3:~ }| {3:~ }| {3:~ }| - ## grid 5 + ## grid 3 + | + ## grid 6 {5: x x x xx}| {5: x x x x}| {5: }| ]], float_pos={ - [5] = { { + [6] = { { id = 1003 }, "NW", 1, 0, 11, true } }} @@ -4726,7 +4974,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 # TODO: 测试字典信息的准确性 | # FIXME: 测试字典信息的准确^性 | @@ -4734,12 +4982,14 @@ describe('floating windows', function() {3:~ }| {3:~ }| {3:~ }| - ## grid 5 + ## grid 3 + | + ## grid 6 {5: x x x xx}| {5: x x x x}| {5: }| ]], float_pos={ - [5] = { { + [6] = { { id = 1003 }, "NW", 1, 0, 12, true } }} |