mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-28 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not create uninitialized sway_keyboard

Browse source 
It's not good to create a uninitialized struct, because it might become
a possible error in future. I actually got hit by this while working on
https://github.com/swaywm/sway/pull/3155

Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
This commit is contained in:
Konstantin Kharlamov 2018-11-25 18:16:40 +03:00
parent 827e5513e0
commit 58fab705ac
3 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/input/keyboard.h
View file

@ -47,8 +47,6 @@ struct sway_keyboard {
struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat,
struct sway_seat_device *device); struct sway_seat_device *device);
void sway_keyboard_configure(struct sway_keyboard *keyboard);
void sway_keyboard_destroy(struct sway_keyboard *keyboard); void sway_keyboard_destroy(struct sway_keyboard *keyboard);
#endif #endif

43
sway/input/keyboard.c
View file

@ -386,27 +386,7 @@ static void handle_keyboard_modifiers(struct wl_listener *listener,
determine_bar_visibility(modifiers); determine_bar_visibility(modifiers);
} }
struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, static void sway_keyboard_configure(struct sway_keyboard *keyboard) {
struct sway_seat_device *device) {
struct sway_keyboard *keyboard =
calloc(1, sizeof(struct sway_keyboard));
if (!sway_assert(keyboard, "could not allocate sway keyboard")) {
return NULL;
}
keyboard->seat_device = device;
device->keyboard = keyboard;
wl_list_init(&keyboard->keyboard_key.link);
wl_list_init(&keyboard->keyboard_modifiers.link);
keyboard->key_repeat_source = wl_event_loop_add_timer(server.wl_event_loop,
handle_keyboard_repeat, keyboard);
return keyboard;
}
void sway_keyboard_configure(struct sway_keyboard *keyboard) {
struct xkb_rule_names rules; struct xkb_rule_names rules;
memset(&rules, 0, sizeof(rules)); memset(&rules, 0, sizeof(rules));
struct input_config *input_config = struct input_config *input_config =
@ -507,6 +487,27 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers; keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers;
} }
struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat,
struct sway_seat_device *device) {
struct sway_keyboard *keyboard =
calloc(1, sizeof(struct sway_keyboard));
if (!sway_assert(keyboard, "could not allocate sway keyboard")) {
return NULL;
}
keyboard->seat_device = device;
device->keyboard = keyboard;
wl_list_init(&keyboard->keyboard_key.link);
wl_list_init(&keyboard->keyboard_modifiers.link);
keyboard->key_repeat_source = wl_event_loop_add_timer(server.wl_event_loop,
handle_keyboard_repeat, keyboard);
sway_keyboard_configure(device->keyboard);
return keyboard;
}
void sway_keyboard_destroy(struct sway_keyboard *keyboard) { void sway_keyboard_destroy(struct sway_keyboard *keyboard) {
if (!keyboard) { if (!keyboard) {
return; return;

1
sway/input/seat.c
View file

@ -446,7 +446,6 @@ static void seat_configure_keyboard(struct sway_seat *seat,
} }
struct wlr_keyboard *wlr_keyboard = struct wlr_keyboard *wlr_keyboard =
seat_device->input_device->wlr_device->keyboard; seat_device->input_device->wlr_device->keyboard;
sway_keyboard_configure(seat_device->keyboard);
wlr_seat_set_keyboard(seat->wlr_seat, wlr_seat_set_keyboard(seat->wlr_seat,
seat_device->input_device->wlr_device); seat_device->input_device->wlr_device);
struct sway_node *focus = seat_get_focus(seat); struct sway_node *focus = seat_get_focus(seat);