zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-12-21 08:11:40 +03:00
Code Issues Projects Releases Wiki Activity
906 Commits 284 Branches 65 Tags 149 MiB
cb3072066d
Commit Graph

906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
denis
ce1f81bcec chore: remove unused dependency from zellij-tile 2021-05-02 13:04:12 +03:00
denis
56cf446275 chore: added zellij-tile-extra, moved macros from zellij-tile 2021-05-02 12:57:48 +03:00
denis
d48cc81536 fix: don't have new on ColoredElements anymore, removed default for palette in zellij-tile 2021-05-02 12:25:49 +03:00
denis
452940fb65 Merge branch 'main' into x-colors 2021-05-02 11:59:20 +03:00
a-kenji
099861ff5b docs(changelog): Improved Config Loading #423 2021-05-02 00:19:14 +02:00
a-kenji
e9eccc13e7
Merge pull request #423 from yykamei/load-config-before-start 
Load config before start()
 2021-05-02 00:14:47 +02:00
Yutaka Kamei
168deabea7
Load config before start() 
Previously, a config file was loaded within `start()`, and if the config
file is invalid, Zellij was supposed to show a user what's wrong with
it. However, since `start()` starts setting up its terminal with an
alternative screen buffer, neither standard output nor standard error
could display such an error.

This change intends to address this issue by making Zellij load a config
file before `start()`.

In addition, the patch also includes some refactorings:

* Redefine `from_cli_config` with `TryFrom`, which was introduced in
  Rust 1.34
* Remove conditional declaration `cfg(not(test))` because `start()` now
  receive a `Config` as the third argument
