[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 63255eb31c 1/5: 删除 exwm-xim tooltip and style, 用
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 63255eb31c 1/5: 删除 exwm-xim tooltip and style, 用 minibuffer 就可以了。 |
Date: |
Thu, 30 Dec 2021 17:57:57 -0500 (EST) |
branch: externals/pyim
commit 63255eb31c2389ac6ea15043801b02891dff1ef3
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
删除 exwm-xim tooltip and style, 用 minibuffer 就可以了。
* README.org (让选词框跟随光标): remove exwm-xim.
* pyim-page.el (pyim-page-tooltip, pyim-page-style)
(pyim-page-get-valid-tooltip): remove exwm-xim.
(pyim-page-style:exwm-xim): removed.
---
README.org | 2 +-
pyim-page.el | 32 +++++++-------------------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/README.org b/README.org
index 28010d5505..8855c45958 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-xim minibuffer))
+ (setq pyim-page-tooltip '(posframe popup minibuffer))
#+end_example
** 调整 tooltip 选词框的显示样式
diff --git a/pyim-page.el b/pyim-page.el
index 12b550344d..9cf87ec413 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-xim minibuffer)
+(defcustom pyim-page-tooltip '(posframe popup minibuffer)
"如何绘制 pyim 选词框.
1. 当这个变量取值为 posframe 时,使用 posframe 包来绘制选词框,
@@ -56,35 +56,29 @@
有时会遇到选词框错位的问题;
3. 当这个变量取值为 minibuffer 时,使用 minibuffer 做为选词框,
这个选项也作为其他选项不可用时的 fallback.
-4. 当这个变量取值为 exwm-xim 时,使用 minibuffer 作为选词框,这个
- 选项专门用于 exwm-xim 环境。
当这个变量的取值是为一个 list 时,pyim 将按照优先顺序动态选择一个
可用的 tooltip."
:type '(choice (repeat (choice (const posframe)
(const popup)
- (const exwm-xim)
- (const message)))
+ (const minibuffer)))
(const posframe)
(const popup)
- (const exwm-xim)
- (const message)))
+ (const minibuffer)))
(defcustom pyim-page-style 'two-lines
"这个变量用来控制选词框的格式.
-pyim 内建的有三种选词框格式:
+pyim 内建的有四种选词框格式:
1. one-line 单行选词框
2. two-lines 双行选词框
3. vertical 垂直选词框
-4. minibuffer 单行选词框 (minibuffer 中专用)
-5. exwm-xim 单行选词框 (exwm-xim 环境中专用)"
+4. minibuffer 单行选词框 (minibuffer 中专用)"
:type 'symbol)
(defcustom pyim-page-tooltip-style-alist
- '((minibuffer . minibuffer)
- (exwm-xim . exwm-xim))
+ '((minibuffer . minibuffer))
"pyim page tooltip 专用 page style 绑定设置表。
这个表是一个 alist, 每个元素的 car 代表 tooltip, cdr 代表对应的
@@ -478,18 +472,6 @@ page 的概念,比如,上面的 “nihao” 的 *待选词列表* 就可以
(gethash :current-page page-info)
(gethash :total-page page-info)))
-(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
- (gethash :candidates page-info)
- (gethash :position page-info)
- nil
- (gethash :hightlight-current page-info))
- (gethash :current-page page-info)
- (gethash :total-page page-info)))
-
(defun pyim-page-get-valid-tooltip ()
"获取一个可用的 tooltip."
(cond
@@ -498,7 +480,7 @@ page 的概念,比如,上面的 “nihao” 的 *待选词列表* 就可以
;; 境下,似乎有很严重的性能问题,原因未知。
((eq (selected-window) (minibuffer-window)) 'minibuffer)
;; 在 exwm-xim 环境下输入中文。
- ((pyim-exwm-xim-environment-p) 'exwm-xim)
+ ((pyim-exwm-xim-environment-p) 'minibuffer)
(t (or (cl-find-if (lambda (tp)
(or (and (eq tp 'posframe)
(functionp 'posframe-workable-p)
- [elpa] externals/pyim updated (4a5a8c8d4a -> 9e401e5bb8), ELPA Syncer, 2021/12/30
- [elpa] externals/pyim 63255eb31c 1/5: 删除 exwm-xim tooltip and style, 用 minibuffer 就可以了。,
ELPA Syncer <=
- [elpa] externals/pyim 9e401e5bb8 5/5: * pyim-page.el (pyim-page-tooltip): Improve comment., ELPA Syncer, 2021/12/30
- [elpa] externals/pyim f51ce641bc 4/5: * pyim-page.el: Add command about posframe and popup., ELPA Syncer, 2021/12/30
- [elpa] externals/pyim 251c30906b 3/5: * pyim-page.el (pyim-page-get-valid-tooltip): Improve comment., ELPA Syncer, 2021/12/30
- [elpa] externals/pyim a8c751d147 2/5: * pyim-page.el (pyim-page-style): improve :type, ELPA Syncer, 2021/12/30