[clfswm-cvs] r161 - in clfswm: . src

[pbrochard at common-lisp.net]

Author: pbrochard
Date: Wed Sep  3 16:50:38 2008
New Revision: 161

Modified:
   clfswm/ChangeLog
   clfswm/clfswm.asd
   clfswm/src/clfswm-internal.lisp
   clfswm/src/clfswm-util.lisp
   clfswm/src/clfswm.lisp
Log:
main-unprotected: Exit clfswm on init error (ie: when another window manager is running).

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Wed Sep  3 16:50:38 2008
@@ -2,6 +2,8 @@
 
 	* src/clfswm.lisp (handle-enter-notify): Add a sloppy strict focus
 	policy -> Sloppy focus only for windows in the current frame.
+	(main-unprotected): Exit clfswm on init error (ie: when another
+	window manager is running).
 
 	* src/clfswm-util.lisp (reset-clfswm): New function.
 

Modified: clfswm/clfswm.asd
==============================================================================
--- clfswm/clfswm.asd	(original)
+++ clfswm/clfswm.asd	Wed Sep  3 16:50:38 2008
@@ -46,7 +46,7 @@
 			 (:file "clfswm-menu"
 				:depends-on ("package" "clfswm-info"))
 			 (:file "menu-def"
-				:depends-on ("clfswm-menu"))
+				:depends-on ("clfswm-menu" "clfswm"))
 			 (:file "clfswm-util"
 				:depends-on ("clfswm" "keysyms" "clfswm-info" "clfswm-second-mode" "clfswm-query" "clfswm-menu" "clfswm-autodoc" "clfswm-corner"))
 			 (:file "clfswm-query"

Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp	(original)
+++ clfswm/src/clfswm-internal.lisp	Wed Sep  3 16:50:38 2008
@@ -26,6 +26,7 @@
 (in-package :clfswm)
 
 
+
 ;;; Conversion functions
 ;;; Float -> Pixel conversion
 (defun x-fl->px (x parent)

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Wed Sep  3 16:50:38 2008
@@ -33,16 +33,6 @@
       (load truename))))
 
 
-
-(defun exit-clfswm ()
-  "Exit clfswm"
-  (throw 'exit-clfswm nil))
-
-(defun reset-clfswm ()
-  "Reset clfswm"
-  (throw 'exit-main-loop nil))
-
-
 (defun reload-clfswm ()
   "Reload clfswm"
   (format t "~&-*- Reloading CLFSWM -*-~%")

Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp	(original)
+++ clfswm/src/clfswm.lisp	Wed Sep  3 16:50:38 2008
@@ -275,6 +275,20 @@
 
 
 
+
+
+
+(defun exit-clfswm ()
+  "Exit clfswm"
+  (throw 'exit-clfswm nil))
+
+(defun reset-clfswm ()
+  "Reset clfswm"
+  (throw 'exit-main-loop nil))
+
+
+
+
 (defun main-unprotected (&key (display (or (getenv "DISPLAY") ":0")) protocol
 			 (base-dir (directory-namestring (or *load-truename* "")))
 			 error-msg)
@@ -285,7 +299,7 @@
     (xlib:access-error (c)
       (format t "~&~A~&Maybe another window manager is running. [1]~%" c)
       (force-output)
-      (return-from main-unprotected 'init-display-error)))
+      (exit-clfswm)))
   (handler-case
       (init-display)
     (xlib:access-error (c)
@@ -294,7 +308,7 @@
       (xlib:close-display *display*)
       (format t "~&~A~&Maybe another window manager is running. [2]~%" c)
       (force-output)
-      (return-from main-unprotected 'init-display-error)))
+      (exit-clfswm)))
   (when error-msg
     (info-mode error-msg))
   (unwind-protect