mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm, evdev: don't crash on missing keyboard

Browse Source 
Weston's notify_keyboard_focus_*() assume that a keyboard is present, if
they are called. With evdev, there might not always be a keyboard.

Also clean up the variable definition in evdev_notify_keyborad_focus().
I read that function through many times and finally had to grep where
does 'all_keys' come from.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen
2012-08-03 14:39:11 +03:00
committed by Kristian Høgsberg
parent 81a13a3757
commit d858351a61
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+1
View File
@@ -2012,6 +2012,7 @@ evdev_remove_devices(struct weston_seat *seat_base)
wl_list_for_each_safe(device, next, &seat->devices_list, link) wl_list_for_each_safe(device, next, &seat->devices_list, link)
evdev_input_device_destroy(device); evdev_input_device_destroy(device);
if (seat->base.seat.keyboard)
notify_keyboard_focus_out(&seat->base.seat); notify_keyboard_focus_out(&seat->base.seat);
} }
src/evdev.c
+5 -1
View File
@@ -561,10 +561,14 @@ evdev_notify_keyboard_focus(struct weston_seat *seat,
struct evdev_input_device *device; struct evdev_input_device *device;
struct wl_array keys; struct wl_array keys;
unsigned int i, set; unsigned int i, set;
char evdev_keys[(KEY_CNT + 7) / 8], all_keys[(KEY_CNT + 7) / 8]; char evdev_keys[(KEY_CNT + 7) / 8];
char all_keys[(KEY_CNT + 7) / 8];
uint32_t *k; uint32_t *k;
int ret; int ret;
if (!seat->seat.keyboard)
return;
memset(all_keys, 0, sizeof all_keys); memset(all_keys, 0, sizeof all_keys);
wl_list_for_each(device, evdev_devices, link) { wl_list_for_each(device, evdev_devices, link) {
memset(evdev_keys, 0, sizeof evdev_keys); memset(evdev_keys, 0, sizeof evdev_keys);