The focus-object-table now lives in nuit-eval.

scheme/eval.scm

@@ -18,3 +18,12 @@
       (map (lambda (file)
              (make-fs-object file abs-dir))
            (scsh-directory-files abs-dir dotfiles?)))))
+
+(define *focus-table* (make-empty-focus-table))
+
+(define (focus-table)
+  *focus-table*)
+
+(define (focus-value id)
+  (get-focus-object (focus-table) id))
+

scheme/nuit-engine.scm

@@ -51,8 +51,6 @@
 (define executable-completions-lock (make-lock))
 (define executable-completions #f)
 
-(define focus-table (make-empty-focus-table))
-
 (define key-control-x 24)
 (define key-o 111)
 (define key-tab 9)
@@ -295,7 +293,7 @@
   (add-string-to-command-buffer
    (if (command-buffer-in-command-mode?)
        (send (current-viewer) 'get-selection (command-buffer-in-scheme-mode?))
-       (send (current-viewer) 'get-focus-object focus-table)))
+       (send (current-viewer) 'get-focus-object (focus-table))))
   (print-command-buffer (app-window-curses-win command-window)
 			command-buffer)
   (move-cursor command-buffer result-buffer)

scheme/nuit-packages.scm

@@ -234,12 +234,18 @@
 ;;; nuit evaluates the expressions entered into command buffer in this
 ;;; package
 
-(define-structure nuit-eval (interface-of scheme-with-scsh)
+(define-structures
+  ((nuit-eval (compound-interface 
+	       (interface-of scheme-with-scsh)
+	       (export focus-value)))
+   (nuit-eval/focus-table (export focus-table)))
   (open 
    (modify scheme-with-scsh
 	   (rename (directory-files scsh-directory-files)))
    let-opt
    srfi-1
+
+   focus-table
    fs-object
    pps)
   (files eval))
@@ -341,6 +347,7 @@
 	tty-debug
 
 	focus-table
+	nuit-eval/focus-table
 	fs-object
 	objects
 	plugin