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

evdev: make evdev_notify_keyboard_focus() independent of evdev_seat

Browse Source 
in preparation of removing evdev_seat

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2012-08-03 14:39:02 +03:00 committed by Kristian Høgsberg
parent 5720e92a20
commit 3bfb20104d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/evdev.c
View File

@ -583,7 +583,8 @@ device_added(struct udev_device *udev_device, struct evdev_seat *master)
} }
static void static void
evdev_notify_keyboard_focus(struct evdev_seat *seat) evdev_notify_keyboard_focus(struct weston_seat *seat,
struct wl_list *evdev_devices)
{ {
struct evdev_input_device *device; struct evdev_input_device *device;
struct wl_array keys; struct wl_array keys;
@ -593,7 +594,7 @@ evdev_notify_keyboard_focus(struct evdev_seat *seat)
int ret; int ret;
memset(all_keys, 0, sizeof all_keys); memset(all_keys, 0, sizeof all_keys);
wl_list_for_each(device, &seat->devices_list, link) { wl_list_for_each(device, evdev_devices, link) {
memset(evdev_keys, 0, sizeof evdev_keys); memset(evdev_keys, 0, sizeof evdev_keys);
ret = ioctl(device->fd, ret = ioctl(device->fd,
EVIOCGKEY(sizeof evdev_keys), evdev_keys); EVIOCGKEY(sizeof evdev_keys), evdev_keys);
@ -615,8 +616,7 @@ evdev_notify_keyboard_focus(struct evdev_seat *seat)
} }
} }
notify_keyboard_focus_in(&seat->base.seat, &keys, notify_keyboard_focus_in(&seat->seat, &keys, STATE_UPDATE_AUTOMATIC);
STATE_UPDATE_AUTOMATIC);
wl_array_release(&keys); wl_array_release(&keys);
} }
@ -649,7 +649,7 @@ evdev_add_devices(struct udev *udev, struct weston_seat *seat_base)
} }
udev_enumerate_unref(e); udev_enumerate_unref(e);
evdev_notify_keyboard_focus(seat); evdev_notify_keyboard_focus(&seat->base, &seat->devices_list);
if (wl_list_empty(&seat->devices_list)) { if (wl_list_empty(&seat->devices_list)) {
weston_log( weston_log(