From 769549c6522943d16e6833c8772a1397349c9137 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Fri, 18 Aug 2017 17:44:10 -0400 Subject: [PATCH 1/2] Refactor example output config Put all the config parsing into shared.h so it is shared among the examples. --- examples/output-layout.c | 103 ++------------------------------------- examples/rotation.c | 84 ++----------------------------- examples/shared.c | 95 ++++++++++++++++++++++++++++++++++++ examples/shared.h | 15 ++++++ 4 files changed, 119 insertions(+), 178 deletions(-) diff --git a/examples/output-layout.c b/examples/output-layout.c index c16af634..4b059f70 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -25,7 +25,7 @@ #include "cat.h" struct sample_state { - struct wl_list config; + struct example_config *config; struct wlr_renderer *renderer; struct wlr_texture *cat_texture; struct wlr_output_layout *layout; @@ -35,13 +35,6 @@ struct sample_state { struct wl_list outputs; }; -struct output_config { - char *name; - enum wl_output_transform transform; - int x, y; - struct wl_list link; -}; - static void handle_output_frame(struct output_state *output, struct timespec *ts) { struct compositor_state *state = output->compositor; struct sample_state *sample = state->data; @@ -134,13 +127,13 @@ static void configure_layout(struct sample_state *sample) { wlr_output_layout_destroy(sample->layout); sample->layout = wlr_output_layout_init(); sample->main_output = NULL; - int max_x = wl_list_empty(&sample->config) ? 0 : INT_MIN; + int max_x = wl_list_empty(&sample->config->outputs) ? 0 : INT_MIN; // first add all the configure outputs struct output_state *output; wl_list_for_each(output, &sample->outputs, link) { struct output_config *conf; - wl_list_for_each(conf, &sample->config, link) { + wl_list_for_each(conf, &sample->config->outputs, link) { if (strcmp(conf->name, output->output->name) == 0) { wlr_output_layout_add(sample->layout, output->output, conf->x, conf->y); @@ -224,88 +217,6 @@ static void handle_keyboard_key(struct keyboard_state *kbstate, uint32_t keycode } } -static void usage(const char *name, int ret) { - fprintf(stderr, - "usage: %s [-d [-r | -f]]*\n" - "\n" - " -o The name of the DRM display. e.g. DVI-I-1.\n" - " -r The rotation counter clockwise. Valid values are 90, 180, 270.\n" - " -x The X-axis coordinate position of this output in the layout.\n" - " -y The Y-axis coordinate position of this output in the layout.\n" - " -f Flip the output along the vertical axis.\n", name); - - exit(ret); -} - -static void parse_args(int argc, char *argv[], struct wl_list *config) { - struct output_config *oc = NULL; - - int c; - while ((c = getopt(argc, argv, "o:r:x:y:fh")) != -1) { - switch (c) { - case 'o': - oc = calloc(1, sizeof(*oc)); - oc->name = optarg; - oc->transform = WL_OUTPUT_TRANSFORM_NORMAL; - wl_list_insert(config, &oc->link); - break; - case 'r': - if (!oc) { - fprintf(stderr, "You must specify an output first\n"); - usage(argv[0], 1); - } - - if (oc->transform != WL_OUTPUT_TRANSFORM_NORMAL - && oc->transform != WL_OUTPUT_TRANSFORM_FLIPPED) { - fprintf(stderr, "Rotation for %s already specified\n", oc->name); - usage(argv[0], 1); - } - - if (strcmp(optarg, "90") == 0) { - oc->transform += WL_OUTPUT_TRANSFORM_90; - } else if (strcmp(optarg, "180") == 0) { - oc->transform += WL_OUTPUT_TRANSFORM_180; - } else if (strcmp(optarg, "270") == 0) { - oc->transform += WL_OUTPUT_TRANSFORM_270; - } else { - fprintf(stderr, "Invalid rotation '%s'\n", optarg); - usage(argv[0], 1); - } - break; - case 'x': - if (!oc) { - fprintf(stderr, "You must specify an output first\n"); - usage(argv[0], 1); - } - oc->x = strtol(optarg, NULL, 0); - break; - case 'y': - if (!oc) { - fprintf(stderr, "You must specify an output first\n"); - usage(argv[0], 1); - } - oc->y = strtol(optarg, NULL, 0); - break; - case 'f': - if (!oc) { - fprintf(stderr, "You must specify an output first\n"); - usage(argv[0], 1); - } - - if (oc->transform >= WL_OUTPUT_TRANSFORM_FLIPPED) { - fprintf(stderr, "Flip for %s already specified\n", oc->name); - usage(argv[0], 1); - } - - oc->transform += WL_OUTPUT_TRANSFORM_FLIPPED; - break; - case 'h': - case '?': - usage(argv[0], c != 'h'); - } - } -} - int main(int argc, char *argv[]) { struct sample_state state = {0}; @@ -313,9 +224,8 @@ int main(int argc, char *argv[]) { state.y_vel = 500; state.layout = wlr_output_layout_init(); - wl_list_init(&state.config); wl_list_init(&state.outputs); - parse_args(argc, argv, &state.config); + state.config = parse_args(argc, argv); struct compositor_state compositor = { 0 }; compositor.data = &state; @@ -337,8 +247,5 @@ int main(int argc, char *argv[]) { wlr_output_layout_destroy(state.layout); - struct output_config *ptr, *tmp; - wl_list_for_each_safe(ptr, tmp, &state.config, link) { - free(ptr); - } + example_config_destroy(state.config); } diff --git a/examples/rotation.c b/examples/rotation.c index 7024b249..b663f428 100644 --- a/examples/rotation.c +++ b/examples/rotation.c @@ -22,7 +22,7 @@ #include "cat.h" struct sample_state { - struct wl_list config; + struct example_config *config; struct wlr_renderer *renderer; struct wlr_texture *cat_texture; }; @@ -32,12 +32,6 @@ struct output_data { float x_vel, y_vel; }; -struct output_config { - char *name; - enum wl_output_transform transform; - struct wl_list link; -}; - static void handle_output_frame(struct output_state *output, struct timespec *ts) { struct compositor_state *state = output->compositor; struct sample_state *sample = state->data; @@ -81,7 +75,7 @@ static void handle_output_add(struct output_state *output) { struct sample_state *state = output->compositor->data; struct output_config *conf; - wl_list_for_each(conf, &state->config, link) { + wl_list_for_each(conf, &state->config->outputs, link) { if (strcmp(conf->name, output->output->name) == 0) { wlr_output_transform(output->output, conf->transform); break; @@ -126,76 +120,9 @@ static void handle_keyboard_key(struct keyboard_state *kbstate, } } -static void usage(const char *name, int ret) { - fprintf(stderr, - "usage: %s [-d [-r | -f]]*\n" - "\n" - " -o The name of the DRM display. e.g. DVI-I-1.\n" - " -r The rotation counter clockwise. Valid values are 90, 180, 270.\n" - " -f Flip the output along the vertical axis.\n", name); - - exit(ret); -} - -static void parse_args(int argc, char *argv[], struct wl_list *config) { - struct output_config *oc = NULL; - - int c; - while ((c = getopt(argc, argv, "o:r:fh")) != -1) { - switch (c) { - case 'o': - oc = calloc(1, sizeof(*oc)); - oc->name = optarg; - oc->transform = WL_OUTPUT_TRANSFORM_NORMAL; - wl_list_insert(config, &oc->link); - break; - case 'r': - if (!oc) { - fprintf(stderr, "You must specify an output first\n"); - usage(argv[0], 1); - } - - if (oc->transform != WL_OUTPUT_TRANSFORM_NORMAL - && oc->transform != WL_OUTPUT_TRANSFORM_FLIPPED) { - fprintf(stderr, "Rotation for %s already specified\n", oc->name); - usage(argv[0], 1); - } - - if (strcmp(optarg, "90") == 0) { - oc->transform += WL_OUTPUT_TRANSFORM_90; - } else if (strcmp(optarg, "180") == 0) { - oc->transform += WL_OUTPUT_TRANSFORM_180; - } else if (strcmp(optarg, "270") == 0) { - oc->transform += WL_OUTPUT_TRANSFORM_270; - } else { - fprintf(stderr, "Invalid rotation '%s'\n", optarg); - usage(argv[0], 1); - } - break; - case 'f': - if (!oc) { - fprintf(stderr, "You must specify an output first\n"); - usage(argv[0], 1); - } - - if (oc->transform >= WL_OUTPUT_TRANSFORM_FLIPPED) { - fprintf(stderr, "Flip for %s already specified\n", oc->name); - usage(argv[0], 1); - } - - oc->transform += WL_OUTPUT_TRANSFORM_FLIPPED; - break; - case 'h': - case '?': - usage(argv[0], c != 'h'); - } - } -} - int main(int argc, char *argv[]) { struct sample_state state = {0}; - wl_list_init(&state.config); - parse_args(argc, argv, &state.config); + state.config = parse_args(argc, argv); struct compositor_state compositor = { 0 }; compositor.data = &state; @@ -223,8 +150,5 @@ int main(int argc, char *argv[]) { wlr_texture_destroy(state.cat_texture); wlr_renderer_destroy(state.renderer); - struct output_config *ptr, *tmp; - wl_list_for_each_safe(ptr, tmp, &state.config, link) { - free(ptr); - } + example_config_destroy(state.config); } diff --git a/examples/shared.c b/examples/shared.c index 5ebb7aa6..f89c9e3c 100644 --- a/examples/shared.c +++ b/examples/shared.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -15,6 +16,100 @@ #include #include "shared.h" +static void usage(const char *name, int ret) { + fprintf(stderr, + "usage: %s [-d [-r | -f]]*\n" + "\n" + " -o The name of the DRM display. e.g. DVI-I-1.\n" + " -r The rotation counter clockwise. Valid values are 90, 180, 270.\n" + " -x The X-axis coordinate position of this output in the layout.\n" + " -y The Y-axis coordinate position of this output in the layout.\n" + " -f Flip the output along the vertical axis.\n", name); + + exit(ret); +} + +struct example_config *parse_args(int argc, char *argv[]) { + struct example_config *config = calloc(1, sizeof(struct example_config)); + wl_list_init(&config->outputs); + struct output_config *oc = NULL; + + int c; + while ((c = getopt(argc, argv, "o:r:x:y:fh")) != -1) { + switch (c) { + case 'o': + oc = calloc(1, sizeof(*oc)); + oc->name = optarg; + oc->transform = WL_OUTPUT_TRANSFORM_NORMAL; + wl_list_insert(&config->outputs, &oc->link); + break; + case 'r': + if (!oc) { + fprintf(stderr, "You must specify an output first\n"); + usage(argv[0], 1); + } + + if (oc->transform != WL_OUTPUT_TRANSFORM_NORMAL + && oc->transform != WL_OUTPUT_TRANSFORM_FLIPPED) { + fprintf(stderr, "Rotation for %s already specified\n", oc->name); + usage(argv[0], 1); + } + + if (strcmp(optarg, "90") == 0) { + oc->transform += WL_OUTPUT_TRANSFORM_90; + } else if (strcmp(optarg, "180") == 0) { + oc->transform += WL_OUTPUT_TRANSFORM_180; + } else if (strcmp(optarg, "270") == 0) { + oc->transform += WL_OUTPUT_TRANSFORM_270; + } else { + fprintf(stderr, "Invalid rotation '%s'\n", optarg); + usage(argv[0], 1); + } + break; + case 'x': + if (!oc) { + fprintf(stderr, "You must specify an output first\n"); + usage(argv[0], 1); + } + oc->x = strtol(optarg, NULL, 0); + break; + case 'y': + if (!oc) { + fprintf(stderr, "You must specify an output first\n"); + usage(argv[0], 1); + } + oc->y = strtol(optarg, NULL, 0); + break; + case 'f': + if (!oc) { + fprintf(stderr, "You must specify an output first\n"); + usage(argv[0], 1); + } + + if (oc->transform >= WL_OUTPUT_TRANSFORM_FLIPPED) { + fprintf(stderr, "Flip for %s already specified\n", oc->name); + usage(argv[0], 1); + } + + oc->transform += WL_OUTPUT_TRANSFORM_FLIPPED; + break; + case 'h': + case '?': + usage(argv[0], c != 'h'); + } + } + + return config; +} + +void example_config_destroy(struct example_config *config) { + struct output_config *oc, *tmp = NULL; + wl_list_for_each_safe(oc, tmp, &config->outputs, link) { + free(oc); + } + free(config); +} + static void keyboard_led_update(struct keyboard_state *kbstate) { uint32_t leds = 0; for (uint32_t i = 0; i < WLR_LED_LAST; ++i) { diff --git a/examples/shared.h b/examples/shared.h index e2ebadef..87982464 100644 --- a/examples/shared.h +++ b/examples/shared.h @@ -12,6 +12,21 @@ #include #include +struct output_config { + char *name; + enum wl_output_transform transform; + int x, y; + struct wl_list link; +}; + +struct example_config { + struct wl_list outputs; +}; + +struct example_config *parse_args(int argc, char *argv[]); + +void example_config_destroy(struct example_config *config); + struct output_state { struct compositor_state *compositor; struct wlr_output *output; From e3edb081269e8db42d8e8e4cc497ddd2bd0109f2 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Fri, 18 Aug 2017 19:31:16 -0400 Subject: [PATCH 2/2] bring output configuration into shared.h --- examples/output-layout.c | 68 ++++++++-------------------------------- examples/shared.c | 48 ++++++++++++++++++++++++++++ examples/shared.h | 3 ++ 3 files changed, 64 insertions(+), 55 deletions(-) diff --git a/examples/output-layout.c b/examples/output-layout.c index 4b059f70..dd43d2f4 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -119,71 +119,29 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts } } -static inline int max(int a, int b) { - return a < b ? b : a; -} - -static void configure_layout(struct sample_state *sample) { - wlr_output_layout_destroy(sample->layout); - sample->layout = wlr_output_layout_init(); - sample->main_output = NULL; - int max_x = wl_list_empty(&sample->config->outputs) ? 0 : INT_MIN; - - // first add all the configure outputs - struct output_state *output; - wl_list_for_each(output, &sample->outputs, link) { - struct output_config *conf; - wl_list_for_each(conf, &sample->config->outputs, link) { - if (strcmp(conf->name, output->output->name) == 0) { - wlr_output_layout_add(sample->layout, output->output, - conf->x, conf->y); - wlr_output_transform(output->output, conf->transform); - int width, height; - wlr_output_effective_resolution(output->output, &width, &height); - max_x = max(max_x, conf->x + width); - - if (!sample->main_output) { - sample->main_output = output->output; - sample->x_offs = conf->x + 20; - sample->y_offs = conf->y + 20; - } - break; - } - } - } - - // now add all the other configured outputs in a sensible position - wl_list_for_each(output, &sample->outputs, link) { - if (wlr_output_layout_get(sample->layout, output->output)) { - continue; - } - wlr_output_layout_add(sample->layout, output->output, max_x, 0); - int width, height; - wlr_output_effective_resolution(output->output, &width, &height); - wlr_output_effective_resolution(output->output, &width, &height); - if (!sample->main_output) { - sample->main_output = output->output; - sample->x_offs = max_x + 200; - sample->y_offs = 200; - } - max_x += width; - } +static void set_main_output(struct sample_state *sample, + struct wlr_output *output) { + sample->main_output = output; + struct wlr_output_layout_output *l_output; + l_output = wlr_output_layout_get(sample->layout, output); + sample->x_offs = l_output->x + 200; + sample->y_offs = l_output->y + 200; } static void handle_output_resolution(struct compositor_state *state, struct output_state *output) { struct sample_state *sample = state->data; - configure_layout(sample); + wlr_output_layout_destroy(sample->layout); + sample->layout = configure_layout(sample->config, &sample->outputs); + set_main_output(sample, output->output); - // reset the image - struct wlr_output_layout_output *l_output = wlr_output_layout_get(sample->layout, sample->main_output); - sample->x_offs = l_output->x + 20; - sample->y_offs = l_output->y + 20; } static void handle_output_add(struct output_state *output) { struct sample_state *sample = output->compositor->data; wl_list_insert(&sample->outputs, &output->link); - configure_layout(sample); + wlr_output_layout_destroy(sample->layout); + sample->layout = configure_layout(sample->config, &sample->outputs); + set_main_output(sample, output->output); } static void update_velocities(struct compositor_state *state, diff --git a/examples/shared.c b/examples/shared.c index f89c9e3c..255652c7 100644 --- a/examples/shared.c +++ b/examples/shared.c @@ -6,12 +6,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include "shared.h" @@ -110,6 +112,52 @@ void example_config_destroy(struct example_config *config) { free(config); } +struct wlr_output_layout *configure_layout(struct example_config *config, struct wl_list *outputs) { + struct wlr_output_layout *layout = wlr_output_layout_init(); + int max_x = INT_MIN; + int max_x_y = INT_MIN; // y value for the max_x output + + // first add all the configured outputs + struct output_state *output; + wl_list_for_each(output, outputs, link) { + struct output_config *conf; + wl_list_for_each(conf, &config->outputs, link) { + if (strcmp(conf->name, output->output->name) == 0) { + wlr_output_layout_add(layout, output->output, + conf->x, conf->y); + wlr_output_transform(output->output, conf->transform); + int width, height; + wlr_output_effective_resolution(output->output, &width, &height); + if (conf->x + width > max_x) { + max_x = conf->x + width; + max_x_y = conf->y; + } + break; + } + } + } + + if (max_x == INT_MIN) { + // couldn't find a configured output + max_x = 0; + max_x_y = 0; + } + + // now add all the other configured outputs in a sensible position + wl_list_for_each(output, outputs, link) { + if (wlr_output_layout_get(layout, output->output)) { + continue; + } + wlr_output_layout_add(layout, output->output, max_x, max_x_y); + int width, height; + wlr_output_effective_resolution(output->output, &width, &height); + max_x += width; + } + + return layout; +} + + static void keyboard_led_update(struct keyboard_state *kbstate) { uint32_t leds = 0; for (uint32_t i = 0; i < WLR_LED_LAST; ++i) { diff --git a/examples/shared.h b/examples/shared.h index 87982464..23b2d83d 100644 --- a/examples/shared.h +++ b/examples/shared.h @@ -27,6 +27,9 @@ struct example_config *parse_args(int argc, char *argv[]); void example_config_destroy(struct example_config *config); +struct wlr_output_layout *configure_layout(struct example_config *config, + struct wl_list *outputs); + struct output_state { struct compositor_state *compositor; struct wlr_output *output;