Mirrors/exwm2
2
0
Fork 0
mirror of https://github.com/emacs-exwm/exwm.git synced 2024-11-27 14:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove an assertion

Browse source 
* exwm-randr.el (exwm-randr--refresh): There can be no valid output
sometimes.
This commit is contained in:
Chris Feng 2016-02-07 10:22:33 +08:00
parent e9e476c4de
commit 3d643fafbe
1 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
exwm-randr.el
View file

@ -84,8 +84,8 @@
output-plist (plist-put output-plist output-name geometry)) output-plist (plist-put output-plist output-name geometry))
(unless default-geometry ;assume the first output as primary (unless default-geometry ;assume the first output as primary
(setq default-geometry geometry))))))) (setq default-geometry geometry)))))))
(cl-assert (<= 2 (length output-plist)))
(exwm--log "(randr) outputs: %s" output-plist) (exwm--log "(randr) outputs: %s" output-plist)
(when output-plist
(setq workarea-offset (if exwm-workspace-minibuffer-position (setq workarea-offset (if exwm-workspace-minibuffer-position
0 0
(window-pixel-height (minibuffer-window)))) (window-pixel-height (minibuffer-window))))
@ -99,7 +99,8 @@
(set-frame-parameter frame 'exwm-randr-output output) (set-frame-parameter frame 'exwm-randr-output output)
(set-frame-parameter frame 'exwm-geometry geometry) (set-frame-parameter frame 'exwm-geometry geometry)
(with-slots (x y width height) geometry (with-slots (x y width height) geometry
(exwm-layout--resize-container (frame-parameter frame 'exwm-outer-id) (exwm-layout--resize-container (frame-parameter frame
'exwm-outer-id)
(frame-parameter frame (frame-parameter frame
'exwm-workspace) 'exwm-workspace)
x y width height) x y width height)
@ -119,7 +120,7 @@
(make-instance 'xcb:ewmh:set-_NET_DESKTOP_VIEWPORT (make-instance 'xcb:ewmh:set-_NET_DESKTOP_VIEWPORT
:window exwm--root :window exwm--root
:data (vconcat viewports))) :data (vconcat viewports)))
(xcb:flush exwm--connection))) (xcb:flush exwm--connection))))
(defvar exwm-randr-screen-change-hook nil (defvar exwm-randr-screen-change-hook nil
"Normal hook run when screen changes.") "Normal hook run when screen changes.")