Ben Spencer <dangerous....@gmail.com> writes:
> On Wed, Aug 17, 2011 at 03:33:54PM +0200, Manuel Giraud wrote:
>> Here's some patches that improve the float-group in stumpwm. Some of
>> them are already in the float branch of the repo but I think it can be
>> incorporated in master. The very last patch creates a focus/unfocus
>> color scheme for float-group only (yipeee! hours of configuration fun to
>> come).
>
> I have pushed 0002, 0004, 0005 and 0006.
>
> I still feel that 0001 doesn't make much sense because if
> *mouse-focus-policy* is set to :ignore one would expect the mouse to
> be ignored for focus purposes. A float-group specific focus policy
> that defaulted to :click would fix this.
>
> I'm happy with 0003 but it didn't apply cleanly without 0001 in place
> and I've been unable to unpick it. If you could rebase this on top of
> the current master and combine it with 0007 I will apply it.
Ok. Here they are. I've just tested those but note that without an
explicit :click mouse-policy the behaviour of the float group is not
obvious.
>From 47e3fc81ec158f7c0c89c63d940199096d2158b5 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel.gir...@univ-nantes.fr>
Date: Wed, 1 Dec 2010 10:17:12 +0100
Subject: [PATCH 1/3] warp pointer in right corner when resizing in float
group
---
floating-group.lisp | 120 +++++++++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 55 deletions(-)
diff --git a/floating-group.lisp b/floating-group.lisp
index 05267fd..847cca0 100644
--- a/floating-group.lisp
+++ b/floating-group.lisp
@@ -146,7 +146,7 @@
(xlib:window-background parent) (xlib:alloc-color (xlib:screen-default-colormap (screen-number (window-screen window)))
"Orange")))
(xlib:clear-area (window-parent window))))
-
+
(defmethod group-resize-request ((group float-group) window width height)
(float-window-move-resize window :width width :height height))
@@ -187,78 +187,88 @@
)
(defmethod group-button-press ((group float-group) x y (window float-window))
- (let ((screen (group-screen group)))
+ (let ((screen (group-screen group))
+ (initial-width (xlib:drawable-width (window-parent window)))
+ (initial-height (xlib:drawable-height (window-parent window))))
(when (eq *mouse-focus-policy* :click)
(focus-window window))
+
+ ;; When in border
(when (or (< x (xlib:drawable-x (window-xwin window)))
(> x (+ (xlib:drawable-width (window-xwin window))
(xlib:drawable-x (window-xwin window))))
(< y (xlib:drawable-y (window-xwin window)))
(> y (+ (xlib:drawable-height (window-xwin window))
(xlib:drawable-y (window-xwin window)))))
+
+ ;; When resizing warp pointer to left-right corner
+ (multiple-value-bind (relx rely same-screen-p child state-mask)
+ (xlib:query-pointer (window-parent window))
+ (declare (ignore relx rely same-screen-p child))
+ (when (find :button-3 (xlib:make-state-keys state-mask))
+ (xlib:warp-pointer (window-parent window) initial-width initial-height)))
+
(multiple-value-bind (relx rely same-screen-p child state-mask)
(xlib:query-pointer (window-parent window))
(declare (ignore same-screen-p child))
- (let ((initial-width (xlib:drawable-width (slot-value window 'parent)))
- (initial-height (xlib:drawable-height (slot-value window 'parent))))
- (labels ((move-window-event-handler
- (&rest event-slots &key event-key &allow-other-keys)
- (case event-key
- (:button-release
- :done)
- (:motion-notify
- (with-slots (parent) window
- (xlib:with-state (parent)
- ;; Either move or resize the window
- (cond
- ((find :button-1 (xlib:make-state-keys state-mask))
- (let ((newx (- (getf event-slots :x) relx))
- (newy (- (getf event-slots :y) rely)))
- (float-window-move-resize window :x newx :y newy)))
- ((find :button-3 (xlib:make-state-keys state-mask))
- (let ((w (+ initial-width
- (- (getf event-slots :x)
- relx
- (xlib:drawable-x parent))))
- (h (+ initial-height
- (- (getf event-slots :y)
- rely
- (xlib:drawable-y parent)
- *float-window-title-height*))))
- ;; Don't let the window become too small
- (float-window-move-resize window
- :width (max w *min-frame-width*)
- :height (max h *min-frame-height*)))))))
- t)
- ;; We need to eat these events or they'll ALL
- ;; come blasting in later. Also things start
- ;; lagging hard if we don't (on clisp anyway).
- (:configure-notify t)
- (:exposure t)
- (t
- nil))))
- (xlib:grab-pointer (screen-root screen) '(:button-release :pointer-motion))
- (unwind-protect
- ;; Wait until the mouse button is released
- (loop for ev = (xlib:process-event *display*
- :handler #'move-window-event-handler
- :timeout nil
- :discard-p t)
- until (eq ev :done))
- (ungrab-pointer))
- (update-configuration window)
- ;; don't forget to update the cache
- (setf (window-x window) (xlib:drawable-x (window-parent window))
- (window-y window) (xlib:drawable-y (window-parent window)))))))))
+ (labels ((move-window-event-handler
+ (&rest event-slots &key event-key &allow-other-keys)
+ (case event-key
+ (:button-release
+ ;; Reset pointer to initial position when done
+ (xlib:warp-pointer (window-parent window) x y)
+ :done)
+ (:motion-notify
+ (with-slots (parent) window
+ (xlib:with-state (parent)
+ ;; Either move or resize the window
+ (cond
+ ((find :button-1 (xlib:make-state-keys state-mask))
+ (setf (xlib:drawable-x parent) (- (getf event-slots :x) relx)
+ (xlib:drawable-y parent) (- (getf event-slots :y) rely)))
+ ((find :button-3 (xlib:make-state-keys state-mask))
+ (let ((w (+ initial-width
+ (- (getf event-slots :x)
+ relx
+ (xlib:drawable-x parent))))
+ (h (+ initial-height
+ (- (getf event-slots :y)
+ rely
+ (xlib:drawable-y parent)
+ *float-window-title-height*))))
+ ;; Don't let the window become too small
+ (float-window-move-resize window
+ :width (max w *min-frame-width*)
+ :height (max h *min-frame-height*)))))))
+ t)
+ ;; We need to eat these events or they'll ALL
+ ;; come blasting in later. Also things start
+ ;; lagging hard if we don't (on clisp anyway).
+ (:configure-notify t)
+ (:exposure t)
+ (t nil))))
+ (xlib:grab-pointer (screen-root screen) '(:button-release :pointer-motion))
+ (unwind-protect
+ ;; Wait until the mouse button is released
+ (loop for ev = (xlib:process-event *display*
+ :handler #'move-window-event-handler
+ :timeout nil
+ :discard-p t)
+ until (eq ev :done))
+ (ungrab-pointer))
+ (update-configuration window)
+ ;; don't forget to update the cache
+ (setf (window-x window) (xlib:drawable-x (window-parent window))
+ (window-y window) (xlib:drawable-y (window-parent window))))))))
(defmethod group-button-press ((group float-group) x y where)
(declare (ignore x y where))
)
(defcommand gnew-float (name) ((:rest "Group Name: "))
-"Create a floating window group with the specified name and switch to it."
+ "Create a floating window group with the specified name and switch to it."
(add-group (current-screen) name :type 'float-group))
(defcommand gnewbg-float (name) ((:rest "Group Name: "))
-"Create a floating window group with the specified name, but do not switch to it."
+ "Create a floating window group with the specified name, but do not switch to it."
(add-group (current-screen) name :background t :type 'float-group))
--
1.7.6
>From 0348a99c7812d18e2edfe21e97279e970f9b5308 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel.gir...@univ-nantes.fr>
Date: Thu, 18 Aug 2011 09:58:01 +0200
Subject: [PATCH 2/3] Don't restore pointer position after a resize in
float-group
---
floating-group.lisp | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/floating-group.lisp b/floating-group.lisp
index 847cca0..d73dcfe 100644
--- a/floating-group.lisp
+++ b/floating-group.lisp
@@ -214,10 +214,7 @@
(labels ((move-window-event-handler
(&rest event-slots &key event-key &allow-other-keys)
(case event-key
- (:button-release
- ;; Reset pointer to initial position when done
- (xlib:warp-pointer (window-parent window) x y)
- :done)
+ (:button-release :done)
(:motion-notify
(with-slots (parent) window
(xlib:with-state (parent)
--
1.7.6
--
Manuel Giraud
_______________________________________________
Stumpwm-devel mailing list
Stumpwm-devel@nongnu.org
https://lists.nongnu.org/mailman/listinfo/stumpwm-devel
