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-xim.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-xim.el')
| -rw-r--r-- | third_party/exwm/exwm-xim.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/third_party/exwm/exwm-xim.el b/third_party/exwm/exwm-xim.el index 9589648d22ca..aea0eb53fbda 100644 --- a/third_party/exwm/exwm-xim.el +++ b/third_party/exwm/exwm-xim.el @@ -1,6 +1,6 @@ ;;; exwm-xim.el --- XIM Module for EXWM -*- lexical-binding: t -*- -;; Copyright (C) 2019-2021 Free Software Foundation, Inc. +;; Copyright (C) 2019-2023 Free Software Foundation, Inc. ;; Author: Chris Feng <chris.w.feng@gmail.com> @@ -68,7 +68,7 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) +(require 'cl-lib) (require 'xcb-keysyms) (require 'xcb-xim) @@ -167,6 +167,7 @@ C,no" (defun exwm-xim--on-SelectionRequest (data _synthetic) "Handle SelectionRequest events on IMS window. +DATA contains unmarshalled SelectionRequest event data. Such events would be received when clients query for LOCALES or TRANSPORT." (exwm--log) @@ -754,10 +755,12 @@ Such event would be received when the client window is destroyed." ;; Close IMS communication connections. (mapc (lambda (i) (when (vectorp i) - (xcb:disconnect (elt i 0)))) + (when (slot-value (elt i 0) 'connected) + (xcb:disconnect (elt i 0))))) exwm-xim--server-client-plist) ;; Close the IMS connection. - (unless exwm-xim--conn + (unless (and exwm-xim--conn + (slot-value exwm-xim--conn 'connected)) (cl-return-from exwm-xim--exit)) ;; Remove exwm-xim from XIM_SERVERS. (let ((reply (xcb:+request-unchecked+reply exwm-xim--conn |