[PATCH libinput 3/7] evdev: move release_pressed_keys() up
Peter Hutterer
peter.hutterer at who-t.net
Tue May 19 15:52:34 PDT 2015
Just a move to make the next diff easier
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
src/evdev.c | 104 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/evdev.c b/src/evdev.c
index 435bc52..87c59dc 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -761,6 +761,58 @@ fallback_process(struct evdev_dispatch *dispatch,
}
static void
+release_pressed_keys(struct evdev_device *device)
+{
+ struct libinput *libinput = device->base.seat->libinput;
+ uint64_t time;
+ int code;
+
+ if ((time = libinput_now(libinput)) == 0)
+ return;
+
+ for (code = 0; code < KEY_CNT; code++) {
+ int count = get_key_down_count(device, code);
+
+ if (count == 0)
+ continue;
+
+ if (count > 1) {
+ log_bug_libinput(libinput,
+ "Key %d is down %d times.\n",
+ code,
+ count);
+ }
+
+ switch (get_key_type(code)) {
+ case EVDEV_KEY_TYPE_NONE:
+ break;
+ case EVDEV_KEY_TYPE_KEY:
+ evdev_keyboard_notify_key(
+ device,
+ time,
+ code,
+ LIBINPUT_KEY_STATE_RELEASED);
+ break;
+ case EVDEV_KEY_TYPE_BUTTON:
+ evdev_pointer_notify_physical_button(
+ device,
+ time,
+ evdev_to_left_handed(device, code),
+ LIBINPUT_BUTTON_STATE_RELEASED);
+ break;
+ }
+
+ count = get_key_down_count(device, code);
+ if (count != 0) {
+ log_bug_libinput(libinput,
+ "Releasing key %d failed.\n",
+ code);
+ break;
+ }
+ }
+}
+
+static void
fallback_destroy(struct evdev_dispatch *dispatch)
{
free(dispatch);
@@ -2317,58 +2369,6 @@ evdev_stop_scroll(struct evdev_device *device,
device->scroll.direction = 0;
}
-static void
-release_pressed_keys(struct evdev_device *device)
-{
- struct libinput *libinput = device->base.seat->libinput;
- uint64_t time;
- int code;
-
- if ((time = libinput_now(libinput)) == 0)
- return;
-
- for (code = 0; code < KEY_CNT; code++) {
- int count = get_key_down_count(device, code);
-
- if (count == 0)
- continue;
-
- if (count > 1) {
- log_bug_libinput(libinput,
- "Key %d is down %d times.\n",
- code,
- count);
- }
-
- switch (get_key_type(code)) {
- case EVDEV_KEY_TYPE_NONE:
- break;
- case EVDEV_KEY_TYPE_KEY:
- evdev_keyboard_notify_key(
- device,
- time,
- code,
- LIBINPUT_KEY_STATE_RELEASED);
- break;
- case EVDEV_KEY_TYPE_BUTTON:
- evdev_pointer_notify_physical_button(
- device,
- time,
- evdev_to_left_handed(device, code),
- LIBINPUT_BUTTON_STATE_RELEASED);
- break;
- }
-
- count = get_key_down_count(device, code);
- if (count != 0) {
- log_bug_libinput(libinput,
- "Releasing key %d failed.\n",
- code);
- break;
- }
- }
-}
-
void
evdev_notify_suspended_device(struct evdev_device *device)
{
--
2.3.5
More information about the wayland-devel
mailing list