From 701b1d41e8de7ecd89ac87ae5a09f121cdeeba4e Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Mon, 26 Aug 2019 17:15:43 +0200 Subject: [PATCH] input_filter: update character generators This adds complete character-generator configurations for English (US), German (Germany and Switzerland), and French (France and Switzerland). The configs are manually amended and stripped-down versions of xkb2ifcfg generated configs. Issue #3483 --- repos/gems/recipes/pkg/sculpt/README | 2 +- repos/gems/run/sculpt.run | 7 +- repos/os/src/server/input_filter/de.chargen | 165 ------ .../os/src/server/input_filter/de_ch.chargen | 525 ++++++++++++------ .../os/src/server/input_filter/de_de.chargen | 314 +++++++++++ .../os/src/server/input_filter/en_us.chargen | 412 +++++++++----- repos/os/src/server/input_filter/fr.chargen | 183 ------ .../os/src/server/input_filter/fr_ch.chargen | 371 +++++++++++++ .../os/src/server/input_filter/fr_fr.chargen | 419 ++++++++++++++ 9 files changed, 1742 insertions(+), 656 deletions(-) delete mode 100644 repos/os/src/server/input_filter/de.chargen create mode 100644 repos/os/src/server/input_filter/de_de.chargen delete mode 100755 repos/os/src/server/input_filter/fr.chargen create mode 100644 repos/os/src/server/input_filter/fr_ch.chargen create mode 100644 repos/os/src/server/input_filter/fr_fr.chargen diff --git a/repos/gems/recipes/pkg/sculpt/README b/repos/gems/recipes/pkg/sculpt/README index 09c3d06caa..9989f9ad44 100644 --- a/repos/gems/recipes/pkg/sculpt/README +++ b/repos/gems/recipes/pkg/sculpt/README @@ -490,7 +490,7 @@ You can edit this component's configuration via ! inspect:/> vim /config/input_filter To change the keyboard layout to German, change "en_us.chargen" to -"de.chargen" and save the file. The change becomes effective immediately at +"de_de.chargen" and save the file. The change becomes effective immediately at saving time. To remap the capslock key to escape - a key often needed while using Vim - diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run index 699dd30a4f..4dcf13f3e8 100644 --- a/repos/gems/run/sculpt.run +++ b/repos/gems/run/sculpt.run @@ -115,9 +115,10 @@ install_config { - - + + + @@ -495,7 +496,7 @@ file copy -force [genode_dir]/repos/gems/run/sculpt/machine.vbox [run_dir]/genod file copy -force [genode_dir]/repos/gems/recipes/raw/drivers_managed-pc/drivers.config \ [run_dir]/genode/drivers.config -foreach file { fr.chargen en_us.chargen de.chargen de_ch.chargen special.chargen } { +foreach file { en_us.chargen de_ch.chargen de_de.chargen fr_ch.chargen fr_fr.chargen special.chargen } { file copy -force [genode_dir]/repos/os/src/server/input_filter/$file \ [run_dir]/genode/$file } diff --git a/repos/os/src/server/input_filter/de.chargen b/repos/os/src/server/input_filter/de.chargen deleted file mode 100644 index c72a37c4f1..0000000000 --- a/repos/os/src/server/input_filter/de.chargen +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/os/src/server/input_filter/de_ch.chargen b/repos/os/src/server/input_filter/de_ch.chargen index b2f894c317..fbc0e2ea4d 100644 --- a/repos/os/src/server/input_filter/de_ch.chargen +++ b/repos/os/src/server/input_filter/de_ch.chargen @@ -1,168 +1,371 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/os/src/server/input_filter/de_de.chargen b/repos/os/src/server/input_filter/de_de.chargen new file mode 100644 index 0000000000..32e6e9f68d --- /dev/null +++ b/repos/os/src/server/input_filter/de_de.chargen @@ -0,0 +1,314 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/os/src/server/input_filter/en_us.chargen b/repos/os/src/server/input_filter/en_us.chargen index 28e9aab3da..f826357de0 100644 --- a/repos/os/src/server/input_filter/en_us.chargen +++ b/repos/os/src/server/input_filter/en_us.chargen @@ -1,149 +1,275 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/os/src/server/input_filter/fr.chargen b/repos/os/src/server/input_filter/fr.chargen deleted file mode 100755 index eb33c09d9b..0000000000 --- a/repos/os/src/server/input_filter/fr.chargen +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/os/src/server/input_filter/fr_ch.chargen b/repos/os/src/server/input_filter/fr_ch.chargen new file mode 100644 index 0000000000..094549897c --- /dev/null +++ b/repos/os/src/server/input_filter/fr_ch.chargen @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/os/src/server/input_filter/fr_fr.chargen b/repos/os/src/server/input_filter/fr_fr.chargen new file mode 100644 index 0000000000..aa14770b42 --- /dev/null +++ b/repos/os/src/server/input_filter/fr_fr.chargen @@ -0,0 +1,419 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +