From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: move_it_vertically_backward question Date: Thu, 23 Dec 2021 09:30:34 +0800 Message-ID: <87h7b0m7k5.fsf@yahoo.com> References: <87lf0pw78r.fsf.ref@yahoo.com> <83tuf9gdg5.fsf@gnu.org> <87pmpwkikp.fsf@yahoo.com> <83mtl0hnm5.fsf@gnu.org> <87czlwkfpk.fsf@yahoo.com> <8735mskal2.fsf@yahoo.com> <83ee6che8h.fsf@gnu.org> <87y24kisgf.fsf@yahoo.com> <838rwkhcqb.fsf@gnu.org> <87r1achulq.fsf@yahoo.com> <83pmpub41v.fsf@gnu.org> <87pmptbeii.fsf@yahoo.com> <8335mp9evn.fsf@gnu.org> <877dc19cpc.fsf@yahoo.com> <83zgox7xmf.fsf@gnu.org> <87ilvk99j0.fsf@yahoo.com> <83lf0g79je.fsf@gnu.org> <87mtkw5bn4.fsf@yahoo.com> <871r26w1v4.fsf@yahoo.com> <83czlpzy2n.fsf@gnu.org> <87wnjxv4ye.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2908"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Dec 23 02:33:32 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n0Cz6-0000Xx-Hx for ged-emacs-devel@m.gmane-mx.org; Thu, 23 Dec 2021 02:33:32 +0100 Original-Received: from localhost ([::1]:60124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Cz4-0007Iy-Jb for ged-emacs-devel@m.gmane-mx.org; Wed, 22 Dec 2021 20:33:30 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:33282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0Cwt-0006Zq-4T for emacs-devel@gnu.org; Wed, 22 Dec 2021 20:31:16 -0500 Original-Received: from sonic303-22.consmr.mail.ne1.yahoo.com ([66.163.188.148]:42138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0Cwn-0001MN-Jq for emacs-devel@gnu.org; Wed, 22 Dec 2021 20:31:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1640223047; bh=xqwyxeZwIGLCesmoYkBjELTk7ezl/KVLbeOIWlJN7Sw=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=PpQBmfJRsMYels09P6tLoYh4w4ylksud0kTHjAbaHeJYJE6Vd2r6ikMXN0VpPtDPwpi5QyLIp6gLNhnQI4bSCliq4hQSO6DCDzCseYWm+7RPeCPQtkbGkmCVrwtrc395e2a5ABEBm7GryXkQ+XX/utzUA0GPNUgaVaja/4EsZyGmZtVYz1bX0fmRFSFZ4sLXHuxQgHNtzdD1MdojOMpQtbX0inACTI4VReiuU3s7kOmolJh6H2bo0lW71eqxuOGmlD67kx/vpHlkMNQ/UDDUUBVARCmi8oGl/msQG5Zx/SCEz9xvXcUKFliF8Wez097Mp26cFLpZok9ueYDjszanaQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1640223047; bh=7e+54qKUbkFummSZMjT17UKEPDvQ4wmWklHh8bB3lxn=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=LSZHIpWlhrKQ+6LgkOwKLqwukBrb9TQ+8yMUgGCPuDd/capYeLMk9WCQ1Hh8OFqa/TRR7d7fFLiU2G8n57siLmBRbp1fGojDdlBTjKhDj779irhFVs24x6n5TrrH4Z9VhxufJh/+ZCvOn6Dr9wy2U6/HHj0Aq3+lAeLRHrazTV9VMO+Uh3bbwUPm2ESL94kQrbJvK/zN5xS40TYnyRwUdG4OCjcoUkZAcHlhTpbO2pP0c4p2wCjo2a+BDGOTOhGuRZUWd3uG6V6iR7MO3A7s7JkDqeKeL+yfaHUZeGUHSxWcPW5gdqOpaQToDgh2oZ0qExz86tDMPBzoQOFizBgxUA== X-YMail-OSG: XRiPpKsVM1ldwxreK9oOgkkGJu17FZWB3r15uBy6_pmA06Dw1fQi6hgDKkPMtHY 8jmQYmZXVjCeVG__GasdhI4XFupnSXBtmdW465lyiDCQE8hV3I4Yz7THokEE1rZYNWYg7QY08xtT KEQgAuACKWWVHCI.AwRlmU0ZFP8JN8RrCloVaO6sTbmQ.8yaKAdcvOP6Pw0GVl1k9_PekdHpRewn 2CspiBr7oSP0_vtsWB8pTvGxLgU9tnYpEZnPww6R1dUf.Hvp2UBicXDy1yVvjse9Ib0qIxAyVm3D IJo7hBNDOzi4zKnlVhzR5ZsPDE3btGRmwClQf25UW3uI5npPU.sUV4p7iFZQsvs69EnjJ_NpoqfV vjDYN3cVnsdq8PHUzX54oWhE57Sgg452op2SzXKgj3SFqpA6oEYBBU_yIj92S9O3urL9Z7SF9PAr 6NI.lTsoRWWZWLCvvzdcu.NUK.ttAqJ.UzdCm9enyvBXmAx_CBk1k8ryqUnT6O1N6lLnF8OPQBWF zaGn9vM1LHrE5Vna97PvUm_675.2_LGANJF_PKRlQh4vc_q.J5JnNzzs5tctL2MPLmjeATszf1FE oY2QIA6l0_.VJbLJCgSDUp712kHiAS4sZLNjO5RfSv0ZwFVmy9QwKUNtDa0FSmadx.jSxWKbaBMm SUCQMWLCy5k6yDsJiB9u7NAvS5.FLTglr3HoUGrDJ.hWz2ROMYa5nysVkdq05hOCBabvyhha_snB wikuwbgaSa3DYVSV2hEvmrlydvfZPCgKkTgEunlxDb0NVUe9MeAjHHMqUeUR1Cf5lfMA59Y3vEzC rWyFViagomsSvj6yx2AQfKDIWd6FFcawCwARzSk9YK X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ne1.yahoo.com with HTTP; Thu, 23 Dec 2021 01:30:47 +0000 Original-Received: by kubenode519.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 827ba55663f3fca5d3903adec58914fa; Thu, 23 Dec 2021 01:30:39 +0000 (UTC) In-Reply-To: <87wnjxv4ye.fsf@yahoo.com> (Po Lu's message of "Wed, 22 Dec 2021 08:49:45 +0800") X-Mailer: WebService/1.1.19498 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.188.148; envelope-from=luangruo@yahoo.com; helo=sonic303-22.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:282857 Archived-At: --=-=-= Content-Type: text/plain Po Lu writes: > Also, here's a patch with some of the changes made. I tried with the > documentation as well, but I'm pretty bad with that stuff. I tried updating the documentation again to better fit what's actually done (including documenting that measurements always begin at the beginning of the visual line). Please take a look and see if it's OK to install this now, thanks. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Allow-window-text-pixel-size-to-measure-pixels-aroun.patch >From 2e01b17fb6ccc3bf8b6552bfb5b59811d4b04422 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Thu, 23 Dec 2021 09:12:02 +0800 Subject: [PATCH] Allow window-text-pixel-size to measure pixels around a position * doc/lispref/display.texi (Size of Displayed Text): Announce new meaning of `from'. * etc/NEWS: Announce changes. * lisp/pixel-scroll.el (pixel-scroll-precision-scroll-up-page): Use new feature. * src/xdisp.c (window_text_pixel_size): Understand a special format of `from' that specifies the amount of pixels above a position. (Fwindow_text_pixel_size): Update doc string. --- doc/lispref/display.texi | 20 ++++++---- etc/NEWS | 3 ++ lisp/pixel-scroll.el | 34 ++++++++-------- src/xdisp.c | 85 +++++++++++++++++++++++++++++++--------- 4 files changed, 99 insertions(+), 43 deletions(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 98a15404f9..7e6ee59824 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2090,19 +2090,23 @@ Size of Displayed Text This function returns the size of the text of @var{window}'s buffer in pixels. @var{window} must be a live window and defaults to the selected one. The return value is a cons of the maximum pixel-width -of any text line and the maximum pixel-height of all text lines. This -function exists to allow Lisp programs to adjust the dimensions of -@var{window} to the buffer text it needs to display. +of any text line and the maximum pixel-height of all text lines, or if +@var{from} is a cons, a list of the pixel-width, pixel-height, and the +buffer position of the first line that was measured. This function +exists to allow Lisp programs to adjust the dimensions of @var{window} +to the buffer text it needs to display. The optional argument @var{from}, if non-@code{nil}, specifies the first text position to consider, and defaults to the minimum accessible position of the buffer. If @var{from} is @code{t}, it stands for the minimum accessible position that is not a newline -character. The optional argument @var{to}, if non-@code{nil}, -specifies the last text position to consider, and defaults to the -maximum accessible position of the buffer. If @var{to} is @code{t}, -it stands for the maximum accessible position that is not a newline -character. +character. If @var{from} is a cons, the cdr specifies a position, and +the car specifies the minimum amount of pixels above or below the +beginning of the visual line at that position to start measuring from. +The optional argument @var{to}, if non-@code{nil}, specifies the last +text position to consider, and defaults to the maximum accessible +position of the buffer. If @var{to} is @code{t}, it stands for the +maximum accessible position that is not a newline character. The optional argument @var{x-limit}, if non-@code{nil}, specifies the maximum X coordinate beyond which text should be ignored; it is diff --git a/etc/NEWS b/etc/NEWS index 86f18078f6..08e19a0eb2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1020,6 +1020,9 @@ This controls whether or not the last screen line of the text being measured will be counted for the purpose of calculating the text dimensions. ++++ +** 'window-text-pixel-size' can now measure from a set amount of pixels above a position. + ** XDG support *** New function 'xdg-state-home' returns 'XDG_STATE_HOME' environment variable. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index fa0185b16e..4aae166f2e 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -516,22 +516,24 @@ pixel-scroll-precision-scroll-up-page usable-height)))) (goto-char up-point))) (let ((current-vscroll (window-vscroll nil t))) - (if (<= delta current-vscroll) - (set-window-vscroll nil (- current-vscroll delta) t) - (setq delta (- delta current-vscroll)) - (set-window-vscroll nil 0 t) - (while (> delta 0) - (let ((position (pixel-point-and-height-at-unseen-line))) - (unless (cdr position) - (signal 'beginning-of-buffer nil)) - (set-window-start nil (car position) t) - ;; If the line above is taller than the window height (i.e. there's - ;; a very tall image), keep point on it. - (when (> (cdr position) usable-height) - (goto-char (car position))) - (setq delta (- delta (cdr position))))) - (when (< delta 0) - (set-window-vscroll nil (- delta) t)))))) + (setq delta (- delta current-vscroll)) + (set-window-vscroll nil 0 t) + (when (> delta 0) + (let* ((start (window-start)) + (dims (window-text-pixel-size nil (cons start (- delta)) + start nil nil nil t)) + (height (nth 1 dims)) + (position (nth 2 dims))) + (set-window-start nil position t) + ;; If the line above is taller than the window height (i.e. there's + ;; a very tall image), keep point on it. + (when (> height usable-height) + (goto-char position)) + (when (or (not position) (eq position start)) + (signal 'beginning-of-buffer nil)) + (setq delta (- delta height)))) + (when (< delta 0) + (set-window-vscroll nil (- delta) t))))) (defun pixel-scroll-precision-interpolate (delta) "Interpolate a scroll of DELTA pixels. diff --git a/src/xdisp.c b/src/xdisp.c index 1f896c256e..d20fdc4016 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10841,8 +10841,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, ptrdiff_t start, end, bpos; struct text_pos startp; void *itdata = NULL; - int c, max_x = 0, max_y = 0, x = 0, y = 0; - int doff = 0; + int c, max_x = 0, max_y = 0, x = 0, y = 0, vertical_offset = 0, doff = 0; if (NILP (from)) { @@ -10868,6 +10867,13 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, break; } } + else if (CONSP (from)) + { + start = clip_to_bounds (BEGV, fix_position (XCAR (from)), ZV); + bpos = CHAR_TO_BYTE (start); + CHECK_FIXNUM (XCDR (from)); + vertical_offset = XFIXNUM (XCDR (from)); + } else { start = clip_to_bounds (BEGV, fix_position (from), ZV); @@ -10914,7 +10920,9 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, itdata = bidi_shelve_cache (); start_display (&it, w, startp); + int start_y = it.current_y; + /* It makes no sense to measure dimensions of region of text that crosses the point where bidi reordering changes scan direction. By using unidirectional movement here we at least support the use @@ -10923,13 +10931,46 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, same directionality. */ it.bidi_p = false; - /* Start at the beginning of the line containing FROM. Otherwise - IT.current_x will be incorrectly set to zero at some arbitrary - non-zero X coordinate. */ - reseat_at_previous_visible_line_start (&it); - it.current_x = it.hpos = 0; - if (IT_CHARPOS (it) != start) - move_it_to (&it, start, -1, -1, -1, MOVE_TO_POS); + if (vertical_offset != 0) + { + int last_y; + it.current_y = 0; + + move_it_by_lines (&it, 0); + + if (vertical_offset < 0) + { + while (it.current_y > vertical_offset) + { + last_y = it.current_y; + move_it_vertically_backward (&it, + (abs (vertical_offset) + + it.current_y)); + + if (it.current_y == last_y) + break; + } + } + else + { + move_it_vertically (&it, vertical_offset); + } + + it.current_y = (WINDOW_TAB_LINE_HEIGHT (w) + + WINDOW_HEADER_LINE_HEIGHT (w)); + start = clip_to_bounds (BEGV, IT_CHARPOS (it), ZV); + start_y = it.current_y; + } + else + { + /* Start at the beginning of the line containing FROM. Otherwise + IT.current_x will be incorrectly set to zero at some arbitrary + non-zero X coordinate. */ + reseat_at_previous_visible_line_start (&it); + it.current_x = it.hpos = 0; + if (IT_CHARPOS (it) != start) + move_it_to (&it, start, -1, -1, -1, MOVE_TO_POS); + } /* Now move to TO. */ int start_x = it.current_x; @@ -11052,25 +11093,31 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, bidi_unshelve_cache (itdata, false); - return Fcons (make_fixnum (x - start_x), make_fixnum (y)); + return (!vertical_offset + ? Fcons (make_fixnum (x - start_x), make_fixnum (y)) + : list3i (x - start_x, y, start)); } DEFUN ("window-text-pixel-size", Fwindow_text_pixel_size, Swindow_text_pixel_size, 0, 7, 0, - doc: /* Return the size of the text of WINDOW's buffer in pixels. -WINDOW must be a live window and defaults to the selected one. The -return value is a cons of the maximum pixel-width of any text line -and the pixel-height of all the text lines in the accessible portion -of buffer text. + doc: /* Return the size of the text of WINDOW's buffer in +pixels. WINDOW must be a live window and defaults to the selected +one. The return value is a cons of the maximum pixel-width of any +text line and the pixel-height of all the text lines in the accessible +portion of buffer text or a list of the maximum pixel-width, +pixel-height, and the buffer position of the line at FROM. This function exists to allow Lisp programs to adjust the dimensions of WINDOW to the buffer text it needs to display. The optional argument FROM, if non-nil, specifies the first text position to consider, and defaults to the minimum accessible position -of the buffer. If FROM is t, it stands for the minimum accessible -position that starts a non-empty line. TO, if non-nil, specifies the -last text position and defaults to the maximum accessible position of -the buffer. If TO is t, it stands for the maximum accessible position +of the buffer. If FROM is a cons, the cdr specifies the amount of +pixels above or below a buffer position to begin measuring text, and +the car specifies the buffer position. In that case, a list is +returned. If FROM is t, it stands for the minimum accessible position +that starts a non-empty line. TO, if non-nil, specifies the last text +position and defaults to the maximum accessible position of the +buffer. If TO is t, it stands for the maximum accessible position that ends a non-empty line. The optional argument X-LIMIT, if non-nil, specifies the maximum X -- 2.33.1 --=-=-=--