From 259dc25ba33d6f9f05a92f9f00ce493f87f1e4c6 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Sat, 23 Jan 2016 14:58:43 +0200 Subject: [PATCH 1/2] swaylock: add option parsing --- swaylock/main.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/swaylock/main.c b/swaylock/main.c index 9de95e7a2..0bf646212 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "client/window.h" #include "client/registry.h" #include "client/cairo.h" @@ -92,6 +93,44 @@ void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t cod int main(int argc, char **argv) { init_log(L_INFO); + + static struct option long_options[] = { + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'v'}, + {0, 0, 0, 0} + }; + + const char *usage = + "Usage: swaylock [stretch|fit|fill|center|tile]\n" + "\n" + " -h, --help Show help message and quit.\n" + " -v, --version Show the version number and quit.\n"; + + int c; + while (1) { + int option_index = 0; + c = getopt_long(argc, argv, "hv", long_options, &option_index); + if (c == -1) { + break; + } + switch (c) { + case 'v': +#if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE + fprintf(stdout, "swaylock version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); +#else + fprintf(stdout, "version not detected\n"); +#endif + exit(EXIT_SUCCESS); + break; + default: + fprintf(stderr, "%s", usage); + exit(EXIT_FAILURE); + } + } + + char *image_path = argv[optind]; + char *scaling_mode_str = argv[optind+1]; + password = malloc(1024); // TODO: Let this grow password[0] = '\0'; surfaces = create_list(); @@ -115,7 +154,7 @@ int main(int argc, char **argv) { #ifdef WITH_GDK_PIXBUF GError *err = NULL; - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(argv[1], &err); // TODO: Parse i3lock arguments + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(image_path, &err); // TODO: Parse i3lock arguments if (!pixbuf) { sway_abort("Failed to load background image."); } @@ -130,7 +169,6 @@ int main(int argc, char **argv) { double width = cairo_image_surface_get_width(image); double height = cairo_image_surface_get_height(image); - const char *scaling_mode_str = argv[2]; enum scaling_mode scaling_mode = SCALING_MODE_STRETCH; if (strcmp(scaling_mode_str, "stretch") == 0) { scaling_mode = SCALING_MODE_STRETCH; From 7b25caba47af4b2755f675c1326e27e9d51ffa1c Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Sat, 23 Jan 2016 15:16:36 +0200 Subject: [PATCH 2/2] swaylock: add i3lock compatible options --- swaylock/main.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/swaylock/main.c b/swaylock/main.c index 0bf646212..c01445e7b 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -92,28 +92,46 @@ void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t cod } int main(int argc, char **argv) { + char *image_path = NULL; + char *scaling_mode_str = "fit"; + init_log(L_INFO); static struct option long_options[] = { {"help", no_argument, NULL, 'h'}, + {"image", required_argument, NULL, 'i'}, + {"scaling", required_argument, NULL, 's'}, + {"tiling", no_argument, NULL, 't'}, {"version", no_argument, NULL, 'v'}, {0, 0, 0, 0} }; const char *usage = - "Usage: swaylock [stretch|fit|fill|center|tile]\n" + "Usage: swaylock [options...]\n" "\n" " -h, --help Show help message and quit.\n" - " -v, --version Show the version number and quit.\n"; + " -s, --scaling Scaling mode: stretch, fill, fit, center, tile.\n" + " -t, --tiling Same as --scaling=tile.\n" + " -v, --version Show the version number and quit.\n" + " -i, --image Display the given image.\n"; int c; while (1) { int option_index = 0; - c = getopt_long(argc, argv, "hv", long_options, &option_index); + c = getopt_long(argc, argv, "hi:s:tv", long_options, &option_index); if (c == -1) { break; } switch (c) { + case 'i': + image_path = optarg; + break; + case 's': + scaling_mode_str = optarg; + break; + case 't': + scaling_mode_str = "tile"; + break; case 'v': #if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE fprintf(stdout, "swaylock version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); @@ -128,8 +146,11 @@ int main(int argc, char **argv) { } } - char *image_path = argv[optind]; - char *scaling_mode_str = argv[optind+1]; + // TODO: support locking without image + if (!image_path) { + fprintf(stderr, "No image specified!\n"); + exit(EXIT_FAILURE); + } password = malloc(1024); // TODO: Let this grow password[0] = '\0'; @@ -154,7 +175,7 @@ int main(int argc, char **argv) { #ifdef WITH_GDK_PIXBUF GError *err = NULL; - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(image_path, &err); // TODO: Parse i3lock arguments + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(image_path, &err); if (!pixbuf) { sway_abort("Failed to load background image."); }