emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf(vc-gutter): optimize bitmaps

Browse source 
The NS build of Emacs (on MacOS) seems to struggle rendering our old
fringe bitmaps for diff-hl, leading to noticably slow-downs when
scrolling in buffers with diff-hl enabled. By pre-computing the pixel
height and width of the bitmap, rather than relying on passing `repeat`
to define-fringe-bitmap's ALIGN argument, this seems to spare it a chunk
of wasted cycles.

Ref: https://www.reddit.com/r/emacs/comments/1do1wgj/fringes_incredibly_slow_on_emacs_ns_with_macos/
Fix: #7923
This commit is contained in:
Henrik Lissner 2024-07-10 03:18:46 -04:00
parent df5f6696ec
commit 78304f4d79
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/ui/vc-gutter/config.el
View file

@ -3,22 +3,35 @@
;; ;;
;;; Default styles ;;; Default styles
;; STYLE: Redefine fringe bitmaps to be sleeker by making them solid bars (with
;; no border) that only take up half the horizontal space in the fringe. This
;; approach lets us avoid robbing fringe space from other packages/modes that
;; may need benefit from it (like magit, flycheck, or flyspell).
(when (modulep! +pretty) (when (modulep! +pretty)
;; UI: make the fringe small enough that the diff bars aren't too domineering,
;; while leaving enough room for other indicators.
(if (fboundp 'fringe-mode) (fringe-mode '8)) (if (fboundp 'fringe-mode) (fringe-mode '8))
;; UI: the gutter looks less cramped with some space between it and buffer.
(setq-default fringes-outside-margins t) (setq-default fringes-outside-margins t)
;; STYLE: Redefine fringe bitmaps to take up only half the horizontal space in (defadvice! +vc-gutter-define-thin-bitmaps-a (&rest _)
;; the fringe. This way we avoid overbearingly large diff bars without :after #'diff-hl-define-bitmaps
;; having to shrink the fringe and sacrifice precious space for other fringe (let* ((scale (if (and (boundp 'text-scale-mode-amount)
;; indicators (like flycheck or flyspell). (numberp text-scale-mode-amount))
;; REVIEW: Extract these into a package with faces that themes can target. (expt text-scale-mode-step text-scale-mode-amount)
(defadvice! +vc-gutter-define-thin-bitmaps-a (&rest args) 1))
:override #'diff-hl-define-bitmaps (spacing (or (and (display-graphic-p) (default-value 'line-spacing)) 0))
(define-fringe-bitmap 'diff-hl-bmp-middle [224] nil nil '(center repeated)) (h (+ (ceiling (* (frame-char-height) scale))
(define-fringe-bitmap 'diff-hl-bmp-delete [240 224 192 128] nil nil 'top)) (if (floatp spacing)
(truncate (* (frame-char-height) spacing))
spacing)))
(w (min (frame-parameter nil (intern (format "%s-fringe" diff-hl-side)))
16))
(_ (if (zerop w) (setq w 16))))
(define-fringe-bitmap 'diff-hl-bmp-middle
(make-vector
h (string-to-number (let ((half-w (1- (/ w 2))))
(concat (make-string half-w ?1)
(make-string (- w half-w) ?0)))
2))
nil nil 'center)))
(defun +vc-gutter-type-face-fn (type _pos) (defun +vc-gutter-type-face-fn (type _pos)
(intern (format "diff-hl-%s" type))) (intern (format "diff-hl-%s" type)))
(defun +vc-gutter-type-at-pos-fn (type _pos) (defun +vc-gutter-type-at-pos-fn (type _pos)