mirror of
https://github.com/ch11ng/exwm.git
synced 2024-11-23 19:47:58 +01:00
; Follows up
This commit is contained in:
Chris Feng
parent
81e52263a7
commit
73b4d6f966
3 changed files with 69 additions and 69 deletions
|
|
@ -486,91 +486,91 @@ This is also used by X window containers.")
|
|||
(cond ((= type xcb:ewmh:_NET_WM_MOVERESIZE_MOVE)
|
||||
(setq cursor exwm-floating--cursor-move
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,(eval-when-compile
|
||||
(lambda (x y)
|
||||
(vector buffer-or-id
|
||||
(eval-when-compile
|
||||
(logior xcb:ConfigWindow:X
|
||||
xcb:ConfigWindow:Y))
|
||||
(- x ,win-x) (- y ,win-y) 0 0))))
|
||||
(- x win-x) (- y win-y) 0 0))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_TOPLEFT)
|
||||
(setq cursor exwm-floating--cursor-top-left
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,(eval-when-compile
|
||||
(lambda (x y)
|
||||
(vector buffer-or-id
|
||||
(eval-when-compile
|
||||
(logior xcb:ConfigWindow:X
|
||||
xcb:ConfigWindow:Y
|
||||
xcb:ConfigWindow:Width
|
||||
xcb:ConfigWindow:Height))
|
||||
(- x ,win-x) (- y ,win-y)
|
||||
(- ,(+ root-x width) x)
|
||||
(- ,(+ root-y height) y)))))
|
||||
(- x win-x) (- y win-y)
|
||||
(- (+ root-x width) x)
|
||||
(- (+ root-y height) y)))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_TOP)
|
||||
(setq cursor exwm-floating--cursor-top
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,(eval-when-compile
|
||||
(lambda (_x y)
|
||||
(vector buffer-or-id
|
||||
(eval-when-compile
|
||||
(logior xcb:ConfigWindow:Y
|
||||
xcb:ConfigWindow:Height))
|
||||
0 (- y ,win-y) 0 (- ,(+ root-y height) y)))))
|
||||
0 (- y win-y) 0 (- (+ root-y height) y)))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_TOPRIGHT)
|
||||
(setq cursor exwm-floating--cursor-top-right
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,(eval-when-compile
|
||||
(lambda (x y)
|
||||
(vector buffer-or-id
|
||||
(eval-when-compile
|
||||
(logior xcb:ConfigWindow:Y
|
||||
xcb:ConfigWindow:Width
|
||||
xcb:ConfigWindow:Height))
|
||||
0 (- y ,win-y) (- x ,(- root-x width))
|
||||
(- ,(+ root-y height) y)))))
|
||||
0 (- y win-y) (- x (- root-x width))
|
||||
(- (+ root-y height) y)))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_RIGHT)
|
||||
(setq cursor exwm-floating--cursor-right
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,xcb:ConfigWindow:Width
|
||||
0 0 (- x ,(- root-x width)) 0))))
|
||||
(lambda (x _y)
|
||||
(vector buffer-or-id
|
||||
xcb:ConfigWindow:Width
|
||||
0 0 (- x (- root-x width)) 0))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)
|
||||
(setq cursor exwm-floating--cursor-bottom-right
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,(eval-when-compile
|
||||
(lambda (x y)
|
||||
(vector buffer-or-id
|
||||
(eval-when-compile
|
||||
(logior xcb:ConfigWindow:Width
|
||||
xcb:ConfigWindow:Height))
|
||||
0 0 (- x ,(- root-x width))
|
||||
(- y ,(- root-y height))))))
|
||||
0 0 (- x (- root-x width))
|
||||
(- y (- root-y height))))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_BOTTOM)
|
||||
(setq cursor exwm-floating--cursor-bottom
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,xcb:ConfigWindow:Height
|
||||
0 0 0 (- y ,(- root-y height))))))
|
||||
(lambda (_x y)
|
||||
(vector buffer-or-id
|
||||
xcb:ConfigWindow:Height
|
||||
0 0 0 (- y (- root-y height))))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)
|
||||
(setq cursor exwm-floating--cursor-bottom-left
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,(eval-when-compile
|
||||
(lambda (x y)
|
||||
(vector buffer-or-id
|
||||
(eval-when-compile
|
||||
(logior xcb:ConfigWindow:X
|
||||
xcb:ConfigWindow:Width
|
||||
xcb:ConfigWindow:Height))
|
||||
(- x ,win-x)
|
||||
(- x win-x)
|
||||
0
|
||||
(- ,(+ root-x width) x)
|
||||
(- y ,(- root-y height))))))
|
||||
(- (+ root-x width) x)
|
||||
(- y (- root-y height))))))
|
||||
((= type xcb:ewmh:_NET_WM_MOVERESIZE_SIZE_LEFT)
|
||||
(setq cursor exwm-floating--cursor-left
|
||||
exwm-floating--moveresize-calculate
|
||||
`(lambda (x y)
|
||||
(vector ,buffer-or-id
|
||||
,(eval-when-compile
|
||||
(lambda (x _y)
|
||||
(vector buffer-or-id
|
||||
(eval-when-compile
|
||||
(logior xcb:ConfigWindow:X
|
||||
xcb:ConfigWindow:Width))
|
||||
(- x ,win-x) 0 (- ,(+ root-x width) x) 0)))))
|
||||
(- x win-x) 0 (- (+ root-x width) x) 0)))))
|
||||
;; Select events and change cursor (should always succeed)
|
||||
(xcb:+request-unchecked+reply exwm--connection
|
||||
(make-instance 'xcb:GrabPointer
|
||||
|
|
|
|||
|
|
@ -720,15 +720,15 @@ button event."
|
|||
(line-mode
|
||||
(setq mode "line"
|
||||
help-echo "mouse-1: Switch to char-mode"
|
||||
cmd `(lambda ()
|
||||
cmd (lambda ()
|
||||
(interactive)
|
||||
(exwm-input-release-keyboard ,id))))
|
||||
(exwm-input-release-keyboard id))))
|
||||
(char-mode
|
||||
(setq mode "char"
|
||||
help-echo "mouse-1: Switch to line-mode"
|
||||
cmd `(lambda ()
|
||||
cmd (lambda ()
|
||||
(interactive)
|
||||
(exwm-input-grab-keyboard ,id)))))
|
||||
(exwm-input-grab-keyboard id)))))
|
||||
(with-current-buffer (exwm--id->buffer id)
|
||||
(setq mode-line-process
|
||||
`(": "
|
||||
|
|
|
|||
|
|
@ -540,8 +540,8 @@ Would you like to kill it? "
|
|||
(signal-process pid 'SIGKILL)
|
||||
;; Ensure it's dead
|
||||
(run-with-timer exwm-manage-ping-timeout nil
|
||||
`(lambda ()
|
||||
(xcb:+request exwm--connection ,request))))
|
||||
(lambda ()
|
||||
(xcb:+request exwm--connection request))))
|
||||
(xcb:flush exwm--connection)))
|
||||
|
||||
(defun exwm-manage--add-frame (frame)
|
||||
|
|
|
|||
Loading…
Reference in a new issue