[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 8485545296 3/4: exwm -> exwm-xim
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 8485545296 3/4: exwm -> exwm-xim |
Date: |
Thu, 30 Dec 2021 04:57:50 -0500 (EST) |
branch: externals/pyim
commit 84855452967a983a14438f05b2af17b4edcf484e
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
exwm -> exwm-xim
* pyim-page.el (pyim-page-tooltip, pyim-page-style)
(pyim-page-info-format, pyim-page-style:exwm-xim)
(pyim-page-tooltip-get-valid-tooltip): exwm -> exwm-xim.
* pyim-process.el (pyim-force-input-chinese-functions): exwm ->
exwm-xim.
* pyim-probe.el (pyim-probe-exwm-xim-environment): Rename from
pyim-probe-exwm-environment.
---
README.org | 2 +-
pyim-page.el | 24 +++++++++++-------------
pyim-probe.el | 4 ++--
pyim-process.el | 2 +-
4 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/README.org b/README.org
index f5fce17633..28010d5505 100644
--- a/README.org
+++ b/README.org
@@ -199,7 +199,7 @@ pyim 支持双拼输入模式,用户可以通过变量 `pyim-default-scheme'
注意:pyim 不会自动安装 posframe, 用户需要手动安装这个包,
3. 按照优先顺序自动选择一个可用的 tooltip
#+begin_example
- (setq pyim-page-tooltip '(posframe popup exwm minibuffer))
+ (setq pyim-page-tooltip '(posframe popup exwm-xim minibuffer))
#+end_example
** 调整 tooltip 选词框的显示样式
diff --git a/pyim-page.el b/pyim-page.el
index 6d66702c46..f4e82d2700 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -46,7 +46,7 @@
细节信息请参考 `pyim-page-refresh' 的 docstring."
:type 'number)
-(defcustom pyim-page-tooltip '(posframe popup exwm minibuffer)
+(defcustom pyim-page-tooltip '(posframe popup exwm-xim minibuffer)
"如何绘制 pyim 选词框.
1. 当这个变量取值为 posframe 时,使用 posframe 包来绘制选词框,
@@ -56,18 +56,18 @@
有时会遇到选词框错位的问题;
3. 当这个变量取值为 minibuffer 时,使用 minibuffer 做为选词框,
这个选项也作为其他选项不可用时的 fallback.
-4. 当这个变量取值为 exwm 时,使用 minibuffer 作为选词框,这个选项
- 专门用于 exwm-xim 环境。
+4. 当这个变量取值为 exwm-xim 时,使用 minibuffer 作为选词框,这个
+ 选项专门用于 exwm-xim 环境。
当这个变量的取值是为一个 list 时,pyim 将按照优先顺序动态选择一个
可用的 tooltip."
:type '(choice (repeat (choice (const posframe)
(const popup)
- (const exwm)
+ (const exwm-xim)
(const message)))
(const posframe)
(const popup)
- (const exwm)
+ (const exwm-xim)
(const message)))
(defcustom pyim-page-style 'two-lines
@@ -79,7 +79,7 @@ pyim 内建的有三种选词框格式:
2. two-lines 双行选词框
3. vertical 垂直选词框
4. minibuffer 单行选词框(minibuffer 中专用)
-5. exwm 单行选词框(exwm-xim 环境中专用)"
+5. exwm-xim 单行选词框(exwm-xim 环境中专用)"
:type 'symbol)
(defcustom pyim-page-posframe-border-width 0
@@ -157,8 +157,6 @@ non-nil,说明,补全已经用完了.
whole
(pyim-page-end t)))))
-(declare-function pyim-probe-exwm-environment "pyim-probe")
-
(defun pyim-page-refresh (&optional hightlight-current)
"刷新 page 页面的函数.
@@ -387,7 +385,7 @@ page 的概念,比如,上面的 “nihao” 的 *待选词列表* 就可以
(defun pyim-page-info-format (page-info tooltip)
"将 PAGE-INFO 按照 `pyim-page-style' 格式化为选词框中显示的字符串。"
- (let* ((style (cond ((eq tooltip 'exwm) 'exwm)
+ (let* ((style (cond ((eq tooltip 'exwm-xim) 'exwm-xim)
((eq tooltip 'minibuffer) 'minibuffer)
(t pyim-page-style))))
(let ((func (intern (format "pyim-page-style:%S" style))))
@@ -470,8 +468,8 @@ page 的概念,比如,上面的 “nihao” 的 *待选词列表* 就可以
(gethash :current-page page-info)
(gethash :total-page page-info)))
-(defun pyim-page-style:exwm (page-info)
- "专门用于 exwm 环境的 page style."
+(defun pyim-page-style:exwm-xim (page-info)
+ "专门用于 exwm-xim 环境的 page style."
(format "[%s]: %s(%s/%s)"
(pyim-page-preview-create)
(pyim-page-menu-create
@@ -489,8 +487,8 @@ page 的概念,比如,上面的 “nihao” 的 *待选词列表* 就可以
;; minibuffer 中试用过 posframe, 在 linux 环境下,运行还不错,但在 windows 环
;; 境下,似乎有很严重的性能问题,原因未知。
((eq (selected-window) (minibuffer-window)) 'minibuffer)
- ;; 在 exwm 环境下使用 exwm-xim 输入中文。
- ((pyim-exwm-xim-environment-p) 'exwm)
+ ;; 在 exwm-xim 环境下输入中文。
+ ((pyim-exwm-xim-environment-p) 'exwm-xim)
(t (or (cl-find-if (lambda (tp)
(or (and (eq tp 'posframe)
(functionp 'posframe-workable-p)
diff --git a/pyim-probe.el b/pyim-probe.el
index 36b64cd9ad..3930d72ddc 100644
--- a/pyim-probe.el
+++ b/pyim-probe.el
@@ -188,8 +188,8 @@
(or (not (eq (org-inside-LaTeX-fragment-p) nil))
(not (eq (org-inside-latex-macro-p) nil)))))
-(defun pyim-probe-exwm-environment ()
- "测试当前是否是 exwm 输入法环境。
+(defun pyim-probe-exwm-xim-environment ()
+ "测试当前是否是 exwm-xim 输入法环境。
这个探针主要用于: `pyim-force-input-chinese-functions'"
(pyim-exwm-xim-environment-p))
diff --git a/pyim-process.el b/pyim-process.el
index 637513a42f..4239fb3217 100644
--- a/pyim-process.el
+++ b/pyim-process.el
@@ -55,7 +55,7 @@
:type 'symbol)
(defcustom pyim-force-input-chinese-functions
- (list 'pyim-probe-exwm-environment
+ (list 'pyim-probe-exwm-xim-environment
'pyim-probe-xwidget-webkit-environment)
"让 pyim 强制输入中文.