From d9d998644defec48172fde353f0a339933800cce Mon Sep 17 00:00:00 2001 From: epoch Date: Sun, 12 Apr 2020 23:45:07 -0500 Subject: fixed up the /dev/input/event (die) inputs to work better with libidc --- src/keyboard_die.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/keyboard_die.c') diff --git a/src/keyboard_die.c b/src/keyboard_die.c index d620f70..e043db4 100644 --- a/src/keyboard_die.c +++ b/src/keyboard_die.c @@ -10,6 +10,17 @@ int kbfd = -1; +int keyboard_init() { + if((kbfd=open(KBDEV,O_RDWR)) == -1) { + fprintf(stderr,"# failed to open keyboard: %s\n",KBDEV); + } + return kbfd; +} + +/*void keyboard_event_handler(struct *me,char *junk) { + //wtf goes here? +}*/ + hvk_t die_keypress_handler(unsigned short code) { switch(code) { case KEY_W: return HVK_FORWARD; @@ -28,10 +39,11 @@ hvk_t get_keyboard_event() { memset(&ie,0,sizeof(ie)); if(kbfd == -1) { kbfd=open(KBDEV,O_RDWR); - fcntl(kbfd,F_SETFL,O_NONBLOCK); + //probably not needed anymore + //fcntl(kbfd,F_SETFL,O_NONBLOCK); } if(kbfd == -1) { - fprintf(stderr,"# keyboard shit fucked up.\n"); + fprintf(stderr,"# keyboard shit fucked up. probably permissions error.\n"); return 1; } if((l=read(kbfd,&ie,sizeof(ie))) > 0) { -- cgit v1.2.3 From 7cedbf16a4c71b8a5ba0646c35fd03f20ddbda24 Mon Sep 17 00:00:00 2001 From: epoch Date: Tue, 14 Apr 2020 06:22:58 -0500 Subject: removed a couple things in keyboard event code that was initializing the keyboard --- src/keyboard_die.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/keyboard_die.c') diff --git a/src/keyboard_die.c b/src/keyboard_die.c index e043db4..5a52879 100644 --- a/src/keyboard_die.c +++ b/src/keyboard_die.c @@ -6,7 +6,8 @@ #include "keyboard.h" -#define KBDEV "/dev/input/event0" +//#define KBDEV "/dev/input/event0" +#define KBDEV "/dev/input/by-path/platform-i8042-serio-0-event-kbd" int kbfd = -1; @@ -37,15 +38,6 @@ hvk_t get_keyboard_event() { struct input_event ie; int l; memset(&ie,0,sizeof(ie)); - if(kbfd == -1) { - kbfd=open(KBDEV,O_RDWR); - //probably not needed anymore - //fcntl(kbfd,F_SETFL,O_NONBLOCK); - } - if(kbfd == -1) { - fprintf(stderr,"# keyboard shit fucked up. probably permissions error.\n"); - return 1; - } if((l=read(kbfd,&ie,sizeof(ie))) > 0) { if(ie.type == 1) { fprintf(stderr,"# value: %d code: %d type: %d\n",ie.value,ie.code,ie.type); -- cgit v1.2.3