procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow floating the ediff control frame under X

Browse source 
This is a step in the direction of making ediff behave better by
default under tiling window managers and fixing Bug#62164.

* lisp/vc/ediff-wind.el (ediff-floating-control-frame): Add
defcustom.
(ediff-frame-make-utility, ediff-setup-control-frame): Allow setting
the control frame up as a utility window under X.  (Bug#62164)
This commit is contained in:
Spencer Baugh 2023-04-07 17:54:06 -04:00 • committed by Eli Zaretskii
parent ea845e3fcd
commit e02d0b554e
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/vc/ediff-wind.el
View file

@ -69,6 +69,16 @@ provided functions are written."
(function :tag "Other function"))
:version "24.3")
(defcustom ediff-floating-control-frame nil
"If non-nil, try making the control frame be floating rather than tiled.
If your X window manager makes the Ediff control frame a tiled one,
set this to a non-nil value, and Emacs will try to make it floating.
This only has effect on X displays."
:type '(choice (const :tag "Control frame floats" t)
(const :tag "Control frame has default WM behavior" nil))
:version "30.1")
(ediff-defvar-local ediff-multiframe nil
"Indicates if we are in a multiframe setup.")
@ -873,6 +883,16 @@ Create a new splittable frame if none is found."
(not (ediff-frame-has-dedicated-windows (window-frame wind)))
)))
(defun ediff-frame-make-utility (frame)
(let ((x-fast-protocol-requests t))
(x-change-window-property
"_NET_WM_WINDOW_TYPE" '("_NET_WM_WINDOW_TYPE_UTILITY")
frame "ATOM" 32 t)
(x-change-window-property
"WM_TRANSIENT_FOR"
(list (string-to-number (frame-parameter nil 'window-id)))
frame "WINDOW" 32 t)))
;; Prepare or refresh control frame
(defun ediff-setup-control-frame (ctl-buffer designated-minibuffer-frame)
(let ((window-min-height 1)
@ -948,6 +968,8 @@ Create a new splittable frame if none is found."
(goto-char (point-min))
(modify-frame-parameters ctl-frame adjusted-parameters)
(when (and ediff-floating-control-frame (eq (window-system ctl-frame) 'x))
(ediff-frame-make-utility ctl-frame))
(make-frame-visible ctl-frame)
;; This works around a bug in 19.25 and earlier. There, if frame gets