commit 80e62f6
Michael Forney
·
2013-12-04 05:47:26 +0000 UTC
parent 44c47d5
evdev_device: Use DEBUG and ERROR
1 files changed,
+6,
-7
+6,
-7
1@@ -72,7 +72,6 @@ static void handle_rel_event(struct swc_evdev_device * device,
2 static void handle_abs_event(struct swc_evdev_device * device,
3 struct input_event * input_event)
4 {
5- printf("abs event\n");
6 }
7
8 static void (* event_handlers[])(struct swc_evdev_device * device,
9@@ -151,17 +150,17 @@ struct swc_evdev_device * swc_evdev_device_new
10
11 if (device->fd == -1)
12 {
13- printf("couldn't open input device at %s\n", path);
14+ ERROR("Failed to open input device at %s\n", path);
15 goto error0;
16 }
17
18 if (libevdev_new_from_fd(device->fd, &device->dev) != 0)
19 {
20- fprintf(stderr, "Could not create libevdev device\n");
21+ ERROR("Failed to create libevdev device\n");
22 goto error1;
23 }
24
25- printf("Adding device %s\n", libevdev_get_name(device->dev));
26+ DEBUG("Adding device %s\n", libevdev_get_name(device->dev));
27
28 device->handler = handler;
29 device->capabilities = 0;
30@@ -170,7 +169,7 @@ struct swc_evdev_device * swc_evdev_device_new
31 if (libevdev_has_event_code(device->dev, EV_KEY, KEY_ENTER))
32 {
33 device->capabilities |= WL_SEAT_CAPABILITY_KEYBOARD;
34- printf("\tthis device is a keyboard\n");
35+ DEBUG("\tThis device is a keyboard\n");
36 }
37
38 if (libevdev_has_event_code(device->dev, EV_REL, REL_X)
39@@ -178,7 +177,7 @@ struct swc_evdev_device * swc_evdev_device_new
40 && libevdev_has_event_code(device->dev, EV_KEY, BTN_MOUSE))
41 {
42 device->capabilities |= WL_SEAT_CAPABILITY_POINTER;
43- printf("\tthis device is a pointer\n");
44+ DEBUG("\tThis device is a pointer\n");
45 }
46
47 /* XXX: touch devices */
48@@ -202,7 +201,7 @@ void swc_evdev_device_destroy(struct swc_evdev_device * device)
49 void swc_evdev_device_add_event_sources(struct swc_evdev_device * device,
50 struct wl_event_loop * event_loop)
51 {
52- printf("Adding event source for %s\n", libevdev_get_name(device->dev));
53+ DEBUG("Adding event source for %s\n", libevdev_get_name(device->dev));
54 device->source
55 = wl_event_loop_add_fd(event_loop, device->fd, WL_EVENT_READABLE,
56 handle_data, device);