[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/corfu 4b32521 12/29: Go back to e0198b4335add183e0673c2
From: |
Stefan Monnier |
Subject: |
[elpa] externals/corfu 4b32521 12/29: Go back to e0198b4335add183e0673c2b224e3d6c3ac09cab for now |
Date: |
Fri, 16 Apr 2021 18:44:15 -0400 (EDT) |
branch: externals/corfu
commit 4b32521b11571a5168c693db05dbe3fef6f07edb
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Go back to e0198b4335add183e0673c2b224e3d6c3ac09cab for now
---
corfu.el | 53 +++++++++++------------------------------------------
1 file changed, 11 insertions(+), 42 deletions(-)
diff --git a/corfu.el b/corfu.el
index ee4f699..c489bb3 100644
--- a/corfu.el
+++ b/corfu.el
@@ -74,19 +74,19 @@
(defface corfu-bar
'((((class color) (min-colors 88) (background dark))
- :background "#444")
+ :foreground "#888")
(((class color) (min-colors 88) (background light))
- :background "#bbb")
+ :foreground "#666")
(t :background "black"))
"Face used for the scrollbar.")
(defface corfu-border
'((((class color) (min-colors 88) (background dark))
- :background "#444")
+ :foreground "#444")
(((class color) (min-colors 88) (background light))
- :background "#bbb")
+ :foreground "#bbb")
(t :background "gray"))
- "Face used for the border line.")
+ "Face used for the background of the scrollbar.")
(defvar corfu-map
(let ((map (make-sparse-keymap)))
@@ -129,43 +129,13 @@
(defvar-local corfu--popup-ovs nil
"Overlay showing the candidates.")
-(defvar-local corfu--borders nil
- "Cached border images.")
-
-(defun corfu--color (face)
- "Return hex color from FACE."
- (apply #'format "#%02x%02x%02x"
- (mapcar (lambda (x) (/ x 256))
- (color-values (face-attribute face :background)))))
-
-(defun corfu--border (color width)
- "Generate border with COLOR and WIDTH."
- (or (cdr (assoc (cons color width) corfu--borders))
- (pcase-let* ((`(,w . ,h) (window-text-pixel-size nil (point-min) (1+
(point-min))))
- (data (format
- "/* XPM */\nstatic char *x[] = {\n\"%s %s 2
1\",\n\"# c %s\",\n\". c None\""
- w h (corfu--color color))))
- (dotimes (_ h)
- (setq data (concat data ",\n\""
- (funcall (if (< width 0) #'reverse #'identity)
- (concat (make-string (abs width) ?#)
- (make-string (- w (abs width))
?.)))
- "\"")))
- (setq data (propertize " " 'display
- `(image :data ,(concat data "};") :type xpm
:scale 1 :ascent center)))
- (push (cons (cons color width) data) corfu--borders)
- data)))
-
(defun corfu--popup (pos idx lo bar lines)
"Show LINES as popup at POS, with IDX highlighted and scrollbar between LO
and LO+BAR."
- (let* ((lborder (corfu--border 'corfu-border 1))
- (rborder (corfu--border 'corfu-border -1))
- (rbar (corfu--border 'corfu-bar -5))
- (col (+ (- pos (line-beginning-position)) corfu--base))
+ (let* ((col (+ (- pos (line-beginning-position)) corfu--base))
+ (row 0)
(width (- (window-total-width) col 10))
(pixelpos (cdr (window-absolute-pixel-position pos)))
(lh (window-default-line-height))
- (row 0)
(count (length lines))
(tail))
(if (< width 10)
@@ -192,13 +162,13 @@
(ov
(if prefix
(make-overlay end end)
- (make-overlay (min (+ beg col) end) (min (+ beg col width 2)
end))))
+ (make-overlay (min (+ beg col) end) (min (+ beg col width
(if lo 2 1)) end))))
(str (concat
- (propertize lborder 'face (if (= row idx) 'corfu-current
'corfu-background))
+ " "
line
(make-string (- width (string-width line)) 32)
- (propertize (if (and lo (<= lo row (+ lo bar))) rbar
rborder)
- 'face (if (= row idx) 'corfu-current
'corfu-background)))))
+ (and lo (propertize "▐" 'face
+ (if (<= lo row (+ lo bar)) 'corfu-bar
'corfu-border))))))
(add-face-text-property 0 (length str) (if (= row idx)
'corfu-current 'corfu-background) 'append str)
(overlay-put ov 'priority (- 1000 row))
(overlay-put ov 'window (selected-window))
@@ -462,7 +432,6 @@
corfu--total
corfu--popup-ovs
corfu--current-ov
- corfu--borders
completion-show-inline-help
completion-auto-help)))
- [elpa] branch externals/corfu created (now a61992d), Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 55d651e 03/29: Improve keybindings for active Corfu popup, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu bff11ca 04/29: Improve readme, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 15b0eee 05/29: Improve face definitions, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 3f930bc 06/29: Popup improvements/truncation, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu bb55c62 01/29: initial commit, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 7d3c6c4 07/29: README: Update features section, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu a2de3f2 11/29: Adjust faces, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 5571d2b 13/29: Revert "Go back to e0198b4335add183e0673c2b224e3d6c3ac09cab for now", Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 4b32521 12/29: Go back to e0198b4335add183e0673c2b224e3d6c3ac09cab for now,
Stefan Monnier <=
- [elpa] externals/corfu f721f1b 14/29: Properly compute character size, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 247c79b 16/29: update screenshot, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 428ef03 08/29: post-command-hook: Make the check more strict, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu e0198b4 09/29: Simplify post-command behavior, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu a497acc 10/29: Experimental border images, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 17201cd 15/29: Generate image in PBM format, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu f98d239 02/29: Add support for cycling, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu ce983a0 17/29: README: Expand configuration, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 2f9e154 18/29: Use completion--replace, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 219afe2 21/29: Deactivate fancy border if line spacing is used (Fix #1), Stefan Monnier, 2021/04/16