using window-screen-lines in window-adjust-process-window-size

using window-screen-lines in window-adjust-process-window-size

[John Shahid]

Hi all,

I noticed with line-spacing turned on (i.e. larger than 0) that
`ansi-term' doesn't report the right number of text rows to the shell.
This causes scrolling to get messed up.  It is the result of using
`window-body-height' instead of `window-screen-lines' in
`window-adjust-process-window-size'.  Can anyone think of a reason for
not using `window-screen-lines' ?

Thanks,

JS

Re: using window-screen-lines in window-adjust-process-window-size

[John Shahid]

ping

John Shahid <jvshahid@gmail.com> writes:

> Hi all,
>
> I noticed with line-spacing turned on (i.e. larger than 0) that
> `ansi-term' doesn't report the right number of text rows to the shell.
> This causes scrolling to get messed up.  It is the result of using
> `window-body-height' instead of `window-screen-lines' in
> `window-adjust-process-window-size'.  Can anyone think of a reason for
> not using `window-screen-lines' ?
>
> Thanks,
>
> JS

Using window-screen-lines in window-adjust-process-window-size (was: Re: using window-screen-lines in window-adjust-process-window-size)

[John Shahid]

It has been a while and I haven't heard from anyone.  I am not sure if
that's because no one can answer my question or if my previous two
emails were lost in the ether.

I decided to ask a more direct question.  Does anyone object if I
changed window-adjust-process-window-size to use window-screen-lines
instead of window-body-height ?

Cheers,

JS

John Shahid <jvshahid@gmail.com> writes:

> ping
>
> John Shahid <jvshahid@gmail.com> writes:
>
>> Hi all,
>>
>> I noticed with line-spacing turned on (i.e. larger than 0) that
>> `ansi-term' doesn't report the right number of text rows to the shell.
>> This causes scrolling to get messed up.  It is the result of using
>> `window-body-height' instead of `window-screen-lines' in
>> `window-adjust-process-window-size'.  Can anyone think of a reason for
>> not using `window-screen-lines' ?
>>
>> Thanks,
>>
>> JS

Re: Using window-screen-lines in window-adjust-process-window-size (was: Re: using window-screen-lines in window-adjust-process-window-size)

[Eli Zaretskii]

> From: John Shahid <jvshahid@gmail.com>
> Date: Sat, 27 Apr 2019 06:43:08 -0400
> 
> It has been a while and I haven't heard from anyone.

That might actually mean no one objects to your proposal ;-)

> I decided to ask a more direct question.  Does anyone object if I
> changed window-adjust-process-window-size to use window-screen-lines
> instead of window-body-height ?

I think you are on the right track, so please show a patch to do that,
and let's take it from there.

Thanks.

Re: Using window-screen-lines in window-adjust-process-window-size (was: Re: using window-screen-lines in window-adjust-process-window-size)

[John Shahid]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]


Eli Zaretskii <eliz@gnu.org> writes:

[...]

> I think you are on the right track, so please show a patch to do that,
> and let's take it from there.

Thanks for getting back to me.  I attached the patch below.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Consider-line-spacing-and-font-height-when-deriving-.patch --]
[-- Type: text/x-patch, Size: 2081 bytes --]

From e9cefa049b6c709e728109eb07cfb186024ef581 Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
Date: Sat, 27 Apr 2019 12:21:38 -0400
Subject: [PATCH] Consider line spacing and font height when deriving proc
 window size

* lisp/window.el (window-adjust-process-window-size): Use
  window-screen-lines instead of window-body-height.
* lisp/term.el (term-mode): Use window-screen-lines to set the initial
  window height.
---
 lisp/term.el   | 2 +-
 lisp/window.el | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/term.el b/lisp/term.el
