tec
/
screenshot.el
1
0
Fork 0
Code Issues 2 Pull Requests Releases Activity

Calculate lines including wrapping

This commit is contained in:
TEC 2022-10-18 02:43:40 +08:00
parent 36b7c50641
commit dac727e98e
Signed by: tec
SSH Key Fingerprint: SHA256:eobz41Mnm0/iYWBvWThftS0ElEs1ftBr6jamutnXc/A
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
screenshot.el
View File

@ -63,9 +63,6 @@ Run after hardcoded setup, but before the screenshot is captured."
(defvar screenshot--first-line-number nil
"The first line contained in the screenshot.")
(defvar screenshot--total-lines nil
"The total number of lines contained in the screenshot.")
;;; Screenshot parameters
(eval-when-compile
@ -249,8 +246,7 @@ and the line number of the first line of the region."
(setq end (line-end-position))))
(setq screenshot--region-beginning beg
screenshot--region-end end
screenshot--first-line-number (line-number-at-pos beg)
screenshot--total-lines (- (line-number-at-pos end) (line-number-at-pos beg) -1)))
screenshot--first-line-number (line-number-at-pos beg)))
(declare-function solaire-mode "ext:solaire-mode")
@ -310,12 +306,28 @@ This buffer then then set up to be used for a screenshot."
(with-current-buffer buffer
(save-excursion
(goto-char (point-min))
(dotimes (line (1+ (count-lines (point-min) (point-max))))
(dotimes (line-1 (count-lines (point-min) (point-max)))
(setq max-line (max max-line
(- (line-end-position line)
(line-beginning-position line)))))))
(- (line-end-position (1+ line-1))
(line-beginning-position (1+ line-1))))))))
max-line))
(defun screenshot--displayed-lines (&optional buffer)
"Count the number of (perhaps wrapped) lines displyed in BUFFER."
(with-current-buffer (or buffer (current-buffer))
(if screenshot-truncate-lines-p
(count-lines (point-min) (point-max))
(save-excursion
(goto-char (point-min))
(let ((displayed-lines 0))
(dotimes (line-1 (count-lines (point-min) (point-max)))
(setq displayed-lines
(+ displayed-lines
(max 1 (ceiling (- (line-end-position (1+ line-1))
(line-beginning-position (1+ line-1)))
screenshot-max-width)))))
displayed-lines)))))
;;; Screenshot processing
(defun screenshot--process ()
@ -330,15 +342,21 @@ and process it."
(let* (before-make-frame-hook
delete-frame-functions
(width (max screenshot-min-width
(min screenshot-max-width
(screenshot--max-line-length
screenshot--buffer))))
(height (screenshot--displayed-lines screenshot--buffer))
(frame (posframe-show
screenshot--buffer
:position (point-min)
:internal-border-width screenshot-border-width
:width (max screenshot-min-width
(min screenshot-max-width
(screenshot--max-line-length
screenshot--buffer)))
:min-height screenshot--total-lines
:min-width width
:width width
:max-width width
:min-height height
:height height
:max-height height
:lines-truncate screenshot-truncate-lines-p
:poshandler #'posframe-poshandler-point-bottom-left-corner
:hidehandler #'posframe-hide)))