Merge pull request #475 from christophgysin/swaylock_color
swaylock: implement --color
This commit is contained in:
commit
d2af1f3395
263
swaylock/main.c
263
swaylock/main.c
|
@ -115,123 +115,24 @@ 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";
|
||||
static void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
|
||||
cairo_set_source_rgba(cairo,
|
||||
(color >> (3*8) & 0xFF) / 255.0,
|
||||
(color >> (2*8) & 0xFF) / 255.0,
|
||||
(color >> (1*8) & 0xFF) / 255.0,
|
||||
(color >> (0*8) & 0xFF) / 255.0);
|
||||
}
|
||||
|
||||
init_log(L_INFO);
|
||||
void render_color(struct window *window, uint32_t color) {
|
||||
cairo_set_source_u32(window->cairo, color);
|
||||
cairo_paint(window->cairo);
|
||||
window_render(window);
|
||||
}
|
||||
|
||||
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 [options...]\n"
|
||||
"\n"
|
||||
" -h, --help Show help message 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 <path> Display the given image.\n";
|
||||
|
||||
int c;
|
||||
while (1) {
|
||||
int option_index = 0;
|
||||
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);
|
||||
#else
|
||||
fprintf(stdout, "version not detected\n");
|
||||
#endif
|
||||
exit(EXIT_SUCCESS);
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "%s", usage);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
// 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';
|
||||
surfaces = create_list();
|
||||
registry = registry_poll();
|
||||
|
||||
if (!registry->swaylock) {
|
||||
sway_abort("swaylock requires the compositor to support the swaylock extension.");
|
||||
}
|
||||
|
||||
int i;
|
||||
for (i = 0; i < registry->outputs->length; ++i) {
|
||||
struct output_state *output = registry->outputs->items[i];
|
||||
struct window *window = window_setup(registry, output->width, output->height, true);
|
||||
if (!window) {
|
||||
sway_abort("Failed to create surfaces.");
|
||||
}
|
||||
list_add(surfaces, window);
|
||||
}
|
||||
|
||||
registry->input->notify = notify_key;
|
||||
|
||||
#ifdef WITH_GDK_PIXBUF
|
||||
GError *err = NULL;
|
||||
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(image_path, &err);
|
||||
if (!pixbuf) {
|
||||
sway_abort("Failed to load background image.");
|
||||
}
|
||||
cairo_surface_t *image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf);
|
||||
g_object_unref(pixbuf);
|
||||
#else
|
||||
cairo_surface_t *image = cairo_image_surface_create_from_png(argv[1]);
|
||||
#endif //WITH_GDK_PIXBUF
|
||||
if (!image) {
|
||||
sway_abort("Failed to read background image.");
|
||||
}
|
||||
void render_image(struct window *window, cairo_surface_t *image, enum scaling_mode scaling_mode) {
|
||||
double width = cairo_image_surface_get_width(image);
|
||||
double height = cairo_image_surface_get_height(image);
|
||||
|
||||
enum scaling_mode scaling_mode = SCALING_MODE_STRETCH;
|
||||
if (strcmp(scaling_mode_str, "stretch") == 0) {
|
||||
scaling_mode = SCALING_MODE_STRETCH;
|
||||
} else if (strcmp(scaling_mode_str, "fill") == 0) {
|
||||
scaling_mode = SCALING_MODE_FILL;
|
||||
} else if (strcmp(scaling_mode_str, "fit") == 0) {
|
||||
scaling_mode = SCALING_MODE_FIT;
|
||||
} else if (strcmp(scaling_mode_str, "center") == 0) {
|
||||
scaling_mode = SCALING_MODE_CENTER;
|
||||
} else if (strcmp(scaling_mode_str, "tile") == 0) {
|
||||
scaling_mode = SCALING_MODE_TILE;
|
||||
} else {
|
||||
sway_abort("Unsupported scaling mode: %s", scaling_mode_str);
|
||||
}
|
||||
|
||||
for (i = 0; i < surfaces->length; ++i) {
|
||||
struct window *window = surfaces->items[i];
|
||||
if (window_prerender(window) && window->cairo) {
|
||||
switch (scaling_mode) {
|
||||
case SCALING_MODE_STRETCH:
|
||||
cairo_scale(window->cairo,
|
||||
|
@ -291,17 +192,151 @@ int main(int argc, char **argv) {
|
|||
cairo_set_source(window->cairo, pattern);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
sway_abort("Scaling mode '%s' not implemented yet!", scaling_mode_str);
|
||||
}
|
||||
|
||||
cairo_paint(window->cairo);
|
||||
|
||||
window_render(window);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
char *image_path = NULL;
|
||||
char *scaling_mode_str = "fit";
|
||||
uint32_t color = 0xFFFFFFFF;
|
||||
|
||||
init_log(L_INFO);
|
||||
|
||||
static struct option long_options[] = {
|
||||
{"help", no_argument, NULL, 'h'},
|
||||
{"color", required_argument, NULL, 'c'},
|
||||
{"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 [options...]\n"
|
||||
"\n"
|
||||
" -h, --help Show help message and quit.\n"
|
||||
" -c, --color <rrggbb> Turn the screen into the given color instead of white.\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 <path> Display the given image.\n";
|
||||
|
||||
int c;
|
||||
while (1) {
|
||||
int option_index = 0;
|
||||
c = getopt_long(argc, argv, "hc:i:s:tv", long_options, &option_index);
|
||||
if (c == -1) {
|
||||
break;
|
||||
}
|
||||
switch (c) {
|
||||
case 'c':
|
||||
if (strlen(optarg) < 6) {
|
||||
fprintf(stderr, "color must be specified in 3 byte format, e.g. ff0000\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
color = strtol(optarg, NULL, 16);
|
||||
color <<= 8;
|
||||
color |= 0xFF;
|
||||
sway_log(L_DEBUG, "color: 0x%x", color);
|
||||
break;
|
||||
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);
|
||||
#else
|
||||
fprintf(stdout, "version not detected\n");
|
||||
#endif
|
||||
exit(EXIT_SUCCESS);
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "%s", usage);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
enum scaling_mode scaling_mode = SCALING_MODE_STRETCH;
|
||||
if (strcmp(scaling_mode_str, "stretch") == 0) {
|
||||
scaling_mode = SCALING_MODE_STRETCH;
|
||||
} else if (strcmp(scaling_mode_str, "fill") == 0) {
|
||||
scaling_mode = SCALING_MODE_FILL;
|
||||
} else if (strcmp(scaling_mode_str, "fit") == 0) {
|
||||
scaling_mode = SCALING_MODE_FIT;
|
||||
} else if (strcmp(scaling_mode_str, "center") == 0) {
|
||||
scaling_mode = SCALING_MODE_CENTER;
|
||||
} else if (strcmp(scaling_mode_str, "tile") == 0) {
|
||||
scaling_mode = SCALING_MODE_TILE;
|
||||
} else {
|
||||
sway_abort("Unsupported scaling mode: %s", scaling_mode_str);
|
||||
}
|
||||
|
||||
password = malloc(1024); // TODO: Let this grow
|
||||
password[0] = '\0';
|
||||
surfaces = create_list();
|
||||
registry = registry_poll();
|
||||
|
||||
if (!registry->swaylock) {
|
||||
sway_abort("swaylock requires the compositor to support the swaylock extension.");
|
||||
}
|
||||
|
||||
int i;
|
||||
for (i = 0; i < registry->outputs->length; ++i) {
|
||||
struct output_state *output = registry->outputs->items[i];
|
||||
struct window *window = window_setup(registry, output->width, output->height, true);
|
||||
if (!window) {
|
||||
sway_abort("Failed to create surfaces.");
|
||||
}
|
||||
list_add(surfaces, window);
|
||||
}
|
||||
|
||||
registry->input->notify = notify_key;
|
||||
|
||||
cairo_surface_t *image = NULL;
|
||||
|
||||
if (image_path) {
|
||||
#ifdef WITH_GDK_PIXBUF
|
||||
GError *err = NULL;
|
||||
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(image_path, &err);
|
||||
if (!pixbuf) {
|
||||
sway_abort("Failed to load background image.");
|
||||
}
|
||||
image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf);
|
||||
g_object_unref(pixbuf);
|
||||
#else
|
||||
cairo_surface_t *image = cairo_image_surface_create_from_png(argv[1]);
|
||||
#endif //WITH_GDK_PIXBUF
|
||||
if (!image) {
|
||||
sway_abort("Failed to read background image.");
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < surfaces->length; ++i) {
|
||||
struct window *window = surfaces->items[i];
|
||||
if (!window_prerender(window) || !window->cairo) {
|
||||
continue;
|
||||
}
|
||||
if (image) {
|
||||
render_image(window, image, scaling_mode);
|
||||
} else {
|
||||
render_color(window, color);
|
||||
}
|
||||
}
|
||||
|
||||
if (image) {
|
||||
cairo_surface_destroy(image);
|
||||
}
|
||||
|
||||
bool locked = false;
|
||||
while (wl_display_dispatch(registry->display) != -1) {
|
||||
|
|
Loading…
Reference in a new issue