02/04: installer: Use default event handlers for "role" page.

[Danny Milosavljevic]

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

commit 17aec5013927daee94b043ead0cb9b0492327b99
Author: Danny Milosavljevic <address@hidden>
Date:   Tue Jul 4 21:46:12 2017 +0200

    installer: Use default event handlers for "role" page.
    
    * gnu/system/installer/role.scm (role-page-mouse-handler): Delete variable.
    (role-page-key-handler): Delete variable.
    (make-role-page): Use default event handlers.
---
 gnu/system/installer/role.scm | 57 +++++--------------------------------------
 1 file changed, 6 insertions(+), 51 deletions(-)

diff --git a/gnu/system/installer/role.scm b/gnu/system/installer/role.scm
index 9232b92..54423ec 100644
--- a/gnu/system/installer/role.scm
+++ b/gnu/system/installer/role.scm
@@ -51,65 +51,20 @@
              title
              role-page-refresh
              0
-             role-page-key-handler
-             role-page-mouse-handler))
-
+             #:activator role-page-activate-focused-item))
 
 (define my-buttons `((cancel ,(M_ "Canc_el") #t)))
 
 (define (role-page-activate-focused-item page)
   (let ((menu (page-datum page 'menu)))
-    (set! system-role (menu-get-current-item menu))
-    (page-leave)))
-
-(define (role-page-mouse-handler page device-id x y z button-state)
-  (let* ((menu (page-datum page 'menu))
-         (status (std-menu-mouse-handler menu device-id x y z button-state)))
-    (if (eq? status 'activated)
-      (role-page-activate-focused-item page))
-    status))
-
-(define (role-page-key-handler page ch)
-  (let* ((menu (page-datum page 'menu))
-         (nav  (page-datum page 'navigation))
-         (result (cond ((eq? ch KEY_RIGHT)
-      (menu-set-active! menu #f)
-      (buttons-select-next nav))
-
-     ((eq? ch #\tab)
-      (cond
-       ((menu-active menu)
-         (menu-set-active! menu #f)
-         (buttons-select nav 0))
-
-       ((eqv? (buttons-selected nav) (1- (buttons-n-buttons nav)))
-       (menu-set-active! menu #t)
-       (buttons-unselect-all nav))
-
-       (else
-       (buttons-select-next nav))))
-
-     ((eq? ch KEY_LEFT)
-      (menu-set-active! menu #f)
-      (buttons-select-prev nav))
-
-     ((eq? ch KEY_UP)
-      (buttons-unselect-all nav)
-      (menu-set-active! menu #t))
-
-
-     ((select-key? ch)
-      (if (menu-active menu)
-        (role-page-activate-focused-item page)))
-
-     ((buttons-key-matches-symbol? nav ch 'cancel)
+    (cond
+     ((menu-active menu)
+      (set! system-role (menu-get-current-item menu))
+      (page-leave))
+     (else ; buttons
       (page-leave)
       'cancelled))))
 
-    (std-menu-key-handler menu ch)
-    result))
-
-
 (define (role-page-refresh page)
   (when (not (page-initialised? page))
     (role-page-init page)