mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-10 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: remove deprecated "--geometry" option

Browse source 
Closes #287
This commit is contained in:
Craig Barnes 2021-01-13 19:59:54 +00:00
parent c009150ec0
commit 0791fba9c7
3 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -51,6 +51,11 @@
### Deprecated ### Deprecated
### Removed ### Removed
* The `-g,--geometry` command-line option (which had been deprecated and
superceded by `-w,--window-size-pixels` since 1.5.0).
### Fixed ### Fixed
* Exit when the client application terminates, not when the TTY file * Exit when the client application terminates, not when the TTY file

3
doc/foot.1.scd
View file

@ -51,9 +51,6 @@ the foot command line
*-W*,*--window-size-chars*=_WIDTHxHEIGHT_ *-W*,*--window-size-chars*=_WIDTHxHEIGHT_
Set initial window width and height, in characters. Default: _not set_. Set initial window width and height, in characters. Default: _not set_.
*-g*,*--geometry*=_WIDTHxHEIGHT_
Deprecated. Alias for *-w*,*--window-size-pixels*.
*-t*,*--term*=_TERM_ *-t*,*--term*=_TERM_
Value to set the environment variable *TERM* to. Default: _foot_. Value to set the environment variable *TERM* to. Default: _foot_.

18
main.c
View file

@ -66,8 +66,8 @@ print_usage(const char *prog_name)
" --maximized start in maximized mode\n" " --maximized start in maximized mode\n"
" --fullscreen start in fullscreen mode\n" " --fullscreen start in fullscreen mode\n"
" --login-shell start shell as a login shell\n" " --login-shell start shell as a login shell\n"
" -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels (alternative to '--dimensions')\n" " -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels\n"
" -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters (alternative to '--geometry')\n" " -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters\n"
" -s,--server[=PATH] run as a server (use 'footclient' to start terminals).\n" " -s,--server[=PATH] run as a server (use 'footclient' to start terminals).\n"
" Without PATH, $XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock will be used.\n" " Without PATH, $XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock will be used.\n"
" --hold remain open after child process exits\n" " --hold remain open after child process exits\n"
@ -162,7 +162,6 @@ main(int argc, char *const *argv)
{"app-id", required_argument, NULL, 'a'}, {"app-id", required_argument, NULL, 'a'},
{"login-shell", no_argument, NULL, 'L'}, {"login-shell", no_argument, NULL, 'L'},
{"font", required_argument, NULL, 'f'}, {"font", required_argument, NULL, 'f'},
{"geometry", required_argument, NULL, 'g'}, /* Deprecated */
{"window-size-pixels", required_argument, NULL, 'w'}, {"window-size-pixels", required_argument, NULL, 'w'},
{"window-size-chars", required_argument, NULL, 'W'}, {"window-size-chars", required_argument, NULL, 'W'},
{"server", optional_argument, NULL, 's'}, {"server", optional_argument, NULL, 's'},
@ -201,7 +200,7 @@ main(int argc, char *const *argv)
user_notifications_t user_notifications = tll_init(); user_notifications_t user_notifications = tll_init();
while (true) { while (true) {
int c = getopt_long(argc, argv, "+c:Ct:T:a:Lf:g:w:W:s::HmFPp:l::Svh", longopts, NULL); int c = getopt_long(argc, argv, "+c:Ct:T:a:Lf:w:W:s::HmFPp:l::Svh", longopts, NULL);
if (c == -1) if (c == -1)
break; break;
@ -252,17 +251,6 @@ main(int argc, char *const *argv)
} }
break; break;
case 'g': {
LOG_WARN("deprecated: -g,--geometry command line option. Use -w,--window-size-pixels instead");
struct user_notification deprecation = {
.kind = USER_NOTIFICATION_DEPRECATED,
.text = xstrdup(
"\033[1m-g,--geometry\033[21m command line option. "
"Use \033[1m-w,--window-size-pixels\033[21m instead"),
};
tll_push_back(user_notifications, deprecation);
/* FALLTHROUGH */
}
case 'w': { case 'w': {
unsigned width, height; unsigned width, height;
if (sscanf(optarg, "%ux%u", &width, &height) != 2 || width == 0 || height == 0) { if (sscanf(optarg, "%ux%u", &width, &height) != 2 || width == 0 || height == 0) {