115/197: installer: New procedure refresh*.

[Danny Milosavljevic]

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 873c374531af8ff740c1fdb64971353025ff6031
Author: John Darrington <address@hidden>
Date:   Wed Jan 18 10:16:22 2017 +0100

    installer: New procedure refresh*.
    
    * gnu/system/installer/utils.scm (refresh*): New procedure.
    * gnu/system/installer/configure.scm,
     gnu/system/installer/dialog.scm,
     gnu/system/installer/disks.scm,
     gnu/system/installer/filesystems.scm,
     gnu/system/installer/format.scm,
     gnu/system/installer/guixsd-installer.scm,
     gnu/system/installer/hostname.scm,
     gnu/system/installer/install.scm,
     gnu/system/installer/key-map.scm,
     gnu/system/installer/mount-point.scm,
     gnu/system/installer/network.scm,
     gnu/system/installer/passphrase.scm,
     gnu/system/installer/ping.scm,
     gnu/system/installer/role.scm,
     gnu/system/installer/time-zone.scm,
     gnu/system/installer/wireless.scm: Change all calls of refresh to
    refresh*.
---
 gnu/system/installer/configure.scm        | 12 ++++++------
 gnu/system/installer/dialog.scm           | 10 +++++-----
 gnu/system/installer/disks.scm            |  8 ++++----
 gnu/system/installer/filesystems.scm      |  8 ++++----
 gnu/system/installer/format.scm           | 12 ++++++------
 gnu/system/installer/guixsd-installer.scm |  4 ++--
 gnu/system/installer/hostname.scm         |  8 ++++----
 gnu/system/installer/install.scm          | 10 +++++-----
 gnu/system/installer/key-map.scm          | 12 ++++++------
 gnu/system/installer/mount-point.scm      |  6 +++---
 gnu/system/installer/network.scm          | 10 +++++-----
 gnu/system/installer/passphrase.scm       |  8 ++++----
 gnu/system/installer/ping.scm             |  8 ++++----
 gnu/system/installer/role.scm             | 10 +++++-----
 gnu/system/installer/time-zone.scm        | 12 ++++++------
 gnu/system/installer/utils.scm            | 14 +++++++++++---
 gnu/system/installer/wireless.scm         | 10 +++++-----
 17 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/gnu/system/installer/configure.scm 
b/gnu/system/installer/configure.scm
index 6f4d377..38bdab9 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -127,8 +127,8 @@
     (configure-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page))))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page))))
 
 
 (define (generate-guix-config p width)
@@ -245,9 +245,9 @@
     (page-set-wwin! p pr)
     (page-set-datum! p 'navigation buttons)
     (buttons-post buttons bwin)
-    (refresh (outer pr))
-    (refresh text-window)
+    (refresh* (outer pr))
+    (refresh* text-window)
 
-    (refresh (outer config-window))
+    (refresh* (outer config-window))
 
-    (refresh bwin)))
+    (refresh* bwin)))
diff --git a/gnu/system/installer/dialog.scm b/gnu/system/installer/dialog.scm
index 41059c7..1c0ad8b 100644
--- a/gnu/system/installer/dialog.scm
+++ b/gnu/system/installer/dialog.scm
@@ -68,7 +68,7 @@
   (when (not (page-initialised? page))
     (dialog-page-init page)
     (page-set-initialised! page #t))
-  (refresh (page-datum page 'text-window)))
+  (refresh* (page-datum page 'text-window)))
 
 (define (dialog-page-init p)
   (let* ((s (page-surface p))
@@ -101,10 +101,10 @@
   (page-set-datum! p 'navigation buttons)
   (buttons-post buttons button-window)
   (buttons-select buttons 0)
-  (refresh (outer frame))
-  (refresh (inner frame))
-  (refresh text-window)
-  (refresh button-window)))
+  (refresh* (outer frame))
+  (refresh* (inner frame))
+  (refresh* text-window)
+  (refresh* button-window)))
 
 
 
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index 398930f..cd4587f 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -55,8 +55,8 @@
 
       (menu-set-items! menu (volumes))
       (touchwin (outer (page-wwin page)))
-      (refresh (outer (page-wwin page)))
-      (refresh (inner (page-wwin page)))
+      (refresh* (outer (page-wwin page)))
+      (refresh* (inner (page-wwin page)))
       (menu-redraw menu)
       (menu-refresh menu)))
 
@@ -153,5 +153,5 @@
     (page-set-datum! p 'navigation buttons)
     (menu-post menu menu-window)
     (buttons-post buttons button-window)
-    (refresh (outer frame))
-    (refresh button-window)))
+    (refresh* (outer frame))
+    (refresh* button-window)))
diff --git a/gnu/system/installer/filesystems.scm 
b/gnu/system/installer/filesystems.scm
index dec473d..a7fc4a4 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -172,8 +172,8 @@
 
     (menu-set-items! menu (partition-volume-pairs))
     (touchwin (outer (page-wwin page)))
-    (refresh (outer (page-wwin page)))
-    (refresh (inner (page-wwin page)))
+    (refresh* (outer (page-wwin page)))
+    (refresh* (inner (page-wwin page)))
     (menu-redraw menu)
     (menu-refresh menu)))
 
