norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uterm_monitor: add input device support

Browse Source 
To allow moving all input handling to uterm, too, we need to detect input
devices in the uterm-monitor like all other devices, too.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-05-05 18:21:58 +02:00
parent d1be1d60fa
commit 5a5bd3a6f2
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/uterm.h
View File

@ -213,6 +213,7 @@ enum uterm_monitor_event_type {
enum uterm_monitor_dev_type { enum uterm_monitor_dev_type {
UTERM_MONITOR_DRM, UTERM_MONITOR_DRM,
UTERM_MONITOR_FBDEV, UTERM_MONITOR_FBDEV,
UTERM_MONITOR_INPUT,
}; };
struct uterm_monitor_event { struct uterm_monitor_event {

18
src/uterm_monitor.c
View File

@ -348,6 +348,8 @@ static void monitor_udev_add(struct uterm_monitor *mon,
return; return;
} }
type = UTERM_MONITOR_FBDEV; type = UTERM_MONITOR_FBDEV;
} else if (!strcmp(subs, "input")) {
type = UTERM_MONITOR_INPUT;
} else { } else {
log_debug("adding device with unknown subsystem %s", subs); log_debug("adding device with unknown subsystem %s", subs);
return; return;
@ -543,6 +545,15 @@ int uterm_monitor_new(struct uterm_monitor **out,
goto err_umon; goto err_umon;
} }
ret = udev_monitor_filter_add_match_subsystem_devtype(mon->umon,
"input", NULL);
if (ret) {
errno = -ret;
log_err("cannot add udev filter (%d): %m", ret);
ret = -EFAULT;
goto err_umon;
}
ret = udev_monitor_filter_add_match_tag(mon->umon, "seat"); ret = udev_monitor_filter_add_match_tag(mon->umon, "seat");
if (ret) { if (ret) {
errno = -ret; errno = -ret;
@ -665,6 +676,13 @@ void uterm_monitor_scan(struct uterm_monitor *mon)
goto out_enum; goto out_enum;
} }
ret = udev_enumerate_add_match_subsystem(e, "input");
if (ret) {
errno = -ret;
log_err("cannot add udev match (%d): %m", ret);
goto out_enum;
}
ret = udev_enumerate_add_match_tag(e, "seat"); ret = udev_enumerate_add_match_tag(e, "seat");
if (ret) { if (ret) {
errno = -ret; errno = -ret;