diff options
| author | Chris Feng <chris.w.feng@gmail.com> | 2015-07-19T01·15+0800 |
|---|---|---|
| committer | Chris Feng <chris.w.feng@gmail.com> | 2015-07-19T01·15+0800 |
| commit | 36e8361b9bd581e89d593b32002404bbf4811b62 (patch) | |
| tree | 25776b19f47a9e607e30706101d839b9eaacf707 | |
| parent | 968d0b48825e9d4b7f0c918f33337f34c1db7487 (diff) | |
Various fixes
Remove wrong shift modifiers. Hide a Window when it's moved to another workspace.
| -rw-r--r-- | exwm-input.el | 2 | ||||
| -rw-r--r-- | exwm-workspace.el | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/exwm-input.el b/exwm-input.el index 1f8e4f4de680..e185b1af1486 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -380,7 +380,7 @@ It's updated in several occasions, and only used by `exwm-input--set-focus'.") ;; (exwm-input--fake-key last-input-event))) (defvar exwm-input-prefix-keys - '(?\C-x ?\C-u ?\C-h ?\M-x ?\M-` ?\M-\S-! ?\M-\S-& ?\M-\S-:) + '(?\C-x ?\C-u ?\C-h ?\M-x ?\M-` ?\M-! ?\M-& ?\M-:) "List of prefix keys EXWM should forward to Emacs when in line-mode.") (defvar exwm-input--simulation-keys nil "Simulation keys in line-mode.") diff --git a/exwm-workspace.el b/exwm-workspace.el index 94d0e75eaf95..bab2612f4f4c 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -162,21 +162,13 @@ The optional FORCE option is for internal use only " :parent (frame-parameter frame 'exwm-window-id) :x 0 :y 0)) ;; Move the window itself - (set-window-buffer (get-buffer-window (exwm--id->buffer id)) - (other-buffer)) - (xcb:+request exwm--connection - (make-instance 'xcb:ChangeWindowAttributes - :window id :value-mask xcb:CW:EventMask - :event-mask xcb:EventMask:NoEvent)) + (bury-buffer) + (exwm-layout--hide id) (xcb:+request exwm--connection (make-instance 'xcb:ReparentWindow :window id :parent (frame-parameter frame 'exwm-window-id) - :x 0 :y 0)) - (xcb:+request exwm--connection - (make-instance 'xcb:ChangeWindowAttributes - :window id :value-mask xcb:CW:EventMask - :event-mask exwm--client-event-mask))))) + :x 0 :y 0))))) (xcb:flush exwm--connection) (exwm-workspace--update-switch-history))) |