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

Merge branch 'eflag'

Browse source 
Closes #184
Closes #257
Closes #313
Closes #596
Closes #625
Closes #716
This commit is contained in:
Daniel Eklöf 2021-09-19 11:26:22 +02:00
commit 16ddb2e292
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -41,6 +41,9 @@
(https://codeberg.org/dnkl/foot/issues/701).
* Braille characters (U+2800 - U+28FF) are now rendered by foot
itself (https://codeberg.org/dnkl/foot/issues/702).
* `-e` command-line option. This option is simply ignored, to appease
program launchers that blindly pass `-e` to any terminal emulator
(https://codeberg.org/dnkl/foot/issues/184).
### Changed
@ -67,6 +70,8 @@
### Security
### Contributors
* [craigbarnes](https://codeberg.org/craigbarnes)
## 1.9.0

8
client.c
View file

@ -71,7 +71,8 @@ print_usage(const char *prog_name)
" -o,--override=[section.]key=value override configuration option\n"
" -d,--log-level={info|warning|error|none} log level (info)\n"
" -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n"
" -v,--version show the version number and quit\n";
" -v,--version show the version number and quit\n"
" -e ignored (for compatibility with xterm -e)\n";
printf("Usage: %s [OPTIONS...]\n", prog_name);
printf("Usage: %s [OPTIONS...] command [ARGS...]\n", prog_name);
@ -145,7 +146,7 @@ main(int argc, char *const *argv)
struct client_string *cargv = NULL;
while (true) {
int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLD:s:HNo:d:l::vh", longopts, NULL);
int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLD:s:HNo:d:l::veh", longopts, NULL);
if (c == -1)
break;
@ -273,6 +274,9 @@ main(int argc, char *const *argv)
ret = EXIT_SUCCESS;
goto err;
case 'e':
break;
case '?':
goto err;
}

10
doc/foot.1.scd
View file

@ -141,6 +141,16 @@ the foot command line
*-v*,*--version*
Show the version number and quit.
*-e*
Ignored; for compatibility with *xterm -e*.
This option was added in response to several program launchers
passing *-e* to arbitrary terminals, under the assumption that
they all implement the same semantics for it as *xterm*(1).
Ignoring it allows foot to be invoked as e.g. *foot -e man foot*
with the same results as with xterm, instead of producing an
"invalid option" error.
# EXIT STATUS
Foot will exit with code 230 if there is a failure in foot itself.

4
doc/footclient.1.scd
View file

@ -79,6 +79,10 @@ terminal has terminated.
*-v*,*--version*
Show the version number and quit
*-e*
Ignored; for compatibility with *xterm -e*. See *foot*(1) for more
details.
# EXIT STATUS
Footlient will exit with code 220 if there is a failure in footclient

8
main.c
View file

@ -78,7 +78,8 @@ print_usage(const char *prog_name)
" -d,--log-level={info|warning|error|none} log level (info)\n"
" -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n"
" -s,--log-no-syslog disable syslog logging (only applicable in server mode)\n"
" -v,--version show the version number and quit\n";
" -v,--version show the version number and quit\n"
" -e ignored (for compatibility with xterm -e)\n";
printf("Usage: %s [OPTIONS...]\n", prog_name);
printf("Usage: %s [OPTIONS...] command [ARGS...]\n", prog_name);
@ -216,7 +217,7 @@ main(int argc, char *const *argv)
config_override_t overrides = tll_init();
while (true) {
int c = getopt_long(argc, argv, "+c:Co:t:T:a:LD:f:w:W:s::HmFPp:d:l::Svh", longopts, NULL);
int c = getopt_long(argc, argv, "+c:Co:t:T:a:LD:f:w:W:s::HmFPp:d:l::Sveh", longopts, NULL);
if (c == -1)
break;
@ -375,6 +376,9 @@ main(int argc, char *const *argv)
print_usage(prog_name);
return EXIT_SUCCESS;
case 'e':
break;
case '?':
return ret;
}