From: Titus von der Malsburg <malsburg@posteo.de>
To: emacs-devel@gnu.org
Cc: Eli Zaretskii <eliz@gnu.org>
Subject: Re: [PATCH] Implement functions for measuring fonts and max chars per line
Date: Sat, 17 Jan 2015 10:13:27 -0800 [thread overview]
Message-ID: <874mrp46ns.fsf@posteo.de> (raw)
In-Reply-To: <87zjaeo7eg.fsf@posteo.de>
[-- Attachment #1: Type: text/plain, Size: 5849 bytes --]
I signed and submitted the copyright forms a while ago. As far as I'm
concerned this patch is ready to be merged. Below is an updated
version.
Best,
Titus
diff --git a/etc/NEWS b/etc/NEWS
index be283bb..603bbc8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -165,6 +165,24 @@ possible inaccuracies in the end position.
In particular, it now returns the average width of the font's
characters, which can be used for geometry-related calculations.
+** A new function `default-font-width' returns the average width of a
+character in the current buffer's default font. If the default face
+is remapped (see `face-remapping-alist'), the value for the remapped
+face is returned. This function complements the existing function
+`default-font-height'.
+
+** New functions `window-font-height' and `window-font-width return
+the height and average width of characters in a specified face and
+window. If FACE is remapped (see `face-remapping-alist'), the
+function returns the information for the remapped face.
+
+** A new function `window-max-chars-per-line' returns the maximal
+number of characters that can be displayed on one line. If a face
+and/or window are provided, these values are used for the
+calculation. This function is different from `window-body-width' in
+that it accounts for (i) continuation glyphs, (ii) the size of the
+font, and (iii) the specified window.
+
\f
* Editing Changes in Emacs 25.1
diff --git a/lisp/simple.el b/lisp/simple.el
index 25293ed..3369606 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5377,7 +5377,10 @@ lines."
(declare-function font-info "font.c" (name &optional frame))
(defun default-font-height ()
- "Return the height in pixels of the current buffer's default face font."
+ "Return the height in pixels of the current buffer's default face font.
+
+If the default font is remapped (see `face-remapping-alist'), the
+function returns the height of the remapped face."
(let ((default-font (face-font 'default)))
(cond
((and (display-multi-font-p)
@@ -5388,6 +5391,25 @@ lines."
(aref (font-info default-font) 3))
(t (frame-char-height)))))
+(defun default-font-width ()
+ "Return the width in pixels of the current buffer's default face font.
+
+If the default font is remapped (see `face-remapping-alist'), the
+function returns the width of the remapped face."
+ (let ((default-font (face-font 'default)))
+ (cond
+ ((and (display-multi-font-p)
+ ;; Avoid calling font-info if the frame's default font was
+ ;; not changed since the frame was created. That's because
+ ;; font-info is expensive for some fonts, see bug #14838.
+ (not (string= (frame-parameter nil 'font) default-font)))
+ (let* ((info (font-info (face-font 'default)))
+ (width (aref info 11)))
+ (if (> width 0)
+ width
+ (aref info 10))))
+ (t (frame-char-width)))))
+
(defun default-line-height ()
"Return the pixel height of current buffer's default-face text line.
diff --git a/lisp/window.el b/lisp/window.el
index abc6006..1606f6c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1835,6 +1835,61 @@ optional argument PIXELWISE is passed to the functions."
(window-body-width window pixelwise)
(window-body-height window pixelwise)))
+(defun window-font-width (&optional window face)
+ "Return average character width for the font of FACE used in WINDOW.
+WINDOW must be a live window and defaults to the selected one.
+
+If FACE is nil or omitted, the default face is used. If FACE is
+remapped (see `face-remapping-alist'), the function returns the
+information for the remapped face."
+ (with-selected-window (window-normalize-window window t)
+ (if (display-multi-font-p)
+ (let* ((face (if face face 'default))
+ (info (font-info (face-font face)))
+ (width (aref info 11)))
+ (if (> width 0)
+ width
+ (aref info 10)))
+ (frame-char-width))))
+
+(defun window-font-height (&optional window face)
+ "Return character height for the font of FACE used in WINDOW.
+WINDOW must be a live window and defaults to the selected one.
+
+If FACE is nil or omitted, the default face is used. If FACE is
+remapped (see `face-remapping-alist'), the function returns the
+information for the remapped face."
+ (with-selected-window (window-normalize-window window t)
+ (if (display-multi-font-p)
+ (let* ((face (if face face 'default))
+ (info (font-info (face-font face))))
+ (aref info 3))
+ (frame-char-height))))
+
+(defun window-max-chars-per-line (&optional window face)
+ "Return the number of characters that can be displayed on one line in WINDOW.
+WINDOW must be a live window and defaults to the selected one.
+
+The character width of FACE is used for the calculation. If FACE
+is nil or omitted, the default face is used. If FACE is
+remapped (see `face-remapping-alist'), the function uses the
+remapped face.
+
+This function is different from `window-body-width' in two
+ways. First, it accounts for the portions of the line reserved
+for the continuation glyph. Second, it accounts for the size of
+the font."
+ (with-selected-window (window-normalize-window window t)
+ (let* ((window-width (window-body-width window t))
+ (font-width (window-font-width window face))
+ (ncols (/ window-width font-width)))
+ (if (and (display-graphic-p)
+ overflow-newline-into-fringe
+ (/= (frame-parameter nil 'left-fringe) 0)
+ (/= (frame-parameter nil 'right-fringe) 0))
+ ncols
+ (1- ncols)))))
+
(defun window-current-scroll-bars (&optional window)
"Return the current scroll bar types for WINDOW.
WINDOW must be a live window and defaults to the selected one.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]
next prev parent reply other threads:[~2015-01-17 18:13 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-22 14:39 [PATCH] Implement functions for measuring fonts and max chars per line Titus von der Malsburg
2014-12-22 22:25 ` Titus von der Malsburg
2014-12-23 12:52 ` Titus von der Malsburg
2015-01-17 18:13 ` Titus von der Malsburg [this message]
2015-01-17 18:43 ` Eli Zaretskii
2015-01-17 20:38 ` Perry E. Metzger
2015-01-17 20:41 ` Eli Zaretskii
2015-01-17 22:21 ` Perry E. Metzger
2015-01-17 22:24 ` David Kastrup
2015-01-18 0:08 ` Perry E. Metzger
2015-01-18 0:11 ` Perry E. Metzger
2015-01-18 1:01 ` Michael Heerdegen
2015-01-18 3:42 ` Eli Zaretskii
2015-01-18 4:08 ` Perry E. Metzger
2015-01-18 15:37 ` Eli Zaretskii
2015-01-18 22:26 ` Perry E. Metzger
2015-01-19 0:38 ` Drew Adams
2015-01-19 2:56 ` Perry E. Metzger
2015-01-19 3:41 ` Eli Zaretskii
2015-01-19 13:31 ` Perry E. Metzger
2015-01-19 16:21 ` Eli Zaretskii
2015-01-19 21:49 ` Perry E. Metzger
2015-01-19 2:01 ` Michael Heerdegen
2015-01-19 3:37 ` Eli Zaretskii
2015-03-21 10:33 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874mrp46ns.fsf@posteo.de \
--to=malsburg@posteo.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).