old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mon Oct 7 22:16:38 2002 Michael Jennings (mej) 

This should clean up and consolidate the size-setting and reporting to
eliminate the discrepencies sometimes seen in Escreen mode when
coupled, for example, with --buttonbar 0.  Azundris spotted this ages
ago, and I've been putting off fixing it.  But it should be all
straightened out now.


SVN revision: 6416
This commit is contained in:
Michael Jennings 2002-10-08 02:18:09 +00:00
parent 4f1e4c1df5
commit ea06545d9e
9 changed files with 245 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -4811,3 +4811,11 @@ Fri Oct 4 22:06:40 2002 Michael Jennings (mej)
Fixed button label positioning to be based on the font descent, not Fixed button label positioning to be based on the font descent, not
just existing button text. just existing button text.
---------------------------------------------------------------------- ----------------------------------------------------------------------
Mon Oct 7 22:16:38 2002 Michael Jennings (mej)
This should clean up and consolidate the size-setting and reporting to
eliminate the discrepencies sometimes seen in Escreen mode when
coupled, for example, with --buttonbar 0. Azundris spotted this ages
ago, and I've been putting off fixing it. But it should be all
straightened out now.
----------------------------------------------------------------------

54
src/command.c
View File

@ -1811,8 +1811,8 @@ xim_set_size(XRectangle * size)
{ {
size->x = TermWin.internalBorder; size->x = TermWin.internalBorder;
size->y = TermWin.internalBorder + bbar_calc_docked_height(BBAR_DOCKED_TOP); size->y = TermWin.internalBorder + bbar_calc_docked_height(BBAR_DOCKED_TOP);
size->width = Width2Pixel(TermWin.ncol); size->width = Width2Pixel(TERM_WINDOW_GET_COLS());
size->height = Height2Pixel(TermWin.nrow); size->height = Height2Pixel(TERM_WINDOW_GET_ROWS());
} }
static void static void
@ -1849,15 +1849,15 @@ static void
xim_get_area(XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect) xim_get_area(XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect)
{ {
preedit_rect->x = needed_rect->width + (scrollbar_is_visible() && !(Options & Opt_scrollbar_right) ? (scrollbar_trough_width()) : 0); preedit_rect->x = needed_rect->width + (scrollbar_is_visible() && !(Options & Opt_scrollbar_right) ? (scrollbar_trough_width()) : 0);
preedit_rect->y = Height2Pixel(TermWin.nrow - 1); preedit_rect->y = Height2Pixel(TERM_WINDOW_GET_ROWS() - 1);
preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + (!(Options & Opt_scrollbar_right) ? (scrollbar_trough_width()) : 0); preedit_rect->width = Width2Pixel(TERM_WINDOW_GET_COLS() + 1) - needed_rect->width + (!(Options & Opt_scrollbar_right) ? (scrollbar_trough_width()) : 0);
preedit_rect->height = Height2Pixel(1); preedit_rect->height = Height2Pixel(1);
status_rect->x = (scrollbar_is_visible() && !(Options & Opt_scrollbar_right)) ? (scrollbar_trough_width()) : 0; status_rect->x = (scrollbar_is_visible() && !(Options & Opt_scrollbar_right)) ? (scrollbar_trough_width()) : 0;
status_rect->y = Height2Pixel(TermWin.nrow - 1); status_rect->y = Height2Pixel(TERM_WINDOW_GET_ROWS() - 1);
status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TERM_WINDOW_GET_COLS() + 1);
status_rect->height = Height2Pixel(1); status_rect->height = Height2Pixel(1);
} }
@ -2180,10 +2180,12 @@ run_command(char **argv)
unsetenv("COLUMNS"); unsetenv("COLUMNS");
unsetenv("TERMCAP"); unsetenv("TERMCAP");
#endif #endif
DEBUG_LEVEL = 0; DEBUG_LEVEL = 0;
get_tty(); get_tty();
SET_TTYMODE(0, &tio); SET_TTYMODE(0, &tio);
tt_winsize(0);
/* become virtual console, fail silently */ /* become virtual console, fail silently */
if (Options & Opt_console) { if (Options & Opt_console) {
@ -2201,7 +2203,6 @@ run_command(char **argv)
#endif /* SRIOCSREDIR */ #endif /* SRIOCSREDIR */
privileges(REVERT); privileges(REVERT);
} }
tt_winsize(0); /* set window size */
/* Permanently revoke all privileges for the child process. /* Permanently revoke all privileges for the child process.
Root shells for everyone are tres uncool.... ;^) -- mej */ Root shells for everyone are tres uncool.... ;^) -- mej */
@ -2591,7 +2592,7 @@ direct_write_screen(int x, int y, char *fg, rend_t bg)
REQUIRE(fg); REQUIRE(fg);
while (*fg && (x >= 0) && (x < TermWin.ncol)) { while (*fg && (x >= 0) && (x < TERM_WINDOW_GET_REPORTED_COLS())) {
t[x] = *(fg++); t[x] = *(fg++);
r[x++] = bg & DIRECT_MASK; r[x++] = bg & DIRECT_MASK;
} }
@ -2604,11 +2605,11 @@ bosconian(int n)
int ys = TermWin.saveLines - TermWin.view_start; int ys = TermWin.saveLines - TermWin.view_start;
for (; n != 0; n--) { for (; n != 0; n--) {
for (y = 0; y < TermWin.nrow; y++) { for (y = 0; y < TERM_WINDOW_GET_ROWS(); y++) {
text_t *t = screen.text[ys + y]; text_t *t = screen.text[ys + y];
rend_t *r = screen.rend[ys + y]; rend_t *r = screen.rend[ys + y];
for (x = 0; x < TermWin.ncol; x++) { for (x = 0; x < TERM_WINDOW_GET_COLS(); x++) {
t[x] = random() & 0xff; t[x] = random() & 0xff;
r[x] = random() & COLOUR_MASK; r[x] = random() & COLOUR_MASK;
} }
@ -2626,21 +2627,21 @@ unbosconian(void)
do { do {
bg = CLEAR; bg = CLEAR;
for (y = 0; (bg == CLEAR) && y < TermWin.nrow; y++) { for (y = 0; (bg == CLEAR) && y < TERM_WINDOW_GET_ROWS(); y++) {
rend_t *r = screen.rend[ys + y]; rend_t *r = screen.rend[ys + y];
for (x = 0; (bg == CLEAR) && x < TermWin.ncol; x++) { for (x = 0; (bg == CLEAR) && x < TERM_WINDOW_GET_COLS(); x++) {
if (r[x] != CLEAR) { if (r[x] != CLEAR) {
bg = r[x]; bg = r[x];
} }
} }
} }
if (bg != CLEAR) { if (bg != CLEAR) {
for (y = 0; y < TermWin.nrow; y++) { for (y = 0; y < TERM_WINDOW_GET_ROWS(); y++) {
text_t *t = screen.text[ys + y]; text_t *t = screen.text[ys + y];
rend_t *r = screen.rend[ys + y]; rend_t *r = screen.rend[ys + y];
for (x = 0; x < TermWin.ncol; x++) { for (x = 0; x < TERM_WINDOW_GET_COLS(); x++) {
if (r[x] == bg) { if (r[x] == bg) {
r[x] = CLEAR; r[x] = CLEAR;
t[x] = ' '; t[x] = ' ';
@ -2661,7 +2662,7 @@ matrix(int n)
{ {
int x, y, w, f; int x, y, w, f;
int ys = TermWin.saveLines - TermWin.view_start; int ys = TermWin.saveLines - TermWin.view_start;
text_t *s = MALLOC(TermWin.ncol); text_t *s = MALLOC(TERM_WINDOW_GET_COLS());
text_t *t, *t2; text_t *t, *t2;
rend_t *r, *r2; rend_t *r, *r2;
@ -2670,12 +2671,12 @@ matrix(int n)
return; return;
} }
MEMSET(s, 0, TermWin.ncol); MEMSET(s, 0, TERM_WINDOW_GET_COLS());
#define MATRIX_HI CLEAR #define MATRIX_HI CLEAR
#define MATRIX_LO ((4<<8)|CLEAR) #define MATRIX_LO ((4<<8)|CLEAR)
while (n--) { while (n--) {
for (x = 0; x < TermWin.ncol; x++) { for (x = 0; x < TERM_WINDOW_GET_COLS(); x++) {
if (!(random() & 3)) { if (!(random() & 3)) {
if ((y = s[x])) { if ((y = s[x])) {
w = random() & 15; w = random() & 15;
@ -2702,7 +2703,7 @@ matrix(int n)
case 2: case 2:
case 3: case 3:
for (f = random() & 7; f != 0; f--) { for (f = random() & 7; f != 0; f--) {
if (y < TermWin.nrow - 1) { if (y < TERM_WINDOW_GET_ROWS() - 1) {
t2 = screen.text[ys + y + 1]; t2 = screen.text[ys + y + 1];
r2 = screen.rend[ys + y + 1]; r2 = screen.rend[ys + y + 1];
t2[x] = t[x]; t2[x] = t[x];
@ -2918,7 +2919,7 @@ escreen_init(char **argv)
buttonbar = bbar; buttonbar = bbar;
} }
bbar_set_font(bbar, "-*-helvetica-medium-r-normal--10-*-*-*-p-*-iso8859-1"); bbar_set_font(bbar, "-*-helvetica-medium-r-normal--10-*-*-*-p-*-iso8859-1");
bbar_init(bbar, TermWin.width); bbar_init(bbar, TERM_WINDOW_GET_WIDTH());
bbar_add(bbar); bbar_add(bbar);
} }
@ -3004,13 +3005,14 @@ tt_winsize(int fd)
MEMSET(&ws, 0, sizeof(struct winsize)); MEMSET(&ws, 0, sizeof(struct winsize));
ws.ws_row = (unsigned short) TermWin.nrow; ws.ws_row = (unsigned short) TERM_WINDOW_GET_REPORTED_ROWS();
ws.ws_col = (unsigned short) TermWin.ncol; ws.ws_col = (unsigned short) TERM_WINDOW_GET_REPORTED_COLS();
#ifndef __CYGWIN32__ #ifndef __CYGWIN32__
ws.ws_xpixel = (unsigned short) TermWin.width; ws.ws_xpixel = (unsigned short) TERM_WINDOW_GET_WIDTH();
ws.ws_ypixel = (unsigned short) TermWin.height; ws.ws_ypixel = (unsigned short) TERM_WINDOW_GET_HEIGHT();
#endif #endif
D_CMD(("%hdx%hd (%hdx%hd)\n", ws.ws_row, ws.ws_col, ws.ws_xpixel, ws.ws_ypixel)); D_CMD(("Sending TIOCSWINSZ to fd %d: %hdx%hd (%hdx%hd)\n",
fd, ws.ws_row, ws.ws_col, ws.ws_xpixel, ws.ws_ypixel));
ioctl(fd, TIOCSWINSZ, &ws); ioctl(fd, TIOCSWINSZ, &ws);
} }
@ -3131,7 +3133,7 @@ cmd_getc(void)
* refreshing should be correct for small scrolls, because of the * refreshing should be correct for small scrolls, because of the
* time-out * time-out
*/ */
if (refresh_count >= (refresh_limit * (TermWin.nrow - 1))) { if (refresh_count >= (refresh_limit * (TERM_WINDOW_GET_ROWS() - 1))) {
D_CMD(("Refresh count %d >= limit %d * rows. (Refresh period %d.)\n", refresh_count, refresh_limit, REFRESH_PERIOD)); D_CMD(("Refresh count %d >= limit %d * rows. (Refresh period %d.)\n", refresh_count, refresh_limit, REFRESH_PERIOD));
if (refresh_limit < REFRESH_PERIOD) if (refresh_limit < REFRESH_PERIOD)
refresh_limit++; refresh_limit++;
@ -3434,7 +3436,7 @@ main_loop(void)
/* nothing */ /* nothing */
} else if (ch == '\n') { } else if (ch == '\n') {
nlines++; nlines++;
if (++refresh_count >= (refresh_limit * (TermWin.nrow - 1))) if (++refresh_count >= (refresh_limit * (TERM_WINDOW_GET_ROWS() - 1)))
break; break;
} else { /* unprintable */ } else { /* unprintable */
cmdbuf_ptr--; cmdbuf_ptr--;

16
src/font.c
View File

@ -647,13 +647,15 @@ change_font(int init, const char *fontname)
set_colorfgbg(); set_colorfgbg();
TermWin.width = TermWin.ncol * TermWin.fwidth;
#ifdef ESCREEN #ifdef ESCREEN
TermWin.height = (NS_MAGIC_LINE(TermWin.screen_mode) ? TermWin.nrow - 1 : TermWin.nrow) * TermWin.fheight; D_FONT((" -> Escreen mode is %s\n", ((NS_MAGIC_LINE(TermWin.screen_mode)) ? ("on") : ("off"))));
#else
TermWin.height = TermWin.nrow * TermWin.fheight;
#endif #endif
D_FONT((" -> New font width/height = %ldx%ld, making the terminal size %ldx%ld\n", TermWin.fwidth, TermWin.fheight, TermWin.width, TermWin.height));
TERM_WINDOW_SET_WIDTH();
TERM_WINDOW_SET_HEIGHT();
D_FONT((" -> New font width/height = %ldx%ld, making the terminal size %ldx%ld\n",
TermWin.fwidth, TermWin.fheight, TERM_WINDOW_GET_WIDTH(), TERM_WINDOW_GET_HEIGHT()));
/* If we're initializing, *we* do the size hints. If not, resize the parent window. */ /* If we're initializing, *we* do the size hints. If not, resize the parent window. */
if (init) { if (init) {
@ -663,8 +665,8 @@ change_font(int init, const char *fontname)
szHint.min_width = szHint.base_width + szHint.width_inc; szHint.min_width = szHint.base_width + szHint.width_inc;
szHint.min_height = szHint.base_height + szHint.height_inc; szHint.min_height = szHint.base_height + szHint.height_inc;
szHint.width = szHint.base_width + TermWin.width; szHint.width = szHint.base_width + TERM_WINDOW_GET_WIDTH();
szHint.height = szHint.base_height + TermWin.height; szHint.height = szHint.base_height + TERM_WINDOW_GET_HEIGHT();
szHint.flags = PMinSize | PResizeInc | PBaseSize; szHint.flags = PMinSize | PResizeInc | PBaseSize;
} else { } else {

309
src/screen.c
View File

@ -122,12 +122,12 @@ inline void blank_screen_mem(text_t **, rend_t **, int, rend_t);
inline void inline void
blank_screen_mem(text_t **tp, rend_t **rp, int row, rend_t efs) blank_screen_mem(text_t **tp, rend_t **rp, int row, rend_t efs)
{ {
register unsigned int i = TermWin.ncol; register unsigned int i = TERM_WINDOW_GET_REPORTED_COLS();
rend_t *r, fs = efs; rend_t *r, fs = efs;
if (tp[row] == NULL) { if (tp[row] == NULL) {
tp[row] = MALLOC(sizeof(text_t) * (TermWin.ncol + 1)); tp[row] = MALLOC(sizeof(text_t) * (TERM_WINDOW_GET_REPORTED_COLS() + 1));
rp[row] = MALLOC(sizeof(rend_t) * TermWin.ncol); rp[row] = MALLOC(sizeof(rend_t) * TERM_WINDOW_GET_REPORTED_COLS());
} }
MEMSET(tp[row], ' ', i); MEMSET(tp[row], ' ', i);
tp[row][i] = 0; tp[row][i] = 0;
@ -147,7 +147,7 @@ scr_reset(void)
TermWin.view_start = 0; TermWin.view_start = 0;
RESET_CHSTAT; RESET_CHSTAT;
if (TermWin.ncol == prev_ncol && TermWin.nrow == prev_nrow) if (TERM_WINDOW_GET_REPORTED_COLS() == prev_ncol && TERM_WINDOW_GET_REPORTED_ROWS() == prev_nrow)
return; return;
if (current_screen != PRIMARY) { if (current_screen != PRIMARY) {
@ -168,7 +168,7 @@ scr_reset(void)
prev_total_rows = prev_nrow + TermWin.saveLines; prev_total_rows = prev_nrow + TermWin.saveLines;
screen.tscroll = 0; screen.tscroll = 0;
screen.bscroll = (TermWin.nrow - 1); screen.bscroll = (TERM_WINDOW_GET_REPORTED_ROWS() - 1);
if (prev_nrow == -1) { if (prev_nrow == -1) {
/* /*
* A: first time called so just malloc everything : don't rely on realloc * A: first time called so just malloc everything : don't rely on realloc
@ -176,16 +176,16 @@ scr_reset(void)
*/ */
screen.text = CALLOC(text_t *, total_rows); screen.text = CALLOC(text_t *, total_rows);
buf_text = CALLOC(text_t *, total_rows); buf_text = CALLOC(text_t *, total_rows);
drawn_text = CALLOC(text_t *, TermWin.nrow); drawn_text = CALLOC(text_t *, TERM_WINDOW_GET_REPORTED_ROWS());
swap.text = CALLOC(text_t *, TermWin.nrow); swap.text = CALLOC(text_t *, TERM_WINDOW_GET_REPORTED_ROWS());
screen.rend = CALLOC(rend_t *, total_rows); screen.rend = CALLOC(rend_t *, total_rows);
buf_rend = CALLOC(rend_t *, total_rows); buf_rend = CALLOC(rend_t *, total_rows);
drawn_rend = CALLOC(rend_t *, TermWin.nrow); drawn_rend = CALLOC(rend_t *, TERM_WINDOW_GET_REPORTED_ROWS());
swap.rend = CALLOC(rend_t *, TermWin.nrow); swap.rend = CALLOC(rend_t *, TERM_WINDOW_GET_REPORTED_ROWS());
D_SCREEN(("screen.text == %8p, screen.rend == %8p, swap.text == %8p, swap.rend == %8p\n", screen.text, screen.rend, swap.text, swap.rend)); D_SCREEN(("screen.text == %8p, screen.rend == %8p, swap.text == %8p, swap.rend == %8p\n", screen.text, screen.rend, swap.text, swap.rend));
for (i = 0; i < TermWin.nrow; i++) { for (i = 0; i < TERM_WINDOW_GET_REPORTED_ROWS(); i++) {
j = i + TermWin.saveLines; j = i + TermWin.saveLines;
blank_screen_mem(screen.text, screen.rend, j, DEFAULT_RSTYLE); blank_screen_mem(screen.text, screen.rend, j, DEFAULT_RSTYLE);
blank_screen_mem(swap.text, swap.rend, i, DEFAULT_RSTYLE); blank_screen_mem(swap.text, swap.rend, i, DEFAULT_RSTYLE);
@ -197,12 +197,12 @@ scr_reset(void)
/* /*
* B1: add or delete rows as appropriate * B1: add or delete rows as appropriate
*/ */
if (TermWin.nrow < prev_nrow) { if (TERM_WINDOW_GET_REPORTED_ROWS() < prev_nrow) {
/* delete rows */ /* delete rows */
k = MIN(TermWin.nscrolled, prev_nrow - TermWin.nrow); k = MIN(TermWin.nscrolled, prev_nrow - TERM_WINDOW_GET_REPORTED_ROWS());
scroll_text(0, prev_nrow - 1, k, 1); scroll_text(0, prev_nrow - 1, k, 1);
for (i = TermWin.nrow; i < prev_nrow; i++) { for (i = TERM_WINDOW_GET_REPORTED_ROWS(); i < prev_nrow; i++) {
j = i + TermWin.saveLines; j = i + TermWin.saveLines;
if (screen.text[j]) { if (screen.text[j]) {
FREE(screen.text[j]); FREE(screen.text[j]);
@ -219,32 +219,32 @@ scr_reset(void)
} }
screen.text = REALLOC(screen.text, total_rows * sizeof(text_t *)); screen.text = REALLOC(screen.text, total_rows * sizeof(text_t *));
buf_text = REALLOC(buf_text, total_rows * sizeof(text_t *)); buf_text = REALLOC(buf_text, total_rows * sizeof(text_t *));
drawn_text = REALLOC(drawn_text, TermWin.nrow * sizeof(text_t *)); drawn_text = REALLOC(drawn_text, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(text_t *));
swap.text = REALLOC(swap.text, TermWin.nrow * sizeof(text_t *)); swap.text = REALLOC(swap.text, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(text_t *));
screen.rend = REALLOC(screen.rend, total_rows * sizeof(rend_t *)); screen.rend = REALLOC(screen.rend, total_rows * sizeof(rend_t *));
buf_rend = REALLOC(buf_rend, total_rows * sizeof(rend_t *)); buf_rend = REALLOC(buf_rend, total_rows * sizeof(rend_t *));
drawn_rend = REALLOC(drawn_rend, TermWin.nrow * sizeof(rend_t *)); drawn_rend = REALLOC(drawn_rend, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(rend_t *));
swap.rend = REALLOC(swap.rend, TermWin.nrow * sizeof(rend_t *)); swap.rend = REALLOC(swap.rend, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(rend_t *));
D_SCREEN(("screen.text == %8p, screen.rend == %8p, swap.text == %8p, swap.rend == %8p\n", screen.text, screen.rend, swap.text, swap.rend)); D_SCREEN(("screen.text == %8p, screen.rend == %8p, swap.text == %8p, swap.rend == %8p\n", screen.text, screen.rend, swap.text, swap.rend));
/* we have fewer rows so fix up number of scrolled lines */ /* we have fewer rows so fix up number of scrolled lines */
UPPER_BOUND(screen.row, TermWin.nrow - 1); UPPER_BOUND(screen.row, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
} else if (TermWin.nrow > prev_nrow) { } else if (TERM_WINDOW_GET_REPORTED_ROWS() > prev_nrow) {
/* add rows */ /* add rows */
screen.text = REALLOC(screen.text, total_rows * sizeof(text_t *)); screen.text = REALLOC(screen.text, total_rows * sizeof(text_t *));
buf_text = REALLOC(buf_text, total_rows * sizeof(text_t *)); buf_text = REALLOC(buf_text, total_rows * sizeof(text_t *));
drawn_text = REALLOC(drawn_text, TermWin.nrow * sizeof(text_t *)); drawn_text = REALLOC(drawn_text, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(text_t *));
swap.text = REALLOC(swap.text, TermWin.nrow * sizeof(text_t *)); swap.text = REALLOC(swap.text, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(text_t *));
screen.rend = REALLOC(screen.rend, total_rows * sizeof(rend_t *)); screen.rend = REALLOC(screen.rend, total_rows * sizeof(rend_t *));
buf_rend = REALLOC(buf_rend, total_rows * sizeof(rend_t *)); buf_rend = REALLOC(buf_rend, total_rows * sizeof(rend_t *));
drawn_rend = REALLOC(drawn_rend, TermWin.nrow * sizeof(rend_t *)); drawn_rend = REALLOC(drawn_rend, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(rend_t *));
swap.rend = REALLOC(swap.rend, TermWin.nrow * sizeof(rend_t *)); swap.rend = REALLOC(swap.rend, TERM_WINDOW_GET_REPORTED_ROWS() * sizeof(rend_t *));
D_SCREEN(("screen.text == %8p, screen.rend == %8p, swap.text == %8p, swap.rend == %8p\n", screen.text, screen.rend, swap.text, swap.rend)); D_SCREEN(("screen.text == %8p, screen.rend == %8p, swap.text == %8p, swap.rend == %8p\n", screen.text, screen.rend, swap.text, swap.rend));
k = MIN(TermWin.nscrolled, TermWin.nrow - prev_nrow); k = MIN(TermWin.nscrolled, TERM_WINDOW_GET_REPORTED_ROWS() - prev_nrow);
for (i = prev_total_rows; i < total_rows - k; i++) { for (i = prev_total_rows; i < total_rows - k; i++) {
screen.text[i] = NULL; screen.text[i] = NULL;
blank_screen_mem(screen.text, screen.rend, i, DEFAULT_RSTYLE); blank_screen_mem(screen.text, screen.rend, i, DEFAULT_RSTYLE);
@ -253,14 +253,14 @@ scr_reset(void)
screen.text[i] = NULL; screen.text[i] = NULL;
screen.rend[i] = NULL; screen.rend[i] = NULL;
} }
for (i = prev_nrow; i < TermWin.nrow; i++) { for (i = prev_nrow; i < TERM_WINDOW_GET_REPORTED_ROWS(); i++) {
swap.text[i] = NULL; swap.text[i] = NULL;
drawn_text[i] = NULL; drawn_text[i] = NULL;
blank_screen_mem(swap.text, swap.rend, i, DEFAULT_RSTYLE); blank_screen_mem(swap.text, swap.rend, i, DEFAULT_RSTYLE);
blank_screen_mem(drawn_text, drawn_rend, i, DEFAULT_RSTYLE); blank_screen_mem(drawn_text, drawn_rend, i, DEFAULT_RSTYLE);
} }
if (k > 0) { if (k > 0) {
scroll_text(0, TermWin.nrow - 1, -k, 1); scroll_text(0, TERM_WINDOW_GET_REPORTED_ROWS() - 1, -k, 1);
screen.row += k; screen.row += k;
TermWin.nscrolled -= k; TermWin.nscrolled -= k;
for (i = TermWin.saveLines - TermWin.nscrolled; k--; i--) { for (i = TermWin.saveLines - TermWin.nscrolled; k--; i--) {
@ -271,42 +271,42 @@ scr_reset(void)
} }
} }
/* B2: resize columns */ /* B2: resize columns */
if (TermWin.ncol != prev_ncol) { if (TERM_WINDOW_GET_REPORTED_COLS() != prev_ncol) {
for (i = 0; i < total_rows; i++) { for (i = 0; i < total_rows; i++) {
if (screen.text[i]) { if (screen.text[i]) {
tc = screen.text[i][prev_ncol]; tc = screen.text[i][prev_ncol];
screen.text[i] = REALLOC(screen.text[i], (TermWin.ncol + 1) * sizeof(text_t)); screen.text[i] = REALLOC(screen.text[i], (TERM_WINDOW_GET_REPORTED_COLS() + 1) * sizeof(text_t));
screen.rend[i] = REALLOC(screen.rend[i], TermWin.ncol * sizeof(rend_t)); screen.rend[i] = REALLOC(screen.rend[i], TERM_WINDOW_GET_REPORTED_COLS() * sizeof(rend_t));
screen.text[i][TermWin.ncol] = MIN(tc, TermWin.ncol); screen.text[i][TERM_WINDOW_GET_REPORTED_COLS()] = MIN(tc, TERM_WINDOW_GET_REPORTED_COLS());
if (TermWin.ncol > prev_ncol) if (TERM_WINDOW_GET_REPORTED_COLS() > prev_ncol)
blank_line(&(screen.text[i][prev_ncol]), &(screen.rend[i][prev_ncol]), TermWin.ncol - prev_ncol, DEFAULT_RSTYLE); blank_line(&(screen.text[i][prev_ncol]), &(screen.rend[i][prev_ncol]), TERM_WINDOW_GET_REPORTED_COLS() - prev_ncol, DEFAULT_RSTYLE);
} }
} }
for (i = 0; i < TermWin.nrow; i++) { for (i = 0; i < TERM_WINDOW_GET_REPORTED_ROWS(); i++) {
drawn_text[i] = REALLOC(drawn_text[i], (TermWin.ncol + 1) * sizeof(text_t)); drawn_text[i] = REALLOC(drawn_text[i], (TERM_WINDOW_GET_REPORTED_COLS() + 1) * sizeof(text_t));
drawn_rend[i] = REALLOC(drawn_rend[i], TermWin.ncol * sizeof(rend_t)); drawn_rend[i] = REALLOC(drawn_rend[i], TERM_WINDOW_GET_REPORTED_COLS() * sizeof(rend_t));
if (swap.text[i]) { if (swap.text[i]) {
tc = swap.text[i][prev_ncol]; tc = swap.text[i][prev_ncol];
swap.text[i] = REALLOC(swap.text[i], (TermWin.ncol + 1) * sizeof(text_t)); swap.text[i] = REALLOC(swap.text[i], (TERM_WINDOW_GET_REPORTED_COLS() + 1) * sizeof(text_t));
swap.rend[i] = REALLOC(swap.rend[i], TermWin.ncol * sizeof(rend_t)); swap.rend[i] = REALLOC(swap.rend[i], TERM_WINDOW_GET_REPORTED_COLS() * sizeof(rend_t));
swap.text[i][TermWin.ncol] = MIN(tc, TermWin.ncol); swap.text[i][TERM_WINDOW_GET_REPORTED_COLS()] = MIN(tc, TERM_WINDOW_GET_REPORTED_COLS());
if (TermWin.ncol > prev_ncol) if (TERM_WINDOW_GET_REPORTED_COLS() > prev_ncol)
blank_line(&(swap.text[i][prev_ncol]), &(swap.rend[i][prev_ncol]), TermWin.ncol - prev_ncol, DEFAULT_RSTYLE); blank_line(&(swap.text[i][prev_ncol]), &(swap.rend[i][prev_ncol]), TERM_WINDOW_GET_REPORTED_COLS() - prev_ncol, DEFAULT_RSTYLE);
} }
if (TermWin.ncol > prev_ncol) if (TERM_WINDOW_GET_REPORTED_COLS() > prev_ncol)
blank_line(&(drawn_text[i][prev_ncol]), &(drawn_rend[i][prev_ncol]), TermWin.ncol - prev_ncol, DEFAULT_RSTYLE); blank_line(&(drawn_text[i][prev_ncol]), &(drawn_rend[i][prev_ncol]), TERM_WINDOW_GET_REPORTED_COLS() - prev_ncol, DEFAULT_RSTYLE);
} }
} }
if (tabs) if (tabs)
FREE(tabs); FREE(tabs);
} }
tabs = MALLOC(TermWin.ncol); tabs = MALLOC(TERM_WINDOW_GET_REPORTED_COLS());
for (i = 0; i < TermWin.ncol; i++) for (i = 0; i < TERM_WINDOW_GET_REPORTED_COLS(); i++)
tabs[i] = (i % TABSIZE == 0) ? 1 : 0; tabs[i] = (i % TABSIZE == 0) ? 1 : 0;
prev_nrow = TermWin.nrow; prev_nrow = TERM_WINDOW_GET_REPORTED_ROWS();
prev_ncol = TermWin.ncol; prev_ncol = TERM_WINDOW_GET_REPORTED_COLS();
tt_resize(); tt_resize();
if (chscr) { if (chscr) {
@ -321,14 +321,14 @@ scr_release(void)
int total_rows; int total_rows;
register int i; register int i;
total_rows = TermWin.nrow + TermWin.saveLines; total_rows = TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines;
for (i = 0; i < total_rows; i++) { for (i = 0; i < total_rows; i++) {
if (screen.text[i]) { if (screen.text[i]) {
FREE(screen.text[i]); FREE(screen.text[i]);
FREE(screen.rend[i]); FREE(screen.rend[i]);
} }
} }
for (i = 0; i < TermWin.nrow; i++) { for (i = 0; i < TERM_WINDOW_GET_REPORTED_ROWS(); i++) {
FREE(drawn_text[i]); FREE(drawn_text[i]);
FREE(drawn_rend[i]); FREE(drawn_rend[i]);
FREE(swap.text[i]); FREE(swap.text[i]);
@ -362,7 +362,7 @@ scr_poweron(void)
scr_change_screen(SECONDARY); scr_change_screen(SECONDARY);
scr_erase_screen(2); scr_erase_screen(2);
swap.tscroll = 0; swap.tscroll = 0;
swap.bscroll = TermWin.nrow - 1; swap.bscroll = TERM_WINDOW_GET_REPORTED_ROWS() - 1;
swap.row = swap.col = 0; swap.row = swap.col = 0;
swap.charset = 0; swap.charset = 0;
swap.flags = Screen_DefaultFlags; swap.flags = Screen_DefaultFlags;
@ -436,7 +436,7 @@ scr_change_screen(int scrn)
offset = TermWin.saveLines; offset = TermWin.saveLines;
if (!screen.text || !screen.rend) if (!screen.text || !screen.rend)
return (current_screen); return (current_screen);
for (i = TermWin.nrow; i--;) { for (i = TERM_WINDOW_GET_REPORTED_ROWS(); i--;) {
SWAP_IT(screen.text[i + offset], swap.text[i], t0); SWAP_IT(screen.text[i + offset], swap.text[i], t0);
SWAP_IT(screen.rend[i + offset], swap.rend[i], r0); SWAP_IT(screen.rend[i + offset], swap.rend[i], r0);
} }
@ -450,8 +450,8 @@ scr_change_screen(int scrn)
#else #else
# ifndef DONT_SCROLL_ME # ifndef DONT_SCROLL_ME
if (current_screen == PRIMARY) { if (current_screen == PRIMARY) {
scroll_text(0, (TermWin.nrow - 1), TermWin.nrow, 0); scroll_text(0, (TERM_WINDOW_GET_REPORTED_ROWS() - 1), TERM_WINDOW_GET_REPORTED_ROWS(), 0);
for (i = TermWin.saveLines; i < TermWin.nrow + TermWin.saveLines; i++) for (i = TermWin.saveLines; i < TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines; i++)
if (screen.text[i] == NULL) { if (screen.text[i] == NULL) {
blank_screen_mem(screen.text, screen.rend, i, DEFAULT_RSTYLE); blank_screen_mem(screen.text, screen.rend, i, DEFAULT_RSTYLE);
} }
@ -689,14 +689,14 @@ scr_add_lines(const unsigned char *str, int nlines, int len)
if (len <= 0) /* sanity */ if (len <= 0) /* sanity */
return; return;
last_col = TermWin.ncol; last_col = TERM_WINDOW_GET_REPORTED_COLS();
D_SCREEN(("scr_add_lines(*,%d,%d)\n", nlines, len)); D_SCREEN(("scr_add_lines(*,%d,%d)\n", nlines, len));
ZERO_SCROLLBACK; ZERO_SCROLLBACK;
if (nlines > 0) { if (nlines > 0) {
nlines += (screen.row - screen.bscroll); nlines += (screen.row - screen.bscroll);
D_SCREEN((" -> screen.row == %d, screen.bscroll == %d, new nlines == %d\n", screen.row, screen.bscroll, nlines)); D_SCREEN((" -> screen.row == %d, screen.bscroll == %d, new nlines == %d\n", screen.row, screen.bscroll, nlines));
if ((nlines > 0) && (screen.tscroll == 0) && (screen.bscroll == (TermWin.nrow - 1))) { if ((nlines > 0) && (screen.tscroll == 0) && (screen.bscroll == (TERM_WINDOW_GET_REPORTED_ROWS() - 1))) {
/* _at least_ this many lines need to be scrolled */ /* _at least_ this many lines need to be scrolled */
scroll_text(screen.tscroll, screen.bscroll, nlines, 0); scroll_text(screen.tscroll, screen.bscroll, nlines, 0);
for (i = nlines, row = screen.bscroll + TermWin.saveLines + 1; row > 0 && i--;) { for (i = nlines, row = screen.bscroll + TermWin.saveLines + 1; row > 0 && i--;) {
@ -708,7 +708,7 @@ scr_add_lines(const unsigned char *str, int nlines, int len)
} }
} }
UPPER_BOUND(screen.col, last_col - 1); UPPER_BOUND(screen.col, last_col - 1);
BOUND(screen.row, -TermWin.nscrolled, TermWin.nrow - 1); BOUND(screen.row, -TermWin.nscrolled, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
row = screen.row + TermWin.saveLines; row = screen.row + TermWin.saveLines;
if (screen.text[row] == NULL) { if (screen.text[row] == NULL) {
@ -757,7 +757,7 @@ scr_add_lines(const unsigned char *str, int nlines, int len)
scroll_text(screen.tscroll, screen.bscroll, 1, 0); scroll_text(screen.tscroll, screen.bscroll, 1, 0);
j = screen.bscroll + TermWin.saveLines; j = screen.bscroll + TermWin.saveLines;
blank_screen_mem(screen.text, screen.rend, j, rstyle & ~RS_Uline); blank_screen_mem(screen.text, screen.rend, j, rstyle & ~RS_Uline);
} else if (screen.row < (TermWin.nrow - 1)) { } else if (screen.row < (TERM_WINDOW_GET_REPORTED_ROWS() - 1)) {
screen.row++; screen.row++;
row = screen.row + TermWin.saveLines; row = screen.row + TermWin.saveLines;
} }
@ -786,7 +786,7 @@ scr_add_lines(const unsigned char *str, int nlines, int len)
/* blank_line(screen.text[j], screen.rend[j], TermWin.ncol, /* blank_line(screen.text[j], screen.rend[j], TermWin.ncol,
rstyle); Bug fix from John Ellison - need to reset rstyle */ rstyle); Bug fix from John Ellison - need to reset rstyle */
blank_screen_mem(screen.text, screen.rend, j, rstyle & ~RS_Uline); blank_screen_mem(screen.text, screen.rend, j, rstyle & ~RS_Uline);
} else if (screen.row < (TermWin.nrow - 1)) { } else if (screen.row < (TERM_WINDOW_GET_REPORTED_ROWS() - 1)) {
screen.row++; screen.row++;
row = screen.row + TermWin.saveLines; row = screen.row + TermWin.saveLines;
} }
@ -825,7 +825,7 @@ scr_add_lines(const unsigned char *str, int nlines, int len)
#ifdef ESCREEN #ifdef ESCREEN
if (NS_MAGIC_LINE(TermWin.screen_mode)) { if (NS_MAGIC_LINE(TermWin.screen_mode)) {
if (screen.row >= TermWin.nrow - 1) { /* last row -> upd-flag */ if (screen.row >= TERM_WINDOW_GET_ROWS()) { /* last row -> upd-flag */
TermWin.screen_pending |= 1; TermWin.screen_pending |= 1;
} }
} }
@ -842,7 +842,7 @@ scr_backspace(void)
RESET_CHSTAT; RESET_CHSTAT;
if (screen.col == 0 && screen.row > 0) { if (screen.col == 0 && screen.row > 0) {
screen.col = TermWin.ncol - 1; screen.col = TERM_WINDOW_GET_REPORTED_COLS() - 1;
screen.row--; screen.row--;
} else if (screen.flags & Screen_WrapNext) { } else if (screen.flags & Screen_WrapNext) {
screen.flags &= ~Screen_WrapNext; screen.flags &= ~Screen_WrapNext;
@ -865,7 +865,7 @@ scr_tab(int count)
if (count == 0) if (count == 0)
return; return;
else if (count > 0) { else if (count > 0) {
for (i = x + 1; i < TermWin.ncol; i++) { for (i = x + 1; i < TERM_WINDOW_GET_REPORTED_COLS(); i++) {
if (tabs[i]) { if (tabs[i]) {
x = i; x = i;
if (!--count) if (!--count)
@ -895,7 +895,7 @@ scr_gotorc(int row, int col, int relative)
RESET_CHSTAT; RESET_CHSTAT;
screen.col = ((relative & C_RELATIVE) ? (screen.col + col) : col); screen.col = ((relative & C_RELATIVE) ? (screen.col + col) : col);
BOUND(screen.col, 0, TermWin.ncol - 1); BOUND(screen.col, 0, TERM_WINDOW_GET_REPORTED_COLS() - 1);
if (screen.flags & Screen_WrapNext) { if (screen.flags & Screen_WrapNext) {
screen.flags &= ~Screen_WrapNext; screen.flags &= ~Screen_WrapNext;
@ -921,14 +921,14 @@ scr_gotorc(int row, int col, int relative)
} }
#ifdef ESCREEN #ifdef ESCREEN
if (NS_MAGIC_LINE(TermWin.screen_mode)) { if (NS_MAGIC_LINE(TermWin.screen_mode)) {
if (screen.row >= TermWin.nrow - 1) { /* last row -> upd-flag */ if (screen.row >= TERM_WINDOW_GET_ROWS()) { /* last row -> upd-flag */
TermWin.screen_pending |= 1; TermWin.screen_pending |= 1;
} else if (TermWin.screen_pending) { /* left last -> upd-finis */ } else if (TermWin.screen_pending) { /* left last -> upd-finis */
TermWin.screen_pending |= 2; TermWin.screen_pending |= 2;
} }
} }
#endif #endif
BOUND(screen.row, 0, TermWin.nrow - 1); BOUND(screen.row, 0, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
} }
/* /*
@ -958,7 +958,7 @@ scr_index(int direction)
blank_screen_mem(screen.text, screen.rend, dirn, rstyle); blank_screen_mem(screen.text, screen.rend, dirn, rstyle);
} else } else
screen.row += dirn; screen.row += dirn;
BOUND(screen.row, 0, TermWin.nrow - 1); BOUND(screen.row, 0, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
CHECK_SELECTION; CHECK_SELECTION;
} }
@ -982,14 +982,14 @@ scr_erase_line(int mode)
} }
row = TermWin.saveLines + screen.row; row = TermWin.saveLines + screen.row;
ASSERT(row < TermWin.nrow + TermWin.saveLines); ASSERT(row < TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines);
if (screen.text[row]) { if (screen.text[row]) {
switch (mode) { switch (mode) {
case 0: /* erase to end of line */ case 0: /* erase to end of line */
col = screen.col; col = screen.col;
num = TermWin.ncol - col; num = TERM_WINDOW_GET_REPORTED_COLS() - col;
UPPER_BOUND(screen.text[row][TermWin.ncol], col); UPPER_BOUND(screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()], col);
break; break;
case 1: /* erase to beginning of line */ case 1: /* erase to beginning of line */
col = 0; col = 0;
@ -997,8 +997,8 @@ scr_erase_line(int mode)
break; break;
case 2: /* erase whole line */ case 2: /* erase whole line */
col = 0; col = 0;
num = TermWin.ncol; num = TERM_WINDOW_GET_REPORTED_COLS();
screen.text[row][TermWin.ncol] = 0; screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()] = 0;
break; break;
default: default:
return; return;
@ -1042,7 +1042,7 @@ scr_erase_screen(int mode)
case 0: /* erase to end of screen */ case 0: /* erase to end of screen */
scr_erase_line(0); scr_erase_line(0);
row = screen.row + 1; /* possible OOB */ row = screen.row + 1; /* possible OOB */
num = TermWin.nrow - row; num = TERM_WINDOW_GET_REPORTED_ROWS() - row;
break; break;
case 1: /* erase to beginning of screen */ case 1: /* erase to beginning of screen */
scr_erase_line(1); scr_erase_line(1);
@ -1051,13 +1051,13 @@ scr_erase_screen(int mode)
break; break;
case 2: /* erase whole screen */ case 2: /* erase whole screen */
row = 0; row = 0;
num = TermWin.nrow; num = TERM_WINDOW_GET_REPORTED_ROWS();
break; break;
default: default:
return; return;
} }
if (row >= 0 && row <= TermWin.nrow) { /* check OOB */ if (row >= 0 && row <= TERM_WINDOW_GET_REPORTED_ROWS()) { /* check OOB */
UPPER_BOUND(num, (TermWin.nrow - row)); UPPER_BOUND(num, (TERM_WINDOW_GET_REPORTED_ROWS() - row));
if (rstyle & RS_RVid || rstyle & RS_Uline) if (rstyle & RS_RVid || rstyle & RS_Uline)
ren = -1; ren = -1;
else { else {
@ -1096,10 +1096,10 @@ scr_E(void)
RESET_CHSTAT; RESET_CHSTAT;
fs = rstyle; fs = rstyle;
for (i = TermWin.saveLines; i < TermWin.nrow + TermWin.saveLines; i++) { for (i = TermWin.saveLines; i < TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines; i++) {
t = screen.text[i]; t = screen.text[i];
r = screen.rend[i]; r = screen.rend[i];
for (j = 0; j < TermWin.ncol; j++) { for (j = 0; j < TERM_WINDOW_GET_REPORTED_COLS(); j++) {
*t++ = 'E'; *t++ = 'E';
*r++ = fs; *r++ = fs;
} }
@ -1159,32 +1159,32 @@ scr_insdel_chars(int count, int insdel)
return; return;
CHECK_SELECTION; CHECK_SELECTION;
UPPER_BOUND(count, (TermWin.ncol - screen.col)); UPPER_BOUND(count, (TERM_WINDOW_GET_REPORTED_COLS() - screen.col));
row = screen.row + TermWin.saveLines; row = screen.row + TermWin.saveLines;
screen.flags &= ~Screen_WrapNext; screen.flags &= ~Screen_WrapNext;
switch (insdel) { switch (insdel) {
case INSERT: case INSERT:
for (col = TermWin.ncol - 1; (col - count) >= screen.col; col--) { for (col = TERM_WINDOW_GET_REPORTED_COLS() - 1; (col - count) >= screen.col; col--) {
screen.text[row][col] = screen.text[row][col - count]; screen.text[row][col] = screen.text[row][col - count];
screen.rend[row][col] = screen.rend[row][col - count]; screen.rend[row][col] = screen.rend[row][col - count];
} }
screen.text[row][TermWin.ncol] += count; screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()] += count;
UPPER_BOUND(screen.text[row][TermWin.ncol], TermWin.ncol); UPPER_BOUND(screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()], TERM_WINDOW_GET_REPORTED_COLS());
/* FALLTHROUGH */ /* FALLTHROUGH */
case ERASE: case ERASE:
blank_line(&(screen.text[row][screen.col]), &(screen.rend[row][screen.col]), count, rstyle); blank_line(&(screen.text[row][screen.col]), &(screen.rend[row][screen.col]), count, rstyle);
break; break;
case DELETE: case DELETE:
for (col = screen.col; (col + count) < TermWin.ncol; col++) { for (col = screen.col; (col + count) < TERM_WINDOW_GET_REPORTED_COLS(); col++) {
screen.text[row][col] = screen.text[row][col + count]; screen.text[row][col] = screen.text[row][col + count];
screen.rend[row][col] = screen.rend[row][col + count]; screen.rend[row][col] = screen.rend[row][col + count];
} }
blank_line(&(screen.text[row][TermWin.ncol - count]), &(screen.rend[row][TermWin.ncol - count]), count, rstyle); blank_line(&(screen.text[row][TERM_WINDOW_GET_REPORTED_COLS() - count]), &(screen.rend[row][TERM_WINDOW_GET_REPORTED_COLS() - count]), count, rstyle);
screen.text[row][TermWin.ncol] -= count; screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()] -= count;
if (((int) (char) screen.text[row][TermWin.ncol]) < 0) if (((int) (char) screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()]) < 0)
screen.text[row][TermWin.ncol] = 0; screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()] = 0;
break; break;
} }
#ifdef MULTI_CHARSET #ifdef MULTI_CHARSET
@ -1192,9 +1192,9 @@ scr_insdel_chars(int count, int insdel)
screen.rend[row][0] &= ~RS_multiMask; screen.rend[row][0] &= ~RS_multiMask;
screen.text[row][0] = ' '; screen.text[row][0] = ' ';
} }
if ((screen.rend[row][TermWin.ncol - 1] & RS_multiMask) == RS_multi1) { if ((screen.rend[row][TERM_WINDOW_GET_REPORTED_COLS() - 1] & RS_multiMask) == RS_multi1) {
screen.rend[row][TermWin.ncol - 1] &= ~RS_multiMask; screen.rend[row][TERM_WINDOW_GET_REPORTED_COLS() - 1] &= ~RS_multiMask;
screen.text[row][TermWin.ncol - 1] = ' '; screen.text[row][TERM_WINDOW_GET_REPORTED_COLS() - 1] = ' ';
} }
#endif #endif
} }
@ -1207,7 +1207,7 @@ void
scr_scroll_region(int top, int bot) scr_scroll_region(int top, int bot)
{ {
LOWER_BOUND(top, 0); LOWER_BOUND(top, 0);
UPPER_BOUND(bot, TermWin.nrow - 1); UPPER_BOUND(bot, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
if (top > bot) if (top > bot)
return; return;
screen.tscroll = top; screen.tscroll = top;
@ -1286,9 +1286,9 @@ void
scr_set_tab(int mode) scr_set_tab(int mode)
{ {
if (mode < 0) if (mode < 0)
MEMSET(tabs, 0, (unsigned int) TermWin.ncol); MEMSET(tabs, 0, (unsigned int) TERM_WINDOW_GET_REPORTED_COLS());
else if (screen.col < TermWin.ncol) else if (screen.col < TERM_WINDOW_GET_REPORTED_COLS())
tabs[screen.col] = (mode ? 1 : 0); tabs[screen.col] = (mode ? 1 : 0);
} }
@ -1306,9 +1306,9 @@ scr_rvideo_mode(int mode)
rvideo = mode; rvideo = mode;
rstyle ^= RS_RVid; rstyle ^= RS_RVid;
maxlines = TermWin.saveLines + TermWin.nrow; maxlines = TermWin.saveLines + TERM_WINDOW_GET_REPORTED_ROWS();
for (i = TermWin.saveLines; i < maxlines; i++) for (i = TermWin.saveLines; i < maxlines; i++)
for (j = 0; j < TermWin.ncol + 1; j++) for (j = 0; j < TERM_WINDOW_GET_REPORTED_COLS() + 1; j++)
screen.rend[i][j] ^= RS_RVid; screen.rend[i][j] ^= RS_RVid;
scr_refresh(SLOW_REFRESH); scr_refresh(SLOW_REFRESH);
} }
@ -1473,8 +1473,8 @@ scr_expose(int x, int y, int width, int height)
REQUIRE(drawn_text != NULL); REQUIRE(drawn_text != NULL);
nc = TermWin.ncol - 1; nc = TERM_WINDOW_GET_REPORTED_COLS() - 1;
nr = TermWin.nrow - 1; nr = TERM_WINDOW_GET_ROWS() - 1;
rect_beg.col = Pixel2Col(x); rect_beg.col = Pixel2Col(x);
BOUND(rect_beg.col, 0, nc); BOUND(rect_beg.col, 0, nc);
@ -1500,8 +1500,8 @@ scr_move_to(int y, int len)
int start; int start;
start = TermWin.view_start; start = TermWin.view_start;
TermWin.view_start = ((len - y) * (TermWin.nrow - 1 + TermWin.nscrolled) TermWin.view_start = ((len - y) * (TERM_WINDOW_GET_REPORTED_ROWS() - 1 + TermWin.nscrolled)
/ (len)) - (TermWin.nrow - 1); / (len)) - (TERM_WINDOW_GET_REPORTED_ROWS() - 1);
D_SCREEN(("scr_move_to(%d, %d) view_start:%d\n", y, len, TermWin.view_start)); D_SCREEN(("scr_move_to(%d, %d) view_start:%d\n", y, len, TermWin.view_start));
BOUND(TermWin.view_start, 0, TermWin.nscrolled); BOUND(TermWin.view_start, 0, TermWin.nscrolled);
@ -1518,7 +1518,7 @@ scr_page(int direction, int nlines)
D_SCREEN(("scr_page(%s, %d) view_start:%d\n", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); D_SCREEN(("scr_page(%s, %d) view_start:%d\n", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
start = TermWin.view_start; start = TermWin.view_start;
BOUND(nlines, 1, TermWin.nrow); BOUND(nlines, 1, TERM_WINDOW_GET_REPORTED_ROWS());
TermWin.view_start += ((direction == UP) ? nlines : (-nlines)); TermWin.view_start += ((direction == UP) ? nlines : (-nlines));
BOUND(TermWin.view_start, 0, TermWin.nscrolled); BOUND(TermWin.view_start, 0, TermWin.nscrolled);
return (TermWin.view_start - start); return (TermWin.view_start - start);
@ -1550,7 +1550,7 @@ scr_printscreen(int fullhist)
if ((fd = popen_printer()) == NULL) if ((fd = popen_printer()) == NULL)
return; return;
nrows = TermWin.nrow; nrows = TERM_WINDOW_GET_REPORTED_ROWS();
if (fullhist) { if (fullhist) {
/* Print the entire scrollback buffer. Always start from the top and go all the way to the bottom. */ /* Print the entire scrollback buffer. Always start from the top and go all the way to the bottom. */
nrows += TermWin.nscrolled; nrows += TermWin.nscrolled;
@ -1562,7 +1562,7 @@ scr_printscreen(int fullhist)
for (r = 0; r < nrows; r++) { for (r = 0; r < nrows; r++) {
t = screen.text[r + row_offset]; t = screen.text[r + row_offset];
for (i = TermWin.ncol - 1; i >= 0; i--) for (i = TERM_WINDOW_GET_REPORTED_COLS() - 1; i >= 0; i--)
if (!isspace(t[i])) if (!isspace(t[i]))
break; break;
fprintf(fd, "%.*s\n", (i + 1), t); fprintf(fd, "%.*s\n", (i + 1), t);
@ -1636,19 +1636,13 @@ scr_refresh(int type)
int bfont = 0; /* we've changed font to bold font */ int bfont = 0; /* we've changed font to bold font */
#endif #endif
#ifdef OPTIMIZE_HACKS #ifdef OPTIMIZE_HACKS
register int nrows = TermWin.nrow; register int nrows = TERM_WINDOW_GET_ROWS();
register int ncols = TermWin.ncol; register int ncols = TERM_WINDOW_GET_COLS();
#endif #endif
int ascent, descent; int ascent, descent;
PROF_INIT(scr_refresh); PROF_INIT(scr_refresh);
#ifdef ESCREEN
if (NS_MAGIC_LINE(TermWin.screen_mode)) {
nrows--;
}
#endif
switch (type) { switch (type) {
case NO_REFRESH: case NO_REFRESH:
D_SCREEN(("scr_refresh(NO_REFRESH) called.\n")); D_SCREEN(("scr_refresh(NO_REFRESH) called.\n"));
@ -1681,8 +1675,8 @@ scr_refresh(int type)
draw_string = XDrawString; draw_string = XDrawString;
draw_image_string = XDrawImageString; draw_image_string = XDrawImageString;
BOUND(screen.row, 0, TermWin.nrow - 1); BOUND(screen.row, 0, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
BOUND(screen.col, 0, TermWin.ncol - 1); BOUND(screen.col, 0, TERM_WINDOW_GET_REPORTED_COLS() - 1);
row = screen.row + TermWin.saveLines; row = screen.row + TermWin.saveLines;
col = screen.col; col = screen.col;
@ -2090,8 +2084,8 @@ scr_refresh(int type)
boldlast = 1; boldlast = 1;
} }
} }
} /* for (col = 0; col < TermWin.ncol; col++) */ } /* for (col = 0; col < TERM_WINDOW_GET_REPORTED_COLS(); col++) */
} /* for (row = 0; row < TermWin.nrow; row++) */ } /* for (row = 0; row < TERM_WINDOW_GET_REPORTED_ROWS(); row++) */
row = screen.row + TermWin.saveLines; row = screen.row + TermWin.saveLines;
col = screen.col; col = screen.col;
@ -2180,8 +2174,8 @@ scr_search_scrollback(char *str)
} else { } else {
last_str = STRDUP(str); last_str = STRDUP(str);
} }
lrow = rows = TermWin.nrow + TermWin.saveLines; lrow = rows = TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines;
cols = TermWin.ncol; cols = TERM_WINDOW_GET_REPORTED_COLS();
len = strlen(str); len = strlen(str);
D_SCREEN(("%d, %d\n", rows, cols)); D_SCREEN(("%d, %d\n", rows, cols));
@ -2227,7 +2221,7 @@ scr_search_scrollback(char *str)
FREE(last_str); FREE(last_str);
} else { } else {
if (lrow != rows) { if (lrow != rows) {
TermWin.view_start = rows - lrow - TermWin.nrow; TermWin.view_start = rows - lrow - TERM_WINDOW_GET_REPORTED_ROWS();
BOUND(TermWin.view_start, 0, TermWin.nscrolled); BOUND(TermWin.view_start, 0, TermWin.nscrolled);
D_SCREEN(("New view start is %d\n", TermWin.view_start)); D_SCREEN(("New view start is %d\n", TermWin.view_start));
} }
@ -2243,8 +2237,8 @@ scr_dump(void)
unsigned int *i; unsigned int *i;
unsigned long row, col, rows, cols; unsigned long row, col, rows, cols;
rows = TermWin.nrow + TermWin.saveLines; rows = TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines;
cols = TermWin.ncol; cols = TERM_WINDOW_GET_REPORTED_COLS();
D_SCREEN(("%d, %d\n", rows, cols)); D_SCREEN(("%d, %d\n", rows, cols));
for (row = 0; row < rows; row++) { for (row = 0; row < rows; row++) {
@ -2280,8 +2274,8 @@ scr_dump_to_file(const char *fname)
REQUIRE(fname != NULL); REQUIRE(fname != NULL);
rows = TermWin.nrow + TermWin.saveLines; rows = TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines;
cols = TermWin.ncol; cols = TERM_WINDOW_GET_REPORTED_COLS();
D_SCREEN(("Dumping to file \"%s\". %d rows, %d cols\n", fname, rows, cols)); D_SCREEN(("Dumping to file \"%s\". %d rows, %d cols\n", fname, rows, cols));
/* Remove it if it's there. If this fails, we don't /* Remove it if it's there. If this fails, we don't
@ -2329,11 +2323,11 @@ selection_check(void)
return; return;
if ((selection.mark.row < -TermWin.nscrolled) if ((selection.mark.row < -TermWin.nscrolled)
|| (selection.mark.row >= TermWin.nrow) || (selection.mark.row >= TERM_WINDOW_GET_ROWS())
|| (selection.beg.row < -TermWin.nscrolled) || (selection.beg.row < -TermWin.nscrolled)
|| (selection.beg.row >= TermWin.nrow) || (selection.beg.row >= TERM_WINDOW_GET_ROWS())
|| (selection.end.row < -TermWin.nscrolled) || (selection.end.row < -TermWin.nscrolled)
|| (selection.end.row >= TermWin.nrow)) { || (selection.end.row >= TERM_WINDOW_GET_ROWS())) {
selection_reset(); selection_reset();
return; return;
} }
@ -2533,8 +2527,8 @@ selection_reset(void)
D_SELECT(("selection_reset()\n")); D_SELECT(("selection_reset()\n"));
lrow = TermWin.nrow + TermWin.saveLines; lrow = TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines;
lcol = TermWin.ncol; lcol = TERM_WINDOW_GET_REPORTED_COLS();
selection.op = SELECTION_CLEAR; selection.op = SELECTION_CLEAR;
i = (current_screen == PRIMARY) ? 0 : TermWin.saveLines; i = (current_screen == PRIMARY) ? 0 : TermWin.saveLines;
@ -2569,16 +2563,16 @@ selection_setclr(int set, int startr, int startc, int endr, int endc)
D_SELECT(("selection_setclr(%d) %s (%d,%d)-(%d,%d)\n", set, (set ? "set " : "clear"), startc, startr, endc, endr)); D_SELECT(("selection_setclr(%d) %s (%d,%d)-(%d,%d)\n", set, (set ? "set " : "clear"), startc, startr, endc, endr));
if ((startr < -TermWin.nscrolled) || (endr >= TermWin.nrow)) { if ((startr < -TermWin.nscrolled) || (endr >= TERM_WINDOW_GET_REPORTED_ROWS())) {
selection_reset(); selection_reset();
return; return;
} }
last_col = TermWin.ncol - 1; last_col = TERM_WINDOW_GET_REPORTED_COLS() - 1;
LOWER_BOUND(startc, 0); LOWER_BOUND(startc, 0);
UPPER_BOUND(endc, last_col); UPPER_BOUND(endc, last_col);
BOUND(startr, -TermWin.nscrolled, TermWin.nrow - 1); BOUND(startr, -TermWin.nscrolled, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
BOUND(endr, -TermWin.nscrolled, TermWin.nrow - 1); BOUND(endr, -TermWin.nscrolled, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
startr += TermWin.saveLines; startr += TermWin.saveLines;
endr += TermWin.saveLines; endr += TermWin.saveLines;
@ -2636,12 +2630,12 @@ selection_start_colrow(int col, int row)
selection_setclr(0, selection.beg.row, selection.beg.col, selection.end.row, selection.end.col); selection_setclr(0, selection.beg.row, selection.beg.col, selection.end.row, selection.end.col);
} }
selection.op = SELECTION_INIT; selection.op = SELECTION_INIT;
BOUND(row, 0, TermWin.nrow - 1); BOUND(row, 0, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
row -= TermWin.view_start; row -= TermWin.view_start;
end_col = screen.text[row + TermWin.saveLines][TermWin.ncol]; end_col = screen.text[row + TermWin.saveLines][TERM_WINDOW_GET_REPORTED_COLS()];
if (end_col != WRAP_CHAR && col > end_col) if (end_col != WRAP_CHAR && col > end_col)
col = TermWin.ncol; col = TERM_WINDOW_GET_REPORTED_COLS();
selection.mark.col = col; selection.mark.col = col;
selection.mark.row = row; selection.mark.row = row;
} }
@ -2678,11 +2672,11 @@ selection_make(Time tm)
if (selection.clicks == 4) if (selection.clicks == 4)
return; /* nothing selected, go away */ return; /* nothing selected, go away */
if (selection.beg.row < -TermWin.nscrolled || selection.end.row >= TermWin.nrow) { if (selection.beg.row < -TermWin.nscrolled || selection.end.row >= TERM_WINDOW_GET_REPORTED_ROWS()) {
selection_reset(); selection_reset();
return; return;
} }
i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; i = (selection.end.row - selection.beg.row + 1) * (TERM_WINDOW_GET_REPORTED_COLS() + 1) + 1;
str = MALLOC(i * sizeof(char)); str = MALLOC(i * sizeof(char));
new_selection_text = (unsigned char *) str; new_selection_text = (unsigned char *) str;
@ -2694,12 +2688,12 @@ selection_make(Time tm)
*/ */
for (; row < end_row; row++) { for (; row < end_row; row++) {
t = &(screen.text[row][col]); t = &(screen.text[row][col]);
if ((end_col = screen.text[row][TermWin.ncol]) == WRAP_CHAR) if ((end_col = screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()]) == WRAP_CHAR)
end_col = TermWin.ncol; end_col = TERM_WINDOW_GET_REPORTED_COLS();
for (; col < end_col; col++) for (; col < end_col; col++)
*str++ = *t++; *str++ = *t++;
col = 0; col = 0;
if (screen.text[row][TermWin.ncol] != WRAP_CHAR) { if (screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()] != WRAP_CHAR) {
if (!(Options & Opt_select_trailing_spaces)) { if (!(Options & Opt_select_trailing_spaces)) {
for (str--; *str == ' ' || *str == '\t'; str--); for (str--; *str == ' ' || *str == '\t'; str--);
str++; str++;
@ -2711,13 +2705,13 @@ selection_make(Time tm)
* B: end row * B: end row
*/ */
t = &(screen.text[row][col]); t = &(screen.text[row][col]);
end_col = screen.text[row][TermWin.ncol]; end_col = screen.text[row][TERM_WINDOW_GET_REPORTED_COLS()];
if (end_col == WRAP_CHAR || selection.end.col <= end_col) { if (end_col == WRAP_CHAR || selection.end.col <= end_col) {
i = 0; i = 0;
end_col = selection.end.col + 1; end_col = selection.end.col + 1;
} else } else
i = 1; i = 1;
UPPER_BOUND(end_col, TermWin.ncol); UPPER_BOUND(end_col, TERM_WINDOW_GET_REPORTED_COLS());
for (; col < end_col; col++) for (; col < end_col; col++)
*str++ = *t++; *str++ = *t++;
if (!(Options & Opt_select_trailing_spaces)) { if (!(Options & Opt_select_trailing_spaces)) {
@ -2801,10 +2795,10 @@ selection_delimit_word(int col, int row, row_col_t *beg, row_col_t *end)
if (!screen.text || !screen.rend) if (!screen.text || !screen.rend)
return; return;
last_col = TermWin.ncol - 1; last_col = TERM_WINDOW_GET_REPORTED_COLS() - 1;
if (row >= TermWin.nrow) { if (row >= TERM_WINDOW_GET_REPORTED_ROWS()) {
row = TermWin.nrow - 1; row = TERM_WINDOW_GET_REPORTED_ROWS() - 1;
col = last_col; col = last_col;
} else if (row < -TermWin.saveLines) { } else if (row < -TermWin.saveLines) {
row = -TermWin.saveLines; row = -TermWin.saveLines;
@ -2930,7 +2924,7 @@ selection_delimit_word(int col, int row, row_col_t *beg, row_col_t *end)
} }
} }
} }
if (end_col == last_col && (end_row < (TermWin.nrow - 1))) { if (end_col == last_col && (end_row < (TERM_WINDOW_GET_REPORTED_ROWS() - 1))) {
if (*++stp == WRAP_CHAR) { if (*++stp == WRAP_CHAR) {
stp = screen.text[end_row + row_offset + 1]; stp = screen.text[end_row + row_offset + 1];
#ifdef MULTI_CHARSET #ifdef MULTI_CHARSET
@ -2976,7 +2970,7 @@ selection_extend(int x, int y, int flag)
*/ */
col = Pixel2Col(x); col = Pixel2Col(x);
row = Pixel2Row(y); row = Pixel2Row(y);
BOUND(row, 0, TermWin.nrow - 1); BOUND(row, 0, TERM_WINDOW_GET_REPORTED_ROWS() - 1);
if (((selection.clicks % 3) == 1) && !flag && (col == selection.mark.col && (row == selection.mark.row + TermWin.view_start))) { if (((selection.clicks % 3) == 1) && !flag && (col == selection.mark.col && (row == selection.mark.row + TermWin.view_start))) {
/* select nothing */ /* select nothing */
selection_setclr(0, selection.beg.row, selection.beg.col, selection.end.row, selection.end.col); selection_setclr(0, selection.beg.row, selection.beg.col, selection.end.row, selection.end.col);
@ -3036,7 +3030,7 @@ selection_extend_colrow(int col, int row, int flag, int cont)
return; return;
} }
old_col = col; old_col = col;
BOUND(col, -1, TermWin.ncol); BOUND(col, -1, TERM_WINDOW_GET_REPORTED_COLS());
old_beg.col = selection.beg.col; old_beg.col = selection.beg.col;
old_beg.row = selection.beg.row; old_beg.row = selection.beg.row;
old_end.col = selection.end.col; old_end.col = selection.end.col;
@ -3053,9 +3047,9 @@ selection_extend_colrow(int col, int row, int flag, int cont)
else if (row > selection.end.row || (row == selection.end.row && col >= selection.end.col)) { else if (row > selection.end.row || (row == selection.end.row && col >= selection.end.col)) {
/* */ ; /* */ ;
} else if (((col - selection.beg.col) } else if (((col - selection.beg.col)
+ ((row - selection.beg.row) * TermWin.ncol)) + ((row - selection.beg.row) * TERM_WINDOW_GET_REPORTED_COLS()))
< ((selection.end.col - col) < ((selection.end.col - col)
+ ((selection.end.row - row) * TermWin.ncol))) + ((selection.end.row - row) * TERM_WINDOW_GET_REPORTED_COLS())))
closeto = LEFT; closeto = LEFT;
} }
if (selection.clicks == 1) { if (selection.clicks == 1) {
@ -3066,7 +3060,7 @@ selection_extend_colrow(int col, int row, int flag, int cont)
if (closeto == LEFT) { if (closeto == LEFT) {
selection.beg.row = row; selection.beg.row = row;
selection.beg.col = col; selection.beg.col = col;
end_col = screen.text[row + TermWin.saveLines][TermWin.ncol]; end_col = screen.text[row + TermWin.saveLines][TERM_WINDOW_GET_REPORTED_COLS()];
if (end_col != WRAP_CHAR && selection.beg.col > end_col) { if (end_col != WRAP_CHAR && selection.beg.col > end_col) {
if (selection.beg.row < selection.end.row) { if (selection.beg.row < selection.end.row) {
selection.beg.col = -1; selection.beg.col = -1;
@ -3079,9 +3073,9 @@ selection_extend_colrow(int col, int row, int flag, int cont)
} else { } else {
selection.end.row = row; selection.end.row = row;
selection.end.col = col - 1; selection.end.col = col - 1;
end_col = screen.text[row + TermWin.saveLines][TermWin.ncol]; end_col = screen.text[row + TermWin.saveLines][TERM_WINDOW_GET_REPORTED_COLS()];
if (end_col != WRAP_CHAR && selection.end.col >= end_col) if (end_col != WRAP_CHAR && selection.end.col >= end_col)
selection.end.col = TermWin.ncol - 1; selection.end.col = TERM_WINDOW_GET_REPORTED_COLS() - 1;
} }
} else if ((row < selection.mark.row) } else if ((row < selection.mark.row)
|| (row == selection.mark.row && col < selection.mark.col)) { || (row == selection.mark.row && col < selection.mark.col)) {
@ -3091,7 +3085,7 @@ selection_extend_colrow(int col, int row, int flag, int cont)
selection.end.row = selection.mark.row; selection.end.row = selection.mark.row;
selection.end.col = selection.mark.col - 1; selection.end.col = selection.mark.col - 1;
if (selection.end.col >= 0) { if (selection.end.col >= 0) {
end_col = screen.text[row + TermWin.saveLines][TermWin.ncol]; end_col = screen.text[row + TermWin.saveLines][TERM_WINDOW_GET_REPORTED_COLS()];
if (end_col != WRAP_CHAR && selection.beg.col > end_col) { if (end_col != WRAP_CHAR && selection.beg.col > end_col) {
if (selection.beg.row < selection.end.row) { if (selection.beg.row < selection.end.row) {
selection.beg.col = -1; selection.beg.col = -1;
@ -3109,19 +3103,19 @@ selection_extend_colrow(int col, int row, int flag, int cont)
selection.end.row = row; selection.end.row = row;
selection.end.col = col - 1; selection.end.col = col - 1;
if (old_col >= 0) { if (old_col >= 0) {
end_col = screen.text[row + TermWin.saveLines][TermWin.ncol]; end_col = screen.text[row + TermWin.saveLines][TERM_WINDOW_GET_REPORTED_COLS()];
if (end_col != WRAP_CHAR && selection.end.col >= end_col) if (end_col != WRAP_CHAR && selection.end.col >= end_col)
selection.end.col = TermWin.ncol - 1; selection.end.col = TERM_WINDOW_GET_REPORTED_COLS() - 1;
} }
} }
#ifdef MULTI_CHARSET #ifdef MULTI_CHARSET
if ((selection.beg.col > 0) && (selection.beg.col < TermWin.ncol)) { if ((selection.beg.col > 0) && (selection.beg.col < TERM_WINDOW_GET_REPORTED_COLS())) {
r = selection.beg.row + TermWin.saveLines; r = selection.beg.row + TermWin.saveLines;
if (((screen.rend[r][selection.beg.col] & RS_multiMask) == RS_multi2) if (((screen.rend[r][selection.beg.col] & RS_multiMask) == RS_multi2)
&& ((screen.rend[r][selection.beg.col - 1] & RS_multiMask) == RS_multi1)) && ((screen.rend[r][selection.beg.col - 1] & RS_multiMask) == RS_multi1))
selection.beg.col--; selection.beg.col--;
} }
if ((selection.end.col > 0) && (selection.end.col < (TermWin.ncol - 1))) { if ((selection.end.col > 0) && (selection.end.col < (TERM_WINDOW_GET_REPORTED_COLS() - 1))) {
r = selection.end.row + TermWin.saveLines; r = selection.end.row + TermWin.saveLines;
if (((screen.rend[r][selection.end.col] & RS_multiMask) == RS_multi1) if (((screen.rend[r][selection.end.col] & RS_multiMask) == RS_multi1)
&& ((screen.rend[r][selection.end.col + 1] & RS_multiMask) == RS_multi2)) && ((screen.rend[r][selection.end.col + 1] & RS_multiMask) == RS_multi2))
@ -3175,7 +3169,7 @@ selection_extend_colrow(int col, int row, int flag, int cont)
selection.beg.col = new_beg2.col; selection.beg.col = new_beg2.col;
selection.clicks = 3; selection.clicks = 3;
} }
selection.end.col = TermWin.ncol - 1; selection.end.col = TERM_WINDOW_GET_REPORTED_COLS() - 1;
} }
D_SELECT(("(c:%d,r:%d)-(c:%d,r:%d) old (c:%d,r:%d)-(c:%d,r:%d)\n", selection.beg.col, selection.beg.row, D_SELECT(("(c:%d,r:%d)-(c:%d,r:%d) old (c:%d,r:%d)-(c:%d,r:%d)\n", selection.beg.col, selection.beg.row,
selection.end.col, selection.end.row, old_beg.col, old_beg.row, old_end.col, old_end.row)); selection.end.col, selection.end.row, old_beg.col, old_beg.row, old_end.col, old_end.row));
@ -3184,7 +3178,7 @@ selection_extend_colrow(int col, int row, int flag, int cont)
* B1: clear anything before the current selection * B1: clear anything before the current selection
*/ */
if ((old_beg.row < selection.beg.row) || (old_beg.row == selection.beg.row && old_beg.col < selection.beg.col)) { if ((old_beg.row < selection.beg.row) || (old_beg.row == selection.beg.row && old_beg.col < selection.beg.col)) {
if (selection.beg.col < TermWin.ncol - 1) { if (selection.beg.col < TERM_WINDOW_GET_REPORTED_COLS() - 1) {
row = selection.beg.row; row = selection.beg.row;
col = selection.beg.col + 1; col = selection.beg.col + 1;
} else { } else {
@ -3202,7 +3196,7 @@ selection_extend_colrow(int col, int row, int flag, int cont)
col = selection.end.col - 1; col = selection.end.col - 1;
} else { } else {
row = selection.end.row - 1; row = selection.end.row - 1;
col = TermWin.ncol - 1; col = TERM_WINDOW_GET_REPORTED_COLS() - 1;
} }
selection_setclr(0, row, col, old_end.row, old_end.col); selection_setclr(0, row, col, old_end.row, old_end.col);
} }
@ -3391,7 +3385,8 @@ xim_get_position(XPoint * pos)
void void
parse_screen_status_if_necessary(void) parse_screen_status_if_necessary(void)
{ {
ns_parse_screen(TermWin.screen, (TermWin.screen_pending > 1), TermWin.ncol, screen.text[TermWin.nrow + TermWin.saveLines - 1]); ns_parse_screen(TermWin.screen, (TermWin.screen_pending > 1),
TERM_WINDOW_GET_REPORTED_COLS(), screen.text[TERM_WINDOW_GET_REPORTED_ROWS() + TermWin.saveLines - 1]);
if (TermWin.screen_pending > 1) if (TermWin.screen_pending > 1)
TermWin.screen_pending = 0; TermWin.screen_pending = 0;
} }

8
src/screen.h
View File

@ -47,8 +47,8 @@
* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
* ERASE_ROWS : set <num> rows starting from row <row> to the foreground color * ERASE_ROWS : set <num> rows starting from row <row> to the foreground color
*/ */
#define CLEAR_ROWS(row, num) do {if (buffer_pixmap) {XCopyArea(Xdisplay, pmap, buffer_pixmap, TermWin.gc, Col2Pixel(0), Row2Pixel(row), TermWin.width, Height2Pixel(num), \ #define CLEAR_ROWS(row, num) do {if (buffer_pixmap) {XCopyArea(Xdisplay, pmap, buffer_pixmap, TermWin.gc, Col2Pixel(0), Row2Pixel(row), TERM_WINDOW_GET_WIDTH(), Height2Pixel(num), \
Col2Pixel(0), Row2Pixel(row));} XClearArea(Xdisplay, TermWin.vt, Col2Pixel(0), Row2Pixel(row), TermWin.width, Height2Pixel(num), 0);} while (0) Col2Pixel(0), Row2Pixel(row));} XClearArea(Xdisplay, TermWin.vt, Col2Pixel(0), Row2Pixel(row), TERM_WINDOW_GET_WIDTH(), Height2Pixel(num), 0);} while (0)
#define CLEAR_CHARS(x, y, num) ((buffer_pixmap) \ #define CLEAR_CHARS(x, y, num) ((buffer_pixmap) \
? (XCopyArea(Xdisplay, pmap, buffer_pixmap, TermWin.gc, x, y, Width2Pixel(num), Height2Pixel(1), x, y)) \ ? (XCopyArea(Xdisplay, pmap, buffer_pixmap, TermWin.gc, x, y, Width2Pixel(num), Height2Pixel(1), x, y)) \
: (XClearArea(Xdisplay, TermWin.vt, x, y, Width2Pixel(num), Height2Pixel(1), 0))) : (XClearArea(Xdisplay, TermWin.vt, x, y, Width2Pixel(num), Height2Pixel(1), 0)))
@ -57,8 +57,8 @@
: (XClearArea(Xdisplay, TermWin.vt, x, y, w, h, 0))) : (XClearArea(Xdisplay, TermWin.vt, x, y, w, h, 0)))
#define UPDATE_BOX(x1, y1, x2, y2) do {if (buffer_pixmap) {if (x1 < low_x) low_x = x1; if (x2 > high_x) high_x = x2; \ #define UPDATE_BOX(x1, y1, x2, y2) do {if (buffer_pixmap) {if (x1 < low_x) low_x = x1; if (x2 > high_x) high_x = x2; \
if (y1 < low_y) low_y = y1; if (y2 > high_y) high_y = y2;}} while (0) if (y1 < low_y) low_y = y1; if (y2 > high_y) high_y = y2;}} while (0)
#define ERASE_ROWS(row, num) do {XFillRectangle(Xdisplay, draw_buffer, TermWin.gc, Col2Pixel(0), Row2Pixel(row), TermWin.width, Height2Pixel(num)); \ #define ERASE_ROWS(row, num) do {XFillRectangle(Xdisplay, draw_buffer, TermWin.gc, Col2Pixel(0), Row2Pixel(row), TERM_WINDOW_GET_WIDTH(), Height2Pixel(num)); \
if (buffer_pixmap) {XClearArea(Xdisplay, TermWin.vt, Col2Pixel(0), Row2Pixel(row), TermWin.width, Height2Pixel(num), 0);}} while (0) if (buffer_pixmap) {XClearArea(Xdisplay, TermWin.vt, Col2Pixel(0), Row2Pixel(row), TERM_WINDOW_GET_WIDTH(), Height2Pixel(num), 0);}} while (0)
#define DRAW_STRING(Func, x, y, str, len) Func(Xdisplay, draw_buffer, TermWin.gc, x, y, str, len) #define DRAW_STRING(Func, x, y, str, len) Func(Xdisplay, draw_buffer, TermWin.gc, x, y, str, len)
#ifndef NO_BRIGHTCOLOR #ifndef NO_BRIGHTCOLOR
# define MONO_BOLD(x) (((x) & RS_Bold) && fore == fgColor) # define MONO_BOLD(x) (((x) & RS_Bold) && fore == fgColor)

5
src/startup.c
View File

@ -231,11 +231,6 @@ eterm_bootstrap(int argc, char *argv[])
process_colors(); process_colors();
Create_Windows(argc, argv); Create_Windows(argc, argv);
#ifdef ESCREEN
if (NS_MAGIC_LINE(TermWin.screen_mode)) {
TermWin.nrow++;
}
#endif
scr_reset(); /* initialize screen */ scr_reset(); /* initialize screen */
/* Initialize the scrollbar */ /* Initialize the scrollbar */

32
src/startup.h
View File

@ -62,14 +62,32 @@
#define TermWin_TotalWidth() (TermWin.width + 2 * TermWin.internalBorder) #define TermWin_TotalWidth() (TermWin.width + 2 * TermWin.internalBorder)
#define TermWin_TotalHeight() (TermWin.height + 2 * TermWin.internalBorder) #define TermWin_TotalHeight() (TermWin.height + 2 * TermWin.internalBorder)
#define Xscreen DefaultScreen(Xdisplay) #define TERM_WINDOW_FULL_WIDTH() (TermWin.width + 2 * TermWin.internalBorder)
#define Xcmap DefaultColormap(Xdisplay,Xscreen) #define TERM_WINDOW_FULL_HEIGHT() (TermWin.height + 2 * TermWin.internalBorder)
#define Xdepth DefaultDepth(Xdisplay,Xscreen) #define TERM_WINDOW_GET_WIDTH() (TermWin.width)
#define Xroot DefaultRootWindow(Xdisplay) #define TERM_WINDOW_GET_HEIGHT() (TermWin.height)
#define Xvisual DefaultVisual(Xdisplay, Xscreen) #define TERM_WINDOW_SET_WIDTH() (TermWin.width = TERM_WINDOW_GET_COLS() * TermWin.fwidth)
#define TERM_WINDOW_SET_HEIGHT() (TermWin.height = TERM_WINDOW_GET_ROWS() * TermWin.fheight)
#define TERM_WINDOW_GET_REPORTED_ROWS() (TermWin.nrow)
#define TERM_WINDOW_GET_REPORTED_COLS() (TermWin.ncol)
#define TERM_WINDOW_GET_COLS() (TermWin.ncol)
#define TERM_WINDOW_SET_COLS(c) (TermWin.ncol = (c))
#ifdef ESCREEN
# define TERM_WINDOW_GET_ROWS() (NS_MAGIC_LINE(TermWin.screen_mode) ? TermWin.nrow - 1 : TermWin.nrow)
# define TERM_WINDOW_SET_ROWS(r) (TermWin.nrow = (NS_MAGIC_LINE(TermWin.screen_mode) ? (r + 1) : (r)))
#else
# define TERM_WINDOW_GET_ROWS() (TermWin.nrow)
# define TERM_WINDOW_SET_ROWS(r) (TermWin.nrow = (r))
#endif
#define Xscreen DefaultScreen(Xdisplay)
#define Xcmap DefaultColormap(Xdisplay, Xscreen)
#define Xroot DefaultRootWindow(Xdisplay)
#define Xvisual DefaultVisual(Xdisplay, Xscreen)
#ifdef DEBUG_DEPTH #ifdef DEBUG_DEPTH
# undef Xdepth # define Xdepth DEBUG_DEPTH
# define Xdepth DEBUG_DEPTH #else
# define Xdepth DefaultDepth(Xdisplay, Xscreen)
#endif #endif
enum { enum {

2
src/term.c
View File

@ -1389,7 +1389,7 @@ process_window_mode(unsigned int nargs, int args[])
tt_write((unsigned char *) buff, strlen(buff)); tt_write((unsigned char *) buff, strlen(buff));
break; break;
case 18: case 18:
snprintf(buff, sizeof(buff), "\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); snprintf(buff, sizeof(buff), "\033[8;%d;%dt", TERM_WINDOW_GET_REPORTED_ROWS(), TERM_WINDOW_GET_REPORTED_COLS());
tt_write((unsigned char *) buff, strlen(buff)); tt_write((unsigned char *) buff, strlen(buff));
break; break;
case 20: case 20:

46
src/windows.c
View File

@ -366,8 +366,8 @@ Create_Windows(int argc, char *argv[])
szHint.height = height; szHint.height = height;
szHint.flags |= USSize; szHint.flags |= USSize;
} }
TermWin.ncol = szHint.width; TERM_WINDOW_SET_COLS(szHint.width);
TermWin.nrow = szHint.height; TERM_WINDOW_SET_ROWS(szHint.height);
change_font(1, NULL); change_font(1, NULL);
@ -527,9 +527,9 @@ resize_parent(unsigned int width, unsigned int height)
void void
set_width(unsigned short width) set_width(unsigned short width)
{ {
unsigned short height = TermWin.nrow; unsigned short height = TERM_WINDOW_GET_REPORTED_ROWS();
if (width != TermWin.ncol) { if (width != TERM_WINDOW_GET_REPORTED_COLS()) {
width = szHint.base_width + width * TermWin.fwidth; width = szHint.base_width + width * TermWin.fwidth;
height = szHint.base_height + height * TermWin.fheight; height = szHint.base_height + height * TermWin.fheight;
@ -542,7 +542,7 @@ void
update_size_hints(void) update_size_hints(void)
{ {
D_X11(("Called.\n")); D_X11(("Called.\n"));
szHint.base_width = (2 * TermWin.internalBorder) + ((scrollbar_is_visible())? (scrollbar_trough_width()) : (0)); szHint.base_width = (2 * TermWin.internalBorder) + ((scrollbar_is_visible()) ? (scrollbar_trough_width()) : (0));
szHint.base_height = (2 * TermWin.internalBorder) + bbar_calc_docked_height(BBAR_DOCKED); szHint.base_height = (2 * TermWin.internalBorder) + bbar_calc_docked_height(BBAR_DOCKED);
szHint.width_inc = TermWin.fwidth; szHint.width_inc = TermWin.fwidth;
@ -552,8 +552,8 @@ update_size_hints(void)
szHint.min_width = szHint.base_width + szHint.width_inc; szHint.min_width = szHint.base_width + szHint.width_inc;
szHint.min_height = szHint.base_height + szHint.height_inc; szHint.min_height = szHint.base_height + szHint.height_inc;
szHint.width = szHint.base_width + TermWin.width; szHint.width = szHint.base_width + TERM_WINDOW_GET_WIDTH();
szHint.height = szHint.base_height + TermWin.height; szHint.height = szHint.base_height + TERM_WINDOW_GET_HEIGHT();
D_X11((" Minimum width/height == %lux%lu, width/height == %lux%lu\n", szHint.min_width, szHint.min_height, szHint.width, szHint.height)); D_X11((" Minimum width/height == %lux%lu, width/height == %lux%lu\n", szHint.min_width, szHint.min_height, szHint.width, szHint.height));
szHint.flags = PMinSize | PResizeInc | PBaseSize; szHint.flags = PMinSize | PResizeInc | PBaseSize;
@ -567,20 +567,16 @@ term_resize(int width, int height)
static int last_width = 0, last_height = 0; static int last_width = 0, last_height = 0;
D_X11(("term_resize(%d, %d)\n", width, height)); D_X11(("term_resize(%d, %d)\n", width, height));
TermWin.width = TermWin.ncol * TermWin.fwidth; TERM_WINDOW_SET_WIDTH();
#ifdef ESCREEN TERM_WINDOW_SET_HEIGHT();
TermWin.height = (NS_MAGIC_LINE(TermWin.screen_mode) ? TermWin.nrow - 1 : TermWin.nrow) * TermWin.fheight; D_X11((" -> New TermWin width/height == %lux%lu\n", TERM_WINDOW_GET_WIDTH(), TERM_WINDOW_GET_HEIGHT()));
#else width = TERM_WINDOW_FULL_WIDTH();
TermWin.height = TermWin.nrow * TermWin.fheight; height = TERM_WINDOW_FULL_HEIGHT();
#endif
D_X11((" -> New TermWin width/height == %lux%lu\n", TermWin.width, TermWin.height));
width = TermWin_TotalWidth();
height = TermWin_TotalHeight();
XMoveResizeWindow(Xdisplay, TermWin.vt, XMoveResizeWindow(Xdisplay, TermWin.vt,
((Options & Opt_scrollbar_right) ? (0) : ((scrollbar_is_visible())? (scrollbar_trough_width()) : (0))), ((Options & Opt_scrollbar_right) ? (0) : ((scrollbar_is_visible())? (scrollbar_trough_width()) : (0))),
bbar_calc_docked_height(BBAR_DOCKED_TOP), width, height); bbar_calc_docked_height(BBAR_DOCKED_TOP), width, height);
if (width != last_width || height != last_height) { if (width != last_width || height != last_height) {
render_simage(images[image_bg].current, TermWin.vt, TermWin_TotalWidth(), TermWin_TotalHeight(), image_bg, 0); render_simage(images[image_bg].current, TermWin.vt, width, height, image_bg, 0);
scr_reset(); scr_reset();
scr_touch(); scr_touch();
if (image_mode_is(image_bg, MODE_AUTO)) { if (image_mode_is(image_bg, MODE_AUTO)) {
@ -616,18 +612,12 @@ handle_resize(unsigned int width, unsigned int height)
D_EVENTS(("handle_resize(%u, %u)\n", width, height)); D_EVENTS(("handle_resize(%u, %u)\n", width, height));
#ifdef ESCREEN if (first_time || (new_ncol != TERM_WINDOW_GET_REPORTED_ROWS()) || (new_nrow != TERM_WINDOW_GET_REPORTED_COLS())) {
if (NS_MAGIC_LINE(TermWin.screen_mode)) { TERM_WINDOW_SET_COLS(new_ncol);
new_nrow++; TERM_WINDOW_SET_ROWS(new_nrow);
}
#endif
if (first_time || (new_ncol != TermWin.ncol) || (new_nrow != TermWin.nrow)) {
TermWin.ncol = new_ncol;
TermWin.nrow = new_nrow;
term_resize(width, height); term_resize(width, height);
szHint.width = szHint.base_width + TermWin.width; szHint.width = szHint.base_width + TERM_WINDOW_GET_WIDTH();
szHint.height = szHint.base_height + TermWin.height; szHint.height = szHint.base_height + TERM_WINDOW_GET_HEIGHT();
D_X11((" -> New szHint.width/height == %lux%lu\n", szHint.width, szHint.height)); D_X11((" -> New szHint.width/height == %lux%lu\n", szHint.width, szHint.height));
scrollbar_resize(width, szHint.height - bbar_calc_docked_height(BBAR_DOCKED)); scrollbar_resize(width, szHint.height - bbar_calc_docked_height(BBAR_DOCKED));
bbar_resize_all(szHint.width); bbar_resize_all(szHint.width);