guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: installer: Support mouse in "dialog" page.


From: Danny Milosavljevic
Subject: 01/01: installer: Support mouse in "dialog" page.
Date: Wed, 12 Jul 2017 20:20:06 -0400 (EDT)

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

commit 5e5d15661b382317a149196f2c5fc8763f26b94b
Author: Danny Milosavljevic <address@hidden>
Date:   Thu Jul 13 02:18:42 2017 +0200

    installer: Support mouse in "dialog" page.
    
    * gnu/system/installer/dialog.scm (dialog-page-mouse-handler): Delete
    variable.
    (dialog-page-key-handler): Delete variable.
    (dialog-page-activate-item): New variable.
    (make-dialog): Use it here.
---
 gnu/system/installer/dialog.scm | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/gnu/system/installer/dialog.scm b/gnu/system/installer/dialog.scm
index 55c7566..77129f4 100644
--- a/gnu/system/installer/dialog.scm
+++ b/gnu/system/installer/dialog.scm
@@ -35,8 +35,7 @@
                        (gettext "Information")
                        dialog-page-refresh
                         0
-                       dialog-page-key-handler
-                       dialog-page-mouse-handler)))
+                       #:activator dialog-page-activate-item)))
     (page-set-datum! page 'message message)
     (page-set-datum! page 'justify justify)
     page))
@@ -44,27 +43,12 @@
 
 (define my-buttons `((ok  ,(M_ "_OK") #t)))
 
-(define (dialog-page-mouse-handler page device-id x y z button-state)
-  'ignored)
-
-(define (dialog-page-key-handler page ch)
-  (let ((nav  (page-datum page 'navigation)))
-
-    (cond
-     ((eq? ch #\tab)
-      (cond
-       ((eqv? (buttons-selected nav) (1- (buttons-n-buttons nav)))
-       (buttons-unselect-all nav))
-
-       (else
-       (buttons-select-next nav))))
-
-     ((buttons-key-matches-symbol? nav ch 'ok)
-
+(define (dialog-page-activate-item page item)
+  (match item
+   ('ok
       (delwin (page-datum page 'text-window))
       (page-leave)
-      ))
-    #f))
+      'handled)))
 
 (define (dialog-page-refresh page)
   (when (not (page-initialised? page))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]