[clfswm-cvs] r430 - in clfswm: . src
Philippe Brochard
pbrochard at common-lisp.net
Sat Mar 12 22:14:31 UTC 2011
Author: pbrochard
Date: Sat Mar 12 17:14:31 2011
New Revision: 430
Log:
clfswm.asd: Change compilation order to prevent undefined variables. src/clfswm-internal.lisp (show-child(frame)): Handle properly the show-root-frame-p parameter. src/clfswm-util.lisp (move-frame, resize-frame): Do not move or resize a frame when it's the current root.
Modified:
clfswm/ChangeLog
clfswm/clfswm.asd
clfswm/src/clfswm-internal.lisp
clfswm/src/clfswm-util.lisp
clfswm/src/package.lisp
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog (original)
+++ clfswm/ChangeLog Sat Mar 12 17:14:31 2011
@@ -1,3 +1,16 @@
+2011-03-12 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * clfswm.asd: Change compilation order to prevent undefined
+ variables.
+
+ * src/clfswm-internal.lisp (show-child(frame)): Handle properly
+ the show-root-frame-p parameter.
+
+2011-03-11 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * src/clfswm-util.lisp (move-frame, resize-frame): Do not move or
+ resize a frame when it's the current root.
+
2011-03-10 Philippe Brochard <pbrochard at common-lisp.net>
* src/clfswm-internal.lisp (show-all-children): Handle properly
Modified: clfswm/clfswm.asd
==============================================================================
--- clfswm/clfswm.asd (original)
+++ clfswm/clfswm.asd Sat Mar 12 17:14:31 2011
@@ -13,6 +13,8 @@
:components ((:module src
:components
((:file "tools")
+ (:file "version"
+ :depends-on ("tools"))
(:file "my-html"
:depends-on ("tools"))
(:file "package"
@@ -41,8 +43,6 @@
(:file "clfswm"
:depends-on ("xlib-util" "netwm-util" "clfswm-keys" "config"
"clfswm-internal" "clfswm-circulate-mode" "tools"))
- (:file "version"
- :depends-on ("tools"))
(:file "clfswm-second-mode"
:depends-on ("package" "clfswm" "clfswm-internal" "clfswm-generic-mode"
"clfswm-placement"))
@@ -60,18 +60,19 @@
:depends-on ("package" "config" "xlib-util" "clfswm-keys"
"clfswm-generic-mode" "clfswm-placement"))
(:file "clfswm-util"
- :depends-on ("clfswm" "keysyms" "clfswm-info" "clfswm-second-mode" "clfswm-query" "clfswm-menu" "clfswm-autodoc" "clfswm-corner"))
+ :depends-on ("clfswm" "keysyms" "clfswm-info" "clfswm-second-mode" "clfswm-query"
+ "clfswm-menu" "clfswm-autodoc" "clfswm-corner"))
+ (:file "clfswm-configuration"
+ :depends-on ("package" "config" "clfswm-internal" "clfswm-util" "clfswm-query"
+ "clfswm-menu"))
+ (:file "menu-def"
+ :depends-on ("clfswm-menu" "clfswm-configuration" "clfswm" "clfswm-util" "clfswm-info"))
(:file "clfswm-layout"
:depends-on ("package" "clfswm-internal" "clfswm-util" "clfswm-info" "menu-def"))
(:file "clfswm-pack"
:depends-on ("clfswm" "clfswm-util" "clfswm-second-mode"))
(:file "clfswm-nw-hooks"
:depends-on ("package" "clfswm-util" "clfswm-info" "clfswm-layout" "menu-def"))
- (:file "clfswm-configuration"
- :depends-on ("package" "config" "clfswm-internal" "clfswm-util" "clfswm-query"
- "clfswm-menu"))
- (:file "menu-def"
- :depends-on ("clfswm-menu" "clfswm-configuration" "clfswm" "clfswm-util" "clfswm-info"))
(:file "bindings"
:depends-on ("clfswm" "clfswm-internal" "clfswm-util" "clfswm-menu"))
(:file "bindings-second-mode"
Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp (original)
+++ clfswm/src/clfswm-internal.lisp Sat Mar 12 17:14:31 2011
@@ -627,8 +627,9 @@
(defmethod show-child ((frame frame) parent previous)
(declare (ignore parent))
(with-slots (window show-window-p) frame
- (if show-window-p
- (when (or *show-root-frame-p* (not (child-equal-p frame *current-root*)))
+ (if (and show-window-p
+ (or *show-root-frame-p* (not (child-equal-p frame *current-root*))))
+ (progn
(map-window window)
(set-child-stack-order window previous)
(display-frame-info frame))
Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp (original)
+++ clfswm/src/clfswm-util.lisp Sat Mar 12 17:14:31 2011
@@ -532,11 +532,8 @@
-
-
-
(defun move-frame (frame parent orig-x orig-y)
- (when (and frame parent)
+ (when (and frame parent (not (child-equal-p frame *current-root*)))
(hide-all-children frame)
(with-slots (window) frame
(move-window window orig-x orig-y #'display-frame-info (list frame))
@@ -546,7 +543,7 @@
(defun resize-frame (frame parent orig-x orig-y)
- (when (and frame parent)
+ (when (and frame parent (not (child-equal-p frame *current-root*)))
(hide-all-children frame)
(with-slots (window) frame
(resize-window window orig-x orig-y #'display-frame-info (list frame))
@@ -580,7 +577,7 @@
(unless (equal (type-of child) 'frame)
(setf child (find-frame-window child *current-root*)))
(setf parent (find-parent-frame child)))))
- (when (equal (type-of child) 'frame)
+ (when (and (frame-p child) (not (child-equal-p child *current-root*)))
(funcall mouse-fn child parent root-x root-y))
(when (and child parent
(focus-all-children child parent
Modified: clfswm/src/package.lisp
==============================================================================
--- clfswm/src/package.lisp (original)
+++ clfswm/src/package.lisp Sat Mar 12 17:14:31 2011
@@ -46,6 +46,10 @@
It is particulary useful with CLISP/MIT-CLX.")
+(defconfig *show-root-frame-p* nil nil
+ "Show the root frame information or not")
+
+
(defconfig *border-size* 1 nil
"Windows and frames border size")
@@ -157,8 +161,6 @@
(defparameter *current-child* nil
"The current child with the focus")
-(defparameter *show-root-frame-p* nil)
-
(defparameter *main-keys* nil)
(defparameter *main-mouse* nil)
More information about the clfswm-cvs
mailing list