StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/interactive-evdev: change --evdev-offset to --without-x11-offset 

There is no reason to give full control rather than just enable/disable.

Signed-off-by: Ran Benita <ran@unusedvar.com>
master
Ran Benita 2020-07-27 11:51:53 +03:00
parent 81842f7fbb
commit 64bff65a6a
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/interactive-evdev.c
View File

@ -381,7 +381,7 @@ usage(FILE *fp, char *progname)
" --report-state-changes (report changes to the state)\n" " --report-state-changes (report changes to the state)\n"
" --enable-compose (enable Compose)\n" " --enable-compose (enable Compose)\n"
" --consumed-mode={xkb|gtk} (select the consumed modifiers mode, default: xkb)\n" " --consumed-mode={xkb|gtk} (select the consumed modifiers mode, default: xkb)\n"
" --evdev-offset=NUM (default: 8)\n" " --without-x11-offset (don't add X11 keycode offset)\n"
); );
} }
@ -408,7 +408,7 @@ main(int argc, char *argv[])
OPT_VARIANT, OPT_VARIANT,
OPT_OPTION, OPT_OPTION,
OPT_KEYMAP, OPT_KEYMAP,
OPT_EVDEV_OFFSET, OPT_WITHOUT_X11_OFFSET,
OPT_CONSUMED_MODE, OPT_CONSUMED_MODE,
OPT_COMPOSE, OPT_COMPOSE,
OPT_REPORT_STATE, OPT_REPORT_STATE,
@ -421,7 +421,7 @@ main(int argc, char *argv[])
{"variant", required_argument, 0, OPT_VARIANT}, {"variant", required_argument, 0, OPT_VARIANT},
{"options", required_argument, 0, OPT_OPTION}, {"options", required_argument, 0, OPT_OPTION},
{"keymap", required_argument, 0, OPT_KEYMAP}, {"keymap", required_argument, 0, OPT_KEYMAP},
{"evdev-offset", required_argument, 0, OPT_EVDEV_OFFSET}, {"without-x11-offset", required_argument, 0, OPT_WITHOUT_X11_OFFSET},
{"consumed-mode", required_argument, 0, OPT_CONSUMED_MODE}, {"consumed-mode", required_argument, 0, OPT_CONSUMED_MODE},
{"enable-compose", no_argument, 0, OPT_COMPOSE}, {"enable-compose", no_argument, 0, OPT_COMPOSE},
{"report-state-changes", no_argument, 0, OPT_REPORT_STATE}, {"report-state-changes", no_argument, 0, OPT_REPORT_STATE},
@ -457,14 +457,8 @@ main(int argc, char *argv[])
case OPT_KEYMAP: case OPT_KEYMAP:
keymap_path = optarg; keymap_path = optarg;
break; break;
case OPT_EVDEV_OFFSET: case OPT_WITHOUT_X11_OFFSET:
errno = 0; evdev_offset = 0;
evdev_offset = strtol(optarg, NULL, 10);
if (errno) {
fprintf(stderr, "error: --evdev-offset option expects a number\n");
usage(stderr, argv[0]);
return EXIT_INVALID_USAGE;
}
break; break;
case OPT_REPORT_STATE: case OPT_REPORT_STATE:
report_state_changes = true; report_state_changes = true;

5
tools/xkbcli-interactive-evdev.1
View File

@ -63,6 +63,11 @@ Enable Compose functionality
.B \-\-consumed\-mode={xkb|gtk} .B \-\-consumed\-mode={xkb|gtk}
Set the consumed modifiers mode (default: xkb) Set the consumed modifiers mode (default: xkb)
. .
.TP
.B \-\-without\-x11\-offset
Don't add an offset of 8 when converting an evdev keycode to an XKB keycode.
You probably don't want this option.
.
.SH "SEE ALSO" .SH "SEE ALSO"
\fBxkbcli\fR(1), \fBxkbcli\-interactive\-wayland\fR(1), \fBxkbcli\-interactive\-x11\fR(1) \fBxkbcli\fR(1), \fBxkbcli\-interactive\-wayland\fR(1), \fBxkbcli\-interactive\-x11\fR(1)
. .