changed user configuration file handling. Now the config file needs to

define the structure config-file implementing
config-file-interface. Old config files need to be changed (see
config.scm).

src/config.scm

@@ -76,36 +76,34 @@
 (define (load-configuration dpy)
   (let ((filename (config-filename dpy)))
     (if (file-exists? filename)
-	(begin
+	(call-with-current-continuation
-	  ;; exceptions ??
+	 (lambda (return)
-	  (for-each (lambda (exp)
+	   (with-handler
-		      (eval exp (interaction-environment)))
+	    (lambda (condition punt)
-		    `( (define root-options '())
+	      (mdisplay "error loading configuration file " filename ".\n")
-		       (define split-options '())
+	      (mdisplay "problem is: " condition "\n")
-		       (define switch-options '())
+	      (mdisplay "ignoring it...\n")
-		       (define move-options '())
+	      (return '()))
-		       (define-syntax define-option
+	    (lambda ()
-			 (syntax-rules
+	      (load-config-file filename)
-			  ()
+	      (let ((config-file (reify-structure 'config-file)))
-			  ((define-option list name value)
+		(load-structure config-file)
-			   (set! list (cons (cons (quote name) value)
+		(let ((get (lambda (n) (rt-structure-binding config-file n))))
-					    list)))))
+		  (append (list (cons 'default-split-options
-		       (define-syntax define-options
+				      (get 'split-options))
-			 (syntax-rules
+				(cons 'default-switch-options
-			  ()
+				      (get 'switch-options))
-			  ((define-options l (name value) ...)
+				(cons 'default-move-options
-			   (set! l (append (list (cons (quote name) value)
+				      (get 'move-options)))
-						 ...)
+			  (get 'root-options))))))))
-					   l)))))
+	;; TODO: maybe create a file with default-config-file in it
-		       ;; define-options ...
-		       (load ,filename)
-		       (set! root-options
-			     (append (list (cons 'default-split-options
-						 split-options)
-					   (cons 'default-switch-options
-						 switch-options)
-					   (cons 'default-move-options
-						 move-options))
-				     root-options)) ))
-	  (eval 'root-options (interaction-environment)))
 	'())))
+
+(define default-config-file
+  '(
+    (define-structure config-file config-file-interface
+      (open scheme xlib config-file-utils)
+      (begin
+	;; your options here
+	))
+    ))

src/packages.scm

@@ -150,6 +150,40 @@
 	utils key-grab)
   (files switch-wm))
 
+;; *** user's config-file utils **************************************
+
+(define-interface config-file-interface
+  (export root-options
+	  split-options
+	  switch-options
+	  move-options))
+
+(define-structure config-file-utils
+  (export root-options
+	  split-options
+	  switch-options
+	  move-options
+	  ((define-option define-options) :syntax))
+  (open scheme)
+  (begin
+    (define root-options '())
+    (define split-options '())
+    (define switch-options '())
+    (define move-options '())
+    (define-syntax define-option
+      (syntax-rules
+       ()
+       ((define-option list name value)
+	(set! list (cons (cons (quote name) value)
+			 list)))))
+    (define-syntax define-options
+      (syntax-rules
+       ()
+       ((define-options l (name value) ...)
+	(set! l (append (list (cons (quote name) value)
+			      ...)
+			l)))))))
+
 ;; *** main package **************************************************
 
 (define-structure scsh-things
@@ -160,8 +194,8 @@
   (export backup-layout
 	  restore-layout
 	  load-configuration)
-  (open scheme list-lib
+  (open scheme list-lib handle
-	scsh xlib
+	scsh xlib rt-modules
 	utils manager root-manager)
   (files config))