[clfswm-cvs] r17 - clfswm
pbrochard at common-lisp.net
pbrochard at common-lisp.net
Thu Mar 6 15:15:25 UTC 2008
Author: pbrochard
Date: Thu Mar 6 10:15:24 2008
New Revision: 17
Modified:
clfswm/bindings-second-mode.lisp
clfswm/clfswm-info.lisp
clfswm/clfswm-keys.lisp
clfswm/clfswm-second-mode.lisp
clfswm/config.lisp
clfswm/package.lisp
Log:
Remove all reference to pager
Modified: clfswm/bindings-second-mode.lisp
==============================================================================
--- clfswm/bindings-second-mode.lisp (original)
+++ clfswm/bindings-second-mode.lisp Thu Mar 6 10:15:24 2008
@@ -233,7 +233,7 @@
(let ((win (find-child-under-mouse root-x root-y)))
(handle-click-to-focus win)))
-(define-mouse-action (1) 'sm-handle-click-to-focus)
+(define-second-mouse (1) 'sm-handle-click-to-focus)
@@ -732,22 +732,22 @@
;;
;;
;;
-;;(define-mouse-action (1) 'move-selected-group 'release-move-selected-group)
-;;(define-mouse-action (1 :mod-1) 'resize-selected-group 'release-resize-selected-group)
-;;(define-mouse-action (1 :control) 'copy-selected-group 'release-copy-selected-group)
+;;(define-second-mouse (1) 'move-selected-group 'release-move-selected-group)
+;;(define-second-mouse (1 :mod-1) 'resize-selected-group 'release-resize-selected-group)
+;;(define-second-mouse (1 :control) 'copy-selected-group 'release-copy-selected-group)
;;
-;;(define-mouse-action (2) nil 'mouse-leave-second-mode-maximize)
-;;(define-mouse-action (2 :control) nil 'mouse-leave-second-mode)
+;;(define-second-mouse (2) nil 'mouse-leave-second-mode-maximize)
+;;(define-second-mouse (2 :control) nil 'mouse-leave-second-mode)
;;
-;;(define-mouse-action (3) 'move-selected-window 'release-move-selected-window)
-;;(define-mouse-action (3 :control) 'copy-selected-window 'release-copy-selected-window)
+;;(define-second-mouse (3) 'move-selected-window 'release-move-selected-window)
+;;(define-second-mouse (3 :control) 'copy-selected-window 'release-copy-selected-window)
;;
;;
-;;(define-mouse-action (4) 'mouse-circulate-window-up nil)
-;;(define-mouse-action (5) 'mouse-circulate-window-down nil)
+;;(define-second-mouse (4) 'mouse-circulate-window-up nil)
+;;(define-second-mouse (5) 'mouse-circulate-window-down nil)
;;
-;;(define-mouse-action (4 :mod-1) 'mouse-circulate-workspace-up nil)
-;;(define-mouse-action (5 :mod-1) 'mouse-circulate-workspace-down nil)
+;;(define-second-mouse (4 :mod-1) 'mouse-circulate-workspace-up nil)
+;;(define-second-mouse (5 :mod-1) 'mouse-circulate-workspace-down nil)
;;
-;;(define-mouse-action ('Motion) 'mouse-motion nil)
+;;(define-second-mouse ('Motion) 'mouse-motion nil)
Modified: clfswm/clfswm-info.lisp
==============================================================================
--- clfswm/clfswm-info.lisp (original)
+++ clfswm/clfswm-info.lisp Thu Mar 6 10:15:24 2008
@@ -339,7 +339,7 @@
(defun show-global-key-binding ()
"Show all key binding"
- (show-key-binding *main-keys* *second-keys* *mouse-action*
+ (show-key-binding *main-keys* *second-keys* *second-mouse*
*info-keys* *info-mouse-action*))
(defun show-main-mode-key-binding ()
@@ -348,7 +348,7 @@
(defun show-second-mode-key-binding ()
"Show the second mode key binding"
- (show-key-binding *second-keys* *mouse-action*))
+ (show-key-binding *second-keys* *second-mouse*))
(let ((days '("Lundi" "Mardi" "Mercredi" "Jeudi" "Vendredi" "Samedi" "Dimanche"))
Modified: clfswm/clfswm-keys.lisp
==============================================================================
--- clfswm/clfswm-keys.lisp (original)
+++ clfswm/clfswm-keys.lisp Thu Mar 6 10:15:24 2008
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Tue Feb 12 19:23:14 2008
+;;; #Date#: Thu Mar 6 16:11:27 2008
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Keys functions definition
@@ -34,9 +34,7 @@
(define-hash-table-key-name *main-keys* "Main mode keys")
(define-hash-table-key-name *second-keys* "Second mode keys")
-(define-hash-table-key-name *mouse-action* "Mouse buttons actions in second mode")
-(define-hash-table-key-name *pager-keys* "Pager mode keys")
-(define-hash-table-key-name *pager-mouse-action* "Mouse buttons actions in pager mode")
+(define-hash-table-key-name *second-mouse* "Mouse buttons actions in second mode")
(define-hash-table-key-name *info-keys* "Info mode keys")
(define-hash-table-key-name *info-mouse-action* "Mouse buttons actions in info mode")
@@ -82,7 +80,6 @@
(define-define-key "main" *main-keys*)
(define-define-key "second" *second-keys*)
-(define-define-key "pager" *pager-keys*)
(define-define-key "info" *info-keys*)
@@ -95,8 +92,8 @@
(defun undefine-info-key-fun (key)
(remhash key *info-keys*))
-(define-define-mouse "mouse-action" *mouse-action*)
-(define-define-mouse "pager-mouse-action" *pager-mouse-action*)
+;;(define-define-mouse "main-mouse" *main-mouse*)
+(define-define-mouse "second-mouse" *second-mouse*)
(define-define-mouse "info-mouse-action" *info-mouse-action*)
@@ -231,7 +228,7 @@
(defun produce-doc-html-in-file (filename)
(with-open-file (stream filename :direction :output
:if-exists :supersede :if-does-not-exist :create)
- (produce-doc-html (list *main-keys* *second-keys* *mouse-action* *pager-keys* *pager-mouse-action*
+ (produce-doc-html (list *main-keys* *second-keys* *second-mouse*
*info-keys* *info-mouse-action*)
stream)))
@@ -264,7 +261,7 @@
(defun produce-doc-in-file (filename)
(with-open-file (stream filename :direction :output
:if-exists :supersede :if-does-not-exist :create)
- (produce-doc (list *main-keys* *second-keys* *mouse-action* *pager-keys* *pager-mouse-action*
+ (produce-doc (list *main-keys* *second-keys* *second-mouse*
*info-keys* *info-mouse-action*)
stream)))
Modified: clfswm/clfswm-second-mode.lisp
==============================================================================
--- clfswm/clfswm-second-mode.lisp (original)
+++ clfswm/clfswm-second-mode.lisp Thu Mar 6 10:15:24 2008
@@ -81,16 +81,16 @@
(defun sm-handle-motion-notify (&rest event-slots &key root-x root-y &allow-other-keys)
(declare (ignore event-slots))
(unless (compress-motion-notify)
- (funcall-button-from-code *mouse-action* 'motion 0 root-x root-y #'first)))
+ (funcall-button-from-code *second-mouse* 'motion 0 root-x root-y #'first)))
(defun sm-handle-button-press (&rest event-slots &key root-x root-y code state &allow-other-keys)
(declare (ignore event-slots))
- (funcall-button-from-code *mouse-action* code state root-x root-y #'first)
+ (funcall-button-from-code *second-mouse* code state root-x root-y #'first)
(draw-second-mode-window))
(defun sm-handle-button-release (&rest event-slots &key root-x root-y code state &allow-other-keys)
(declare (ignore event-slots))
- (funcall-button-from-code *mouse-action* code state root-x root-y #'third)
+ (funcall-button-from-code *second-mouse* code state root-x root-y #'third)
(draw-second-mode-window))
(defun sm-handle-configure-request (&rest event-slots)
Modified: clfswm/config.lisp
==============================================================================
--- clfswm/config.lisp (original)
+++ clfswm/config.lisp Thu Mar 6 10:15:24 2008
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Sat Mar 1 13:52:41 2008
+;;; #Date#: Thu Mar 6 16:11:38 2008
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Configuration file
@@ -64,30 +64,6 @@
(defparameter *sm-height* 25)
-;;; CONFIG - Pager mode colors and fonts
-(defparameter *pager-background* "black")
-(defparameter *pager-workspace-border* "blue")
-(defparameter *pager-workspace-background* "black")
-(defparameter *pager-group-border* "yellow")
-(defparameter *pager-group-border-selected* "red")
-(defparameter *pager-group-background* "grey10")
-
-(defparameter *pager-window-selected* "Green")
-(defparameter *pager-window-deselected* "Yellow")
-(defparameter *pager-window-hidden* "Green")
-(defparameter *pager-window-hidden-1* "Red")
-
-(defparameter *pager-window-separator* "blue")
-
-(defparameter *pager-workspace-cursor* "black")
-(defparameter *pager-line-cursor* "blue")
-(defparameter *pager-group-cursor* "white")
-(defparameter *pager-group-background-cursor* "grey35")
-
-
-(defparameter *pager-font-string* "9x15bold")
-
-(defparameter *pager-workspace-height* 200)
Modified: clfswm/package.lisp
==============================================================================
--- clfswm/package.lisp (original)
+++ clfswm/package.lisp Thu Mar 6 10:15:24 2008
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Thu Mar 6 15:25:41 2008
+;;; #Date#: Thu Mar 6 16:11:59 2008
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Package definition
@@ -97,9 +97,7 @@
(defparameter *main-keys* (make-hash-table :test 'equal))
(defparameter *second-keys* (make-hash-table :test 'equal))
-(defparameter *mouse-action* (make-hash-table :test 'equal))
-(defparameter *pager-keys* (make-hash-table :test 'equal))
-(defparameter *pager-mouse-action* (make-hash-table :test 'equal))
+(defparameter *second-mouse* (make-hash-table :test 'equal))
(defparameter *info-keys* (make-hash-table :test 'equal))
(defparameter *info-mouse-action* (make-hash-table :test 'equal))
@@ -116,9 +114,6 @@
(defparameter *arrow-action* nil
"Arrow action in the second mode")
-(defparameter *pager-arrow-action* nil
- "Arrow action in the pager mode")
-
;;; Hook definitions
@@ -167,21 +162,6 @@
(defparameter *sm-exposure-hook* nil)
-;;; Pager mode hooks (set in clfswm-pager.lisp)
-(defparameter *pager-button-press-hook* nil)
-(defparameter *pager-button-release-hook* nil)
-(defparameter *pager-motion-notify-hook* nil)
-(defparameter *pager-key-press-hook* nil)
-(defparameter *pager-configure-request-hook* nil)
-(defparameter *pager-map-request-hook* nil)
-(defparameter *pager-unmap-notify-hook* nil)
-(defparameter *pager-destroy-notify-hook* nil)
-(defparameter *pager-mapping-notify-hook* nil)
-(defparameter *pager-property-notify-hook* nil)
-(defparameter *pager-create-notify-hook* nil)
-(defparameter *pager-enter-notify-hook* nil)
-(defparameter *pager-exposure-hook* nil)
-
;;; Second mode global variables
(defparameter *motion-action* nil)
More information about the clfswm-cvs
mailing list