diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2021-05-18 10:05:15 +0200 |
|---|---|---|
| committer | a-kenji <aks.kenji@protonmail.com> | 2021-05-18 10:05:15 +0200 |
| commit | bcbde9fbb5bffe4e1334acc1270314517938cac5 (patch) | |
| tree | 8a18820a32392fb4a8a132a27740299ac4849f84 | |
| parent | dc067580f3df50bff17aee48fb330c164084c6bd (diff) | |
| parent | 8c3bf215b7c56fb1254e55ac182233ac488f3113 (diff) | |
Merge branch 'main' of https://github.com/zellij-org/zellij into layout-path-506
| -rw-r--r-- | .github/workflows/rust.yml | 30 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Cargo.lock | 254 | ||||
| -rw-r--r-- | Cargo.toml | 44 | ||||
| -rw-r--r-- | Makefile.toml | 7 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | default-plugins/status-bar/src/main.rs | 64 | ||||
| -rw-r--r-- | default-plugins/tab-bar/src/line.rs | 12 | ||||
| -rw-r--r-- | default-plugins/tab-bar/src/main.rs | 2 | ||||
| -rw-r--r-- | default-plugins/tab-bar/src/tab.rs | 8 | ||||
| -rw-r--r-- | src/common/input/mod.rs | 7 | ||||
| -rw-r--r-- | src/common/mod.rs | 14 | ||||
| -rw-r--r-- | src/common/thread_bus.rs | 142 | ||||
| -rw-r--r-- | src/common/utils/mod.rs | 5 | ||||
| -rw-r--r-- | src/main.rs | 41 | ||||
| -rw-r--r-- | src/tests/fakes.rs | 23 | ||||
| -rw-r--r-- | src/tests/integration/basic.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/close_pane.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/compatibility.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/layouts.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_down.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_left.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_right.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_up.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/resize_down.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/resize_left.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/resize_right.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/resize_up.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/tabs.rs | 5 | ||||
| -rw-r--r-- | src/tests/integration/terminal_window_resize.rs | 4 | ||||
| -rw-r--r-- | src/tests/integration/toggle_fullscreen.rs | 4 | ||||
| -rw-r--r-- | src/tests/mod.rs | 8 | ||||
| -rw-r--r-- | src/tests/utils.rs | 7 | ||||
| -rw-r--r-- | zellij-client/Cargo.toml | 22 | ||||
| -rw-r--r-- | zellij-client/src/command_is_executing.rs (renamed from src/common/command_is_executing.rs) | 2 | ||||
| -rw-r--r-- | zellij-client/src/input_handler.rs (renamed from src/common/input/handler.rs) | 100 | ||||
| -rw-r--r-- | zellij-client/src/lib.rs (renamed from src/client/mod.rs) | 63 | ||||
| -rw-r--r-- | zellij-client/src/os_input_output.rs | 188 | ||||
| -rw-r--r-- | zellij-server/Cargo.toml | 37 | ||||
| -rw-r--r-- | zellij-server/src/lib.rs (renamed from src/server/mod.rs) | 87 | ||||
| -rw-r--r-- | zellij-server/src/os_input_output.rs (renamed from src/common/os_input_output.rs) | 198 | ||||
| -rw-r--r-- | zellij-server/src/panes/grid.rs (renamed from src/client/panes/grid.rs) | 180 | ||||
| -rw-r--r-- | zellij-server/src/panes/mod.rs (renamed from src/client/panes/mod.rs) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/plugin_pane.rs (renamed from src/client/panes/plugin_pane.rs) | 6 | ||||
| -rw-r--r-- | zellij-server/src/panes/terminal_character.rs (renamed from src/client/panes/terminal_character.rs) | 14 | ||||
| -rw-r--r-- | zellij-server/src/panes/terminal_pane.rs (renamed from src/client/panes/terminal_pane.rs) | 45 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/grid_tests.rs (renamed from src/client/panes/unit/grid_tests.rs) | 67 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__csi_b.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__csi_b.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__csi_capital_i.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__csi_capital_i.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__csi_capital_z.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__csi_capital_z.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__terminal_reports.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__terminal_reports.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_0.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest1_0.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_1.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest1_1.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_2.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest1_2.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_3.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest1_3.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_4.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest1_4.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest1_5.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest1_5.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_0.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_0.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_1.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_1.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_10.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_10.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_11.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_11.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_12.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_12.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_13.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_13.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_14.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_14.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_2.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_2.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_3.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_3.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_4.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_4.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_5.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_5.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_6.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_6.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_7.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_7.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_8.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_8.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest2_9.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest2_9.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest3_0.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest3_0.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest8_0.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest8_0.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest8_1.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest8_1.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest8_2.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest8_2.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest8_3.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest8_3.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest8_4.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest8_4.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/unit/snapshots/zellij_server__panes__grid__grid_tests__vttest8_5.snap (renamed from src/client/panes/unit/snapshots/zellij__client__panes__grid__grid_tests__vttest8_5.snap) | 2 | ||||
| -rw-r--r-- | zellij-server/src/pty.rs (renamed from src/common/pty.rs) | 44 | ||||
| -rw-r--r-- | zellij-server/src/route.rs (renamed from src/server/route.rs) | 30 | ||||
| -rw-r--r-- | zellij-server/src/screen.rs (renamed from src/common/screen.rs) | 107 | ||||
| -rw-r--r-- | zellij-server/src/tab.rs (renamed from src/client/tab.rs) | 43 | ||||
| -rw-r--r-- | zellij-server/src/thread_bus.rs | 80 | ||||
| -rw-r--r-- |