From 29254aac066a910669406599cd229404af7c28c0 Mon Sep 17 00:00:00 2001 From: Philippe Brochard Date: Wed, 4 Jan 2012 22:51:55 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ src/xlib-util.lisp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3b890b..0c91d05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-04 Philippe Brochard + + * 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 * 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") ,@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))))) -- 2.11.4.GIT