[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/exwm 3d643fa 3/6: Remove an assertion
From: |
Chris Feng |
Subject: |
[elpa] externals/exwm 3d643fa 3/6: Remove an assertion |
Date: |
Sun, 07 Feb 2016 03:41:53 +0000 |
branch: externals/exwm
commit 3d643fafbe58d9b3e2dc9e864cbf05a2d911e1b2
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>
Remove an assertion
* exwm-randr.el (exwm-randr--refresh): There can be no valid output
sometimes.
---
exwm-randr.el | 71 +++++++++++++++++++++++++++++----------------------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/exwm-randr.el b/exwm-randr.el
index 51161a4..716d521 100644
--- a/exwm-randr.el
+++ b/exwm-randr.el
@@ -84,42 +84,43 @@
output-plist (plist-put output-plist output-name geometry))
(unless default-geometry ;assume the first output as primary
(setq default-geometry geometry)))))))
- (cl-assert (<= 2 (length output-plist)))
(exwm--log "(randr) outputs: %s" output-plist)
- (setq workarea-offset (if exwm-workspace-minibuffer-position
- 0
- (window-pixel-height (minibuffer-window))))
- (dotimes (i exwm-workspace-number)
- (let* ((output (plist-get exwm-randr-workspace-output-plist i))
- (geometry (lax-plist-get output-plist output))
- (frame (elt exwm-workspace--list i)))
- (unless geometry
- (setq geometry default-geometry
- output nil))
- (set-frame-parameter frame 'exwm-randr-output output)
- (set-frame-parameter frame 'exwm-geometry geometry)
- (with-slots (x y width height) geometry
- (exwm-layout--resize-container (frame-parameter frame 'exwm-outer-id)
- (frame-parameter frame
- 'exwm-workspace)
- x y width height)
- (when (and (eq frame exwm-workspace--current)
- (exwm-workspace--minibuffer-own-frame-p))
- (exwm-workspace--resize-minibuffer-frame width height))
- (setq workareas
- (nconc workareas (list x y width (- height
- workarea-offset)))
- viewports (nconc viewports (list x y))))))
- ;; Update _NET_WORKAREA
- (xcb:+request exwm--connection
- (make-instance 'xcb:ewmh:set-_NET_WORKAREA
- :window exwm--root :data (vconcat workareas)))
- ;; Update _NET_DESKTOP_VIEWPORT
- (xcb:+request exwm--connection
- (make-instance 'xcb:ewmh:set-_NET_DESKTOP_VIEWPORT
- :window exwm--root
- :data (vconcat viewports)))
- (xcb:flush exwm--connection)))
+ (when output-plist
+ (setq workarea-offset (if exwm-workspace-minibuffer-position
+ 0
+ (window-pixel-height (minibuffer-window))))
+ (dotimes (i exwm-workspace-number)
+ (let* ((output (plist-get exwm-randr-workspace-output-plist i))
+ (geometry (lax-plist-get output-plist output))
+ (frame (elt exwm-workspace--list i)))
+ (unless geometry
+ (setq geometry default-geometry
+ output nil))
+ (set-frame-parameter frame 'exwm-randr-output output)
+ (set-frame-parameter frame 'exwm-geometry geometry)
+ (with-slots (x y width height) geometry
+ (exwm-layout--resize-container (frame-parameter frame
+ 'exwm-outer-id)
+ (frame-parameter frame
+ 'exwm-workspace)
+ x y width height)
+ (when (and (eq frame exwm-workspace--current)
+ (exwm-workspace--minibuffer-own-frame-p))
+ (exwm-workspace--resize-minibuffer-frame width height))
+ (setq workareas
+ (nconc workareas (list x y width (- height
+ workarea-offset)))
+ viewports (nconc viewports (list x y))))))
+ ;; Update _NET_WORKAREA
+ (xcb:+request exwm--connection
+ (make-instance 'xcb:ewmh:set-_NET_WORKAREA
+ :window exwm--root :data (vconcat workareas)))
+ ;; Update _NET_DESKTOP_VIEWPORT
+ (xcb:+request exwm--connection
+ (make-instance 'xcb:ewmh:set-_NET_DESKTOP_VIEWPORT
+ :window exwm--root
+ :data (vconcat viewports)))
+ (xcb:flush exwm--connection))))
(defvar exwm-randr-screen-change-hook nil
"Normal hook run when screen changes.")
- [elpa] externals/exwm updated (97daba2 -> fb9bfd2), Chris Feng, 2016/02/06
- [elpa] externals/exwm 3d643fa 3/6: Remove an assertion,
Chris Feng <=
- [elpa] externals/exwm fb9bfd2 6/6: Eliminate compilation warnings, Chris Feng, 2016/02/06
- [elpa] externals/exwm 0006523 1/6: Resize minibuffer only when it's in its own frame, Chris Feng, 2016/02/06
- [elpa] externals/exwm e9e476c 2/6: Merge branch 'fjl-fix-resize-minibuffer', Chris Feng, 2016/02/06
- [elpa] externals/exwm e2edf81 4/6: Add some useful key bindings, Chris Feng, 2016/02/06
- [elpa] externals/exwm 15cdf8f 5/6: Unmanage X windows on exit, Chris Feng, 2016/02/06