diff options
| author | Vincent Ambo <mail@tazj.in> | 2023-10-09T07·12+0300 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2023-10-09T07·12+0300 |
| commit | 5f53841a343f0f2b5a66f9d58739b19a2e81dcb9 (patch) | |
| tree | 16ce612b7d3b0311265d9ad8a4bc264b8773c945 /third_party/exwm/exwm-floating.el | |
| parent | a63f99135142e103afe51ee0e9b211f7a065633d (diff) | |
| parent | 56db521a3ed6a2ccc1193110a56545a1992e9654 (diff) | |
subtree(3p/exwm): bump exwm to upstream commit '56db521a' r/6746
This bumps us past EXWM 0.28, which has several major fixes. Change-Id: Ie89997cc5d60f4e5aaedfe60368571420b7e4b9d
Diffstat (limited to 'third_party/exwm/exwm-floating.el')
| -rw-r--r-- | third_party/exwm/exwm-floating.el | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/third_party/exwm/exwm-floating.el b/third_party/exwm/exwm-floating.el index 69e86a24e81b..def7f43e535a 100644 --- a/third_party/exwm/exwm-floating.el +++ b/third_party/exwm/exwm-floating.el @@ -1,6 +1,6 @@ ;;; exwm-floating.el --- Floating Module for EXWM -*- lexical-binding: t -*- -;; Copyright (C) 2015-2021 Free Software Foundation, Inc. +;; Copyright (C) 2015-2023 Free Software Foundation, Inc. ;; Author: Chris Feng <chris.w.feng@gmail.com> @@ -118,13 +118,13 @@ context of the corresponding buffer." (defvar exwm-workspace--current) (defvar exwm-workspace--frame-y-offset) (defvar exwm-workspace--window-y-offset) -(defvar exwm-workspace--workareas) (declare-function exwm-layout--hide "exwm-layout.el" (id)) (declare-function exwm-layout--iconic-state-p "exwm-layout.el" (&optional id)) (declare-function exwm-layout--refresh "exwm-layout.el" ()) (declare-function exwm-layout--show "exwm-layout.el" (id &optional window)) (declare-function exwm-workspace--position "exwm-workspace.el" (frame)) (declare-function exwm-workspace--update-offsets "exwm-workspace.el" ()) +(declare-function exwm-workspace--workarea "exwm-workspace.el" (frame)) (defun exwm-floating--set-allowed-actions (id tilling) "Set _NET_WM_ALLOWED_ACTIONS." @@ -186,12 +186,8 @@ context of the corresponding buffer." (set-frame-parameter frame 'exwm-container frame-container) ;; Fix illegal parameters ;; FIXME: check normal hints restrictions - (let* ((workarea (elt exwm-workspace--workareas - (exwm-workspace--position original-frame))) - (x* (aref workarea 0)) - (y* (aref workarea 1)) - (width* (aref workarea 2)) - (height* (aref workarea 3))) + (with-slots ((x* x) (y* y) (width* width) (height* height)) + (exwm-workspace--workarea original-frame) ;; Center floating windows (when (and (or (= x 0) (= x x*)) (or (= y 0) (= y y*))) |