aboutsummaryrefslogtreecommitdiff
path: root/examples/tablet.c
diff options
context:
space:
mode:
authorTimidger <APragmaticPlace@gmail.com>2018-04-29 20:16:29 -0400
committerTimidger <APragmaticPlace@gmail.com>2018-05-10 19:03:58 -0700
commit7da50d065b298b74e16c86065c19cfe22e157c6f (patch)
treec41207da8bb05190082208a80eadd1d0b8bf36dd /examples/tablet.c
parent7f1230fe7881d343e83da30affcbae80e494da08 (diff)
Fixed style issues
Diffstat (limited to 'examples/tablet.c')
-rw-r--r--examples/tablet.c23
1 files changed, 9 insertions, 14 deletions
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;