aboutsummaryrefslogtreecommitdiff
path: root/examples/simple.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/simple.c
parent7f1230fe7881d343e83da30affcbae80e494da08 (diff)
Fixed style issues
Diffstat (limited to 'examples/simple.c')
-rw-r--r--examples/simple.c16
1 files changed, 6 insertions, 10 deletions
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);