diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-09-05 08:24:53 -0400 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-09-05 08:24:53 -0400 |
commit | 0cdd7fac02f77689fc80f795e13e38447e6c6a09 (patch) | |
tree | 5f20ad224957c2419ac2ddeef8b536609083ab3b | |
parent | c5a2014a2ff3e22086c0d911f3bf771c5d5fb112 (diff) |
pointer.c: refactor device configuration
-rw-r--r-- | examples/config.c | 12 | ||||
-rw-r--r-- | examples/config.h | 8 | ||||
-rw-r--r-- | examples/pointer.c | 28 |
3 files changed, 33 insertions, 15 deletions
diff --git a/examples/config.c b/examples/config.c index 6796ea66..3a884760 100644 --- a/examples/config.c +++ b/examples/config.c @@ -266,3 +266,15 @@ struct output_config *example_config_get_output(struct example_config *config, return NULL; } + +struct device_config *example_config_get_device(struct example_config *config, + struct wlr_input_device *device) { + struct device_config *d_config; + wl_list_for_each(d_config, &config->devices, link) { + if (strcmp(d_config->name, device->name) == 0) { + return d_config; + } + } + + return NULL; +} diff --git a/examples/config.h b/examples/config.h index bc2e101b..93cf08c8 100644 --- a/examples/config.h +++ b/examples/config.h @@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200112L #endif #include <wlr/types/wlr_output_layout.h> +#include <wlr/types/wlr_input_device.h> struct output_config { char *name; @@ -41,4 +42,11 @@ void example_config_destroy(struct example_config *config); struct output_config *example_config_get_output(struct example_config *config, struct wlr_output *output); +/** + * Get configuration for the device. If the device is not configured, returns + * NULL. + */ +struct device_config *example_config_get_device(struct example_config *config, + struct wlr_input_device *device); + #endif diff --git a/examples/pointer.c b/examples/pointer.c index 1eb0f923..07b6d1c2 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -97,31 +97,29 @@ static void handle_output_frame(struct output_state *output, static void configure_devices(struct sample_state *sample) { struct sample_input_device *dev; - struct device_config *dc; + struct device_config *d_config; // reset device mappings wl_list_for_each(dev, &sample->devices, link) { wlr_cursor_map_input_to_output(sample->cursor, dev->device, NULL); - wl_list_for_each(dc, &sample->config->devices, link) { - if (strcmp(dev->device->name, dc->name) == 0) { - wlr_cursor_map_input_to_region(sample->cursor, dev->device, - dc->mapped_box); - } + d_config = example_config_get_device(sample->config, dev->device); + if (d_config) { + wlr_cursor_map_input_to_region(sample->cursor, dev->device, + d_config->mapped_box); } } struct output_state *ostate; wl_list_for_each(ostate, &sample->compositor->outputs, link) { - wl_list_for_each(dc, &sample->config->devices, link) { + struct wlr_output *output = ostate->output; + wl_list_for_each(dev, &sample->devices, link) { // configure device to output mappings - if (dc->mapped_output && - strcmp(dc->mapped_output, ostate->output->name) == 0) { - wl_list_for_each(dev, &sample->devices, link) { - if (strcmp(dev->device->name, dc->name) == 0) { - wlr_cursor_map_input_to_output(sample->cursor, - dev->device, ostate->output); - } - } + d_config = example_config_get_device(sample->config, dev->device); + if (d_config && + d_config->mapped_output && + strcmp(d_config->mapped_output, output->name) == 0) { + wlr_cursor_map_input_to_output(sample->cursor, dev->device, + ostate->output); } } } |