diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2010-06-21 18:56:49 +0200 |
---|---|---|
committer | Henrik Rydberg <rydberg@euromail.se> | 2010-06-21 18:56:49 +0200 |
commit | 7380af2c93dc83f4f09e293717d46eadf7799e89 (patch) | |
tree | 2eb11199ef87e3181411bb848252bb5d6fed0be6 /src/test.c | |
parent | 71168e1fb794f4a24e97177508bb1d54ae24b266 (diff) | |
download | xorg-input-kobomultitouch-7380af2c93dc83f4f09e293717d46eadf7799e89.tar.gz xorg-input-kobomultitouch-7380af2c93dc83f4f09e293717d46eadf7799e89.tar.bz2 xorg-input-kobomultitouch-7380af2c93dc83f4f09e293717d46eadf7799e89.zip |
Simplify event reading
This patch puts the reading code more in line with the upcoming
mtdev library, and should remove some spurious input behavior.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/test.c')
-rw-r--r-- | src/test.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -27,8 +27,6 @@ static void loop_device(int fd) { struct Gestures gs; struct MTouch mt; - const struct input_event *ev; - struct input_event event; if (configure_mtouch(&mt, fd)) { fprintf(stderr, "error: could not configure device\n"); return; @@ -37,12 +35,12 @@ static void loop_device(int fd) fprintf(stderr, "error: could not open device\n"); return; } - while (ev = get_iobuf_event(&mt.buf, fd)) { - if (parse_event(&mt, ev)) { + while (poll_iobuf(&mt.buf, fd, 5000)) { + while (read_packet(&mt, fd) > 0) { extract_gestures(&gs, &mt); output_gesture(&gs); } - if (mt_is_idle(&mt, fd)) { + if (has_delayed_gestures(&mt, fd)) { extract_delayed_gestures(&gs, &mt); output_gesture(&gs); } @@ -56,7 +54,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Usage: test <mtdev>\n"); return -1; } - int fd = open(argv[1], O_RDONLY); + int fd = open(argv[1], O_RDONLY | O_NONBLOCK); if (fd < 0) { fprintf(stderr, "error: could not open file\n"); return -1; |