From 88a480c9388d698f123bf892f33197d7bd1cfb9b Mon Sep 17 00:00:00 2001 From: NRK Date: Wed, 17 Aug 2022 20:54:14 +0600 Subject: allow disabling anti-aliasing via cli flag simply running nsxiv with `--anti-alias` will enable anti-aliasing, and running it with `--anti-alias=no` will disable it. the cli flag will overwrite the config.h default. Closes: https://codeberg.org/nsxiv/nsxiv/issues/349 --- options.c | 61 +++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 24 deletions(-) (limited to 'options.c') diff --git a/options.c b/options.c index 812a01a..bf9bb99 100644 --- a/options.c +++ b/options.c @@ -19,8 +19,11 @@ #include "nsxiv.h" #include "version.h" +#define INCLUDE_OPTIONS_CONFIG +#include "config.h" #include +#include #include #include #include @@ -63,31 +66,35 @@ static void print_version(void) void parse_options(int argc, char **argv) { + enum { /* ensure these can't be represented in a single byte */ + OPT_AA = UCHAR_MAX + 1 + }; static const struct optparse_long longopts[] = { - { "framerate", 'A', OPTPARSE_REQUIRED }, - { "animate", 'a', OPTPARSE_NONE }, - { "no-bar", 'b', OPTPARSE_NONE }, - { "clean-cache", 'c', OPTPARSE_NONE }, - { "embed", 'e', OPTPARSE_REQUIRED }, - { "fullscreen", 'f', OPTPARSE_NONE }, - { "gamma", 'G', OPTPARSE_REQUIRED }, - { "geometry", 'g', OPTPARSE_REQUIRED }, - { "help", 'h', OPTPARSE_NONE }, - { "stdin", 'i', OPTPARSE_NONE }, - { "class", 'N', OPTPARSE_REQUIRED }, - { "start-at", 'n', OPTPARSE_REQUIRED }, - { "stdout", 'o', OPTPARSE_NONE }, - { "private", 'p', OPTPARSE_NONE }, - { "quiet", 'q', OPTPARSE_NONE }, - { "recursive", 'r', OPTPARSE_NONE }, - { "ss-delay", 'S', OPTPARSE_REQUIRED }, - { "scale-mode", 's', OPTPARSE_REQUIRED }, - { NULL, 'T', OPTPARSE_REQUIRED }, - { "thumbnail", 't', OPTPARSE_NONE }, - { "version", 'v', OPTPARSE_NONE }, - { "zoom-100", 'Z', OPTPARSE_NONE }, - { "zoom", 'z', OPTPARSE_REQUIRED }, - { "null", '0', OPTPARSE_NONE }, + { "framerate", 'A', OPTPARSE_REQUIRED }, + { "animate", 'a', OPTPARSE_NONE }, + { "no-bar", 'b', OPTPARSE_NONE }, + { "clean-cache", 'c', OPTPARSE_NONE }, + { "embed", 'e', OPTPARSE_REQUIRED }, + { "fullscreen", 'f', OPTPARSE_NONE }, + { "gamma", 'G', OPTPARSE_REQUIRED }, + { "geometry", 'g', OPTPARSE_REQUIRED }, + { "help", 'h', OPTPARSE_NONE }, + { "stdin", 'i', OPTPARSE_NONE }, + { "class", 'N', OPTPARSE_REQUIRED }, + { "start-at", 'n', OPTPARSE_REQUIRED }, + { "stdout", 'o', OPTPARSE_NONE }, + { "private", 'p', OPTPARSE_NONE }, + { "quiet", 'q', OPTPARSE_NONE }, + { "recursive", 'r', OPTPARSE_NONE }, + { "ss-delay", 'S', OPTPARSE_REQUIRED }, + { "scale-mode", 's', OPTPARSE_REQUIRED }, + { NULL, 'T', OPTPARSE_REQUIRED }, + { "thumbnail", 't', OPTPARSE_NONE }, + { "version", 'v', OPTPARSE_NONE }, + { "zoom-100", 'Z', OPTPARSE_NONE }, + { "zoom", 'z', OPTPARSE_REQUIRED }, + { "null", '0', OPTPARSE_NONE }, + { "anti-alias", OPT_AA, OPTPARSE_OPTIONAL }, { 0 }, /* end */ }; @@ -106,6 +113,7 @@ void parse_options(int argc, char **argv) _options.scalemode = SCALE_DOWN; _options.zoom = 1.0; + _options.aa = ANTI_ALIAS; _options.animate = false; _options.gamma = 0; _options.slideshow = 0; @@ -233,6 +241,11 @@ void parse_options(int argc, char **argv) case '0': _options.using_null = true; break; + case OPT_AA: + if (op.optarg != NULL && !STREQ(op.optarg, "no")) + error(EXIT_FAILURE, 0, "Invalid argument for option --anti-alias: %s", op.optarg); + _options.aa = op.optarg == NULL; + break; } } -- cgit v1.2.3-54-g00ecf