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

tools: align `xkbcli how-to-type` output ourselves 

Can possibly add a machine-parsable format if desired, but for now just
have it work nicely.

Signed-off-by: Ran Benita <ran@unusedvar.com>
master
Ran Benita 2020-09-09 10:09:13 +03:00
parent 6178924f28
commit c5565bd05f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/how-to-type.c
View File

@ -38,7 +38,6 @@ usage(const char *argv0, FILE *fp)
fprintf(fp, "Usage: %s [--rules <rules>] [--model <model>] " fprintf(fp, "Usage: %s [--rules <rules>] [--model <model>] "
"[--layout <layout>] [--variant <variant>] [--options <options>]" "[--layout <layout>] [--variant <variant>] [--options <options>]"
" <unicode codepoint>\n", argv0); " <unicode codepoint>\n", argv0);
fprintf(fp, "Pipe into `column -ts $'\\t'` for nicely aligned output.\n");
} }
int int
@ -155,7 +154,8 @@ main(int argc, char *argv[])
} }
printf("keysym: %s (%#x)\n", name, keysym); printf("keysym: %s (%#x)\n", name, keysym);
printf("KEYCODE\tKEY NAME\tLAYOUT#\tLAYOUT NAME\tLEVEL#\tMODIFIERS\n"); printf("%-8s %-9s %-8s %-20s %-7s %-s\n",
"KEYCODE", "KEY NAME", "LAYOUT", "LAYOUT NAME", "LEVEL#", "MODIFIERS");
min_keycode = xkb_keymap_min_keycode(keymap); min_keycode = xkb_keymap_min_keycode(keymap);
max_keycode = xkb_keymap_max_keycode(keymap); max_keycode = xkb_keymap_max_keycode(keymap);
@ -202,7 +202,7 @@ main(int argc, char *argv[])
for (size_t i = 0; i < num_masks; i++) { for (size_t i = 0; i < num_masks; i++) {
xkb_mod_mask_t mask = masks[i]; xkb_mod_mask_t mask = masks[i];
printf("%u\t%s\t%u\t%s\t%u\t[ ", printf("%-8u %-9s %-8u %-20s %-7u [ ",
keycode, key_name, layout + 1, layout_name, level + 1); keycode, key_name, layout + 1, layout_name, level + 1);
for (xkb_mod_index_t mod = 0; mod < num_mods; mod++) { for (xkb_mod_index_t mod = 0; mod < num_mods; mod++) {
if ((mask & (1 << mod)) == 0) { if ((mask & (1 << mod)) == 0) {

7
tools/xkbcli-how-to-type.1
View File

@ -13,11 +13,8 @@
. .
.Sh DESCRIPTION .Sh DESCRIPTION
.Nm .Nm
prints key sequences to type the given Unicode codepoint. prints the key combinations (keycode + modifiers) in the keymap's layouts which
.Pp would produce the given Unicode codepoint.
Pipe into
.Dq "column \-ts $\'\e\et\'"
for nicely aligned output.
. .
.Bl -tag -width Ds .Bl -tag -width Ds
.It Fl \-rules Ar rules .It Fl \-rules Ar rules