@@ -297,7 +297,7 @@
     (page-set-datum! p 'text-window text-window)
     (menu-post menu mwin)
     (buttons-post buttons bwin)
-    (refresh (outer pr))
-    (refresh bwin)))
+    (refresh* (outer pr))
+    (refresh* bwin)))
 
 
diff --git a/gnu/system/installer/format.scm b/gnu/system/installer/format.scm
index d4840b0..bc0ce81 100644
--- a/gnu/system/installer/format.scm
+++ b/gnu/system/installer/format.scm
@@ -151,8 +151,8 @@ match those uuids read from the respective partitions"
     (format-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page))))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page))))
 
 
 (define (format-page-init p)
@@ -199,9 +199,9 @@ match those uuids read from the respective partitions"
     (page-set-datum! p 'navigation buttons)
     (page-set-datum! p 'config-window (inner config-window))
     (buttons-post buttons bwin)
-    (refresh (outer pr))
-    (refresh text-window)
+    (refresh* (outer pr))
+    (refresh* text-window)
 
-    (refresh (outer config-window))
+    (refresh* (outer config-window))
 
-    (refresh bwin)))
+    (refresh* bwin)))
diff --git a/gnu/system/installer/guixsd-installer.scm 
b/gnu/system/installer/guixsd-installer.scm
index 8bdb575..6db5477 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -265,8 +265,8 @@ tail of the list."
     (page-set-initialised! page #t))
 
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page)))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page)))
   (menu-redraw (page-datum page 'menu))
   (menu-refresh (page-datum page 'menu)))
 
diff --git a/gnu/system/installer/hostname.scm 
b/gnu/system/installer/hostname.scm
index 33b4194..0d03452 100644
--- a/gnu/system/installer/hostname.scm
+++ b/gnu/system/installer/hostname.scm
@@ -65,9 +65,9 @@
      text-window
      (gettext
       (format #f "Enter the host name for the new system.  Only letters, 
digits and hyphens are allowed. The first character may not be a hyphen.  A 
maximum of ~a characters are allowed." max-length)))
-    (refresh text-window)
-    (refresh (outer (page-wwin page)))
-    (refresh (form-window form))))
+    (refresh* text-window)
+    (refresh* (outer (page-wwin page)))
+    (refresh* (form-window form))))
 
 (define (host-name-key-handler page ch)
   (let ((form  (page-datum page 'form))
@@ -151,5 +151,5 @@
     (form-post form fw)
     (buttons-post nav bwin)
     (page-set-wwin! p pr)
-    (refresh (outer pr))))
+    (refresh* (outer pr))))
 
diff --git a/gnu/system/installer/install.scm b/gnu/system/installer/install.scm
index 3c21eab..b62c938 100644
--- a/gnu/system/installer/install.scm
+++ b/gnu/system/installer/install.scm
@@ -126,8 +126,8 @@
     (install-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page))))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page))))
 
 
 (define (install-page-init p)
@@ -167,7 +167,7 @@
     (page-set-datum! p 'navigation buttons)
     (page-set-datum! p 'config-window (inner config-window))
     (buttons-post buttons bwin)
-    (refresh (outer pr))
-    (refresh text-window)
-    (refresh bwin)))
+    (refresh* (outer pr))
+    (refresh* text-window)
+    (refresh* bwin)))
 
