about summary refs log tree commit diff
path: root/exwm-core.el
diff options
context:
space:
mode:
authorChris Feng <chris.w.feng@gmail.com>2016-02-03T05·30+0800
committerChris Feng <chris.w.feng@gmail.com>2016-02-03T05·30+0800
commit2d42fee327f92b01444718cfc83ce5f00716fa33 (patch)
tree90074501f43a1c61b0f88508c5ecdcff50b09981 /exwm-core.el
parent0db666b4fbbf0ce4446e5e5205fa70822cd93fd6 (diff)
parentd8281abca4bc5182040a7866560a1806c59176d4 (diff)
Merge branch 'feat/virtual-root'
Diffstat (limited to 'exwm-core.el')
-rw-r--r--exwm-core.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/exwm-core.el b/exwm-core.el
index 744c4ac69e20..61633c9775d5 100644
--- a/exwm-core.el
+++ b/exwm-core.el
@@ -38,6 +38,9 @@
   (when exwm-debug-on
     `(message (concat "[EXWM] " ,format-string) ,@args)))
 
+(defmacro exwm--debug (&rest forms)
+  (when exwm-debug-on `(progn ,@forms)))
+
 (defvar exwm--connection nil "X connection.")
 (defvar exwm--root nil "Root window.")
 (defvar exwm--id-buffer-alist nil "Alist of (<X window ID> . <Emacs buffer>).")
@@ -77,12 +80,12 @@
 
 ;; Internal variables
 (defvar-local exwm--id nil)                        ;window ID
+(defvar-local exwm--container nil)                 ;container
 (defvar-local exwm--frame nil)                     ;workspace frame
 (defvar-local exwm--floating-frame nil)            ;floating frame
-(defvar-local exwm--floating-edges nil)            ;four edges
 (defvar-local exwm--floating-mode-line-format nil) ;save mode-line-format
 (defvar-local exwm--fullscreen nil)                ;used in fullscreen
-(defvar-local exwm--floating-frame-geometry nil)   ;in fullscreen
+(defvar-local exwm--floating-frame-position nil)   ;used in fullscreen
 (defvar-local exwm--fixed-size nil)                ;fixed size
 (defvar-local exwm--on-KeyPress         ;KeyPress event handler
   #'exwm-input--on-KeyPress-line-mode)