summaryrefslogtreecommitdiff
path: root/gnu/installer/keymap.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2018-12-05 14:36:22 +0900
committerLudovic Courtès <ludo@gnu.org>2019-01-17 14:04:23 +0100
commitc088b2e47f6675199f1ef545df7d04d4532e64e3 (patch)
tree335f80e187ea1da73fbb39a1ca296166e714db90 /gnu/installer/keymap.scm
parentdc5f3275ecbddc804875899e9e457299a835d7ab (diff)
installer: Do not ask for keyboard model.
Suppose that the keyboard model is "pc105". * gnu/installer.scm (apply-keymap): Remove model ... * gnu/installer/newt/keymap.scm (run-keymap-page): passed here. (run-model-page): remove procedure * gnu/installer/record.scm (installer): Edit keymap-page prototype in comment. * gnu/installer/keymap.scm (default-keyboard-model): New exported parameter.
Diffstat (limited to 'gnu/installer/keymap.scm')
-rw-r--r--gnu/installer/keymap.scm4
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/installer/keymap.scm b/gnu/installer/keymap.scm
index 78065aa6c62..d9f8656855d 100644
--- a/gnu/installer/keymap.scm
+++ b/gnu/installer/keymap.scm
@@ -46,6 +46,7 @@
46 x11-keymap-variant-name 46 x11-keymap-variant-name
47 x11-keymap-variant-description 47 x11-keymap-variant-description
48 48
49 default-keyboard-model
49 xkb-rules->models+layouts 50 xkb-rules->models+layouts
50 kmscon-update-keymap)) 51 kmscon-update-keymap))
51 52
@@ -68,6 +69,9 @@
68 (name x11-keymap-variant-name) ;string 69 (name x11-keymap-variant-name) ;string
69 (description x11-keymap-variant-description)) ;string 70 (description x11-keymap-variant-description)) ;string
70 71
72;; Assume all modern keyboards have this model.
73(define default-keyboard-model (make-parameter "pc105"))
74
71(define (xkb-rules->models+layouts file) 75(define (xkb-rules->models+layouts file)
72 "Parse FILE and return two values, the list of supported X11-KEYMAP-MODEL 76 "Parse FILE and return two values, the list of supported X11-KEYMAP-MODEL
73and X11-KEYMAP-LAYOUT records. FILE is an XML file from the X Keyboard 77and X11-KEYMAP-LAYOUT records. FILE is an XML file from the X Keyboard