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

tools: change xkbcli list to output YAML 

We have a lot of keyboard layouts and the current output format is virtually
useless at searching for a specific one to debug any issues with either the
layout list or the output from libxkbregistry.

Let's use YAML instead because that can easily be post-processed to extract the
specific layouts wanted, e.g. to get the list of all layouts:
  xkbcli-list | yq -r ".layouts[].layout"
to get the list of all variants of the "us" layout:
  xkbcli-list | yq -r '.layouts[] | select(.layout == "us") | .variant
and the number of option groups:
  xkbcli-list | yq -r '.option_groups[] | length'

Note that the top-level nodes have been de-capitalized, so where it was "Models"
before it is now "models" and the "Options" node is now "option_groups".

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
master
Peter Hutterer 2021-04-22 12:52:55 +10:00 committed by Ran Benita
parent 693ffb073b
commit f434c690cc
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tools/registry-list.c
View File

@ -136,11 +136,13 @@ main(int argc, char **argv)
goto err; goto err;
} }
printf("Models:\n"); printf("models:\n");
m = rxkb_model_first(ctx); m = rxkb_model_first(ctx);
assert(m); /* Empty model list is usually a bug or a bad xml file */ assert(m); /* Empty model list is usually a bug or a bad xml file */
while (m) { while (m) {
printf("- %s:%s:%s\n", printf("- name: %s\n"
" vendor: %s\n"
" description: %s\n",
rxkb_model_get_name(m), rxkb_model_get_name(m),
rxkb_model_get_vendor(m), rxkb_model_get_vendor(m),
rxkb_model_get_description(m)); rxkb_model_get_description(m));
@ -148,7 +150,7 @@ main(int argc, char **argv)
} }
printf("\n"); printf("\n");
printf("Layouts:\n"); printf("layouts:\n");
l = rxkb_layout_first(ctx); l = rxkb_layout_first(ctx);
assert(l); /* Empty layout list is usually a bug or a bad xml file */ assert(l); /* Empty layout list is usually a bug or a bad xml file */
while (l) { while (l) {
@ -157,56 +159,62 @@ main(int argc, char **argv)
const char *variant = rxkb_layout_get_variant(l); const char *variant = rxkb_layout_get_variant(l);
const char *brief = rxkb_layout_get_brief(l); const char *brief = rxkb_layout_get_brief(l);
printf("- %s%s%s%s:%s:%s", printf("- layout: %s\n"
" variant: %s\n"
" brief: %s\n"
" description: %s\n",
rxkb_layout_get_name(l), rxkb_layout_get_name(l),
variant ? "(" : "", variant ? variant : "''",
variant ? variant : "", brief ? brief : "''",
variant ? ")" : "",
brief ? brief : "",
rxkb_layout_get_description(l)); rxkb_layout_get_description(l));
printf(" iso639: [");
iso639 = rxkb_layout_get_iso639_first(l); iso639 = rxkb_layout_get_iso639_first(l);
if (iso639) { if (iso639) {
const char *sep = ""; const char *sep = "";
printf(":iso639-");
while (iso639) { while (iso639) {
printf("%s%s", sep, rxkb_iso639_code_get_code(iso639)); printf("%s%s", sep, rxkb_iso639_code_get_code(iso639));
iso639 = rxkb_iso639_code_next(iso639); iso639 = rxkb_iso639_code_next(iso639);
sep = ","; sep = ", ";
} }
} }
printf("]\n");
printf(" iso3166: [");
iso3166 = rxkb_layout_get_iso3166_first(l); iso3166 = rxkb_layout_get_iso3166_first(l);
if (iso3166) { if (iso3166) {
const char *sep = ""; const char *sep = "";
printf(":iso3166-");
while (iso3166) { while (iso3166) {
printf("%s%s", sep, rxkb_iso3166_code_get_code(iso3166)); printf("%s%s", sep, rxkb_iso3166_code_get_code(iso3166));
iso3166 = rxkb_iso3166_code_next(iso3166); iso3166 = rxkb_iso3166_code_next(iso3166);
sep = ","; sep = ", ";
} }
} }
printf("]\n");
printf("\n");
l = rxkb_layout_next(l); l = rxkb_layout_next(l);
} }
printf("\n"); printf("\n");
printf("Options:\n"); printf("option_groups:\n");
g = rxkb_option_group_first(ctx); g = rxkb_option_group_first(ctx);
assert(g); /* Empty option goups list is usually a bug or a bad xml file */ assert(g); /* Empty option goups list is usually a bug or a bad xml file */
while (g) { while (g) {
struct rxkb_option *o; struct rxkb_option *o;
printf("- %s:%s (%s)\n", printf("- name: %s\n"
" description: %s\n"
" allows_multiple: %s\n"
" options:\n",
rxkb_option_group_get_name(g), rxkb_option_group_get_name(g),
rxkb_option_group_get_description(g), rxkb_option_group_get_description(g),
rxkb_option_group_allows_multiple(g) ? "multiple" : "single"); rxkb_option_group_allows_multiple(g) ? "true" : "false");
o = rxkb_option_first(g); o = rxkb_option_first(g);
assert(o); /* Empty option list is usually a bug or a bad xml file */ assert(o); /* Empty option list is usually a bug or a bad xml file */
while (o) { while (o) {
const char *brief = rxkb_option_get_brief(o); const char *brief = rxkb_option_get_brief(o);
printf(" - %s:%s:%s\n", printf(" - name: '%s'\n"
" brief: '%s'\n"
" description: '%s'\n",
rxkb_option_get_name(o), rxkb_option_get_name(o),
brief ? brief : "", brief ? brief : "",
rxkb_option_get_description(o)); rxkb_option_get_description(o));