From 7da50d065b298b74e16c86065c19cfe22e157c6f Mon Sep 17 00:00:00 2001 From: Timidger Date: Sun, 29 Apr 2018 20:16:29 -0400 Subject: [PATCH] Fixed style issues --- examples/multi-pointer.c | 26 ++++++++++---------------- examples/output-layout.c | 15 ++++++--------- examples/pointer.c | 16 ++++++---------- examples/rotation.c | 15 ++++++--------- examples/simple.c | 16 ++++++---------- examples/tablet.c | 23 +++++++++-------------- examples/touch.c | 20 ++++++++------------ 7 files changed, 51 insertions(+), 80 deletions(-) diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c index 236fd99e..6b67e8eb 100644 --- a/examples/multi-pointer.c +++ b/examples/multi-pointer.c @@ -205,8 +205,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) { for (int i = 0; i < nsyms; i++) { xkb_keysym_t sym = syms[i]; if (sym == XKB_KEY_Escape) { - wl_display_terminate(sample->display); - } + wl_display_terminate(sample->display); + } } } @@ -220,28 +220,22 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void new_input_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; struct sample_state *sample = wl_container_of(listener, sample, new_input); - struct sample_keyboard *keyboard; - struct xkb_rule_names rules; - struct xkb_context *context; - struct sample_cursor *cursor = 0; - struct sample_pointer *pointer = 0; - struct wlr_xcursor_image *image; switch (device->type) { - case WLR_INPUT_DEVICE_KEYBOARD: - keyboard = calloc(1, sizeof(struct sample_keyboard)); + case WLR_INPUT_DEVICE_KEYBOARD:; + struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard)); keyboard->device = device; keyboard->sample = sample; wl_signal_add(&device->events.destroy, &keyboard->destroy); keyboard->destroy.notify = keyboard_destroy_notify; wl_signal_add(&device->keyboard->events.key, &keyboard->key); keyboard->key.notify = keyboard_key_notify; - memset(&rules, 0, sizeof(rules)); + struct xkb_rule_names rules = { 0 }; rules.rules = getenv("XKB_DEFAULT_RULES"); rules.model = getenv("XKB_DEFAULT_MODEL"); rules.layout = getenv("XKB_DEFAULT_LAYOUT"); rules.variant = getenv("XKB_DEFAULT_VARIANT"); rules.options = getenv("XKB_DEFAULT_OPTIONS"); - context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { wlr_log(L_ERROR, "Failed to create XKB context"); exit(1); @@ -250,9 +244,9 @@ void new_input_notify(struct wl_listener *listener, void *data) { &rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); xkb_context_unref(context); break; - case WLR_INPUT_DEVICE_POINTER: - cursor = calloc(1, sizeof(struct sample_cursor)); - pointer = calloc(1, sizeof(struct sample_pointer)); + case WLR_INPUT_DEVICE_POINTER:; + struct sample_cursor *cursor = calloc(1, sizeof(struct sample_cursor)); + struct sample_pointer *pointer = calloc(1, sizeof(struct sample_pointer)); pointer->device = device; cursor->sample = sample; cursor->device = device; @@ -270,7 +264,7 @@ void new_input_notify(struct wl_listener *listener, void *data) { wlr_cursor_attach_input_device(cursor->cursor, device); configure_cursor(cursor->cursor, device, sample); - image = sample->xcursor->images[0]; + struct wlr_xcursor_image *image = sample->xcursor->images[0]; wlr_cursor_set_image(cursor->cursor, image->buffer, image->width * 4, image->width, image->height, image->hotspot_x, image->hotspot_y, 0); diff --git a/examples/output-layout.c b/examples/output-layout.c index 9c8db60a..382e170e 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -184,8 +184,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) { for (int i = 0; i < nsyms; i++) { xkb_keysym_t sym = syms[i]; if (sym == XKB_KEY_Escape) { - wl_display_terminate(sample->display); - } + wl_display_terminate(sample->display); + } // NOTE: It may be better to simply refer to our key state during each frame // and make this change in pixels/sec^2 // Also, key repeat @@ -219,25 +219,22 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void new_input_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; struct sample_state *sample = wl_container_of(listener, sample, new_input); - struct sample_keyboard *keyboard; - struct xkb_rule_names rules; - struct xkb_context *context; switch (device->type) { - case WLR_INPUT_DEVICE_KEYBOARD: - keyboard = calloc(1, sizeof(struct sample_keyboard)); + case WLR_INPUT_DEVICE_KEYBOARD:; + struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard)); keyboard->device = device; keyboard->sample = sample; wl_signal_add(&device->events.destroy, &keyboard->destroy); keyboard->destroy.notify = keyboard_destroy_notify; wl_signal_add(&device->keyboard->events.key, &keyboard->key); keyboard->key.notify = keyboard_key_notify; - memset(&rules, 0, sizeof(rules)); + struct xkb_rule_names rules = { 0 }; rules.rules = getenv("XKB_DEFAULT_RULES"); rules.model = getenv("XKB_DEFAULT_MODEL"); rules.layout = getenv("XKB_DEFAULT_LAYOUT"); rules.variant = getenv("XKB_DEFAULT_VARIANT"); rules.options = getenv("XKB_DEFAULT_OPTIONS"); - context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { wlr_log(L_ERROR, "Failed to create XKB context"); exit(1); diff --git a/examples/pointer.c b/examples/pointer.c index 00002921..96c07667 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -74,7 +74,6 @@ struct sample_keyboard { struct wl_listener destroy; }; - static void warp_to_touch(struct sample_state *sample, struct wlr_input_device *dev) { if (wl_list_empty(&sample->touch_points)) { @@ -235,8 +234,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) { for (int i = 0; i < nsyms; i++) { xkb_keysym_t sym = syms[i]; if (sym == XKB_KEY_Escape) { - wl_display_terminate(sample->display); - } + wl_display_terminate(sample->display); + } } } @@ -282,9 +281,6 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void new_input_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; struct sample_state *sample = wl_container_of(listener, sample, new_input); - struct sample_keyboard *keyboard; - struct xkb_rule_names rules; - struct xkb_context *context; switch (device->type) { case WLR_INPUT_DEVICE_POINTER: case WLR_INPUT_DEVICE_TOUCH: @@ -292,21 +288,21 @@ void new_input_notify(struct wl_listener *listener, void *data) { wlr_cursor_attach_input_device(sample->cursor, device); break; - case WLR_INPUT_DEVICE_KEYBOARD: - keyboard = calloc(1, sizeof(struct sample_keyboard)); + case WLR_INPUT_DEVICE_KEYBOARD:; + struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard)); keyboard->device = device; keyboard->sample = sample; wl_signal_add(&device->events.destroy, &keyboard->destroy); keyboard->destroy.notify = keyboard_destroy_notify; wl_signal_add(&device->keyboard->events.key, &keyboard->key); keyboard->key.notify = keyboard_key_notify; - memset(&rules, 0, sizeof(rules)); + struct xkb_rule_names rules = { 0 }; rules.rules = getenv("XKB_DEFAULT_RULES"); rules.model = getenv("XKB_DEFAULT_MODEL"); rules.layout = getenv("XKB_DEFAULT_LAYOUT"); rules.variant = getenv("XKB_DEFAULT_VARIANT"); rules.options = getenv("XKB_DEFAULT_OPTIONS"); - context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { wlr_log(L_ERROR, "Failed to create XKB context"); exit(1); diff --git a/examples/rotation.c b/examples/rotation.c index 618e91af..4a30cd96 100644 --- a/examples/rotation.c +++ b/examples/rotation.c @@ -138,8 +138,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) { for (int i = 0; i < nsyms; i++) { xkb_keysym_t sym = syms[i]; if (sym == XKB_KEY_Escape) { - wl_display_terminate(sample->display); - } + wl_display_terminate(sample->display); + } if (event->state == WLR_KEY_PRESSED) { switch (sym) { case XKB_KEY_Left: @@ -169,25 +169,22 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void new_input_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; struct sample_state *sample = wl_container_of(listener, sample, new_input); - struct sample_keyboard *keyboard; - struct xkb_rule_names rules; - struct xkb_context *context; switch (device->type) { - case WLR_INPUT_DEVICE_KEYBOARD: - keyboard = calloc(1, sizeof(struct sample_keyboard)); + case WLR_INPUT_DEVICE_KEYBOARD:; + struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard)); keyboard->device = device; keyboard->sample = sample; wl_signal_add(&device->events.destroy, &keyboard->destroy); keyboard->destroy.notify = keyboard_destroy_notify; wl_signal_add(&device->keyboard->events.key, &keyboard->key); keyboard->key.notify = keyboard_key_notify; - memset(&rules, 0, sizeof(rules)); + struct xkb_rule_names rules = { 0 }; rules.rules = getenv("XKB_DEFAULT_RULES"); rules.model = getenv("XKB_DEFAULT_MODEL"); rules.layout = getenv("XKB_DEFAULT_LAYOUT"); rules.variant = getenv("XKB_DEFAULT_VARIANT"); rules.options = getenv("XKB_DEFAULT_OPTIONS"); - context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { wlr_log(L_ERROR, "Failed to create XKB context"); exit(1); diff --git a/examples/simple.c b/examples/simple.c index 0c58f933..d3424036 100644 --- a/examples/simple.c +++ b/examples/simple.c @@ -36,7 +36,6 @@ struct sample_keyboard { struct wl_listener destroy; }; - void output_frame_notify(struct wl_listener *listener, void *data) { wlr_log(L_DEBUG, "Output removed"); struct sample_output *sample_output = wl_container_of(listener, sample_output, frame); @@ -100,8 +99,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) { for (int i = 0; i < nsyms; i++) { xkb_keysym_t sym = syms[i]; if (sym == XKB_KEY_Escape) { - wl_display_terminate(sample->display); - } + wl_display_terminate(sample->display); + } } } @@ -115,25 +114,22 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void new_input_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; struct sample_state *sample = wl_container_of(listener, sample, new_input); - struct sample_keyboard *keyboard; - struct xkb_rule_names rules; - struct xkb_context *context; switch (device->type) { - case WLR_INPUT_DEVICE_KEYBOARD: - keyboard = calloc(1, sizeof(struct sample_keyboard)); + case WLR_INPUT_DEVICE_KEYBOARD:; + struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard)); keyboard->device = device; keyboard->sample = sample; wl_signal_add(&device->events.destroy, &keyboard->destroy); keyboard->destroy.notify = keyboard_destroy_notify; wl_signal_add(&device->keyboard->events.key, &keyboard->key); keyboard->key.notify = keyboard_key_notify; - memset(&rules, 0, sizeof(rules)); + struct xkb_rule_names rules = { 0 }; rules.rules = getenv("XKB_DEFAULT_RULES"); rules.model = getenv("XKB_DEFAULT_MODEL"); rules.layout = getenv("XKB_DEFAULT_LAYOUT"); rules.variant = getenv("XKB_DEFAULT_VARIANT"); rules.options = getenv("XKB_DEFAULT_OPTIONS"); - context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { wlr_log(L_ERROR, "Failed to create XKB context"); exit(1); diff --git a/examples/tablet.c b/examples/tablet.c index 7b8abeb4..bf67ab93 100644 --- a/examples/tablet.c +++ b/examples/tablet.c @@ -263,8 +263,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) { for (int i = 0; i < nsyms; i++) { xkb_keysym_t sym = syms[i]; if (sym == XKB_KEY_Escape) { - wl_display_terminate(sample->display); - } + wl_display_terminate(sample->display); + } } } @@ -278,27 +278,22 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void new_input_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; struct sample_state *sample = wl_container_of(listener, sample, new_input); - struct sample_keyboard *keyboard; - struct xkb_rule_names rules; - struct xkb_context *context; - struct tablet_tool_state *tstate; - struct tablet_pad_state *pstate; switch (device->type) { - case WLR_INPUT_DEVICE_KEYBOARD: - keyboard = calloc(1, sizeof(struct sample_keyboard)); + case WLR_INPUT_DEVICE_KEYBOARD:; + struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard)); keyboard->device = device; keyboard->sample = sample; wl_signal_add(&device->events.destroy, &keyboard->destroy); keyboard->destroy.notify = keyboard_destroy_notify; wl_signal_add(&device->keyboard->events.key, &keyboard->key); keyboard->key.notify = keyboard_key_notify; - memset(&rules, 0, sizeof(rules)); + struct xkb_rule_names rules = { 0 }; rules.rules = getenv("XKB_DEFAULT_RULES"); rules.model = getenv("XKB_DEFAULT_MODEL"); rules.layout = getenv("XKB_DEFAULT_LAYOUT"); rules.variant = getenv("XKB_DEFAULT_VARIANT"); rules.options = getenv("XKB_DEFAULT_OPTIONS"); - context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { wlr_log(L_ERROR, "Failed to create XKB context"); exit(1); @@ -307,8 +302,8 @@ void new_input_notify(struct wl_listener *listener, void *data) { &rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); xkb_context_unref(context); break; - case WLR_INPUT_DEVICE_TABLET_PAD: - pstate = calloc(sizeof(struct tablet_pad_state), 1); + case WLR_INPUT_DEVICE_TABLET_PAD:; + struct tablet_pad_state *pstate = calloc(sizeof(struct tablet_pad_state), 1); pstate->device = device; pstate->sample = sample; pstate->destroy.notify = tablet_pad_destroy_notify; @@ -325,7 +320,7 @@ void new_input_notify(struct wl_listener *listener, void *data) { sample->height_mm = device->height_mm == 0 ? 10 : device->height_mm; - tstate = calloc(sizeof(struct tablet_tool_state), 1); + struct tablet_tool_state *tstate = calloc(sizeof(struct tablet_tool_state), 1); tstate->device = device; tstate->sample = sample; tstate->destroy.notify = tablet_tool_destroy_notify; diff --git a/examples/touch.c b/examples/touch.c index 1d56a9ff..47f5793c 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -176,8 +176,8 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) { for (int i = 0; i < nsyms; i++) { xkb_keysym_t sym = syms[i]; if (sym == XKB_KEY_Escape) { - wl_display_terminate(sample->display); - } + wl_display_terminate(sample->display); + } } } @@ -191,26 +191,22 @@ void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void new_input_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; struct sample_state *sample = wl_container_of(listener, sample, new_input); - struct sample_keyboard *keyboard; - struct xkb_rule_names rules; - struct xkb_context *context; - struct touch_state *tstate; switch (device->type) { - case WLR_INPUT_DEVICE_KEYBOARD: - keyboard = calloc(1, sizeof(struct sample_keyboard)); + case WLR_INPUT_DEVICE_KEYBOARD:; + struct sample_keyboard *keyboard = calloc(1, sizeof(struct sample_keyboard)); keyboard->device = device; keyboard->sample = sample; wl_signal_add(&device->events.destroy, &keyboard->destroy); keyboard->destroy.notify = keyboard_destroy_notify; wl_signal_add(&device->keyboard->events.key, &keyboard->key); keyboard->key.notify = keyboard_key_notify; - memset(&rules, 0, sizeof(rules)); + struct xkb_rule_names rules = { 0 }; rules.rules = getenv("XKB_DEFAULT_RULES"); rules.model = getenv("XKB_DEFAULT_MODEL"); rules.layout = getenv("XKB_DEFAULT_LAYOUT"); rules.variant = getenv("XKB_DEFAULT_VARIANT"); rules.options = getenv("XKB_DEFAULT_OPTIONS"); - context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { wlr_log(L_ERROR, "Failed to create XKB context"); exit(1); @@ -219,8 +215,8 @@ void new_input_notify(struct wl_listener *listener, void *data) { &rules, XKB_KEYMAP_COMPILE_NO_FLAGS)); xkb_context_unref(context); break; - case WLR_INPUT_DEVICE_TOUCH: - tstate = calloc(sizeof(struct touch_state), 1); + case WLR_INPUT_DEVICE_TOUCH:; + struct touch_state *tstate = calloc(sizeof(struct touch_state), 1); tstate->device = device; tstate->sample = sample; tstate->destroy.notify = touch_destroy_notify;