aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-20 22:12:45 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-20 23:21:00 +0100
commit37eda8c044d7923da36f2857040d48335ca6f439 (patch)
treee195ca9a78e2ac72870fc8d6631b862a4cc16607
parent48659aa22170a252c9b2e60f16fbe9f83a6deba4 (diff)
downloadguix-37eda8c044d7923da36f2857040d48335ca6f439.tar
guix-37eda8c044d7923da36f2857040d48335ca6f439.tar.gz
installer: Disable F12 hot key.
Fixes <https://bugs.gnu.org/38562>. Reported by Brice Waegeneire <brice@waegenei.re>. Previously, pressing F12 or shift-F2 in one of those forms would cause it to exit, usually with the default value #t because the caller had not provided a useful hotkey "callback". * gnu/installer/newt/page.scm (run-input-page, run-confirmation-page) (run-listbox-selection-page, run-checkbox-tree-page) (run-file-textbox-page): Pass #:flags FLAG-NOF12 to 'make-form'.
-rw-r--r--gnu/installer/newt/page.scm10
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm
index ef2d8368fb..8aea5a1109 100644
--- a/gnu/installer/newt/page.scm
+++ b/gnu/installer/newt/page.scm
@@ -107,7 +107,7 @@ input box, such as FLAG-PASSWORD."
(list GRID-ELEMENT-COMPONENT input-visible-cb)
'())))
GRID-ELEMENT-COMPONENT ok-button))
- (form (make-form)))
+ (form (make-form #:flags FLAG-NOF12)))
(add-component-callback
input-visible-cb
@@ -181,7 +181,7 @@ of the page is set to TITLE."
(horizontal-stacked-grid
GRID-ELEMENT-COMPONENT ok-button
GRID-ELEMENT-COMPONENT exit-button)))
- (form (make-form)))
+ (form (make-form #:flags FLAG-NOF12)))
(add-form-to-grid grid form #t)
(make-wrapped-grid-window grid title)
@@ -315,7 +315,7 @@ the current listbox item has to be selected by key."
(if listbox-allow-multiple?
FLAG-MULTIPLE
0))))
- (form (make-form))
+ (form (make-form #:flags FLAG-NOF12))
(info-textbox
(make-reflowed-textbox -1 -1 info-text
info-textbox-width
@@ -516,7 +516,7 @@ ITEMS when 'Ok' is pressed."
GRID-ELEMENT-COMPONENT ok-button
GRID-ELEMENT-COMPONENT exit-button)))
(keys (fill-checkbox-tree checkbox-tree items))
- (form (make-form)))
+ (form (make-form #:flags FLAG-NOF12)))
(add-form-to-grid grid form #t)
(make-wrapped-grid-window grid title)
@@ -593,7 +593,7 @@ ITEMS when 'Ok' is pressed."
,@(if exit-button?
(list GRID-ELEMENT-COMPONENT exit-button)
'())))))
- (form (make-form)))
+ (form (make-form #:flags FLAG-NOF12)))
(add-form-to-grid grid form #t)
(make-wrapped-grid-window grid title)