diff --git a/gnu/system/installer/key-map.scm b/gnu/system/installer/key-map.scm
index c2febb6..95ba603 100644
--- a/gnu/system/installer/key-map.scm
+++ b/gnu/system/installer/key-map.scm
@@ -87,8 +87,8 @@
     (file-browser-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page)))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page)))
   (menu-refresh (page-datum page 'menu)))
 
 (define (file-browser-page-init p)
@@ -128,10 +128,10 @@
     (page-set-datum! p 'menu menu)
     (page-set-datum! p 'navigation buttons)
     (buttons-post buttons button-window)
-    (refresh (outer frame))
-    (refresh (inner frame))
-    (refresh text-window)
-    (refresh button-window)))
+    (refresh* (outer frame))
+    (refresh* (inner frame))
+    (refresh* text-window)
+    (refresh* button-window)))
 
                        
 
diff --git a/gnu/system/installer/mount-point.scm 
b/gnu/system/installer/mount-point.scm
index aeb8c51..d610fe4 100644
--- a/gnu/system/installer/mount-point.scm
+++ b/gnu/system/installer/mount-point.scm
@@ -44,8 +44,8 @@
     (mount-point-page-init page)
     (page-set-initialised! page #t))
   (let ((form  (page-datum page 'form)))
-    (refresh (outer (page-wwin page)))
-    (refresh (form-window form))))
+    (refresh* (outer (page-wwin page)))
+    (refresh* (form-window form))))
 
 (define (mount-point-page-key-handler page ch)
   (let ((form  (page-datum page 'form))
@@ -159,5 +159,5 @@
     (page-set-datum! p 'form form)
 
     (page-set-wwin! p pr)
-    (refresh (outer pr))))
+    (refresh* (outer pr))))
 
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 9eeefa0..0ee9fc6 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -155,8 +155,8 @@
     (network-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page)))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page)))
   (menu-refresh (page-datum page 'menu)))
 
 
@@ -214,6 +214,6 @@
     (page-set-datum! p 'navigation buttons)
     (menu-post menu mwin)
     (buttons-post buttons bwin)
-    (refresh (outer pr))
-    (refresh text-window)
-    (refresh bwin)))
+    (refresh* (outer pr))
+    (refresh* text-window)
+    (refresh* bwin)))
diff --git a/gnu/system/installer/passphrase.scm 
b/gnu/system/installer/passphrase.scm
index a633585..18dc959 100644
--- a/gnu/system/installer/passphrase.scm
+++ b/gnu/system/installer/passphrase.scm
@@ -61,9 +61,9 @@
      (gettext
       (format #f "Enter the passphrase for the network ~a."
               (page-datum page 'network))))
-    (refresh text-window)
-    (refresh (outer (page-wwin page)))
-    (refresh (form-window form))))
+    (refresh* text-window)
+    (refresh* (outer (page-wwin page)))
+    (refresh* (form-window form))))
 
 (define (passphrase-key-handler page ch)
   (let ((form  (page-datum page 'form))
@@ -133,4 +133,4 @@
     (form-post form fw)
     (buttons-post nav bwin)
     (page-set-wwin! p pr)
-    (refresh (outer pr))))
+    (refresh* (outer pr))))
diff --git a/gnu/system/installer/ping.scm b/gnu/system/installer/ping.scm
index a8cd82e..7fd82a5 100644
--- a/gnu/system/installer/ping.scm
+++ b/gnu/system/installer/ping.scm
@@ -97,13 +97,13 @@
            (addstr test-window
                    (gettext "Test failed. No servers reached.")))
 
