← Back to branch summary

~fginther/grail/grail-2.0.1.1-oneiric

« back to all changes in this revision

Viewing changes to tools/grail-test-mtdev.c

  • Committer: Francis Ginther
  • Date: 2012-08-22 18:35:11 UTC
  • mfrom: (20.2.19 upstream)
  • Revision ID: francis.ginther@canonical.com-20120822183511-yxwny2hixhyu2z42
https://launchpad.net/bugs/1040218
* New upstream microrelease, bug fixes only
  - Rename project to simply 'grail' (LP: #1040218)
* Updated debian/watch file for project rename

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/grail-test-mtdev.c
21
21
 
22
22
#define MTDEV_NO_LEGACY_API
23
23
 
24
 
#include <utouch/frame-mtdev.h>
 
24
#include <oif/frame-mtdev.h>
25
25
#include <grail.h>
26
26
#include <string.h>
27
27
#include <stdio.h>
32
32
struct frame_test {
33
33
        struct evemu_device *evemu;
34
34
        struct mtdev *mtdev;
35
 
        utouch_frame_handle fh;
 
35
        oif_frame_handle fh;
36
36
        grail_handle ge;
37
37
};
38
38
 
57
57
 
58
58
static int init_frame(struct frame_test *test, int fd)
59
59
{
60
 
        test->fh = utouch_frame_new_engine(100, 32, 100);
 
60
        test->fh = oif_frame_new_engine(100, 32, 100);
61
61
        if (!test->fh)
62
62
                return -1;
63
 
        return utouch_frame_init_mtdev(test->fh, test->evemu);
 
63
        return oif_frame_init_mtdev(test->fh, test->evemu);
64
64
}
65
65
 
66
66
static int init_grail(struct frame_test *test)
77
77
static void destroy_all(struct frame_test *test)
78
78
{
79
79
        grail_delete(test->ge);
80
 
        utouch_frame_delete_engine(test->fh);
 
80
        oif_frame_delete_engine(test->fh);
81
81
        if (test->mtdev)
82
82
                mtdev_close_delete(test->mtdev);
83
83
        evemu_delete(test->evemu);
85
85
}
86
86
 
87
87
static void report_frame(grail_handle ge,
88
 
                         const struct utouch_frame *touch)
 
88
                         const struct oif_frame *touch)
89
89
{
90
90
        const struct grail_frame *frame = grail_pump_frame(ge, touch);
91
91
        int i;
131
131
 
132
132
static void loop_device(struct frame_test *test, FILE *fp, int fd)
133
133
{
134
 
        const struct utouch_frame *frame;
 
134
        const struct oif_frame *frame;
135
135
        struct input_event ev;
136
136
 
137
137
        if (fp) {
138
138
                struct timeval evtime;
139
139
                memset(&evtime, 0, sizeof(evtime));
140
140
                while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) {
141
 
                        frame = utouch_frame_pump_mtdev(test->fh, &ev);
 
141
                        frame = oif_frame_pump_mtdev(test->fh, &ev);
142
142
                        if (frame)
143
143
                                report_frame(test->ge, frame);
144
144
                }
145
145
        } else {
146
146
                while (!mtdev_idle(test->mtdev, fd, 5000)) {
147
147
                        while (mtdev_get(test->mtdev, fd, &ev, 1) > 0) {
148
 
                                frame = utouch_frame_pump_mtdev(test->fh, &ev);
 
148
                                frame = oif_frame_pump_mtdev(test->fh, &ev);
149
149
                                if (frame)
150
150
                                        report_frame(test->ge, frame);
151
151
                        }
155
155
 
156
156
static void report_device_caps(struct frame_test *test)
157
157
{
158
 
        const struct utouch_surface *s = utouch_frame_get_surface(test->fh);
 
158
        const struct oif_surface *s = oif_frame_get_surface(test->fh);
159
159
 
160
160
        fprintf(stderr, "device props:\n");
161
161
        if (s->needs_pointer)
183
183
                fprintf(stderr, "\tdistance\n");
184
184
 
185
185
        fprintf(stderr, "touch frames: %d\n",
186
 
                utouch_frame_get_num_frames(test->fh));
 
186
                oif_frame_get_num_frames(test->fh));
187
187
        fprintf(stderr, "touch slots: %d\n",
188
 
                utouch_frame_get_num_slots(test->fh));
 
188
                oif_frame_get_num_slots(test->fh));
189
189
}
190
190
 
191
191
int main(int argc, char *argv[])
223
223
                fprintf(stderr, "error: could not describe device\n");
224
224
                return -1;
225
225
        }
226
 
        if (!utouch_frame_is_supported_mtdev(test.evemu)) {
 
226
        if (!oif_frame_is_supported_mtdev(test.evemu)) {
227
227
                fprintf(stderr, "error: unsupported device\n");
228
228
                return -1;
229
229
        }