git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keys: clean up mode defaults setup in print_rows()
[sheet.git]
/
tools
/
mkdigraphs-xorg
diff --git
a/tools/mkdigraphs-xorg
b/tools/mkdigraphs-xorg
index 32a5044150c62657d5ce214f5052560f87847c6a..aeed5fe036226bc9c86e888357cd529097fe39d6 100755
(executable)
--- a/
tools/mkdigraphs-xorg
+++ b/
tools/mkdigraphs-xorg
@@
-3,11
+3,14
@@
use 5.014;
use warnings;
use utf8;
use open IO => ':utf8', ':std';
use warnings;
use utf8;
use open IO => ':utf8', ':std';
+use re '/msx';
use Data::Dump 'pp';
use Data::Dump 'pp';
-our $VERSION = '1.0
0
';
+our $VERSION = '1.0
1
';
-open my $keysymh, '<', '/usr/include/X11/keysymdef.h'
+my $keysymh;
+open $keysymh, '<', 'data/keysymdef.h'
+ or open $keysymh, '<', '/usr/include/X11/keysymdef.h'
or die "Could not find keysym definitions: $!\n";
my %keysym;
or die "Could not find keysym definitions: $!\n";
my %keysym;
@@
-16,7
+19,7
@@
while (readline $keysymh) {
\A [#]define[ ]XK_ (?<name>[a-zA-Z_0-9]+)
\h+ 0x(?<value>[0-9a-f]+)
\h* [/][*] [\h(] U[+] (?<unicode>[0-9A-F]{4,6})
\A [#]define[ ]XK_ (?<name>[a-zA-Z_0-9]+)
\h+ 0x(?<value>[0-9a-f]+)
\h* [/][*] [\h(] U[+] (?<unicode>[0-9A-F]{4,6})
- }
msx
or next;
+ } or next;
$keysym{ $+{name} } = chr hex $+{unicode};
}
$keysym{ $+{name} } = chr hex $+{unicode};
}
@@
-24,12
+27,12
@@
say "# automatically generated by $0";
say '+{';
while ($_ = readline) {
say '+{';
while ($_ = readline) {
- my ($mnem, $chr, $trail) =
/^<Multi_key>\h(.*?)\h+:\h"([^"]+)"\h*
(.*)/
+ my ($mnem, $chr, $trail) =
m/\A <Multi_key> \h (.*?) \h+ : \h "([^"]+)" \h*
(.*)/
or next;
$chr =~ s/\\(.)/$1/g;
or next;
$chr =~ s/\\(.)/$1/g;
- $mnem !~
/<dead|<KP_|
<U[0-9A-Fa-f]{4}/ or next; # skip non-standard keys
- $mnem =~ s{<([^>]+)> ?}{$keysym{$1} // die "reference to unknown keysym $1\n"}eg;
- $mnem !~
/[^
-\x7F]/ or next; # skip unicode
+ $mnem !~
m/<dead | <KP_ |
<U[0-9A-Fa-f]{4}/ or next; # skip non-standard keys
+ $mnem =~ s{<([^>]+)>
\h
?}{$keysym{$1} // die "reference to unknown keysym $1\n"}eg;
+ $mnem !~
m/[^\x20
-\x7F]/ or next; # skip unicode
# (state $seen = {})->{$chr}++ and next;
printf "%s => %s,\n", pp($mnem), pp($chr);
}
# (state $seen = {})->{$chr}++ and next;
printf "%s => %s,\n", pp($mnem), pp($chr);
}