-       (refresh test-window)))) #f))
+       (refresh* test-window)))) #f))
 
 (define (ping-page-refresh page)
   (when (not (page-initialised? page))
     (ping-page-init page)
     (page-set-initialised! page #t))
-  (refresh (page-datum page 'test-window)))
+  (refresh* (page-datum page 'test-window)))
 
 (define (ping-page-init p)
   (let* ((s (page-surface p))
@@ -135,5 +135,5 @@
     (page-set-datum! p 'test-window test-window)
     (page-set-datum! p 'navigation buttons)
     (buttons-post buttons button-window)
-    (refresh text-window)
-    (refresh button-window)))
+    (refresh* text-window)
+    (refresh* button-window)))
diff --git a/gnu/system/installer/role.scm b/gnu/system/installer/role.scm
index 7193677..2b74de4 100644
--- a/gnu/system/installer/role.scm
+++ b/gnu/system/installer/role.scm
@@ -107,8 +107,8 @@
     (role-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page)))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page)))
   (menu-refresh (page-datum page 'menu)))
 
 
@@ -170,6 +170,6 @@
     (page-set-datum! p 'navigation buttons)
     (menu-post menu mwin)
     (buttons-post buttons bwin)
-    (refresh (outer pr))
-    (refresh text-window)
-    (refresh bwin)))
+    (refresh* (outer pr))
+    (refresh* text-window)
+    (refresh* bwin)))
diff --git a/gnu/system/installer/time-zone.scm 
b/gnu/system/installer/time-zone.scm
index cdbd56d..95e655b 100644
--- a/gnu/system/installer/time-zone.scm
+++ b/gnu/system/installer/time-zone.scm
@@ -93,8 +93,8 @@
     (time-zone-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page)))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page)))
   (menu-refresh (page-datum page 'menu)))
 
 (define (time-zone-page-init p)
@@ -147,7 +147,7 @@
     (page-set-datum! p 'menu menu)
     (page-set-datum! p 'navigation  buttons)
     (buttons-post buttons button-window)
-    (refresh (outer frame))
-    (refresh (inner frame))
-    (refresh text-window)
-    (refresh button-window)))
+    (refresh* (outer frame))
+    (refresh* (inner frame))
+    (refresh* text-window)
+    (refresh* button-window)))
diff --git a/gnu/system/installer/utils.scm b/gnu/system/installer/utils.scm
index 35da260..6bd10f3 100644
--- a/gnu/system/installer/utils.scm
+++ b/gnu/system/installer/utils.scm
@@ -40,6 +40,7 @@
 
            window-pipe
             pipe-cmd
+            refresh*
 
            select-key?))
 
@@ -50,8 +51,15 @@
             (gnu system installer misc)
              (gnu system installer filesystems)
             (ncurses form)
+             (ncurses panel)
              (ncurses curses))
 
+(define (refresh* win)
+  (if (panel? win)
+      (begin
+        (update-panels)
+        (doupdate))
+      (refresh win)))
 
 (define (make-window-port win)
   "Return a port which writes to the curses window WIN"
@@ -65,7 +73,7 @@
    (vector
     (lambda (c) (addch win c))
     (lambda (s) (addstr win s))
-    (lambda () (refresh win))
+    (lambda () (refresh* win))
     #f
     #f)
    "w"))
@@ -232,7 +240,7 @@ which will process each string before returning it."
         (menu-driver menu REQ_UP_ITEM)
         ))
 
-    (refresh win)))
+    (refresh* win)))
 
 
 
@@ -293,7 +301,7 @@ pair whose car is the inner window and whose cdr is the 
frame."
          (addstr win title #:y 1
                  #:x (round (/ (- (getmaxx win) (string-length title)) 2)))))
 
-    (refresh sw)
+    (refresh* sw)
     ;; Return the inner and outer windows
     (cons sw win)))
 
diff --git a/gnu/system/installer/wireless.scm 
b/gnu/system/installer/wireless.scm
index 0c34c53..efaa87b 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -95,8 +95,8 @@
     (wireless-page-init page)
     (page-set-initialised! page #t))
   (touchwin (outer (page-wwin page)))
-  (refresh (outer (page-wwin page)))
-  (refresh (inner (page-wwin page)))
+  (refresh* (outer (page-wwin page)))
+  (refresh* (inner (page-wwin page)))
   (menu-refresh (page-datum page 'menu)))
 
 
@@ -150,9 +150,9 @@
     (page-set-datum! p 'navigation buttons)
     (menu-post menu mwin)
     (buttons-post buttons bwin)
-    (refresh (outer pr))
-    (refresh text-window)
-    (refresh bwin)))
+    (refresh* (outer pr))
+    (refresh* text-window)
+    (refresh* bwin)))