fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-04 02:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: prefix the hw key/button bitmask with 'hw'

Browse source 
This bitmask reflects the hw state, prefix it accordingly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2014-08-22 10:41:20 +10:00
parent 504c7667e9
commit 9f2b05d5ac
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/evdev.c
View file

@ -48,15 +48,15 @@ enum evdev_key_type {
};
static void
set_key_down(struct evdev_device *device, int code, int pressed)
hw_set_key_down(struct evdev_device *device, int code, int pressed)
{
long_set_bit_state(device->key_mask, code, pressed);
long_set_bit_state(device->hw_key_mask, code, pressed);
}
static int
is_key_down(struct evdev_device *device, int code)
hw_is_key_down(struct evdev_device *device, int code)
{
return long_bit_is_set(device->key_mask, code);
return long_bit_is_set(device->hw_key_mask, code);
}
static int
@ -385,12 +385,12 @@ evdev_process_key(struct evdev_device *device,
break;
case EVDEV_KEY_TYPE_KEY:
case EVDEV_KEY_TYPE_BUTTON:
if (!is_key_down(device, e->code))
if (!hw_is_key_down(device, e->code))
return;
}
}
set_key_down(device, e->code, e->value);
hw_set_key_down(device, e->code, e->value);
switch (type) {
case EVDEV_KEY_TYPE_NONE:

2
src/evdev.h
View file

@ -100,7 +100,7 @@ struct evdev_device {
/* Bitmask of pressed keys used to ignore initial release events from
* the kernel. */
unsigned long key_mask[NLONGS(KEY_CNT)];
unsigned long hw_key_mask[NLONGS(KEY_CNT)];
/* Key counter used for multiplexing button events internally in
* libinput. */
uint8_t key_count[KEY_CNT];