From: Colin Clark Date: Sat, 13 Apr 2024 17:38:33 +0000 (+0100) Subject: Some command line options are not GNU/POSIX compliant X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=fc81685858baf853a93fae8ef23e123b94f2c1d2 Some command line options are not GNU/POSIX compliant The definitions are: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html Colons in an option have been replaced by an equals sign. Multi-character short options have been deleted. The option --cache-render-shared-recurse remains illegal because it exceeds the three--word limit. --- diff --git a/doc/docbook/CommandLineOptions.xml b/doc/docbook/CommandLineOptions.xml index 91286d6c..527779d5 100644 --- a/doc/docbook/CommandLineOptions.xml +++ b/doc/docbook/CommandLineOptions.xml @@ -8,7 +8,7 @@ GEEQIE 1 April 2024 -Geeqie 2.4+git20240402-d802d5f5 GTK3 +Geeqie 2.4+git20240413-2a5c2a89 GTK3 Geeqie @@ -30,7 +30,7 @@ zooming, panning, thumbnails and sorting images into collections. Generated for version: -Geeqie 2.4+git20240402-d802d5f5 +Geeqie 2.4+git20240413-2a5c2a89 Valid options: @@ -81,7 +81,7 @@ zooming, panning, thumbnails and sorting images into collections. - -o:, --log-file:<file> + -o, --log-file=<file> save log data to file @@ -93,7 +93,7 @@ zooming, panning, thumbnails and sorting images into collections. - -rh, --remote-help + --remote-help print remote command list @@ -135,7 +135,7 @@ zooming, panning, thumbnails and sorting images into collections. - -g:, --grep:<regexp> + -g, --grep=<regexp> filter debug output @@ -152,7 +152,7 @@ can be used to modify this behavior on an individual basis e.g. Remote command list: - --action:<ACTION> + --action=<ACTION> execute keyboard action (See Help/Reference/Remote Keyboard Actions) @@ -176,55 +176,55 @@ can be used to modify this behavior on an individual basis e.g. - --config-load:<FILE>|layout ID + --config-load=<FILE>|layout ID load configuration from FILE - -cm --cache-metadata + --cache-metadata clean the metadata cache - -cr: --cache-render:<folder> + --cache-render=<folder> render thumbnails - -crr: --cache-render-recurse:<folder> + --cache-render-recurse=<folder> render thumbnails recursively - -crs: --cache-render-shared:<folder> + --cache-render-shared=<folder> render thumbnails (see Help) - -crsr: --cache-render-shared-recurse:<folder> + --cache-render-shared-recurse=<folder> render thumbnails recursively (see Help) - -cs: --cache-shared:clean|clear + --cache-shared=clean|clear clean or clear shared thumbnail cache - -ct: --cache-thumbs:clean|clear + --cache-thumbs=clean|clear clean or clear thumbnail cache - -d --delay=<[H:][M:][N][.M]> + -d --delay=<[H=][M=][N][.M]> set slide show delay to Hrs Mins N.M seconds @@ -242,25 +242,25 @@ can be used to modify this behavior on an individual basis e.g. - --file:<FILE>|<URL> + --file=<FILE>|<URL> open FILE or URL, bring Geeqie window to the top - --File:<FILE>|<URL> + --File=<FILE>|<URL> open FILE or URL, do not bring Geeqie window to the top - -fs --fullscreen-start + --fullscreen-start start full screen - -fS --fullscreen-stop + --fullscreen-stop stop full screen @@ -272,7 +272,7 @@ can be used to modify this behavior on an individual basis e.g. - --get-collection:<COLLECTION> + --get-collection=<COLLECTION> get collection content @@ -284,7 +284,7 @@ can be used to modify this behavior on an individual basis e.g. - --get-destination:<FILE> + --get-destination=<FILE> get destination path of FILE (See Plugins Configuration) @@ -296,13 +296,13 @@ can be used to modify this behavior on an individual basis e.g. - --get-filelist:[<FOLDER>] + --get-filelist=[<FOLDER>] get list of files and class - --get-filelist-recurse:[<FOLDER>] + --get-filelist-recurse=[<FOLDER>] get list of files and class recursive @@ -326,7 +326,7 @@ can be used to modify this behavior on an individual basis e.g. - --get-sidecars:<FILE> + --get-sidecars=<FILE> get list of sidecars of FILE @@ -338,7 +338,7 @@ can be used to modify this behavior on an individual basis e.g. - --id:<ID> + --id=<ID> window id for following commands @@ -350,7 +350,7 @@ can be used to modify this behavior on an individual basis e.g. - --list-add:<FILE> + --list-add=<FILE> add FILE to command line collection list @@ -362,7 +362,7 @@ can be used to modify this behavior on an individual basis e.g. - --lua:<FILE>,<lua script> + --lua=<FILE>,<lua script> run lua script on FILE @@ -392,7 +392,7 @@ can be used to modify this behavior on an individual basis e.g. - --PWD:<PWD> + --PWD=<PWD> use PWD as working directory for following commands @@ -410,7 +410,7 @@ can be used to modify this behavior on an individual basis e.g. - --selection-add:[<FILE>] + --selection-add=[<FILE>] adds the current file (or the specified file) to the current selection @@ -422,7 +422,7 @@ can be used to modify this behavior on an individual basis e.g. - --selection-remove:[<FILE>] + --selection-remove=[<FILE>] removes the current file (or the specified file) from the current selection @@ -434,19 +434,19 @@ can be used to modify this behavior on an individual basis e.g. - --slideshow-recurse:<FOLDER> + --slideshow-recurse=<FOLDER> start recursive slide show in FOLDER - -ss --slideshow-start + --slideshow-start start slide show - -sS --slideshow-stop + --slideshow-stop stop slide show @@ -470,7 +470,7 @@ can be used to modify this behavior on an individual basis e.g. - --view:<FILE> + --view=<FILE> open FILE in new window diff --git a/geeqie.1 b/geeqie.1 index 071730a1..def25f6e 100644 --- a/geeqie.1 +++ b/geeqie.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GEEQIE "1" "April 2024" "Geeqie 2.4+git20240402-d802d5f5 GTK3" "User Commands" +.TH GEEQIE "1" "April 2024" "Geeqie 2.4+git20240413-2a5c2a89 GTK3" "User Commands" .SH NAME Geeqie - GTK based multiformat image viewer .SH SYNOPSIS @@ -11,7 +11,7 @@ zooming, panning, thumbnails and sorting images into collections. Generated for version: .PP -Geeqie 2.4+git20240402\-d802d5f5 +Geeqie 2.4+git20240413\-2a5c2a89 .SS "Valid options:" .TP \fB\-\-blank\fR @@ -37,13 +37,13 @@ show this message \fB\-n\fR, \fB\-\-new\-instance\fR open a new instance of Geeqie * .TP -\fB\-o\fR:, \fB\-\-log\-file\fR: +\fB\-o\fR, \fB\-\-log\-file=\fR save log data to file .TP \fB\-r\fR, \fB\-\-remote\fR send following commands to open window .TP -\fB\-rh\fR, \fB\-\-remote\-help\fR +\fB\-\-remote\-help\fR print remote command list .TP \fB\-s\fR, \fB\-\-slideshow\fR @@ -64,7 +64,7 @@ show log window \fB\-\-debug\fR[=\fI\,level\/\fR] turn on debug output .TP -\fB\-g\fR:, \fB\-\-grep\fR: +\fB\-g\fR, \fB\-\-grep=\fR filter debug output .PP * Normally a single set of configuration files is used for all instances. @@ -74,7 +74,7 @@ can be used to modify this behavior on an individual basis e.g. XDG_CONFIG_HOME=/tmp/a XDG_CACHE_HOME=/tmp/b geeqie .SS "Remote command list:" .TP -\fB\-\-action\fR: +\fB\-\-action=\fR execute keyboard action (See Help/Reference/Remote Keyboard Actions) .TP \fB\-\-action\-list\fR @@ -86,31 +86,31 @@ previous image \fB\-\-close\-window\fR close window .TP -\fB\-\-config\-load\fR:|layout ID +\fB\-\-config\-load=\fR|layout ID load configuration from FILE .TP -\fB\-cm\fR \fB\-\-cache\-metadata\fR +\fB\-\-cache\-metadata\fR clean the metadata cache .TP -\fB\-cr\fR: \fB\-\-cache\-render\fR: +\fB\-\-cache\-render=\fR render thumbnails .TP -\fB\-crr\fR: \fB\-\-cache\-render\-recurse\fR: +\fB\-\-cache\-render\-recurse=\fR render thumbnails recursively .TP -\fB\-crs\fR: \fB\-\-cache\-render\-shared\fR: +\fB\-\-cache\-render\-shared=\fR render thumbnails (see Help) .TP -\fB\-crsr\fR: \fB\-\-cache\-render\-shared\-recurse\fR: +\fB\-\-cache\-render\-shared\-recurse=\fR render thumbnails recursively (see Help) .TP -\fB\-cs\fR: \fB\-\-cache\-shared\fR:clean|clear +\fB\-\-cache\-shared\fR=\fI\,clean\/\fR|clear clean or clear shared thumbnail cache .TP -\fB\-ct\fR: \fB\-\-cache\-thumbs\fR:clean|clear +\fB\-\-cache\-thumbs\fR=\fI\,clean\/\fR|clear clean or clear thumbnail cache .TP -\fB\-d\fR \fB\-\-delay=\fR<[H:][M:][N][.M]> +\fB\-d\fR \fB\-\-delay=\fR<[H=][M=][N][.M]> set slide show delay to Hrs Mins N.M seconds .TP \fB\-\-first\fR @@ -119,37 +119,37 @@ first image \fB\-f\fR \fB\-\-fullscreen\fR toggle full screen .TP -\fB\-\-file\fR:| +\fB\-\-file=\fR| open FILE or URL, bring Geeqie window to the top .TP -\fB\-\-File\fR:| +\fB\-\-File=\fR| open FILE or URL, do not bring Geeqie window to the top .TP -\fB\-fs\fR \fB\-\-fullscreen\-start\fR +\fB\-\-fullscreen\-start\fR start full screen .TP -\fB\-fS\fR \fB\-\-fullscreen\-stop\fR +\fB\-\-fullscreen\-stop\fR stop full screen .TP \fB\-\-geometry=\fR set window geometry .TP -\fB\-\-get\-collection\fR: +\fB\-\-get\-collection=\fR get collection content .TP \fB\-\-get\-collection\-list\fR get collection list .TP -\fB\-\-get\-destination\fR: +\fB\-\-get\-destination=\fR get destination path of FILE (See Plugins Configuration) .TP \fB\-\-get\-file\-info\fR get file info .TP -\fB\-\-get\-filelist\fR:[] +\fB\-\-get\-filelist\fR=\fI\,[\/\fR] get list of files and class .TP -\fB\-\-get\-filelist\-recurse\fR:[] +\fB\-\-get\-filelist\-recurse\fR=\fI\,[\/\fR] get list of files and class recursive .TP \fB\-\-get\-rectangle\fR @@ -161,25 +161,25 @@ get render intent \fB\-\-get\-selection\fR get list of selected files .TP -\fB\-\-get\-sidecars\fR: +\fB\-\-get\-sidecars=\fR get list of sidecars of FILE .TP \fB\-\-get\-window\-list\fR get window list .TP -\fB\-\-id\fR: +\fB\-\-id=\fR window id for following commands .TP \fB\-\-last\fR last image .TP -\fB\-\-list\-add\fR: +\fB\-\-list\-add=\fR add FILE to command line collection list .TP \fB\-\-list\-clear\fR clear command line collection list .TP -\fB\-\-lua\fR:, +\fB\-\-lua=\fR, run lua script on FILE .TP \fB\-\-new\-window\fR @@ -194,7 +194,7 @@ print pixel info of mouse pointer on current image \fB\-\-print0\fR terminate returned data with null character instead of newline .TP -\fB\-\-PWD\fR: +\fB\-\-PWD=\fR use PWD as working directory for following commands .TP \fB\-q\fR \fB\-\-quit\fR @@ -203,25 +203,25 @@ quit \fB\-\-raise\fR bring the Geeqie window to the top .TP -\fB\-\-selection\-add\fR:[] +\fB\-\-selection\-add\fR=\fI\,[\/\fR] adds the current file (or the specified file) to the current selection .TP \fB\-\-selection\-clear\fR clears the current selection .TP -\fB\-\-selection\-remove\fR:[] +\fB\-\-selection\-remove\fR=\fI\,[\/\fR] removes the current file (or the specified file) from the current selection .TP \fB\-s\fR \fB\-\-slideshow\fR toggle slide show .TP -\fB\-\-slideshow\-recurse\fR: +\fB\-\-slideshow\-recurse=\fR start recursive slide show in FOLDER .TP -\fB\-ss\fR \fB\-\-slideshow\-start\fR +\fB\-\-slideshow\-start\fR start slide show .TP -\fB\-sS\fR \fB\-\-slideshow\-stop\fR +\fB\-\-slideshow\-stop\fR stop slide show .TP \fB\-\-tell\fR @@ -233,7 +233,7 @@ show tools \fB\-t\fR \fB\-\-tools\-hide\fR hide tools .TP -\fB\-\-view\fR: +\fB\-\-view=\fR open FILE in new window .IP All other command line parameters are used as plain files if they exist. diff --git a/scripts/lua-test.sh b/scripts/lua-test.sh index 4e1feb50..37d94f4e 100755 --- a/scripts/lua-test.sh +++ b/scripts/lua-test.sh @@ -69,7 +69,7 @@ done sleep 2 base_lua=$(basename "$lua_test_file") -result=$(xvfb-run --auto-servernum "$1" --remote --lua:"$lua_test_image","$base_lua") +result=$(xvfb-run --auto-servernum "$1" --remote --lua="$lua_test_image","$base_lua") xvfb-run --auto-servernum "$1" --remote --quit ## @FIXME Running on GitHub gives additional dbind-WARNINGs. The data required is the last n lines. diff --git a/src/main.cc b/src/main.cc index a0b73325..7e4b86a0 100644 --- a/src/main.cc +++ b/src/main.cc @@ -438,21 +438,21 @@ static void parse_command_line(gint argc, gchar *argv[]) { command_line->log_window_show = TRUE; } - else if (strncmp(cmd_line, "-o:", 3) == 0) + else if (strncmp(cmd_line, "-o", 2) == 0) { - command_line->log_file = g_strdup(cmd_line + 3); + command_line->log_file = g_strdup(cmd_line + 2); } - else if (strncmp(cmd_line, "--log-file:", 11) == 0) + else if (strncmp(cmd_line, "--log-file=", 11) == 0) { command_line->log_file = g_strdup(cmd_line + 11); } - else if (strncmp(cmd_line, "-g:", 3) == 0) + else if (strncmp(cmd_line, "-g", 2) == 0) { - set_regexp(g_strdup(cmd_line+3)); + set_regexp(g_strdup(cmd_line + 2)); } - else if (strncmp(cmd_line, "-grep:", 6) == 0) + else if (strncmp(cmd_line, "--grep=", 7) == 0) { - set_regexp(g_strdup(cmd_line+3)); + set_regexp(g_strdup(cmd_line + 7)); } else if (strncmp(cmd_line, "-n", 2) == 0) { @@ -462,8 +462,7 @@ static void parse_command_line(gint argc, gchar *argv[]) { command_line->new_instance = TRUE; } - else if (strcmp(cmd_line, "-rh") == 0 || - strcmp(cmd_line, "--remote-help") == 0) + else if (strcmp(cmd_line, "--remote-help") == 0) { remote_help(); exit(0); @@ -492,9 +491,9 @@ static void parse_command_line(gint argc, gchar *argv[]) print_term(FALSE, _(" -h, --help show this message\n")); print_term(FALSE, _(" -l, --list [files] [collections] open collection window for command line\n")); print_term(FALSE, _(" -n, --new-instance open a new instance of Geeqie *\n")); - print_term(FALSE, _(" -o:, --log-file: save log data to file\n")); + print_term(FALSE, _(" -o, --log-file= save log data to file\n")); print_term(FALSE, _(" -r, --remote send following commands to open window\n")); - print_term(FALSE, _(" -rh, --remote-help print remote command list\n")); + print_term(FALSE, _(" --remote-help print remote command list\n")); print_term(FALSE, _(" -s, --slideshow start in slideshow mode\n")); print_term(FALSE, _(" -T, --with-tools force show of tools\n")); print_term(FALSE, _(" -t, --without-tools force hide of tools\n")); @@ -502,7 +501,7 @@ static void parse_command_line(gint argc, gchar *argv[]) print_term(FALSE, _(" -w, --show-log-window show log window\n")); #ifdef DEBUG print_term(FALSE, _(" --debug[=level] turn on debug output\n")); - print_term(FALSE, _(" -g:, --grep: filter debug output\n")); + print_term(FALSE, _(" -g, --grep= filter debug output\n")); #endif print_term(FALSE, "\n"); diff --git a/src/remote.cc b/src/remote.cc index e6e6de74..1a21c11f 100644 --- a/src/remote.cc +++ b/src/remote.cc @@ -1718,67 +1718,67 @@ struct RemoteCommandEntry { }; static RemoteCommandEntry remote_commands[] = { - /* short, long callback, extra, prefer, parameter, description */ - { nullptr, "--action:", gr_action, TRUE, FALSE, N_(""), N_("execute keyboard action (See Help/Reference/Remote Keyboard Actions)") }, - { nullptr, "--action-list", gr_action_list, FALSE, FALSE, nullptr, N_("list available keyboard actions (some are redundant)") }, - { "-b", "--back", gr_image_prev, FALSE, FALSE, nullptr, N_("previous image") }, - { nullptr, "--close-window", gr_close_window, FALSE, FALSE, nullptr, N_("close window") }, - { nullptr, "--config-load:", gr_config_load, TRUE, FALSE, N_("|layout ID"), N_("load configuration from FILE") }, - { "-cm","--cache-metadata", gr_cache_metadata, FALSE, FALSE, nullptr, N_("clean the metadata cache") }, - { "-cr:", "--cache-render:", gr_cache_render, TRUE, FALSE, N_(" "), N_(" render thumbnails") }, - { "-crr:", "--cache-render-recurse:", gr_cache_render_recurse, TRUE, FALSE, N_(" "), N_("render thumbnails recursively") }, - { "-crs:", "--cache-render-shared:", gr_cache_render_standard, TRUE, FALSE, N_(" "), N_(" render thumbnails (see Help)") }, - { "-crsr:", "--cache-render-shared-recurse:", gr_cache_render_standard_recurse, TRUE, FALSE, N_(""), N_(" render thumbnails recursively (see Help)") }, - { "-cs:", "--cache-shared:", gr_cache_shared, TRUE, FALSE, N_("clean|clear"), N_("clean or clear shared thumbnail cache") }, - { "-ct:", "--cache-thumbs:", gr_cache_thumb, TRUE, FALSE, N_("clean|clear"), N_("clean or clear thumbnail cache") }, - { "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("<[H:][M:][N][.M]>"), N_("set slide show delay to Hrs Mins N.M seconds") }, - { nullptr, "--first", gr_image_first, FALSE, FALSE, nullptr, N_("first image") }, - { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, nullptr, N_("toggle full screen") }, - { nullptr, "--file:", gr_file_load, TRUE, FALSE, N_("|"), N_("open FILE or URL, bring Geeqie window to the top") }, - { nullptr, "file:", gr_file_load, TRUE, FALSE, N_("|"), N_("open FILE or URL, bring Geeqie window to the top") }, - { nullptr, "--File:", gr_file_load_no_raise, TRUE, FALSE, N_("|"), N_("open FILE or URL, do not bring Geeqie window to the top") }, - { nullptr, "File:", gr_file_load_no_raise, TRUE, FALSE, N_("|"), N_("open FILE or URL, do not bring Geeqie window to the top") }, - { "-fs","--fullscreen-start", gr_fullscreen_start, FALSE, FALSE, nullptr, N_("start full screen") }, - { "-fS","--fullscreen-stop", gr_fullscreen_stop, FALSE, FALSE, nullptr, N_("stop full screen") }, - { nullptr, "--geometry=", gr_geometry, TRUE, FALSE, N_(""), N_("set window geometry") }, - { nullptr, "--get-collection:", gr_collection, TRUE, FALSE, N_(""), N_("get collection content") }, - { nullptr, "--get-collection-list", gr_collection_list, FALSE, FALSE, nullptr, N_("get collection list") }, - { nullptr, "--get-destination:", gr_get_destination, TRUE, FALSE, N_(""), N_("get destination path of FILE (See Plugins Configuration)") }, - { nullptr, "--get-file-info", gr_file_info, FALSE, FALSE, nullptr, N_("get file info") }, - { nullptr, "--get-filelist:", gr_filelist, TRUE, FALSE, N_("[]"), N_("get list of files and class") }, - { nullptr, "--get-filelist-recurse:", gr_filelist_recurse, TRUE, FALSE, N_("[]"), N_("get list of files and class recursive") }, - { nullptr, "--get-rectangle", gr_rectangle, FALSE, FALSE, nullptr, N_("get rectangle co-ordinates") }, - { nullptr, "--get-render-intent", gr_render_intent, FALSE, FALSE, nullptr, N_("get render intent") }, - { nullptr, "--get-selection", gr_get_selection, FALSE, FALSE, nullptr, N_("get list of selected files") }, - { nullptr, "--get-sidecars:", gr_get_sidecars, TRUE, FALSE, N_(""), N_("get list of sidecars of FILE") }, - { nullptr, "--get-window-list", gr_window_list, FALSE, FALSE, nullptr, N_("get window list") }, - { nullptr, "--id:", gr_lw_id, TRUE, FALSE, N_(""), N_("window id for following commands") }, - { nullptr, "--last", gr_image_last, FALSE, FALSE, nullptr, N_("last image") }, - { nullptr, "--list-add:", gr_list_add, TRUE, FALSE, N_(""), N_("add FILE to command line collection list") }, - { nullptr, "--list-clear", gr_list_clear, FALSE, FALSE, nullptr, N_("clear command line collection list") }, + /* short, long callback, extra, prefer, parameter, description */ + { nullptr, "--action=", gr_action, TRUE, FALSE, N_(""), N_("execute keyboard action (See Help/Reference/Remote Keyboard Actions)") }, + { nullptr, "--action-list", gr_action_list, FALSE, FALSE, nullptr, N_("list available keyboard actions (some are redundant)") }, + { "-b", "--back", gr_image_prev, FALSE, FALSE, nullptr, N_("previous image") }, + { nullptr, "--close-window", gr_close_window, FALSE, FALSE, nullptr, N_("close window") }, + { nullptr, "--config-load=", gr_config_load, TRUE, FALSE, N_("|layout ID"), N_("load configuration from FILE") }, + { nullptr, "--cache-metadata", gr_cache_metadata, FALSE, FALSE, nullptr, N_("clean the metadata cache") }, + { nullptr, "--cache-render=", gr_cache_render, TRUE, FALSE, N_(" "), N_(" render thumbnails") }, + { nullptr, "--cache-render-recurse=", gr_cache_render_recurse, TRUE, FALSE, N_(" "), N_("render thumbnails recursively") }, + { nullptr, "--cache-render-shared=", gr_cache_render_standard,TRUE, FALSE, N_(" "), N_(" render thumbnails (see Help)") }, + { nullptr, "--cache-render-shared-recurse=", gr_cache_render_standard_recurse, TRUE, FALSE, N_(""), N_(" render thumbnails recursively (see Help)") }, + { nullptr, "--cache-shared=", gr_cache_shared, TRUE, FALSE, N_("clean|clear"), N_("clean or clear shared thumbnail cache") }, + { nullptr, "--cache-thumbs=", gr_cache_thumb, TRUE, FALSE, N_("clean|clear"), N_("clean or clear thumbnail cache") }, + { "-d", "--delay=", gr_slideshow_delay, TRUE, FALSE, N_("<[H=][M=][N][.M]>"), N_("set slide show delay to Hrs Mins N.M seconds") }, + { nullptr, "--first", gr_image_first, FALSE, FALSE, nullptr, N_("first image") }, + { "-f", "--fullscreen", gr_fullscreen_toggle, FALSE, TRUE, nullptr, N_("toggle full screen") }, + { nullptr, "--file=", gr_file_load, TRUE, FALSE, N_("|"), N_("open FILE or URL, bring Geeqie window to the top") }, + { nullptr, "file=", gr_file_load, TRUE, FALSE, N_("|"), N_("open FILE or URL, bring Geeqie window to the top") }, + { nullptr, "--File=", gr_file_load_no_raise, TRUE, FALSE, N_("|"), N_("open FILE or URL, do not bring Geeqie window to the top") }, + { nullptr, "File=", gr_file_load_no_raise, TRUE, FALSE, N_("|"), N_("open FILE or URL, do not bring Geeqie window to the top") }, + { nullptr, "--fullscreen-start", gr_fullscreen_start, FALSE, FALSE, nullptr, N_("start full screen") }, + { nullptr, "--fullscreen-stop", gr_fullscreen_stop, FALSE, FALSE, nullptr, N_("stop full screen") }, + { nullptr, "--geometry=", gr_geometry, TRUE, FALSE, N_(""), N_("set window geometry") }, + { nullptr, "--get-collection=", gr_collection, TRUE, FALSE, N_(""), N_("get collection content") }, + { nullptr, "--get-collection-list", gr_collection_list, FALSE, FALSE, nullptr, N_("get collection list") }, + { nullptr, "--get-destination=", gr_get_destination, TRUE, FALSE, N_(""), N_("get destination path of FILE (See Plugins Configuration)") }, + { nullptr, "--get-file-info", gr_file_info, FALSE, FALSE, nullptr, N_("get file info") }, + { nullptr, "--get-filelist=", gr_filelist, TRUE, FALSE, N_("[]"), N_("get list of files and class") }, + { nullptr, "--get-filelist-recurse=", gr_filelist_recurse, TRUE, FALSE, N_("[]"), N_("get list of files and class recursive") }, + { nullptr, "--get-rectangle", gr_rectangle, FALSE, FALSE, nullptr, N_("get rectangle co-ordinates") }, + { nullptr, "--get-render-intent", gr_render_intent, FALSE, FALSE, nullptr, N_("get render intent") }, + { nullptr, "--get-selection", gr_get_selection, FALSE, FALSE, nullptr, N_("get list of selected files") }, + { nullptr, "--get-sidecars=", gr_get_sidecars, TRUE, FALSE, N_(""), N_("get list of sidecars of FILE") }, + { nullptr, "--get-window-list", gr_window_list, FALSE, FALSE, nullptr, N_("get window list") }, + { nullptr, "--id=", gr_lw_id, TRUE, FALSE, N_(""), N_("window id for following commands") }, + { nullptr, "--last", gr_image_last, FALSE, FALSE, nullptr, N_("last image") }, + { nullptr, "--list-add=", gr_list_add, TRUE, FALSE, N_(""), N_("add FILE to command line collection list") }, + { nullptr, "--list-clear", gr_list_clear, FALSE, FALSE, nullptr, N_("clear command line collection list") }, #if HAVE_LUA - { nullptr, "--lua:", gr_lua, TRUE, FALSE, N_(","), N_("run lua script on FILE") }, + { nullptr, "--lua=", gr_lua, TRUE, FALSE, N_(","), N_("run lua script on FILE") }, #endif - { nullptr, "--new-window", gr_new_window, FALSE, FALSE, nullptr, N_("new window") }, - { "-n", "--next", gr_image_next, FALSE, FALSE, nullptr, N_("next image") }, - { nullptr, "--pixel-info", gr_pixel_info, FALSE, FALSE, nullptr, N_("print pixel info of mouse pointer on current image") }, - { nullptr, "--print0", gr_print0, TRUE, FALSE, nullptr, N_("terminate returned data with null character instead of newline") }, - { nullptr, "--PWD:", gr_pwd, TRUE, FALSE, N_(""), N_("use PWD as working directory for following commands") }, - { "-q", "--quit", gr_quit, FALSE, FALSE, nullptr, N_("quit") }, - { nullptr, "--raise", gr_raise, FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") }, - { nullptr, "raise", gr_raise, FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") }, - { nullptr, "--selection-add:", gr_selection_add, TRUE, FALSE, N_("[]"), N_("adds the current file (or the specified file) to the current selection") }, - { nullptr, "--selection-clear", gr_selection_clear, FALSE, FALSE, nullptr, N_("clears the current selection") }, - { nullptr, "--selection-remove:", gr_selection_remove, TRUE, FALSE, N_("[]"), N_("removes the current file (or the specified file) from the current selection") }, - { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, nullptr, N_("toggle slide show") }, - { nullptr, "--slideshow-recurse:", gr_slideshow_start_rec, TRUE, FALSE, N_(""), N_("start recursive slide show in FOLDER") }, - { "-ss","--slideshow-start", gr_slideshow_start, FALSE, FALSE, nullptr, N_("start slide show") }, - { "-sS","--slideshow-stop", gr_slideshow_stop, FALSE, FALSE, nullptr, N_("stop slide show") }, - { nullptr, "--tell", gr_file_tell, FALSE, FALSE, nullptr, N_("print filename [and Collection] of current image") }, - { "-T", "--tools-show", gr_tools_show, FALSE, TRUE, nullptr, N_("show tools") }, - { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, nullptr, N_("hide tools") }, - { nullptr, "--view:", gr_file_view, TRUE, FALSE, N_(""), N_("open FILE in new window") }, - { nullptr, "view:", gr_file_view, TRUE, FALSE, N_(""), N_("open FILE in new window") }, + { nullptr, "--new-window", gr_new_window, FALSE, FALSE, nullptr, N_("new window") }, + { "-n", "--next", gr_image_next, FALSE, FALSE, nullptr, N_("next image") }, + { nullptr, "--pixel-info", gr_pixel_info, FALSE, FALSE, nullptr, N_("print pixel info of mouse pointer on current image") }, + { nullptr, "--print0", gr_print0, TRUE, FALSE, nullptr, N_("terminate returned data with null character instead of newline") }, + { nullptr, "--PWD=", gr_pwd, TRUE, FALSE, N_(""), N_("use PWD as working directory for following commands") }, + { "-q", "--quit", gr_quit, FALSE, FALSE, nullptr, N_("quit") }, + { nullptr, "--raise", gr_raise, FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") }, + { nullptr, "raise", gr_raise, FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") }, + { nullptr, "--selection-add=", gr_selection_add, TRUE, FALSE, N_("[]"), N_("adds the current file (or the specified file) to the current selection") }, + { nullptr, "--selection-clear", gr_selection_clear, FALSE, FALSE, nullptr, N_("clears the current selection") }, + { nullptr, "--selection-remove=", gr_selection_remove, TRUE, FALSE, N_("[]"), N_("removes the current file (or the specified file) from the current selection") }, + { "-s", "--slideshow", gr_slideshow_toggle, FALSE, TRUE, nullptr, N_("toggle slide show") }, + { nullptr, "--slideshow-recurse=", gr_slideshow_start_rec, TRUE, FALSE, N_(""), N_("start recursive slide show in FOLDER") }, + { nullptr, "--slideshow-start", gr_slideshow_start, FALSE, FALSE, nullptr, N_("start slide show") }, + { nullptr, "--slideshow-stop", gr_slideshow_stop, FALSE, FALSE, nullptr, N_("stop slide show") }, + { nullptr, "--tell", gr_file_tell, FALSE, FALSE, nullptr, N_("print filename [and Collection] of current image") }, + { "-T", "--tools-show", gr_tools_show, FALSE, TRUE, nullptr, N_("show tools") }, + { "-t", "--tools-hide", gr_tools_hide, FALSE, TRUE, nullptr, N_("hide tools") }, + { nullptr, "--view=", gr_file_view, TRUE, FALSE, N_(""), N_("open FILE in new window") }, + { nullptr, "view=", gr_file_view, TRUE, FALSE, N_(""), N_("open FILE in new window") }, { nullptr, nullptr, nullptr, FALSE, FALSE, nullptr, nullptr } };