summaryrefslogtreecommitdiffstats
path: root/swaylock
diff options
context:
space:
mode:
authorLibravatar Nuew <code@nuew.net>2016-03-24 18:52:57 -0400
committerLibravatar Nuew <code@nuew.net>2016-03-24 18:52:57 -0400
commit34009205e99e79150a5c8ecdede9346abf85eae7 (patch)
treec3fa7dcca80ff2a38c5e6fe1c70eecfd66ebf3fc /swaylock
parentChange 'display' to 'output' in swaylock docs where necessary (diff)
downloadsway-34009205e99e79150a5c8ecdede9346abf85eae7.tar.gz
sway-34009205e99e79150a5c8ecdede9346abf85eae7.tar.zst
sway-34009205e99e79150a5c8ecdede9346abf85eae7.zip
Change 'display' to 'output' in swaylock error messages where necessary
Diffstat (limited to 'swaylock')
-rw-r--r--swaylock/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/swaylock/main.c b/swaylock/main.c
index 202d95c2..9ed97013 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -293,14 +293,14 @@ int main(int argc, char **argv) {
293 images = load_image(optarg); 293 images = load_image(optarg);
294 num_images = -1; 294 num_images = -1;
295 } else { 295 } else {
296 fprintf(stderr, "display must be defined for all --images or no --images.\n"); 296 fprintf(stderr, "output must be defined for all --images or no --images.\n");
297 exit(EXIT_FAILURE); 297 exit(EXIT_FAILURE);
298 } 298 }
299 } else { 299 } else {
300 if (num_images == 0) { 300 if (num_images == 0) {
301 images = calloc(registry->outputs->length, sizeof(char*) * 2); 301 images = calloc(registry->outputs->length, sizeof(char*) * 2);
302 } else if (num_images == -1) { 302 } else if (num_images == -1) {
303 fprintf(stderr, "display must be defined for all --images or no --images.\n"); 303 fprintf(stderr, "output must be defined for all --images or no --images.\n");
304 exit(EXIT_FAILURE); 304 exit(EXIT_FAILURE);
305 } 305 }
306 306
@@ -397,13 +397,13 @@ int main(int argc, char **argv) {
397 if (displays_paths[i * 2] != NULL) { 397 if (displays_paths[i * 2] != NULL) {
398 for (int j = 0;; ++j) { 398 for (int j = 0;; ++j) {
399 if (j >= json_object_array_length(json_outputs)) { 399 if (j >= json_object_array_length(json_outputs)) {
400 fprintf(stderr, "%s is not an extant display\n", displays_paths[i * 2]); 400 fprintf(stderr, "%s is not an extant output\n", displays_paths[i * 2]);
401 exit(EXIT_FAILURE); 401 exit(EXIT_FAILURE);
402 } 402 }
403 403
404 struct json_object *dsp_name, *at_j = json_object_array_get_idx(json_outputs, j); 404 struct json_object *dsp_name, *at_j = json_object_array_get_idx(json_outputs, j);
405 if (!json_object_object_get_ex(at_j, "name", &dsp_name)) { 405 if (!json_object_object_get_ex(at_j, "name", &dsp_name)) {
406 sway_abort("display doesn't have a name field"); 406 sway_abort("output doesn't have a name field");
407 } 407 }
408 if (!strcmp(displays_paths[i * 2], json_object_get_string(dsp_name))) { 408 if (!strcmp(displays_paths[i * 2], json_object_get_string(dsp_name))) {
409 ((cairo_surface_t**) images)[j] = load_image(displays_paths[i * 2 + 1]); 409 ((cairo_surface_t**) images)[j] = load_image(displays_paths[i * 2 + 1]);