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.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.245 by root, Fri Jan 20 10:35:25 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 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() \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * 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
95 */ 93 */
… …
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
119 117
120/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
121void 119void
122rxvt_term::scr_blank_line (line_t &l, unsigned int col, 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
123{ 121{
124 if (!l.t) 122 if (!l.t)
125 { 123 {
126 lalloc (l); 124 lalloc (l);
127 col = 0; 125 col = 0;
128 width = ncol; 126 width = ncol;
129 } 127 }
130 128
129 l.touch ();
130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* 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 */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
155void 159void
156rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
157{ 161{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
162 scr_overlay_off (); 163 scr_overlay_off ();
163#endif 164#endif
164 165
165 view_start = 0; 166 view_start = 0;
… …
175 return; 176 return;
176 177
177 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
179 { 180 {
181 //TODO//FIXME
180 saveLines++; 182 saveLines++;
181 prev_nrow--; 183 prev_nrow--;
182 nsaved++; 184 top_row--;
183 } 185 }
184 186
185 want_refresh = 1; 187 want_refresh = 1;
186 188
187 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
188 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
189 191
190 screen.tscroll = 0; 192 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
192 194
193 if (!save) 195 if (!row_buf)
194 { 196 {
195 /* 197 /*
196 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
197 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 199 */
199 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
200 term_start = 0; 201 term_start = 0;
201 202
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 205
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 209
210 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
211 { 211 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 215 }
216 216
217 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0; 239 rvideo = 0;
241 } 240 }
242 else 241 else
243 { 242 {
244 /* 243 /*
245 * add or delete rows as appropriate 244 * add or delete rows as appropriate
246 */ 245 */
247 246
248 rxvt_salloc *old_ta; 247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 249
250#if 0
251 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
252 { 252 {
253 /* delete rows */
254 k = min (nsaved, prev_nrow - nrow);
255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k);
257
258 for (p = nrow; p < prev_nrow; p++) 253 for (int row = nrow; row < prev_nrow; row++)
259 { 254 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 255 lfree (swap_buf [row]);
262 lfree (drawn[p]); 256 lfree (drawn_buf[row]);
263 } 257 }
258 }
259#endif
264 260
265 /* we have fewer rows so fix up cursor position */ 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 263
268 scr_reset_realloc (); /* realloc _last_ */ 264 for (int row = min (nrow, prev_nrow); row--; )
265 {
266 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]);
268 }
269
270 for (int row = prev_nrow; row < nrow; row++)
271 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 }
275
276 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
269 } 278
270 else if (nrow > prev_nrow) 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row
282
283 if (top_row)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
271 { 291 do
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 292 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 293 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 296#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 299
353 assert (llen >= 0); 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 301 {
302 p = MOD (p - 1, prev_total_rows);
303
357 --p; 304 plines++;
358 llen += prev_ncol; 305 llen += prev_ncol;
359 } 306 }
360 307
361 int qlines = llen / ncol + 1; 308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
362 int lofs = 0; 316 int lofs = 0;
317 line_t *qline;
363 318
364 q -= qlines; 319 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
370 { 321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
327 int qcol = 0;
328
329 // see below for cursor adjustment rationale
371 if (qrow >= 0) 330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
333 // fill a single destination line
334 while (lofs < llen && qcol < ncol)
372 { 335 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 336 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
383 338
339 prow = MOD (p + prow, prev_total_rows);
340
341 // we only adjust the cursor _row_ and put it into
342 // the topmost line of "long line" it was in, as
343 // this seems to upset applications/shells/readline
344 // least.
345 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow);
347
348 line_t &pline = old_buf [prow];
349
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 351
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); 352#if DEBUG_STRICT
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000); 353 assert (len);
354 assert (pline.t);
355#endif
400 356
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 359
404 lofs += len; 360 lofs += len;
405 qcol += len; 361 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 362 }
411 else
412 lofs += ncol;
413 } 363 }
364
365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
366 qline->is_longer (0);
367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 368 }
369 while (p != pend && q > 0);
370
371 term_start = total_rows - nrow;
372 top_row = q - term_start;
373
374 // make sure all terminal lines exist
375 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 }
378 else
415 } 379 {
380 // if no scrollback exists (yet), wing, instead of wrap
381
382 for (int row = min (nrow, prev_nrow); row--; )
383 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row];
416 386
417 free (screen.text); screen.text = tp; 387 qline = pline;
418 free (screen.rend); screen.rend = rp; 388 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 389 }
420 390
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 391 for (int row = prev_nrow; row < nrow; row++)
422#endif 392 {
393 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
394 }
395
396 term_start = 0;
397 }
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
423 405
424 if (tabs) 406 if (tabs)
425 free (tabs); 407 free (tabs);
426 } 408 }
427 409
410 CLEAR_ALL_SELECTION ();
411
428 prev_nrow = nrow; 412 prev_nrow = nrow;
429 prev_ncol = ncol; 413 prev_ncol = ncol;
430 414
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 416
433 for (p = 0; p < ncol; p++) 417 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 418 tabs [col] = col % TABSIZE == 0;
435 419
436 tt_winch (); 420 tt_winch ();
437}
438 421
439void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446} 423}
447 424
448/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
449/* 426/*
450 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
451 */ 428 */
452void 429void
453rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
454{ 431{
455 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
457 434
458 free (save); 435 free (row_buf);
459 free (swap_save); 436 free (swap_buf);
460 free (drawn); 437 free (drawn_buf);
461 free (buf);
462 free (tabs); 438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
463} 441}
464 442
465/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
466/* 444/*
467 * Hard reset 445 * Hard reset
468 */ 446 */
469void 447void
470rxvt_term::scr_poweron () 448rxvt_term::scr_poweron () NOTHROW
471{ 449{
472 scr_release (); 450 scr_release ();
473 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
474 scr_reset (); 452 scr_reset ();
475 453
476 scr_clear (true); 454 scr_clear (true);
477 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
478} 456}
479 457
480/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
481 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
482 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
484 * Save and Restore cursor 462 * Save and Restore cursor
485 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
486 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
487 */ 465 */
488void 466void
489rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
490{ 468{
491 screen_t *s; 469 screen_t *s;
492 470
493#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
494 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
518 set_font_style (); 496 set_font_style ();
519 break; 497 break;
520 } 498 }
521 499
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 500 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 501 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 502 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 504 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 505 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0);
531#endif 506#endif
532} 507}
533 508
534/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
535/* 510/*
536 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
537 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539 */ 514 */
540int 515int
541rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn) NOTHROW
542{ 517{
543 want_refresh = 1; 518 want_refresh = 1;
544 view_start = 0; 519 view_start = 0;
545 520
546 if (current_screen == scrn) 521 if (current_screen == scrn)
547 return scrn; 522 return scrn;
548 523
549 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
550 525
551 SWAP_IT (scrn, current_screen, int); 526 int i = current_screen; current_screen = scrn; scrn = i;
552 527
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 528 ::swap (screen.cur.row, swap.cur.row);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 529 ::swap (screen.cur.col, swap.cur.col);
555 MAX_IT (screen.cur.row, 0); 530
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 533
560#if NSCREENS 534#if NSCREENS
561 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
562 { 536 {
563 num_scr = 0; 537 num_scr = 0;
564 538
565 for (int i = nrow; i--; ) 539 for (int i = prev_nrow; i--; )
566 SWAP_IT (ROW(i), swap_save[i], line_t); 540 ::swap (ROW(i), swap_buf [i]);
567 541
568 SWAP_IT (screen.charset, swap.charset, int16_t); 542 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 543 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
572 } 546 }
573 else 547 else
574#endif 548#endif
575 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
576 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
577 551
578 return scrn; 552 return scrn;
579} 553}
580 554
581// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
582void 556void
583rxvt_term::scr_do_wrap () 557rxvt_term::scr_do_wrap () NOTHROW
584{ 558{
585 if (!(screen.flags & Screen_WrapNext)) 559 if (!(screen.flags & Screen_WrapNext))
586 return; 560 return;
587 561
588 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
… …
598/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
599/* 573/*
600 * Change the colour for following text 574 * Change the colour for following text
601 */ 575 */
602void 576void
603rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
604{ 578{
605 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
606 color = fgbg; 580 color = fgbg;
607 581
608 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
609 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
610 else 584 else
… …
614/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
615/* 589/*
616 * Change the rendition style for following text 590 * Change the rendition style for following text
617 */ 591 */
618void 592void
619rxvt_term::scr_rendition (int set, int style) 593rxvt_term::scr_rendition (int set, int style) NOTHROW
620 { 594 {
621 if (set) 595 if (set)
622 rstyle |= style; 596 rstyle |= style;
623 else if (style == ~RS_None) 597 else if (style == ~RS_None)
624 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
… …
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 606 * count positive ==> scroll up
633 * count negative ==> scroll down 607 * count negative ==> scroll down
634 */ 608 */
635int 609int
636rxvt_term::scr_scroll_text (int row1, int row2, int count) 610rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 611{
638 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
639 return 0; 613 return 0;
640 614
641 want_refresh = 1; 615 want_refresh = 1;
642 num_scr += count; 616 num_scr += count;
643 617
644 if (count > 0 618 if (count > 0
645 && row1 == 0 619 && row1 == 0
646 && row2 == nrow - 1
647 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
648 { 621 {
649 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
650 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
651 626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
652 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
653 { 661 {
654 selection.beg.row -= count; 662 selection.beg.row -= count;
655 selection.end.row -= count; 663 selection.end.row -= count;
656 selection.mark.row -= count; 664 selection.mark.row -= count;
657 665
658 selection_check (0); 666 if (selection.beg.row < top_row
659 } 667 || selection.end.row < top_row
660 668 || selection.mark.row < top_row)
661 for (int i = count; i--; )
662 scr_blank_screen_mem (ROW(row2 - i), rstyle);
663
664 if ((options & Opt_scrollWithBuffer)
665 && view_start != 0
666 && view_start != saveLines)
667 scr_page (UP, count);
668 }
669 else
670 {
671 if (selection.op && current_screen == selection.screen)
672 {
673 int i = selection.beg.row;
674 int j = selection.end.row;
675
676 if ((i < row1 && j > row1)
677 || (i < row2 && j > row2)
678 || (i - count < row1 && i >= row1)
679 || (i - count > row2 && i <= row2)
680 || (j - count < row1 && j >= row1)
681 || (j - count > row2 && j <= row2))
682 { 669 {
683 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
685 } 672 }
686 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
683 }
684 else
685 {
686 if (selection.op && current_screen == selection.screen)
687 {
688 if ((selection.beg.row < row1 && selection.end.row > row1)
689 || (selection.beg.row < row2 && selection.end.row > row2)
690 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
691 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
692 || (selection.end.row - count < row1 && selection.end.row >= row1)
693 || (selection.end.row - count > row2 && selection.end.row <= row2))
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 else if (selection.end.row >= row1 && selection.end.row <= row2)
687 { 699 {
688 /* move selected region too */ 700 /* move selected region too */
689 selection.beg.row -= count; 701 selection.beg.row -= count;
690 selection.end.row -= count; 702 selection.end.row -= count;
691 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
697 // use a simple and robust scrolling algorithm, this 709 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 710 // part of scr_scroll_text is not time-critical.
699 711
700 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
701 713
714 min_it (count, rows);
715
716 line_t *temp_buf = row_buf + total_rows;
717
702 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
703 { 719 {
704 buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
705 721
706 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
707 scr_blank_screen_mem (buf [row], rstyle); 723 scr_blank_screen_mem (temp_buf [row], rstyle);
708 } 724 }
709 725
710 for (int row = 0; row < rows; row++) 726 for (int row = 0; row < rows; row++)
711 ROW(row1 + row) = buf [row]; 727 ROW(row1 + row) = temp_buf [row];
712 } 728 }
713 729
714 return count; 730 return count;
715} 731}
716 732
717/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
718/* 734/*
719 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
720 */ 736 */
721void 737void
722rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
723{ 739{
724 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
725 return; 741 return;
726 742
727 unsigned char checksel; 743 unsigned char checksel;
728 unicode_t c; 744 unicode_t c;
729 int row, last_col; 745 int ncol = this->ncol;
730 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
731 747
732 want_refresh = 1; 748 want_refresh = 1;
733 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
734 last_col = ncol;
735 750
736 if (nlines > 0) 751 if (minlines > 0)
737 { 752 {
738 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
739 if ((nlines > 0) 755 if (minlines > 0
740 && (screen.tscroll == 0) 756 && screen.tscroll == 0
741 && (screen.bscroll == (nrow - 1))) 757 && screen.bscroll == nrow - 1)
742 { 758 {
743 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
744 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
745 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
746 } 762 }
747 } 763 }
748 764
749#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
750 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
751 assert ((screen.cur.row < nrow) 767 assert (screen.cur.row < nrow
752 && (screen.cur.row >= - (int32_t)nsaved)); 768 && screen.cur.row >= top_row);
753#else /* drive with your eyes closed */
754 MIN_IT (screen.cur.col, last_col - 1);
755 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
756 MAX_IT (screen.cur.row, - (int32_t)nsaved);
757#endif 769#endif
758 row = screen.cur.row; 770 int row = screen.cur.row;
759 771
760 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
761 773
762 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
763 775
764 while (str < strend) 776 while (str < strend)
765 { 777 {
766 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
767 779
768 if (c < 0x20) 780 if (c < 0x20)
769 if (c == C0_LF) 781 if (c == C0_LF)
770 { 782 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 MAX_IT (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
773 784
774 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
775 786
776 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
777 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
781 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
782 continue; 793 continue;
783 } 794 }
784 else if (c == C0_CR) 795 else if (c == C0_CR)
785 { 796 {
786 if (!line->is_longer ()) /* XXX: think about this */
787 MAX_IT (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
788 798
789 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
790 screen.cur.col = 0; 800 screen.cur.col = 0;
791 continue; 801 continue;
792 } 802 }
… …
809 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
810 } 820 }
811 821
812 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
813 { 823 {
814 line->set_is_longer ();
815
816 scr_do_wrap (); 824 scr_do_wrap ();
817 825
826 line->l = ncol;
827 line->is_longer (1);
828
818 row = screen.cur.row; 829 row = screen.cur.row;
819 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
820 } 831 }
821 832
822 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
827 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
828 // for the line drawing characters below as they might be invalid in the current 839 // for the line drawing characters below as they might be invalid in the current
829 // locale. 840 // locale.
830 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
831 842
832 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
833 { 844 {
834 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
835 // 5f-7e standard vt100 846 // 5f-7e standard vt100
836 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
837 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 } 900 }
890 901
891 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
892 903
893 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
894 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
895 { 906 {
896 // ...output spaces 907 // ...output spaces
897 c = ' '; 908 c = ' ';
898 // and try the same character next loop iteration 909 // and try the same character next loop iteration
899 --str; 910 --str;
900 } 911 }
901 912
913 line->touch ();
914
902 do 915 do
903 { 916 {
904 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
905 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
906 919
907 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
908 screen.cur.col++; 921 screen.cur.col++;
909 else 922 else
910 { 923 {
911 line->l = last_col; 924 line->l = ncol;
912 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
913 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
914 break; 927 break;
915 } 928 }
916 929
… …
918 } 931 }
919 while (--width > 0); 932 while (--width > 0);
920 933
921 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
922 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
923 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
924 { 940 {
925 line->t[c] = ' '; 941 line->t[c] = ' ';
926 line->r[c] = rend; 942 line->r[c] = rend;
927 } 943 }
944 }
928 } 945 }
929 else // width == 0 946 else // width == 0
930 { 947 {
931#if ENABLE_COMBINING 948#if ENABLE_COMBINING
932 // handle combining characters 949 // handle combining characters
933 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
934 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
935 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
936 text_t *tp; 954 text_t *tp;
937 rend_t *rp; 955 rend_t *rp;
938 956
939 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
940 { 958 {
959 linep = line;
941 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
942 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
943
944 while (*tp == NOCHAR && tp > line->t)
945 tp--, rp--;
946 } 962 }
947 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
948 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
949 { 965 {
950 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
951
952 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
953 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
954
955 while (*tp == NOCHAR && tp > line->t)
956 tp--, rp--;
957 } 969 }
958 else 970 else
959 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
960 977
961 // first try to find a precomposed character 978 // first try to find a precomposed character
962 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
963 if (n == NOCHAR) 980 if (n == NOCHAR)
964 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
967 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
968#endif 985#endif
969 } 986 }
970 } 987 }
971 988
972 if (!line->is_longer ()) /* XXX: think about this */
973 MAX_IT (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
974 990
975#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
976 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
977#else /* drive with your eyes closed */
978 MAX_IT (screen.cur.row, 0);
979#endif 993#endif
980} 994}
981 995
982/* ------------------------------------------------------------------------- */ 996/* ------------------------------------------------------------------------- */
983/* 997/*
984 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
985 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
986 */ 1000 */
987void 1001void
988rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
989{ 1003{
990 want_refresh = 1; 1004 want_refresh = 1;
991 1005
992 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
993 { 1007 {
… …
1011 * Process Horizontal Tab 1025 * Process Horizontal Tab
1012 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
1013 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
1014 */ 1028 */
1015void 1029void
1016rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
1017{ 1031{
1018 int i, x; 1032 int i, x;
1019 1033
1020 want_refresh = 1; 1034 want_refresh = 1;
1021 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
1022 1036
1023 if (count == 0) 1037 if (count == 0)
1024 return; 1038 return;
1025 else if (count > 0) 1039 else if (count > 0)
1026 { 1040 {
1027 int row = screen.cur.row;
1028
1029 line_t &l = ROW(row); 1041 line_t &l = ROW(screen.cur.row);
1030 rend_t base_rend = l.r[i]; 1042 rend_t base_rend = l.r[i];
1031 ht &= l.t[i] == ' '; 1043 ht &= l.t[i] == ' ';
1032 1044
1033 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
1034 if (tabs[i]) 1046 if (tabs[i])
1035 { 1047 {
1036 x = i; 1048 x = i;
1049
1037 if (!--count) 1050 if (!--count)
1038 break; 1051 break;
1039 } 1052 }
1040 else 1053 else
1041 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
1044 if (count) 1057 if (count)
1045 x = ncol - 1; 1058 x = ncol - 1;
1046 1059
1047 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
1048 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1049 if (ht && options & Opt_pastableTabs) 1062 if (ht && OPTION (Opt_pastableTabs))
1050 { 1063 {
1051 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1052 1065
1053 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
1054 MAX_IT (l.l, x);
1055 1067
1056 i = screen.cur.col; 1068 i = screen.cur.col;
1057 1069
1058 l.t[i] = '\t'; 1070 l.t[i] = '\t';
1059 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1090 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1091 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1092 */ 1104 */
1093#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1094void 1106void
1095rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1096{ 1108{
1097 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1098 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1099 else 1111 else
1100 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1107 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1108 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1109 */ 1121 */
1110#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1111void 1123void
1112rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1113{ 1125{
1114 int row;
1115
1116 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1117 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1118 else 1128 else
1119 { 1129 {
1120 row = screen.cur.row; 1130 line_t &l = ROW(screen.cur.row);
1121 1131
1122 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1132 l.touch ();
1123 ROW(row).l = ncol; 1133 l.is_longer (0);
1124 1134
1125 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1126 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1127 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1128 } 1138 }
… …
1132/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1133/* 1143/*
1134 * Goto Row/Column 1144 * Goto Row/Column
1135 */ 1145 */
1136void 1146void
1137rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1138{ 1148{
1139 want_refresh = 1; 1149 want_refresh = 1;
1140 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1141 1151
1142 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1143 MAX_IT (screen.cur.col, 0); 1153 clamp_it (screen.cur.col, 0, ncol - 1);
1144 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1145 1154
1146 screen.flags &= ~Screen_WrapNext; 1155 screen.flags &= ~Screen_WrapNext;
1147 1156
1148 if (relative & R_RELATIVE) 1157 if (relative & R_RELATIVE)
1149 { 1158 {
… …
1167 else 1176 else
1168 { 1177 {
1169 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1170 { /* relative origin mode */ 1179 { /* relative origin mode */
1171 screen.cur.row = row + screen.tscroll; 1180 screen.cur.row = row + screen.tscroll;
1172 MIN_IT (screen.cur.row, screen.bscroll); 1181 min_it (screen.cur.row, screen.bscroll);
1173 } 1182 }
1174 else 1183 else
1175 screen.cur.row = row; 1184 screen.cur.row = row;
1176 } 1185 }
1177 1186
1178 MAX_IT (screen.cur.row, 0); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1179 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1180} 1188}
1181 1189
1182/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1183/* 1191/*
1184 * direction should be UP or DN 1192 * direction should be UP or DN
1185 */ 1193 */
1186void 1194void
1187rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1188{ 1196{
1189 int dirn; 1197 int dirn;
1190 1198
1191 want_refresh = 1; 1199 want_refresh = 1;
1192 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1199 || (screen.cur.row == screen.tscroll && direction == DN)) 1207 || (screen.cur.row == screen.tscroll && direction == DN))
1200 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1208 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1201 else 1209 else
1202 screen.cur.row += dirn; 1210 screen.cur.row += dirn;
1203 1211
1204 MAX_IT (screen.cur.row, 0); 1212 clamp_it (screen.cur.row, 0, nrow - 1);
1205 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1206 selection_check (0); 1213 selection_check (0);
1207} 1214}
1208 1215
1209/* ------------------------------------------------------------------------- */ 1216/* ------------------------------------------------------------------------- */
1210/* 1217/*
… …
1212 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1213 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1214 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1215 */ 1222 */
1216void 1223void
1217rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1218{ 1225{
1219 unsigned int row, col, num; 1226 unsigned int col, num;
1220 1227
1221 want_refresh = 1; 1228 want_refresh = 1;
1222 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1223 1230
1224 selection_check (1); 1231 selection_check (1);
1225 1232
1226 row = screen.cur.row; 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1227 1237
1228 switch (mode) 1238 switch (mode)
1229 { 1239 {
1230 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1231 col = screen.cur.col; 1241 col = screen.cur.col;
1232 num = ncol - col; 1242 num = ncol - col;
1233 MIN_IT (ROW(row).l, (int16_t)col); 1243 min_it (line.l, col);
1234 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1235 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1236 CLEAR_SELECTION (); 1246 CLEAR_SELECTION ();
1237 break; 1247 break;
1238 case 1: /* erase to beginning of line */ 1248 case 1: /* erase to beginning of line */
… …
1243 CLEAR_SELECTION (); 1253 CLEAR_SELECTION ();
1244 break; 1254 break;
1245 case 2: /* erase whole line */ 1255 case 2: /* erase whole line */
1246 col = 0; 1256 col = 0;
1247 num = ncol; 1257 num = ncol;
1248 ROW(row).l = 0; 1258 line.l = 0;
1249 if (selection.beg.row <= screen.cur.row 1259 if (selection.beg.row <= screen.cur.row
1250 && selection.end.row >= screen.cur.row) 1260 && selection.end.row >= screen.cur.row)
1251 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1252 break; 1262 break;
1253 default: 1263 default:
1254 return; 1264 return;
1255 } 1265 }
1256 1266
1257 scr_blank_line (ROW(row), col, num, rstyle); 1267 scr_blank_line (line, col, num, rstyle);
1258} 1268}
1259 1269
1260/* ------------------------------------------------------------------------- */ 1270/* ------------------------------------------------------------------------- */
1261/* 1271/*
1262 * Erase part of whole of the screen 1272 * Erase part of whole of the screen
1263 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1264 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1265 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1266 */ 1276 */
1267void 1277void
1268rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1269{ 1279{
1270 int num; 1280 int num;
1271 int32_t row; 1281 int32_t row;
1272 rend_t ren; 1282 rend_t ren;
1273 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1305 CLEAR_SELECTION (); 1315 CLEAR_SELECTION ();
1306 1316
1307 if (row >= nrow) /* Out Of Bounds */ 1317 if (row >= nrow) /* Out Of Bounds */
1308 return; 1318 return;
1309 1319
1310 MIN_IT (num, (nrow - row)); 1320 min_it (num, nrow - row);
1311 1321
1312 if (rstyle & (RS_RVid | RS_Uline)) 1322 if (rstyle & (RS_RVid | RS_Uline))
1313 ren = (rend_t) ~RS_None; 1323 ren = (rend_t) ~RS_None;
1314 else if (GET_BASEBG (rstyle) == Color_bg) 1324 else if (GET_BASEBG (rstyle) == Color_bg)
1315 { 1325 {
… …
1317 CLEAR_ROWS (row, num); 1327 CLEAR_ROWS (row, num);
1318 } 1328 }
1319 else 1329 else
1320 { 1330 {
1321 ren = rstyle & (RS_fgMask | RS_bgMask); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1322 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324 ERASE_ROWS (row, num); 1334 ERASE_ROWS (row, num);
1325 gcvalue.foreground = pix_colors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1326 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1327 } 1337 }
1328 1338
1329 for (; num--; row++) 1339 for (; num--; row++)
1330 { 1340 {
1331 scr_blank_screen_mem (ROW (row), rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1332 ROW (row).l = 0;
1333 scr_blank_line (drawn[row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1334 } 1343 }
1335} 1344}
1336 1345
1337#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1338void 1347void
1339rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1340{ 1349{
1341 want_refresh = 1; 1350 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1343 1352
1344 nsaved = 0; 1353 top_row = 0;
1345} 1354}
1346#endif 1355#endif
1347 1356
1348/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1349/* 1358/*
1350 * Fill the screen with `E's 1359 * Fill the screen with `E's
1351 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1352 */ 1361 */
1353void 1362void
1354rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1355{ 1364{
1356 rend_t fs; 1365 rend_t fs;
1357 1366
1358 want_refresh = 1; 1367 want_refresh = 1;
1359 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1370 rend_t *r1 = line.r; 1379 rend_t *r1 = line.r;
1371 1380
1372 for (int j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1373 *r1++ = fs; 1382 *r1++ = fs;
1374 1383
1375 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1376 } 1386 }
1377} 1387}
1378 1388
1379/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1380/* 1390/*
1381 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1382 */ 1392 */
1383void 1393void
1384rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1385{ 1395{
1386 int end; 1396 int end;
1387 1397
1388 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1389 1399
… …
1409/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1410/* 1420/*
1411 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1412 */ 1422 */
1413void 1423void
1414rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1415{ 1425{
1416 int col, row; 1426 int col, row;
1417 rend_t tr; 1427 rend_t tr;
1418 1428
1419 want_refresh = 1; 1429 want_refresh = 1;
… …
1423 return; 1433 return;
1424 1434
1425 scr_do_wrap (); 1435 scr_do_wrap ();
1426 1436
1427 selection_check (1); 1437 selection_check (1);
1428 MIN_IT (count, (ncol - screen.cur.col)); 1438 min_it (count, ncol - screen.cur.col);
1429 1439
1430 row = screen.cur.row; 1440 row = screen.cur.row;
1431 1441
1432 line_t *line = &ROW(row); 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1433 1446
1434 switch (insdel) 1447 switch (insdel)
1435 { 1448 {
1436 case INSERT: 1449 case INSERT:
1437 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1438 { 1451 {
1439 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1440 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1441 } 1454 }
1442 1455
1443 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1444 {
1445 line->l += count;
1446 MIN_IT (line->l, ncol);
1447 }
1448 1457
1449 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451 { 1460 {
1452 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1465 1474
1466 case ERASE: 1475 case ERASE:
1467 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1468 selection_check (1); 1477 selection_check (1);
1469 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1470 scr_blank_line (*line, screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1471 break; 1482 break;
1472 1483
1473 case DELETE: 1484 case DELETE:
1474 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1477 { 1488 {
1478 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1479 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1480 } 1491 }
1481 1492
1493 line->l = max (line->l - count, 0);
1482 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1483
1484 if (line->is_longer ()) /* break line continuation */
1485 line->l = ncol;
1486
1487 line->l = max (line->l - count, 0);
1488 1495
1489 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1490 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1491 { 1498 {
1492 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1510/* 1517/*
1511 * Set the scrolling region 1518 * Set the scrolling region
1512 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1513 */ 1520 */
1514void 1521void
1515rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1516{ 1523{
1517 MAX_IT (top, 0); 1524 max_it (top, 0);
1518 MIN_IT (bot, (int)nrow - 1); 1525 min_it (bot, nrow - 1);
1519 1526
1520 if (top > bot) 1527 if (top > bot)
1521 return; 1528 return;
1522 1529
1523 screen.tscroll = top; 1530 screen.tscroll = top;
… …
1530 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1531 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1532 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1533 */ 1540 */
1534void 1541void
1535rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1536{ 1543{
1537 want_refresh = 1; 1544 want_refresh = 1;
1538 1545
1539 if (mode) 1546 if (mode)
1540 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1547 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1548 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1549 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1550 */ 1557 */
1551void 1558void
1552rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1553{ 1560{
1554 if (mode) 1561 if (mode)
1555 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1556 else 1563 else
1557 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1566 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1567 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1568 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1569 */ 1576 */
1570void 1577void
1571rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1572{ 1579{
1573 if (mode) 1580 if (mode)
1574 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1575 else 1582 else
1576 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1583 * Set insert/replace mode 1590 * Set insert/replace mode
1584 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1585 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1586 */ 1593 */
1587void 1594void
1588rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1589{ 1596{
1590 if (mode) 1597 if (mode)
1591 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1592 else 1599 else
1593 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1599 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1600 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1601 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1602 */ 1609 */
1603void 1610void
1604rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1605{ 1612{
1606 if (mode < 0) 1613 if (mode < 0)
1607 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1608 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1609 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1610} 1617}
1611 1618
1612/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1613/* 1620/*
1614 * Set reverse/normal video 1621 * Set reverse/normal video
1615 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1616 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1617 */ 1624 */
1618void 1625void
1619rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW
1620{ 1627{
1621 XGCValues gcvalue; 1628 XGCValues gcvalue;
1622 1629
1623 if (rvideo != mode) 1630 if (rvideo != mode)
1624 { 1631 {
1625 rvideo = mode; 1632 rvideo = mode;
1626 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1627#if XPM_BACKGROUND 1634#if XPM_BACKGROUND
1628 if (bgPixmap.pixmap == None) 1635 if (bgPixmap.pixmap == None)
1629#endif 1636#endif
1630#if TRANSPARENT 1637#if TRANSPARENT
1631 if (! (options & Opt_transparent) || am_transparent == 0) 1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1632#endif 1639#endif
1633 XSetWindowBackground (display->display, vt, 1640 XSetWindowBackground (display->display, vt,
1634 pix_colors[Color_bg]); 1641 pix_colors[Color_bg]);
1635 1642
1636 gcvalue.foreground = pix_colors[Color_fg]; 1643 gcvalue.foreground = pix_colors[Color_fg];
… …
1646/* 1653/*
1647 * Report current cursor position 1654 * Report current cursor position
1648 * XTERM_SEQ: Report position: ESC [ 6 n 1655 * XTERM_SEQ: Report position: ESC [ 6 n
1649 */ 1656 */
1650void 1657void
1651rxvt_term::scr_report_position () 1658rxvt_term::scr_report_position () NOTHROW
1652{ 1659{
1653 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1660 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1654} 1661}
1655 1662
1656/* ------------------------------------------------------------------------- * 1663/* ------------------------------------------------------------------------- *
… …
1659 1666
1660/* 1667/*
1661 * Set font style 1668 * Set font style
1662 */ 1669 */
1663void 1670void
1664rxvt_term::set_font_style () 1671rxvt_term::set_font_style () NOTHROW
1665{ 1672{
1673#if 0
1666 switch (charsets[screen.charset]) 1674 switch (charsets [screen.charset])
1667 { 1675 {
1668 case '0': /* DEC Special Character & Line Drawing Set */ 1676 case '0': /* DEC Special Character & Line Drawing Set */
1669 break; 1677 break;
1670 case 'A': /* United Kingdom (UK) */ 1678 case 'A': /* United Kingdom (UK) */
1671 break; 1679 break;
… …
1678 case 'C': /* Finnish character set */ 1686 case 'C': /* Finnish character set */
1679 break; 1687 break;
1680 case 'K': /* German character set */ 1688 case 'K': /* German character set */
1681 break; 1689 break;
1682 } 1690 }
1691#endif
1683} 1692}
1684 1693
1685/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
1686/* 1695/*
1687 * Choose a font 1696 * Choose a font
… …
1689 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1698 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1690 * XTERM_SEQ: Invoke G2 character set: ESC N 1699 * XTERM_SEQ: Invoke G2 character set: ESC N
1691 * XTERM_SEQ: Invoke G3 character set: ESC O 1700 * XTERM_SEQ: Invoke G3 character set: ESC O
1692 */ 1701 */
1693void 1702void
1694rxvt_term::scr_charset_choose (int set) 1703rxvt_term::scr_charset_choose (int set) NOTHROW
1695{ 1704{
1696 screen.charset = set; 1705 screen.charset = set;
1697 set_font_style (); 1706 set_font_style ();
1698} 1707}
1699 1708
… …
1705 * XTERM_SEQ: Set G2 character set: ESC * <C> 1714 * XTERM_SEQ: Set G2 character set: ESC * <C>
1706 * XTERM_SEQ: Set G3 character set: ESC + <C> 1715 * XTERM_SEQ: Set G3 character set: ESC + <C>
1707 * See set_font_style for possible values for <C> 1716 * See set_font_style for possible values for <C>
1708 */ 1717 */
1709void 1718void
1710rxvt_term::scr_charset_set (int set, unsigned int ch) 1719rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1711{ 1720{
1712 charsets[set] = (unsigned char)ch; 1721 charsets[set] = (unsigned char)ch;
1713 set_font_style (); 1722 set_font_style ();
1714} 1723}
1715 1724
… …
1720 1729
1721/* 1730/*
1722 * refresh matching text. 1731 * refresh matching text.
1723 */ 1732 */
1724bool 1733bool
1725rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1734rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1726{ 1735{
1727 bool found = false; 1736 bool found = false;
1728 1737
1729 for (int i = 0; i < nrow; i++) 1738 for (int i = 0; i < nrow; i++)
1730 { 1739 {
1731 int col = 0; 1740 int col = 0;
1732 rend_t *drp = drawn[i].r; 1741 rend_t *drp = drawn_buf[i].r;
1733 1742
1734 for (; col < ncol; col++, drp++) 1743 for (; col < ncol; col++, drp++)
1735 if ((*drp & mask) == value) 1744 if ((*drp & mask) == value)
1736 { 1745 {
1737 found = true; 1746 found = true;
… …
1750 PART_END, 1759 PART_END,
1751 RC_COUNT 1760 RC_COUNT
1752}; 1761};
1753 1762
1754void 1763void
1755rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1764rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1756{ 1765{
1757 int i; 1766 int i;
1758 row_col_t rc[RC_COUNT]; 1767 row_col_t rc[RC_COUNT];
1759 1768
1760 if (!drawn) /* sanity check */ 1769 if (!drawn_buf) /* sanity check */
1761 return; 1770 return;
1762 1771
1763#ifndef NO_SLOW_LINK_SUPPORT 1772#ifndef NO_SLOW_LINK_SUPPORT
1764 if (refresh_type == FAST_REFRESH && !display->is_local) 1773 if (refresh_type == FAST_REFRESH && !display->is_local)
1765 { 1774 {
1766 y = 0; 1775 y = 0;
1767 eheight = height; 1776 eheight = height;
1768 } 1777 }
1769#endif
1770
1771#ifdef DEBUG_STRICT
1772 x = max (x, 0);
1773 x = min (x, (int)width);
1774 y = max (y, 0);
1775 y = min (y, (int)height);
1776#endif 1778#endif
1777 1779
1778 /* round down */ 1780 /* round down */
1779 rc[PART_BEG].col = Pixel2Col (x); 1781 rc[PART_BEG].col = Pixel2Col (x);
1780 rc[PART_BEG].row = Pixel2Row (y); 1782 rc[PART_BEG].row = Pixel2Row (y);
… …
1783 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1785 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1784 1786
1785 /* sanity checks */ 1787 /* sanity checks */
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1788 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1789 {
1788 MIN_IT (rc[i].col, ncol - 1); 1790 min_it (rc[i].col, ncol - 1);
1789 MIN_IT (rc[i].row, nrow - 1); 1791 min_it (rc[i].row, nrow - 1);
1790 } 1792 }
1791 1793
1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1793 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1796
1797 num_scr_allow = 0;
1794 1798
1795 if (refresh) 1799 if (refresh)
1796 scr_refresh (SLOW_REFRESH); 1800 scr_refresh ();
1797} 1801}
1798 1802
1799/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1800/* 1804/*
1801 * Refresh the entire screen 1805 * Refresh the entire screen
1802 */ 1806 */
1803void 1807void
1804rxvt_term::scr_touch (bool refresh) 1808rxvt_term::scr_touch (bool refresh) NOTHROW
1805{ 1809{
1806 scr_expose (0, 0, width, height, refresh); 1810 scr_expose (0, 0, width, height, refresh);
1807} 1811}
1808 1812
1809/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1810/* 1814/*
1811 * Move the display so that the line represented by scrollbar value Y is at 1815 * Move the display so that the line represented by scrollbar value Y is at
1812 * the top of the screen 1816 * the top of the screen
1813 */ 1817 */
1814int 1818void
1815rxvt_term::scr_move_to (int y, int len) 1819rxvt_term::scr_move_to (int y, int len) NOTHROW
1816{ 1820{
1817 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818 unsigned int oldviewstart;
1819
1820 oldviewstart = view_start;
1821
1822 if (y < len)
1823 {
1824 p = (nrow + nsaved) * (len - y) / len;
1825 p -= (long) (nrow - 1);
1826 p = max (p, 0);
1827 }
1828
1829 view_start = (unsigned int)min (p, nsaved);
1830
1831 return scr_changeview (oldviewstart);
1832} 1822}
1833 1823
1834/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1835/* 1825/*
1836 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1837 * direction should be UP or DN 1827 * direction should be UP or DN
1838 */ 1828 */
1839int 1829bool
1840rxvt_term::scr_page (enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1841{ 1831{
1842 int n; 1832 int new_view_start =
1843 unsigned int oldviewstart;
1844
1845 oldviewstart = view_start;
1846
1847 if (direction == UP)
1848 {
1849 n = view_start + nlines;
1850 view_start = min (n, nsaved);
1851 }
1852 else
1853 {
1854 n = view_start - nlines; 1833 direction == UP ? view_start - nlines
1855 view_start = max (n, 0); 1834 : view_start + nlines;
1856 }
1857 1835
1858 return scr_changeview (oldviewstart); 1836 return scr_changeview (new_view_start);
1859} 1837}
1860 1838
1861int 1839bool
1862rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (int new_view_start) NOTHROW
1863{ 1841{
1842 clamp_it (new_view_start, top_row, 0);
1843
1864 if (view_start != oldviewstart) 1844 if (new_view_start == view_start)
1865 { 1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1866 want_refresh = 1; 1849 want_refresh = 1;
1867 num_scr -= (view_start - oldviewstart);
1868 }
1869 1850
1870 return (int) (view_start - oldviewstart); 1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1871}
1872 1852
1853 return true;
1854}
1855
1873/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1874void 1857void
1875rxvt_term::scr_bell () 1858rxvt_term::scr_bell () NOTHROW
1876{ 1859{
1877#ifndef NO_BELL 1860#ifndef NO_BELL
1878 1861
1879# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1880# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
1881 if (options & Opt_mapAlert) 1864 if (OPTION (Opt_mapAlert))
1882# endif 1865# endif
1883 XMapWindow (display->display, parent[0]); 1866 XMapWindow (display->display, parent[0]);
1884# endif 1867# endif
1885 1868
1886 if (options & Opt_visualBell) 1869 if (OPTION (Opt_visualBell))
1887 { 1870 {
1888 scr_rvideo_mode (!rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 display->flush ();
1889 rxvt_usleep (VISUAL_BELL_DURATION); 1873 rxvt_usleep (VISUAL_BELL_DURATION);
1890 scr_rvideo_mode (!rvideo); /* refresh also done */ 1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1891 } 1875 }
1892 else 1876 else
1893 XBell (display->display, 0); 1877 XBell (display->display, 0);
… …
1896} 1880}
1897 1881
1898/* ------------------------------------------------------------------------- */ 1882/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1883/* ARGSUSED */
1900void 1884void
1901rxvt_term::scr_printscreen (int fullhist) 1885rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902{ 1886{
1903#ifdef PRINTPIPE 1887#ifdef PRINTPIPE
1904 int nrows, row_start; 1888 int nrows, row_start;
1905 FILE *fd; 1889 FILE *fd;
1906 1890
1907 if ((fd = popen_printer ()) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1908 return; 1892 return;
1909 1893
1910 if (fullhist) 1894 if (fullhist)
1911 { 1895 {
1912 nrows = nrow + nsaved; 1896 nrows = nrow - top_row;
1913 row_start = -nsaved; 1897 row_start = top_row;
1914 } 1898 }
1915 else 1899 else
1916 { 1900 {
1917 nrows = nrow; 1901 nrows = nrow;
1918 row_start = -view_start; 1902 row_start = view_start;
1919 } 1903 }
1920 1904
1921 wctomb (0, 0); 1905 wctomb (0, 0);
1922 1906
1923 for (int r1 = 0; r1 < nrows; r1++) 1907 for (int r1 = 0; r1 < nrows; r1++)
… …
1955 * Refresh the screen 1939 * Refresh the screen
1956 * drawn_text/drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1957 * screen.text/screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1942 */
1959void 1943void
1960rxvt_term::scr_refresh (unsigned char refresh_type) 1944rxvt_term::scr_refresh () NOTHROW
1961{ 1945{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
1966 int i, /* tmp */ 1950 int i; /* tmp */
1967 row_offset; /* basic offset in screen structure */
1968#ifndef NO_CURSORCOLOR 1951#ifndef NO_CURSORCOLOR
1969 rend_t cc1; /* store colours at cursor position (s) */ 1952 rend_t cc1; /* store colours at cursor position (s) */
1970#endif 1953#endif
1971 rend_t *crp; // cursor rendition pointer 1954 rend_t *crp; // cursor rendition pointer
1972 1955
… …
1979 * A: set up vars 1962 * A: set up vars
1980 */ 1963 */
1981 must_clear = 0; 1964 must_clear = 0;
1982 refresh_count = 0; 1965 refresh_count = 0;
1983 1966
1984 row_offset = term_start - view_start;
1985
1986#if XPM_BACKGROUND 1967#if XPM_BACKGROUND
1987 must_clear |= bgPixmap.pixmap != None; 1968 must_clear |= bgPixmap.pixmap != None;
1988#endif 1969#endif
1989#if TRANSPARENT 1970#if TRANSPARENT
1990 must_clear |= (options & Opt_transparent) && am_transparent; 1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1991#endif 1972#endif
1992 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1993 1974
1994 /* 1975 /*
1995 * B: reverse any characters which are selected 1976 * B: reverse any characters which are selected
… …
2019 2000
2020 crp = &ROW(screen.cur.row).r[col]; 2001 crp = &ROW(screen.cur.row).r[col];
2021 2002
2022 if (showcursor && focus) 2003 if (showcursor && focus)
2023 { 2004 {
2024 if (options & Opt_cursorUnderline) 2005 if (OPTION (Opt_cursorUnderline))
2025 *crp ^= RS_Uline; 2006 *crp ^= RS_Uline;
2026 else 2007 else
2027 { 2008 {
2028 *crp ^= RS_RVid; 2009 *crp ^= RS_RVid;
2029 2010
… …
2031 cc1 = *crp & (RS_fgMask | RS_bgMask); 2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
2032 if (ISSET_PIXCOLOR (Color_cursor)) 2013 if (ISSET_PIXCOLOR (Color_cursor))
2033 ccol1 = Color_cursor; 2014 ccol1 = Color_cursor;
2034 else 2015 else
2035#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2036 ccol1 = GET_FGCOLOR (rstyle); 2017 ccol1 = fgcolor_of (rstyle);
2037#else 2018#else
2038 ccol1 = Color_fg; 2019 ccol1 = Color_fg;
2039#endif 2020#endif
2040 if (ISSET_PIXCOLOR (Color_cursor2)) 2021 if (ISSET_PIXCOLOR (Color_cursor2))
2041 ccol2 = Color_cursor2; 2022 ccol2 = Color_cursor2;
2042 else 2023 else
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol2 = GET_BGCOLOR (rstyle); 2025 ccol2 = bgcolor_of (rstyle);
2045#else 2026#else
2046 ccol2 = Color_bg; 2027 ccol2 = Color_bg;
2047#endif 2028#endif
2048 *crp = SET_FGCOLOR (*crp, ccol1); 2029 *crp = SET_FGCOLOR (*crp, ccol1);
2049 *crp = SET_BGCOLOR (*crp, ccol2); 2030 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2054 2035
2055 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
2056 setoldcursor = 0; 2037 setoldcursor = 0;
2057 if (ocrow != -1) 2038 if (ocrow != -1)
2058 { 2039 {
2059 if (screen.cur.row + view_start != ocrow 2040 if (screen.cur.row - view_start != ocrow
2060 || screen.cur.col != oldcursor.col) 2041 || screen.cur.col != oldcursor.col)
2061 { 2042 {
2062 if (ocrow < nrow 2043 if (ocrow < nrow
2063 && oldcursor.col < ncol) 2044 && oldcursor.col < ncol)
2064 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2065 2046
2066 if (focus || !showcursor) 2047 if (focus || !showcursor)
2067 oldcursor.row = -1; 2048 oldcursor.row = -1;
2068 else 2049 else
2069 setoldcursor = 1; 2050 setoldcursor = 1;
… …
2072 else if (!focus) 2053 else if (!focus)
2073 setoldcursor = 1; 2054 setoldcursor = 1;
2074 2055
2075 if (setoldcursor) 2056 if (setoldcursor)
2076 { 2057 {
2077 if (screen.cur.row + view_start >= nrow) 2058 if (screen.cur.row - view_start >= nrow)
2078 oldcursor.row = -1; 2059 oldcursor.row = -1;
2079 else 2060 else
2080 { 2061 {
2081 oldcursor.row = screen.cur.row + view_start; 2062 oldcursor.row = screen.cur.row - view_start;
2082 oldcursor.col = screen.cur.col; 2063 oldcursor.col = screen.cur.col;
2083 } 2064 }
2084 } 2065 }
2085 } 2066 }
2086 2067
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2087#if ENABLE_OVERLAY 2069#if ENABLE_OVERLAY
2088 scr_swap_overlay (); 2070 scr_swap_overlay ();
2089#endif 2071#endif
2090 2072
2091#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2074 /*
2093 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2095 */ 2077 */
2096 i = num_scr;
2097 if (!display->is_local 2078 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2080 && abs (num_scr) < nrow && !must_clear)
2100 { 2081 {
2101 int16_t nits; 2082 int16_t nits;
2102 int j; 2083 int j;
2103 int len, wlen; 2084 int len, wlen;
2085 dLocal (int, num_scr);
2104 2086
2105 j = nrow; 2087 j = nrow;
2106 wlen = len = -1; 2088 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2091 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2093 {
2112 line_t s = save[(row + row_offset) % total_rows]; 2094 line_t s = ROW(view_start + row);
2113 line_t d = drawn[row]; 2095 line_t d = drawn_buf[row];
2114 line_t d2 = drawn[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2115 2097
2116 for (nits = 0, col = ncol; col--; ) 2098 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2099 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2118 nits--; 2100 nits--;
2119 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2101 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2137 2119
2138 if (len != -1) 2120 if (len != -1)
2139 { 2121 {
2140 /* also comes here at end if needed because of >= above */ 2122 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2123 if (wlen < len)
2142 SWAP_IT (wlen, len, int); 2124 ::swap (wlen, len);
2143 2125
2144 XCopyArea (display->display, vt, vt, 2126 XCopyArea (display->display, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2127 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)TermWin_TotalWidth (), 2128 (unsigned int)this->width,
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2129 (unsigned int)Height2Pixel (wlen - len + 1),
2148 0, Row2Pixel (len)); 2130 0, Row2Pixel (len));
2149 len = -1; 2131 len = -1;
2150 } 2132 }
2151 } 2133 }
… …
2155 /* 2137 /*
2156 * E: main pass across every character 2138 * E: main pass across every character
2157 */ 2139 */
2158 for (row = 0; row < nrow; row++) 2140 for (row = 0; row < nrow; row++)
2159 { 2141 {
2160 text_t *stp = save[(row + row_offset) % total_rows].t; 2142 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = save[(row + row_offset) % total_rows].r; 2143 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn[row].t; 2144 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn[row].r; 2145 rend_t *drp = drawn_buf[row].r;
2164 2146
2165 /* 2147 /*
2166 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
2167 */ 2149 */
2168 int ypixel = (int)Row2Pixel (row); 2150 int ypixel = (int)Row2Pixel (row);
… …
2230 count++, i--; 2212 count++, i--;
2231 2213
2232 /* 2214 /*
2233 * Determine the attributes for the string 2215 * Determine the attributes for the string
2234 */ 2216 */
2235 int fore = GET_FGCOLOR (rend); // desired foreground 2217 int fore = fgcolor_of (rend); // desired foreground
2236 int back = GET_BGCOLOR (rend); // desired background 2218 int back = bgcolor_of (rend); // desired background
2237 2219
2238 // only do special processing if any attributes are set, which is rare 2220 // only do special processing if any attributes are set, which is unlikely
2239 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2240 { 2222 {
2241#if ENABLE_STYLES 2223#if ENABLE_STYLES
2242 // force redraw after "careful" characters to avoid pixel droppings 2224 // force redraw after "careful" characters to avoid pixel droppings
2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2279 fore = Color_UL; 2261 fore = Color_UL;
2280#endif 2262#endif
2281 2263
2282 if (invert) 2264 if (invert)
2283 { 2265 {
2284 SWAP_IT (fore, back, int); 2266 ::swap (fore, back);
2285 2267
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2287 if (ISSET_PIXCOLOR (Color_RV)) 2269 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV; 2270 back = Color_RV;
2289 2271
… …
2354 } /* for (row....) */ 2336 } /* for (row....) */
2355 2337
2356#if ENABLE_OVERLAY 2338#if ENABLE_OVERLAY
2357 scr_swap_overlay (); 2339 scr_swap_overlay ();
2358#endif 2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2359 2342
2360 /* 2343 /*
2361 * G: cleanup cursor and display outline cursor if necessary 2344 * G: cleanup cursor and display outline cursor if necessary
2362 */ 2345 */
2363 if (showcursor) 2346 if (showcursor)
2364 { 2347 {
2365 if (focus) 2348 if (focus)
2366 { 2349 {
2367 if (options & Opt_cursorUnderline) 2350 if (OPTION (Opt_cursorUnderline))
2368 *crp ^= RS_Uline; 2351 *crp ^= RS_Uline;
2369 else 2352 else
2370 { 2353 {
2371 *crp ^= RS_RVid; 2354 *crp ^= RS_RVid;
2372#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
… …
2381 2364
2382 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2365 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2383 col--; 2366 col--;
2384 2367
2385 while (col + cursorwidth < ncol 2368 while (col + cursorwidth < ncol
2386 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2387 cursorwidth++; 2370 cursorwidth++;
2388 2371
2389#ifndef NO_CURSORCOLOR 2372#ifndef NO_CURSORCOLOR
2390 if (ISSET_PIXCOLOR (Color_cursor)) 2373 if (ISSET_PIXCOLOR (Color_cursor))
2391 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2402 /* 2385 /*
2403 * H: cleanup selection 2386 * H: cleanup selection
2404 */ 2387 */
2405 scr_reverse_selection (); 2388 scr_reverse_selection ();
2406 2389
2407 if (refresh_type & SMOOTH_REFRESH)
2408 XFlush (display->display);
2409
2410 num_scr = 0; 2390 num_scr = 0;
2411 num_scr_allow = 1; 2391 num_scr_allow = 1;
2412} 2392}
2413 2393
2414void 2394void
2415rxvt_term::scr_remap_chars (const line_t &l) 2395rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2416{ 2396{
2417 if (!l.t) 2397 if (!l.t)
2418 return; 2398 return;
2419 2399
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401
2420 for (int i = ncol; i--; ) 2402 for (int i = ncol; i--; )
2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2422} 2404}
2423 2405
2424void 2406void
2425rxvt_term::scr_remap_chars () 2407rxvt_term::scr_remap_chars () NOTHROW
2426{ 2408{
2427 for (int i = total_rows; i--; ) 2409 for (int i = total_rows; i--; )
2428 scr_remap_chars (save[i]); 2410 scr_remap_chars (row_buf [i]);
2429 2411
2430 for (int i = nrow; i--; ) 2412 for (int i = nrow; i--; )
2431 { 2413 {
2432 scr_remap_chars (drawn[i]); 2414 scr_remap_chars (drawn_buf [i]);
2433 scr_remap_chars (swap_save[i]); 2415 scr_remap_chars (swap_buf [i]);
2434 } 2416 }
2435} 2417}
2436 2418
2437void 2419void
2438rxvt_term::scr_recolour () 2420rxvt_term::scr_recolour () NOTHROW
2439{ 2421{
2440 if (1 2422 if (1
2441#if TRANSPARENT 2423#if TRANSPARENT
2442 && !am_transparent 2424 && !am_transparent
2443#endif 2425#endif
… …
2464 want_refresh = 1; 2446 want_refresh = 1;
2465} 2447}
2466 2448
2467/* ------------------------------------------------------------------------- */ 2449/* ------------------------------------------------------------------------- */
2468void 2450void
2469rxvt_term::scr_clear (bool really) 2451rxvt_term::scr_clear (bool really) NOTHROW
2470{ 2452{
2471 if (!mapped) 2453 if (!mapped)
2472 return; 2454 return;
2473 2455
2474 num_scr_allow = 0; 2456 num_scr_allow = 0;
… …
2476 2458
2477 if (really) 2459 if (really)
2478 XClearWindow (display->display, vt); 2460 XClearWindow (display->display, vt);
2479} 2461}
2480 2462
2481/* ------------------------------------------------------------------------- */
2482void 2463void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{
2466 int view_end = view_start + nrow;
2467 int row, col;
2468
2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2470 {
2471 text_t *stp = ROW(row).t;
2472 rend_t *srp = ROW(row).r;
2473
2474 for (col = beg_col; col < end_col; col++)
2475 srp[col] ^= rstyle1;
2476
2477 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2478 srp[col] ^= rstyle2;
2479
2480 if (++col < end_col)
2481 srp[col] ^= rstyle2;
2482 }
2483}
2484
2485void
2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 if (beg_row >= view_start)
2492 {
2493 col = beg_col;
2494 row = beg_row;
2495 }
2496 else
2497 {
2498 col = 0;
2499 row = view_start;
2500 }
2501
2502 for (; row < min (end_row, view_end); row++, col = 0)
2503 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2504 srp[col] ^= rstyle;
2505
2506 if (row == end_row)
2507 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2508 srp[col] ^= rstyle;
2509}
2510
2511/* ------------------------------------------------------------------------- */
2512void
2483rxvt_term::scr_reverse_selection () 2513rxvt_term::scr_reverse_selection () NOTHROW
2484{ 2514{
2485 if (selection.op 2515 if (selection.op
2486 && current_screen == selection.screen 2516 && current_screen == selection.screen
2487 && selection.end.row >= -view_start) 2517 && selection.end.row >= view_start)
2488 { 2518 {
2489 int view_end = -view_start + nrow;
2490 int row, col;
2491
2492#if ENABLE_FRILLS 2519#if ENABLE_FRILLS
2493 if (selection.rect) 2520 if (selection.rect)
2494 { 2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2495 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2522 selection.end.row, selection.end.col,
2496 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2523 RS_RVid, RS_RVid | RS_Uline);
2497 srp[col] ^= RS_RVid;
2498 }
2499 else 2524 else
2500#endif 2525#endif
2501 { 2526 scr_xor_span (selection.beg.row, selection.beg.col,
2502 if (selection.beg.row >= -view_start) 2527 selection.end.row, selection.end.col,
2503 { 2528 RS_RVid);
2504 col = selection.beg.col;
2505 row = selection.beg.row;
2506 }
2507 else
2508 {
2509 col = 0;
2510 row = view_start;
2511 }
2512
2513 for (; row < min (selection.end.row, view_end); row++, col = 0)
2514 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2515 srp[col] ^= RS_RVid;
2516
2517 if (row == selection.end.row)
2518 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2519 srp[col] ^= RS_RVid;
2520 }
2521 } 2529 }
2522} 2530}
2523 2531
2524/* ------------------------------------------------------------------------- */ 2532/* ------------------------------------------------------------------------- */
2525/* 2533/*
2526 * Dump the whole scrollback and screen to the passed filedescriptor. The 2534 * Dump the whole scrollback and screen to the passed filedescriptor. The
2527 * invoking routine must close the fd. 2535 * invoking routine must close the fd.
2528 */ 2536 */
2529#if 0 2537#if 0
2530void 2538void
2531rxvt_term::scr_dump (int fd) 2539rxvt_term::scr_dump (int fd) NOTHROW
2532{ 2540{
2533 int row, wrote; 2541 int row, wrote;
2534 unsigned int width, towrite; 2542 unsigned int width, towrite;
2535 char r1[] = "\n"; 2543 char r1[] = "\n";
2536 2544
2537 for (row = saveLines - nsaved; 2545 for (row = saveLines - nsaved;
2538 row < saveLines + nrow - 1; row++) 2546 row < saveLines + nrow - 1; row++)
2539 { 2547 {
2540 width = save[row].l >= 0 ? save[row].l 2548 width = row_buf[row].l >= 0 ? row_buf[row].l
2541 : ncol; 2549 : ncol;
2542 for (towrite = width; towrite; towrite -= wrote) 2550 for (towrite = width; towrite; towrite -= wrote)
2543 { 2551 {
2544 wrote = write (fd, & (save[row].t[width - towrite]), 2552 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2545 towrite); 2553 towrite);
2546 if (wrote < 0) 2554 if (wrote < 0)
2547 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2548 } 2556 }
2549 if (save[row].l >= 0) 2557 if (row_buf[row].l >= 0)
2550 if (write (fd, r1, 1) <= 0) 2558 if (write (fd, r1, 1) <= 0)
2551 return; /* XXX: death, no report */ 2559 return; /* XXX: death, no report */
2552 } 2560 }
2553} 2561}
2554#endif 2562#endif
2555 2563
2556/* ------------------------------------------------------------------------- * 2564/* ------------------------------------------------------------------------- *
2557 * CHARACTER SELECTION * 2565 * CHARACTER SELECTION *
2558 * ------------------------------------------------------------------------- */ 2566 * ------------------------------------------------------------------------- */
2559void 2567void
2560rxvt_term::selection_check (int check_more) 2568rxvt_term::selection_check (int check_more) NOTHROW
2561{ 2569{
2562 row_col_t pos; 2570 row_col_t pos;
2563 2571
2564 if (!selection.op) 2572 if (!selection.op)
2565 return; 2573 return;
2566 2574
2567 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2568 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2569 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2570 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2571 || (check_more == 1 2579 || (check_more == 1
2572 && current_screen == selection.screen 2580 && current_screen == selection.screen
2573 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2574 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2575 || (check_more == 2 2583 || (check_more == 2
… …
2586/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2587/* 2595/*
2588 * Paste a selection direct to the command fd 2596 * Paste a selection direct to the command fd
2589 */ 2597 */
2590void 2598void
2591rxvt_term::paste (unsigned char *data, unsigned int len) 2599rxvt_term::paste (char *data, unsigned int len) NOTHROW
2592{ 2600{
2593 /* convert normal newline chars into common keyboard Return key sequence */ 2601 /* convert normal newline chars into common keyboard Return key sequence */
2594 for (unsigned int i = 0; i < len; i++) 2602 for (unsigned int i = 0; i < len; i++)
2595 if (data[i] == C0_LF) 2603 if (data[i] == C0_LF)
2596 data[i] = C0_CR; 2604 data[i] = C0_CR;
… …
2602/* 2610/*
2603 * Respond to a notification that a primary selection has been sent 2611 * Respond to a notification that a primary selection has been sent
2604 * EXT: SelectionNotify 2612 * EXT: SelectionNotify
2605 */ 2613 */
2606void 2614void
2607rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2615rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2608{ 2616{
2609 if (prop == None) /* check for failed XConvertSelection */ 2617 if (prop == None) /* check for failed XConvertSelection */
2610 { 2618 {
2611 if ((selection_type & Sel_CompoundText)) 2619 if ((selection_type & Sel_CompoundText))
2612 { 2620 {
… …
2740 { 2748 {
2741 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2742 char *s = rxvt_wcstombs (w); 2750 char *s = rxvt_wcstombs (w);
2743 free (w); 2751 free (w);
2744 // TODO: strlen == only the first element will be converted. well... 2752 // TODO: strlen == only the first element will be converted. well...
2745 paste ((unsigned char *)s, strlen (s)); 2753 paste (s, strlen (s));
2746 free (s); 2754 free (s);
2747 } 2755 }
2748 else 2756 else
2749#endif 2757#endif
2750 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2751 && cl) 2759 && cl)
2752 { 2760 {
2753 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2754 paste ((unsigned char *)cl[i], strlen (cl[i])); 2762 paste (cl[i], strlen (cl[i]));
2755 2763
2756 XFreeStringList (cl); 2764 XFreeStringList (cl);
2757 } 2765 }
2758 else 2766 else
2759 paste (ct.value, ct.nitems); // paste raw 2767 paste ((char *)ct.value, ct.nitems); // paste raw
2760 2768
2761bailout: 2769bailout:
2762 XFree (ct.value); 2770 XFree (ct.value);
2763 2771
2764 if (selection_wait == Sel_normal) 2772 if (selection_wait == Sel_normal)
2765 selection_wait = Sel_none; 2773 selection_wait = Sel_none;
2766} 2774}
2767 2775
2768void 2776void
2769rxvt_term::incr_cb (time_watcher &w) 2777rxvt_term::incr_cb (time_watcher &w) NOTHROW
2770{ 2778{
2771 selection_wait = Sel_none; 2779 selection_wait = Sel_none;
2772 2780
2773 incr_buf_size = 0; 2781 incr_buf_size = 0;
2774 free (incr_buf); 2782 free (incr_buf);
2775 2783
2776 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2784 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2777} 2785}
2778 2786
2779void 2787void
2780rxvt_term::selection_property (Window win, Atom prop) 2788rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2781{ 2789{
2782 if (prop == None || selection_wait != Sel_incr) 2790 if (prop == None || selection_wait != Sel_incr)
2783 return; 2791 return;
2784 2792
2785 selection_paste (win, prop, true); 2793 selection_paste (win, prop, true);
… …
2794 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2795 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2796 * EXT: button 2 release 2804 * EXT: button 2 release
2797 */ 2805 */
2798void 2806void
2799rxvt_term::selection_request (Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2800{ 2808{
2801 if (x < 0 || x >= width || y < 0 || y >= height) 2809 if (selection.text && selnum == Sel_Primary)
2802 return; /* outside window */
2803
2804 if (selection.text)
2805 { /* internal selection */ 2810 { /* internal selection */
2806 char *str = rxvt_wcstombs (selection.text, selection.len); 2811 char *str = rxvt_wcstombs (selection.text, selection.len);
2807 paste ((unsigned char *)str, strlen (str)); 2812 paste (str, strlen (str));
2808 free (str); 2813 free (str);
2809 return; 2814 return;
2810 } 2815 }
2811 else 2816 else
2812 { 2817 {
2813 int i;
2814
2815 selection_request_time = tm; 2818 selection_request_time = tm;
2816 selection_wait = Sel_normal; 2819 selection_wait = Sel_normal;
2817 2820
2818 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2819 {
2820#if X_HAVE_UTF8_STRING 2821#if X_HAVE_UTF8_STRING
2821 selection_type = Sel_UTF8String; 2822 selection_type = Sel_UTF8String;
2822 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2823 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2823 return; 2824 return;
2824#else 2825#else
2825 selection_type = Sel_CompoundText; 2826 selection_type = Sel_CompoundText;
2826 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2827 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2827 return; 2828 return;
2828#endif 2829#endif
2829 }
2830 } 2830 }
2831 2831
2832 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2832 selection_wait = Sel_none; /* don't loop in selection_paste () */
2833 selection_paste (display->root, XA_CUT_BUFFER0, false); 2833 selection_paste (display->root, XA_CUT_BUFFER0, false);
2834} 2834}
2835 2835
2836int 2836int
2837rxvt_term::selection_request_other (Atom target, int selnum) 2837rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2838{ 2838{
2839 Atom sel; 2839 Atom sel;
2840 2840
2841 selection_type |= selnum; 2841 selection_type |= selnum;
2842 2842
… …
2861/* 2861/*
2862 * Clear all selected text 2862 * Clear all selected text
2863 * EXT: SelectionClear 2863 * EXT: SelectionClear
2864 */ 2864 */
2865void 2865void
2866rxvt_term::selection_clear () 2866rxvt_term::selection_clear () NOTHROW
2867{ 2867{
2868 want_refresh = 1; 2868 want_refresh = 1;
2869 free (selection.text); 2869 free (selection.text);
2870 selection.text = NULL; 2870 selection.text = NULL;
2871 selection.len = 0; 2871 selection.len = 0;
… …
2904 selection.op = SELECTION_DONE; 2904 selection.op = SELECTION_DONE;
2905 2905
2906 if (selection.clicks == 4) 2906 if (selection.clicks == 4)
2907 return; /* nothing selected, go away */ 2907 return; /* nothing selected, go away */
2908 2908
2909 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2910 return;
2911
2909 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2912 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2910 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2913 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2911 2914
2912 int ofs = 0; 2915 int ofs = 0;
2913 int extra = 0; 2916 int extra = 0;
… …
2925 col = selection.beg.col; 2928 col = selection.beg.col;
2926 end_col = ncol + 1; 2929 end_col = ncol + 1;
2927 } 2930 }
2928 else 2931 else
2929#endif 2932#endif
2930 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2933 end_col = ROW(row).l;
2931 2934
2932 col = max (col, 0); 2935 col = max (col, 0);
2933 2936
2934 if (row == selection.end.row || selection.rect) 2937 if (row == selection.end.row
2938#if ENABLE_FRILLS
2939 || selection.rect
2940#endif
2941 )
2935 end_col = min (end_col, selection.end.col); 2942 min_it (end_col, selection.end.col);
2936 2943
2937 t = ROW(row).t + col; 2944 t = ROW(row).t + col;
2945
2938 for (; col < end_col; col++) 2946 for (; col < end_col; col++)
2939 { 2947 {
2940 if (*t == NOCHAR) 2948 if (*t == NOCHAR)
2941 t++; 2949 t++;
2942#if ENABLE_COMBINING 2950#if ENABLE_COMBINING
… …
2958#endif 2966#endif
2959 else 2967 else
2960 new_selection_text[ofs++] = *t++; 2968 new_selection_text[ofs++] = *t++;
2961 } 2969 }
2962 2970
2971#if ENABLE_FRILLS
2972 if (selection.rect)
2973 {
2974 while (ofs
2975 && new_selection_text[ofs - 1] != C0_LF
2976 && unicode::is_space (new_selection_text[ofs - 1]))
2977 --ofs;
2978
2979 new_selection_text[ofs++] = C0_LF;
2980 }
2981 else
2982#endif
2963 if (!ROW(row).is_longer () && row != selection.end.row) 2983 if (!ROW(row).is_longer () && row != selection.end.row)
2964 new_selection_text[ofs++] = C0_LF; 2984 new_selection_text[ofs++] = C0_LF;
2965 } 2985 }
2966 2986
2967 if (end_col != selection.end.col) 2987 if (end_col != selection.end.col)
2968 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
2969 2989
… …
2979 2999
2980 // we usually allocate much more than necessary, so realloc it smaller again 3000 // we usually allocate much more than necessary, so realloc it smaller again
2981 selection.len = ofs; 3001 selection.len = ofs;
2982 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3002 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2983 3003
3004 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3005 return;
3006
3007 selection_grab (tm);
3008}
3009
3010bool
3011rxvt_term::selection_grab (Time tm) NOTHROW
3012{
3013 selection_time = tm;
3014
2984 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2985 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3017 {
2986 display->set_selection_owner (this); 3018 display->set_selection_owner (this);
3019 return true;
3020 }
2987 else 3021 else
2988 rxvt_warn ("can't get primary selection, ignoring.\n"); 3022 {
3023 selection_clear ();
3024 return false;
3025 }
2989 3026
2990#if 0 3027#if 0
2991 XTextProperty ct; 3028 XTextProperty ct;
2992 3029
2993 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2994 { 3031 {
2995 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3032 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2996 XFree (ct.value); 3033 XFree (ct.value);
2997 } 3034 }
2998#endif 3035#endif
2999
3000 selection_time = tm;
3001} 3036}
3002 3037
3003/* ------------------------------------------------------------------------- */ 3038/* ------------------------------------------------------------------------- */
3004/* 3039/*
3005 * Mark or select text based upon number of clicks: 1, 2, or 3 3040 * Mark or select text based upon number of clicks: 1, 2, or 3
3006 * EXT: button 1 press 3041 * EXT: button 1 press
3007 */ 3042 */
3008void 3043void
3009rxvt_term::selection_click (int clicks, int x, int y) 3044rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3010{ 3045{
3011 clicks = ((clicks - 1) % 3) + 1; 3046 clicks = ((clicks - 1) % 3) + 1;
3012 selection.clicks = clicks; /* save clicks so extend will work */ 3047 selection.clicks = clicks; /* save clicks so extend will work */
3013 3048
3049 if (clicks == 2 && !selection.rect
3050 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3051 {
3052 MEvent.clicks = 1; // what a mess
3053 selection.screen = current_screen;
3054 selection.op = SELECTION_CONT;
3055 return;
3056 }
3057
3014 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3058 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3015 3059
3016 if (clicks == 2 || clicks == 3) 3060 if (clicks == 2 || clicks == 3)
3017 selection_extend_colrow (selection.mark.col, 3061 selection_extend_colrow (selection.mark.col,
3018 selection.mark.row + view_start, 3062 selection.mark.row - view_start,
3019 0, /* button 3 */ 3063 0, /* button 3 */
3020 1, /* button press */ 3064 1, /* button press */
3021 0); /* click change */ 3065 0); /* click change */
3022} 3066}
3023 3067
3024/* ------------------------------------------------------------------------- */ 3068/* ------------------------------------------------------------------------- */
3025/* 3069/*
3026 * Mark a selection at the specified col/row 3070 * Mark a selection at the specified col/row
3027 */ 3071 */
3028void 3072void
3029rxvt_term::selection_start_colrow (int col, int row) 3073rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3030{ 3074{
3031 want_refresh = 1; 3075 want_refresh = 1;
3032 3076
3033 selection.mark.row = row - view_start; 3077 selection.mark.row = row + view_start;
3034 selection.mark.col = col; 3078 selection.mark.col = col;
3035 3079
3036 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3080 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3037 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3081 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3038 3082
3039 while (selection.mark.col > 0 3083 while (selection.mark.col > 0
3040 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3084 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3041 --selection.mark.col; 3085 --selection.mark.col;
3042 3086
… …
3060#define DELIMIT_TEXT(x) \ 3104#define DELIMIT_TEXT(x) \
3061 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3105 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3062#define DELIMIT_REND(x) 1 3106#define DELIMIT_REND(x) 1
3063 3107
3064void 3108void
3065rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3109rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3066{ 3110{
3067 int col, row, dirnadd, tcol, trow, w1, w2; 3111 int col, row, dirnadd, tcol, trow, w1, w2;
3068 row_col_t bound; 3112 row_col_t bound;
3069 text_t *stp; 3113 text_t *stp;
3070 rend_t *srp; 3114 rend_t *srp;
3071 3115
3072 if (dirn == UP) 3116 if (dirn == UP)
3073 { 3117 {
3074 bound.row = - nsaved - 1; 3118 bound.row = top_row - 1;
3075 bound.col = 0; 3119 bound.col = 0;
3076 dirnadd = -1; 3120 dirnadd = -1;
3077 } 3121 }
3078 else 3122 else
3079 { 3123 {
… …
3127 } 3171 }
3128 } 3172 }
3129 break; 3173 break;
3130 } 3174 }
3131 3175
3132Old_Word_Selection_You_Die:
3133 if (dirn == DN) 3176 if (dirn == DN)
3134 col++; /* put us on one past the end */ 3177 col++; /* put us on one past the end */
3135 3178
3136 /* Poke the values back in */ 3179 /* Poke the values back in */
3137 ret->row = row; 3180 ret->row = row;
… …
3145 * flag == 0 ==> button 1 3188 * flag == 0 ==> button 1
3146 * flag == 1 ==> button 3 press 3189 * flag == 1 ==> button 3 press
3147 * flag == 2 ==> button 3 motion 3190 * flag == 2 ==> button 3 motion
3148 */ 3191 */
3149void 3192void
3150rxvt_term::selection_extend (int x, int y, int flag) 3193rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3151{ 3194{
3152 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3195 int col = clamp (Pixel2Col (x), 0, ncol);
3153 int row = min (max (Pixel2Row (y), 0), ncol); 3196 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3154 3197
3155 /* 3198 /*
3156 * If we're selecting characters (single click) then we must check first 3199 * If we're selecting characters (single click) then we must check first
3157 * if we are at the same place as the original mark. If we are then 3200 * if we are at the same place as the original mark. If we are then
3158 * select nothing. Otherwise, if we're to the right of the mark, you have to 3201 * select nothing. Otherwise, if we're to the right of the mark, you have to
3159 * be _past_ a character for it to be selected. 3202 * be _past_ a character for it to be selected.
3160 */ 3203 */
3161 if (((selection.clicks % 3) == 1) && !flag 3204 if (((selection.clicks % 3) == 1) && !flag
3162 && (col == selection.mark.col 3205 && (col == selection.mark.col
3163 && (row == selection.mark.row + view_start))) 3206 && (row == selection.mark.row - view_start)))
3164 { 3207 {
3165 /* select nothing */ 3208 /* select nothing */
3166 selection.beg.row = selection.end.row = 0; 3209 selection.beg.row = selection.end.row = 0;
3167 selection.beg.col = selection.end.col = 0; 3210 selection.beg.col = selection.end.col = 0;
3168 selection.clicks = 4; 3211 selection.clicks = 4;
… …
3181/* ------------------------------------------------------------------------- */ 3224/* ------------------------------------------------------------------------- */
3182/* 3225/*
3183 * Extend the selection to the specified col/row 3226 * Extend the selection to the specified col/row
3184 */ 3227 */
3185void 3228void
3186rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3229rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3187{ 3230{
3188 row_col_t pos; 3231 row_col_t pos;
3189 enum { 3232 enum {
3190 LEFT, RIGHT 3233 LEFT, RIGHT
3191 } closeto = RIGHT; 3234 } closeto = RIGHT;
… …
3223 selection.beg.col = selection.end.col = selection.mark.col; 3266 selection.beg.col = selection.end.col = selection.mark.col;
3224 selection.beg.row = selection.end.row = selection.mark.row; 3267 selection.beg.row = selection.end.row = selection.mark.row;
3225 } 3268 }
3226 3269
3227 pos.col = col; 3270 pos.col = col;
3228 pos.row = row - view_start; 3271 pos.row = view_start + row;
3229 3272
3230 /* 3273 /*
3231 * This is mainly xterm style selection with a couple of differences, mainly 3274 * This is mainly xterm style selection with a couple of differences, mainly
3232 * in the way button3 drag extension works. 3275 * in the way button3 drag extension works.
3233 * We're either doing: button1 drag; button3 press; or button3 drag 3276 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3320 selection_delimit_word (DN, &selection.end, &selection.end); 3363 selection_delimit_word (DN, &selection.end, &selection.end);
3321 } 3364 }
3322 else if (selection.clicks == 3) 3365 else if (selection.clicks == 3)
3323 { 3366 {
3324#if ENABLE_FRILLS 3367#if ENABLE_FRILLS
3325 if (options & Opt_tripleclickwords) 3368 if (OPTION (Opt_tripleclickwords))
3326 { 3369 {
3327 selection_delimit_word (UP, &selection.beg, &selection.beg); 3370 selection_delimit_word (UP, &selection.beg, &selection.beg);
3328 3371
3329 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3372 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3330 { 3373 {
… …
3371 } 3414 }
3372 } 3415 }
3373 3416
3374#if ENABLE_FRILLS 3417#if ENABLE_FRILLS
3375 if (selection.rect && selection.beg.col > selection.end.col) 3418 if (selection.rect && selection.beg.col > selection.end.col)
3376 SWAP_IT (selection.beg.col, selection.end.col, int); 3419 ::swap (selection.beg.col, selection.end.col);
3377#endif 3420#endif
3378} 3421}
3379 3422
3380#if ENABLE_FRILLS 3423#if ENABLE_FRILLS
3381void 3424void
3382rxvt_term::selection_remove_trailing_spaces () 3425rxvt_term::selection_remove_trailing_spaces () NOTHROW
3383{ 3426{
3384 int32_t end_col, end_row; 3427 int32_t end_col, end_row;
3385 text_t *stp; 3428 text_t *stp;
3386 3429
3387 end_col = selection.end.col; 3430 end_col = selection.end.col;
… …
3391 { 3434 {
3392 stp = ROW(end_row).t; 3435 stp = ROW(end_row).t;
3393 3436
3394 while (--end_col >= 0) 3437 while (--end_col >= 0)
3395 { 3438 {
3396 if (stp[end_col] != ' ' 3439 if (stp[end_col] != NOCHAR
3397 && stp[end_col] != '\t' 3440 && !unicode::is_space (stp[end_col]))
3398 && stp[end_col] != NOCHAR)
3399 break; 3441 break;
3400 } 3442 }
3401 3443
3402 if (end_col >= 0 3444 if (end_col >= 0
3403 || !ROW(end_row - 1).is_longer ()) 3445 || !ROW(end_row - 1).is_longer ())
… …
3426/* 3468/*
3427 * Double click on button 3 when already selected 3469 * Double click on button 3 when already selected
3428 * EXT: button 3 double click 3470 * EXT: button 3 double click
3429 */ 3471 */
3430void 3472void
3431rxvt_term::selection_rotate (int x, int y) 3473rxvt_term::selection_rotate (int x, int y) NOTHROW
3432{ 3474{
3433 selection.clicks = selection.clicks % 3 + 1; 3475 selection.clicks = selection.clicks % 3 + 1;
3434 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3476 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3435} 3477}
3436 3478
… …
3438/* 3480/*
3439 * Respond to a request for our current selection 3481 * Respond to a request for our current selection
3440 * EXT: SelectionRequest 3482 * EXT: SelectionRequest
3441 */ 3483 */
3442void 3484void
3443rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3444{ 3486{
3445 XSelectionEvent ev; 3487 XSelectionEvent ev;
3446 dDisp; 3488 dDisp;
3447 3489
3448 ev.type = SelectionNotify; 3490 ev.type = SelectionNotify;
… …
3576 3618
3577/* 3619/*
3578 * return col/row values corresponding to x/y pixel values 3620 * return col/row values corresponding to x/y pixel values
3579 */ 3621 */
3580void 3622void
3581rxvt_term::pixel_position (int *x, int *y) 3623rxvt_term::pixel_position (int *x, int *y) NOTHROW
3582{ 3624{
3583 *x = Pixel2Col (*x); 3625 *x = Pixel2Col (*x);
3584 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3626 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3585 *y = Pixel2Row (*y); 3627 *y = Pixel2Row (*y);
3586 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3628 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3587} 3629}
3588 3630
3589/* ------------------------------------------------------------------------- */ 3631/* ------------------------------------------------------------------------- */
3590#ifdef USE_XIM 3632#ifdef USE_XIM
3591void 3633void
3592rxvt_term::im_set_position (XPoint &pos) 3634rxvt_term::im_set_position (XPoint &pos) NOTHROW
3593{ 3635{
3594 XWindowAttributes xwa; 3636 XWindowAttributes xwa;
3595 3637
3596 XGetWindowAttributes (display->display, vt, &xwa); 3638 XGetWindowAttributes (display->display, vt, &xwa);
3597 3639
… …
3600} 3642}
3601#endif 3643#endif
3602 3644
3603#if ENABLE_OVERLAY 3645#if ENABLE_OVERLAY
3604void 3646void
3605rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3647rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3606{ 3648{
3607 if (nrow < 3 || ncol < 3) 3649 if (nrow < 1 || ncol < 1)
3608 return; 3650 return;
3609 3651
3610 want_refresh = 1; 3652 want_refresh = 1;
3611 3653
3612 scr_overlay_off (); 3654 scr_overlay_off ();
3613 3655
3614 if (x < 0) x = ncol - w; 3656 if (x < 0) x = ncol - w;
3615 if (y < 0) y = nrow - h; 3657 if (y < 0) y = nrow - h;
3616 3658
3617 // make space for border 3659 // make space for border
3618 w += 2; MIN_IT (w, ncol); 3660 w += 2; min_it (w, ncol);
3619 h += 2; MIN_IT (h, nrow); 3661 h += 2; min_it (h, nrow);
3620 3662
3621 x -= 1; MAX_IT (x, 0); 3663 x -= 1; clamp_it (x, 0, ncol - w);
3622 y -= 1; MAX_IT (y, 0); 3664 y -= 1; clamp_it (y, 0, nrow - h);
3623
3624 MIN_IT (x, ncol - w);
3625 MIN_IT (y, nrow - h);
3626 3665
3627 ov_x = x; ov_y = y; 3666 ov_x = x; ov_y = y;
3628 ov_w = w; ov_h = h; 3667 ov_w = w; ov_h = h;
3629 3668
3630 ov_text = new text_t *[h]; 3669 ov_text = new text_t *[h];
… …
3658 *rp = r; 3697 *rp = r;
3659 } 3698 }
3660} 3699}
3661 3700
3662void 3701void
3663rxvt_term::scr_overlay_off () 3702rxvt_term::scr_overlay_off () NOTHROW
3664{ 3703{
3665 if (!ov_text) 3704 if (!ov_text)
3666 return; 3705 return;
3667 3706
3668 want_refresh = 1; 3707 want_refresh = 1;
… …
3676 delete [] ov_text; ov_text = 0; 3715 delete [] ov_text; ov_text = 0;
3677 delete [] ov_rend; ov_rend = 0; 3716 delete [] ov_rend; ov_rend = 0;
3678} 3717}
3679 3718
3680void 3719void
3681rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3720rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3682{ 3721{
3683 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3722 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3684 return; 3723 return;
3685 3724
3686 x++, y++; 3725 x++, y++;
… …
3688 ov_text[y][x] = text; 3727 ov_text[y][x] = text;
3689 ov_rend[y][x] = rend; 3728 ov_rend[y][x] = rend;
3690} 3729}
3691 3730
3692void 3731void
3693rxvt_term::scr_overlay_set (int x, int y, const char *s) 3732rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3694{ 3733{
3695 while (*s) 3734 while (*s)
3696 scr_overlay_set (x++, y, *s++); 3735 scr_overlay_set (x++, y, *s++);
3697} 3736}
3698 3737
3699void 3738void
3700rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3701{ 3740{
3702 while (*s) 3741 while (*s)
3703 { 3742 {
3704 text_t t = *s++; 3743 text_t t = *s++;
3705 int width = wcwidth (t); 3744 int width = wcwidth (t);
… …
3711 } 3750 }
3712 } 3751 }
3713} 3752}
3714 3753
3715void 3754void
3716rxvt_term::scr_swap_overlay () 3755rxvt_term::scr_swap_overlay () NOTHROW
3717{ 3756{
3718 if (!ov_text) 3757 if (!ov_text)
3719 return; 3758 return;
3720 3759
3721 // swap screen mem with overlay 3760 // swap screen mem with overlay
3722 for (int y = ov_h; y--; ) 3761 for (int y = ov_h; y--; )
3723 { 3762 {
3724 text_t *t1 = ov_text[y]; 3763 text_t *t1 = ov_text[y];
3725 rend_t *r1 = ov_rend[y]; 3764 rend_t *r1 = ov_rend[y];
3726 3765
3727 text_t *t2 = ROW(y - view_start).t + ov_x; 3766 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3728 rend_t *r2 = ROW(y - view_start).r + ov_x; 3767 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3729 3768
3730 for (int x = ov_w; x--; ) 3769 for (int x = ov_w; x--; )
3731 { 3770 {
3732 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3771 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3733 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3772 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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