From pbrochard at common-lisp.net Mon Jun 3 20:41:51 2013 From: pbrochard at common-lisp.net (Philippe Brochard) Date: Mon, 3 Jun 2013 13:41:51 -0700 (PDT) Subject: [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1212-30-gd5e80bb Message-ID: <20130603204151.51C5B3565FA@mail.common-lisp.net> 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 d5e80bb911b496f1a1a9836cb2884cf64b532fb5 (commit) from cc5ba0e7ace5f8b2f4a8a1ff2bb83db2802ef834 (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 d5e80bb911b496f1a1a9836cb2884cf64b532fb5 Author: Philippe Brochard Date: Mon Jun 3 22:42:21 2013 +0200 Change focus for sloppy-select-window in manage-focus only on child change diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp index f42b8a8..bf1c3f6 100644 --- a/src/clfswm-internal.lisp +++ b/src/clfswm-internal.lisp @@ -1676,7 +1676,7 @@ managed." (frame-selected-pos parent) 0))) -(let ((lx -1) (ly -1)) +(let ((last-child nil)) (defun manage-focus (window root-x root-y) (case (if (frame-p (current-child)) (frame-focus-policy (current-child)) @@ -1699,8 +1699,8 @@ managed." (need-warp-pointer (not (or (frame-p child) (child-equal-p child (frame-selected-child parent)))))) (unless (or (child-root-p child) - (= lx root-x) (= ly root-y)) - (setf lx root-x ly root-y) + (child-equal-p child last-child)) + (setf last-child child) (when (focus-all-children child parent) (show-all-children) (when (and need-warp-pointer diff --git a/src/clfswm-util.lisp b/src/clfswm-util.lisp index 68e00a6..0187a9f 100644 --- a/src/clfswm-util.lisp +++ b/src/clfswm-util.lisp @@ -1807,8 +1807,7 @@ For window: set current child to window or its parent according to window-parent (put-child-on-top window parent) (when maximized (change-root (find-root parent) parent)) - (when *steal-focus* - (focus-all-children window parent)) + (focus-all-children window parent) (show-all-children t)) (funcall run-fn)))) diff --git a/src/clfswm.lisp b/src/clfswm.lisp index d6c75bf..884372b 100644 --- a/src/clfswm.lisp +++ b/src/clfswm.lisp @@ -126,7 +126,7 @@ (define-handler main-mode :enter-notify (window root-x root-y) (unless (and (> root-x (- (xlib:screen-width *screen*) 3)) (> root-y (- (xlib:screen-height *screen*) 3))) - (manage-focus window root-x root-y))) + (manage-focus window root-x root-y))) (define-handler main-mode :exposure (window) diff --git a/src/config.lisp b/src/config.lisp index 19e3058..3cd3c35 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -32,8 +32,8 @@ ;;; CONFIG - Default modifiers -(defconfig *default-modifiers* '() nil - "Default modifiers list to append to explicit modifiers +(defconfig *default-modifiers* '() + nil "Default modifiers list to append to explicit modifiers Example: :mod-2 for num_lock, :lock for Caps_lock...") @@ -59,24 +59,24 @@ Example: :mod-2 for num_lock, :lock for Caps_lock...") A list of (list match-function handle-function)") -(defconfig *steal-focus* t nil - "Allow to streal the focus on configure request") +(defconfig *steal-focus* t + nil "Allow to steal the focus on configure request") -(defconfig *hide-unmanaged-window* t nil - "Hide or not unmanaged windows when a child is deselected.") +(defconfig *hide-unmanaged-window* t + nil "Hide or not unmanaged windows when a child is deselected.") -(defconfig *snap-size* 5 nil - "Snap size (in % of parent size) when move or resize frame is constrained") +(defconfig *snap-size* 5 + nil "Snap size (in % of parent size) when move or resize frame is constrained") -(defconfig *spatial-move-delay-before* 0.2 nil - "Delay to display the current child before doing a spatial move") +(defconfig *spatial-move-delay-before* 0.2 + nil "Delay to display the current child before doing a spatial move") -(defconfig *spatial-move-delay-after* 0.5 nil - "Delay to display the new child after doing a spatial move") +(defconfig *spatial-move-delay-after* 0.5 + nil "Delay to display the new child after doing a spatial move") -(defconfig *corner-size* 3 'Corner - "The size of the corner square") +(defconfig *corner-size* 3 + 'Corner "The size of the corner square") ;;; CONFIG: Corner actions - See in clfswm-corner.lisp for ;;; allowed functions ----------------------------------------------------------------------- Summary of changes: src/clfswm-internal.lisp | 6 +++--- src/clfswm-util.lisp | 3 +-- src/clfswm.lisp | 2 +- src/config.lisp | 28 ++++++++++++++-------------- 4 files changed, 19 insertions(+), 20 deletions(-) hooks/post-receive -- CLFSWM - A(nother) Common Lisp FullScreen Window Manager