From 9ff99d63281ced50a34fa803e8cc48633c1f8449 Mon Sep 17 00:00:00 2001 From: Chris Feng Date: Mon, 15 Aug 2016 18:42:35 +0800 Subject: [PATCH] Do not set _NET_WORKAREA * exwm-workspace.el (exwm-workspace--update-workareas): Do not set _NET_WORKAREA. * exwm.el (exwm--init-icccm-ewmh, exwm--exit-icccm-ewmh): Remove _NET_WORKAREA from the supported list. --- exwm-randr.el | 2 +- exwm-workspace.el | 9 ++------- exwm.el | 7 +++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/exwm-randr.el b/exwm-randr.el index 4ce1752..5caf875 100644 --- a/exwm-randr.el +++ b/exwm-randr.el @@ -107,7 +107,7 @@ output nil)) (set-frame-parameter frame 'exwm-randr-output output) (set-frame-parameter frame 'exwm-geometry geometry))) - ;; Update workareas and set _NET_WORKAREA. + ;; Update workareas. (exwm-workspace--update-workareas) ;; Resize workspace. (dolist (f exwm-workspace--list) diff --git a/exwm-workspace.el b/exwm-workspace.el index 77c9417..9585112 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -249,7 +249,7 @@ Value nil means to use the default position which is fixed at bottom, while (defvar exwm-workspace--workareas nil "Workareas (struts excluded).") (defun exwm-workspace--update-workareas () - "Update `exwm-workspace--workareas' and set _NET_WORKAREA." + "Update `exwm-workspace--workareas'." (let ((root-width (x-display-pixel-width)) (root-height (x-display-pixel-height)) workareas @@ -309,11 +309,6 @@ Value nil means to use the default position which is fixed at bottom, while (cl-incf (aref w 3) delta)))))) ;; Save the result. (setq exwm-workspace--workareas workareas) - ;; Update _NET_WORKAREA. - (xcb:+request exwm--connection - (make-instance 'xcb:ewmh:set-_NET_WORKAREA - :window exwm--root - :data (mapconcat #'vconcat workareas []))) (xcb:flush exwm--connection))) (defvar exwm-workspace--fullscreen-frame-count 0 @@ -1320,7 +1315,7 @@ Please check `exwm-workspace--minibuffer-own-frame-p' first." :window exwm--root :data num-workspaces)) ;; Set _NET_DESKTOP_GEOMETRY. (exwm-workspace--set-desktop-geometry) - ;; Update and set _NET_WORKAREA. + ;; Update workareas. (exwm-workspace--update-workareas) ;; Set _NET_VIRTUAL_ROOTS. (xcb:+request exwm--connection diff --git a/exwm.el b/exwm.el index de45f4f..293072c 100644 --- a/exwm.el +++ b/exwm.el @@ -273,7 +273,7 @@ (setcdr pair struts) (push (cons id struts) exwm-workspace--id-struts-alist)) (exwm-workspace--update-struts)) - ;; Update workareas and set _NET_WORKAREA. + ;; Update workareas. (exwm-workspace--update-workareas) ;; Update workspaces. (dolist (f exwm-workspace--list) @@ -292,7 +292,7 @@ (setcdr pair struts) (push (cons id struts) exwm-workspace--id-struts-alist)) (exwm-workspace--update-struts)) - ;; Update workareas and set _NET_WORKAREA. + ;; Update workareas. (exwm-workspace--update-workareas) ;; Update workspaces. (dolist (f exwm-workspace--list) @@ -520,7 +520,7 @@ xcb:Atom:_NET_CURRENT_DESKTOP ;; xcb:Atom:_NET_DESKTOP_NAMES xcb:Atom:_NET_ACTIVE_WINDOW - xcb:Atom:_NET_WORKAREA + ;; xcb:Atom:_NET_WORKAREA xcb:Atom:_NET_SUPPORTING_WM_CHECK xcb:Atom:_NET_VIRTUAL_ROOTS ;; xcb:Atom:_NET_DESKTOP_LAYOUT @@ -648,7 +648,6 @@ xcb:Atom:_NET_DESKTOP_VIEWPORT xcb:Atom:_NET_CURRENT_DESKTOP xcb:Atom:_NET_ACTIVE_WINDOW - xcb:Atom:_NET_WORKAREA xcb:Atom:_NET_SUPPORTING_WM_CHECK xcb:Atom:_NET_VIRTUAL_ROOTS ;; TODO: Keep this list synchronized with that in