dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 9af0e172b7056aa5c81b3da0cdfbe7e9d600da1d
Author: Danny Milosavljevic <[email protected]>
Date: Tue Jul 4 18:52:52 2017 +0200
installer: Use select-key? for checking the key for selection.
* gnu/system/installer/disks.scm (disk-page-key-handler): Use select-key?.
* gnu/system/installer/filesystems.scm (filesystem-page-key-handler): Use
select-key?.
* gnu/system/installer/key-map.scm (key-map-page-key-handler): Use
select-key?.
* gnu/system/installer/locale.scm (locale-page-key-handler): Use
select-key?.
* gnu/system/installer/time-zone.scm (time-zone-page-key-handler): Use
select-key?.
---
gnu/system/installer/disks.scm | 2 +-
gnu/system/installer/filesystems.scm | 2 +-
gnu/system/installer/key-map.scm | 2 +-
gnu/system/installer/locale.scm | 2 +-
gnu/system/installer/time-zone.scm | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index 61c1f65..f56ece0 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -102,7 +102,7 @@
(buttons-unselect-all nav)
(menu-set-active! menu #t))
- ((and (eq? ch #\newline)
+ ((and (select-key? ch)
(menu-active menu))
(disk-page-activate-focused-item page))
diff --git a/gnu/system/installer/filesystems.scm
b/gnu/system/installer/filesystems.scm
index 7568f17..66c3755 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -223,7 +223,7 @@
(buttons-unselect-all nav)
(menu-set-active! menu #t))
- ((eq? ch #\newline)
+ ((select-key? ch)
(filesystem-page-activate-focused-item page))
((buttons-key-matches-symbol? nav ch 'cancel)
diff --git a/gnu/system/installer/key-map.scm b/gnu/system/installer/key-map.scm
index 30928d3..e62ba3c 100644
--- a/gnu/system/installer/key-map.scm
+++ b/gnu/system/installer/key-map.scm
@@ -81,7 +81,7 @@
(page-leave))
- ((and (eqv? ch #\newline)
+ ((and (select-key? ch)
(menu-active menu))
(key-map-page-activate-focused-item page)))
(std-menu-key-handler menu ch)
diff --git a/gnu/system/installer/locale.scm b/gnu/system/installer/locale.scm
index eb00dad..08a9b90 100644
--- a/gnu/system/installer/locale.scm
+++ b/gnu/system/installer/locale.scm
@@ -100,7 +100,7 @@
(buttons-unselect-all nav)
(menu-set-active! menu #t))
- ((and (eq? ch #\newline)
+ ((and (select-key? ch)
(menu-active menu))
(locale-page-activate-focused-item page))
diff --git a/gnu/system/installer/time-zone.scm
b/gnu/system/installer/time-zone.scm
index d4313cb..a1365a7 100644
--- a/gnu/system/installer/time-zone.scm
+++ b/gnu/system/installer/time-zone.scm
@@ -89,7 +89,7 @@
(page-leave)
'cancelled)
- ((and (eqv? ch #\newline)
+ ((and (select-key? ch)
(menu-active menu))
(time-zone-page-activate-focused-item page)))))
(std-menu-key-handler menu ch)
