From 4cd4754df5cf3a076db30e788f89f9709cc32360 Mon Sep 17 00:00:00 2001 From: Philippe Brochard Date: Mon, 22 Apr 2013 21:01:32 +0200 Subject: [PATCH] Use with-current-window instead of with-focus-window to take current window over brothers in second mode --- src/clfswm-circulate-mode.lisp | 11 +++++------ src/clfswm-second-mode.lisp | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/clfswm-circulate-mode.lisp b/src/clfswm-circulate-mode.lisp index 7c52dda..720d456 100644 --- a/src/clfswm-circulate-mode.lisp +++ b/src/clfswm-circulate-mode.lisp @@ -266,12 +266,11 @@ (defmacro with-move-current-focused-window (() &body body) - (let ((window (gensym))) - `(with-focus-window (,window) - ,@body - (move-child-to ,window (if (frame-p (current-child)) - (current-child) - (find-parent-frame (current-child) (find-current-root))))))) + `(with-current-window + ,@body + (move-child-to window (if (frame-p (current-child)) + (current-child) + (find-parent-frame (current-child) (find-current-root)))))) diff --git a/src/clfswm-second-mode.lisp b/src/clfswm-second-mode.lisp index 50029f2..b8d4ac4 100644 --- a/src/clfswm-second-mode.lisp +++ b/src/clfswm-second-mode.lisp @@ -42,7 +42,8 @@ (truncate (/ (- *sm-width* (* (xlib:max-char-width *sm-font*) len)) 2)) (truncate (/ (+ *sm-height* (- (xlib:font-ascent *sm-font*) (xlib:font-descent *sm-font*))) 2)) text)) - (copy-pixmap-buffer *sm-window* *sm-gc*)) + (copy-pixmap-buffer *sm-window* *sm-gc*) + (no-focus)) -- 2.11.4.GIT