01/01: installer: Use default event handler for "main" page.

[Danny Milosavljevic]

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

commit 0f81c0823ea2b10f95e0261917e2c899693d4874
Author: Danny Milosavljevic <address@hidden>
Date:   Wed Jul 5 10:58:32 2017 +0200

    installer: Use default event handler for "main" page.
    
    * gnu/system/installer/guixsd-installer.scm (main-page-mouse-handler): 
Delete
    variable.
    (main-page-key-handler): Delete variable.
    (guixsd-installer): Use default event handlers.
---
 gnu/system/installer/guixsd-installer.scm | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/gnu/system/installer/guixsd-installer.scm 
b/gnu/system/installer/guixsd-installer.scm
index 54a65af..40a3993 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -20,7 +20,6 @@
 
 (use-modules (ncurses curses)
             (gurses menu)
-            (gurses buttons)
             (gnu system installer utils)
             (gnu system installer misc)
             (gnu system installer partition-reader)
@@ -212,20 +211,6 @@
     (page-uniquify)
     ((page-refresh (car stack)) (car stack))))
 
-(define (main-page-mouse-handler page device-id x y z button-state)
-  (let* ((main-menu (page-datum page 'menu))
-         (status (std-menu-mouse-handler main-menu device-id x y z 
button-state)))
-    (if (eq? 'activated status)
-      (main-page-activate-focused-item page))
-    status))
-
-(define (main-page-key-handler page ch)
-  (let ((main-menu (page-datum page 'menu)))
-    (std-menu-key-handler main-menu ch)
-    (cond
-     ((eq? ch #\newline)
-      (main-page-activate-focused-item page)))))
-
 (define (main-page-init page)
   (let* ((frame (make-boxed-window (page-surface page) (lines) (cols) 0 0
                                    #:title (page-title page)))
@@ -324,8 +309,8 @@
 
       (let ((page (make-page
                    stdscr (gettext "GuixSD Installer")
-                   main-page-refresh 0 main-page-key-handler
-                   main-page-mouse-handler)))
+                   main-page-refresh 0
+                   #:activator main-page-activate-focused-item)))
         (page-enter page)
         (page-push #f)
         (let loop ((ch (getch stdscr)))