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 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541
|
local placement = require("awful.placement")
local wibox = require("wibox")
local wibar = require("awful.wibar")
local test_client = require("_client")
local steps = {}
local parent, small
local twibar, bwibar, lwibar, rwibar = screen.primary.mywibox
-- Pretty print issues
local function print_expected()
local wa, sa = mouse.screen.workarea, mouse.screen.geometry
local ret = table.concat{
"\nSCREEN: ", sa.x, " ", sa.y," ", sa.width, " ", sa.height
}
ret = table.concat{ret,
"\nWORKAREA: ", wa.x, " ", wa.y," ", wa.width, " ", wa.height
}
ret = table.concat{ret,
"\nSTRUTS: l:",
wa.x, " t:",
wa.y," r:",
sa.width - wa.width - wa.x, " b:",
sa.height - wa.height - wa.y
}
for k, w in ipairs {lwibar, rwibar, twibar, bwibar} do
ret = table.concat{
ret , "\n " , k, ": ", w.position, " [",
w.width, ", ",
w.height ,
"]"
}
end
return ret
end
-- All wibars on top and bottom are full width and all on left and right
-- must honor the workarea height
local function validate_wibar_geometry()
for _, w in ipairs {lwibar, rwibar, twibar, bwibar} do
assert(w and w.position and w.screen)
if w.visible then
if w.position == "top" or w.position == "bottom" then
assert(w.width == w.screen.geometry.width, print_expected())
else
assert(w.height == w.screen.workarea.height, print_expected())
end
end
end
end
-- Test the struts without using wibars
table.insert(steps, function()
local sgeo = screen.primary.geometry
-- Manually place at the bottom right
local w = wibox{
height = 50,
width = 50,
y = sgeo.y + sgeo.height - 50,
x = sgeo.x + sgeo.width - 50,
visible = true,
}
w:struts {
left = 0,
top = 0,
bottom = 50,
right = 50,
}
local wa = screen.primary.workarea
assert(wa.x == 0 )
assert(wa.y == twibar.height )
assert(wa.width == sgeo.width - 50 )
assert(wa.height == sgeo.height - 50 - twibar.height)
w:struts {
left = 0,
top = 0,
bottom = 0,
right = 0,
}
w.visible = false
wa = screen.primary.workarea
assert(wa.x == 0 )
assert(wa.y == twibar.height )
assert(wa.width == sgeo.width )
assert(wa.height == sgeo.height - twibar.height)
return true
end)
-- Test "attach" for wibox/client to wibox
table.insert(steps, function()
parent = wibox {
visible = true,
width = 500,
height = 500,
}
placement.centered(parent)
small = wibox {
bg = "#ff0000",
height = 24,
ontop = true,
visible = true,
}
-- Add an attached function
placement.top_left(small, {parent = parent})
placement.maximize_horizontally(small, {parent = parent, attach = true})
return true
end)
table.insert(steps, function()
assert(parent:geometry().width == 500)
assert(parent:geometry().height == 500)
assert(parent:geometry().y == small:geometry().y)
assert(parent:geometry().x == small:geometry().x)
assert(parent:geometry().width == small:geometry().width )
assert(small:geometry().height == 24)
-- Now, move the parent and see of the attached one is correctly updated
placement.stretch_left(parent)
return true
end)
table.insert(steps, function()
assert(parent:geometry().y == small:geometry().y)
assert(parent:geometry().x == small:geometry().x)
assert(parent:geometry().width == small:geometry().width )
assert(small:geometry().height == 24)
-- Hide (and hopefully GC) the old "small"
small.visible = false
-- Do the same, but with placement compositing
small = wibox {
bg = "#ff0000",
height = 50,
width = 50,
ontop = true,
visible = true,
}
local p = placement.bottom_right + placement.scale
p(small, {parent=parent, attach=true, direction="left", to_percent=0.5})
return true
end)
local function check_ratio()
assert(
(
parent:geometry().y
+ parent:geometry().height
- small :geometry().height
) == small:geometry().y
)
assert(math.abs(parent:geometry().x + math.ceil(parent:geometry().width/2) - small:geometry().x) <= 1)
assert(math.abs(math.ceil(parent:geometry().width/2) - small:geometry().width) <= 1)
assert(small:geometry().height == 50)
end
table.insert(steps, function()
check_ratio()
-- Now, do some more transformation on the parent and make sure the "small"
-- wibox follow.
placement.scale (parent, {direction="left", to_percent=0.2})
placement.scale (parent, {direction="up" , to_percent=0.2})
placement.bottom (parent )
placement.top_right(parent )
placement.centered (parent )
return true
end)
-- Do the same checks to see if everything has followed as expected
table.insert(steps, function()
check_ratio()
-- Now, test if the wibar has updated the workarea.
placement.maximize(parent, {honor_workarea = true})
return true
end)
table.insert(steps, function()
local wa = screen.primary.workarea
local sgeo = screen.primary.geometry
local wgeo = twibar:geometry()
assert(wa.width == sgeo.width )
assert(wa.x == sgeo.x )
assert(wa.y == sgeo.y + wgeo.height )
-- assert(wa.height == sgeo.height - wgeo.height)
-- assert(wgeo.height == sgeo.height - wa.height )
assert(parent.y == wa.y )
assert(parent.x == wa.x )
assert(parent.width == wa.width )
assert(parent.height == wa.height )
-- Add more wibars
bwibar = wibar {position = "bottom", bg = "#00ff00"}
lwibar = wibar {position = "left" , bg = "#0000ff"}
rwibar = wibar {position = "right" , bg = "#ff00ff"}
validate_wibar_geometry()
return true
end)
-- Make sure the maximized client has the right size and position
local function check_maximize()
local pgeo = parent:geometry()
local margins = {left=0, right=0, top=0, bottom=0}
for _, w in ipairs {twibar, lwibar, rwibar, bwibar} do
if w.visible then
local pos = w.position
local w_or_h = (pos == "left" or pos == "right") and "width" or "height"
margins[pos] = margins[pos] + w[w_or_h]
end
end
local sgeo = parent.screen.geometry
sgeo.x = sgeo.x + margins.left
sgeo.y = sgeo.y + margins.top
sgeo.width = sgeo.width - margins.left - margins.right
sgeo.height = sgeo.height - margins.top - margins.bottom
local wa = parent.screen.workarea
for k, v in pairs(wa) do
assert(sgeo[k] == v)
end
assert(sgeo.width == pgeo.width + 2*parent.border_width)
assert(sgeo.height == pgeo.height + 2*parent.border_width)
assert(sgeo.x == pgeo.x )
assert(sgeo.y == pgeo.y )
end
table.insert(steps, function()
-- Attach the parent wibox to it is updated along the workarea
placement.maximize(parent, {honor_workarea = true, attach = true})
-- Make the wibox more visible
parent.border_color = "#ffff00"
parent.border_width = 10
parent.ontop = true
-- parent.visible = false
local wa = screen.primary.workarea
local sgeo = screen.primary.geometry
assert(lwibar.width == rwibar.width )
assert(lwibar.height == rwibar.height )
assert(twibar.x == bwibar.x )
assert(twibar.width == bwibar.width )
-- Check the left wibar size and position
assert(lwibar.x == wa.x - lwibar.width )
assert(lwibar.height == wa.height )
-- Check the right wibar size and position
assert(rwibar.x == wa.x + wa.width )
assert(rwibar.height == wa.height )
-- Check the bottom wibar size and position
assert(bwibar.width == sgeo.width )
assert(bwibar.x == 0 )
return true
end)
table.insert(steps, function()
check_maximize()
-- There should be a detach callback
assert(lwibar.detach_callback)
-- Begin to move wibars around
lwibar.position = "top"
assert(lwibar.position == "top")
assert(lwibar.y == twibar.height)
validate_wibar_geometry()
return true
end)
table.insert(steps, function()
check_maximize()
bwibar.position = "right"
bwibar.ontop = true
rwibar.ontop = true
assert(bwibar.position == "right")
validate_wibar_geometry()
return true
end)
table.insert(steps, function()
check_maximize()
rwibar.position = "top"
validate_wibar_geometry()
return true
end)
table.insert(steps, function()
check_maximize()
bwibar.position = "top"
validate_wibar_geometry()
return true
end)
table.insert(steps, function()
check_maximize()
for _, w in ipairs {twibar, lwibar, rwibar, bwibar} do
w.position = "right"
validate_wibar_geometry()
end
return true
end)
-- Test visibility
table.insert(steps, function()
check_maximize()
twibar.visible = false
rwibar.visible = false
return true
end)
table.insert(steps, function()
check_maximize()
twibar.visible = true
return true
end)
table.insert(steps, function()
check_maximize()
return true
end)
-- Now test again with a real client
local c
table.insert(steps, function()
-- I'm lazy, so get rid of all the wiboxes that have struts
parent.visible = false
small.visible = false
bwibar.visible = false
lwibar.visible = false
rwibar.visible = false
screen.primary.mywibox.visible = false
-- Spawn a client to test things with
assert(#client.get() == 0)
test_client()
return true
end)
-- Given a geometry and a workarea, test that the given struts are applied
local function test_workarea(geo, wa, left, right, top, bottom)
-- Get the line number from where we were called (helps debugging)
local line = debug.getinfo(2).currentline
assert(geo.x + left == wa.x,
string.format("%d + %d == %d called from line %d", geo.x, left, wa.x, line))
assert(geo.y + top == wa.y,
string.format("%d + %d == %d called from line %d", geo.y, top, wa.y, line))
assert(geo.width - left - right == wa.width,
string.format("%d - %d - %d == %d called from line %d", geo.width, left, right, wa.width, line))
assert(geo.height - top - bottom == wa.height,
string.format("%d - %d - %d == %d called from line %d", geo.height, top, bottom, wa.height, line))
end
table.insert(steps, function()
if #client.get() ~= 1 then
return
end
c = client.get()[1]
assert(c)
assert(c:isvisible())
-- Test some simple struts
c:struts { left = 50 }
test_workarea(c.screen.geometry, c.screen.workarea, 50, 0, 0, 0)
validate_wibar_geometry()
-- A tag switch should make the client no longer apply
screen.primary.tags[2]:view_only()
test_workarea(c.screen.geometry, c.screen.workarea, 0, 0, 0, 0)
validate_wibar_geometry()
-- But sticky clients always 'count'
c.sticky = true
test_workarea(c.screen.geometry, c.screen.workarea, 50, 0, 0, 0)
validate_wibar_geometry()
c.sticky = false
test_workarea(c.screen.geometry, c.screen.workarea, 0, 0, 0, 0)
validate_wibar_geometry()
-- And switch back to the right tag
c.first_tag:view_only()
test_workarea(c.screen.geometry, c.screen.workarea, 50, 0, 0, 0)
validate_wibar_geometry()
-- What if we move the client to another tag?
c:tags{ screen.primary.tags[2] }
test_workarea(c.screen.geometry, c.screen.workarea, 0, 0, 0, 0)
validate_wibar_geometry()
-- Move it back to the selected tag
c:tags{ screen.primary.tags[1] }
test_workarea(c.screen.geometry, c.screen.workarea, 50, 0, 0, 0)
validate_wibar_geometry()
return true
end)
local s
table.insert(steps, function()
c = client.get()[1]
assert(c)
s = c.screen
c:kill()
bwibar:remove()
lwibar:remove()
rwibar:remove()
twibar:remove()
return true
end)
table.insert(steps, function()
if client.get()[1] then
return
end
test_workarea(s.geometry, s.workarea, 0, 0, 0, 0)
validate_wibar_geometry()
local wdg = {
layout = wibox.layout.align.vertical,
wibox.widget.textbox("BEGIN"),
nil,
wibox.widget.textbox("END")
}
local wdg2 = {
layout = wibox.layout.align.horizontal,
wibox.widget.textbox("BEGIN"),
nil,
wibox.widget.textbox("END")
}
lwibar = wibar{position = "top", screen = s, height = 15,
visible = true, bg = "#660066"}
lwibar:setup(wdg2)
rwibar = wibar{position = "top", screen = s, height = 15,
visible = true, bg = "#660000"}
rwibar:setup(wdg2)
bwibar = wibar{position = "left", screen = s, ontop = true, width = 64,
visible = true, bg = "#006600"}
bwibar:setup(wdg)
twibar = wibar{position = "bottom", screen = s,
height = 15, bg = "#666600"}
twibar:setup(wdg2)
test_workarea(s.geometry, s.workarea, 64, 0, 30, 15)
validate_wibar_geometry()
bwibar:remove()
test_workarea(s.geometry, s.workarea, 0, 0, 30, 15)
validate_wibar_geometry()
lwibar:remove()
test_workarea(s.geometry, s.workarea, 0, 0, 15, 15)
validate_wibar_geometry()
rwibar:remove()
test_workarea(s.geometry, s.workarea, 0, 0, 0, 15)
validate_wibar_geometry()
twibar:remove()
test_workarea(s.geometry, s.workarea, 0, 0, 0, 0)
validate_wibar_geometry()
return true
end)
require("_runner").run_steps(steps)
-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
|