[clfswm-cvs] r37 - clfswm
pbrochard at common-lisp.net
pbrochard at common-lisp.net
Thu Mar 13 00:03:47 UTC 2008
Author: pbrochard
Date: Wed Mar 12 19:03:40 2008
New Revision: 37
Modified:
clfswm/bindings-second-mode.lisp
clfswm/bindings.lisp
clfswm/clfswm-info.lisp
clfswm/clfswm-internal.lisp
clfswm/clfswm-keys.lisp
clfswm/clfswm-layout.lisp
clfswm/clfswm-nw-hooks.lisp
clfswm/clfswm-pack.lisp
clfswm/clfswm-query.lisp
clfswm/clfswm-second-mode.lisp
clfswm/clfswm-util.lisp
clfswm/clfswm.lisp
clfswm/config.lisp
clfswm/load.lisp
clfswm/my-html.lisp
clfswm/netwm-util.lisp
clfswm/package.lisp
clfswm/tools.lisp
clfswm/xlib-util.lisp
Log:
Check for Keysym+Shift. Remove all #Date# references.
Modified: clfswm/bindings-second-mode.lisp
==============================================================================
--- clfswm/bindings-second-mode.lisp (original)
+++ clfswm/bindings-second-mode.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Fri Mar 7 23:14:21 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Bindings keys and mouse for second mode
;;;
Modified: clfswm/bindings.lisp
==============================================================================
--- clfswm/bindings.lisp (original)
+++ clfswm/bindings.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Sat Mar 8 21:13:30 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Bindings keys and mouse
;;;
Modified: clfswm/clfswm-info.lisp
==============================================================================
--- clfswm/clfswm-info.lisp (original)
+++ clfswm/clfswm-info.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Thu Mar 6 16:45:37 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Info function (see the end of this file for user definition
;;; --------------------------------------------------------------------------
Modified: clfswm/clfswm-internal.lisp
==============================================================================
--- clfswm/clfswm-internal.lisp (original)
+++ clfswm/clfswm-internal.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Sun Mar 9 01:24:59 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Main functions
;;; --------------------------------------------------------------------------
Modified: clfswm/clfswm-keys.lisp
==============================================================================
--- clfswm/clfswm-keys.lisp (original)
+++ clfswm/clfswm-keys.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Wed Mar 12 18:12:54 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Keys functions definition
;;; --------------------------------------------------------------------------
@@ -142,7 +140,10 @@
(let ((char (keycode->char code state)))
(function-from char)))
(from-string ()
- (let ((string (keysym->keysym-name (xlib:keycode->keysym *display* code 0))))
+ (let* ((modifiers (xlib:make-state-keys state))
+ (string (keysym->keysym-name (xlib:keycode->keysym *display* code (cond ((member :shift modifiers) 1)
+ ((member :mod-5 modifiers) 2)
+ (t 0))))))
(function-from string))))
(or (from-code) (from-char) (from-string))))
Modified: clfswm/clfswm-layout.lisp
==============================================================================
--- clfswm/clfswm-layout.lisp (original)
+++ clfswm/clfswm-layout.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Thu Mar 6 15:04:13 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Layout functions
;;; --------------------------------------------------------------------------
Modified: clfswm/clfswm-nw-hooks.lisp
==============================================================================
--- clfswm/clfswm-nw-hooks.lisp (original)
+++ clfswm/clfswm-nw-hooks.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Tue Mar 11 00:07:04 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: New window Hooks
;;;
Modified: clfswm/clfswm-pack.lisp
==============================================================================
--- clfswm/clfswm-pack.lisp (original)
+++ clfswm/clfswm-pack.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Tue Feb 12 14:02:45 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Tile, pack and fill functions
;;; --------------------------------------------------------------------------
Modified: clfswm/clfswm-query.lisp
==============================================================================
--- clfswm/clfswm-query.lisp (original)
+++ clfswm/clfswm-query.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Tue Mar 4 22:39:47 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Query utility
;;; --------------------------------------------------------------------------
Modified: clfswm/clfswm-second-mode.lisp
==============================================================================
--- clfswm/clfswm-second-mode.lisp (original)
+++ clfswm/clfswm-second-mode.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Thu Mar 6 16:30:51 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Second mode functions
;;; --------------------------------------------------------------------------
Modified: clfswm/clfswm-util.lisp
==============================================================================
--- clfswm/clfswm-util.lisp (original)
+++ clfswm/clfswm-util.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Tue Mar 11 12:35:53 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Utility
;;; --------------------------------------------------------------------------
@@ -231,7 +229,7 @@
(format nil "Press a key to identify. Press 'q' to stop the identify loop."))
(when code
(xlib:draw-image-glyphs window gc 10 (+ (* 2 (+ (xlib:max-char-ascent font) (xlib:max-char-descent font))) 5)
- (format nil "Code=~A KeySym=~A Key=~S Modifiers=~A"
+ (format nil "Code=~A KeySym=~S Key=~S Modifiers=~A"
code keysym key modifiers))
(print-doc "Main mode : " *main-keys* 3 code state)
(print-doc "Second mode: " *second-keys* 4 code state)))
@@ -239,7 +237,9 @@
(declare (ignore event-slots root))
(let* ((modifiers (xlib:make-state-keys state))
(key (keycode->char code state))
- (keysym (keysym->keysym-name (xlib:keycode->keysym *display* code 0))))
+ (keysym (keysym->keysym-name (xlib:keycode->keysym *display* code (cond ((member :shift modifiers) 1)
+ ((member :mod-5 modifiers) 2)
+ (t 0))))))
(setf done (and (equal key #\q) (null modifiers)))
(dbg code keysym key modifiers)
(print-key code state keysym key modifiers)
Modified: clfswm/clfswm.lisp
==============================================================================
--- clfswm/clfswm.lisp (original)
+++ clfswm/clfswm.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Sun Mar 9 13:35:36 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Main functions
;;; --------------------------------------------------------------------------
Modified: clfswm/config.lisp
==============================================================================
--- clfswm/config.lisp (original)
+++ clfswm/config.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Thu Mar 6 16:11:38 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Configuration file
;;;
Modified: clfswm/load.lisp
==============================================================================
--- clfswm/load.lisp (original)
+++ clfswm/load.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Wed Mar 12 22:34:33 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: System loading functions
;;; --------------------------------------------------------------------------
Modified: clfswm/my-html.lisp
==============================================================================
--- clfswm/my-html.lisp (original)
+++ clfswm/my-html.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Fri Dec 21 23:00:35 2007
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Html generator helper
;;; --------------------------------------------------------------------------
Modified: clfswm/netwm-util.lisp
==============================================================================
--- clfswm/netwm-util.lisp (original)
+++ clfswm/netwm-util.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Wed Feb 20 23:26:21 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: NetWM functions
;;; http://freedesktop.org/wiki/Specifications_2fwm_2dspec
Modified: clfswm/package.lisp
==============================================================================
--- clfswm/package.lisp (original)
+++ clfswm/package.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Sat Mar 8 21:26:50 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Package definition
;;; --------------------------------------------------------------------------
Modified: clfswm/tools.lisp
==============================================================================
--- clfswm/tools.lisp (original)
+++ clfswm/tools.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Tue Feb 26 21:53:55 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: General tools
;;; --------------------------------------------------------------------------
Modified: clfswm/xlib-util.lisp
==============================================================================
--- clfswm/xlib-util.lisp (original)
+++ clfswm/xlib-util.lisp Wed Mar 12 19:03:40 2008
@@ -1,8 +1,6 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Fri Mar 7 21:18:17 2008
-;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Utility functions
;;; --------------------------------------------------------------------------
More information about the clfswm-cvs
mailing list