mirror of
https://github.com/emacs-exwm/exwm.git
synced 2024-11-23 13:07:59 +01:00
Fix regressions
(exwm-init): Do not signal an error on startup. * exwm-floating.el (exwm-floating-toggle-floating): * exwm-input (exwm-input-send-next-key) (exwm-input-send-simulation-key): * exwm-layout (exwm-layout-set-fullscreen) (exwm-layout-unset-fullscreen, exwm-layout-toggle-fullscreen): Fix incorrect use of `cl-return-from'.
This commit is contained in:
parent
cb8706f91c
commit
3f6c609a2b
4 changed files with 12 additions and 10 deletions
|
@ -401,7 +401,7 @@ This is also used by X window containers.")
|
||||||
"Toggle the current window between floating and non-floating states."
|
"Toggle the current window between floating and non-floating states."
|
||||||
(interactive)
|
(interactive)
|
||||||
(unless (derived-mode-p 'exwm-mode)
|
(unless (derived-mode-p 'exwm-mode)
|
||||||
(cl-return-from 'exwm-floating-toggle-floating))
|
(cl-return-from exwm-floating-toggle-floating))
|
||||||
(with-current-buffer (window-buffer)
|
(with-current-buffer (window-buffer)
|
||||||
(if exwm--floating-frame
|
(if exwm--floating-frame
|
||||||
(exwm-floating--unset-floating exwm--id)
|
(exwm-floating--unset-floating exwm--id)
|
||||||
|
|
|
@ -745,7 +745,7 @@ EXWM will prompt for the key to send. This command can be prefixed to send
|
||||||
multiple keys."
|
multiple keys."
|
||||||
(interactive "p")
|
(interactive "p")
|
||||||
(unless (derived-mode-p 'exwm-mode)
|
(unless (derived-mode-p 'exwm-mode)
|
||||||
(cl-return-from 'exwm-input-send-next-key))
|
(cl-return-from exwm-input-send-next-key))
|
||||||
(when (> times 12) (setq times 12))
|
(when (> times 12) (setq times 12))
|
||||||
(let (key keys)
|
(let (key keys)
|
||||||
(dotimes (i times)
|
(dotimes (i times)
|
||||||
|
@ -893,7 +893,7 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences."
|
||||||
"Fake a key event according to the last input key sequence."
|
"Fake a key event according to the last input key sequence."
|
||||||
(interactive "p")
|
(interactive "p")
|
||||||
(unless (derived-mode-p 'exwm-mode)
|
(unless (derived-mode-p 'exwm-mode)
|
||||||
(cl-return-from 'exwm-input-send-simulation-key))
|
(cl-return-from exwm-input-send-simulation-key))
|
||||||
(let ((keys (gethash (this-single-command-keys)
|
(let ((keys (gethash (this-single-command-keys)
|
||||||
exwm-input--simulation-keys)))
|
exwm-input--simulation-keys)))
|
||||||
(dotimes (_ times)
|
(dotimes (_ times)
|
||||||
|
|
|
@ -147,7 +147,7 @@
|
||||||
(interactive)
|
(interactive)
|
||||||
(unless (and (or id (derived-mode-p 'exwm-mode))
|
(unless (and (or id (derived-mode-p 'exwm-mode))
|
||||||
(not (exwm-layout--fullscreen-p)))
|
(not (exwm-layout--fullscreen-p)))
|
||||||
(cl-return-from 'exwm-layout-set-fullscreen))
|
(cl-return-from exwm-layout-set-fullscreen))
|
||||||
(with-current-buffer (if id (exwm--id->buffer id) (window-buffer))
|
(with-current-buffer (if id (exwm--id->buffer id) (window-buffer))
|
||||||
;; Expand the X window to fill the whole screen.
|
;; Expand the X window to fill the whole screen.
|
||||||
(with-slots (x y width height) (exwm-workspace--get-geometry exwm--frame)
|
(with-slots (x y width height) (exwm-workspace--get-geometry exwm--frame)
|
||||||
|
@ -174,7 +174,7 @@
|
||||||
(interactive)
|
(interactive)
|
||||||
(unless (and (or id (derived-mode-p 'exwm-mode))
|
(unless (and (or id (derived-mode-p 'exwm-mode))
|
||||||
(exwm-layout--fullscreen-p))
|
(exwm-layout--fullscreen-p))
|
||||||
(cl-return-from 'exwm-layout-unset-fullscreen))
|
(cl-return-from exwm-layout-unset-fullscreen))
|
||||||
(with-current-buffer (if id (exwm--id->buffer id) (window-buffer))
|
(with-current-buffer (if id (exwm--id->buffer id) (window-buffer))
|
||||||
(setq exwm--ewmh-state
|
(setq exwm--ewmh-state
|
||||||
(delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state))
|
(delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state))
|
||||||
|
@ -200,7 +200,7 @@
|
||||||
"Toggle fullscreen mode."
|
"Toggle fullscreen mode."
|
||||||
(interactive (list (exwm--buffer->id (window-buffer))))
|
(interactive (list (exwm--buffer->id (window-buffer))))
|
||||||
(unless (or id (derived-mode-p 'exwm-mode))
|
(unless (or id (derived-mode-p 'exwm-mode))
|
||||||
(cl-return-from 'exwm-layout-toggle-fullscreen))
|
(cl-return-from exwm-layout-toggle-fullscreen))
|
||||||
(when id
|
(when id
|
||||||
(with-current-buffer (exwm--id->buffer id)
|
(with-current-buffer (exwm--id->buffer id)
|
||||||
(if (exwm-layout--fullscreen-p)
|
(if (exwm-layout--fullscreen-p)
|
||||||
|
|
10
exwm.el
10
exwm.el
|
@ -757,7 +757,7 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'."
|
||||||
(setq exwm--wmsn-window new-owner))))
|
(setq exwm--wmsn-window new-owner))))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun exwm-init (&optional frame)
|
(cl-defun exwm-init (&optional frame)
|
||||||
"Initialize EXWM."
|
"Initialize EXWM."
|
||||||
(interactive)
|
(interactive)
|
||||||
(if frame
|
(if frame
|
||||||
|
@ -765,9 +765,11 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'."
|
||||||
(select-frame-set-input-focus frame)
|
(select-frame-set-input-focus frame)
|
||||||
(setq frame (selected-frame)))
|
(setq frame (selected-frame)))
|
||||||
(when (not (eq 'x (framep frame)))
|
(when (not (eq 'x (framep frame)))
|
||||||
(user-error "Not running under X environment"))
|
(message "[EXWM] Not running under X environment")
|
||||||
|
(cl-return-from exwm-init))
|
||||||
(when exwm--connection
|
(when exwm--connection
|
||||||
(user-error "EXWM already running"))
|
(exwm--log "EXWM already running")
|
||||||
|
(cl-return-from exwm-init))
|
||||||
(condition-case err
|
(condition-case err
|
||||||
(progn
|
(progn
|
||||||
(exwm-enable 'undo) ;never initialize again
|
(exwm-enable 'undo) ;never initialize again
|
||||||
|
@ -809,7 +811,7 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'."
|
||||||
((quit error)
|
((quit error)
|
||||||
(exwm-exit)
|
(exwm-exit)
|
||||||
;; Rethrow error
|
;; Rethrow error
|
||||||
(signal (car err) (cdr err)))))
|
(warn "[EXWM] EXWM fails to start (%s: %s)" (car err) (cdr err)))))
|
||||||
|
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
|
|
Loading…
Reference in a new issue