From 0b1af11da950e15ef27468507e2c4fbccfdb62a6 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 29 Jan 2025 02:55:37 -0800
Subject: [PATCH] Use double-hyphen style for command line arguments
---
.github/workflows/main.yml | 2 +-
examples/glfont.c | 8 ++++----
examples/showfont.c | 34 +++++++++++++++++-----------------
examples/testgputext.c | 4 ++--
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 21c5fad3..d356f04e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -112,7 +112,7 @@ jobs:
if: ${{ runner.os == 'Linux' }}
run: |
# Just check that it doesn't crash, we can't really test the results...
- env -C build/ SDL_VIDEODRIVER=dummy ./showfont -dump /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
+ env -C build/ SDL_VIDEODRIVER=dummy ./showfont --dump /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
# ... but we can at least assert that it outputs a .bmp
file build/glyph-100.bmp
diff --git a/examples/glfont.c b/examples/glfont.c
index 24703e1b..8b7ec1fc 100644
--- a/examples/glfont.c
+++ b/examples/glfont.c
@@ -42,7 +42,7 @@
#define HEIGHT 480
#define TTF_GLFONT_USAGE \
-"Usage: %s [-b] [-i] [-u] [-fgcol r,g,b] [-bgcol r,g,b] \
+"Usage: %s [-b] [-i] [-u] [--fgcol r,g,b] [--bgcol r,g,b] \
<font>.ttf [ptsize] [text]\n"
static void SDL_GL_Enter2DMode(int width, int height)
@@ -217,10 +217,10 @@ int main(int argc, char *argv[])
if (SDL_strcmp(argv[i], "-u") == 0) {
renderstyle |= TTF_STYLE_UNDERLINE;
} else
- if (SDL_strcmp(argv[i], "-dump") == 0) {
+ if (SDL_strcmp(argv[i], "--dump") == 0) {
dump = 1;
} else
- if (SDL_strcmp(argv[i], "-fgcol") == 0) {
+ if (SDL_strcmp(argv[i], "--fgcol") == 0) {
int r, g, b;
if (sscanf (argv[++i], "%d,%d,%d", &r, &g, &b) != 3) {
fprintf(stderr, TTF_GLFONT_USAGE, argv0);
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
forecol->g = (Uint8)g;
forecol->b = (Uint8)b;
} else
- if (SDL_strcmp(argv[i], "-bgcol") == 0) {
+ if (SDL_strcmp(argv[i], "--bgcol") == 0) {
int r, g, b;
if (sscanf (argv[++i], "%d,%d,%d", &r, &g, &b) != 3) {
fprintf(stderr, TTF_GLFONT_USAGE, argv0);
diff --git a/examples/showfont.c b/examples/showfont.c
index c1b36b93..f1501ed9 100644
--- a/examples/showfont.c
+++ b/examples/showfont.c
@@ -47,7 +47,7 @@
#define TTF_SHOWFONT_USAGE \
-"Usage: %s [-textengine surface|renderer] [-solid] [-shaded] [-blended] [-b] [-i] [-u] [-s] [-outline size] [-hintlight|-hintmono|-hintnone] [-nokerning] [-wrap] [-align left|center|right] [-fgcol r,g,b,a] [-bgcol r,g,b,a] [-disable-editbox] [-fallback <font>.ttf>] <font>.ttf [ptsize] [text]\n"
+"Usage: %s [--textengine surface|renderer] [--solid] [--shaded] [--blended] [-b] [-i] [-u] [-s] [--outline size] [--hintlight|--hintmono|--hintnone] [--nokerning] [--wrap] [--align left|center|right] [--fgcol r,g,b,a] [--bgcol r,g,b,a] [--disable-editbox] [--fallback <font>.ttf>] <font>.ttf [ptsize] [text]\n"
typedef enum
{
@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
forecol = &black;
backcol = &white;
for (i=1; argv[i] && argv[i][0] == '-'; ++i) {
- if (SDL_strcmp(argv[i], "-fallback") == 0 && argv[i+1]) {
+ if (SDL_strcmp(argv[i], "--fallback") == 0 && argv[i+1]) {
++i;
if (num_fallbacks < MAX_FALLBACKS) {
fallback_font_files[num_fallbacks++] = argv[i];
@@ -317,7 +317,7 @@ int main(int argc, char *argv[])
return(1);
}
} else
- if (SDL_strcmp(argv[i], "-textengine") == 0 && argv[i+1]) {
+ if (SDL_strcmp(argv[i], "--textengine") == 0 && argv[i+1]) {
++i;
if (SDL_strcmp(argv[i], "surface") == 0) {
scene.textEngine = TextEngineSurface;
@@ -328,13 +328,13 @@ int main(int argc, char *argv[])
return(1);
}
} else
- if (SDL_strcmp(argv[i], "-solid") == 0) {
+ if (SDL_strcmp(argv[i], "--solid") == 0) {
rendermethod = TextRenderSolid;
} else
- if (SDL_strcmp(argv[i], "-shaded") == 0) {
+ if (SDL_strcmp(argv[i], "--shaded") == 0) {
rendermethod = TextRenderShaded;
} else
- if (SDL_strcmp(argv[i], "-blended") == 0) {
+ if (SDL_strcmp(argv[i], "--blended") == 0) {
rendermethod = TextRenderBlended;
} else
if (SDL_strcmp(argv[i], "-b") == 0) {
@@ -349,28 +349,28 @@ int main(int argc, char *argv[])
if (SDL_strcmp(argv[i], "-s") == 0) {
renderstyle |= TTF_STYLE_STRIKETHROUGH;
} else
- if (SDL_strcmp(argv[i], "-outline") == 0 && argv[i+1]) {
+ if (SDL_strcmp(argv[i], "--outline") == 0 && argv[i+1]) {
if (SDL_sscanf(argv[++i], "%d", &outline) != 1) {
SDL_Log(TTF_SHOWFONT_USAGE, argv0);
return(1);
}
} else
- if (SDL_strcmp(argv[i], "-hintlight") == 0) {
+ if (SDL_strcmp(argv[i], "--hintlight") == 0) {
hinting = TTF_HINTING_LIGHT;
} else
- if (SDL_strcmp(argv[i], "-hintmono") == 0) {
+ if (SDL_strcmp(argv[i], "--hintmono") == 0) {
hinting = TTF_HINTING_MONO;
} else
- if (SDL_strcmp(argv[i], "-hintnone") == 0) {
+ if (SDL_strcmp(argv[i], "--hintnone") == 0) {
hinting = TTF_HINTING_NONE;
} else
- if (SDL_strcmp(argv[i], "-nokerning") == 0) {
+ if (SDL_strcmp(argv[i], "--nokerning") == 0) {
kerning = 0;
} else
- if (SDL_strcmp(argv[i], "-wrap") == 0) {
+ if (SDL_strcmp(argv[i], "--wrap") == 0) {
wrap = true;
} else
- if (SDL_strcmp(argv[i], "-align") == 0 && argv[i+1]) {
+ if (SDL_strcmp(argv[i], "--align") == 0 && argv[i+1]) {
++i;
if (SDL_strcmp(argv[i], "left") == 0) {
align = TTF_HORIZONTAL_ALIGN_LEFT;
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
return (1);
}
} else
- if (SDL_strcmp(argv[i], "-fgcol") == 0 && argv[i+1]) {
+ if (SDL_strcmp(argv[i], "--fgcol") == 0 && argv[i+1]) {
int r, g, b, a = SDL_ALPHA_OPAQUE;
if (SDL_sscanf(argv[++i], "%d,%d,%d,%d", &r, &g, &b, &a) < 3) {
SDL_Log(TTF_SHOWFONT_USAGE, argv0);
@@ -394,7 +394,7 @@ int main(int argc, char *argv[])
forecol->b = (Uint8)b;
forecol->a = (Uint8)a;
} else
- if (SDL_strcmp(argv[i], "-bgcol") == 0 && argv[i+1]) {
+ if (SDL_strcmp(argv[i], "--bgcol") == 0 && argv[i+1]) {
int r, g, b, a = SDL_ALPHA_OPAQUE;
if (SDL_sscanf(argv[++i], "%d,%d,%d,%d", &r, &g, &b, &a) < 3) {
SDL_Log(TTF_SHOWFONT_USAGE, argv0);
@@ -405,10 +405,10 @@ int main(int argc, char *argv[])
backcol->b = (Uint8)b;
backcol->a = (Uint8)a;
} else
- if (SDL_strcmp(argv[i], "-disable-editbox") == 0) {
+ if (SDL_strcmp(argv[i], "--disable-editbox") == 0) {
editbox = false;
} else
- if (SDL_strcmp(argv[i], "-dump") == 0) {
+ if (SDL_strcmp(argv[i], "--dump") == 0) {
dump = true;
} else {
SDL_Log(TTF_SHOWFONT_USAGE, argv0);
diff --git a/examples/testgputext.c b/examples/testgputext.c
index 5a663e79..15a47018 100644
--- a/examples/testgputext.c
+++ b/examples/testgputext.c
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
(void)argc;
for (int i = 1; argv[i]; ++i) {
- if (SDL_strcasecmp(argv[i], "-sdf") == 0) {
+ if (SDL_strcasecmp(argv[i], "--sdf") == 0) {
use_SDF = true;
} else if (*argv[i] == '-') {
break;
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
}
}
if (!font_filename) {
- SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Usage: testgputext [-sdf] FONT_FILENAME");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Usage: testgputext [--sdf] FONT_FILENAME");
return 2;
}