ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.161 by root, Tue Feb 22 21:41:50 2005 UTC vs.
Revision 1.251 by root, Wed Jan 25 21:03:04 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 TermWin.view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
… …
88/* 89/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 93 */
93#define drawBuffer TermWin.vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
129 l.touch ();
130
121 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 133
134 text_t *et = l.t + col;
135 rend_t *er = l.r + col;
136
124 while (width--) 137 while (width--)
125 { 138 {
126 *et++ = ' '; 139 *et++ = ' ';
127 *er++ = efs; 140 *er++ = efs;
128 } 141 }
129} 142}
130 143
131/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
132/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
133void 146void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
135{ 148{
136#ifdef DEBUG_STRICT 149 scr_blank_line (l, 0, ncol, efs);
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144 150
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 151 l.l = 0;
152 l.f = 0;
146} 153}
147 154
148/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
151void 159void
152rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
153{ 161{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q;
156 int k;
157 rend_t setrstyle;
158
159#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
160 scr_overlay_off (); 163 scr_overlay_off ();
161#endif 164#endif
162 165
163 TermWin.view_start = 0; 166 view_start = 0;
164 num_scr = 0; 167 num_scr = 0;
165 168
166 if (TermWin.ncol == 0) 169 if (ncol == 0)
167 TermWin.ncol = 80; 170 ncol = 80;
168 171
169 if (TermWin.nrow == 0) 172 if (nrow == 0)
170 TermWin.nrow = 24; 173 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
184 //TODO//FIXME
181 TermWin.saveLines++; 185 saveLines++;
182 prev_nrow--; 186 prev_nrow--;
183 TermWin.nscrolled++; 187 top_row--;
184 } 188 }
185 189
186 want_refresh = 1; 190 want_refresh = 1;
187 191
188 prev_total_rows = prev_nrow + TermWin.saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 193 total_rows = nrow + saveLines;
190 194
191 screen.tscroll = 0; 195 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 196 screen.bscroll = nrow - 1;
193 197
194 if (!talloc) 198 if (!row_buf)
195 { 199 {
200 /*
201 * first time called so just malloc everything: don't rely on realloc
202 */
203 top_row = 0;
204 term_start = 0;
205
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199 208
200 if (!screen.text) 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
201 { 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 /* 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 * first time called so just malloc everything: don't rely on realloc 212
204 * Note: this is still needed so that all the scrollback lines are NULL 213 for (int row = nrow; row--; )
205 */ 214 {
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++)
220 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 217 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
226 } 218 }
227 219
228 memset (charsets, 'B', sizeof (charsets)); 220 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 221 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 222 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 223 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 224 screen.charset = 0;
234 current_screen = PRIMARY; 225 current_screen = PRIMARY;
… …
246 selection.text = NULL; 237 selection.text = NULL;
247 selection.len = 0; 238 selection.len = 0;
248 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
249 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
250 selection.clicks = 0; 241 selection.clicks = 0;
251 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
252 rvideo = 0;
253 } 243 }
254 else 244 else
255 { 245 {
256 /* 246 /*
257 * add or delete rows as appropriate 247 * add or delete rows as appropriate
258 */ 248 */
259 setrstyle = DEFAULT_RSTYLE;
260 249
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
261 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
262 { 255 {
263 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow);
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266
267 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
268 { 257 {
269 q = p + TermWin.saveLines; 258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
270 263
271 if (screen.text[q]) 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; )
268 {
269 lresize (drawn_buf[row]);
270 lresize (swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 {
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row
285
286 if (top_row)
287 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
294 do
295 {
296 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
302
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
272 { 304 {
273#ifdef DEBUG_STRICT 305 p = MOD (p - 1, prev_total_rows);
274 assert (screen.rend[q]); 306
275#endif 307 plines++;
276 talloc->free (screen.text[q]); 308 llen += prev_ncol;
277 ralloc->free (screen.rend[q]);
278 } 309 }
279 310
280 if (swap.text[p]) 311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
319 int lofs = 0;
320 line_t *qline;
321
322 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++)
281 { 324 {
282#ifdef DEBUG_STRICT 325 qline = row_buf + qrow;
283 assert (swap.rend[p]); 326 lalloc (*qline);
284#endif 327 qline->l = ncol;
285 talloc->free (swap.text[p]); 328 qline->is_longer (1);
286 ralloc->free (swap.rend[p]); 329
330 int qcol = 0;
331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
336 // fill a single destination line
337 while (lofs < llen && qcol < ncol)
338 {
339 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol;
341
342 prow = MOD (p + prow, prev_total_rows);
343
344 // we only adjust the cursor _row_ and put it into
345 // the topmost line of "long line" it was in, as
346 // this seems to upset applications/shells/readline
347 // least.
348 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow);
350
351 line_t &pline = old_buf [prow];
352
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354
355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
357
358 lofs += len;
359 qcol += len;
360 }
287 } 361 }
288 362
289#ifdef DEBUG_STRICT 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
290 assert (drawn_text[p] && drawn_rend[p]); 364 qline->is_longer (0);
291#endif 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
292 talloc->free (drawn_text[p]);
293 ralloc->free (drawn_rend[p]);
294 } 366 }
367 while (p != pend && q > 0);
295 368
296 /* we have fewer rows so fix up cursor position */ 369 term_start = total_rows - nrow;
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 370 top_row = q - term_start;
298 371
299 scr_reset_realloc (); /* realloc _last_ */ 372 // make sure all terminal lines exist
300 } 373 while (top_row > 0)
301 else if (nrow > prev_nrow) 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
302 { 375 }
303 /* add rows */ 376 else
304 scr_reset_realloc (); /* realloc _first_ */ 377 {
305 378 // if no scrollback exists (yet), wing, instead of wrap
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 379
307 380 for (int row = min (nrow, prev_nrow); row--; )
308 k = min (TermWin.nscrolled, nrow - prev_nrow);
309
310 for (p = prev_total_rows; p < total_rows; p++)
311 { 381 {
312 screen.tlen[p] = 0; 382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
313 screen.text[p] = NULL; 383 line_t &qline = row_buf [row];
314 screen.rend[p] = NULL; 384
385 qline = pline;
386 lresize (qline);
315 } 387 }
316 388
317 for (p = prev_total_rows; p < total_rows - k; p++)
318 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
319
320 for (p = prev_nrow; p < nrow; p++) 389 for (int row = prev_nrow; row < nrow; row++)
321 { 390 {
322 swap.tlen[p] = 0; 391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
323 swap.text[p] = NULL;
324 swap.rend[p] = NULL;
325 drawn_text[p] = NULL;
326 drawn_rend[p] = NULL;
327 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
328 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
329 } 392 }
330 393
331 if (k > 0) 394 term_start = 0;
332 {
333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
334 screen.cur.row += k;
335 screen.s_cur.row += k;
336 TermWin.nscrolled -= k;
337 }
338
339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow);
341#else /* drive with your eyes closed */
342 MIN_IT (screen.cur.row, nrow - 1);
343#endif
344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
345 }
346
347 /* resize columns */
348 if (ncol != prev_ncol)
349 { 395 }
350 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
351 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
352 396
353 for (p = 0; p < total_rows; p++) 397 free (old_buf);
354 { 398 delete old_ta;
355 if (screen.text[p]) 399 delete old_ra;
356 {
357 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
358 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
359 400
360 MIN_IT (screen.tlen[p], (int16_t)ncol); 401 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1);
361 403
362 if (ncol > prev_ncol)
363 scr_blank_line (&screen.text[p][prev_ncol],
364 &screen.rend[p][prev_ncol],
365 ncol - prev_ncol, setrstyle);
366 }
367 }
368
369 for (p = 0; p < nrow; p++)
370 {
371 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
372 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
373
374 if (ncol > prev_ncol)
375 scr_blank_line (&drawn_text[p][prev_ncol],
376 &drawn_rend[p][prev_ncol],
377 ncol - prev_ncol, setrstyle);
378
379 if (swap.text[p])
380 {
381 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
382 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
383
384 MIN_IT (swap.tlen[p], (int16_t)ncol);
385
386 if (ncol > prev_ncol)
387 scr_blank_line (&swap.text[p][prev_ncol],
388 &swap.rend[p][prev_ncol],
389 ncol - prev_ncol, setrstyle);
390 }
391
392 }
393
394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
395
396 delete talloc; talloc = ta;
397 delete ralloc; ralloc = ra;
398 }
399
400 if (tabs)
401 free (tabs); 404 free (tabs);
402 } 405 }
406
407 CLEAR_ALL_SELECTION ();
403 408
404 prev_nrow = nrow; 409 prev_nrow = nrow;
405 prev_ncol = ncol; 410 prev_ncol = ncol;
406 411
407 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
408 413
409 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
410 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
411 419
412 tt_winch (); 420 tt_winch ();
413}
414 421
415void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416rxvt_term::scr_reset_realloc ()
417{
418 unsigned int total_rows, nrow;
419
420 nrow = TermWin.nrow;
421 total_rows = nrow + TermWin.saveLines;
422 /* *INDENT-OFF* */
423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
424 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
425 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
426 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
427
428 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
429 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
430
431 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
432 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
433 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
434 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
435 /* *INDENT-ON* */
436} 423}
437 424
438/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
439/* 426/*
440 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
441 */ 428 */
442void 429void
443rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
444{ 431{
445 unsigned int total_rows; 432 if (row_buf)
446 int i; 433 {
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
452 436
453 free (screen.text); 437 free (row_buf);
454 free (screen.tlen); 438 free (swap_buf);
455 free (screen.rend); 439 free (drawn_buf);
456 free (drawn_text);
457 free (drawn_rend);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text);
462 free (buf_rend);
463 free (tabs); 440 free (tabs);
464 441
465 /* NULL these so if anything tries to use them, we'll know about it */ 442 row_buf = 0; // signal that we freed all the arrays
466 screen.text = drawn_text = swap.text = NULL; 443 }
467 screen.rend = drawn_rend = swap.rend = NULL;
468 screen.tlen = swap.tlen = NULL;
469 buf_text = NULL;
470 buf_rend = NULL;
471 tabs = NULL;
472} 444}
473 445
474/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
475/* 447/*
476 * Hard reset 448 * Hard reset
… …
481 scr_release (); 453 scr_release ();
482 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
483 scr_reset (); 455 scr_reset ();
484 456
485 scr_clear (true); 457 scr_clear (true);
486 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
487} 459}
488 460
489/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
490 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
491 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
493 * Save and Restore cursor 465 * Save and Restore cursor
494 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
495 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
496 */ 468 */
497void 469void
498rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
499{ 471{
500 screen_t *s; 472 screen_t *s;
501 473
502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
503 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
527 set_font_style (); 499 set_font_style ();
528 break; 500 break;
529 } 501 }
530 502
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 504 min_it (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 505 min_it (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0);
539 MAX_IT (s->cur.col, 0);
540#endif 509#endif
510}
511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
541} 525}
542 526
543/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
544/* 528/*
545 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
546 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
547 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
548 */ 532 */
549int 533void
550rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
551{ 535{
552 int i; 536 if (scrn == current_screen)
537 return;
538
539 want_refresh = 1;
540 view_start = 0;
541
542 selection_check (2); /* check for boundary cross */
543
544 int i = current_screen; current_screen = scrn; scrn = i;
545
553#if NSCREENS 546#if NSCREENS
554 int offset; 547 if (OPTION (Opt_secondaryScreen))
555#endif
556
557 want_refresh = 1;
558
559 TermWin.view_start = 0;
560
561 if (current_screen == scrn)
562 return scrn;
563
564 selection_check (2); /* check for boundary cross */
565
566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
575#if NSCREENS
576 if (options & Opt_secondaryScreen)
577 { 548 {
578 num_scr = 0; 549 num_scr = 0;
579 offset = TermWin.saveLines;
580 550
581 for (i = prev_nrow; i--;) 551 scr_swap_screen ();
582 {
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 }
587 552
588 SWAP_IT (screen.charset, swap.charset, int16_t); 553 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 554 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
592 } 557 }
593 else 558 else
594#endif 559#endif
595 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
597
598 return scrn;
599} 562}
600 563
601// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
602void 565void
603rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
604{ 567{
605 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
606 return; 569 return;
607 570
608 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
609 572
610 screen.cur.col = 0; 573 screen.cur.col = 0;
611 574
612 if (screen.cur.row == screen.bscroll) 575 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 576 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
614 else if (screen.cur.row < TermWin.nrow - 1) 577 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 578 screen.cur.row++;
616} 579}
617 580
618/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
619/* 582/*
620 * Change the colour for following text 583 * Change the colour for following text
621 */ 584 */
622void 585void
623rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
624{ 587{
625 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
626 color = fgbg; 589 color = fgbg;
627 590
628 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
629 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
630 else 593 else
… …
634/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
635/* 598/*
636 * Change the rendition style for following text 599 * Change the rendition style for following text
637 */ 600 */
638void 601void
639rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
640 { 603 {
641 if (set) 604 if (set)
642 rstyle |= style; 605 rstyle |= style;
643 else if (style == ~RS_None) 606 else if (style == ~RS_None)
644 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
649/* ------------------------------------------------------------------------- */ 612/* ------------------------------------------------------------------------- */
650/* 613/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 615 * count positive ==> scroll up
653 * count negative ==> scroll down 616 * count negative ==> scroll down
654 * spec == 0 for normal routines
655 */ 617 */
656int 618int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
658{ 620{
659 int i, j;
660 long nscrolled;
661
662 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
663 return 0; 622 return 0;
664 623
665 want_refresh = 1; 624 want_refresh = 1;
625 num_scr += count;
666 626
667 if (row1 == 0 && count > 0 627 if (count > 0
628 && row1 == 0
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
630 {
631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635
636 // sever bottommost line
669 { 637 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 638 line_t &l = ROW(row2 - count);
671 639 l.is_longer (0);
672 if (nscrolled > (long)TermWin.saveLines) 640 l.touch ();
673 TermWin.nscrolled = TermWin.saveLines;
674 else
675 TermWin.nscrolled = (unsigned int)nscrolled;
676
677 if ((options & Opt_scrollWithBuffer)
678 && TermWin.view_start != 0
679 && TermWin.view_start != TermWin.saveLines)
680 scr_page (UP, count);
681 } 641 }
682 else if (!spec)
683 row1 += TermWin.saveLines;
684 642
685 row2 += TermWin.saveLines; 643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
686 649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
688 {
689 i = selection.beg.row + TermWin.saveLines;
690 j = selection.end.row + TermWin.saveLines;
691 if ((i < row1 && j > row1)
692 || (i < row2 && j > row2)
693 || (i - count < row1 && i >= row1)
694 || (i - count > row2 && i <= row2)
695 || (j - count < row1 && j >= row1)
696 || (j - count > row2 && j <= row2))
697 {
698 CLEAR_ALL_SELECTION ();
699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
700 } 670 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 671 selection.beg.row -= count;
705 selection.end.row -= count; 672 selection.end.row -= count;
706 selection.mark.row -= count; 673 selection.mark.row -= count;
674
675 if (selection.beg.row < top_row
676 || selection.end.row < top_row
677 || selection.mark.row < top_row)
678 {
679 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR;
707 } 681 }
708 }
709
710 selection_check (0); /* _after_ TermWin.nscrolled update */
711
712 num_scr += count;
713 j = count;
714
715 if (count < 0)
716 count = -count;
717
718 i = row2 - row1 + 1;
719 MIN_IT (count, i);
720
721 if (j > 0)
722 {
723 /* scroll up */
724
725 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734
735 j = row2 - count + 1, i = count;
736 }
737 else /* if (j < 0) */
738 {
739 /* scroll down */
740
741 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--)
743 { 682 }
744 buf_text[i] = screen.text[j]; 683
745 buf_rend[i] = screen.rend[j]; 684 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer)
686 && view_start != 0
687 && view_start != -saveLines)
688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
692 }
693 else
694 {
695 if (selection.op && current_screen == selection.screen)
746 } 696 {
747 697 if ((selection.beg.row < row1 && selection.end.row > row1)
748 /* Rotate lines */ 698 || (selection.beg.row < row2 && selection.end.row > row2)
749 for (j = row2, i = j - count; i >= row1; i--, j--) 699 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
700 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
701 || (selection.end.row - count < row1 && selection.end.row >= row1)
702 || (selection.end.row - count > row2 && selection.end.row <= row2))
703 {
704 CLEAR_ALL_SELECTION ();
705 selection.op = SELECTION_CLEAR;
706 }
707 else if (selection.end.row >= row1 && selection.end.row <= row2)
708 {
709 /* move selected region too */
710 selection.beg.row -= count;
711 selection.end.row -= count;
712 selection.mark.row -= count;
713
714 selection_check (0);
715 }
750 { 716 }
751 screen.tlen[j] = screen.tlen[i]; 717
752 screen.text[j] = screen.text[i]; 718 // use a simple and robust scrolling algorithm, this
753 screen.rend[j] = screen.rend[i]; 719 // part of scr_scroll_text is not time-critical.
720
721 int rows = row2 - row1 + 1;
722
723 min_it (count, rows);
724
725 line_t *temp_buf = row_buf + total_rows;
726
727 for (int row = 0; row < rows; row++)
754 } 728 {
729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
755 730
756 j = row1, i = count; 731 if (!IN_RANGE_EXC (row + count, 0, rows))
757 count = -count; 732 scr_blank_screen_mem (temp_buf [row], rstyle);
758 } 733 }
759 734
760 /* Resurrect lines */ 735 for (int row = 0; row < rows; row++)
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 736 ROW(row1 + row) = temp_buf [row];
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 737 }
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */
765 for (; i--; j++)
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
767 738
768 return count; 739 return count;
769} 740}
770 741
771/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
772/* 743/*
773 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
774 */ 745 */
775void 746void
776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
777{ 748{
749 if (len <= 0) /* sanity */
750 return;
751
778 unsigned char checksel; 752 unsigned char checksel;
779 unicode_t c; 753 unicode_t c;
780 int i, row, last_col; 754 int ncol = this->ncol;
781 text_t *stp; 755 const wchar_t *strend = str + len;
782 rend_t *srp;
783
784 if (len <= 0) /* sanity */
785 return;
786 756
787 want_refresh = 1; 757 want_refresh = 1;
788 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol;
790 759
791 if (nlines > 0) 760 if (minlines > 0)
792 { 761 {
793 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
764
794 if ((nlines > 0) 765 if (minlines > 0
795 && (screen.tscroll == 0) 766 && screen.tscroll == 0
796 && (screen.bscroll == (TermWin.nrow - 1))) 767 && screen.bscroll == nrow - 1)
797 { 768 {
798 /* _at least_ this many lines need to be scrolled */ 769 /* _at least_ this many lines need to be scrolled */
799 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
800 screen.cur.row -= nlines; 771 screen.cur.row -= minlines;
801 } 772 }
802 } 773 }
803 774
804#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
805 assert (screen.cur.col < last_col); 776 assert (screen.cur.col < ncol);
806 assert ((screen.cur.row < TermWin.nrow) 777 assert (screen.cur.row < nrow
807 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 778 && screen.cur.row >= top_row);
808#else /* drive with your eyes closed */
809 MIN_IT (screen.cur.col, last_col - 1);
810 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
812#endif 779#endif
813 row = screen.cur.row + TermWin.saveLines; 780 int row = screen.cur.row;
814 781
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 783
817 stp = screen.text[row]; 784 line_t *line = &ROW(row);
818 srp = screen.rend[row];
819 785
820 while (len--) 786 while (str < strend)
821 { 787 {
822 c = *str++; 788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
823 789
824 if (c < 0x20) 790 if (c < 0x20)
825 switch (c) 791 if (c == C0_LF)
826 { 792 {
827 case C0_HT: 793 max_it (line->l, screen.cur.col);
828 scr_tab (1, true);
829 continue;
830 794
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 795 screen.flags &= ~Screen_WrapNext;
836 796
837 if (screen.cur.row == screen.bscroll) 797 if (screen.cur.row == screen.bscroll)
838 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 798 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
839 else if (screen.cur.row < (TermWin.nrow - 1)) 799 else if (screen.cur.row < (nrow - 1))
840 row = (++screen.cur.row) + TermWin.saveLines; 800 row = ++screen.cur.row;
841 801
842 stp = screen.text[row]; /* _must_ refresh */ 802 line = &ROW(row); /* _must_ refresh */
843 srp = screen.rend[row]; /* _must_ refresh */
844 continue; 803 continue;
804 }
805 else if (c == C0_CR)
806 {
807 max_it (line->l, screen.cur.col);
845 808
846 case C0_CR:
847 if (screen.tlen[row] != -1) /* XXX: think about this */
848 MAX_IT (screen.tlen[row], screen.cur.col);
849
850 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
851 screen.cur.col = 0; 810 screen.cur.col = 0;
852 continue; 811 continue;
812 }
813 else if (c == C0_HT)
814 {
815 scr_tab (1, true);
816 continue;
853 } 817 }
854 818
855 if (checksel /* see if we're writing within selection */ 819 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 821 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
865 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
866 } 830 }
867 831
868 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
869 { 833 {
870 screen.tlen[row] = -1; 834 scr_do_wrap ();
871
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
873
874 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */
876 } 835
836 line->l = ncol;
837 line->is_longer (1);
877 838
839 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */
841 }
842
843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
845 c = 0xfffd;
846
878 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
879 // do wcwidth before further replacements, as wcwidth says that line-drawing 848 // further replacements, as wcwidth might return -1 for the line
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 849 // drawing characters below as they might be invalid in the current
881 int width = c < 0x100 ? 1 : wcwidth (c); 850 // locale.
851 int width = WCWIDTH (c);
882 852
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
884 { 854 {
885 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 856 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 857 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 858 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 859 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 860 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 861 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 862 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 863 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 864 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 865 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 866 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 867 };
898 868
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 869 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 870 {
901 c = vt100_0[c - 0x40]; 871 c = vt100_0[c - 0x41];
902 width = 1; 872 width = 1; // vt100 line drawing characters are always single-width
903 } 873 }
904 } 874 }
905 875
906 if (screen.flags & Screen_Insert) 876 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 877 scr_insdel_chars (width, INSERT);
908 878
909 if (width != 0) 879 if (width != 0)
910 { 880 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 881#if !UNICODE_3
916 // trim characters we can't store directly :( 882 // trim characters we can't store directly :(
917 if (c >= 0x10000) 883 if (c >= 0x10000)
918# if ENABLE_COMBINING 884# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 885 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
921 c = 0xfffd; 887 c = 0xfffd;
922# endif 888# endif
923#endif 889#endif
924 890
925 // nuke the character at this position, if required 891 // nuke the character at this position, if required
926 if (stp[screen.cur.col] == NOCHAR 892 if (line->t[screen.cur.col] == NOCHAR
927 || (screen.cur.col < TermWin.ncol - 1 893 || (screen.cur.col < ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR)) 894 && line->t[screen.cur.col + 1] == NOCHAR))
929 { 895 {
930 int col = screen.cur.col; 896 int col = screen.cur.col;
931 897
932 // find begin 898 // find begin
933 while (col > 0 && stp[col] == NOCHAR) 899 while (col > 0 && line->t[col] == NOCHAR)
934 col--; 900 col--;
935 901
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
937 903
938 // found begin, nuke 904 // found begin, nuke
939 do { 905 do {
940 stp[col] = ' '; 906 line->t[col] = ' ';
941 srp[col] = rend; 907 line->r[col] = rend;
942 col++; 908 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 909 } while (col < ncol && line->t[col] == NOCHAR);
944 } 910 }
945 911
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922
923 line->touch ();
947 924
948 do 925 do
949 { 926 {
950 stp[screen.cur.col] = c; 927 line->t[screen.cur.col] = c;
951 srp[screen.cur.col] = rend; 928 line->r[screen.cur.col] = rend;
952 929
953 if (screen.cur.col < last_col - 1) 930 if (screen.cur.col < ncol - 1)
954 screen.cur.col++; 931 screen.cur.col++;
955 else 932 else
956 { 933 {
957 screen.tlen[row] = last_col; 934 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 936 screen.flags |= Screen_WrapNext;
960 break; 937 break;
961 } 938 }
962 939
… …
964 } 941 }
965 while (--width > 0); 942 while (--width > 0);
966 943
967 // pad with spaces when overwriting wide character with smaller one 944 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 945 if (!width)
946 {
947 line->touch ();
948
969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 950 {
971 stp[c] = ' '; 951 line->t[c] = ' ';
972 srp[c] = rend; 952 line->r[c] = rend;
973 } 953 }
974 } 954 }
955 }
975 else if (width == 0) 956 else // width == 0
976 { 957 {
977#if ENABLE_COMBINING 958#if ENABLE_COMBINING
978 // handle combining characters 959 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 960 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 961 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 962 // we don't handle double-width characters nicely yet.
982 963 line_t *linep;
983 text_t *tp; 964 text_t *tp;
984 rend_t *rp; 965 rend_t *rp;
985 966
986 if (screen.cur.col > 0) 967 if (screen.cur.col > 0)
987 { 968 {
969 linep = line;
988 tp = stp + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
989 rp = srp + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
993 } 972 }
994 else if (screen.cur.row > 0 973 else if (screen.cur.row > 0
995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 974 && ROW(screen.cur.row - 1).is_longer ())
996 { 975 {
997 int line = screen.cur.row - 1 + TermWin.saveLines; 976 linep = &ROW(screen.cur.row - 1);
998
999 tp = screen.text[line] + last_col - 1; 977 tp = line->t + ncol - 1;
1000 rp = screen.rend[line] + last_col - 1; 978 rp = line->r + ncol - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
1004 } 979 }
1005 else 980 else
1006 continue; 981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
1007 987
1008 // first try to find a precomposed character 988 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c); 989 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR) 990 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c); 991 n = rxvt_composite.compose (*tp, c);
… …
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1015#endif 995#endif
1016 } 996 }
1017 } 997 }
1018 998
1019 if (screen.tlen[row] != -1) /* XXX: think about this */ 999 max_it (line->l, screen.cur.col);
1020 MAX_IT (screen.tlen[row], screen.cur.col);
1021 1000
1022#ifdef DEBUG_STRICT 1001#ifdef DEBUG_STRICT
1023 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1024#else /* drive with your eyes closed */
1025 MAX_IT (screen.cur.row, 0);
1026#endif 1003#endif
1027} 1004}
1028 1005
1029/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1030/* 1007/*
1031 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
1032 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1033 */ 1010 */
1034void 1011void
1035rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
1036{ 1013{
1037 want_refresh = 1; 1014 want_refresh = 1;
1038 1015
1039 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1040 { 1017 {
1041 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
1042 { 1019 {
1043#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
1044 screen.cur.col = TermWin.ncol - 1; 1021 screen.cur.col = ncol - 1;
1045 screen.cur.row--; 1022 screen.cur.row--;
1046 return; 1023 return;
1047#endif 1024#endif
1048 } 1025 }
1049 } 1026 }
… …
1058 * Process Horizontal Tab 1035 * Process Horizontal Tab
1059 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1060 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1061 */ 1038 */
1062void 1039void
1063rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1064{ 1041{
1065 int i, x; 1042 int i, x;
1066 1043
1067 want_refresh = 1; 1044 want_refresh = 1;
1068 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
1069 1046
1070 if (count == 0) 1047 if (count == 0)
1071 return; 1048 return;
1072 else if (count > 0) 1049 else if (count > 0)
1073 { 1050 {
1074 int row = TermWin.saveLines + screen.cur.row; 1051 line_t &l = ROW(screen.cur.row);
1075 text_t *tp = screen.text[row];
1076 rend_t *rp = screen.rend[row];
1077 rend_t base_rend = rp[i]; 1052 rend_t base_rend = l.r[i];
1078 ht &= tp[i] == ' '; 1053 ht &= l.t[i] == ' ';
1079 1054
1080 for (; ++i < TermWin.ncol; ) 1055 for (; ++i < ncol; )
1081 if (tabs[i]) 1056 if (tabs[i])
1082 { 1057 {
1083 x = i; 1058 x = i;
1059
1084 if (!--count) 1060 if (!--count)
1085 break; 1061 break;
1086 } 1062 }
1087 else 1063 else
1088 ht &= tp[i] == ' ' 1064 ht &= l.t[i] == ' '
1089 && RS_SAME (rp[i], base_rend); 1065 && RS_SAME (l.r[i], base_rend);
1090 1066
1091 if (count) 1067 if (count)
1092 x = TermWin.ncol - 1; 1068 x = ncol - 1;
1093 1069
1094 // store horizontal tab commands as characters inside the text 1070 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted. 1071 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs) 1072 if (ht && OPTION (Opt_pastableTabs))
1097 { 1073 {
1098 base_rend = SET_FONT (base_rend, 0); 1074 base_rend = SET_FONT (base_rend, 0);
1099 1075
1100 if (screen.tlen[row] != -1) /* XXX: think about this */ 1076 l.touch (x);
1101 MAX_IT (screen.tlen[row], x);
1102 1077
1103 i = screen.cur.col; 1078 i = screen.cur.col;
1104 1079
1105 tp[i] = '\t'; 1080 l.t[i] = '\t';
1106 rp[i] = base_rend; 1081 l.r[i] = base_rend;
1107 1082
1108 while (++i < x) 1083 while (++i < x)
1109 { 1084 {
1110 tp[i] = NOCHAR; 1085 l.t[i] = NOCHAR;
1111 rp[i] = base_rend; 1086 l.r[i] = base_rend;
1112 } 1087 }
1113 } 1088 }
1114 } 1089 }
1115 else /* if (count < 0) */ 1090 else /* if (count < 0) */
1116 { 1091 {
… …
1137 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1138 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1139 */ 1114 */
1140#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1141void 1116void
1142rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1143{ 1118{
1144 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1146 else 1121 else
1147 {
1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1149 return; /* um, yeah? */
1150
1151 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
1152 }
1153} 1123}
1154#endif 1124#endif
1155/* ------------------------------------------------------------------------- */ 1125/* ------------------------------------------------------------------------- */
1156/* 1126/*
1157 * Process DEC Forward Index 1127 * Process DEC Forward Index
… …
1159 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1160 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1161 */ 1131 */
1162#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1163void 1133void
1164rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1165{ 1135{
1166 int row;
1167
1168 if (screen.cur.col < TermWin.ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1170 else 1138 else
1171 { 1139 {
1172 row = screen.cur.row + TermWin.saveLines; 1140 line_t &l = ROW(screen.cur.row);
1173 1141
1174 if (screen.tlen[row] == 0) 1142 l.touch ();
1175 return; /* um, yeah? */ 1143 l.is_longer (0);
1176 else if (screen.tlen[row] == -1)
1177 screen.tlen[row] = TermWin.ncol;
1178 1144
1179 scr_gotorc (0, 0, R_RELATIVE); 1145 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1146 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1147 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1148 }
1183} 1149}
1184#endif 1150#endif
1185 1151
1186/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1187/* 1153/*
1188 * Goto Row/Column 1154 * Goto Row/Column
1189 */ 1155 */
1190void 1156void
1191rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1192{ 1158{
1193 want_refresh = 1; 1159 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1195 1161
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1163 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1199 1164
1200 screen.flags &= ~Screen_WrapNext; 1165 screen.flags &= ~Screen_WrapNext;
1201 1166
1202 if (relative & R_RELATIVE) 1167 if (relative & R_RELATIVE)
1203 { 1168 {
… …
1221 else 1186 else
1222 { 1187 {
1223 if (screen.flags & Screen_Relative) 1188 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1189 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1190 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1191 min_it (screen.cur.row, screen.bscroll);
1227 } 1192 }
1228 else 1193 else
1229 screen.cur.row = row; 1194 screen.cur.row = row;
1230 } 1195 }
1231 1196
1232 MAX_IT (screen.cur.row, 0); 1197 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1234} 1198}
1235 1199
1236/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1237/* 1201/*
1238 * direction should be UP or DN 1202 * direction should be UP or DN
1239 */ 1203 */
1240void 1204void
1241rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1242{ 1206{
1243 int dirn; 1207 int dirn;
1244 1208
1245 want_refresh = 1; 1209 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1249 1213
1250 screen.flags &= ~Screen_WrapNext; 1214 screen.flags &= ~Screen_WrapNext;
1251 1215
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1216 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1217 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1218 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1219 else
1256 screen.cur.row += dirn; 1220 screen.cur.row += dirn;
1257 1221
1258 MAX_IT (screen.cur.row, 0); 1222 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1260 selection_check (0); 1223 selection_check (0);
1261} 1224}
1262 1225
1263/* ------------------------------------------------------------------------- */ 1226/* ------------------------------------------------------------------------- */
1264/* 1227/*
… …
1266 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 */ 1232 */
1270void 1233void
1271rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1272{ 1235{
1273 unsigned int row, col, num; 1236 unsigned int col, num;
1274 1237
1275 want_refresh = 1; 1238 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1277 1240
1278 selection_check (1); 1241 selection_check (1);
1279 1242
1280 row = TermWin.saveLines + screen.cur.row; 1243 line_t &line = ROW(screen.cur.row);
1244
1245 line.touch ();
1246 line.is_longer (0);
1247
1281 switch (mode) 1248 switch (mode)
1282 { 1249 {
1283 case 0: /* erase to end of line */ 1250 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1251 col = screen.cur.col;
1285 num = TermWin.ncol - col; 1252 num = ncol - col;
1286 MIN_IT (screen.tlen[row], (int16_t)col); 1253 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1256 CLEAR_SELECTION ();
1290 break; 1257 break;
1291 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
… …
1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1296 CLEAR_SELECTION (); 1263 CLEAR_SELECTION ();
1297 break; 1264 break;
1298 case 2: /* erase whole line */ 1265 case 2: /* erase whole line */
1299 col = 0; 1266 col = 0;
1300 num = TermWin.ncol; 1267 num = ncol;
1301 screen.tlen[row] = 0; 1268 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1269 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1270 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1305 break; 1272 break;
1306 default: 1273 default:
1307 return; 1274 return;
1308 } 1275 }
1309 1276
1310 if (screen.text[row]) 1277 scr_blank_line (line, col, num, rstyle);
1311 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1312 else
1313 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1314} 1278}
1315 1279
1316/* ------------------------------------------------------------------------- */ 1280/* ------------------------------------------------------------------------- */
1317/* 1281/*
1318 * Erase part of whole of the screen 1282 * Erase part of whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1286 */
1323void 1287void
1324rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1325{ 1289{
1326 int num; 1290 int num;
1327 int32_t row, row_offset; 1291 int32_t row;
1328 rend_t ren; 1292 rend_t ren;
1329 XGCValues gcvalue; 1293 XGCValues gcvalue;
1330 1294
1331 want_refresh = 1; 1295 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1296 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)TermWin.saveLines;
1335 1297
1336 switch (mode) 1298 switch (mode)
1337 { 1299 {
1338 case 0: /* erase to end of screen */ 1300 case 0: /* erase to end of screen */
1339 selection_check (1); 1301 selection_check (1);
1340 scr_erase_line (0); 1302 scr_erase_line (0);
1341 row = screen.cur.row + 1; /* possible OOB */ 1303 row = screen.cur.row + 1; /* possible OOB */
1342 num = TermWin.nrow - row; 1304 num = nrow - row;
1343 break; 1305 break;
1344 case 1: /* erase to beginning of screen */ 1306 case 1: /* erase to beginning of screen */
1345 selection_check (3); 1307 selection_check (3);
1346 scr_erase_line (1); 1308 scr_erase_line (1);
1347 row = 0; 1309 row = 0;
1348 num = screen.cur.row; 1310 num = screen.cur.row;
1349 break; 1311 break;
1350 case 2: /* erase whole screen */ 1312 case 2: /* erase whole screen */
1351 selection_check (3); 1313 selection_check (3);
1352 row = 0; 1314 row = 0;
1353 num = TermWin.nrow; 1315 num = nrow;
1354 break; 1316 break;
1355 default: 1317 default:
1356 return; 1318 return;
1357 } 1319 }
1358 1320
… …
1360 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1322 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1361 || (selection.end.row >= row 1323 || (selection.end.row >= row
1362 && selection.end.row <= row + num))) 1324 && selection.end.row <= row + num)))
1363 CLEAR_SELECTION (); 1325 CLEAR_SELECTION ();
1364 1326
1365 if (row >= TermWin.nrow) /* Out Of Bounds */ 1327 if (row >= nrow) /* Out Of Bounds */
1366 return; 1328 return;
1367 1329
1368 MIN_IT (num, (TermWin.nrow - row)); 1330 min_it (num, nrow - row);
1369 1331
1370 if (rstyle & (RS_RVid | RS_Uline)) 1332 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1333 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1334 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1335 {
… …
1375 CLEAR_ROWS (row, num); 1337 CLEAR_ROWS (row, num);
1376 } 1338 }
1377 else 1339 else
1378 { 1340 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1343 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1347 }
1386 1348
1387 for (; num--; row++) 1349 for (; num--; row++)
1388 { 1350 {
1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1390 screen.tlen[row + row_offset] = 0; 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1392 } 1353 }
1393} 1354}
1394 1355
1395#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1396void 1357void
1397rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1398{ 1359{
1399 want_refresh = 1; 1360 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1401 1362
1402 TermWin.nscrolled = 0; 1363 top_row = 0;
1403} 1364}
1404#endif 1365#endif
1405 1366
1406/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1407/* 1368/*
1408 * Fill the screen with `E's 1369 * Fill the screen with `E's
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1371 */
1411void 1372void
1412rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1413{ 1374{
1414 int i, j, k;
1415 rend_t *r1, fs; 1375 rend_t fs;
1416 1376
1417 want_refresh = 1; 1377 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
1419 1379
1420 num_scr_allow = 0; 1380 num_scr_allow = 0;
1421 selection_check (3); 1381 selection_check (3);
1422 1382
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1383 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1384 for (int row = nrow; row--; )
1425 { 1385 {
1426 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1386 line_t &line = ROW(row);
1387
1427 fill_text (screen.text[k], 'E', TermWin.ncol); 1388 fill_text (line.t, 'E', ncol);
1428 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1389 rend_t *r1 = line.r;
1390
1391 for (int j = ncol; j--; )
1429 *r1++ = fs; 1392 *r1++ = fs;
1393
1394 line.is_longer (0);
1395 line.touch (ncol);
1430 } 1396 }
1431} 1397}
1432 1398
1433/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1434/* 1400/*
1435 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1436 */ 1402 */
1437void 1403void
1438rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1439{ 1405{
1440 int end; 1406 int end;
1441 1407
1442 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1443 1409
… …
1455 count = end; 1421 count = end;
1456 } 1422 }
1457 1423
1458 scr_do_wrap (); 1424 scr_do_wrap ();
1459 1425
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1426 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1427}
1462 1428
1463/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1464/* 1430/*
1465 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1466 */ 1432 */
1467void 1433void
1468rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1469{ 1435{
1470 int col, row; 1436 int col, row;
1471 rend_t tr; 1437 rend_t tr;
1472 text_t *stp;
1473 rend_t *srp;
1474 int16_t *slp;
1475 1438
1476 want_refresh = 1; 1439 want_refresh = 1;
1477 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1478 1441
1479 if (count <= 0) 1442 if (count <= 0)
1480 return; 1443 return;
1481 1444
1482 scr_do_wrap (); 1445 scr_do_wrap ();
1483 1446
1484 selection_check (1); 1447 selection_check (1);
1485 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1448 min_it (count, ncol - screen.cur.col);
1486 1449
1487 row = screen.cur.row + TermWin.saveLines;
1488
1489 stp = screen.text[row];
1490 srp = screen.rend[row]; 1450 row = screen.cur.row;
1491 slp = &screen.tlen[row]; 1451
1452 line_t *line = &ROW(row);
1453
1454 line->touch ();
1455 line->is_longer (0);
1492 1456
1493 switch (insdel) 1457 switch (insdel)
1494 { 1458 {
1495 case INSERT: 1459 case INSERT:
1496 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1461 {
1498 stp[col] = stp[col - count]; 1462 line->t[col] = line->t[col - count];
1499 srp[col] = srp[col - count]; 1463 line->r[col] = line->r[col - count];
1500 } 1464 }
1501 1465
1502 if (*slp != -1) 1466 line->l = min (line->l + count, ncol);
1503 {
1504 *slp += count;
1505 MIN_IT (*slp, TermWin.ncol);
1506 }
1507 1467
1508 if (selection.op && current_screen == selection.screen 1468 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1470 {
1511 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
1512 || (selection.end.col + count >= TermWin.ncol)) 1472 || (selection.end.col + count >= ncol))
1513 CLEAR_SELECTION (); 1473 CLEAR_SELECTION ();
1514 else 1474 else
1515 { /* shift selection */ 1475 { /* shift selection */
1516 selection.beg.col += count; 1476 selection.beg.col += count;
1517 selection.mark.col += count; /* XXX: yes? */ 1477 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1478 selection.end.col += count;
1519 } 1479 }
1520 } 1480 }
1521 1481
1522 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1482 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 (unsigned int)count, rstyle);
1524 break; 1483 break;
1525 1484
1526 case ERASE: 1485 case ERASE:
1527 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1486 screen.cur.col += count; /* don't worry if > ncol */
1528 selection_check (1); 1487 selection_check (1);
1529 screen.cur.col -= count; 1488 screen.cur.col -= count;
1530 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1489
1531 (unsigned int)count, rstyle); 1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, screen.cur.col, count, rstyle);
1532 break; 1492 break;
1533 1493
1534 case DELETE: 1494 case DELETE:
1535 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1536 1496
1537 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1497 for (col = screen.cur.col; (col + count) < ncol; col++)
1538 { 1498 {
1539 stp[col] = stp[col + count]; 1499 line->t[col] = line->t[col + count];
1540 srp[col] = srp[col + count]; 1500 line->r[col] = line->r[col + count];
1541 } 1501 }
1542 1502
1543 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1503 line->l = max (line->l - count, 0);
1544 (unsigned int)count, tr); 1504 scr_blank_line (*line, ncol - count, count, tr);
1545
1546 if (*slp == -1) /* break line continuation */
1547 *slp = TermWin.ncol;
1548
1549 *slp -= count;
1550 MAX_IT (*slp, 0);
1551 1505
1552 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1553 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1554 { 1508 {
1555 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
1556 || (screen.cur.col >= selection.beg.col - count) 1510 || (screen.cur.col >= selection.beg.col - count)
1557 || selection.end.col >= TermWin.ncol) 1511 || selection.end.col >= ncol)
1558 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1559 else 1513 else
1560 { 1514 {
1561 /* shift selection */ 1515 /* shift selection */
1562 selection.beg.col -= count; 1516 selection.beg.col -= count;
… …
1573/* 1527/*
1574 * Set the scrolling region 1528 * Set the scrolling region
1575 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1576 */ 1530 */
1577void 1531void
1578rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1579{ 1533{
1580 MAX_IT (top, 0); 1534 max_it (top, 0);
1581 MIN_IT (bot, (int)TermWin.nrow - 1); 1535 min_it (bot, nrow - 1);
1582 1536
1583 if (top > bot) 1537 if (top > bot)
1584 return; 1538 return;
1585 1539
1586 screen.tscroll = top; 1540 screen.tscroll = top;
… …
1593 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1594 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1595 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1596 */ 1550 */
1597void 1551void
1598rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1599{ 1553{
1600 want_refresh = 1; 1554 want_refresh = 1;
1601 1555
1602 if (mode) 1556 if (mode)
1603 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1610 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1611 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1612 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1613 */ 1567 */
1614void 1568void
1615rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1616{ 1570{
1617 if (mode) 1571 if (mode)
1618 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1619 else 1573 else
1620 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1629 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1630 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1631 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1632 */ 1586 */
1633void 1587void
1634rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1635{ 1589{
1636 if (mode) 1590 if (mode)
1637 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1638 else 1592 else
1639 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1646 * Set insert/replace mode 1600 * Set insert/replace mode
1647 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1648 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1649 */ 1603 */
1650void 1604void
1651rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1652{ 1606{
1653 if (mode) 1607 if (mode)
1654 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1655 else 1609 else
1656 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1662 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1663 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1664 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1665 */ 1619 */
1666void 1620void
1667rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1668{ 1622{
1669 if (mode < 0) 1623 if (mode < 0)
1670 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1671 else if (screen.cur.col < TermWin.ncol) 1625 else if (screen.cur.col < ncol)
1672 tabs[screen.cur.col] = (mode ? 1 : 0); 1626 tabs [screen.cur.col] = !!mode;
1673} 1627}
1674 1628
1675/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
1676/* 1630/*
1677 * Set reverse/normal video 1631 * Set reverse/normal video
1678 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1679 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1680 */ 1634 */
1681void 1635void
1682rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1683{ 1637{
1684 XGCValues gcvalue; 1638 rvideo_mode = on;
1685 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1686 if (rvideo != mode) 1644 if (rvideo_state != on)
1687 { 1645 {
1688 rvideo = mode; 1646 rvideo_state = on;
1647
1689 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1691 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1692#endif 1651#endif
1693#if TRANSPARENT 1652#if TRANSPARENT
1694 if (! (options & Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1695#endif 1654#endif
1696 XSetWindowBackground (display->display, TermWin.vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1697 pix_colors[Color_bg]);
1698 1656
1657 XGCValues gcvalue;
1699 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1700 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1701 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1702 &gcvalue); 1661
1703 scr_clear (); 1662 scr_clear ();
1704 scr_touch (true); 1663 scr_touch (true);
1705 } 1664 }
1706} 1665}
1707 1666
… …
1709/* 1668/*
1710 * Report current cursor position 1669 * Report current cursor position
1711 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1712 */ 1671 */
1713void 1672void
1714rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1715{ 1674{
1716 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1717} 1676}
1718 1677
1719/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1722 1681
1723/* 1682/*
1724 * Set font style 1683 * Set font style
1725 */ 1684 */
1726void 1685void
1727rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1728{ 1687{
1688#if 0
1729 switch (charsets[screen.charset]) 1689 switch (charsets [screen.charset])
1730 { 1690 {
1731 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1732 break; 1692 break;
1733 case 'A': /* United Kingdom (UK) */ 1693 case 'A': /* United Kingdom (UK) */
1734 break; 1694 break;
… …
1741 case 'C': /* Finnish character set */ 1701 case 'C': /* Finnish character set */
1742 break; 1702 break;
1743 case 'K': /* German character set */ 1703 case 'K': /* German character set */
1744 break; 1704 break;
1745 } 1705 }
1706#endif
1746} 1707}
1747 1708
1748/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1749/* 1710/*
1750 * Choose a font 1711 * Choose a font
… …
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1716 */
1756void 1717void
1757rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1719{
1759 screen.charset = set; 1720 screen.charset = set;
1760 set_font_style (); 1721 set_font_style ();
1761} 1722}
1762 1723
… …
1768 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1769 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1770 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1771 */ 1732 */
1772void 1733void
1773rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1774{ 1735{
1775 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1776 set_font_style (); 1737 set_font_style ();
1777} 1738}
1778 1739
… …
1783 1744
1784/* 1745/*
1785 * refresh matching text. 1746 * refresh matching text.
1786 */ 1747 */
1787bool 1748bool
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1750{
1790 bool found = false; 1751 bool found = false;
1791 1752
1792 for (int i = 0; i < TermWin.nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1793 { 1754 {
1794 int col = 0; 1755 int col = 0;
1795 rend_t *drp = drawn_rend [i]; 1756 rend_t *drp = drawn_buf[i].r;
1796 1757
1797 for (; col < TermWin.ncol; col++, drp++) 1758 for (; col < ncol; col++, drp++)
1798 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1799 { 1760 {
1800 found = true; 1761 found = true;
1801 *drp = ~value; 1762 *drp = ~value;
1802 } 1763 }
… …
1813 PART_END, 1774 PART_END,
1814 RC_COUNT 1775 RC_COUNT
1815}; 1776};
1816 1777
1817void 1778void
1818rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1819{ 1780{
1820 int i; 1781 int i;
1821 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1822 1783
1823 if (drawn_text == NULL) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
1824 return; 1785 return;
1825 1786
1826#ifndef NO_SLOW_LINK_SUPPORT 1787#ifndef NO_SLOW_LINK_SUPPORT
1827 if (refresh_type == FAST_REFRESH && !display->is_local) 1788 if (refresh_type == FAST_REFRESH && !display->is_local)
1828 { 1789 {
1829 y = 0; 1790 y = 0;
1830 height = TermWin.height; 1791 eheight = height;
1831 } 1792 }
1832#endif
1833
1834#ifdef DEBUG_STRICT
1835 x = max (x, 0);
1836 x = min (x, (int)TermWin.width);
1837 y = max (y, 0);
1838 y = min (y, (int)TermWin.height);
1839#endif 1793#endif
1840 1794
1841 /* round down */ 1795 /* round down */
1842 rc[PART_BEG].col = Pixel2Col (x); 1796 rc[PART_BEG].col = Pixel2Col (x);
1843 rc[PART_BEG].row = Pixel2Row (y); 1797 rc[PART_BEG].row = Pixel2Row (y);
1844 /* round up */ 1798 /* round up */
1845 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1799 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1846 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1800 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1847 1801
1848 /* sanity checks */ 1802 /* sanity checks */
1849 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1850 { 1804 {
1851 MIN_IT (rc[i].col, TermWin.ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1852 MIN_IT (rc[i].row, TermWin.nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1853 } 1807 }
1854 1808
1855 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1856 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811
1812 num_scr_allow = 0;
1857 1813
1858 if (refresh) 1814 if (refresh)
1859 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1860} 1816}
1861 1817
1862/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1863/* 1819/*
1864 * Refresh the entire screen 1820 * Refresh the entire screen
1865 */ 1821 */
1866void 1822void
1867rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1868{ 1824{
1869 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1870} 1826}
1871 1827
1872/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1873/* 1829/*
1874 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1875 * the top of the screen 1831 * the top of the screen
1876 */ 1832 */
1877int 1833void
1878rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1879{ 1835{
1880 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1881 unsigned int oldviewstart;
1882
1883 oldviewstart = TermWin.view_start;
1884
1885 if (y < len)
1886 {
1887 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1888 p -= (long) (TermWin.nrow - 1);
1889 p = max (p, 0);
1890 }
1891
1892 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1893
1894 return scr_changeview (oldviewstart);
1895} 1837}
1896 1838
1897/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1898/* 1840/*
1899 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1900 * direction should be UP or DN 1842 * direction should be UP or DN
1901 */ 1843 */
1902int 1844bool
1903rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1904{ 1846{
1905 int n; 1847 int new_view_start =
1906 unsigned int oldviewstart; 1848 direction == UP ? view_start - nlines
1849 : view_start + nlines;
1907 1850
1908 oldviewstart = TermWin.view_start;
1909
1910 if (direction == UP)
1911 {
1912 n = TermWin.view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled);
1914 }
1915 else
1916 {
1917 n = TermWin.view_start - nlines;
1918 TermWin.view_start = max (n, 0);
1919 }
1920
1921 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1922} 1852}
1923 1853
1924int 1854bool
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1927 if (TermWin.view_start != oldviewstart) 1859 if (new_view_start == view_start)
1928 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1929 want_refresh = 1; 1864 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart);
1931 }
1932 1865
1933 return (int) (TermWin.view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1934}
1935 1867
1936/* ------------------------------------------------------------------------- */ 1868 return true;
1937void 1869}
1938rxvt_term::scr_bell () 1870
1939{
1940#ifndef NO_BELL 1871#ifndef NO_BELL
1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1882rxvt_term::scr_bell () NOTHROW
1883{
1884#ifndef NO_BELL
1885
1941# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1888 if (OPTION (Opt_mapAlert))
1944# endif 1889# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1890 XMapWindow (display->display, parent[0]);
1946# endif 1891# endif
1947 if (options & Opt_visualBell) 1892
1893 if (OPTION (Opt_visualBell))
1948 { 1894 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1896 scr_rvideo_mode (rvideo_mode);
1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1951 } 1900 }
1952 else 1901 else
1953 XBell (display->display, 0); 1902 XBell (display->display, 0);
1903
1954#endif 1904#endif
1955} 1905}
1956 1906
1957/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1908/* ARGSUSED */
1959void 1909void
1960rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1961{ 1911{
1962#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1913 int nrows, row_start;
1964 FILE *fd; 1914 FILE *fd;
1965 1915
1966 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1967 return; 1917 return;
1968 1918
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1919 if (fullhist)
1973 row_offset -= TermWin.view_start; 1920 {
1921 nrows = nrow - top_row;
1922 row_start = top_row;
1923 }
1974 else 1924 else
1975 { 1925 {
1976 nrows += TermWin.nscrolled; 1926 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1927 row_start = view_start;
1978 } 1928 }
1979 1929
1980 wctomb (0, 0); 1930 wctomb (0, 0);
1981 1931
1982 for (r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1933 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1934 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1935 int len = ROW(r1).l;
1986 1936
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1937 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1938 {
1989 char mb[MB_LEN_MAX]; 1939 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1940 text_t t = *tp++;
1991 if (t == NOCHAR) 1941 if (t == NOCHAR)
1992 continue; 1942 continue;
… …
2013/* 1963/*
2014 * Refresh the screen 1964 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1967 */
2018
2019#define FONT_WIDTH(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021#define FONT_RBEAR(X, Y) \
2022 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023#define FONT_LBEAR(X, Y) \
2024 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025#define IS_FONT_CHAR(X, Y) \
2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028void 1968void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
2030{ 1970{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
2032 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
2033 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
2035 int i, /* tmp */ 1975 int i; /* tmp */
2036 row_offset; /* basic offset in screen structure */
2037#ifndef NO_CURSORCOLOR 1976#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */ 1977 rend_t cc1; /* store colours at cursor position (s) */
2039#endif 1978#endif
2040 rend_t *crp; // cursor rendition pointer 1979 rend_t *crp; // cursor rendition pointer
2041 1980
2042 want_refresh = 0; /* screen is current */ 1981 want_refresh = 0; /* screen is current */
2043 1982
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1983 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 1984 return;
2046 1985
2047 /* 1986 /*
2048 * A: set up vars 1987 * A: set up vars
2049 */ 1988 */
2050 must_clear = 0; 1989 must_clear = 0;
2051 refresh_count = 0; 1990 refresh_count = 0;
2052 1991
2053 row_offset = TermWin.saveLines - TermWin.view_start;
2054
2055#if XPM_BACKGROUND 1992#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 1993 must_clear |= bgPixmap.pixmap != None;
2057#endif 1994#endif
2058#if TRANSPARENT 1995#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent); 1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
2060#endif 1997#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 1999
2063 /* 2000 /*
2064 * B: reverse any characters which are selected 2001 * B: reverse any characters which are selected
… …
2081 2018
2082 if (showcursor) 2019 if (showcursor)
2083 { 2020 {
2084 int col = screen.cur.col; 2021 int col = screen.cur.col;
2085 2022
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2024 col--;
2088 2025
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2026 crp = &ROW(screen.cur.row).r[col];
2090 2027
2091 if (showcursor && TermWin.focus) 2028 if (showcursor && focus)
2092 { 2029 {
2030 if (OPTION (Opt_cursorUnderline))
2031 *crp ^= RS_Uline;
2032 else
2033 {
2093 *crp ^= RS_RVid; 2034 *crp ^= RS_RVid;
2035
2094#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask); 2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2038 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2039 ccol1 = Color_cursor;
2098 else 2040 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle); 2042 ccol1 = fgcolor_of (rstyle);
2101#else 2043#else
2102 ccol1 = Color_fg; 2044 ccol1 = Color_fg;
2103#endif 2045#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2)) 2046 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2; 2047 ccol2 = Color_cursor2;
2106 else 2048 else
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108 ccol2 = GET_BGCOLOR (rstyle); 2050 ccol2 = bgcolor_of (rstyle);
2109#else 2051#else
2110 ccol2 = Color_bg; 2052 ccol2 = Color_bg;
2111#endif 2053#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2054 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2055 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2056#endif
2057 }
2115 } 2058 }
2116 } 2059 }
2117 2060
2118 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2062 setoldcursor = 0;
2120 if (ocrow != -1) 2063 if (ocrow != -1)
2121 { 2064 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2124 { 2067 {
2125 if (ocrow < TermWin.nrow 2068 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2069 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2071
2129 if (TermWin.focus || !showcursor) 2072 if (focus || !showcursor)
2130 oldcursor.row = -1; 2073 oldcursor.row = -1;
2131 else 2074 else
2132 setoldcursor = 1; 2075 setoldcursor = 1;
2133 } 2076 }
2134 } 2077 }
2135 else if (!TermWin.focus) 2078 else if (!focus)
2136 setoldcursor = 1; 2079 setoldcursor = 1;
2137 2080
2138 if (setoldcursor) 2081 if (setoldcursor)
2139 { 2082 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2083 if (screen.cur.row - view_start >= nrow)
2141 oldcursor.row = -1; 2084 oldcursor.row = -1;
2142 else 2085 else
2143 { 2086 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2145 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2146 } 2089 }
2147 } 2090 }
2148 } 2091 }
2149 2092
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2150#if ENABLE_OVERLAY 2094#if ENABLE_OVERLAY
2151 scr_swap_overlay (); 2095 scr_swap_overlay ();
2152#endif 2096#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156 2097
2157#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2099 /*
2159 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2161 */ 2102 */
2162 i = num_scr;
2163 if (!display->is_local 2103 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2166 { 2106 {
2167 int16_t nits; 2107 int16_t nits;
2168 int j; 2108 int j;
2169 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2170 2111
2171 j = TermWin.nrow; 2112 j = nrow;
2172 wlen = len = -1; 2113 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2116 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2118 {
2178 text_t *stp = screen.text[row + row_offset]; 2119 line_t s = ROW(view_start + row);
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2120 line_t d = drawn_buf[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2122
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2125 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2126 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2127 nits++;
2190 2128
2191 if (nits > 8) /* XXX: arbitrary choice */ 2129 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2130 {
2193 for (col = TermWin.ncol; col--; ) 2131 for (col = ncol; col--; )
2194 { 2132 {
2195 *dtp++ = *dtp2++; 2133 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2134 *d.r++ = *d2.r++;
2197 } 2135 }
2198 2136
2199 if (len == -1) 2137 if (len == -1)
2200 len = row; 2138 len = row;
2201 2139
… …
2206 2144
2207 if (len != -1) 2145 if (len != -1)
2208 { 2146 {
2209 /* also comes here at end if needed because of >= above */ 2147 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2148 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2149 ::swap (wlen, len);
2212 2150
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2151 XCopyArea (display->display, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2153 (unsigned int)this->width,
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2218 len = -1; 2156 len = -1;
2219 } 2157 }
2220 } 2158 }
… …
2222#endif 2160#endif
2223 2161
2224 /* 2162 /*
2225 * E: main pass across every character 2163 * E: main pass across every character
2226 */ 2164 */
2227 for (row = 0; row < TermWin.nrow; row++) 2165 for (row = 0; row < nrow; row++)
2228 { 2166 {
2229 text_t *stp = screen.text[row + row_offset]; 2167 text_t *stp = ROW(view_start + row).t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2168 rend_t *srp = ROW(view_start + row).r;
2231 text_t *dtp = drawn_text[row]; 2169 text_t *dtp = drawn_buf[row].t;
2232 rend_t *drp = drawn_rend[row]; 2170 rend_t *drp = drawn_buf[row].r;
2233 2171
2234 /* 2172 /*
2235 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
2236 */ 2174 */
2237 int ypixel = (int)Row2Pixel (row); 2175 int ypixel = (int)Row2Pixel (row);
2238 2176
2239 for (col = 0; col < TermWin.ncol; col++) 2177 for (col = 0; col < ncol; col++)
2240 { 2178 {
2241 /* compare new text with old - if exactly the same then continue */ 2179 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2180 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2181 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2182 || (stp[col] == ' ' /* space w/ no background change */
… …
2258 dtp[col] = stp[col]; 2196 dtp[col] = stp[col];
2259 drp[col] = rend; 2197 drp[col] = rend;
2260 2198
2261 int xpixel = Col2Pixel (col); 2199 int xpixel = Col2Pixel (col);
2262 2200
2263 for (i = 0; ++col < TermWin.ncol; ) 2201 for (i = 0; ++col < ncol; )
2264 { 2202 {
2265 if (stp[col] == NOCHAR) 2203 if (stp[col] == NOCHAR)
2266 { 2204 {
2267 dtp[col] = stp[col]; 2205 dtp[col] = stp[col];
2268 drp[col] = rend; 2206 drp[col] = rend;
… …
2296 2234
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2235 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2236 while (i && text[count] == NOCHAR)
2299 count++, i--; 2237 count++, i--;
2300 2238
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2312
2313 /* 2239 /*
2314 * Determine the attributes for the string 2240 * Determine the attributes for the string
2315 */ 2241 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2242 int fore = fgcolor_of (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2243 int back = bgcolor_of (rend); // desired background
2318 2244
2319 // only do special processing if ana attributes are set, which is rare 2245 // only do special processing if any attributes are set, which is unlikely
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2247 {
2248#if ENABLE_STYLES
2249 // "careful" (too wide) character handling
2250
2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2252 while (text > stp
2253 && srp[text - stp - 1] & RS_Careful
2254 && RS_SAME (rend, srp[text - stp - 1]))
2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2264#endif
2265
2322 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2323 2267
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold 2269 if (rend & RS_Bold
2326 && fore == Color_fg) 2270 && fore == Color_fg)
… …
2348 fore = Color_UL; 2292 fore = Color_UL;
2349#endif 2293#endif
2350 2294
2351 if (invert) 2295 if (invert)
2352 { 2296 {
2353 SWAP_IT (fore, back, int); 2297 ::swap (fore, back);
2354 2298
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2299#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV)) 2300 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV; 2301 back = Color_RV;
2302
2303 if (fore == back)
2304 {
2305 fore = Color_bg;
2306 back = Color_fg;
2307 }
2358#endif 2308#endif
2359 } 2309 }
2360 2310
2361#ifdef TEXT_BLINK 2311#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2312 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2373 } 2323 }
2374 2324
2375 /* 2325 /*
2376 * Actually do the drawing of the string here 2326 * Actually do the drawing of the string here
2377 */ 2327 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2328 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2329
2380 if (back == fore) 2330 if (back == fore)
2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2331 font->clear_rect (*drawable, xpixel, ypixel,
2382 TermWin.fwidth * count, TermWin.fheight, 2332 fwidth * count, fheight,
2383 back); 2333 back);
2384 else if (back == Color_bg) 2334 else if (back == Color_bg)
2385 { 2335 {
2386 if (must_clear) 2336 if (must_clear)
2387 { 2337 {
2388 CLEAR_CHARS (xpixel, ypixel, count); 2338 CLEAR_CHARS (xpixel, ypixel, count);
2389 2339
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2340 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2341 if (text[i] != ' ')
2392 { 2342 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2343 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2394 break; 2344 break;
2395 } 2345 }
2396 } 2346 }
2397 else 2347 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2348 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2399 } 2349 }
2400 else 2350 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2352
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2353 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2354 {
2405#if ENABLE_FRILLS 2355#if ENABLE_FRILLS
2406 if (ISSET_PIXCOLOR (Color_underline)) 2356 if (ISSET_PIXCOLOR (Color_underline))
2407 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2357 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2408 else 2358 else
2409#endif 2359#endif
2410 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2360 XSetForeground (display->display, gc, pix_colors[fore]);
2411 2361
2412 XDrawLine (display->display, drawBuffer, TermWin.gc, 2362 XDrawLine (display->display, drawBuffer, gc,
2413 xpixel, ypixel + font->ascent + 1, 2363 xpixel, ypixel + font->ascent + 1,
2414 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2415 } 2365 }
2416 } /* for (col....) */ 2366 } /* for (col....) */
2417 } /* for (row....) */ 2367 } /* for (row....) */
2418 2368
2419#if ENABLE_OVERLAY 2369#if ENABLE_OVERLAY
2420 scr_swap_overlay (); 2370 scr_swap_overlay ();
2421#endif 2371#endif
2372 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422 2373
2423 /* 2374 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2375 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2376 */
2426 if (showcursor) 2377 if (showcursor)
2427 { 2378 {
2428 if (TermWin.focus) 2379 if (focus)
2380 {
2381 if (OPTION (Opt_cursorUnderline))
2382 *crp ^= RS_Uline;
2383 else
2429 { 2384 {
2430 *crp ^= RS_RVid; 2385 *crp ^= RS_RVid;
2431#ifndef NO_CURSORCOLOR 2386#ifndef NO_CURSORCOLOR
2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2387 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2433#endif 2388#endif
2389 }
2434 } 2390 }
2435 else if (oldcursor.row >= 0) 2391 else if (oldcursor.row >= 0)
2436 { 2392 {
2393 int cursorwidth = 1;
2394 int col = oldcursor.col;
2395
2396 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2397 col--;
2398
2399 while (col + cursorwidth < ncol
2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2401 cursorwidth++;
2402
2437#ifndef NO_CURSORCOLOR 2403#ifndef NO_CURSORCOLOR
2438 if (ISSET_PIXCOLOR (Color_cursor)) 2404 if (ISSET_PIXCOLOR (Color_cursor))
2439 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2405 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2440#endif 2406#endif
2441 int cursorwidth = 1;
2442 while (oldcursor.col + cursorwidth < TermWin.ncol
2443 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2444 cursorwidth++;
2445 2407
2446 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2408 XDrawRectangle (display->display, drawBuffer, gc,
2447 Col2Pixel (oldcursor.col), 2409 Col2Pixel (col),
2448 Row2Pixel (oldcursor.row), 2410 Row2Pixel (oldcursor.row),
2449 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2411 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2450 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2451 } 2413 }
2452 } 2414 }
2453 2415
2454 /* 2416 /*
2455 * H: cleanup selection 2417 * H: cleanup selection
2456 */ 2418 */
2457 scr_reverse_selection (); 2419 scr_reverse_selection ();
2458 2420
2459 if (refresh_type & SMOOTH_REFRESH)
2460 XFlush (display->display);
2461
2462 num_scr = 0; 2421 num_scr = 0;
2463 num_scr_allow = 1; 2422 num_scr_allow = 1;
2464} 2423}
2465 2424
2466void 2425void
2467rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2426rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2468{ 2427{
2469 if (!rp || !tp) 2428 if (!l.t)
2470 return; 2429 return;
2471 2430
2472 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2431 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2432
2433 for (int i = ncol; i--; )
2473 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2434 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2474} 2435}
2475 2436
2476void 2437void
2477rxvt_term::scr_remap_chars () 2438rxvt_term::scr_remap_chars () NOTHROW
2478{ 2439{
2479 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2440 for (int i = total_rows; i--; )
2480 scr_remap_chars (screen.text[i], screen.rend[i]); 2441 scr_remap_chars (row_buf [i]);
2481 2442
2482 for (int i = TermWin.nrow; i--; ) 2443 for (int i = nrow; i--; )
2483 {
2484 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2485 scr_remap_chars (swap.text[i], swap.rend[i]);
2486 } 2444 {
2445 scr_remap_chars (drawn_buf [i]);
2446 scr_remap_chars (swap_buf [i]);
2447 }
2487} 2448}
2488 2449
2489void 2450void
2490rxvt_term::scr_recolour () 2451rxvt_term::scr_recolour () NOTHROW
2491{ 2452{
2492 if (1 2453 if (1
2493#if TRANSPARENT 2454#if TRANSPARENT
2494 && !am_transparent 2455 && !am_transparent
2495#endif 2456#endif
2496#if XPM_BACKGROUND 2457#if XPM_BACKGROUND
2497 && !bgPixmap.pixmap 2458 && !bgPixmap.pixmap
2498#endif 2459#endif
2499 ) 2460 )
2500 { 2461 {
2501 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2462 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2502 XClearWindow (display->display, TermWin.parent[0]); 2463 XClearWindow (display->display, parent[0]);
2503 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2464 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2504#if HAVE_SCROLLBARS 2465#if HAVE_SCROLLBARS
2505 if (scrollBar.win) 2466 if (scrollBar.win)
2506 { 2467 {
2507 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2468 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2508 scrollBar.setIdle (); 2469 scrollBar.setIdle ();
… …
2516 want_refresh = 1; 2477 want_refresh = 1;
2517} 2478}
2518 2479
2519/* ------------------------------------------------------------------------- */ 2480/* ------------------------------------------------------------------------- */
2520void 2481void
2521rxvt_term::scr_clear (bool really) 2482rxvt_term::scr_clear (bool really) NOTHROW
2522{ 2483{
2523 if (!TermWin.mapped) 2484 if (!mapped)
2524 return; 2485 return;
2525 2486
2526 num_scr_allow = 0; 2487 num_scr_allow = 0;
2527 want_refresh = 1; 2488 want_refresh = 1;
2528 2489
2529#if TRANSPARENT
2530 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2531 {
2532 int i;
2533
2534 if (!(options & Opt_transparent_all))
2535 i = 0;
2536 else
2537 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2538
2539 while (i--)
2540 if (TermWin.parent[i] != None)
2541 XClearWindow (display->display, TermWin.parent[i]);
2542 }
2543#endif
2544
2545 if (really) 2490 if (really)
2546 XClearWindow (display->display, TermWin.vt); 2491 XClearWindow (display->display, vt);
2547} 2492}
2548 2493
2549/* ------------------------------------------------------------------------- */
2550void 2494void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{
2497 int view_end = view_start + nrow;
2498 int row, col;
2499
2500 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2501 {
2502 text_t *stp = ROW(row).t;
2503 rend_t *srp = ROW(row).r;
2504
2505 for (col = beg_col; col < end_col; col++)
2506 srp[col] ^= rstyle1;
2507
2508 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2509 srp[col] ^= rstyle2;
2510
2511 if (++col < end_col)
2512 srp[col] ^= rstyle2;
2513 }
2514}
2515
2516void
2517rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2518{
2519 int view_end = view_start + nrow;
2520 int row, col;
2521
2522 if (beg_row >= view_start)
2523 {
2524 col = beg_col;
2525 row = beg_row;
2526 }
2527 else
2528 {
2529 col = 0;
2530 row = view_start;
2531 }
2532
2533 for (; row < min (end_row, view_end); row++, col = 0)
2534 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2535 srp[col] ^= rstyle;
2536
2537 if (row == end_row)
2538 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2539 srp[col] ^= rstyle;
2540}
2541
2542/* ------------------------------------------------------------------------- */
2543void
2551rxvt_term::scr_reverse_selection () 2544rxvt_term::scr_reverse_selection () NOTHROW
2552{ 2545{
2546 if (selection.op
2553 if (selection.op && current_screen == selection.screen) 2547 && current_screen == selection.screen
2548 && selection.end.row >= view_start)
2554 { 2549 {
2555 int end_row = TermWin.saveLines - TermWin.view_start;
2556 int i = selection.beg.row + TermWin.saveLines;
2557 int col, row = selection.end.row + TermWin.saveLines;
2558 rend_t *srp;
2559
2560#if ENABLE_FRILLS 2550#if ENABLE_FRILLS
2561 if (selection.rect) 2551 if (selection.rect)
2562 { 2552 scr_xor_rect (selection.beg.row, selection.beg.col,
2563 end_row += TermWin.nrow; 2553 selection.end.row, selection.end.col,
2564 2554 RS_RVid, RS_RVid | RS_Uline);
2565 for (; i <= row && i <= end_row; i++)
2566 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2567 srp[col] ^= RS_RVid;
2568 }
2569 else 2555 else
2570#endif 2556#endif
2571 { 2557 scr_xor_span (selection.beg.row, selection.beg.col,
2572 if (i >= end_row) 2558 selection.end.row, selection.end.col,
2573 col = selection.beg.col; 2559 RS_RVid);
2574 else
2575 {
2576 col = 0;
2577 i = end_row;
2578 }
2579
2580 end_row += TermWin.nrow;
2581
2582 for (; i < row && i < end_row; i++, col = 0)
2583 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2584 srp[col] ^= RS_RVid;
2585
2586 if (i == row && i < end_row)
2587 for (srp = screen.rend[i]; col < selection.end.col; col++)
2588 srp[col] ^= RS_RVid;
2589 }
2590 } 2560 }
2591} 2561}
2592 2562
2593/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2594/* 2564/*
2595 * Dump the whole scrollback and screen to the passed filedescriptor. The 2565 * Dump the whole scrollback and screen to the passed filedescriptor. The
2596 * invoking routine must close the fd. 2566 * invoking routine must close the fd.
2597 */ 2567 */
2598#if 0 2568#if 0
2599void 2569void
2600rxvt_term::scr_dump (int fd) 2570rxvt_term::scr_dump (int fd) NOTHROW
2601{ 2571{
2602 int row, wrote; 2572 int row, wrote;
2603 unsigned int width, towrite; 2573 unsigned int width, towrite;
2604 char r1[] = "\n"; 2574 char r1[] = "\n";
2605 2575
2606 for (row = TermWin.saveLines - TermWin.nscrolled; 2576 for (row = saveLines - nsaved;
2607 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2577 row < saveLines + nrow - 1; row++)
2608 { 2578 {
2609 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2579 width = row_buf[row].l >= 0 ? row_buf[row].l
2610 : TermWin.ncol; 2580 : ncol;
2611 for (towrite = width; towrite; towrite -= wrote) 2581 for (towrite = width; towrite; towrite -= wrote)
2612 { 2582 {
2613 wrote = write (fd, & (screen.text[row][width - towrite]), 2583 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2614 towrite); 2584 towrite);
2615 if (wrote < 0) 2585 if (wrote < 0)
2616 return; /* XXX: death, no report */ 2586 return; /* XXX: death, no report */
2617 } 2587 }
2618 if (screen.tlen[row] >= 0) 2588 if (row_buf[row].l >= 0)
2619 if (write (fd, r1, 1) <= 0) 2589 if (write (fd, r1, 1) <= 0)
2620 return; /* XXX: death, no report */ 2590 return; /* XXX: death, no report */
2621 } 2591 }
2622} 2592}
2623#endif 2593#endif
2624 2594
2625/* ------------------------------------------------------------------------- * 2595/* ------------------------------------------------------------------------- *
2626 * CHARACTER SELECTION * 2596 * CHARACTER SELECTION *
2627 * ------------------------------------------------------------------------- */ 2597 * ------------------------------------------------------------------------- */
2628
2629/*
2630 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2631 */
2632void 2598void
2633rxvt_term::selection_check (int check_more) 2599rxvt_term::selection_check (int check_more) NOTHROW
2634{ 2600{
2635 row_col_t pos; 2601 row_col_t pos;
2636 2602
2637 if (!selection.op) 2603 if (!selection.op)
2638 return; 2604 return;
2639 2605
2640 pos.row = pos.col = 0; 2606 pos.row = pos.col = 0;
2641 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2607 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2642 || (selection.beg.row >= TermWin.nrow) 2608 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2643 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2609 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2644 || (selection.mark.row >= TermWin.nrow)
2645 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2646 || (selection.end.row >= TermWin.nrow)
2647 || (check_more == 1 2610 || (check_more == 1
2648 && current_screen == selection.screen 2611 && current_screen == selection.screen
2649 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2612 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2650 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2613 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2651 || (check_more == 2 2614 || (check_more == 2
… …
2653 && ROWCOL_IS_AFTER (selection.end, pos)) 2616 && ROWCOL_IS_AFTER (selection.end, pos))
2654 || (check_more == 3 2617 || (check_more == 3
2655 && ROWCOL_IS_AFTER (selection.end, pos)) 2618 && ROWCOL_IS_AFTER (selection.end, pos))
2656 || (check_more == 4 /* screen width change */ 2619 || (check_more == 4 /* screen width change */
2657 && (selection.beg.row != selection.end.row 2620 && (selection.beg.row != selection.end.row
2658 || selection.end.col > TermWin.ncol))) 2621 || selection.end.col > ncol)))
2659 CLEAR_SELECTION (); 2622 CLEAR_SELECTION ();
2660} 2623}
2661 2624
2662/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2663/* 2626/*
2664 * Paste a selection direct to the command fd 2627 * Paste a selection direct to the command fd
2665 */ 2628 */
2666void 2629void
2667rxvt_term::paste (unsigned char *data, unsigned int len) 2630rxvt_term::paste (char *data, unsigned int len) NOTHROW
2668{ 2631{
2669 /* convert normal newline chars into common keyboard Return key sequence */ 2632 /* convert normal newline chars into common keyboard Return key sequence */
2670 for (unsigned int i = 0; i < len; i++) 2633 for (unsigned int i = 0; i < len; i++)
2671 if (data[i] == C0_LF) 2634 if (data[i] == C0_LF)
2672 data[i] = C0_CR; 2635 data[i] = C0_CR;
… …
2678/* 2641/*
2679 * Respond to a notification that a primary selection has been sent 2642 * Respond to a notification that a primary selection has been sent
2680 * EXT: SelectionNotify 2643 * EXT: SelectionNotify
2681 */ 2644 */
2682void 2645void
2683rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2646rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2684{ 2647{
2685 if (prop == None) /* check for failed XConvertSelection */ 2648 if (prop == None) /* check for failed XConvertSelection */
2686 { 2649 {
2687 if ((selection_type & Sel_CompoundText)) 2650 if ((selection_type & Sel_CompoundText))
2688 { 2651 {
… …
2816 { 2779 {
2817 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2818 char *s = rxvt_wcstombs (w); 2781 char *s = rxvt_wcstombs (w);
2819 free (w); 2782 free (w);
2820 // TODO: strlen == only the first element will be converted. well... 2783 // TODO: strlen == only the first element will be converted. well...
2821 paste ((unsigned char *)s, strlen (s)); 2784 paste (s, strlen (s));
2822 free (s); 2785 free (s);
2823 } 2786 }
2824 else 2787 else
2825#endif 2788#endif
2826 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2827 && cl) 2790 && cl)
2828 { 2791 {
2829 for (int i = 0; i < cr; i++) 2792 for (int i = 0; i < cr; i++)
2830 paste ((unsigned char *)cl[i], strlen (cl[i])); 2793 paste (cl[i], strlen (cl[i]));
2831 2794
2832 XFreeStringList (cl); 2795 XFreeStringList (cl);
2833 } 2796 }
2834 else 2797 else
2835 paste (ct.value, ct.nitems); // paste raw 2798 paste ((char *)ct.value, ct.nitems); // paste raw
2836 2799
2837bailout: 2800bailout:
2838 XFree (ct.value); 2801 XFree (ct.value);
2839 2802
2840 if (selection_wait == Sel_normal) 2803 if (selection_wait == Sel_normal)
2841 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2842} 2805}
2843 2806
2844void 2807void
2845rxvt_term::incr_cb (time_watcher &w) 2808rxvt_term::incr_cb (time_watcher &w) NOTHROW
2846{ 2809{
2847 selection_wait = Sel_none; 2810 selection_wait = Sel_none;
2848 2811
2849 incr_buf_size = 0; 2812 incr_buf_size = 0;
2850 free (incr_buf); 2813 free (incr_buf);
2851 2814
2852 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2815 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2853} 2816}
2854 2817
2855void 2818void
2856rxvt_term::selection_property (Window win, Atom prop) 2819rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2857{ 2820{
2858 if (prop == None || selection_wait != Sel_incr) 2821 if (prop == None || selection_wait != Sel_incr)
2859 return; 2822 return;
2860 2823
2861 selection_paste (win, prop, true); 2824 selection_paste (win, prop, true);
… …
2870 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2871 * will auto fallback to CUT_BUFFER0 2834 * will auto fallback to CUT_BUFFER0
2872 * EXT: button 2 release 2835 * EXT: button 2 release
2873 */ 2836 */
2874void 2837void
2875rxvt_term::selection_request (Time tm, int x, int y) 2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2876{ 2839{
2877 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2840 if (selection.text && selnum == Sel_Primary)
2878 return; /* outside window */
2879
2880 if (selection.text)
2881 { /* internal selection */ 2841 { /* internal selection */
2882 char *str = rxvt_wcstombs (selection.text, selection.len); 2842 char *str = rxvt_wcstombs (selection.text, selection.len);
2883 paste ((unsigned char *)str, strlen (str)); 2843 paste (str, strlen (str));
2884 free (str); 2844 free (str);
2885 return; 2845 return;
2886 } 2846 }
2887 else 2847 else
2888 { 2848 {
2889 int i;
2890
2891 selection_request_time = tm; 2849 selection_request_time = tm;
2892 selection_wait = Sel_normal; 2850 selection_wait = Sel_normal;
2893 2851
2894 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2895 {
2896#if X_HAVE_UTF8_STRING 2852#if X_HAVE_UTF8_STRING
2897 selection_type = Sel_UTF8String; 2853 selection_type = Sel_UTF8String;
2898 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2854 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2899 return; 2855 return;
2900#else 2856#else
2901 selection_type = Sel_CompoundText; 2857 selection_type = Sel_CompoundText;
2902 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2858 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2903 return; 2859 return;
2904#endif 2860#endif
2905 }
2906 } 2861 }
2907 2862
2908 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2863 selection_wait = Sel_none; /* don't loop in selection_paste () */
2909 selection_paste (display->root, XA_CUT_BUFFER0, false); 2864 selection_paste (display->root, XA_CUT_BUFFER0, false);
2910} 2865}
2911 2866
2912int 2867int
2913rxvt_term::selection_request_other (Atom target, int selnum) 2868rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2914{ 2869{
2915 Atom sel; 2870 Atom sel;
2916 2871
2917 selection_type |= selnum; 2872 selection_type |= selnum;
2918 2873
… …
2924 sel = xa[XA_CLIPBOARD]; 2879 sel = xa[XA_CLIPBOARD];
2925 2880
2926 if (XGetSelectionOwner (display->display, sel) != None) 2881 if (XGetSelectionOwner (display->display, sel) != None)
2927 { 2882 {
2928 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2883 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2929 TermWin.vt, selection_request_time); 2884 vt, selection_request_time);
2930 return 1; 2885 return 1;
2931 } 2886 }
2932 2887
2933 return 0; 2888 return 0;
2934} 2889}
… …
2937/* 2892/*
2938 * Clear all selected text 2893 * Clear all selected text
2939 * EXT: SelectionClear 2894 * EXT: SelectionClear
2940 */ 2895 */
2941void 2896void
2942rxvt_term::selection_clear () 2897rxvt_term::selection_clear () NOTHROW
2943{ 2898{
2944 want_refresh = 1; 2899 want_refresh = 1;
2945 free (selection.text); 2900 free (selection.text);
2946 selection.text = NULL; 2901 selection.text = NULL;
2947 selection.len = 0; 2902 selection.len = 0;
… …
2957 * EXT: button 1 or 3 release 2912 * EXT: button 1 or 3 release
2958 */ 2913 */
2959void 2914void
2960rxvt_term::selection_make (Time tm) 2915rxvt_term::selection_make (Time tm)
2961{ 2916{
2962 int i, col, end_col, row, end_row; 2917 int i;
2963 wchar_t *new_selection_text; 2918 wchar_t *new_selection_text;
2964 text_t *t; 2919 text_t *t;
2965 2920
2966 switch (selection.op) 2921 switch (selection.op)
2967 { 2922 {
… …
2980 selection.op = SELECTION_DONE; 2935 selection.op = SELECTION_DONE;
2981 2936
2982 if (selection.clicks == 4) 2937 if (selection.clicks == 4)
2983 return; /* nothing selected, go away */ 2938 return; /* nothing selected, go away */
2984 2939
2940 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2941 return;
2942
2985 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2943 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2986 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2944 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2987 2945
2988 col = selection.beg.col;
2989 row = selection.beg.row + TermWin.saveLines;
2990 end_row = selection.end.row + TermWin.saveLines;
2991 int ofs = 0; 2946 int ofs = 0;
2992 int extra = 0; 2947 int extra = 0;
2993 2948
2949 int col = selection.beg.col;
2950 int row = selection.beg.row;
2951
2952 int end_col;
2953
2994 for (; row <= end_row; row++, col = 0) 2954 for (; row <= selection.end.row; row++, col = 0)
2995 { 2955 {
2996 end_col = screen.tlen[row];
2997
2998#if ENABLE_FRILLS 2956#if ENABLE_FRILLS
2999 if (selection.rect) 2957 if (selection.rect)
3000 { 2958 {
3001 col = selection.beg.col; 2959 col = selection.beg.col;
3002 end_col = TermWin.ncol + 1; 2960 end_col = ncol + 1;
2961 }
2962 else
2963#endif
2964 end_col = ROW(row).l;
2965
2966 col = max (col, 0);
2967
2968 if (row == selection.end.row
2969#if ENABLE_FRILLS
2970 || selection.rect
2971#endif
3003 } 2972 )
3004#endif
3005
3006 MAX_IT (col, 0);
3007
3008 if (end_col == -1)
3009 end_col = TermWin.ncol;
3010
3011 if (row == end_row || selection.rect)
3012 MIN_IT (end_col, selection.end.col); 2973 min_it (end_col, selection.end.col);
3013 2974
3014 t = &screen.text[row][col]; 2975 t = ROW(row).t + col;
2976
3015 for (; col < end_col; col++) 2977 for (; col < end_col; col++)
3016 { 2978 {
3017 if (*t == NOCHAR) 2979 if (*t == NOCHAR)
3018 t++; 2980 t++;
3019#if ENABLE_COMBINING 2981#if ENABLE_COMBINING
… …
3035#endif 2997#endif
3036 else 2998 else
3037 new_selection_text[ofs++] = *t++; 2999 new_selection_text[ofs++] = *t++;
3038 } 3000 }
3039 3001
3040 if (screen.tlen[row] != -1 && row != end_row) 3002#if ENABLE_FRILLS
3003 if (selection.rect)
3004 {
3005 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1]))
3008 --ofs;
3009
3041 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
3011 }
3012 else
3013#endif
3014 if (!ROW(row).is_longer () && row != selection.end.row)
3015 new_selection_text[ofs++] = C0_LF;
3042 } 3016 }
3043 3017
3044 if (end_col != selection.end.col) 3018 if (end_col != selection.end.col)
3045 new_selection_text[ofs++] = C0_LF; 3019 new_selection_text[ofs++] = C0_LF;
3046 3020
… …
3056 3030
3057 // we usually allocate much more than necessary, so realloc it smaller again 3031 // we usually allocate much more than necessary, so realloc it smaller again
3058 selection.len = ofs; 3032 selection.len = ofs;
3059 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3033 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3060 3034
3035 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3036 return;
3037
3038 selection_grab (tm);
3039}
3040
3041bool
3042rxvt_term::selection_grab (Time tm) NOTHROW
3043{
3044 selection_time = tm;
3045
3061 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3062 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3048 {
3063 display->set_selection_owner (this); 3049 display->set_selection_owner (this);
3050 return true;
3051 }
3064 else 3052 else
3065 rxvt_warn ("can't get primary selection, ignoring.\n"); 3053 {
3054 selection_clear ();
3055 return false;
3056 }
3066 3057
3067#if 0 3058#if 0
3068 XTextProperty ct; 3059 XTextProperty ct;
3069 3060
3070 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3071 { 3062 {
3072 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3073 XFree (ct.value); 3064 XFree (ct.value);
3074 } 3065 }
3075#endif 3066#endif
3076
3077 selection_time = tm;
3078} 3067}
3079 3068
3080/* ------------------------------------------------------------------------- */ 3069/* ------------------------------------------------------------------------- */
3081/* 3070/*
3082 * Mark or select text based upon number of clicks: 1, 2, or 3 3071 * Mark or select text based upon number of clicks: 1, 2, or 3
3083 * EXT: button 1 press 3072 * EXT: button 1 press
3084 */ 3073 */
3085void 3074void
3086rxvt_term::selection_click (int clicks, int x, int y) 3075rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3087{ 3076{
3088 clicks = ((clicks - 1) % 3) + 1; 3077 clicks = ((clicks - 1) % 3) + 1;
3089 selection.clicks = clicks; /* save clicks so extend will work */ 3078 selection.clicks = clicks; /* save clicks so extend will work */
3090 3079
3080 if (clicks == 2 && !selection.rect
3081 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3082 {
3083 MEvent.clicks = 1; // what a mess
3084 selection.screen = current_screen;
3085 selection.op = SELECTION_CONT;
3086 return;
3087 }
3088
3091 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3089 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3092 3090
3093 if (clicks == 2 || clicks == 3) 3091 if (clicks == 2 || clicks == 3)
3094 selection_extend_colrow (selection.mark.col, 3092 selection_extend_colrow (selection.mark.col,
3095 selection.mark.row + TermWin.view_start, 3093 selection.mark.row - view_start,
3096 0, /* button 3 */ 3094 0, /* button 3 */
3097 1, /* button press */ 3095 1, /* button press */
3098 0); /* click change */ 3096 0); /* click change */
3099} 3097}
3100 3098
3101/* ------------------------------------------------------------------------- */ 3099/* ------------------------------------------------------------------------- */
3102/* 3100/*
3103 * Mark a selection at the specified col/row 3101 * Mark a selection at the specified col/row
3104 */ 3102 */
3105void 3103void
3106rxvt_term::selection_start_colrow (int col, int row) 3104rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3107{ 3105{
3108 want_refresh = 1; 3106 want_refresh = 1;
3107
3108 selection.mark.row = row + view_start;
3109 selection.mark.col = col; 3109 selection.mark.col = col;
3110 selection.mark.row = row - TermWin.view_start;
3111 3110
3112 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3111 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3113 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3114 MAX_IT (selection.mark.col, 0);
3115 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3116 3113
3117 while (selection.mark.col > 0 3114 while (selection.mark.col > 0
3118 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3119 --selection.mark.col; 3116 --selection.mark.col;
3120 3117
3121 if (selection.op) 3118 if (selection.op)
3122 { /* clear the old selection */ 3119 { /* clear the old selection */
3123 selection.beg.row = selection.end.row = selection.mark.row; 3120 selection.beg.row = selection.end.row = selection.mark.row;
… …
3138#define DELIMIT_TEXT(x) \ 3135#define DELIMIT_TEXT(x) \
3139 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3136 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3140#define DELIMIT_REND(x) 1 3137#define DELIMIT_REND(x) 1
3141 3138
3142void 3139void
3143rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3140rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3144{ 3141{
3145 int col, row, dirnadd, tcol, trow, w1, w2; 3142 int col, row, dirnadd, tcol, trow, w1, w2;
3146 row_col_t bound; 3143 row_col_t bound;
3147 text_t *stp; 3144 text_t *stp;
3148 rend_t *srp; 3145 rend_t *srp;
3149 3146
3150 if (dirn == UP) 3147 if (dirn == UP)
3151 { 3148 {
3152 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3149 bound.row = top_row - 1;
3153 bound.col = 0; 3150 bound.col = 0;
3154 dirnadd = -1; 3151 dirnadd = -1;
3155 } 3152 }
3156 else 3153 else
3157 { 3154 {
3158 bound.row = TermWin.saveLines + TermWin.nrow; 3155 bound.row = nrow;
3159 bound.col = TermWin.ncol - 1; 3156 bound.col = ncol - 1;
3160 dirnadd = 1; 3157 dirnadd = 1;
3161 } 3158 }
3162 3159
3163 row = mark->row + TermWin.saveLines; 3160 row = mark->row;
3164 col = mark->col; 3161 col = max (mark->col, 0);
3165 MAX_IT (col, 0); 3162
3166 /* find the edge of a word */ 3163 /* find the edge of a word */
3167 stp = &screen.text[row][col]; 3164 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3168 w1 = DELIMIT_TEXT (*stp); 3165 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3169
3170 srp = &screen.rend[row][col];
3171 w2 = DELIMIT_REND (*srp);
3172 3166
3173 for (;;) 3167 for (;;)
3174 { 3168 {
3175 for (; col != bound.col; col += dirnadd) 3169 for (; col != bound.col; col += dirnadd)
3176 { 3170 {
… …
3186 break; 3180 break;
3187 } 3181 }
3188 3182
3189 if ((col == bound.col) && (row != bound.row)) 3183 if ((col == bound.col) && (row != bound.row))
3190 { 3184 {
3191 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3185 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3192 { 3186 {
3193 trow = row + dirnadd; 3187 trow = row + dirnadd;
3194 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3188 tcol = dirn == UP ? ncol - 1 : 0;
3195 3189
3196 if (screen.text[trow] == NULL) 3190 if (!ROW(trow).t)
3197 break; 3191 break;
3198 3192
3199 stp = & (screen.text[trow][tcol]); 3193 stp = ROW(trow).t + tcol;
3200 srp = & (screen.rend[trow][tcol]); 3194 srp = ROW(trow).r + tcol;
3201 3195
3202 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3196 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3203 break; 3197 break;
3204 3198
3205 row = trow; 3199 row = trow;
… …
3208 } 3202 }
3209 } 3203 }
3210 break; 3204 break;
3211 } 3205 }
3212 3206
3213Old_Word_Selection_You_Die:
3214 if (dirn == DN) 3207 if (dirn == DN)
3215 col++; /* put us on one past the end */ 3208 col++; /* put us on one past the end */
3216 3209
3217 /* Poke the values back in */ 3210 /* Poke the values back in */
3218 ret->row = row - TermWin.saveLines; 3211 ret->row = row;
3219 ret->col = col; 3212 ret->col = col;
3220} 3213}
3221 3214
3222/* ------------------------------------------------------------------------- */ 3215/* ------------------------------------------------------------------------- */
3223/* 3216/*
… …
3226 * flag == 0 ==> button 1 3219 * flag == 0 ==> button 1
3227 * flag == 1 ==> button 3 press 3220 * flag == 1 ==> button 3 press
3228 * flag == 2 ==> button 3 motion 3221 * flag == 2 ==> button 3 motion
3229 */ 3222 */
3230void 3223void
3231rxvt_term::selection_extend (int x, int y, int flag) 3224rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3232{ 3225{
3233 int col, row; 3226 int col = clamp (Pixel2Col (x), 0, ncol);
3234 3227 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3235 col = Pixel2Col (x);
3236 row = Pixel2Row (y);
3237 MAX_IT (row, 0);
3238 MIN_IT (row, (int)TermWin.nrow - 1);
3239 MAX_IT (col, 0);
3240 MIN_IT (col, (int)TermWin.ncol);
3241 3228
3242 /* 3229 /*
3243 * If we're selecting characters (single click) then we must check first 3230 * If we're selecting characters (single click) then we must check first
3244 * if we are at the same place as the original mark. If we are then 3231 * if we are at the same place as the original mark. If we are then
3245 * select nothing. Otherwise, if we're to the right of the mark, you have to 3232 * select nothing. Otherwise, if we're to the right of the mark, you have to
3246 * be _past_ a character for it to be selected. 3233 * be _past_ a character for it to be selected.
3247 */ 3234 */
3248 if (((selection.clicks % 3) == 1) && !flag 3235 if (((selection.clicks % 3) == 1) && !flag
3249 && (col == selection.mark.col 3236 && (col == selection.mark.col
3250 && (row == selection.mark.row + TermWin.view_start))) 3237 && (row == selection.mark.row - view_start)))
3251 { 3238 {
3252 /* select nothing */ 3239 /* select nothing */
3253 selection.beg.row = selection.end.row = 0; 3240 selection.beg.row = selection.end.row = 0;
3254 selection.beg.col = selection.end.col = 0; 3241 selection.beg.col = selection.end.col = 0;
3255 selection.clicks = 4; 3242 selection.clicks = 4;
… …
3268/* ------------------------------------------------------------------------- */ 3255/* ------------------------------------------------------------------------- */
3269/* 3256/*
3270 * Extend the selection to the specified col/row 3257 * Extend the selection to the specified col/row
3271 */ 3258 */
3272void 3259void
3273rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3274{ 3261{
3275 int16_t ncol = TermWin.ncol;
3276 int end_col;
3277 row_col_t pos; 3262 row_col_t pos;
3278 enum { 3263 enum {
3279 LEFT, RIGHT 3264 LEFT, RIGHT
3280 } closeto = RIGHT; 3265 } closeto = RIGHT;
3281 3266
… …
3312 selection.beg.col = selection.end.col = selection.mark.col; 3297 selection.beg.col = selection.end.col = selection.mark.col;
3313 selection.beg.row = selection.end.row = selection.mark.row; 3298 selection.beg.row = selection.end.row = selection.mark.row;
3314 } 3299 }
3315 3300
3316 pos.col = col; 3301 pos.col = col;
3317 pos.row = row; 3302 pos.row = view_start + row;
3318
3319 pos.row -= TermWin.view_start; /* adjust for scroll */
3320 3303
3321 /* 3304 /*
3322 * This is mainly xterm style selection with a couple of differences, mainly 3305 * This is mainly xterm style selection with a couple of differences, mainly
3323 * in the way button3 drag extension works. 3306 * in the way button3 drag extension works.
3324 * We're either doing: button1 drag; button3 press; or button3 drag 3307 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3383 } 3366 }
3384 } 3367 }
3385 3368
3386 if (selection.clicks == 1) 3369 if (selection.clicks == 1)
3387 { 3370 {
3388 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3371 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3389 3372 && !ROW(selection.beg.row).is_longer ()
3390 if (selection.beg.col > end_col
3391 && end_col != -1
3392#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3393 && !selection.rect 3374 && !selection.rect
3394#endif 3375#endif
3395 ) 3376 )
3396 selection.beg.col = ncol; 3377 selection.beg.col = ncol;
3397 3378
3398 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3399
3400 if ( 3379 if (
3401 selection.end.col > end_col 3380 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3402 && end_col != -1 3381 && !ROW(selection.end.row).is_longer ()
3403#if ENABLE_FRILLS 3382#if ENABLE_FRILLS
3404 && !selection.rect 3383 && !selection.rect
3405#endif 3384#endif
3406 ) 3385 )
3407 selection.end.col = ncol; 3386 selection.end.col = ncol;
… …
3415 selection_delimit_word (DN, &selection.end, &selection.end); 3394 selection_delimit_word (DN, &selection.end, &selection.end);
3416 } 3395 }
3417 else if (selection.clicks == 3) 3396 else if (selection.clicks == 3)
3418 { 3397 {
3419#if ENABLE_FRILLS 3398#if ENABLE_FRILLS
3420 if (options & Opt_tripleclickwords) 3399 if (OPTION (Opt_tripleclickwords))
3421 { 3400 {
3422 int end_row;
3423
3424 selection_delimit_word (UP, &selection.beg, &selection.beg); 3401 selection_delimit_word (UP, &selection.beg, &selection.beg);
3425 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3426 3402
3427 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3403 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3428 { 3404 {
3429 end_col = screen.tlen[end_row + TermWin.saveLines]; 3405 if (!ROW(end_row).is_longer ())
3430
3431 if (end_col != -1)
3432 { 3406 {
3433 selection.end.row = end_row; 3407 selection.end.row = end_row;
3434 selection.end.col = end_col; 3408 selection.end.col = ROW(end_row).l;
3435 selection_remove_trailing_spaces (); 3409 selection_remove_trailing_spaces ();
3436 break; 3410 break;
3437 } 3411 }
3438 } 3412 }
3439 } 3413 }
… …
3445 3419
3446 selection.beg.col = 0; 3420 selection.beg.col = 0;
3447 selection.end.col = ncol; 3421 selection.end.col = ncol;
3448 3422
3449 // select a complete logical line 3423 // select a complete logical line
3450 while (selection.beg.row > -TermWin.saveLines 3424 while (selection.beg.row > -saveLines
3451 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3425 && ROW(selection.beg.row - 1).is_longer ())
3452 selection.beg.row--; 3426 selection.beg.row--;
3453 3427
3454 while (selection.end.row < TermWin.nrow 3428 while (selection.end.row < nrow
3455 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3429 && ROW(selection.end.row).is_longer ())
3456 selection.end.row++; 3430 selection.end.row++;
3457 } 3431 }
3458 } 3432 }
3459 3433
3460 if (button3 && buttonpress) 3434 if (button3 && buttonpress)
… …
3471 } 3445 }
3472 } 3446 }
3473 3447
3474#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3475 if (selection.rect && selection.beg.col > selection.end.col) 3449 if (selection.rect && selection.beg.col > selection.end.col)
3476 SWAP_IT (selection.beg.col, selection.end.col, int); 3450 ::swap (selection.beg.col, selection.end.col);
3477#endif 3451#endif
3478} 3452}
3479 3453
3480#if ENABLE_FRILLS 3454#if ENABLE_FRILLS
3481void 3455void
3482rxvt_term::selection_remove_trailing_spaces () 3456rxvt_term::selection_remove_trailing_spaces () NOTHROW
3483{ 3457{
3484 int32_t end_col, end_row; 3458 int32_t end_col, end_row;
3485 text_t *stp; 3459 text_t *stp;
3486 3460
3487 end_col = selection.end.col; 3461 end_col = selection.end.col;
3488 end_row = selection.end.row; 3462 end_row = selection.end.row;
3489 3463
3490 for ( ; end_row >= selection.beg.row; ) 3464 for (; end_row >= selection.beg.row; )
3491 { 3465 {
3492 stp = screen.text[end_row + TermWin.saveLines]; 3466 stp = ROW(end_row).t;
3493 3467
3494 while (--end_col >= 0) 3468 while (--end_col >= 0)
3495 { 3469 {
3496 if (stp[end_col] != ' ' 3470 if (stp[end_col] != NOCHAR
3497 && stp[end_col] != '\t' 3471 && !unicode::is_space (stp[end_col]))
3498 && stp[end_col] != NOCHAR)
3499 break; 3472 break;
3500 } 3473 }
3501 3474
3502 if (end_col >= 0 3475 if (end_col >= 0
3503 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3476 || !ROW(end_row - 1).is_longer ())
3504 { 3477 {
3505 selection.end.col = end_col + 1; 3478 selection.end.col = end_col + 1;
3506 selection.end.row = end_row; 3479 selection.end.row = end_row;
3507 break; 3480 break;
3508 } 3481 }
3509 3482
3510 end_row--; 3483 end_row--;
3511 end_col = TermWin.ncol; 3484 end_col = ncol;
3512 } 3485 }
3513 3486
3514 if (selection.mark.row > selection.end.row) 3487 if (selection.mark.row > selection.end.row)
3515 { 3488 {
3516 selection.mark.row = selection.end.row; 3489 selection.mark.row = selection.end.row;
… …
3526/* 3499/*
3527 * Double click on button 3 when already selected 3500 * Double click on button 3 when already selected
3528 * EXT: button 3 double click 3501 * EXT: button 3 double click
3529 */ 3502 */
3530void 3503void
3531rxvt_term::selection_rotate (int x, int y) 3504rxvt_term::selection_rotate (int x, int y) NOTHROW
3532{ 3505{
3533 selection.clicks = selection.clicks % 3 + 1; 3506 selection.clicks = selection.clicks % 3 + 1;
3534 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3507 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3535} 3508}
3536 3509
… …
3538/* 3511/*
3539 * Respond to a request for our current selection 3512 * Respond to a request for our current selection
3540 * EXT: SelectionRequest 3513 * EXT: SelectionRequest
3541 */ 3514 */
3542void 3515void
3543rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3544{ 3517{
3545 XSelectionEvent ev; 3518 XSelectionEvent ev;
3546 dDisp;
3547 3519
3548 ev.type = SelectionNotify; 3520 ev.type = SelectionNotify;
3549 ev.property = None; 3521 ev.property = None;
3550 ev.display = rq.display; 3522 ev.display = rq.display;
3551 ev.requestor = rq.requestor; 3523 ev.requestor = rq.requestor;
… …
3565 *target++ = xa[XA_COMPOUND_TEXT]; 3537 *target++ = xa[XA_COMPOUND_TEXT];
3566#if X_HAVE_UTF8_STRING 3538#if X_HAVE_UTF8_STRING
3567 *target++ = xa[XA_UTF8_STRING]; 3539 *target++ = xa[XA_UTF8_STRING];
3568#endif 3540#endif
3569 3541
3570 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3542 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3571 32, PropModeReplace, 3543 32, PropModeReplace,
3572 (unsigned char *)target_list, target - target_list); 3544 (unsigned char *)target_list, target - target_list);
3573 ev.property = rq.property; 3545 ev.property = rq.property;
3574 } 3546 }
3575#if TODO // TODO 3547#if TODO // TODO
… …
3578 /* TODO: Handle MULTIPLE */ 3550 /* TODO: Handle MULTIPLE */
3579 } 3551 }
3580#endif 3552#endif
3581 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3553 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3582 { 3554 {
3583 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3555 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3584 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3556 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3585 ev.property = rq.property; 3557 ev.property = rq.property;
3586 } 3558 }
3587 else if (rq.target == XA_STRING 3559 else if (rq.target == XA_STRING
3588 || rq.target == xa[XA_TEXT] 3560 || rq.target == xa[XA_TEXT]
… …
3646 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3618 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3647 ct.nitems = strlen ((char *)ct.value); 3619 ct.nitems = strlen ((char *)ct.value);
3648 } 3620 }
3649 else 3621 else
3650#endif 3622#endif
3651 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3623 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3652 freect = 1; 3624 freect = 1;
3653 else 3625 else
3654 { 3626 {
3655 /* if we failed to convert then send it raw */ 3627 /* if we failed to convert then send it raw */
3656 ct.value = (unsigned char *)cl; 3628 ct.value = (unsigned char *)cl;
3657 ct.nitems = selectlen; 3629 ct.nitems = selectlen;
3658 ct.encoding = target; 3630 ct.encoding = target;
3659 } 3631 }
3660 3632
3661 XChangeProperty (disp, rq.requestor, rq.property, 3633 XChangeProperty (xdisp, rq.requestor, rq.property,
3662 ct.encoding, 8, PropModeReplace, 3634 ct.encoding, 8, PropModeReplace,
3663 ct.value, (int)ct.nitems); 3635 ct.value, (int)ct.nitems);
3664 ev.property = rq.property; 3636 ev.property = rq.property;
3665 3637
3666 if (freect) 3638 if (freect)
3667 XFree (ct.value); 3639 XFree (ct.value);
3668 } 3640 }
3669 3641
3670 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3642 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3671} 3643}
3672 3644
3673/* ------------------------------------------------------------------------- * 3645/* ------------------------------------------------------------------------- *
3674 * MOUSE ROUTINES * 3646 * MOUSE ROUTINES *
3675 * ------------------------------------------------------------------------- */ 3647 * ------------------------------------------------------------------------- */
3676 3648
3677/* 3649/*
3678 * return col/row values corresponding to x/y pixel values 3650 * return col/row values corresponding to x/y pixel values
3679 */ 3651 */
3680void 3652void
3681rxvt_term::pixel_position (int *x, int *y) 3653rxvt_term::pixel_position (int *x, int *y) NOTHROW
3682{ 3654{
3683 *x = Pixel2Col (*x); 3655 *x = Pixel2Col (*x);
3684 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3656 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3685 *y = Pixel2Row (*y); 3657 *y = Pixel2Row (*y);
3686 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3658 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3687} 3659}
3688 3660
3689/* ------------------------------------------------------------------------- */ 3661/* ------------------------------------------------------------------------- */
3690#ifdef USE_XIM 3662#ifdef USE_XIM
3691void 3663void
3692rxvt_term::im_set_position (XPoint &pos) 3664rxvt_term::im_set_position (XPoint &pos) NOTHROW
3693{ 3665{
3694 XWindowAttributes xwa; 3666 XWindowAttributes xwa;
3695 3667
3696 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3668 XGetWindowAttributes (display->display, vt, &xwa);
3697 3669
3698 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3670 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3699 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3671 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3700} 3672}
3701#endif 3673#endif
3702 3674
3703#if ENABLE_OVERLAY 3675#if ENABLE_OVERLAY
3704void 3676void
3705rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3677rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3706{ 3678{
3707 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3679 if (nrow < 1 || ncol < 1)
3708 return; 3680 return;
3709 3681
3710 want_refresh = 1; 3682 want_refresh = 1;
3711 3683
3712 scr_overlay_off (); 3684 scr_overlay_off ();
3713 3685
3714 if (x < 0) x = TermWin.ncol - w; 3686 if (x < 0) x = ncol - w;
3715 if (y < 0) y = TermWin.nrow - h; 3687 if (y < 0) y = nrow - h;
3716 3688
3717 // make space for border 3689 // make space for border
3718 w += 2; MIN_IT (w, TermWin.ncol); 3690 w += 2; min_it (w, ncol);
3719 h += 2; MIN_IT (h, TermWin.nrow); 3691 h += 2; min_it (h, nrow);
3720 3692
3721 x -= 1; MAX_IT (x, 0); 3693 x -= 1; clamp_it (x, 0, ncol - w);
3722 y -= 1; MAX_IT (y, 0); 3694 y -= 1; clamp_it (y, 0, nrow - h);
3723
3724 MIN_IT (x, TermWin.ncol - w);
3725 MIN_IT (y, TermWin.nrow - h);
3726 3695
3727 ov_x = x; ov_y = y; 3696 ov_x = x; ov_y = y;
3728 ov_w = w; ov_h = h; 3697 ov_w = w; ov_h = h;
3729 3698
3730 ov_text = new text_t *[h]; 3699 ov_text = new text_t *[h];
… …
3758 *rp = r; 3727 *rp = r;
3759 } 3728 }
3760} 3729}
3761 3730
3762void 3731void
3763rxvt_term::scr_overlay_off () 3732rxvt_term::scr_overlay_off () NOTHROW
3764{ 3733{
3765 if (!ov_text) 3734 if (!ov_text)
3766 return; 3735 return;
3767 3736
3768 want_refresh = 1; 3737 want_refresh = 1;
… …
3776 delete [] ov_text; ov_text = 0; 3745 delete [] ov_text; ov_text = 0;
3777 delete [] ov_rend; ov_rend = 0; 3746 delete [] ov_rend; ov_rend = 0;
3778} 3747}
3779 3748
3780void 3749void
3781rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3750rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3782{ 3751{
3783 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3752 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3784 return; 3753 return;
3785 3754
3786 x++, y++; 3755 x++, y++;
… …
3788 ov_text[y][x] = text; 3757 ov_text[y][x] = text;
3789 ov_rend[y][x] = rend; 3758 ov_rend[y][x] = rend;
3790} 3759}
3791 3760
3792void 3761void
3793rxvt_term::scr_overlay_set (int x, int y, const char *s) 3762rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3794{ 3763{
3795 while (*s) 3764 while (*s)
3796 scr_overlay_set (x++, y, *s++); 3765 scr_overlay_set (x++, y, *s++);
3797} 3766}
3798 3767
3799void 3768void
3769rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3770{
3771 while (*s)
3772 {
3773 text_t t = *s++;
3774 int width = WCWIDTH (t);
3775
3776 while (width--)
3777 {
3778 scr_overlay_set (x++, y, t);
3779 t = NOCHAR;
3780 }
3781 }
3782}
3783
3784void
3800rxvt_term::scr_swap_overlay () 3785rxvt_term::scr_swap_overlay () NOTHROW
3801{ 3786{
3802 if (!ov_text) 3787 if (!ov_text)
3803 return; 3788 return;
3804 3789
3805 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3806
3807 // swap screen mem with overlay 3790 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3791 for (int y = ov_h; y--; )
3809 { 3792 {
3810 text_t *t1 = ov_text[y]; 3793 text_t *t1 = ov_text[y];
3811 rend_t *r1 = ov_rend[y]; 3794 rend_t *r1 = ov_rend[y];
3812 3795
3813 text_t *t2 = screen.text[y + row_offset] + ov_x; 3796 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3814 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3797 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3815 3798
3816 for (int x = ov_w; x--; ) 3799 for (int x = ov_w; x--; )
3817 { 3800 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3801 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3802 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3821 } 3804 }
3822} 3805}
3823 3806
3824#endif 3807#endif
3825/* ------------------------------------------------------------------------- */ 3808/* ------------------------------------------------------------------------- */
3809

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines