fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 13:38:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add msleep() helper function

Browse source 
For those whose eyes struggle to focus on 5 zeros in a row, or those just sick
of forgetting one zero and wondering why things don't work.

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-06-20 14:06:19 +10:00
parent bad56cac5b
commit 4441c9debe
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libinput-util.h
View file

@ -23,6 +23,8 @@
#ifndef LIBINPUT_UTIL_H #ifndef LIBINPUT_UTIL_H
#define LIBINPUT_UTIL_H #define LIBINPUT_UTIL_H
#include <unistd.h>
#include "libinput.h" #include "libinput.h"
void void
@ -84,4 +86,10 @@ zalloc(size_t size)
return calloc(1, size); return calloc(1, size);
} }
static inline void
msleep(unsigned int ms)
{
usleep(ms * 1000);
}
#endif /* LIBINPUT_UTIL_H */ #endif /* LIBINPUT_UTIL_H */

12
test/touchpad.c
View file

@ -125,7 +125,7 @@ START_TEST(touchpad_1fg_tap)
assert_button_event(li, BTN_LEFT, assert_button_event(li, BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED); LIBINPUT_BUTTON_STATE_PRESSED);
usleep(300000); /* tap-n-drag timeout */ msleep(300); /* tap-n-drag timeout */
assert_button_event(li, BTN_LEFT, assert_button_event(li, BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED); LIBINPUT_BUTTON_STATE_RELEASED);
@ -177,7 +177,7 @@ START_TEST(touchpad_1fg_tap_n_drag)
ck_assert_int_eq(libinput_next_event_type(li), LIBINPUT_EVENT_NONE); ck_assert_int_eq(libinput_next_event_type(li), LIBINPUT_EVENT_NONE);
usleep(300000); /* tap-n-drag timeout */ msleep(300); /* tap-n-drag timeout */
assert_button_event(li, BTN_LEFT, assert_button_event(li, BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED); LIBINPUT_BUTTON_STATE_RELEASED);
@ -202,7 +202,7 @@ START_TEST(touchpad_2fg_tap)
assert_button_event(li, BTN_RIGHT, assert_button_event(li, BTN_RIGHT,
LIBINPUT_BUTTON_STATE_PRESSED); LIBINPUT_BUTTON_STATE_PRESSED);
usleep(300000); /* tap-n-drag timeout */ msleep(300); /* tap-n-drag timeout */
assert_button_event(li, BTN_RIGHT, assert_button_event(li, BTN_RIGHT,
LIBINPUT_BUTTON_STATE_RELEASED); LIBINPUT_BUTTON_STATE_RELEASED);
@ -681,7 +681,7 @@ START_TEST(clickpad_softbutton_left_1st_fg_move)
/* move out of the area, then wait for softbutton timer */ /* move out of the area, then wait for softbutton timer */
litest_touch_move_to(dev, 0, 20, 90, 90, 20, 10); litest_touch_move_to(dev, 0, 20, 90, 90, 20, 10);
libinput_dispatch(li); libinput_dispatch(li);
usleep(400000); msleep(400);
libinput_dispatch(li); libinput_dispatch(li);
litest_drain_events(li); litest_drain_events(li);
@ -982,13 +982,13 @@ START_TEST(clickpad_topsoftbuttons_move_out_ignore)
litest_touch_down(dev, 0, 50, 5); litest_touch_down(dev, 0, 50, 5);
libinput_dispatch(li); libinput_dispatch(li);
usleep(200000); msleep(200);
libinput_dispatch(li); libinput_dispatch(li);
litest_assert_empty_queue(li); litest_assert_empty_queue(li);
litest_touch_move_to(dev, 0, 50, 5, 80, 90, 20); litest_touch_move_to(dev, 0, 50, 5, 80, 90, 20);
libinput_dispatch(li); libinput_dispatch(li);
usleep(400000); msleep(400);
libinput_dispatch(li); libinput_dispatch(li);
litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_KEY, BTN_LEFT, 1);