From c5fffd6e2c48aa7fb8b45b8bdcd972bbd8ce900b Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 29 Nov 2024 21:11:02 +0300 Subject: Initial WIP floating window implementation --- src/handlers/compositor.rs | 27 +- src/handlers/xdg_shell.rs | 13 +- src/input/mod.rs | 19 + src/layout/floating.rs | 815 +++++++++++++++++++++ src/layout/mod.rs | 236 +++++- src/layout/monitor.rs | 53 +- src/layout/scrolling.rs | 41 +- src/layout/workspace.rs | 412 ++++++++++- src/niri.rs | 2 +- ...check_target_output_and_workspace@fsF-spA1.snap | 2 +- ...check_target_output_and_workspace@fsF-spA2.snap | 2 +- ...check_target_output_and_workspace@fsF-spB1.snap | 4 +- ...check_target_output_and_workspace@fsF-spB2.snap | 2 +- ...target_output_and_workspace@fsF-wfsA1-spA1.snap | 2 +- ...target_output_and_workspace@fsF-wfsA1-spA2.snap | 2 +- ...target_output_and_workspace@fsF-wfsA1-spB1.snap | 4 +- ...target_output_and_workspace@fsF-wfsA1-spB2.snap | 4 +- ...target_output_and_workspace@fsF-wfsA2-spA1.snap | 2 +- ...target_output_and_workspace@fsF-wfsA2-spA2.snap | 1 + ...target_output_and_workspace@fsF-wfsA2-spB1.snap | 4 +- ...target_output_and_workspace@fsF-wfsA2-spB2.snap | 3 +- ...target_output_and_workspace@fsF-wfsAA-spA1.snap | 4 +- ...target_output_and_workspace@fsF-wfsAA-spA2.snap | 4 +- ...target_output_and_workspace@fsF-wfsAA-spB1.snap | 6 +- ...target_output_and_workspace@fsF-wfsAA-spB2.snap | 4 +- ...target_output_and_workspace@fsF-wfsAN-spA1.snap | 2 +- ...target_output_and_workspace@fsF-wfsAN-spA2.snap | 2 +- ...target_output_and_workspace@fsF-wfsAN-spB1.snap | 4 +- ...target_output_and_workspace@fsF-wfsAN-spB2.snap | 3 +- ...target_output_and_workspace@fsF-wfsB1-spA1.snap | 2 +- ...target_output_and_workspace@fsF-wfsB1-spA2.snap | 2 +- ...target_output_and_workspace@fsF-wfsB1-spB1.snap | 4 +- ...target_output_and_workspace@fsF-wfsB1-spB2.snap | 4 +- ...target_output_and_workspace@fsF-wfsB2-spA1.snap | 1 + ...target_output_and_workspace@fsF-wfsB2-spA2.snap | 1 + ...target_output_and_workspace@fsF-wfsB2-spB1.snap | 2 +- ...target_output_and_workspace@fsF-wfsB2-spB2.snap | 2 +- ...target_output_and_workspace@fsF-wfsBN-spA1.snap | 2 +- ...target_output_and_workspace@fsF-wfsBN-spA2.snap | 2 +- ...target_output_and_workspace@fsF-wfsBN-spB1.snap | 4 +- ...target_output_and_workspace@fsF-wfsBN-spB2.snap | 2 +- ...target_output_and_workspace@fsF-wfsBU-spA1.snap | 2 +- ...target_output_and_workspace@fsF-wfsBU-spA2.snap | 2 +- ...target_output_and_workspace@fsF-wfsBU-spB1.snap | 4 +- ...target_output_and_workspace@fsF-wfsBU-spB2.snap | 2 +- ...check_target_output_and_workspace@fsT-spA1.snap | 2 +- ...check_target_output_and_workspace@fsT-spA2.snap | 2 +- ...check_target_output_and_workspace@fsT-spB1.snap | 4 +- ...check_target_output_and_workspace@fsT-spB2.snap | 3 +- ...target_output_and_workspace@fsT-wfsA1-spA1.snap | 2 +- ...target_output_and_workspace@fsT-wfsA1-spA2.snap | 2 +- ...target_output_and_workspace@fsT-wfsA1-spB1.snap | 4 +- ...target_output_and_workspace@fsT-wfsA1-spB2.snap | 4 +- ...target_output_and_workspace@fsT-wfsA2-spA1.snap | 2 +- ...target_output_and_workspace@fsT-wfsA2-spA2.snap | 1 + ...target_output_and_workspace@fsT-wfsA2-spB1.snap | 4 +- ...target_output_and_workspace@fsT-wfsA2-spB2.snap | 3 +- ...target_output_and_workspace@fsT-wfsAA-spA1.snap | 4 +- ...target_output_and_workspace@fsT-wfsAA-spA2.snap | 4 +- ...target_output_and_workspace@fsT-wfsAA-spB1.snap | 6 +- ...target_output_and_workspace@fsT-wfsAA-spB2.snap | 4 +- ...target_output_and_workspace@fsT-wfsAN-spA1.snap | 2 +- ...target_output_and_workspace@fsT-wfsAN-spA2.snap | 2 +- ...target_output_and_workspace@fsT-wfsAN-spB1.snap | 4 +- ...target_output_and_workspace@fsT-wfsAN-spB2.snap | 3 +- ...target_output_and_workspace@fsT-wfsB1-spA1.snap | 2 +- ...target_output_and_workspace@fsT-wfsB1-spA2.snap | 2 +- ...target_output_and_workspace@fsT-wfsB1-spB1.snap | 4 +- ...target_output_and_workspace@fsT-wfsB1-spB2.snap | 4 +- ...target_output_and_workspace@fsT-wfsB2-spA1.snap | 1 + ...target_output_and_workspace@fsT-wfsB2-spA2.snap | 1 + ...target_output_and_workspace@fsT-wfsB2-spB1.snap | 3 +- ...target_output_and_workspace@fsT-wfsB2-spB2.snap | 3 +- ...target_output_and_workspace@fsT-wfsBN-spA1.snap | 2 +- ...target_output_and_workspace@fsT-wfsBN-spA2.snap | 2 +- ...target_output_and_workspace@fsT-wfsBN-spB1.snap | 4 +- ...target_output_and_workspace@fsT-wfsBN-spB2.snap | 3 +- ...target_output_and_workspace@fsT-wfsBU-spA1.snap | 2 +- ...target_output_and_workspace@fsT-wfsBU-spA2.snap | 2 +- ...target_output_and_workspace@fsT-wfsBU-spB1.snap | 4 +- ...target_output_and_workspace@fsT-wfsBU-spB2.snap | 3 +- ..._target_output_and_workspace@out1-fsF-spA1.snap | 2 +- ..._target_output_and_workspace@out1-fsF-spA2.snap | 2 +- ..._target_output_and_workspace@out1-fsF-spB1.snap | 4 +- ..._target_output_and_workspace@out1-fsF-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsA2-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@out1-fsF-wfsA2-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@out1-fsF-wfsAA-spA1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsAA-spA2.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsAA-spB1.snap | 6 +- ...t_output_and_workspace@out1-fsF-wfsAA-spB2.snap | 6 +- ...t_output_and_workspace@out1-fsF-wfsAN-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsAN-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsAN-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsAN-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsB1-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsB1-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsB1-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsB1-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsB2-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsB2-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsB2-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsB2-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsBN-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsBN-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsBN-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsBN-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsBU-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsBU-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsF-wfsBU-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsF-wfsBU-spB2.snap | 4 +- ..._target_output_and_workspace@out1-fsT-spA1.snap | 2 +- ..._target_output_and_workspace@out1-fsT-spA2.snap | 2 +- ..._target_output_and_workspace@out1-fsT-spB1.snap | 4 +- ..._target_output_and_workspace@out1-fsT-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsA2-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@out1-fsT-wfsA2-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@out1-fsT-wfsAA-spA1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsAA-spA2.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsAA-spB1.snap | 6 +- ...t_output_and_workspace@out1-fsT-wfsAA-spB2.snap | 6 +- ...t_output_and_workspace@out1-fsT-wfsAN-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsAN-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsAN-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsAN-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsB1-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsB1-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsB1-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsB1-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsB2-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsB2-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsB2-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsB2-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsBN-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsBN-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsBN-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsBN-spB2.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsBU-spA1.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsBU-spA2.snap | 2 +- ...t_output_and_workspace@out1-fsT-wfsBU-spB1.snap | 4 +- ...t_output_and_workspace@out1-fsT-wfsBU-spB2.snap | 4 +- ...heck_target_output_and_workspace@out1-spA1.snap | 2 +- ...heck_target_output_and_workspace@out1-spA2.snap | 2 +- ...heck_target_output_and_workspace@out1-spB1.snap | 4 +- ...heck_target_output_and_workspace@out1-spB2.snap | 4 +- ...arget_output_and_workspace@out1-wfsA1-spA1.snap | 2 +- ...arget_output_and_workspace@out1-wfsA1-spA2.snap | 2 +- ...arget_output_and_workspace@out1-wfsA1-spB1.snap | 4 +- ...arget_output_and_workspace@out1-wfsA1-spB2.snap | 4 +- ...arget_output_and_workspace@out1-wfsA2-spA1.snap | 2 +- ...arget_output_and_workspace@out1-wfsA2-spA2.snap | 1 + ...arget_output_and_workspace@out1-wfsA2-spB1.snap | 4 +- ...arget_output_and_workspace@out1-wfsA2-spB2.snap | 3 +- ...arget_output_and_workspace@out1-wfsAA-spA1.snap | 4 +- ...arget_output_and_workspace@out1-wfsAA-spA2.snap | 4 +- ...arget_output_and_workspace@out1-wfsAA-spB1.snap | 6 +- ...arget_output_and_workspace@out1-wfsAA-spB2.snap | 6 +- ...arget_output_and_workspace@out1-wfsAN-spA1.snap | 2 +- ...arget_output_and_workspace@out1-wfsAN-spA2.snap | 2 +- ...arget_output_and_workspace@out1-wfsAN-spB1.snap | 4 +- ...arget_output_and_workspace@out1-wfsAN-spB2.snap | 4 +- ...arget_output_and_workspace@out1-wfsB1-spA1.snap | 2 +- ...arget_output_and_workspace@out1-wfsB1-spA2.snap | 2 +- ...arget_output_and_workspace@out1-wfsB1-spB1.snap | 4 +- ...arget_output_and_workspace@out1-wfsB1-spB2.snap | 4 +- ...arget_output_and_workspace@out1-wfsB2-spA1.snap | 2 +- ...arget_output_and_workspace@out1-wfsB2-spA2.snap | 2 +- ...arget_output_and_workspace@out1-wfsB2-spB1.snap | 4 +- ...arget_output_and_workspace@out1-wfsB2-spB2.snap | 4 +- ...arget_output_and_workspace@out1-wfsBN-spA1.snap | 2 +- ...arget_output_and_workspace@out1-wfsBN-spA2.snap | 2 +- ...arget_output_and_workspace@out1-wfsBN-spB1.snap | 4 +- ...arget_output_and_workspace@out1-wfsBN-spB2.snap | 4 +- ...arget_output_and_workspace@out1-wfsBU-spA1.snap | 2 +- ...arget_output_and_workspace@out1-wfsBU-spA2.snap | 2 +- ...arget_output_and_workspace@out1-wfsBU-spB1.snap | 4 +- ...arget_output_and_workspace@out1-wfsBU-spB2.snap | 4 +- ..._target_output_and_workspace@out2-fsF-spA1.snap | 1 + ..._target_output_and_workspace@out2-fsF-spA2.snap | 1 + ..._target_output_and_workspace@out2-fsF-spB1.snap | 2 +- ..._target_output_and_workspace@out2-fsF-spB2.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@out2-fsF-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@out2-fsF-wfsA2-spA1.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsA2-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsF-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsF-wfsAA-spA1.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsAA-spA2.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsAA-spB1.snap | 4 +- ...t_output_and_workspace@out2-fsF-wfsAA-spB2.snap | 4 +- ...t_output_and_workspace@out2-fsF-wfsAN-spA1.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsAN-spA2.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsAN-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsF-wfsAN-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsF-wfsB1-spA1.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsB1-spA2.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsB1-spB1.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsB1-spB2.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsB2-spA1.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsB2-spA2.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsB2-spB1.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsB2-spB2.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsBN-spA1.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsBN-spA2.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsBN-spB1.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsBN-spB2.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsBU-spA1.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsBU-spA2.snap | 1 + ...t_output_and_workspace@out2-fsF-wfsBU-spB1.snap | 2 +- ...t_output_and_workspace@out2-fsF-wfsBU-spB2.snap | 2 +- ..._target_output_and_workspace@out2-fsT-spA1.snap | 1 + ..._target_output_and_workspace@out2-fsT-spA2.snap | 1 + ..._target_output_and_workspace@out2-fsT-spB1.snap | 3 +- ..._target_output_and_workspace@out2-fsT-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@out2-fsT-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@out2-fsT-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@out2-fsT-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@out2-fsT-wfsA2-spA1.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsA2-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsAA-spA1.snap | 2 +- ...t_output_and_workspace@out2-fsT-wfsAA-spA2.snap | 2 +- ...t_output_and_workspace@out2-fsT-wfsAA-spB1.snap | 4 +- ...t_output_and_workspace@out2-fsT-wfsAA-spB2.snap | 4 +- ...t_output_and_workspace@out2-fsT-wfsAN-spA1.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsAN-spA2.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsAN-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsAN-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsB1-spA1.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsB1-spA2.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsB1-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsB1-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsB2-spA1.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsB2-spA2.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsB2-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsB2-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsBN-spA1.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsBN-spA2.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsBN-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsBN-spB2.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsBU-spA1.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsBU-spA2.snap | 1 + ...t_output_and_workspace@out2-fsT-wfsBU-spB1.snap | 3 +- ...t_output_and_workspace@out2-fsT-wfsBU-spB2.snap | 3 +- ...heck_target_output_and_workspace@out2-spA1.snap | 1 + ...heck_target_output_and_workspace@out2-spA2.snap | 1 + ...heck_target_output_and_workspace@out2-spB1.snap | 2 +- ...heck_target_output_and_workspace@out2-spB2.snap | 2 +- ...arget_output_and_workspace@out2-wfsA1-spA1.snap | 2 +- ...arget_output_and_workspace@out2-wfsA1-spA2.snap | 2 +- ...arget_output_and_workspace@out2-wfsA1-spB1.snap | 4 +- ...arget_output_and_workspace@out2-wfsA1-spB2.snap | 4 +- ...arget_output_and_workspace@out2-wfsA2-spA1.snap | 1 + ...arget_output_and_workspace@out2-wfsA2-spA2.snap | 1 + ...arget_output_and_workspace@out2-wfsA2-spB1.snap | 3 +- ...arget_output_and_workspace@out2-wfsA2-spB2.snap | 3 +- ...arget_output_and_workspace@out2-wfsAA-spA1.snap | 2 +- ...arget_output_and_workspace@out2-wfsAA-spA2.snap | 2 +- ...arget_output_and_workspace@out2-wfsAA-spB1.snap | 4 +- ...arget_output_and_workspace@out2-wfsAA-spB2.snap | 4 +- ...arget_output_and_workspace@out2-wfsAN-spA1.snap | 1 + ...arget_output_and_workspace@out2-wfsAN-spA2.snap | 1 + ...arget_output_and_workspace@out2-wfsAN-spB1.snap | 3 +- ...arget_output_and_workspace@out2-wfsAN-spB2.snap | 3 +- ...arget_output_and_workspace@out2-wfsB1-spA1.snap | 1 + ...arget_output_and_workspace@out2-wfsB1-spA2.snap | 1 + ...arget_output_and_workspace@out2-wfsB1-spB1.snap | 3 +- ...arget_output_and_workspace@out2-wfsB1-spB2.snap | 3 +- ...arget_output_and_workspace@out2-wfsB2-spA1.snap | 1 + ...arget_output_and_workspace@out2-wfsB2-spA2.snap | 1 + ...arget_output_and_workspace@out2-wfsB2-spB1.snap | 3 +- ...arget_output_and_workspace@out2-wfsB2-spB2.snap | 3 +- ...arget_output_and_workspace@out2-wfsBN-spA1.snap | 1 + ...arget_output_and_workspace@out2-wfsBN-spA2.snap | 1 + ...arget_output_and_workspace@out2-wfsBN-spB1.snap | 3 +- ...arget_output_and_workspace@out2-wfsBN-spB2.snap | 3 +- ...arget_output_and_workspace@out2-wfsBU-spA1.snap | 1 + ...arget_output_and_workspace@out2-wfsBU-spA2.snap | 1 + ...arget_output_and_workspace@out2-wfsBU-spB1.snap | 2 +- ...arget_output_and_workspace@out2-wfsBU-spB2.snap | 2 +- ...ng__check_target_output_and_workspace@spA1.snap | 2 +- ...ng__check_target_output_and_workspace@spA2.snap | 2 +- ...ng__check_target_output_and_workspace@spB1.snap | 4 +- ...ng__check_target_output_and_workspace@spB2.snap | 2 +- ...eck_target_output_and_workspace@wfsA1-spA1.snap | 2 +- ...eck_target_output_and_workspace@wfsA1-spA2.snap | 2 +- ...eck_target_output_and_workspace@wfsA1-spB1.snap | 4 +- ...eck_target_output_and_workspace@wfsA1-spB2.snap | 4 +- ...eck_target_output_and_workspace@wfsA2-spA1.snap | 2 +- ...eck_target_output_and_workspace@wfsA2-spA2.snap | 1 + ...eck_target_output_and_workspace@wfsA2-spB1.snap | 4 +- ...eck_target_output_and_workspace@wfsA2-spB2.snap | 3 +- ...eck_target_output_and_workspace@wfsAA-spA1.snap | 4 +- ...eck_target_output_and_workspace@wfsAA-spA2.snap | 4 +- ...eck_target_output_and_workspace@wfsAA-spB1.snap | 6 +- ...eck_target_output_and_workspace@wfsAA-spB2.snap | 4 +- ...eck_target_output_and_workspace@wfsAN-spA1.snap | 2 +- ...eck_target_output_and_workspace@wfsAN-spA2.snap | 2 +- ...eck_target_output_and_workspace@wfsAN-spB1.snap | 4 +- ...eck_target_output_and_workspace@wfsAN-spB2.snap | 3 +- ...eck_target_output_and_workspace@wfsB1-spA1.snap | 2 +- ...eck_target_output_and_workspace@wfsB1-spA2.snap | 2 +- ...eck_target_output_and_workspace@wfsB1-spB1.snap | 4 +- ...eck_target_output_and_workspace@wfsB1-spB2.snap | 4 +- ...eck_target_output_and_workspace@wfsB2-spA1.snap | 1 + ...eck_target_output_and_workspace@wfsB2-spA2.snap | 1 + ...eck_target_output_and_workspace@wfsB2-spB1.snap | 3 +- ...eck_target_output_and_workspace@wfsB2-spB2.snap | 3 +- ...eck_target_output_and_workspace@wfsBN-spA1.snap | 2 +- ...eck_target_output_and_workspace@wfsBN-spA2.snap | 2 +- ...eck_target_output_and_workspace@wfsBN-spB1.snap | 4 +- ...eck_target_output_and_workspace@wfsBN-spB2.snap | 3 +- ...eck_target_output_and_workspace@wfsBU-spA1.snap | 2 +- ...eck_target_output_and_workspace@wfsBU-spA2.snap | 2 +- ...eck_target_output_and_workspace@wfsBU-spB1.snap | 4 +- ...eck_target_output_and_workspace@wfsBU-spB2.snap | 2 +- ...k_target_output_and_workspace@ws1-fsF-spA1.snap | 2 +- ...k_target_output_and_workspace@ws1-fsF-spA2.snap | 2 +- ...k_target_output_and_workspace@ws1-fsF-spB1.snap | 4 +- ...k_target_output_and_workspace@ws1-fsF-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsA1-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsA1-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsA1-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsA1-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsA2-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsA2-spA2.snap | 1 + ...et_output_and_workspace@ws1-fsF-wfsA2-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsA2-spB2.snap | 3 +- ...et_output_and_workspace@ws1-fsF-wfsAA-spA1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsAA-spA2.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsAA-spB1.snap | 6 +- ...et_output_and_workspace@ws1-fsF-wfsAA-spB2.snap | 6 +- ...et_output_and_workspace@ws1-fsF-wfsAN-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsAN-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsAN-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsAN-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsB1-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsB1-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsB1-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsB1-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsB2-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsB2-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsB2-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsB2-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsBN-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsBN-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsBN-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsBN-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsBU-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsBU-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsF-wfsBU-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsF-wfsBU-spB2.snap | 4 +- ...k_target_output_and_workspace@ws1-fsT-spA1.snap | 2 +- ...k_target_output_and_workspace@ws1-fsT-spA2.snap | 2 +- ...k_target_output_and_workspace@ws1-fsT-spB1.snap | 4 +- ...k_target_output_and_workspace@ws1-fsT-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsA1-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsA1-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsA1-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsA1-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsA2-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsA2-spA2.snap | 1 + ...et_output_and_workspace@ws1-fsT-wfsA2-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsA2-spB2.snap | 3 +- ...et_output_and_workspace@ws1-fsT-wfsAA-spA1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsAA-spA2.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsAA-spB1.snap | 6 +- ...et_output_and_workspace@ws1-fsT-wfsAA-spB2.snap | 6 +- ...et_output_and_workspace@ws1-fsT-wfsAN-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsAN-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsAN-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsAN-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsB1-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsB1-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsB1-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsB1-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsB2-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsB2-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsB2-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsB2-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsBN-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsBN-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsBN-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsBN-spB2.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsBU-spA1.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsBU-spA2.snap | 2 +- ...et_output_and_workspace@ws1-fsT-wfsBU-spB1.snap | 4 +- ...et_output_and_workspace@ws1-fsT-wfsBU-spB2.snap | 4 +- ...get_output_and_workspace@ws1-out1-fsF-spA1.snap | 2 +- ...get_output_and_workspace@ws1-out1-fsF-spA2.snap | 2 +- ...get_output_and_workspace@ws1-out1-fsF-spB1.snap | 4 +- ...get_output_and_workspace@ws1-out1-fsF-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsA2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws1-out1-fsF-wfsA2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws1-out1-fsF-wfsAA-spA1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsAA-spA2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsAA-spB1.snap | 6 +- ...tput_and_workspace@ws1-out1-fsF-wfsAA-spB2.snap | 6 +- ...tput_and_workspace@ws1-out1-fsF-wfsAN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsAN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsAN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsAN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsB1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsB1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsB1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsB1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsB2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsB2-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsB2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsB2-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsBN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsBN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsBN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsBN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsBU-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsBU-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsF-wfsBU-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsF-wfsBU-spB2.snap | 4 +- ...get_output_and_workspace@ws1-out1-fsT-spA1.snap | 2 +- ...get_output_and_workspace@ws1-out1-fsT-spA2.snap | 2 +- ...get_output_and_workspace@ws1-out1-fsT-spB1.snap | 4 +- ...get_output_and_workspace@ws1-out1-fsT-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsA2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws1-out1-fsT-wfsA2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws1-out1-fsT-wfsAA-spA1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsAA-spA2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsAA-spB1.snap | 6 +- ...tput_and_workspace@ws1-out1-fsT-wfsAA-spB2.snap | 6 +- ...tput_and_workspace@ws1-out1-fsT-wfsAN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsAN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsAN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsAN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsB1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsB1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsB1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsB1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsB2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsB2-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsB2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsB2-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsBN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsBN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsBN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsBN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsBU-spA1.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsBU-spA2.snap | 2 +- ...tput_and_workspace@ws1-out1-fsT-wfsBU-spB1.snap | 4 +- ...tput_and_workspace@ws1-out1-fsT-wfsBU-spB2.snap | 4 +- ..._target_output_and_workspace@ws1-out1-spA1.snap | 2 +- ..._target_output_and_workspace@ws1-out1-spA2.snap | 2 +- ..._target_output_and_workspace@ws1-out1-spB1.snap | 4 +- ..._target_output_and_workspace@ws1-out1-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsA2-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@ws1-out1-wfsA2-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@ws1-out1-wfsAA-spA1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsAA-spA2.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsAA-spB1.snap | 6 +- ...t_output_and_workspace@ws1-out1-wfsAA-spB2.snap | 6 +- ...t_output_and_workspace@ws1-out1-wfsAN-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsAN-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsAN-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsAN-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsB1-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsB1-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsB1-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsB1-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsB2-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsB2-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsB2-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsB2-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsBN-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsBN-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsBN-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsBN-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsBU-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsBU-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out1-wfsBU-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out1-wfsBU-spB2.snap | 4 +- ...get_output_and_workspace@ws1-out2-fsF-spA1.snap | 2 +- ...get_output_and_workspace@ws1-out2-fsF-spA2.snap | 2 +- ...get_output_and_workspace@ws1-out2-fsF-spB1.snap | 4 +- ...get_output_and_workspace@ws1-out2-fsF-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsA2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws1-out2-fsF-wfsA2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws1-out2-fsF-wfsAA-spA1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsAA-spA2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsAA-spB1.snap | 6 +- ...tput_and_workspace@ws1-out2-fsF-wfsAA-spB2.snap | 6 +- ...tput_and_workspace@ws1-out2-fsF-wfsAN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsAN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsAN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsAN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsB1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsB1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsB1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsB1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsB2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsB2-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsB2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsB2-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsBN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsBN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsBN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsBN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsBU-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsBU-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsF-wfsBU-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsF-wfsBU-spB2.snap | 4 +- ...get_output_and_workspace@ws1-out2-fsT-spA1.snap | 2 +- ...get_output_and_workspace@ws1-out2-fsT-spA2.snap | 2 +- ...get_output_and_workspace@ws1-out2-fsT-spB1.snap | 4 +- ...get_output_and_workspace@ws1-out2-fsT-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsA2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws1-out2-fsT-wfsA2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws1-out2-fsT-wfsAA-spA1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsAA-spA2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsAA-spB1.snap | 6 +- ...tput_and_workspace@ws1-out2-fsT-wfsAA-spB2.snap | 6 +- ...tput_and_workspace@ws1-out2-fsT-wfsAN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsAN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsAN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsAN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsB1-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsB1-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsB1-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsB1-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsB2-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsB2-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsB2-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsB2-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsBN-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsBN-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsBN-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsBN-spB2.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsBU-spA1.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsBU-spA2.snap | 2 +- ...tput_and_workspace@ws1-out2-fsT-wfsBU-spB1.snap | 4 +- ...tput_and_workspace@ws1-out2-fsT-wfsBU-spB2.snap | 4 +- ..._target_output_and_workspace@ws1-out2-spA1.snap | 2 +- ..._target_output_and_workspace@ws1-out2-spA2.snap | 2 +- ..._target_output_and_workspace@ws1-out2-spB1.snap | 4 +- ..._target_output_and_workspace@ws1-out2-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsA2-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@ws1-out2-wfsA2-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@ws1-out2-wfsAA-spA1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsAA-spA2.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsAA-spB1.snap | 6 +- ...t_output_and_workspace@ws1-out2-wfsAA-spB2.snap | 6 +- ...t_output_and_workspace@ws1-out2-wfsAN-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsAN-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsAN-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsAN-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsB1-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsB1-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsB1-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsB1-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsB2-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsB2-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsB2-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsB2-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsBN-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsBN-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsBN-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsBN-spB2.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsBU-spA1.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsBU-spA2.snap | 2 +- ...t_output_and_workspace@ws1-out2-wfsBU-spB1.snap | 4 +- ...t_output_and_workspace@ws1-out2-wfsBU-spB2.snap | 4 +- ...check_target_output_and_workspace@ws1-spA1.snap | 2 +- ...check_target_output_and_workspace@ws1-spA2.snap | 2 +- ...check_target_output_and_workspace@ws1-spB1.snap | 4 +- ...check_target_output_and_workspace@ws1-spB2.snap | 4 +- ...target_output_and_workspace@ws1-wfsA1-spA1.snap | 2 +- ...target_output_and_workspace@ws1-wfsA1-spA2.snap | 2 +- ...target_output_and_workspace@ws1-wfsA1-spB1.snap | 4 +- ...target_output_and_workspace@ws1-wfsA1-spB2.snap | 4 +- ...target_output_and_workspace@ws1-wfsA2-spA1.snap | 2 +- ...target_output_and_workspace@ws1-wfsA2-spA2.snap | 1 + ...target_output_and_workspace@ws1-wfsA2-spB1.snap | 4 +- ...target_output_and_workspace@ws1-wfsA2-spB2.snap | 3 +- ...target_output_and_workspace@ws1-wfsAA-spA1.snap | 4 +- ...target_output_and_workspace@ws1-wfsAA-spA2.snap | 4 +- ...target_output_and_workspace@ws1-wfsAA-spB1.snap | 6 +- ...target_output_and_workspace@ws1-wfsAA-spB2.snap | 6 +- ...target_output_and_workspace@ws1-wfsAN-spA1.snap | 2 +- ...target_output_and_workspace@ws1-wfsAN-spA2.snap | 2 +- ...target_output_and_workspace@ws1-wfsAN-spB1.snap | 4 +- ...target_output_and_workspace@ws1-wfsAN-spB2.snap | 4 +- ...target_output_and_workspace@ws1-wfsB1-spA1.snap | 2 +- ...target_output_and_workspace@ws1-wfsB1-spA2.snap | 2 +- ...target_output_and_workspace@ws1-wfsB1-spB1.snap | 4 +- ...target_output_and_workspace@ws1-wfsB1-spB2.snap | 4 +- ...target_output_and_workspace@ws1-wfsB2-spA1.snap | 2 +- ...target_output_and_workspace@ws1-wfsB2-spA2.snap | 2 +- ...target_output_and_workspace@ws1-wfsB2-spB1.snap | 4 +- ...target_output_and_workspace@ws1-wfsB2-spB2.snap | 4 +- ...target_output_and_workspace@ws1-wfsBN-spA1.snap | 2 +- ...target_output_and_workspace@ws1-wfsBN-spA2.snap | 2 +- ...target_output_and_workspace@ws1-wfsBN-spB1.snap | 4 +- ...target_output_and_workspace@ws1-wfsBN-spB2.snap | 4 +- ...target_output_and_workspace@ws1-wfsBU-spA1.snap | 2 +- ...target_output_and_workspace@ws1-wfsBU-spA2.snap | 2 +- ...target_output_and_workspace@ws1-wfsBU-spB1.snap | 4 +- ...target_output_and_workspace@ws1-wfsBU-spB2.snap | 4 +- ...k_target_output_and_workspace@ws2-fsF-spA1.snap | 1 + ...k_target_output_and_workspace@ws2-fsF-spA2.snap | 1 + ...k_target_output_and_workspace@ws2-fsF-spB1.snap | 2 +- ...k_target_output_and_workspace@ws2-fsF-spB2.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsA1-spA1.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsA1-spA2.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsA1-spB1.snap | 4 +- ...et_output_and_workspace@ws2-fsF-wfsA1-spB2.snap | 4 +- ...et_output_and_workspace@ws2-fsF-wfsA2-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsA2-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsA2-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsF-wfsA2-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsF-wfsAA-spA1.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsAA-spA2.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsAA-spB1.snap | 4 +- ...et_output_and_workspace@ws2-fsF-wfsAA-spB2.snap | 4 +- ...et_output_and_workspace@ws2-fsF-wfsAN-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsAN-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsAN-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsF-wfsAN-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsF-wfsB1-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsB1-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsB1-spB1.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsB1-spB2.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsB2-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsB2-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsB2-spB1.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsB2-spB2.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsBN-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsBN-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsBN-spB1.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsBN-spB2.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsBU-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsBU-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsF-wfsBU-spB1.snap | 2 +- ...et_output_and_workspace@ws2-fsF-wfsBU-spB2.snap | 2 +- ...k_target_output_and_workspace@ws2-fsT-spA1.snap | 1 + ...k_target_output_and_workspace@ws2-fsT-spA2.snap | 1 + ...k_target_output_and_workspace@ws2-fsT-spB1.snap | 3 +- ...k_target_output_and_workspace@ws2-fsT-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsA1-spA1.snap | 2 +- ...et_output_and_workspace@ws2-fsT-wfsA1-spA2.snap | 2 +- ...et_output_and_workspace@ws2-fsT-wfsA1-spB1.snap | 4 +- ...et_output_and_workspace@ws2-fsT-wfsA1-spB2.snap | 4 +- ...et_output_and_workspace@ws2-fsT-wfsA2-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsA2-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsA2-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsA2-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsAA-spA1.snap | 2 +- ...et_output_and_workspace@ws2-fsT-wfsAA-spA2.snap | 2 +- ...et_output_and_workspace@ws2-fsT-wfsAA-spB1.snap | 4 +- ...et_output_and_workspace@ws2-fsT-wfsAA-spB2.snap | 4 +- ...et_output_and_workspace@ws2-fsT-wfsAN-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsAN-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsAN-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsAN-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsB1-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsB1-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsB1-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsB1-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsB2-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsB2-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsB2-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsB2-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsBN-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsBN-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsBN-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsBN-spB2.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsBU-spA1.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsBU-spA2.snap | 1 + ...et_output_and_workspace@ws2-fsT-wfsBU-spB1.snap | 3 +- ...et_output_and_workspace@ws2-fsT-wfsBU-spB2.snap | 3 +- ...get_output_and_workspace@ws2-out1-fsF-spA1.snap | 1 + ...get_output_and_workspace@ws2-out1-fsF-spA2.snap | 1 + ...get_output_and_workspace@ws2-out1-fsF-spB1.snap | 2 +- ...get_output_and_workspace@ws2-out1-fsF-spB2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws2-out1-fsF-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws2-out1-fsF-wfsA2-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsA2-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsF-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsF-wfsAA-spA1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsAA-spA2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsAA-spB1.snap | 4 +- ...tput_and_workspace@ws2-out1-fsF-wfsAA-spB2.snap | 4 +- ...tput_and_workspace@ws2-out1-fsF-wfsAN-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsAN-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsAN-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsF-wfsAN-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsF-wfsB1-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsB1-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsB1-spB1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsB1-spB2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsB2-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsB2-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsB2-spB1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsB2-spB2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsBN-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsBN-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsBN-spB1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsBN-spB2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsBU-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsBU-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsF-wfsBU-spB1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsF-wfsBU-spB2.snap | 2 +- ...get_output_and_workspace@ws2-out1-fsT-spA1.snap | 1 + ...get_output_and_workspace@ws2-out1-fsT-spA2.snap | 1 + ...get_output_and_workspace@ws2-out1-fsT-spB1.snap | 3 +- ...get_output_and_workspace@ws2-out1-fsT-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsT-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsT-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws2-out1-fsT-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws2-out1-fsT-wfsA2-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsA2-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsAA-spA1.snap | 2 +- ...tput_and_workspace@ws2-out1-fsT-wfsAA-spA2.snap | 2 +- ...tput_and_workspace@ws2-out1-fsT-wfsAA-spB1.snap | 4 +- ...tput_and_workspace@ws2-out1-fsT-wfsAA-spB2.snap | 4 +- ...tput_and_workspace@ws2-out1-fsT-wfsAN-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsAN-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsAN-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsAN-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsB1-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsB1-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsB1-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsB1-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsB2-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsB2-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsB2-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsB2-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsBN-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsBN-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsBN-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsBN-spB2.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsBU-spA1.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsBU-spA2.snap | 1 + ...tput_and_workspace@ws2-out1-fsT-wfsBU-spB1.snap | 3 +- ...tput_and_workspace@ws2-out1-fsT-wfsBU-spB2.snap | 3 +- ..._target_output_and_workspace@ws2-out1-spA1.snap | 1 + ..._target_output_and_workspace@ws2-out1-spA2.snap | 1 + ..._target_output_and_workspace@ws2-out1-spB1.snap | 2 +- ..._target_output_and_workspace@ws2-out1-spB2.snap | 2 +- ...t_output_and_workspace@ws2-out1-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@ws2-out1-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@ws2-out1-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@ws2-out1-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@ws2-out1-wfsA2-spA1.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsA2-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsAA-spA1.snap | 2 +- ...t_output_and_workspace@ws2-out1-wfsAA-spA2.snap | 2 +- ...t_output_and_workspace@ws2-out1-wfsAA-spB1.snap | 4 +- ...t_output_and_workspace@ws2-out1-wfsAA-spB2.snap | 4 +- ...t_output_and_workspace@ws2-out1-wfsAN-spA1.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsAN-spA2.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsAN-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsAN-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsB1-spA1.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsB1-spA2.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsB1-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsB1-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsB2-spA1.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsB2-spA2.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsB2-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsB2-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsBN-spA1.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsBN-spA2.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsBN-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsBN-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out1-wfsBU-spA1.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsBU-spA2.snap | 1 + ...t_output_and_workspace@ws2-out1-wfsBU-spB1.snap | 2 +- ...t_output_and_workspace@ws2-out1-wfsBU-spB2.snap | 2 +- ...get_output_and_workspace@ws2-out2-fsF-spA1.snap | 1 + ...get_output_and_workspace@ws2-out2-fsF-spA2.snap | 1 + ...get_output_and_workspace@ws2-out2-fsF-spB1.snap | 2 +- ...get_output_and_workspace@ws2-out2-fsF-spB2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws2-out2-fsF-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws2-out2-fsF-wfsA2-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsA2-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsF-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsF-wfsAA-spA1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsAA-spA2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsAA-spB1.snap | 4 +- ...tput_and_workspace@ws2-out2-fsF-wfsAA-spB2.snap | 4 +- ...tput_and_workspace@ws2-out2-fsF-wfsAN-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsAN-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsAN-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsF-wfsAN-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsF-wfsB1-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsB1-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsB1-spB1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsB1-spB2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsB2-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsB2-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsB2-spB1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsB2-spB2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsBN-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsBN-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsBN-spB1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsBN-spB2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsBU-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsBU-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsF-wfsBU-spB1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsF-wfsBU-spB2.snap | 2 +- ...get_output_and_workspace@ws2-out2-fsT-spA1.snap | 1 + ...get_output_and_workspace@ws2-out2-fsT-spA2.snap | 1 + ...get_output_and_workspace@ws2-out2-fsT-spB1.snap | 3 +- ...get_output_and_workspace@ws2-out2-fsT-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsA1-spA1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsT-wfsA1-spA2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsT-wfsA1-spB1.snap | 4 +- ...tput_and_workspace@ws2-out2-fsT-wfsA1-spB2.snap | 4 +- ...tput_and_workspace@ws2-out2-fsT-wfsA2-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsA2-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsA2-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsA2-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsAA-spA1.snap | 2 +- ...tput_and_workspace@ws2-out2-fsT-wfsAA-spA2.snap | 2 +- ...tput_and_workspace@ws2-out2-fsT-wfsAA-spB1.snap | 4 +- ...tput_and_workspace@ws2-out2-fsT-wfsAA-spB2.snap | 4 +- ...tput_and_workspace@ws2-out2-fsT-wfsAN-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsAN-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsAN-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsAN-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsB1-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsB1-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsB1-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsB1-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsB2-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsB2-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsB2-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsB2-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsBN-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsBN-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsBN-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsBN-spB2.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsBU-spA1.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsBU-spA2.snap | 1 + ...tput_and_workspace@ws2-out2-fsT-wfsBU-spB1.snap | 3 +- ...tput_and_workspace@ws2-out2-fsT-wfsBU-spB2.snap | 3 +- ..._target_output_and_workspace@ws2-out2-spA1.snap | 1 + ..._target_output_and_workspace@ws2-out2-spA2.snap | 1 + ..._target_output_and_workspace@ws2-out2-spB1.snap | 2 +- ..._target_output_and_workspace@ws2-out2-spB2.snap | 2 +- ...t_output_and_workspace@ws2-out2-wfsA1-spA1.snap | 2 +- ...t_output_and_workspace@ws2-out2-wfsA1-spA2.snap | 2 +- ...t_output_and_workspace@ws2-out2-wfsA1-spB1.snap | 4 +- ...t_output_and_workspace@ws2-out2-wfsA1-spB2.snap | 4 +- ...t_output_and_workspace@ws2-out2-wfsA2-spA1.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsA2-spA2.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsA2-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsA2-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsAA-spA1.snap | 2 +- ...t_output_and_workspace@ws2-out2-wfsAA-spA2.snap | 2 +- ...t_output_and_workspace@ws2-out2-wfsAA-spB1.snap | 4 +- ...t_output_and_workspace@ws2-out2-wfsAA-spB2.snap | 4 +- ...t_output_and_workspace@ws2-out2-wfsAN-spA1.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsAN-spA2.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsAN-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsAN-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsB1-spA1.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsB1-spA2.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsB1-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsB1-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsB2-spA1.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsB2-spA2.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsB2-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsB2-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsBN-spA1.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsBN-spA2.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsBN-spB1.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsBN-spB2.snap | 3 +- ...t_output_and_workspace@ws2-out2-wfsBU-spA1.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsBU-spA2.snap | 1 + ...t_output_and_workspace@ws2-out2-wfsBU-spB1.snap | 2 +- ...t_output_and_workspace@ws2-out2-wfsBU-spB2.snap | 2 +- ...check_target_output_and_workspace@ws2-spA1.snap | 1 + ...check_target_output_and_workspace@ws2-spA2.snap | 1 + ...check_target_output_and_workspace@ws2-spB1.snap | 2 +- ...check_target_output_and_workspace@ws2-spB2.snap | 2 +- ...target_output_and_workspace@ws2-wfsA1-spA1.snap | 2 +- ...target_output_and_workspace@ws2-wfsA1-spA2.snap | 2 +- ...target_output_and_workspace@ws2-wfsA1-spB1.snap | 4 +- ...target_output_and_workspace@ws2-wfsA1-spB2.snap | 4 +- ...target_output_and_workspace@ws2-wfsA2-spA1.snap | 1 + ...target_output_and_workspace@ws2-wfsA2-spA2.snap | 1 + ...target_output_and_workspace@ws2-wfsA2-spB1.snap | 3 +- ...target_output_and_workspace@ws2-wfsA2-spB2.snap | 3 +- ...target_output_and_workspace@ws2-wfsAA-spA1.snap | 2 +- ...target_output_and_workspace@ws2-wfsAA-spA2.snap | 2 +- ...target_output_and_workspace@ws2-wfsAA-spB1.snap | 4 +- ...target_output_and_workspace@ws2-wfsAA-spB2.snap | 4 +- ...target_output_and_workspace@ws2-wfsAN-spA1.snap | 1 + ...target_output_and_workspace@ws2-wfsAN-spA2.snap | 1 + ...target_output_and_workspace@ws2-wfsAN-spB1.snap | 3 +- ...target_output_and_workspace@ws2-wfsAN-spB2.snap | 3 +- ...target_output_and_workspace@ws2-wfsB1-spA1.snap | 1 + ...target_output_and_workspace@ws2-wfsB1-spA2.snap | 1 + ...target_output_and_workspace@ws2-wfsB1-spB1.snap | 3 +- ...target_output_and_workspace@ws2-wfsB1-spB2.snap | 3 +- ...target_output_and_workspace@ws2-wfsB2-spA1.snap | 1 + ...target_output_and_workspace@ws2-wfsB2-spA2.snap | 1 + ...target_output_and_workspace@ws2-wfsB2-spB1.snap | 3 +- ...target_output_and_workspace@ws2-wfsB2-spB2.snap | 3 +- ...target_output_and_workspace@ws2-wfsBN-spA1.snap | 1 + ...target_output_and_workspace@ws2-wfsBN-spA2.snap | 1 + ...target_output_and_workspace@ws2-wfsBN-spB1.snap | 3 +- ...target_output_and_workspace@ws2-wfsBN-spB2.snap | 3 +- ...target_output_and_workspace@ws2-wfsBU-spA1.snap | 1 + ...target_output_and_workspace@ws2-wfsBU-spA2.snap | 1 + ...target_output_and_workspace@ws2-wfsBU-spB1.snap | 2 +- ...target_output_and_workspace@ws2-wfsBU-spB2.snap | 2 +- src/window/mod.rs | 35 +- 982 files changed, 3029 insertions(+), 1201 deletions(-) create mode 100644 src/layout/floating.rs (limited to 'src') diff --git a/src/handlers/compositor.rs b/src/handlers/compositor.rs index fe9f8839..0e9397ee 100644 --- a/src/handlers/compositor.rs +++ b/src/handlers/compositor.rs @@ -119,6 +119,11 @@ impl CompositorHandler for State { (ResolvedWindowRules::empty(), None, false, None, None) }; + // The GTK about dialog sets min/max size after the initial configure but + // before mapping, so we need to compute open_floating at the last possible + // moment, that is here. + let is_floating = rules.compute_open_floating(toplevel); + let parent = toplevel .parent() .and_then(|parent| self.niri.layout.find_window_and_output(&parent)) @@ -160,15 +165,20 @@ impl CompositorHandler for State { // // FIXME: do we want to use activate here? How do we want things to behave // exactly? - self.niri - .layout - .add_window_right_of(&p, mapped, width, is_full_width) + self.niri.layout.add_window_right_of( + &p, + mapped, + width, + is_full_width, + is_floating, + ) } else if let Some(workspace_name) = &workspace_name { self.niri.layout.add_window_to_named_workspace( workspace_name, mapped, width, is_full_width, + is_floating, activate, ) } else if let Some(output) = &output { @@ -177,13 +187,18 @@ impl CompositorHandler for State { mapped, width, is_full_width, + is_floating, activate, ); Some(output) } else { - self.niri - .layout - .add_window(mapped, width, is_full_width, activate) + self.niri.layout.add_window( + mapped, + width, + is_full_width, + is_floating, + activate, + ) }; if let Some(output) = output.cloned() { diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs index ae860e4a..869492a2 100644 --- a/src/handlers/xdg_shell.rs +++ b/src/handlers/xdg_shell.rs @@ -459,7 +459,7 @@ impl XdgShellHandler for State { toplevel.with_pending_state(|state| { state.states.set(xdg_toplevel::State::Fullscreen); }); - ws.configure_new_window(&unmapped.window, None, rules); + ws.configure_new_window(&unmapped.window, None, false, rules); } // We already sent the initial configure, so we need to reconfigure. @@ -553,7 +553,13 @@ impl XdgShellHandler for State { } else { *width }; - ws.configure_new_window(&unmapped.window, configure_width, rules); + let is_floating = rules.compute_open_floating(&toplevel); + ws.configure_new_window( + &unmapped.window, + configure_width, + is_floating, + rules, + ); } // We already sent the initial configure, so we need to reconfigure. @@ -815,6 +821,7 @@ impl State { let mut width = None; let is_full_width = rules.open_maximized.unwrap_or(false); + let is_floating = rules.compute_open_floating(toplevel); // Tell the surface the preferred size and bounds for its likely output. let ws = rules @@ -843,7 +850,7 @@ impl State { } else { width }; - ws.configure_new_window(window, configure_width, &rules); + ws.configure_new_window(window, configure_width, is_floating, &rules); } // If the user prefers no CSD, it's a reasonable assumption that they would prefer to get diff --git a/src/input/mod.rs b/src/input/mod.rs index 13ed6d7f..4e264b06 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -1294,6 +1294,25 @@ impl State { } } } + Action::ToggleWindowFloating => {