mirror of
https://github.com/emacs-exwm/exwm.git
synced 2024-11-23 21:17:59 +01:00
Merge branch 'tumashu.github.com/master' into externals/exwm
This commit is contained in:
commit
1863361674
1 changed files with 7 additions and 0 deletions
|
@ -161,6 +161,10 @@ C,no"
|
||||||
(defvar exwm-xim--_XIM_PROTOCOL nil)
|
(defvar exwm-xim--_XIM_PROTOCOL nil)
|
||||||
(defvar exwm-xim--_XIM_XCONNECT nil)
|
(defvar exwm-xim--_XIM_XCONNECT nil)
|
||||||
|
|
||||||
|
(defvar exwm-xim-buffer-p nil
|
||||||
|
"Whether current buffer is used by exwm-xim.")
|
||||||
|
(make-variable-buffer-local 'exwm-xim-buffer-p)
|
||||||
|
|
||||||
(defun exwm-xim--on-SelectionRequest (data _synthetic)
|
(defun exwm-xim--on-SelectionRequest (data _synthetic)
|
||||||
"Handle SelectionRequest events on IMS window.
|
"Handle SelectionRequest events on IMS window.
|
||||||
|
|
||||||
|
@ -585,6 +589,9 @@ The actual XIM request is in client message data or a property."
|
||||||
(exwm-input--grab-keyboard))
|
(exwm-input--grab-keyboard))
|
||||||
(unwind-protect
|
(unwind-protect
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
|
;; This variable is used to test whether exwm-xim is enabled.
|
||||||
|
;; Used by e.g. pyim-probe.
|
||||||
|
(setq-local exwm-xim-buffer-p t)
|
||||||
;; Always show key strokes.
|
;; Always show key strokes.
|
||||||
(let ((input-method-use-echo-area t)
|
(let ((input-method-use-echo-area t)
|
||||||
(exwm-input-line-mode-passthrough t))
|
(exwm-input-line-mode-passthrough t))
|
||||||
|
|
Loading…
Reference in a new issue