03/03: installer: Clean up utils.

[Danny Milosavljevic]

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

commit 4b6ad152b178ab7f7b6d9a32c56ca58466172476
Author: Danny Milosavljevic <address@hidden>
Date:   Sun Jul 9 17:48:29 2017 +0200

    installer: Clean up utils.
    
    * gnu/system/installer/utils.scm (slurp**): Clean up.
    (boxed-window-decoration-refresh): Clean up.
---
 gnu/system/installer/utils.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/system/installer/utils.scm b/gnu/system/installer/utils.scm
index 832d934..3bcd9e5 100644
--- a/gnu/system/installer/utils.scm
+++ b/gnu/system/installer/utils.scm
@@ -76,7 +76,7 @@
    (vector
     (lambda (c) (addch win c))
     (lambda (s) (addstr win s))
-    (lambda () (refresh* win)
+    (lambda () ;; Note: This will lose the cursor position.
                (update-panels)
                (doupdate))
     #f
@@ -171,8 +171,6 @@ This version assumes some external entity puts in the 
carriage returns."
        #f)))
 
 (define (slurp** surface program . args)
-  (addstr surface "Please wait..." #:x 20 #:y 13)
-  (refresh* surface)
   ;; This probably doesn't work because the window port is a soft port.
   ;; pipe-cmd has a weird workaround for that.
   (parameterize ((current-error-port (make-window-port surface)))
@@ -269,8 +267,10 @@ Ignore blank lines."
 
 (define* (boxed-window-decoration-refresh pr title)
   (let ((win (outer pr)))
-    ;(erase win) ; FIXME Why does this nuke the label in an unrelated window? 
WTF.
+    ;(erase win)
     (color-set! win 0)
+    (move win 0 0)
+    ;(addstr win "X")
     (box win (acs-vline) (acs-hline))
     (if title
       (begin