shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-28 07:21:32 +03:00
Code

Merge pull request #6210 from poettering/input-mask

Browse Source 
logind: make use of EVIOCSMASK input ioctl to mask out events we aren…
This commit is contained in:
Lennart Poettering 2017-06-27 23:24:21 +02:00 committed by GitHub
commit eca2995c51
4 changed files with 134 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/basic/missing.h
View File

@ -23,6 +23,7 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
#include <linux/audit.h>
#include <linux/capability.h>
#include <linux/if_link.h>
@ -569,6 +570,17 @@ struct btrfs_ioctl_quota_ctl_args {
# define EVIOCREVOKE _IOW('E', 0x91, int)
#endif
#ifndef EVIOCSMASK
struct input_mask {
uint32_t type;
uint32_t codes_size;
uint64_t codes_ptr;
};
#define EVIOCSMASK _IOW('E', 0x93, struct input_mask)
#endif
#ifndef DRM_IOCTL_SET_MASTER
# define DRM_IOCTL_SET_MASTER _IO('d', 0x1e)
#endif

9
src/login/70-power-switch.rules
View File

@ -7,12 +7,7 @@
ACTION=="remove", GOTO="power_switch_end"
SUBSYSTEM=="input", KERNEL=="event*", SUBSYSTEMS=="acpi", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", KERNELS=="thinkpad_acpi", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="twl4030_pwrbutton", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="tps65217_pwr_but", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="* WMI hotkeys", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", \
SUBSYSTEMS=="platform", DRIVERS=="gpio-keys", ATTRS{keys}=="*,116|116,*|116|*,116,*", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT_SWITCH}=="1", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT_KEY}=="1", TAG+="power-switch"
LABEL="power_switch_end"

119
src/login/logind-button.c
View File

