mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: Use parse_options() from shared for command line options

Browse Source 
Also add a basic --help option

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
This commit is contained in:
Bryce Harrington
2016-11-21 13:26:22 -08:00
parent 21fac60838
commit 3d90da21fe
1 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+56 -21
View File
@@ -37,6 +37,7 @@
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include "shared/config-parser.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "window.h" #include "window.h"
@@ -1489,28 +1490,62 @@ global_handler(struct display *display, uint32_t name,
} }
} }
/** Display help for command line options, and exit */
static uint32_t opt_help = 0;
/** Require a distinct click to show the input panel (virtual keyboard) */
static uint32_t opt_click_to_show = 0;
/** Set a specific (RFC-3066) language. Used for the virtual keyboard, etc. */
static const char *opt_preferred_language = NULL;
/**
* \brief command line options for editor
*/
static const struct weston_option editor_options[] = {
{ WESTON_OPTION_BOOLEAN, "help", 'h', &opt_help },
{ WESTON_OPTION_BOOLEAN, "click-to-show", 'C', &opt_click_to_show },
{ WESTON_OPTION_STRING, "preferred-language", 'L', &opt_preferred_language },
};
static void
usage(const char *program_name, int exit_code)
{
unsigned k;
fprintf(stderr, "Usage: %s [OPTIONS]\n\n", program_name);
for (k = 0; k < ARRAY_LENGTH(editor_options); k++) {
const struct weston_option *p = &editor_options[k];
if (p->name) {
fprintf(stderr, " --%s", p->name);
if (p->type != WESTON_OPTION_BOOLEAN)
fprintf(stderr, "=VALUE");
fprintf(stderr, "\n");
}
if (p->short_name) {
fprintf(stderr, " -%c", p->short_name);
if (p->type != WESTON_OPTION_BOOLEAN)
fprintf(stderr, "VALUE");
fprintf(stderr, "\n");
}
}
exit(exit_code);
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
struct editor editor; struct editor editor;
int i;
uint32_t click_to_show = 0;
const char *preferred_language = NULL;
for (i = 1; i < argc; i++) { parse_options(editor_options, ARRAY_LENGTH(editor_options),
if (strcmp("--click-to-show", argv[i]) == 0) &argc, argv);
click_to_show = 1; if (opt_help)
else if (strcmp("--preferred-language", argv[i]) == 0 && usage(argv[0], EXIT_SUCCESS);
i + 1 < argc) {
preferred_language = argv[i + 1]; if (argc > 1) {
i++; usage(argv[0], EXIT_FAILURE);
} else { /* FIXME: Use remaining arguments as a path/filename to load */
printf("Usage: %s [OPTIONS]\n" return 0;
" --click-to-show\n"
" --preferred-language LANGUAGE\n",
argv[0]);
return 1;
}
} }
memset(&editor, 0, sizeof editor); memset(&editor, 0, sizeof editor);
@@ -1537,12 +1572,12 @@ main(int argc, char *argv[])
editor.widget = window_frame_create(editor.window, &editor); editor.widget = window_frame_create(editor.window, &editor);
editor.entry = text_entry_create(&editor, "Entry"); editor.entry = text_entry_create(&editor, "Entry");
editor.entry->click_to_show = click_to_show; editor.entry->click_to_show = opt_click_to_show;
if (preferred_language) if (opt_preferred_language)
editor.entry->preferred_language = strdup(preferred_language); editor.entry->preferred_language = strdup(opt_preferred_language);
editor.editor = text_entry_create(&editor, "Numeric"); editor.editor = text_entry_create(&editor, "Numeric");
editor.editor->content_purpose = ZWP_TEXT_INPUT_V1_CONTENT_PURPOSE_NUMBER; editor.editor->content_purpose = ZWP_TEXT_INPUT_V1_CONTENT_PURPOSE_NUMBER;
editor.editor->click_to_show = click_to_show; editor.editor->click_to_show = opt_click_to_show;
editor.selection = NULL; editor.selection = NULL;
editor.selected_text = NULL; editor.selected_text = NULL;