index 586a887a29..b5949c4600 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1024,7 +1024,7 @@ term-mode
   (setq indent-tabs-mode nil)
   (setq buffer-display-table term-display-table)
   (set (make-local-variable 'term-home-marker) (copy-marker 0))
-  (set (make-local-variable 'term-height) (window-text-height))
+  (set (make-local-variable 'term-height) (window-screen-lines))
   (set (make-local-variable 'term-width) (window-max-chars-per-line))
   (set (make-local-variable 'term-last-input-start) (make-marker))
   (set (make-local-variable 'term-last-input-end) (make-marker))
diff --git a/lisp/window.el b/lisp/window.el
index b4f5ac5cc4..c8fc1248ab 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9425,10 +9425,12 @@ window-adjust-process-window-size
 the given windows."
   (when windows
     (let ((width (window-max-chars-per-line (car windows)))
-          (height (window-body-height (car windows))))
+          (height (with-selected-window (car windows)
+                    (floor (window-screen-lines)))))
       (dolist (window (cdr windows))
         (setf width (funcall reducer width (window-max-chars-per-line window)))
-        (setf height (funcall reducer height (window-body-height window))))
+        (setf height (funcall reducer height (with-selected-window window
+                                               (floor (window-screen-lines))))))
       (cons width height))))
 
 (defun window-adjust-process-window-size-smallest (_process windows)
-- 
2.21.0

Re: Using window-screen-lines in window-adjust-process-window-size (was: Re: using window-screen-lines in window-adjust-process-window-size)

[John Shahid]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]


I just realized that the initial term-height didn't use floor to round
down the value of window-text-height.  This was masked by a hook I have
in my configuration.  I attached another patch that fixes the issue.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Consider-line-spacing-and-font-height-when-deriving-.patch --]
[-- Type: text/x-patch, Size: 2089 bytes --]

From 92825356ddf320a480c1dd4068cac3f995043faf Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
Date: Sat, 27 Apr 2019 12:21:38 -0400
Subject: [PATCH] Consider line spacing and font height when deriving proc
 window size

* lisp/window.el (window-adjust-process-window-size): Use
  window-screen-lines instead of window-body-height.
* lisp/term.el (term-mode): Use window-screen-lines to set the initial
  window height.
---
 lisp/term.el   | 2 +-
 lisp/window.el | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/term.el b/lisp/term.el
index 586a887a29..8a28e6df28 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1024,7 +1024,7 @@ term-mode
   (setq indent-tabs-mode nil)
   (setq buffer-display-table term-display-table)
   (set (make-local-variable 'term-home-marker) (copy-marker 0))
-  (set (make-local-variable 'term-height) (window-text-height))
+  (set (make-local-variable 'term-height) (floor (window-screen-lines)))
   (set (make-local-variable 'term-width) (window-max-chars-per-line))
   (set (make-local-variable 'term-last-input-start) (make-marker))
   (set (make-local-variable 'term-last-input-end) (make-marker))
diff --git a/lisp/window.el b/lisp/window.el
index b4f5ac5cc4..c8fc1248ab 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9425,10 +9425,12 @@ window-adjust-process-window-size
 the given windows."
   (when windows
     (let ((width (window-max-chars-per-line (car windows)))
-          (height (window-body-height (car windows))))
+          (height (with-selected-window (car windows)
+                    (floor (window-screen-lines)))))
       (dolist (window (cdr windows))
         (setf width (funcall reducer width (window-max-chars-per-line window)))
-        (setf height (funcall reducer height (window-body-height window))))
+        (setf height (funcall reducer height (with-selected-window window
+                                               (floor (window-screen-lines))))))
       (cons width height))))
 
 (defun window-adjust-process-window-size-smallest (_process windows)
-- 
2.21.0

Re: Using window-screen-lines in window-adjust-process-window-size (was: Re: using window-screen-lines in window-adjust-process-window-size)

[John Shahid]

It looks like no one objects to my earlier patch.  If that is the case,
can you push the change to master.  I don't have commit access.

Thanks,

JS

John Shahid <jvshahid@gmail.com> writes:

> I just realized that the initial term-height didn't use floor to round
> down the value of window-text-height.  This was masked by a hook I have
> in my configuration.  I attached another patch that fixes the issue.
>
> From 92825356ddf320a480c1dd4068cac3f995043faf Mon Sep 17 00:00:00 2001
> From: John Shahid <jvshahid@gmail.com>
> Date: Sat, 27 Apr 2019 12:21:38 -0400
> Subject: [PATCH] Consider line spacing and font height when deriving proc
>  window size
>
> * lisp/window.el (window-adjust-process-window-size): Use
>   window-screen-lines instead of window-body-height.
> * lisp/term.el (term-mode): Use window-screen-lines to set the initial
>   window height.
> ---
>  lisp/term.el   | 2 +-
>  lisp/window.el | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/lisp/term.el b/lisp/term.el
> index 586a887a29..8a28e6df28 100644
> --- a/lisp/term.el
> +++ b/lisp/term.el
> @@ -1024,7 +1024,7 @@ term-mode
>    (setq indent-tabs-mode nil)
>    (setq buffer-display-table term-display-table)
>    (set (make-local-variable 'term-home-marker) (copy-marker 0))
> -  (set (make-local-variable 'term-height) (window-text-height))
> +  (set (make-local-variable 'term-height) (floor (window-screen-lines)))
>    (set (make-local-variable 'term-width) (window-max-chars-per-line))
>    (set (make-local-variable 'term-last-input-start) (make-marker))
>    (set (make-local-variable 'term-last-input-end) (make-marker))
> diff --git a/lisp/window.el b/lisp/window.el
> index b4f5ac5cc4..c8fc1248ab 100644
> --- a/lisp/window.el
> +++ b/lisp/window.el
> @@ -9425,10 +9425,12 @@ window-adjust-process-window-size
>  the given windows."
>    (when windows
>      (let ((width (window-max-chars-per-line (car windows)))
> -          (height (window-body-height (car windows))))
> +          (height (with-selected-window (car windows)
> +                    (floor (window-screen-lines)))))
>        (dolist (window (cdr windows))
>          (setf width (funcall reducer width (window-max-chars-per-line window)))
> -        (setf height (funcall reducer height (window-body-height window))))
> +        (setf height (funcall reducer height (with-selected-window window
> +                                               (floor (window-screen-lines))))))
>        (cons width height))))
>
>  (defun window-adjust-process-window-size-smallest (_process windows)

Re: Using window-screen-lines in window-adjust-process-window-size (was: Re: using window-screen-lines in window-adjust-process-window-size)

[Eli Zaretskii]

> From: John Shahid <jvshahid@gmail.com>
> Cc: emacs-devel@gnu.org
> Date: Mon, 13 May 2019 08:03:19 -0400
> 
> It looks like no one objects to my earlier patch.  If that is the case,
> can you push the change to master.  I don't have commit access.

Thanks, and sorry for the long delay.

I've now pushed your changes to the master branch.