mirror of
https://github.com/emacs-exwm/exwm.git
synced 2024-11-27 14:57:59 +01:00
Automatically refresh RandR settings
* exwm-randr.el (exwm-randr--last-timestamp): New variable recording last seen timestamp after requesting `GetMonitors'. (exwm-randr--get-monitors): Use it. (exwm-randr--on-ScreenChangeNotify): Do not refresh any more. (exwm-randr--on-Notify): New function for handling `CrtcChangeNotify' and `OutputChangeNotify' events. (exwm-randr--on-ConfigureNotify): New function for handling `ConfigureNotify' event. (exwm-randr--init): Add listeners for additional events.
This commit is contained in:
parent
5fde63cc45
commit
882a628daa
1 changed files with 54 additions and 7 deletions
|
@ -91,6 +91,8 @@ corresponding monitors whenever the monitors are active.
|
||||||
(define-obsolete-variable-alias 'exwm-randr-workspace-output-plist
|
(define-obsolete-variable-alias 'exwm-randr-workspace-output-plist
|
||||||
'exwm-randr-workspace-monitor-plist "27.1"))
|
'exwm-randr-workspace-monitor-plist "27.1"))
|
||||||
|
|
||||||
|
(defvar exwm-randr--last-timestamp 0 "Used for debouncing events.")
|
||||||
|
|
||||||
(defvar exwm-workspace--fullscreen-frame-count)
|
(defvar exwm-workspace--fullscreen-frame-count)
|
||||||
(defvar exwm-workspace--list)
|
(defvar exwm-workspace--list)
|
||||||
(declare-function exwm-workspace--count "exwm-workspace.el")
|
(declare-function exwm-workspace--count "exwm-workspace.el")
|
||||||
|
@ -103,12 +105,15 @@ corresponding monitors whenever the monitors are active.
|
||||||
|
|
||||||
(defun exwm-randr--get-monitors ()
|
(defun exwm-randr--get-monitors ()
|
||||||
"Get RandR monitors."
|
"Get RandR monitors."
|
||||||
|
(exwm--log)
|
||||||
(let (monitor-name geometry monitor-plist primary-monitor)
|
(let (monitor-name geometry monitor-plist primary-monitor)
|
||||||
(with-slots (monitors)
|
(with-slots (timestamp monitors)
|
||||||
(xcb:+request-unchecked+reply exwm--connection
|
(xcb:+request-unchecked+reply exwm--connection
|
||||||
(make-instance 'xcb:randr:GetMonitors
|
(make-instance 'xcb:randr:GetMonitors
|
||||||
:window exwm--root
|
:window exwm--root
|
||||||
:get-active 1))
|
:get-active 1))
|
||||||
|
(when (> timestamp exwm-randr--last-timestamp)
|
||||||
|
(setq exwm-randr--last-timestamp timestamp))
|
||||||
(dolist (monitor monitors)
|
(dolist (monitor monitors)
|
||||||
(with-slots (name primary x y width height) monitor
|
(with-slots (name primary x y width height) monitor
|
||||||
(setq monitor-name (x-get-atom-name name)
|
(setq monitor-name (x-get-atom-name name)
|
||||||
|
@ -129,6 +134,7 @@ corresponding monitors whenever the monitors are active.
|
||||||
(defun exwm-randr-refresh ()
|
(defun exwm-randr-refresh ()
|
||||||
"Refresh workspaces according to the updated RandR info."
|
"Refresh workspaces according to the updated RandR info."
|
||||||
(interactive)
|
(interactive)
|
||||||
|
(exwm--log)
|
||||||
(let* ((result (exwm-randr--get-monitors))
|
(let* ((result (exwm-randr--get-monitors))
|
||||||
(primary-monitor (elt result 0))
|
(primary-monitor (elt result 0))
|
||||||
(monitor-plist (elt result 1))
|
(monitor-plist (elt result 1))
|
||||||
|
@ -187,9 +193,42 @@ corresponding monitors whenever the monitors are active.
|
||||||
"27.1")
|
"27.1")
|
||||||
|
|
||||||
(defun exwm-randr--on-ScreenChangeNotify (_data _synthetic)
|
(defun exwm-randr--on-ScreenChangeNotify (_data _synthetic)
|
||||||
|
"Handle `ScreenChangeNotify' event.
|
||||||
|
|
||||||
|
Run `exwm-randr-screen-change-hook' (usually user scripts to configure RandR)."
|
||||||
(exwm--log)
|
(exwm--log)
|
||||||
(run-hooks 'exwm-randr-screen-change-hook)
|
(run-hooks 'exwm-randr-screen-change-hook))
|
||||||
(exwm-randr--refresh))
|
|
||||||
|
(defun exwm-randr--on-Notify (data _synthetic)
|
||||||
|
"Handle `CrtcChangeNotify' and `OutputChangeNotify' events.
|
||||||
|
|
||||||
|
Refresh when any CRTC/output changes."
|
||||||
|
(exwm--log)
|
||||||
|
(let ((evt (make-instance 'xcb:randr:Notify))
|
||||||
|
notify)
|
||||||
|
(xcb:unmarshal evt data)
|
||||||
|
(with-slots (subCode u) evt
|
||||||
|
(cl-case subCode
|
||||||
|
(xcb:randr:Notify:CrtcChange
|
||||||
|
(setq notify (slot-value u 'cc)))
|
||||||
|
(xcb:randr:Notify:OutputChange
|
||||||
|
(setq notify (slot-value u 'oc))))
|
||||||
|
(when notify
|
||||||
|
(with-slots (timestamp) notify
|
||||||
|
(when (> timestamp exwm-randr--last-timestamp)
|
||||||
|
(exwm-randr-refresh)
|
||||||
|
(setq exwm-randr--last-timestamp timestamp)))))))
|
||||||
|
|
||||||
|
(defun exwm-randr--on-ConfigureNotify (data _synthetic)
|
||||||
|
"Handle `ConfigureNotify' event.
|
||||||
|
|
||||||
|
Refresh when any RandR 1.5 monitor changes."
|
||||||
|
(exwm--log)
|
||||||
|
(let ((evt (make-instance 'xcb:ConfigureNotify)))
|
||||||
|
(xcb:unmarshal evt data)
|
||||||
|
(with-slots (window) evt
|
||||||
|
(when (eq window exwm--root)
|
||||||
|
(exwm-randr-refresh)))))
|
||||||
|
|
||||||
(defun exwm-randr--init ()
|
(defun exwm-randr--init ()
|
||||||
"Initialize RandR extension and EXWM RandR module."
|
"Initialize RandR extension and EXWM RandR module."
|
||||||
|
@ -205,15 +244,23 @@ corresponding monitors whenever the monitors are active.
|
||||||
major-version minor-version)
|
major-version minor-version)
|
||||||
;; External monitor(s) may already be connected.
|
;; External monitor(s) may already be connected.
|
||||||
(run-hooks 'exwm-randr-screen-change-hook)
|
(run-hooks 'exwm-randr-screen-change-hook)
|
||||||
(exwm-randr--refresh)
|
(exwm-randr-refresh)
|
||||||
|
;; Listen for `ScreenChangeNotify' to notify external tools to
|
||||||
|
;; configure RandR and `CrtcChangeNotify/OutputChangeNotify' to
|
||||||
|
;; refresh the workspace layout.
|
||||||
(xcb:+event exwm--connection 'xcb:randr:ScreenChangeNotify
|
(xcb:+event exwm--connection 'xcb:randr:ScreenChangeNotify
|
||||||
#'exwm-randr--on-ScreenChangeNotify)
|
#'exwm-randr--on-ScreenChangeNotify)
|
||||||
|
(xcb:+event exwm--connection 'xcb:randr:Notify #'exwm-randr--on-Notify)
|
||||||
|
(xcb:+event exwm--connection 'xcb:ConfigureNotify
|
||||||
|
#'exwm-randr--on-ConfigureNotify)
|
||||||
(xcb:+request exwm--connection
|
(xcb:+request exwm--connection
|
||||||
(make-instance 'xcb:randr:SelectInput
|
(make-instance 'xcb:randr:SelectInput
|
||||||
:window exwm--root
|
:window exwm--root
|
||||||
:enable xcb:randr:NotifyMask:ScreenChange))
|
:enable (logior xcb:randr:NotifyMask:ScreenChange
|
||||||
|
xcb:randr:NotifyMask:CrtcChange
|
||||||
|
xcb:randr:NotifyMask:OutputChange)))
|
||||||
(xcb:flush exwm--connection)
|
(xcb:flush exwm--connection)
|
||||||
(add-hook 'exwm-workspace-list-change-hook #'exwm-randr--refresh))))
|
(add-hook 'exwm-workspace-list-change-hook #'exwm-randr-refresh))))
|
||||||
;; Prevent frame parameters introduced by this module from being
|
;; Prevent frame parameters introduced by this module from being
|
||||||
;; saved/restored.
|
;; saved/restored.
|
||||||
(dolist (i '(exwm-randr-monitor))
|
(dolist (i '(exwm-randr-monitor))
|
||||||
|
@ -222,7 +269,7 @@ corresponding monitors whenever the monitors are active.
|
||||||
|
|
||||||
(defun exwm-randr--exit ()
|
(defun exwm-randr--exit ()
|
||||||
"Exit the RandR module."
|
"Exit the RandR module."
|
||||||
(remove-hook 'exwm-workspace-list-change-hook #'exwm-randr--refresh))
|
(remove-hook 'exwm-workspace-list-change-hook #'exwm-randr-refresh))
|
||||||
|
|
||||||
(defun exwm-randr-enable ()
|
(defun exwm-randr-enable ()
|
||||||
"Enable RandR support for EXWM."
|
"Enable RandR support for EXWM."
|
||||||
|
|
Loading…
Reference in a new issue