[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1106-108-g6c085a7
Philippe Brochard
pbrochard at common-lisp.net
Sun Sep 9 15:24:35 UTC 2012
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 6c085a7ccfc59f984017a7e1374b130469e61ef4 (commit)
from fcd792813a60d93baab7b00993eb1b21921a8583 (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 6c085a7ccfc59f984017a7e1374b130469e61ef4
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date: Sun Sep 9 17:24:29 2012 +0200
src/*.lisp: Remove uneeded with-xlib-protect.
diff --git a/ChangeLog b/ChangeLog
index 00f4958..a4b5dff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-09 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * src/*.lisp: Remove uneeded with-xlib-protect.
+
2012-09-06 Philippe Brochard <pbrochard at common-lisp.net>
* contrib/wallpaper.lisp (wallpaper): create/use-background
diff --git a/src/package.lisp b/src/package.lisp
index 275c573..72bdd4f 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -45,23 +45,23 @@
;;; CONFIG - Compress motion notify ?
;; This variable may be useful to speed up some slow version of CLX.
;; It is particulary useful with CLISP/MIT-CLX (and others).
-(defconfig *have-to-compress-notify* t nil
- "Compress event notify?
+(defconfig *have-to-compress-notify* t
+ nil "Compress event notify?
This variable may be useful to speed up some slow version of CLX.
It is particulary useful with CLISP/MIT-CLX.")
-(defconfig *transparent-background* t nil
- "Enable transparent background: one of nil, :pseudo, t (xcompmgr must be started)")
+(defconfig *transparent-background* t
+ nil "Enable transparent background: one of nil, :pseudo, t (xcompmgr must be started)")
-(defconfig *default-transparency* 0.8 nil
- "Default transparency for all windows when in xcompmgr transparency mode")
+(defconfig *default-transparency* 0.8
+ nil "Default transparency for all windows when in xcompmgr transparency mode")
-(defconfig *show-root-frame-p* nil nil
- "Show the root frame information or not")
+(defconfig *show-root-frame-p* nil
+ nil "Show the root frame information or not")
-(defconfig *border-size* 1 nil
- "Windows and frames border size")
+(defconfig *border-size* 1
+ nil "Windows and frames border size")
diff --git a/src/xlib-util.lisp b/src/xlib-util.lisp
index 104e21a..fa6f1e3 100644
--- a/src/xlib-util.lisp
+++ b/src/xlib-util.lisp
@@ -120,8 +120,9 @@ Window types are in +WINDOW-TYPES+.")
(when (and pos (zerop pos))
(let ((pos-mod (search "mode" name)))
(when pos-mod
- (values (intern (string-upcase (subseq name (+ pos-mod 5))) :keyword)
- (subseq name (length "handle-event-fun-") (1- pos-mod))))))))
+ (intern (string-upcase (subseq name (+ pos-mod 5))) :keyword))))))
+;; (values (intern (string-upcase (subseq name (+ pos-mod 5))) :keyword)
+;; (subseq name (length "handle-event-fun-") (1- pos-mod))))))))
(defparameter *handle-event-fun-symbols* nil)
@@ -178,8 +179,7 @@ Expand in handle-event-fun-main-mode-key-press"
`(defun ,(keyword->handle-event mode keyword) (&rest event-slots &key #+:event-debug event-key , at args &allow-other-keys)
(declare (ignorable event-slots))
#+:event-debug (print (list *current-event-mode* event-key))
- (with-xlib-protect (:define-handler (list ',mode ,keyword))
- , at body)))
+ , at body))
(defun event-hook-name (event-keyword)
@@ -227,11 +227,9 @@ Expand in handle-event-fun-main-mode-key-press"
`(let ((,event-fun (lambda (&rest event-slots &key #+:event-debug event-key , at args &allow-other-keys)
(declare (ignorable event-slots))
#+:event-debug (print (list ,event-keyword event-key))
- (with-xlib-protect (:define-event-hook ,event-keyword)
- , at body))))
+ , at body)))
(add-event-hook ,event-keyword ,event-fun)
- (with-xlib-protect (:define-event-hook-2 ,event-keyword)
- ,event-fun))))
+ ,event-fun)))
(defmacro event-defun (name args &body body)
@@ -261,20 +259,17 @@ they should be windows. So use this function to make a window out of them."
#+(or sbcl ecl openmcl) (xlib::make-window :id (slot-value xobject 'xlib::id) :display *display*)
#-(or sbcl clisp ecl openmcl)
(error 'not-implemented)))
- (with-xlib-protect (:handle-event event-key)
- (catch 'exit-handle-event
- (let ((win (getf event-slots :window)))
- (when (and win (not (xlib:window-p win)))
- (dbg "Pixmap Workaround! Should be a window: " win)
- (setf (getf event-slots :window) (make-xlib-window win))))
- (with-xlib-protect (:handle-event-2 event-key)
- (let ((hook-symbol (event-hook-name event-key)))
- (when (boundp hook-symbol)
- (apply #'call-hook (symbol-value hook-symbol) event-slots))))
- (with-xlib-protect (:handle-event-3 event-key)
- (if (fboundp event-key)
- (apply event-key event-slots)
- #+:event-debug (pushnew (list *current-event-mode* event-key) *unhandled-events* :test #'equal))))
+ (catch 'exit-handle-event
+ (let ((win (getf event-slots :window)))
+ (when (and win (not (xlib:window-p win)))
+ (dbg "Pixmap Workaround! Should be a window: " win)
+ (setf (getf event-slots :window) (make-xlib-window win))))
+ (let ((hook-symbol (event-hook-name event-key)))
+ (when (boundp hook-symbol)
+ (apply #'call-hook (symbol-value hook-symbol) event-slots)))
+ (if (fboundp event-key)
+ (apply event-key event-slots)
+ #+:event-debug (pushnew (list *current-event-mode* event-key) *unhandled-events* :test #'equal))
(xlib:display-finish-output *display*))
t))
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
src/package.lisp | 20 ++++++++++----------
src/xlib-util.lisp | 39 +++++++++++++++++----------------------
3 files changed, 31 insertions(+), 32 deletions(-)
hooks/post-receive
--
CLFSWM - A(nother) Common Lisp FullScreen Window Manager
More information about the clfswm-cvs
mailing list