From: Zoltan Hidvegi <hzoli@ny.frontiercomm.net>
To: zsh-workers@math.gatech.edu (Zsh hacking and development)
Subject: Re: test patches
Date: Sun, 11 May 1997 02:19:18 -0400 (EDT) [thread overview]
Message-ID: <199705110619.CAA06002@hzoli.home> (raw)
In-Reply-To: From hzoli at "May 11, 97 00:57:15 am"
I wrote:
> > } > There still doesn't appear to be a test in init.c for the case where
> > } > the system supports TIOCGWINSZ but the rows and columns value in the
> > } > shttyinfo.winsize structure are both zero. In that case we ought to
> > } > be using the row and column sizes from the termcap or terminfo entry?
>
> The patch below implements this. It does not work for non-interactive
That patch does not work apply for zsh-3.0.3-test5. Here is a patch for
zsh-3.0.3-test5.
Zoltan
--- Src/globals.h 1997/04/25 05:53:45 3.0.2.4
+++ Src/globals.h 1997/05/11 05:04:53
@@ -603,6 +603,10 @@
EXTERN int tclen[TC_COUNT];
EXTERN char *tcstr[TC_COUNT];
+
+/* Values of the li and co entries */
+
+EXTERN int tclines, tccolumns;
/* names of the strings we want */
#ifdef GLOBALS
--- Src/init.c 1997/04/20 07:24:12 3.0.2.4
+++ Src/init.c 1997/05/11 05:04:53
@@ -441,6 +441,9 @@
/* check whether terminal has automargin (wraparound) capability */
hasam = tgetflag("am");
+ tclines = tgetnum("li");
+ tccolumns = tgetnum("co");
+
/* if there's no termcap entry for cursor up, use single line mode: *
* this is flagged by termflags which is examined in zle_refresh.c *
*/
@@ -599,8 +602,9 @@
setiparam("COLUMNS", shttyinfo.winsize.ws_col);
setiparam("LINES", shttyinfo.winsize.ws_row);
#else
- setiparam("COLUMNS", 80);
- setiparam("LINES", 24);
+ /* Using zero below sets the defaults from termcap */
+ setiparam("COLUMNS", 0);
+ setiparam("LINES", 0);
#endif
/* create hash table for multi-character emacs bindings */
--- Src/params.c 1997/04/25 05:18:50 3.0.2.7
+++ Src/params.c 1997/05/11 05:13:35
@@ -1235,23 +1235,19 @@
zlevarsetfn(Param pm, long x)
{
if ((long *)pm->data == & columns) {
+ if(x <= 0)
+ x = tccolumns > 0 ? tccolumns : 80;
if (x > 2)
termflags &= ~TERM_NARROW;
- else {
+ else
termflags |= TERM_NARROW;
- if (x <= 0)
- x = 80; /* Arbitary, but same as init.c */
- else
- x = 2;
- }
} else if ((long *)pm->data == & lines) {
+ if(x <= 0)
+ x = tclines > 0 ? tclines : 24;
if (x > 2)
termflags &= ~TERM_SHORT;
- else {
+ else
termflags |= TERM_SHORT;
- if (x <= 0)
- x = 24; /* Arbitrary, but same as init.c */
- }
}
*((long *)pm->data) = x;
next reply other threads:[~1997-05-11 7:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
1997-05-11 6:19 Zoltan Hidvegi [this message]
-- strict thread matches above, loose matches on Subject: below --
1997-05-09 7:42 Zoltan Hidvegi
1997-05-09 8:04 ` Hrvoje Niksic
1997-05-09 17:50 ` Zoltan T. Hidvegi
1997-05-09 8:49 ` Bart Schaefer
1997-05-09 14:00 ` Zefram
1997-05-09 18:09 ` Zoltan T. Hidvegi
1997-05-09 20:40 ` Zefram
1997-05-09 21:04 ` Zoltan T. Hidvegi
1997-05-10 17:09 ` Bart Schaefer
1997-05-10 17:48 ` Zoltan Hidvegi
1997-05-10 19:12 ` Bart Schaefer
1997-05-11 4:57 ` Zoltan Hidvegi
1997-05-12 12:41 ` Andrej Borsenkow
1997-05-12 17:49 ` Zefram
1997-05-13 5:46 ` Andrej Borsenkow
1997-05-13 16:08 ` Zefram
1997-05-13 18:53 ` Zoltan T. Hidvegi
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=199705110619.CAA06002@hzoli.home \
--to=hzoli@ny.frontiercomm.net \
--cc=zsh-workers@math.gatech.edu \
/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.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).