diff options
| -rw-r--r-- | marsond.8 | 2 | ||||
| -rw-r--r-- | marsond.c | 25 | ||||
| -rw-r--r-- | marsond.rst | 2 | ||||
| -rw-r--r-- | usage.c | 2 |
4 files changed, 19 insertions, 12 deletions
@@ -61,7 +61,7 @@ Options can be "bundled": \fB\-vf\fP is the same as \fB\-v\fP \fB\-f\fP\&. Amount of time in milliseconds to delay the Enter key release events. Default: 30. .UNINDENT -.\" delay time for Enter key relase (default 30). +.\" delay time for Enter key release. . .INDENT 0.0 .TP @@ -83,6 +83,10 @@ void print_help(void) { for(helpline = helptext; *helpline; helpline++) puts(*helpline); + + puts( "Compiled-in defaults:"); + puts( " -k: " DEFAULT_KBD); + printf(" -d: %d\n", DEFAULT_DELAY_MS); } void version(void) { @@ -276,6 +280,16 @@ void set_evbit(int outfd, int event) { } } +void print_device_name(void) { + char name[UINPUT_MAX_NAME_SIZE]; + + if(ioctl(outfd, UI_GET_SYSNAME(UINPUT_MAX_NAME_SIZE), name) >= 0) { + debug("created virtual keyboard device: /sys/devices/virtual/input/%s/", name); + } else { + debug("created virtual keyboard device but couldn't get its name (old kernel?)"); + } +} + int main(int argc, char **argv) { int i; struct uinput_user_dev dev; @@ -346,14 +360,7 @@ int main(int argc, char **argv) { /* I was hoping the return value of this ioctl would be the device number, but it's just 0 for no error. */ if(ioctl(outfd, UI_DEV_CREATE) >= 0) { - if(debugging) { - char name[UINPUT_MAX_NAME_SIZE]; - if(ioctl(outfd, UI_GET_SYSNAME(UINPUT_MAX_NAME_SIZE), name) >= 0) { - debug("created virtual keyboard device: /sys/devices/virtual/input/%s/", name); - } else { - debug("created virtual keyboard device but couldn't get its name (old kernel?)"); - } - } + if(debugging) print_device_name(); } else { die("UI_DEV_CREATE failed: %s", strerror(errno)); } @@ -383,7 +390,7 @@ int main(int argc, char **argv) { } if(foreground) { - debug("got event: type %d, code %d, value %d\n", + debug("got event: type %d, code %d, value %d", ev.type, ev.code, ev.value); } diff --git a/marsond.rst b/marsond.rst index c304a06..2e705f6 100644 --- a/marsond.rst +++ b/marsond.rst @@ -47,7 +47,7 @@ Options can be "bundled": **-vf** is the same as **-v** **-f**. Amount of time in milliseconds to delay the Enter key release events. Default: 30. -.. delay time for Enter key relase (default 30). +.. delay time for Enter key release. -f Run in the foreground; do not detach from the terminal or become a @@ -1,5 +1,5 @@ const char *helptext[] = { - " -d delay-ms: delay time for Enter key relase (default 30).", + " -d delay-ms: delay time for Enter key release.", " -f: run in foreground, not as a daemon.", " -k keyboard-device: keyboard device (usually under /dev/input/by-id/).", " -p pause-ms: pause before opening keyboard/uinput devs (default 0).", |