[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1106-21-g2fc480c
Philippe Brochard
pbrochard at common-lisp.net
Wed Jan 18 22:43:25 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 2fc480c62e57ae1f6fd1e47bc7448d88f93dbe07 (commit)
from 8f97d3ed7637d664ca02edd295bfd47035dc40a5 (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 2fc480c62e57ae1f6fd1e47bc7448d88f93dbe07
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date: Wed Jan 18 23:43:20 2012 +0100
src/*.lisp: Use create-symbol and create-symbol-in-package instead of the shorter symb. (Thanks Aad Versteden).
diff --git a/ChangeLog b/ChangeLog
index 4bdd870..8d10c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-01-18 Philippe Brochard <pbrochard at common-lisp.net>
+ * src/*.lisp: Use create-symbol and create-symbol-in-package
+ instead of the shorter symb. (Thanks Aad Versteden).
+
* src/bindings-second-mode.lisp (set-default-second-keys): New
key binding to set window and frame transparency.
diff --git a/src/clfswm-expose-mode.lisp b/src/clfswm-expose-mode.lisp
index e17d4f6..e962c70 100644
--- a/src/clfswm-expose-mode.lisp
+++ b/src/clfswm-expose-mode.lisp
@@ -81,7 +81,7 @@
(defmacro define-expose-letter-keys ()
(labels ((produce-name (n)
- (symb "%" "expose-fun-key-" n "%")))
+ (create-symbol "%" "expose-fun-key-" n "%")))
`(progn
,@(loop for n from 0 to 61
collect `(progn
diff --git a/src/clfswm-keys.lisp b/src/clfswm-keys.lisp
index 0aedb55..d188a8b 100644
--- a/src/clfswm-keys.lisp
+++ b/src/clfswm-keys.lisp
@@ -251,6 +251,6 @@
(defmacro define-keys ((mode) &body keys)
- (let ((symb (symb "DEFINE-" mode "-KEY")))
+ (let ((symbol (create-symbol "DEFINE-" mode "-KEY")))
`(progn
- ,@(loop for k in keys collect `(,symb , at k)))))
+ ,@(loop for k in keys collect `(,symbol , at k)))))
diff --git a/src/package.lisp b/src/package.lisp
index 164a488..2291007 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -265,9 +265,9 @@ loading configuration file and before opening the display.")
(defmacro make-x-drawable (argname type)
"Drawable wrapper to prevent type error in some CLX versions.
Replace xlib:drawable-* functions with x-drawable-* equivalents"
- (let ((fun-symbol (symb 'x-drawable- argname))
- (set-symbol (symb 'set-x-drawable- argname))
- (xlib-equiv-symbol (symb-intern :xlib 'drawable- argname)))
+ (let ((fun-symbol (create-symbol 'x-drawable- argname))
+ (set-symbol (create-symbol 'set-x-drawable- argname))
+ (xlib-equiv-symbol (create-symbol-in-package :xlib 'drawable- argname)))
`(progn
(declaim (inline ,fun-symbol))
(defun ,fun-symbol (window)
@@ -275,7 +275,7 @@ Replace xlib:drawable-* functions with x-drawable-* equivalents"
(defun ,set-symbol (window ,argname)
(if (typep ,argname ',type)
(setf (,xlib-equiv-symbol window) ,argname)
- (dbg ',(symb 'drawable-type-error- argname) window ,argname (xlib:wm-name window))))
+ (dbg ',(create-symbol 'drawable-type-error- argname) window ,argname (xlib:wm-name window))))
(defsetf ,fun-symbol ,set-symbol))))
diff --git a/src/tools.lisp b/src/tools.lisp
index 5453182..f4587f1 100644
--- a/src/tools.lisp
+++ b/src/tools.lisp
@@ -40,7 +40,7 @@
:nfuncall
:pfuncall
:symbol-search
- :symb :symb-intern
+ :create-symbol :create-symbol-in-package
:call-hook
:add-hook
:remove-hook
@@ -62,7 +62,6 @@
:empty-string-p
:find-common-string
:setf/=
- :create-symbol
:number->char
:number->string
:simple-type-of
@@ -209,11 +208,11 @@
(dolist (a args)
(princ a s))))
- (defun symb (&rest args)
- (values (intern (apply #'mkstr args))))
+ (defun create-symbol (&rest args)
+ (values (intern (string-upcase (apply #'mkstr args)))))
- (defun symb-intern (package &rest args)
- (values (intern (apply #'mkstr args) package))))
+ (defun create-symbol-in-package (package &rest args)
+ (values (intern (string-upcase (apply #'mkstr args)) package))))
;;;,-----
@@ -441,13 +440,6 @@ Return the result of the last hook"
(setf ,var ,gval)))))
-
-
-(defun create-symbol (&rest names)
- "Return a new symbol from names"
- (intern (string-upcase (apply #'concatenate 'string names))))
-
-
(defun number->char (number)
(cond ((<= number 25) (code-char (+ (char-code #\a) number)))
((<= 26 number 35) (code-char (+ (char-code #\0) (- number 26))))
@@ -614,8 +606,8 @@ of the program to return.
(unless proc
(error "Cannot create process."))
proc)
- #+:ecl(ext:run-program program args :input :stream :output :stream
- :error :output)
+ #+:ecl (ext:run-program program args :input :stream :output :stream
+ :error :output)
#+:openmcl (let ((proc (ccl:run-program program args :input
:stream :output
:stream :wait wt)))
diff --git a/src/xlib-util.lisp b/src/xlib-util.lisp
index 7aeaf80..c40a0d6 100644
--- a/src/xlib-util.lisp
+++ b/src/xlib-util.lisp
@@ -101,7 +101,7 @@ Window types are in +WINDOW-TYPES+.")
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun keyword->handle-event (mode keyword)
- (symb 'handle-event-fun "-" mode "-" keyword)))
+ (create-symbol 'handle-event-fun "-" mode "-" keyword)))
(defun handle-event->keyword (symbol)
(let* ((name (string-downcase (symbol-name symbol)))
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
src/clfswm-expose-mode.lisp | 2 +-
src/clfswm-keys.lisp | 4 ++--
src/package.lisp | 8 ++++----
src/tools.lisp | 22 +++++++---------------
src/xlib-util.lisp | 2 +-
6 files changed, 18 insertions(+), 23 deletions(-)
hooks/post-receive
--
CLFSWM - A(nother) Common Lisp FullScreen Window Manager
More information about the clfswm-cvs
mailing list