Small bits of cleanup

Author: kwhat

src/evdev/input_hook.c

@@ -19,7 +19,6 @@
 #include <inttypes.h>
 #include <limits.h>
 
-#include <stdio.h> // FIXME Remove
 #include <glob.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -175,6 +174,9 @@ static int create_hook_info(char *path, struct hook_info **info) {
                 err);
 
         hook->uinput = NULL;
+    } else {
+         // On success, grab the device so we can consume events.
+         //libevdev_grab(&hook->evdev, LIBEVDEV_GRAB);
     }
 
     char *label;
@@ -302,6 +304,9 @@ static int create_event_listeners(int epoll_fd, struct epoll_event **listeners)
     return UIOHOOK_SUCCESS;
 }
 
+static int destroy_event_listeners(int epoll_fd, struct epoll_event **listeners) {
+    // FIXME Implement
+}
 
 
 UIOHOOK_API int hook_run() {
@@ -338,48 +343,57 @@ UIOHOOK_API int hook_run() {
     int err;
     struct input_event ev;
 
+    // FIXME We need some way of turning this off.
     while (1) {
-		printf("\nPolling for input...\n");
 		event_count = epoll_wait(epoll_fd, event_buffer, EVENT_BUFFER_SIZE, EVENT_BUFFER_WAIT * 1000);
-		printf("%d ready events\n", event_count);
-		for (int i = 0; i < event_count; i++) {
-			printf("Reading file descriptor %p '%d' -- ", event_buffer[i].data.ptr, event_buffer[i].data.fd);
 
-            struct hook_info *device = (struct hook_info *) event_buffer[i].data.ptr;
+		for (int i = 0; i < event_count; i++) {
+		    struct hook_info *info = event_buffer[i].data.ptr;
 
-            err = libevdev_next_event(device->evdev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
+            err = libevdev_next_event(info->evdev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
             if (err == LIBEVDEV_READ_STATUS_SUCCESS) {
+                if (ev.type == EV_KEY) {
+                    logger(LOG_LEVEL_DEBUG, "%s [%u]: Keyboard FD: %d -- KEY: '%u' '%d'.\n",
+                            __FUNCTION__, __LINE__,
+                            info->fd, ev.code, ev.value);
+                } else if (ev.type == EV_REL) {
+                    logger(LOG_LEVEL_DEBUG, "%s [%u]: Keyboard FD: %d -- MOVE: '%u' '%d'.\n",
+                            __FUNCTION__, __LINE__,
+                            info->fd, ev.code, ev.value);
+                }
+
                 /*
                 if (ev.type == EV_KEY && ev.code == KEY_HOME) {
                     ev.code = KEY_B;
+                    libevdev_uinput_write_event(info->uinput, ev.type, ev.code, ev.value);
                 }
-                */
-
-                //libevdev_uinput_write_event(device->uinput, ev.type, ev.code, ev.value);
-                printf("LIBEVDEV_READ_STATUS_SUCCESS\n");
+                //*/
             } else if (err == LIBEVDEV_READ_STATUS_SYNC) {
                 do {
-                    err = libevdev_next_event(device->evdev, LIBEVDEV_READ_FLAG_SYNC, &ev);
+                    err = libevdev_next_event(info->evdev, LIBEVDEV_READ_FLAG_SYNC, &ev);
                 } while (err != -EAGAIN);
 
-                printf("LIBEVDEV_READ_STATUS_SYNC\n");
+                logger(LOG_LEVEL_ERROR, "%s [%u]: LIBEVDEV_READ_STATUS_SYNC!\n",
+                        __FUNCTION__, __LINE__);
             } else if (err == -EAGAIN) {
-                printf("EAGAIN\n");
+                logger(LOG_LEVEL_ERROR, "%s [%u]: EAGAIN!\n",
+                        __FUNCTION__, __LINE__);
                 continue;
             } else {
-                printf("????\n");
+                logger(LOG_LEVEL_ERROR, "%s [%u]: ?!\n",
+                        __FUNCTION__, __LINE__);
                 // Error reading event
                 break;
             }
 		}
 	}
 
 	if (close(epoll_fd)) {
-		fprintf(stderr, "Failed to close epoll file descriptor\n");
-		return 1;
+	    logger(LOG_LEVEL_ERROR, "%s [%u]: Failed to close epoll file descriptor!\n",
+                __FUNCTION__, __LINE__);
+        // FIXME What exactly should we do here? Return error, set epoll_fd to null?
 	}
 
-
     logger(LOG_LEVEL_DEBUG, "%s [%u]: Something, something, something, complete.\n",
             __FUNCTION__, __LINE__);