Merge branch 'main' into viewport-clamp

This commit is contained in:
Alexis Maiquez 2023-12-12 00:57:51 +01:00 committed by GitHub
commit 13ba153042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,6 +3,7 @@
#include "Steam/FileSystem/FileSystem.h" #include "Steam/FileSystem/FileSystem.h"
#include "WallpaperEngine/Logging/CLog.h" #include "WallpaperEngine/Logging/CLog.h"
#include <cstdlib>
#include <cstring> #include <cstring>
#include <getopt.h> #include <getopt.h>
@ -190,6 +191,7 @@ CApplicationContext::CApplicationContext (int argc, char* argv[])
case 'h': case 'h':
printHelp (argv[0]); printHelp (argv[0]);
std::exit(0);
break; break;
case 'f': case 'f':
@ -268,6 +270,7 @@ CApplicationContext::CApplicationContext (int argc, char* argv[])
else else
{ {
printHelp (argv[0]); printHelp (argv[0]);
std::exit(0);
} }
} }
@ -353,4 +356,4 @@ void CApplicationContext::printHelp (const char* route)
\t\t For default wallpaper last specified value will be used.\n\ \t\t For default wallpaper last specified value will be used.\n\
\t\t Example: ./wallengine --scaling stretch --screen-root eDP-1 --bg 2667198601 --scaling fill --screen-root eDP-2 2667198602"); \t\t Example: ./wallengine --scaling stretch --screen-root eDP-1 --bg 2667198601 --scaling fill --screen-root eDP-2 2667198602");
sLog.out ("\t--clamping <mode>\t Clamping mode for all wallpapers. Can be clamp, border, repeat. Enables GL_CLAMP_TO_EDGE, GL_CLAMP_TO_BORDER, GL_REPEAT accordingly. Default is clamp."); sLog.out ("\t--clamping <mode>\t Clamping mode for all wallpapers. Can be clamp, border, repeat. Enables GL_CLAMP_TO_EDGE, GL_CLAMP_TO_BORDER, GL_REPEAT accordingly. Default is clamp.");
} }