main: geometry defaults to 800x600 pixels

This commit is contained in:
Daniel Eklöf 2020-02-25 19:05:48 +01:00
parent 551170d940
commit ac32bcda07
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 5 additions and 12 deletions

View file

@ -6,7 +6,7 @@ _arguments \
'(-f --font)'{-f,--font}'[font name and style in fontconfig format (monospace)]:font:->fonts' \
'(-t --term)'{-t,--term}'[value to set the environment variable TERM to (foot)]:term:->terms' \
'--login-shell[start shell as a login shell]' \
'(-g --geometry)'{-g,--geometry}'[window WIDTHxHEIGHT, in pixels (80x24 cells)]:geometry:()' \
'(-g --geometry)'{-g,--geometry}'[window WIDTHxHEIGHT, in pixels (800x600)]:geometry:()' \
'(-s --server)'{-s,--server}'[run as server; open terminals by running footclient]:server:_files' \
'--hold[remain open after child process exits]' \
'(-p --print-pid)'{-p,--print-pid}'[print PID to this file or FD when up and running (server mode only)]:pidfile:_files' \

View file

@ -491,8 +491,8 @@ config_load(struct config *conf, const char *conf_path)
*conf = (struct config) {
.term = strdup("foot"),
.shell = get_shell(),
.width = -1,
.height = -1,
.width = 800,
.height = 600,
.pad_x = 2,
.pad_y = 2,
.fonts = tll_init(),

View file

@ -31,7 +31,7 @@ execute (instead of the shell).
Default: _monospace_.
*-g*,*--geometry*=_WIDTHxHEIGHT_
Set initial window width and height.
Set initial window width and height. Default: *800x600*.
*-t*,*--term*=_TERM_
Value to set the environment variable *TERM* to. Default: *foot*.

2
footrc
View file

@ -2,7 +2,7 @@
# font=monospace
# scrollback=1000
# geometry=500x300
# geometry=800x600
# pad=2x2
# shell=<user's default shell (from /etc/passwd)> (you may need to override if you need a login shell)
# term=foot

View file

@ -791,13 +791,6 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
unsigned width = conf->width;
unsigned height = conf->height;
if (width == -1) {
/* No user-configuration - use 80x24 cells */
assert(height == -1);
width = 80 * term->cell_width;
height = 24 * term->cell_height;
}
/* Don't go below a single cell */
width = max(width, term->cell_width);
height = max(height, term->cell_height);