Handle left and right shift, allow shift+enter.

1 files changed, 52 insertions, 25 deletions

diff --git a/marsond.c b/marsond.c
index 7aeb52d..d936569 100644
--- a/marsond.c
+++ b/marsond.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <pwd.h>
 #include <grp.h>
 #include <signal.h>
@@ -44,6 +45,7 @@ int debugging = 0;                      /* -v */
 int foreground = 0;                     /* -v */
 const char *keyboard_dev = DEFAULT_KBD; /* -k */
 int delay_ms = DEFAULT_DELAY_MS;        /* -d */
+int shift_ms = 0;                       /* -s, -d */
 int pause_ms = 0;                       /* -p */
 
 int infd = -1, outfd = -1;
@@ -64,6 +66,7 @@ void logmsg(const char *prefix, const char *fmt, ...) {
 #define warn(fmt, ...)  { logmsg("warning", fmt, ##__VA_ARGS__); };
 #define info(fmt, ...)  { logmsg("info",    fmt, ##__VA_ARGS__); };
 #define debug(fmt, ...) { if(debugging) logmsg("debug",    fmt, ##__VA_ARGS__); };
+#define debug_fg(fmt, ...) { if(debugging && foreground) logmsg("debug",    fmt, ##__VA_ARGS__); };
 
 void set_self(const char *argv0) {
    char *p;
@@ -120,9 +123,10 @@ void parse_args(int argc, char **argv) {
       }
    }
 
-	while( (opt = getopt(argc, argv, ":d:hfk:p:vV")) != -1) {
+	while( (opt = getopt(argc, argv, ":d:s:hfk:p:vV")) != -1) {
 		switch(opt) {
 			case 'd': delay_ms = parse_num(optarg, 'd', 1); break;
+			case 's': shift_ms = parse_num(optarg, 's', 1); break;
 			case 'f': foreground++;            break;
 			case 'h': print_help(); exit(0);   break;
 			case 'k': keyboard_dev = optarg;   break;
@@ -137,6 +141,8 @@ void parse_args(int argc, char **argv) {
 	if(optind < argc) {
 		die("unknown argument: %s", argv[optind]);
 	}
+
+	if(!shift_ms) shift_ms = delay_ms * 4;
 }
 
 /* cleanup() gets called by die() and sighandler() */
@@ -329,10 +335,28 @@ void write_event(struct input_event *ev) {
 	}
 }
 
+long long gettime_millis(void) {
+	struct timeval tv;
+
+	gettimeofday(&tv, 0);
+	return(tv.tv_sec * 1000 + tv.tv_usec / 1000);
+}
+
+void release_key(int code) {
+	struct input_event ev;
+
+	ev.type = EV_KEY;
+	ev.code = code;
+	ev.value = 0;
+
+	write_event(&ev);
+}
+
 int main(int argc, char **argv) {
-	int i, was_shift = 0;
+	int i;
+	long long last_l_shift = 0, last_r_shift = 0;
 	struct uinput_user_dev dev;
-	struct input_event ev, shift_release;
+	struct input_event ev;
 
 	set_self(argv[0]);
 
@@ -429,35 +453,38 @@ int main(int argc, char **argv) {
 			}
 		}
 
-		if(foreground) {
-			debug("got event: type %d, code 0x%02x, value %d",
-					ev.type, ev.code, ev.value);
-		}
+		debug_fg("got event: type %d, code 0x%02x, value %d",
+		         ev.type, ev.code, ev.value);
 
-		if(ev.type == EV_KEY && ev.code == KEY_RIGHTSHIFT) {
-			was_shift = ev.value;
+		if(ev.type == EV_KEY && ev.value == 1) {
+			if(ev.code == KEY_RIGHTSHIFT) {
+				last_r_shift = (ev.value ? gettime_millis() : 0);
+				debug_fg("last_r_shift %lld", last_r_shift);
+			} else if(ev.code == KEY_LEFTSHIFT) {
+				last_l_shift = (ev.value ? gettime_millis() : 0);
+				debug_fg("last_l_shift %lld", last_l_shift);
+			}
 		}
 
-		if(ev.type == EV_KEY && ev.code == KEY_ENTER && ev.value == 1) {
-			if(was_shift) {
-				if(foreground) {
-					debug("!!! got Enter keypress with was_shift==1, sending "
-							"Shift key release before Enter keypress");
+		/* ev.value: 0 == release, 1 == initial press, 2 == repeat */
+		if(ev.type == EV_KEY) {
+			if(ev.code == KEY_ENTER && ev.value == 1) {
+				if(last_r_shift && (gettime_millis() < (last_r_shift + shift_ms))) {
+					debug_fg("!!! Enter pressed; last right shift press < %dms ago, sending right shift release", shift_ms);
+					release_key(KEY_RIGHTSHIFT);
+					last_r_shift = 0;
+				}
+				if(last_l_shift && (gettime_millis() < (last_l_shift + shift_ms))) {
+					debug_fg("!!! Enter pressed; last left shift press < %dms ago, sending left shift release", shift_ms);
+					release_key(KEY_LEFTSHIFT);
+					last_l_shift = 0;
 				}
-				memcpy(&shift_release, &ev, sizeof(ev));
-				shift_release.code = KEY_RIGHTSHIFT;
-				shift_release.value = 0;
-				write_event(&shift_release);
-				was_shift = 0;
 			}
-		}
 
-		/* value == 0 means key release (a 1 would be a press) */
-		if(ev.type == EV_KEY && ev.code == KEY_ENTER && ev.value == 0) {
-			if(foreground) {
-				debug("!!! got Enter key release, delaying %d ms", delay_ms);
+			if(ev.code == KEY_ENTER && ev.value == 0) {
+				debug_fg("!!! got Enter key release, delaying %dms", delay_ms);
+				usleep(delay_ms * 1000);
 			}
-			usleep(delay_ms * 1000);
 		}
 
 		write_event(&ev);