hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor example output config

Browse source 
Put all the config parsing into shared.h so it is shared among the examples.
This commit is contained in:
Tony Crisci 2017-08-18 17:44:10 -04:00
parent a1551bccc0
commit 769549c652
4 changed files with 119 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
examples/output-layout.c
View file

@ -25,7 +25,7 @@
#include "cat.h" #include "cat.h"
struct sample_state { struct sample_state {
struct wl_list config; struct example_config *config;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wlr_texture *cat_texture; struct wlr_texture *cat_texture;
struct wlr_output_layout *layout; struct wlr_output_layout *layout;
@ -35,13 +35,6 @@ struct sample_state {
struct wl_list outputs; 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) { static void handle_output_frame(struct output_state *output, struct timespec *ts) {
struct compositor_state *state = output->compositor; struct compositor_state *state = output->compositor;
struct sample_state *sample = state->data; struct sample_state *sample = state->data;
@ -134,13 +127,13 @@ static void configure_layout(struct sample_state *sample) {
wlr_output_layout_destroy(sample->layout); wlr_output_layout_destroy(sample->layout);
sample->layout = wlr_output_layout_init(); sample->layout = wlr_output_layout_init();
sample->main_output = NULL; 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 // first add all the configure outputs
struct output_state *output; struct output_state *output;
wl_list_for_each(output, &sample->outputs, link) { wl_list_for_each(output, &sample->outputs, link) {
struct output_config *conf; 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) { if (strcmp(conf->name, output->output->name) == 0) {
wlr_output_layout_add(sample->layout, output->output, wlr_output_layout_add(sample->layout, output->output,
conf->x, conf->y); 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 <name> [-r <rotation> | -f]]*\n"
"\n"
" -o <output> The name of the DRM display. e.g. DVI-I-1.\n"
" -r <rotation> The rotation counter clockwise. Valid values are 90, 180, 270.\n"
" -x <position> The X-axis coordinate position of this output in the layout.\n"
" -y <position> 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[]) { int main(int argc, char *argv[]) {
struct sample_state state = {0}; struct sample_state state = {0};
@ -313,9 +224,8 @@ int main(int argc, char *argv[]) {
state.y_vel = 500; state.y_vel = 500;
state.layout = wlr_output_layout_init(); state.layout = wlr_output_layout_init();
wl_list_init(&state.config);
wl_list_init(&state.outputs); wl_list_init(&state.outputs);
parse_args(argc, argv, &state.config); state.config = parse_args(argc, argv);
struct compositor_state compositor = { 0 }; struct compositor_state compositor = { 0 };
compositor.data = &state; compositor.data = &state;
@ -337,8 +247,5 @@ int main(int argc, char *argv[]) {
wlr_output_layout_destroy(state.layout); wlr_output_layout_destroy(state.layout);
struct output_config *ptr, *tmp; example_config_destroy(state.config);
wl_list_for_each_safe(ptr, tmp, &state.config, link) {
free(ptr);
}
} }

84
examples/rotation.c
View file

@ -22,7 +22,7 @@
#include "cat.h" #include "cat.h"
struct sample_state { struct sample_state {
struct wl_list config; struct example_config *config;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wlr_texture *cat_texture; struct wlr_texture *cat_texture;
}; };
@ -32,12 +32,6 @@ struct output_data {
float x_vel, y_vel; 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) { static void handle_output_frame(struct output_state *output, struct timespec *ts) {
struct compositor_state *state = output->compositor; struct compositor_state *state = output->compositor;
struct sample_state *sample = state->data; 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 sample_state *state = output->compositor->data;
struct output_config *conf; 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) { if (strcmp(conf->name, output->output->name) == 0) {
wlr_output_transform(output->output, conf->transform); wlr_output_transform(output->output, conf->transform);
break; 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 <name> [-r <rotation> | -f]]*\n"
"\n"
" -o <output> The name of the DRM display. e.g. DVI-I-1.\n"
" -r <rotation> 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[]) { int main(int argc, char *argv[]) {
struct sample_state state = {0}; struct sample_state state = {0};
wl_list_init(&state.config); state.config = parse_args(argc, argv);
parse_args(argc, argv, &state.config);
struct compositor_state compositor = { 0 }; struct compositor_state compositor = { 0 };
compositor.data = &state; compositor.data = &state;
@ -223,8 +150,5 @@ int main(int argc, char *argv[]) {
wlr_texture_destroy(state.cat_texture); wlr_texture_destroy(state.cat_texture);
wlr_renderer_destroy(state.renderer); wlr_renderer_destroy(state.renderer);
struct output_config *ptr, *tmp; example_config_destroy(state.config);
wl_list_for_each_safe(ptr, tmp, &state.config, link) {
free(ptr);
}
} }

95
examples/shared.c
View file

@ -5,6 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <wayland-server-protocol.h> #include <wayland-server-protocol.h>
#include <wlr/backend.h> #include <wlr/backend.h>
@ -15,6 +16,100 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "shared.h" #include "shared.h"
static void usage(const char *name, int ret) {
fprintf(stderr,
"usage: %s [-d <name> [-r <rotation> | -f]]*\n"
"\n"
" -o <output> The name of the DRM display. e.g. DVI-I-1.\n"
" -r <rotation> The rotation counter clockwise. Valid values are 90, 180, 270.\n"
" -x <position> The X-axis coordinate position of this output in the layout.\n"
" -y <position> 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) { static void keyboard_led_update(struct keyboard_state *kbstate) {
uint32_t leds = 0; uint32_t leds = 0;
for (uint32_t i = 0; i < WLR_LED_LAST; ++i) { for (uint32_t i = 0; i < WLR_LED_LAST; ++i) {

15
examples/shared.h
View file

@ -12,6 +12,21 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_input_device.h>
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 output_state {
struct compositor_state *compositor; struct compositor_state *compositor;
struct wlr_output *output; struct wlr_output *output;