1 files changed, 7 insertions, 53 deletions

diff --git a/src/main.c b/src/main.c
index a0a56f9..b4d1a26 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,7 +60,6 @@ typedef struct Mouse {
 typedef struct Input {
     int kbd_fd;
     int mouse_fd;
-    int home_fd;
     char map[KEY_MAX / 8 + 1];
     u8 controller;
     Mouse mouse;
@@ -77,22 +76,14 @@ init_input(void) {
     in.kbd_fd = -1;
     in.mouse_fd = -1;
 
-    // in.kbd_fd = open(KBD_PATH, O_RDONLY | O_NONBLOCK);
-    in.kbd_fd = open("/dev/input/event0", O_RDONLY | O_NONBLOCK);
+    in.kbd_fd = open(KBD_PATH, O_RDONLY | O_NONBLOCK);
     if (in.kbd_fd == -1) {
         // NOTE: Some applications may not require a keyboard so this is
         //       optional, but we are still displaying an error.
         fprintf(stderr, "error: couldn't open keyboard %s: %s.\n", KBD_PATH, strerror(errno));
     }
 
-    // NOTE: nook home and power buttons event handler.
-    in.home_fd = open("/dev/input/event1", O_RDONLY | O_NONBLOCK);
-    if (in.home_fd == -1) {
-        fprintf(stderr, "error: couldn't open home buttons %s: %s.\n", "/dev/input/event1", strerror(errno));
-    }
-
-    // in.mouse_fd = open(MOUSE_PATH, O_RDONLY | O_NONBLOCK);
-    in.mouse_fd = open("/dev/input/event2", O_RDONLY | O_NONBLOCK);
+    in.mouse_fd = open(MOUSE_PATH, O_RDONLY | O_NONBLOCK);
     if (in.mouse_fd == -1) {
         // NOTE: Some applications may not require a mouse so this is
         //       optional, but we are still displaying an error.
@@ -127,16 +118,16 @@ poll_mouse(void) {
         if (mouse_event.type == EV_REL) {
             if (mouse_event.code == REL_X) {
                 in.mouse.x = CLAMP(
-                    in.mouse.x / zoom + (s32)mouse_event.value, 0, (s32)screen_width);
+                    in.mouse.x / (s32)zoom + (s32)mouse_event.value, 0, (s32)screen_width);
             } else  if (mouse_event.code == REL_Y) {
                 in.mouse.y = CLAMP(
-                    in.mouse.y / zoom + (s32)mouse_event.value, 0, (s32)screen_height);
+                    in.mouse.y / (s32)zoom + (s32)mouse_event.value, 0, (s32)screen_height);
             }
         } else if (mouse_event.type == EV_ABS) {
             if (mouse_event.code == ABS_X) {
-                in.mouse.x = CLAMP((s32)mouse_event.value / zoom, 0, (s32)screen_width);
+                in.mouse.x = CLAMP((s32)mouse_event.value / (s32)zoom, 0, (s32)screen_width);
             } else  if (mouse_event.code == ABS_Y) {
-                in.mouse.y = CLAMP((s32)mouse_event.value / zoom, 0, (s32)screen_height);
+                in.mouse.y = CLAMP((s32)mouse_event.value / (s32)zoom, 0, (s32)screen_height);
             }
         } else if (mouse_event.type == EV_KEY) {
             switch (mouse_event.code) {
@@ -154,14 +145,7 @@ poll_mouse(void) {
                         in.mouse.buttons &= ~0x10;
                     }
                 } break;
-                default: {
-                    // NOTE: nook press.
-                    if (mouse_event.value == 1) {
-                        in.mouse.buttons |= 0x01;
-                    } else {
-                        in.mouse.buttons &= ~0x01;
-                    }
-                } break;
+                default: break;
             }
         }
         in.mouse.update = true;
@@ -169,24 +153,9 @@ poll_mouse(void) {
 }
 
 void
-poll_home(void) {
-    if (in.home_fd == -1) {
-        return;
-    }
-
-    struct input_event event;
-    if (read(in.home_fd, &event, sizeof(event)) != -1) {
-        if (event.code == 102 && event.value == 1) {
-            exit(EXIT_SUCCESS);
-        }
-    }
-}
-
-void
 poll_input(void) {
     poll_keyboard();
     poll_mouse();
-    poll_home();
 }
 
 void
@@ -317,15 +286,6 @@ handle_keyboard(void) {
                     default: break;
                 }
 
-                // NOTE: Nook overrides.
-                switch (key_code) {
-                    case 156: { rune = 0x10; } break; // top left
-                    case 139: { rune = 0x20; } break; // bottom left
-                    case 151: { rune = 0x40; } break; // top right
-                    case 158: { rune = 0x80; } break; // bottom right
-                    default: break;
-                }
-
                 if (rune) {
                     controller_now |= rune;
                     continue;
@@ -567,8 +527,6 @@ main(int argc, char *argv[]) {
 
     // Main loop.
     Time frame_time = time_now();
-    size_t frames_update = 0;
-    size_t frames_refresh = 0;
     while (true) {
         poll_input();
         size_t elapsed = time_elapsed(frame_time);
@@ -580,10 +538,6 @@ main(int argc, char *argv[]) {
 
             // Blit ppu.pixels to the framebuffer.
             blit_framebuffer();
-            if (++frames_update > frames_per_update) {
-                write(fb_file, "0", 0);
-                frames_update = 0;
-            }
             frame_time = time_now();
         }
     }