@ -32,6 +32,18 @@
#include "string-util.h"
#include "util.h"
#define CONST_MAX4(a, b, c, d) CONST_MAX(CONST_MAX(a, b), CONST_MAX(c, d))
#define ULONG_BITS (sizeof(unsigned long)*8)
static bool bitset_get(const unsigned long *bits, unsigned i) {
return (bits[i / ULONG_BITS] >> (i % ULONG_BITS)) & 1UL;
}
static void bitset_put(unsigned long *bits, unsigned i) {
bits[i / ULONG_BITS] |= (unsigned long) 1 << (i % ULONG_BITS);
}
Button* button_new(Manager *m, const char *name) {
Button *b;
@ -231,6 +243,95 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
return 0;
}
static int button_suitable(Button *b) {
unsigned long types[CONST_MAX(EV_KEY, EV_SW)/ULONG_BITS+1];
assert(b);
assert(b->fd);
if (ioctl(b->fd, EVIOCGBIT(EV_SYN, sizeof(types)), types) < 0)
return -errno;
if (bitset_get(types, EV_KEY)) {
unsigned long keys[CONST_MAX4(KEY_POWER, KEY_POWER2, KEY_SLEEP, KEY_SUSPEND)/ULONG_BITS+1];
if (ioctl(b->fd, EVIOCGBIT(EV_KEY, sizeof(keys)), keys) < 0)
return -errno;
if (bitset_get(keys, KEY_POWER) ||
bitset_get(keys, KEY_POWER2) ||
bitset_get(keys, KEY_SLEEP) ||
bitset_get(keys, KEY_SUSPEND))
return true;
}
if (bitset_get(types, EV_SW)) {
unsigned long switches[CONST_MAX(SW_LID, SW_DOCK)/ULONG_BITS+1];
if (ioctl(b->fd, EVIOCGBIT(EV_SW, sizeof(switches)), switches) < 0)
return -errno;
if (bitset_get(switches, SW_LID) ||
bitset_get(switches, SW_DOCK))
return true;
}
return false;
}
static int button_set_mask(Button *b) {
unsigned long
types[CONST_MAX(EV_KEY, EV_SW)/ULONG_BITS+1] = {},
keys[CONST_MAX4(KEY_POWER, KEY_POWER2, KEY_SLEEP, KEY_SUSPEND)/ULONG_BITS+1] = {},
switches[CONST_MAX(SW_LID, SW_DOCK)/ULONG_BITS+1] = {};
struct input_mask mask;
assert(b);
assert(b->fd >= 0);
bitset_put(types, EV_KEY);
bitset_put(types, EV_SW);
mask = (struct input_mask) {
.type = EV_SYN,
.codes_size = sizeof(types),
.codes_ptr = PTR_TO_UINT64(types),
};
if (ioctl(b->fd, EVIOCSMASK, &mask) < 0)
/* Log only at debug level if the kernel doesn't do EVIOCSMASK yet */
return log_full_errno(IN_SET(errno, ENOTTY, EOPNOTSUPP, EINVAL) ? LOG_DEBUG : LOG_WARNING,
errno, "Failed to set EV_SYN event mask on /dev/input/%s: %m", b->name);
bitset_put(keys, KEY_POWER);
bitset_put(keys, KEY_POWER2);
bitset_put(keys, KEY_SLEEP);
bitset_put(keys, KEY_SUSPEND);
mask = (struct input_mask) {
.type = EV_KEY,
.codes_size = sizeof(keys),
.codes_ptr = PTR_TO_UINT64(keys),
};
if (ioctl(b->fd, EVIOCSMASK, &mask) < 0)
return log_warning_errno(errno, "Failed to set EV_KEY event mask on /dev/input/%s: %m", b->name);
bitset_put(switches, SW_LID);
bitset_put(switches, SW_DOCK);
mask = (struct input_mask) {
.type = EV_SW,
.codes_size = sizeof(switches),
.codes_ptr = PTR_TO_UINT64(switches),
};
if (ioctl(b->fd, EVIOCSMASK, &mask) < 0)
return log_warning_errno(errno, "Failed to set EV_SW event mask on /dev/input/%s: %m", b->name);
return 0;
}
int button_open(Button *b) {
char *p, name[256];
int r;
@ -243,13 +344,23 @@ int button_open(Button *b) {
b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
if (b->fd < 0)
return log_warning_errno(errno, "Failed to open %s: %m", b->name);
return log_warning_errno(errno, "Failed to open %s: %m", p);
r = button_suitable(b);
if (r < 0)
return log_warning_errno(r, "Failed to determine whether input device is relevant to us: %m");
if (r == 0) {
log_debug("Device %s does not expose keys or switches relevant to us, ignoring.", p);
return -EADDRNOTAVAIL;
}
if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
r = log_error_errno(errno, "Failed to get input name: %m");
goto fail;
}
(void) button_set_mask(b);
r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b);
if (r < 0) {
log_error_errno(r, "Failed to add button event: %m");
@ -266,7 +377,7 @@ fail:
}
int button_check_switches(Button *b) {
uint8_t switches[SW_MAX/8+1] = {};
unsigned long switches[CONST_MAX(SW_LID, SW_DOCK)/ULONG_BITS+1] = {};
assert(b);
if (b->fd < 0)
@ -275,8 +386,8 @@ int button_check_switches(Button *b) {
if (ioctl(b->fd, EVIOCGSW(sizeof(switches)), switches) < 0)
return -errno;
b->lid_closed = (switches[SW_LID/8] >> (SW_LID % 8)) & 1;
b->docked = (switches[SW_DOCK/8] >> (SW_DOCK % 8)) & 1;
b->lid_closed = bitset_get(switches, SW_LID);
b->docked = bitset_get(switches, SW_DOCK);
if (b->lid_closed)
button_install_check_event_source(b);

6
src/login/logind-core.c
View File

@ -269,7 +269,11 @@ int manager_process_button_device(Manager *m, struct udev_device *d) {
sn = "seat0";
button_set_seat(b, sn);
button_open(b);
r = button_open(b);
if (r < 0) /* event device doesn't have any keys or switches relevant to us? (or any other error
* opening the device?) let's close the button again. */
button_free(b);
}
return 0;