[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1106-13-g29254aa

[Philippe Brochard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CLFSWM - A(nother) Common Lisp FullScreen Window Manager".

The branch, master has been updated
       via  29254aac066a910669406599cd229404af7c28c0 (commit)
      from  5e8514a2cde78233d5d956de63a8e359ebecba3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 29254aac066a910669406599cd229404af7c28c0
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Wed Jan 4 22:51:55 2012 +0100

    src/xlib-util.lisp (with-xlib-protect): Protect from xlib:lookup-error. This prevent an error in clisp/new-clx when sometimes an xlib:colormap is expected instead of an xlib:window.

diff --git a/ChangeLog b/ChangeLog
index a3b890b..0c91d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-04  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/xlib-util.lisp (with-xlib-protect): Protect from
+	xlib:lookup-error. This prevent an error in clisp/new-clx when
+	sometimes an xlib:colormap is expected instead of an xlib:window.
+
 2012-01-03  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/xlib-util.lisp (handle-event): Fix a clisp/new-clx error
diff --git a/src/xlib-util.lisp b/src/xlib-util.lisp
index 93be3b6..cde1d50 100644
--- a/src/xlib-util.lisp
+++ b/src/xlib-util.lisp
@@ -68,9 +68,9 @@ Window types are in +WINDOW-TYPES+.")
   `(handler-case
        (with-simple-restart (top-level "Return to clfswm's top level")
 	 , at body)
-     ((or xlib:match-error xlib:window-error xlib:drawable-error) (c)
+     ((or xlib:match-error xlib:window-error xlib:drawable-error xlib:lookup-error) (c)
        (progn
-	 (dbg "Ignore Xlib Error" c ',body)
+         (format t "Ignoring XLib error: ~S~%" c)
 	 (unassoc-keyword-handle-event)
 	 (assoc-keyword-handle-event 'main-mode)
 	 (setf *in-second-mode* nil)))))

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    6 ++++++
 src/xlib-util.lisp |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CLFSWM - A(nother) Common Lisp FullScreen Window Manager