From 7b9b6c3e6613b7c9cda9362c9e1db2b690dff839 Mon Sep 17 00:00:00 2001
From: eknauel <eknauel>
Date: Tue, 31 May 2005 11:20:20 +0000
Subject: [PATCH] move the standard viewer to a seperate module

---
 scheme/nuit-engine.scm   | 31 -------------------------------
 scheme/nuit-packages.scm | 10 ++++++++++
 scheme/std-viewer.scm    | 28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 31 deletions(-)
 create mode 100644 scheme/std-viewer.scm

diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index a5e5b98..1f53a58 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -913,34 +913,3 @@
 	(lp (cdr chars) (string-append token (string (car chars)))
 	    tokens (+ i 1)))))))
 
-(define (make-standard-viewer)
-  (let ((x 1)
-	(y 1)
-	(text "")
-	(value #f))
-
-    (lambda (message)      
-      (cond
-
-       ((eq? message 'init)
-	(lambda (self new-value buffer)
-	  (set! value new-value)
-	  (set! text
-		(layout-result-standard 
-		 (exp->string value)
-		 (result-buffer-num-cols buffer)))
-	  self))
-	  
-       ((eq? message 'paint)
-	(lambda (self win buffer have-focus?)
-	  ;; #### get rid of this cruft
-	  ((make-simple-result-buffer-printer y x text '() '())
-	   win buffer have-focus?)))
-
-       ((eq? message 'key-press)
-	(lambda (self . ignore)
-	  self))))))
-      
-(define standard-view-plugin
-  (make-view-plugin make-standard-viewer
-		    (lambda (val) #t)))
diff --git a/scheme/nuit-packages.scm b/scheme/nuit-packages.scm
index b5f49c3..59b9503 100644
--- a/scheme/nuit-packages.scm
+++ b/scheme/nuit-packages.scm
@@ -120,6 +120,14 @@
 	plugin)
   (files std-command))
 
+(define-structure standard-viewer
+    (export make-standard-viewer)
+  (open scheme
+
+	objects
+	layout)
+  (files std-viewer))
+
 ;;; fs-objects
 
 (define-interface fs-object-interface
@@ -305,6 +313,7 @@
 	inspect-exception
 	rt-modules
 	tty-debug
+
 	fs-object
 	objects
 	plugin
@@ -319,6 +328,7 @@
 	dirlist-view-plugin
 	process-viewer
 	standard-command-plugin
+	standard-viewer
         nuit-inspector-plugin)
   (files nuit-engine))
 
diff --git a/scheme/std-viewer.scm b/scheme/std-viewer.scm
new file mode 100644
index 0000000..bb15c4b
--- /dev/null
+++ b/scheme/std-viewer.scm
@@ -0,0 +1,28 @@
+(define (make-standard-viewer)
+  (let ((x 1)
+	(y 1)
+	(text "")
+	(value #f))
+
+    (lambda (message)      
+      (cond
+
+       ((eq? message 'init)
+	(lambda (self new-value buffer)
+	  (set! value new-value)
+	  (set! text
+		(layout-result-standard 
+		 (exp->string value)
+		 (result-buffer-num-cols buffer)))
+	  self))
+	  
+       ((eq? message 'paint)
+	(lambda (self win buffer have-focus?)
+	  ;; #### get rid of this cruft
+	  ((make-simple-result-buffer-printer y x text '() '())
+	   win buffer have-focus?)))
+
+       ((eq? message 'key-press)
+	(lambda (self . ignore)
+	  self))))))
+