* Introduce [`tempfile`](https://crates.io/crates/tempfile) in order to
  run tests with actual files
* Typo?: "Deserialisation" -> "Deserialization"
 2021-05-02 06:18:40 +09:00
Kyle Sutherland-Cash
69d34c3e09 Don't commit to master like an idiot... :( 2021-05-01 09:32:30 -07:00
Kyle Sutherland-Cash
2eadcb86a5 Bit of renaming 2021-05-01 09:22:21 -07:00
Kyle Sutherland-Cash
e7d8aefa79 Simplify some names and start using Bus in the plugin thread 2021-05-01 09:11:22 -07:00
Kyle Sutherland-Cash
bb2369dcb8 Use Bus type for PTY thread (incomplete) 2021-05-01 08:48:58 -07:00
Kyle Sutherland-Cash
ae6192d698 Use Bus type for screen thread 2021-05-01 08:26:57 -07:00
Kyle Sutherland-Cash
f01887463f Define shared bus type 2021-05-01 08:26:31 -07:00
denis
61bb74ebbd chore: clippy please allow it 2021-05-01 15:10:21 +03:00
denis
0adc914352 fix: hello formatter my old friend... 2021-05-01 14:48:13 +03:00
denis
f85822972a chore: cleanup, fix: the tests finally pass 2021-05-01 14:44:43 +03:00
denis
eabecde90b chore: painless merge this time 2021-05-01 13:45:01 +03:00
Aram Drevekenin
325fc5620f
docs(changelog): performance improvements 2021-04-30 16:02:31 +02:00
Horasal
454ad0ed19
Enable should_render (fix pane render) (#318) 
* fix pane render when switch/resize tab

* render when reflow_lines

* back to always render because widechar issue

* fix clippy

* force_render when current grid contains widechar

* bug fix

* pane_contains -> panes_contain

* fix conflict

* fix(terminal): bring back should_render

Co-authored-by: Aram Drevekenin <aram@poor.dev>
 2021-04-30 16:01:15 +02:00
a-kenji
b5d38e95c8
Merge pull request #407 from a-kenji/default-layout 
Fix Startup with Default in Same Folder
 2021-04-29 18:09:14 +02:00
a-kenji
153119de02 Fix Startup with Default in Same Folder 
Doesn't try loading `default` files, other than
the plugin directory by default anymore.
 2021-04-29 18:00:55 +02:00
Brooks J Rady
72650a6491 fix(ci): name assets consistently 2021-04-29 16:26:46 +01:00
Brooks J Rady
964bc7b7f3 fix(style): fix up some unneeded .as_mut() and if let 2021-04-29 16:15:37 +01:00
Brooks J Rady
349758fd10 fix(build): just kidding, binary assets still need to be in git 2021-04-29 16:07:02 +01:00
Brooks Rady
94779057d0
chore(changelog): fix the tab '(Sync)' suffix in named tabs 2021-04-29 16:00:10 +01:00
Brooks Rady
20649643de
fix(ui): fix the tab '(Sync)' suffix 2021-04-29 15:56:15 +01:00
Brooks J Rady
65f15457c1 fix(build): don't store binary assets in git 2021-04-29 15:53:10 +01:00
Aram Drevekenin
28af9f077d chore(version): boost development version to 0.7.0 and update changelog 2021-04-29 16:50:48 +02:00
Dante Pippi
2a3debc1c7 Style fix 2021-04-29 11:11:55 -03:00
Dante Pippi
c958fc67eb Fix Tab (Sync) suffix 2021-04-29 10:53:13 -03:00
Aram Drevekenin
a7363d410f
docs(changelog): fix formatting 2021-04-29 15:26:44 +02:00
Aram Drevekenin
b04c4f3e22
docs(changelog): pass vttest 1 2021-04-29 15:26:25 +02:00
Aram Drevekenin
cedd830a2e
Terminal: pass vttest 1 (#408) 
* fix(compatibility): pass vttest 1

* fix(tests): move unit tests to a separate file

* style(fmt): rustfmt

* fix(grid): correct comment

* style(fmt): rustfmt
 2021-04-29 15:25:08 +02:00
Brooks Rady
03be8e309e
chore(changelog): added the ability to synchronize input sent to panes 2021-04-28 16:28:39 +01:00
Brooks Rady
3c431ee625
feat(ui): add the ability to synchronize input sent to panes 2021-04-28 16:27:06 +01:00
Dante Pippi
f6df6e9dc8 Defining sync keybind using default.yaml 2021-04-28 11:41:48 -03:00
Dante Pippi
62662464e3 Including text on tab name to let users know sync is on. 2021-04-28 11:16:06 -03:00
Dante Pippi
6769627c36 cargo fmt 2021-04-28 11:16:06 -03:00
Dante Pippi
1a84c5f4ec New feature: Synchronize text sent to panes 2021-04-28 11:15:58 -03:00
a-kenji
fe1f0ba3c4 docs(changelog): Screen Config File (#399) 2021-04-28 15:05:39 +02:00
a-kenji
637ae07689
Merge pull request #399 from SaintFenix/main 
Added Screen Config File: screen-overview.yaml and screen.nonfunctional,
 2021-04-28 15:02:48 +02:00
fenix
fd4997a686 Minor Visibility problem fixed: 2021-04-28 05:27:10 -07:00
a-kenji
acc0983a3f docs(changelog): Keybind Improvement(#400) 2021-04-28 08:01:54 +02:00
a-kenji
9e71288b84
Merge pull request #400 from yykamei/refer-to-keybinds-within-a-function 
refactor(handler): refer to self.config.keybinds internally
 2021-04-28 07:36:49 +02:00
Yutaka Kamei
82c5f505f1 refactor(handler): refer to self.config.keybinds internally 
Because `handle_key` can refer to `self.config.keybinds` by itself, it
doesn't have to receive the third argument. Also, this change may
slightly improve the performance as it deletes `clone()`.
 2021-04-28 14:14:27 +09:00
fenix
72890b966e Merge remote-tracking branch 'origin/main' into main 2021-04-27 20:01:53 -07:00
fenix
2ba7fc312c Added Screen-overview.yaml & Screen.nonfunctional.txt 
Added Screen Equivalents for the Tmux.yaml files in the same format.
 2021-04-27 20:01:17 -07:00
a-kenji
f172a01dac
Merge pull request #391 from a-kenji/config-loading 
Load Config from Assets
 2021-04-27 22:58:19 +02:00
a-kenji
55d2a4cea9 Merge branch 'main' of https://github.com/zellij-org/zellij into config-loading 2021-04-27 21:40:13 +02:00
a-kenji
77e0b5e0d7 Config Loading 
* Configuration is now handled in this order:
 --config flag
 ZELLIJ_CONFIG_FILE env
 get_default_config_dir() (directories-next)
 HOME/.config/zellij (for mac convenience)
 SYSTEM_DEFAULT_CONFIG_DIR (for distributions to specify sensible
 defaults ontop of zellij)
 from assets

* Fix default.yaml file

* Move default.yaml file to assets directory
 2021-04-27 21:38:26 +02:00