summaryrefslogtreecommitdiff
path: root/gnu/installer
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 /gnu/installer
parent48659aa22170a252c9b2e60f16fbe9f83a6deba4 (diff)
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'.
Diffstat (limited to 'gnu/installer')
-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 ef2d8368fb1..8aea5a11096 100644
--- a/gnu/installer/newt/page.scm
+++ b/gnu/installer/newt/page.scm
@@ -107,7 +107,7 @@ input box, such as FLAG-PASSWORD."
107 (list GRID-ELEMENT-COMPONENT input-visible-cb) 107 (list GRID-ELEMENT-COMPONENT input-visible-cb)
108 '()))) 108 '())))
109 GRID-ELEMENT-COMPONENT ok-button)) 109 GRID-ELEMENT-COMPONENT ok-button))
110 (form (make-form))) 110 (form (make-form #:flags FLAG-NOF12)))
111 111
112 (add-component-callback 112 (add-component-callback
113 input-visible-cb 113 input-visible-cb
@@ -181,7 +181,7 @@ of the page is set to TITLE."
181 (horizontal-stacked-grid 181 (horizontal-stacked-grid
182 GRID-ELEMENT-COMPONENT ok-button 182 GRID-ELEMENT-COMPONENT ok-button
183 GRID-ELEMENT-COMPONENT exit-button))) 183 GRID-ELEMENT-COMPONENT exit-button)))
184 (form (make-form))) 184 (form (make-form #:flags FLAG-NOF12)))
185 185
186 (add-form-to-grid grid form #t) 186 (add-form-to-grid grid form #t)
187 (make-wrapped-grid-window grid title) 187 (make-wrapped-grid-window grid title)
@@ -315,7 +315,7 @@ the current listbox item has to be selected by key."
315 (if listbox-allow-multiple? 315 (if listbox-allow-multiple?
316 FLAG-MULTIPLE 316 FLAG-MULTIPLE
317 0)))) 317 0))))
318 (form (make-form)) 318 (form (make-form #:flags FLAG-NOF12))
319 (info-textbox 319 (info-textbox
320 (make-reflowed-textbox -1 -1 info-text 320 (make-reflowed-textbox -1 -1 info-text
321 info-textbox-width 321 info-textbox-width
@@ -516,7 +516,7 @@ ITEMS when 'Ok' is pressed."
516 GRID-ELEMENT-COMPONENT ok-button 516 GRID-ELEMENT-COMPONENT ok-button
517 GRID-ELEMENT-COMPONENT exit-button))) 517 GRID-ELEMENT-COMPONENT exit-button)))
518 (keys (fill-checkbox-tree checkbox-tree items)) 518 (keys (fill-checkbox-tree checkbox-tree items))
519 (form (make-form))) 519 (form (make-form #:flags FLAG-NOF12)))
520 520
521 (add-form-to-grid grid form #t) 521 (add-form-to-grid grid form #t)
522 (make-wrapped-grid-window grid title) 522 (make-wrapped-grid-window grid title)
@@ -593,7 +593,7 @@ ITEMS when 'Ok' is pressed."
593 ,@(if exit-button? 593 ,@(if exit-button?
594 (list GRID-ELEMENT-COMPONENT exit-button) 594 (list GRID-ELEMENT-COMPONENT exit-button)
595 '()))))) 595 '())))))
596 (form (make-form))) 596 (form (make-form #:flags FLAG-NOF12)))
597 597
598 (add-form-to-grid grid form #t) 598 (add-form-to-grid grid form #t)
599 (make-wrapped-grid-window grid title) 599 (make-wrapped-grid-window grid title)