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.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.465 by root, Thu Aug 4 18:28:44 2022 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32
33#include "salloc.C" // HACK, should be a separate compile!
34 33
35static inline void 34static inline void
36fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
… …
96 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
97 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
98 97
99/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
100void 99void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept
102{ 101{
103 if (!l.t) 102 if (!l.valid ())
104 { 103 {
105 lalloc (l); 104 l.alloc ();
106 col = 0; 105 col = 0;
107 width = ncol; 106 width = ncol;
108 } 107 }
109 108
110 l.touch (); 109 l.touch ();
111 110
112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
114 113
115 text_t *et = l.t + col; 114 text_t *et = l.t + col;
116 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
117 116
118 while (width--) 117 while (width--)
… …
123} 122}
124 123
125/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
126/* Fill a full line with blanks - make sure it is allocated first */ 125/* Fill a full line with blanks - make sure it is allocated first */
127void 126void
128rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW 127rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept
129{ 128{
130 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
131 130
132 l.l = 0; 131 l.l = 0;
133 l.f = 0; 132 l.f = 0;
134} 133}
135 134
136// nuke a single wide character at the given column 135// nuke a single wide character at the given column
137void 136void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
139{ 138{
140 // find begin 139 // find begin
141 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
142 col--; 141 col--;
143 142
144 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
146 145
147 l.touch (); 146 l.touch ();
148 147
149 // found start, nuke 148 // found start, nuke
150 do { 149 do {
… …
152 l.r[col] = rend; 151 l.r[col] = rend;
153 col++; 152 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
155} 154}
156 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
157/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
160 169
161void 170void
171rxvt_term::scr_alloc () noexcept
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
162rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
163{ 216{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
164 view_start = 0; 221 view_start = 0;
165 num_scr = 0; 222 num_scr = 0;
166 223
167 if (ncol == 0) 224 if (ncol == 0)
168 ncol = 80; 225 ncol = 80;
… …
188 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
189 246
190 screen.tscroll = 0; 247 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
192 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
193 if (!row_buf) 258 if (!prev_row_buf)
194 { 259 {
195 /*
196 * first time called so just malloc everything: don't rely on realloc
197 */
198 top_row = 0; 260 top_row = 0;
199 term_start = 0; 261 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208 for (int row = nrow; row--; )
209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
214 262
215 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
241 { 289 {
242 /* 290 /*
243 * add or delete rows as appropriate 291 * add or delete rows as appropriate
244 */ 292 */
245 293
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 295
249#if 0 296 // resize swap_buf, blank drawn_buf
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262
263 for (int row = min (nrow, prev_nrow); row--; ) 297 for (int row = min (nrow, prev_nrow); row--; )
264 { 298 {
265 lresize (drawn_buf[row]); 299 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 300 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267 } 301 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268 302
269 for (int row = prev_nrow; row < nrow; row++) 303 copy_line (swap_buf [row], prev_swap_buf [row]);
270 { 304 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 305
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 306 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 307 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 308 int q = total_rows; // rewrapped row
281 309
282 if (top_row) 310#if ENABLE_FRILLS
311 if ((rewrap_always || top_row) && !rewrap_never)
283 { 312 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 313 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change 315 // TODO: maybe optimise when width didn't change
287 316
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 319
291 do 320 do
292 { 321 {
293 p = MOD (p - 1, prev_total_rows); 322 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 324 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 326
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 327 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 328 {
300 p = MOD (p - 1, prev_total_rows); 329 p = MOD (p - 1, prev_total_rows);
301 330
302 plines++; 331 plines++;
303 llen += prev_ncol; 332 llen += prev_ncol;
304 } 333 }
305 334
306 int qlines = max (0, (llen - 1) / ncol) + 1; 335 int qlines = max (0, (llen - 1) / ncol) + 1;
307 336
337 q -= qlines;
338
308 // drop partial lines completely 339 // drop partial lines completely
309 if (q < qlines) 340 if (q < 0)
310 break; 341 break;
311
312 q -= qlines;
313 342
314 int lofs = 0; 343 int lofs = 0;
315 line_t *qline; 344 line_t *qline;
316 345
317 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 347 for (int qrow = q; qlines--; qrow++)
319 { 348 {
320 qline = row_buf + qrow; 349 qline = row_buf + qrow;
321 lalloc (*qline); 350 qline->alloc (); // redundant with next line
322 qline->l = ncol; 351 qline->l = ncol;
323 qline->is_longer (1); 352 qline->is_longer (1);
324 353
325 int qcol = 0; 354 int qcol = 0;
326 355
… …
341 // this seems to upset applications/shells/readline 370 // this seems to upset applications/shells/readline
342 // least. 371 // least.
343 if (prow == ocur.row) 372 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 373 screen.cur.row = q - (total_rows - nrow);
345 374
346 line_t &pline = old_buf [prow]; 375 line_t &pline = prev_row_buf [prow];
347 376
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 378
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 qline->is_longer (0); 388 qline->is_longer (0);
360 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 389 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
361 } 390 }
362 while (p != pend && q > 0); 391 while (p != pend && q > 0);
363 392
364 term_start = total_rows - nrow;
365 top_row = q - term_start;
366
367 // make sure all terminal lines exist 393 // make sure all terminal lines exist
368 while (top_row > 0) 394 while (top_row > 0)
369 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 395 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
370 } 396 }
371 else 397 else
398#endif
399 {
400 // wing, instead of wrap
372 { 401 do
373 // if no scrollback exists (yet), wing, instead of wrap
374
375 for (int row = min (nrow, prev_nrow); row--; )
376 { 402 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 p = MOD (p - 1, prev_total_rows);
378 line_t &qline = row_buf [row]; 404 q--;
379 405
380 qline = pline; 406 copy_line (row_buf [q], prev_row_buf [p]);
381 lresize (qline);
382 } 407 }
408 while (p != pend);
383 409
384 for (int row = prev_nrow; row < nrow; row++) 410 screen.cur.row += nrow - prev_nrow;
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 } 411 }
388 412
389 term_start = 0; 413 term_start = total_rows - nrow;
390 } 414 top_row = q - term_start;
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 415
396 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 418 }
399 419
420 // ensure drawn_buf, swap_buf and terminal rows are all initialized
421 for (int row = nrow; row--; )
422 {
423 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
424 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
425 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
426 }
427
428 chunk_free (prev_chunk, prev_chunk_size);
429
400 free (tabs); 430 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 431 tabs = (char *)rxvt_malloc (ncol);
402 432
403 for (int col = ncol; col--; ) 433 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 434 tabs [col] = col % TABSIZE == 0;
… …
411 tt_winch (); 441 tt_winch ();
412 442
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 443 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 444}
415 445
416/* ------------------------------------------------------------------------- */ 446void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 447rxvt_term::scr_release () noexcept
422{ 448{
423 if (row_buf) 449 chunk_free (chunk, chunk_size);
424 { 450 chunk = 0;
425 delete talloc; talloc = 0; 451 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 452
428 free (row_buf);
429 free (swap_buf);
430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
433 free (tabs); 453 free (tabs);
434 tabs = 0; 454 tabs = 0;
435 }
436} 455}
437 456
438/* ------------------------------------------------------------------------- */ 457/* ------------------------------------------------------------------------- */
439/* 458/*
440 * Hard/Soft reset 459 * Hard/Soft reset
441 */ 460 */
442void 461void ecb_cold
443rxvt_term::scr_poweron () 462rxvt_term::scr_poweron ()
444{ 463{
445 scr_release (); 464 scr_release ();
465
446 prev_nrow = prev_ncol = 0; 466 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 467 rvideo_mode = false;
448 scr_soft_reset (); 468 scr_soft_reset ();
449 scr_reset (); 469 scr_reset ();
450 470
451 scr_clear (true); 471 scr_clear (true);
452 scr_refresh (); 472 scr_refresh ();
453} 473}
454 474
455void 475void ecb_cold
456rxvt_term::scr_soft_reset () 476rxvt_term::scr_soft_reset () noexcept
457{ 477{
458 /* only affects modes, nothing drastic such as clearing the screen */ 478 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 479#if ENABLE_OVERLAY
460 scr_overlay_off (); 480 scr_overlay_off ();
461#endif 481#endif
… …
475 * Save and Restore cursor 495 * Save and Restore cursor
476 * XTERM_SEQ: Save cursor : ESC 7 496 * XTERM_SEQ: Save cursor : ESC 7
477 * XTERM_SEQ: Restore cursor: ESC 8 497 * XTERM_SEQ: Restore cursor: ESC 8
478 */ 498 */
479void 499void
480rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 500rxvt_term::scr_cursor (cursor_mode mode) noexcept
481{ 501{
482 screen_t *s; 502 screen_t *s;
483 503
484#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 504#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
485 if (current_screen == SECONDARY) 505 if (current_screen == SECONDARY)
… …
516 assert (s->cur.row >= 0); 536 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 537 assert (s->cur.col >= 0);
518} 538}
519 539
520void 540void
521rxvt_term::scr_swap_screen () 541rxvt_term::scr_swap_screen () noexcept
522{ 542{
523 if (!option (Opt_secondaryScreen)) 543 if (!option (Opt_secondaryScreen))
524 return; 544 return;
525 545
526 for (int i = prev_nrow; i--; ) 546 for (int i = prev_nrow; i--; )
… …
545 return; 565 return;
546 566
547 want_refresh = 1; 567 want_refresh = 1;
548 view_start = 0; 568 view_start = 0;
549 569
550 selection_check (2); /* check for boundary cross */ 570 /* check for boundary cross */
571 row_col_t pos;
572 pos.row = pos.col = 0;
573 if (ROWCOL_IS_BEFORE (selection.beg, pos)
574 && ROWCOL_IS_AFTER (selection.end, pos))
575 CLEAR_SELECTION ();
551 576
552 current_screen = scrn; 577 current_screen = scrn;
553 578
554#if NSCREENS 579#if NSCREENS
555 if (option (Opt_secondaryScreen)) 580 if (option (Opt_secondaryScreen))
… …
569 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 594 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
570} 595}
571 596
572// clear WrapNext indicator, solidifying position on next line 597// clear WrapNext indicator, solidifying position on next line
573void 598void
574rxvt_term::scr_do_wrap () NOTHROW 599rxvt_term::scr_do_wrap () noexcept
575{ 600{
576 if (!(screen.flags & Screen_WrapNext)) 601 if (!(screen.flags & Screen_WrapNext))
577 return; 602 return;
578 603
579 screen.flags &= ~Screen_WrapNext; 604 screen.flags &= ~Screen_WrapNext;
… …
589/* ------------------------------------------------------------------------- */ 614/* ------------------------------------------------------------------------- */
590/* 615/*
591 * Change the colour for following text 616 * Change the colour for following text
592 */ 617 */
593void 618void
594rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 619rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
595{ 620{
596 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 621 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
597 color = fgbg; 622 color = fgbg;
598 623
599 if (fgbg == Color_fg) 624 if (fgbg == Color_fg)
600 rstyle = SET_FGCOLOR (rstyle, color); 625 rstyle = SET_FGCOLOR (rstyle, color);
601 else 626 else
… …
605/* ------------------------------------------------------------------------- */ 630/* ------------------------------------------------------------------------- */
606/* 631/*
607 * Change the rendition style for following text 632 * Change the rendition style for following text
608 */ 633 */
609void 634void
610rxvt_term::scr_rendition (int set, int style) NOTHROW 635rxvt_term::scr_rendition (int set, int style) noexcept
611{ 636{
612 if (set) 637 if (set)
613 rstyle |= style; 638 rstyle |= style;
614 else if (style == ~RS_None) 639 else if (style == ~RS_None)
615 rstyle = DEFAULT_RSTYLE; 640 rstyle = DEFAULT_RSTYLE;
… …
621/* 646/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 647 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 648 * count positive ==> scroll up
624 * count negative ==> scroll down 649 * count negative ==> scroll down
625 */ 650 */
626int 651int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 652rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
628{ 653{
629 if (count == 0 || (row1 > row2)) 654 if (count == 0 || (row1 > row2))
630 return 0; 655 return 0;
631 656
632 want_refresh = 1; 657 want_refresh = 1;
… …
634 659
635 if (count > 0 660 if (count > 0
636 && row1 == 0 661 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 662 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 663 {
664 min_it (count, total_rows - (nrow - (row2 + 1)));
665
639 top_row = max (top_row - count, -saveLines); 666 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 667
644 // sever bottommost line 668 // sever bottommost line
645 { 669 {
646 line_t &l = ROW(row2 - count); 670 line_t &l = ROW(row2);
647 l.is_longer (0); 671 l.is_longer (0);
648 l.touch (); 672 l.touch ();
649 } 673 }
650 674
675 // scroll everything up 'count' lines
676 term_start = (term_start + count) % total_rows;
677
678 // now copy lines below the scroll region bottom to the
679 // bottom of the screen again, so they look as if they
680 // hadn't moved.
681 for (int i = nrow; --i > row2; )
682 {
683 line_t &l1 = ROW(i - count);
684 line_t &l2 = ROW(i);
685
686 ::swap (l1, l2);
687 l2.touch ();
688 }
689
651 // erase newly scrolled-in lines 690 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 691 for (int i = count; i--; )
653 { 692 {
654 line_t &l = ROW(nrow - 1 - i); 693 line_t &l = ROW(row2 - i);
655 694
656 // optimize if already cleared, can be significant on slow machines 695 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 696 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 697 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 698 {
660 scr_blank_line (l, 0, l.l, rstyle); 699 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 700 l.l = 0;
… …
663 } 702 }
664 else 703 else
665 scr_blank_screen_mem (l, rstyle); 704 scr_blank_screen_mem (l, rstyle);
666 } 705 }
667 706
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 707 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 708 if (selection.op && current_screen == selection.screen
709 && selection.beg.row <= row2)
682 { 710 {
683 selection.beg.row -= count; 711 selection.beg.row -= count;
684 selection.end.row -= count; 712 selection.end.row -= count;
685 selection.mark.row -= count; 713 selection.mark.row -= count;
686 714
687 if (selection.beg.row < top_row 715 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 716 }
695 717
696 // finally move the view window, if desired 718 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 719 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 720 && view_start != 0
699 && view_start != -saveLines) 721 && view_start != -saveLines)
700 scr_page (UP, count); 722 scr_page (count);
701 723
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 724 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 725 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
704 } 726 }
705 else 727 else
… …
728 } 750 }
729 751
730 // use a simple and robust scrolling algorithm, this 752 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 753 // part of scr_scroll_text is not time-critical.
732 754
755 // sever line above scroll region
756 if (row1)
757 {
758 line_t &l = ROW(row1 - 1);
759 l.is_longer (0);
760 l.touch ();
761 }
762
733 int rows = row2 - row1 + 1; 763 int rows = row2 - row1 + 1;
734 764
735 min_it (count, rows); 765 min_it (count, rows);
736 766
737 line_t *temp_buf = row_buf + total_rows; 767 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 768
739 for (int row = 0; row < rows; row++) 769 for (int row = 0; row < rows; row++)
740 { 770 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 771 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 772
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 774 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 775 }
746 776
747 for (int row = 0; row < rows; row++) 777 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 778 ROW(row1 + row) = temp_buf [row];
779
780 // sever bottommost line
781 {
782 line_t &l = ROW(row2);
783 l.is_longer (0);
784 l.touch ();
785 }
749 } 786 }
750 787
751 return count; 788 return count;
752} 789}
753 790
754/* ------------------------------------------------------------------------- */ 791/* ------------------------------------------------------------------------- */
755/* 792/*
756 * Add text given in <str> of length <len> to screen struct 793 * Add text given in <str> of length <len> to screen struct
757 */ 794 */
758void 795void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 796rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
760{ 797{
761 if (len <= 0) /* sanity */ 798 if (len <= 0) /* sanity */
762 return; 799 return;
763 800
764 unsigned char checksel; 801 bool checksel;
765 unicode_t c; 802 unicode_t c;
766 int ncol = this->ncol; 803 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 804 const wchar_t *strend = str + len;
768 805
769 want_refresh = 1; 806 want_refresh = 1;
… …
795 832
796 while (str < strend) 833 while (str < strend)
797 { 834 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 835 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 836
800 if (expect_false (c < 0x20)) 837 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 838 if (c == C0_LF)
802 { 839 {
803 max_it (line->l, screen.cur.col); 840 max_it (line->l, screen.cur.col);
804 841
805 screen.flags &= ~Screen_WrapNext; 842 screen.flags &= ~Screen_WrapNext;
… …
824 { 861 {
825 scr_tab (1, true); 862 scr_tab (1, true);
826 continue; 863 continue;
827 } 864 }
828 865
829 if (expect_false ( 866 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 867 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 868 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 869 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 870 ))
834 { 871 {
… …
839 * should be a similar check. 876 * should be a similar check.
840 */ 877 */
841 CLEAR_SELECTION (); 878 CLEAR_SELECTION ();
842 } 879 }
843 880
844 if (expect_false (screen.flags & Screen_WrapNext)) 881 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 882 {
846 scr_do_wrap (); 883 scr_do_wrap ();
847 884
848 line->l = ncol; 885 line->l = ncol;
849 line->is_longer (1); 886 line->is_longer (1);
… …
851 row = screen.cur.row; 888 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 889 line = &ROW(row); /* _must_ refresh */
853 } 890 }
854 891
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 892 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 893 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 894 c = 0xfffd;
858 895
859 // rely on wcwidth to tell us the character width, do wcwidth before 896 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 897 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 898 // drawing characters below as they might be invalid in the current
862 // locale. 899 // locale.
863 int width = WCWIDTH (c); 900 int width = WCWIDTH (c);
864 901
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 902 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 903 {
867 // vt100 special graphics and line drawing 904 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 905 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 906 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 907 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 920 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 921 width = 1; // vt100 line drawing characters are always single-width
885 } 922 }
886 } 923 }
887 924
888 if (expect_false (screen.flags & Screen_Insert)) 925 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 926 scr_insdel_chars (width, INSERT);
890 927
891 if (width != 0) 928 if (width != 0)
892 { 929 {
893#if !UNICODE_3 930#if !UNICODE_3
… …
901#endif 938#endif
902 939
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 940 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 941
905 // if the character doesn't fit into the remaining columns... 942 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 943 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 944 {
908 if (screen.flags & Screen_Autowrap) 945 if (screen.flags & Screen_Autowrap)
909 { 946 {
910 // ... artificially enlargen the previous one 947 // ... artificially enlargen the previous one
911 c = NOCHAR; 948 c = NOCHAR;
… …
918 955
919 // nuke the character at this position, if required 956 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 957 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 958 // we never have to check for overwriting a wide char itself,
922 // only its tail. 959 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 960 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 961 scr_kill_char (*line, screen.cur.col);
925 962
926 line->touch (); 963 line->touch ();
927 964
928 do 965 do
929 { 966 {
930 line->t[screen.cur.col] = c; 967 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 968 line->r[screen.cur.col] = rend;
932 969
933 if (expect_true (screen.cur.col < ncol - 1)) 970 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 971 screen.cur.col++;
935 else 972 else
936 { 973 {
937 line->l = ncol; 974 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 975 if (screen.flags & Screen_Autowrap)
… …
941 goto end_of_line; 978 goto end_of_line;
942 } 979 }
943 980
944 c = NOCHAR; 981 c = NOCHAR;
945 } 982 }
946 while (expect_false (--width > 0)); 983 while (ecb_unlikely (--width > 0));
947 984
948 // pad with spaces when overwriting wide character with smaller one 985 // pad with spaces when overwriting wide character with smaller one
949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 986 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 987 {
951 line->t[c] = ' '; 988 line->t[c] = ' ';
952 line->r[c] = rend; 989 line->r[c] = rend;
953 } 990 }
954 991
… …
976 } 1013 }
977 else if (screen.cur.row > 0 1014 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ()) 1015 && ROW(screen.cur.row - 1).is_longer ())
979 { 1016 {
980 linep = &ROW(screen.cur.row - 1); 1017 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1; 1018 tp = linep->t + ncol - 1;
982 rp = line->r + ncol - 1; 1019 rp = linep->r + ncol - 1;
983 } 1020 }
984 else 1021 else
985 continue; 1022 continue;
986 1023
987 linep->touch (); 1024 linep->touch ();
… …
1010/* 1047/*
1011 * Process Backspace. Move back the cursor back a position, wrap if have to 1048 * Process Backspace. Move back the cursor back a position, wrap if have to
1012 * XTERM_SEQ: CTRL-H 1049 * XTERM_SEQ: CTRL-H
1013 */ 1050 */
1014void 1051void
1015rxvt_term::scr_backspace () NOTHROW 1052rxvt_term::scr_backspace () noexcept
1016{ 1053{
1017 if (screen.cur.col == 0) 1054 if (screen.cur.col == 0)
1018 { 1055 {
1019 if (screen.cur.row > 0) 1056 if (screen.cur.row > 0)
1020 { 1057 {
… …
1037 * Process Horizontal Tab 1074 * Process Horizontal Tab
1038 * count: +ve = forward; -ve = backwards 1075 * count: +ve = forward; -ve = backwards
1039 * XTERM_SEQ: CTRL-I 1076 * XTERM_SEQ: CTRL-I
1040 */ 1077 */
1041void 1078void
1042rxvt_term::scr_tab (int count, bool ht) NOTHROW 1079rxvt_term::scr_tab (int count, bool ht) noexcept
1043{ 1080{
1044 int i, x; 1081 int i, x;
1045 1082
1046 want_refresh = 1; 1083 want_refresh = 1;
1047 i = x = screen.cur.col; 1084 i = x = screen.cur.col;
… …
1113 * XTERM_SEQ: ESC 6 1150 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1151 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1152 * in that row right. Clear left column.
1116 */ 1153 */
1117#if !ENABLE_MINIMAL 1154#if !ENABLE_MINIMAL
1118void 1155void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1156rxvt_term::scr_backindex () noexcept
1120{ 1157{
1121 if (screen.cur.col > 0) 1158 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1159 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1160 else
1124 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
… …
1130 * XTERM_SEQ: ESC 9 1167 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1168 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1169 * in that row left. Clear right column.
1133 */ 1170 */
1134#if !ENABLE_MINIMAL 1171#if !ENABLE_MINIMAL
1135void 1172void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1173rxvt_term::scr_forwardindex () noexcept
1137{ 1174{
1138 if (screen.cur.col < ncol - 1) 1175 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1176 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1177 else
1141 { 1178 {
… …
1154/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1155/* 1192/*
1156 * Goto Row/Column 1193 * Goto Row/Column
1157 */ 1194 */
1158void 1195void
1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1196rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1160{ 1197{
1161 want_refresh = 1; 1198 want_refresh = 1;
1162 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1163 1200
1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1203/* ------------------------------------------------------------------------- */ 1240/* ------------------------------------------------------------------------- */
1204/* 1241/*
1205 * direction should be UP or DN 1242 * direction should be UP or DN
1206 */ 1243 */
1207void 1244void
1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1245rxvt_term::scr_index (enum page_dirn direction) noexcept
1209{ 1246{
1210 int dirn;
1211
1212 want_refresh = 1; 1247 want_refresh = 1;
1213 ZERO_SCROLLBACK (); 1248 ZERO_SCROLLBACK ();
1214 1249
1215 dirn = ((direction == UP) ? 1 : -1);
1216
1217 screen.flags &= ~Screen_WrapNext; 1250 screen.flags &= ~Screen_WrapNext;
1218 1251
1219 if ((screen.cur.row == screen.bscroll && direction == UP) 1252 if ((screen.cur.row == screen.bscroll && direction == UP)
1220 || (screen.cur.row == screen.tscroll && direction == DN)) 1253 || (screen.cur.row == screen.tscroll && direction == DN))
1221 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1254 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1222 else 1255 else
1223 screen.cur.row += dirn; 1256 screen.cur.row += direction;
1224 1257
1225 clamp_it (screen.cur.row, 0, nrow - 1); 1258 clamp_it (screen.cur.row, 0, nrow - 1);
1226 selection_check (0); 1259 selection_check (0);
1227} 1260}
1228 1261
… …
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K 1268 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1269 */
1237void 1270void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1271rxvt_term::scr_erase_line (int mode) noexcept
1239{ 1272{
1240 unsigned int col, num; 1273 unsigned int col, num;
1241 1274
1242 want_refresh = 1; 1275 want_refresh = 1;
1243 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
… …
1291 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1292} 1325}
1293 1326
1294/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1295/* 1328/*
1296 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1333 */
1301void 1334void
1302rxvt_term::scr_erase_screen (int mode) NOTHROW 1335rxvt_term::scr_erase_screen (int mode) noexcept
1303{ 1336{
1304 int num; 1337 int num;
1305 int32_t row; 1338 int32_t row;
1306 rend_t ren; 1339 rend_t ren;
1307 XGCValues gcvalue; 1340 XGCValues gcvalue;
… …
1310 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1311 1344
1312 switch (mode) 1345 switch (mode)
1313 { 1346 {
1314 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1348 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1350 num = nrow - row;
1319 break; 1351 break;
1320 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1353 scr_erase_line (1);
1323 row = 0; 1354 row = 0;
1324 num = screen.cur.row; 1355 num = screen.cur.row;
1325 break; 1356 break;
1326 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1358 row = 0;
1329 num = nrow; 1359 num = nrow;
1330 break; 1360 break;
1331 default: 1361 default:
1332 return; 1362 return;
… …
1349 { 1379 {
1350 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1351 1381
1352 if (mapped) 1382 if (mapped)
1353 XClearArea (dpy, vt, 0, 1383 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width, 1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num), False); 1385 (unsigned int)Height2Pixel (num), False);
1356 } 1386 }
1357 else 1387 else
1358 { 1388 {
1359 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1362 { 1392 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1395 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start), 1396 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1397 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1398 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 } 1401 }
1372 } 1402 }
… …
1380 } 1410 }
1381} 1411}
1382 1412
1383#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1384void 1414void
1385rxvt_term::scr_erase_savelines () NOTHROW 1415rxvt_term::scr_erase_savelines () noexcept
1386{ 1416{
1387 want_refresh = 1; 1417 want_refresh = 1;
1388 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1389 1419
1390 top_row = 0; 1420 top_row = 0;
… …
1394/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1395/* 1425/*
1396 * Fill the screen with `E's 1426 * Fill the screen with `E's
1397 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1398 */ 1428 */
1399void 1429void ecb_cold
1400rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () noexcept
1401{ 1431{
1402 rend_t fs; 1432 rend_t fs;
1403 1433
1404 want_refresh = 1; 1434 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1406 1436
1407 num_scr_allow = 0; 1437 num_scr_allow = 0;
1408 selection_check (3); 1438
1439 row_col_t pos;
1440 pos.row = pos.col = 0;
1441 if (ROWCOL_IS_AFTER (selection.end, pos))
1442 CLEAR_SELECTION ();
1409 1443
1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1412 { 1446 {
1413 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1426/* ------------------------------------------------------------------------- */ 1460/* ------------------------------------------------------------------------- */
1427/* 1461/*
1428 * Insert/Delete <count> lines 1462 * Insert/Delete <count> lines
1429 */ 1463 */
1430void 1464void
1431rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1432{ 1466{
1433 int end; 1467 int end;
1434 1468
1435 ZERO_SCROLLBACK (); 1469 ZERO_SCROLLBACK ();
1436 1470
… …
1456/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
1457/* 1491/*
1458 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1459 */ 1493 */
1460void 1494void
1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1495rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1462{ 1496{
1463 want_refresh = 1; 1497 want_refresh = 1;
1464 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1465 1499
1466 if (count <= 0) 1500 if (count <= 0)
… …
1564/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1565/* 1599/*
1566 * Set the scrolling region 1600 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1602 */
1569void 1603void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) noexcept
1571{ 1605{
1572 max_it (top, 0); 1606 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1574 1608
1575 if (top > bot) 1609 if (top > bot)
… …
1584/* 1618/*
1585 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1622 */
1589void 1623void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) noexcept
1591{ 1625{
1592 want_refresh = 1; 1626 want_refresh = 1;
1593 1627
1594 if (mode) 1628 if (mode)
1595 screen.flags |= Screen_VisibleCursor; 1629 screen.flags |= Screen_VisibleCursor;
… …
1601/* 1635/*
1602 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1639 */
1606void 1640void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) noexcept
1608{ 1642{
1609 if (mode) 1643 if (mode)
1610 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1611 else 1645 else
1612 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1646 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1620 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1621 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1658 */
1625void 1659void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) noexcept
1627{ 1661{
1628 if (mode) 1662 if (mode)
1629 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1630 else 1664 else
1631 screen.flags &= ~Screen_Relative; 1665 screen.flags &= ~Screen_Relative;
… …
1637/* 1671/*
1638 * Set insert/replace mode 1672 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1675 */
1642void 1676void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) noexcept
1644{ 1678{
1645 if (mode) 1679 if (mode)
1646 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1647 else 1681 else
1648 screen.flags &= ~Screen_Insert; 1682 screen.flags &= ~Screen_Insert;
… …
1653 * Set/Unset tabs 1687 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1691 */
1658void 1692void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) noexcept
1660{ 1694{
1661 if (mode < 0) 1695 if (mode < 0)
1662 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
1664 tabs [screen.cur.col] = !!mode; 1698 tabs [screen.cur.col] = !!mode;
… …
1669 * Set reverse/normal video 1703 * Set reverse/normal video
1670 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1704 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1671 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1705 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1672 */ 1706 */
1673void 1707void
1674rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1708rxvt_term::scr_rvideo_mode (bool on) noexcept
1675{ 1709{
1676 rvideo_mode = on; 1710 rvideo_mode = on;
1677 1711
1678#ifndef NO_BELL 1712#ifndef NO_BELL
1679 on ^= rvideo_bell; 1713 on ^= rvideo_bell;
… …
1681 1715
1682 if (rvideo_state != on) 1716 if (rvideo_state != on)
1683 { 1717 {
1684 rvideo_state = on; 1718 rvideo_state = on;
1685 1719
1720#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade])
1722 {
1723 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1724 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1725 }
1726 else
1727#endif
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1728 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1729#ifdef HAVE_IMG
1688 if (bg_pixmap == None) 1730 if (bg_img == 0)
1689#endif 1731#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1732 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1733
1692 XGCValues gcvalue; 1734 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1735 gcvalue.foreground = pix_colors[Color_fg];
… …
1702/* ------------------------------------------------------------------------- */ 1744/* ------------------------------------------------------------------------- */
1703/* 1745/*
1704 * Report current cursor position 1746 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1747 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1748 */
1707void 1749void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1750rxvt_term::scr_report_position () noexcept
1709{ 1751{
1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1752 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711} 1753}
1712 1754
1713/* ------------------------------------------------------------------------- * 1755/* ------------------------------------------------------------------------- *
… …
1715 * ------------------------------------------------------------------------- */ 1757 * ------------------------------------------------------------------------- */
1716 1758
1717/* 1759/*
1718 * Set font style 1760 * Set font style
1719 */ 1761 */
1720void 1762void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1763rxvt_term::set_font_style () noexcept
1722{ 1764{
1723#if 0 1765#if 0
1724 switch (charsets [screen.charset]) 1766 switch (charsets [screen.charset])
1725 { 1767 {
1726 case '0': /* DEC Special Character & Line Drawing Set */ 1768 case '0': /* DEC Special Character & Line Drawing Set */
… …
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1789 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1790 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1791 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1792 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1793 */
1752void 1794void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1795rxvt_term::scr_charset_choose (int set) noexcept
1754{ 1796{
1755 screen.charset = set; 1797 screen.charset = set;
1756 set_font_style (); 1798 set_font_style ();
1757} 1799}
1758 1800
… …
1764 * XTERM_SEQ: Set G2 character set: ESC * <C> 1806 * XTERM_SEQ: Set G2 character set: ESC * <C>
1765 * XTERM_SEQ: Set G3 character set: ESC + <C> 1807 * XTERM_SEQ: Set G3 character set: ESC + <C>
1766 * See set_font_style for possible values for <C> 1808 * See set_font_style for possible values for <C>
1767 */ 1809 */
1768void 1810void
1769rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1811rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1770{ 1812{
1771 charsets[set] = (unsigned char)ch; 1813 charsets[set] = (unsigned char)ch;
1772 set_font_style (); 1814 set_font_style ();
1773} 1815}
1774 1816
… …
1778 * ------------------------------------------------------------------------- */ 1820 * ------------------------------------------------------------------------- */
1779 1821
1780/* 1822/*
1781 * refresh matching text. 1823 * refresh matching text.
1782 */ 1824 */
1783bool 1825bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1826rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1785{ 1827{
1786 bool found = false; 1828 bool found = false;
1787 1829
1788 for (int i = 0; i < nrow; i++) 1830 for (int i = 0; i < nrow; i++)
1789 { 1831 {
… …
1807 PART_BEG = 0, 1849 PART_BEG = 0,
1808 PART_END, 1850 PART_END,
1809 RC_COUNT 1851 RC_COUNT
1810}; 1852};
1811 1853
1812void 1854void ecb_hot
1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1855rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1814{ 1856{
1815 int i; 1857 int i;
1816 row_col_t rc[RC_COUNT]; 1858 row_col_t rc[RC_COUNT];
1817 1859
1818 if (!drawn_buf) /* sanity check */ 1860 if (!drawn_buf) /* sanity check */
… …
1852/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1853/* 1895/*
1854 * Refresh the entire screen 1896 * Refresh the entire screen
1855 */ 1897 */
1856void 1898void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1899rxvt_term::scr_touch (bool refresh) noexcept
1858{ 1900{
1859 scr_expose (0, 0, width, height, refresh); 1901 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1902}
1861 1903
1862/* ------------------------------------------------------------------------- */ 1904/* ------------------------------------------------------------------------- */
1863/* 1905/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1906 * Move the display so that the line represented by scrollbar value Y is at
1865 * the top of the screen 1907 * the top of the screen
1866 */ 1908 */
1867void 1909void
1868rxvt_term::scr_move_to (int y, int len) NOTHROW 1910rxvt_term::scr_move_to (int y, int len) noexcept
1869{ 1911{
1870 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1912 // lerp (y, 0, len, top_row, nrow - 1)
1913 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1871} 1914}
1872 1915
1873/* ------------------------------------------------------------------------- */ 1916/* ------------------------------------------------------------------------- */
1874/* 1917/*
1875 * Page the screen up/down nlines 1918 * Page the screen up/down nlines
1876 * direction should be UP or DN 1919 * direction should be UP or DN
1877 */ 1920 */
1878bool 1921bool
1879rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1922rxvt_term::scr_page (int nlines) noexcept
1880{ 1923{
1881 int new_view_start =
1882 direction == UP ? view_start - nlines
1883 : view_start + nlines;
1884
1885 return scr_changeview (new_view_start); 1924 return scr_changeview (view_start - nlines);
1886} 1925}
1887 1926
1888bool 1927bool
1889rxvt_term::scr_changeview (int new_view_start) NOTHROW 1928rxvt_term::scr_changeview (int new_view_start) noexcept
1890{ 1929{
1891 clamp_it (new_view_start, top_row, 0); 1930 clamp_it (new_view_start, top_row, 0);
1892 1931
1893 if (new_view_start == view_start) 1932 if (new_view_start == view_start)
1894 return false; 1933 return false;
… …
1912} 1951}
1913#endif 1952#endif
1914 1953
1915/* ------------------------------------------------------------------------- */ 1954/* ------------------------------------------------------------------------- */
1916void 1955void
1917rxvt_term::scr_bell () NOTHROW 1956rxvt_term::scr_bell () noexcept
1918{ 1957{
1919#ifndef NO_BELL 1958#ifndef NO_BELL
1920 1959
1921# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1962 if (option (Opt_mapAlert))
1924# endif 1963# endif
1925 XMapWindow (dpy, parent[0]); 1964 XMapWindow (dpy, parent);
1926# endif 1965# endif
1927 1966
1928# if ENABLE_FRILLS 1967# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1968 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1969 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1983#endif
1945} 1984}
1946 1985
1947/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */ 1987void ecb_cold
1949void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) noexcept
1951{ 1989{
1952#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1953 int nrows, row_start; 1991 int nrows, row_start;
1954 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
1955 1993
… …
2003/* 2041/*
2004 * Refresh the screen 2042 * Refresh the screen
2005 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
2006 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
2007 */ 2045 */
2008void 2046void ecb_hot
2009rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () noexcept
2010{ 2048{
2011 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2012 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2013 int i; /* tmp */ 2051 int i; /* tmp */
2014#ifndef NO_CURSORCOLOR
2015 rend_t cc1; /* store colours at cursor position (s) */
2016#endif
2017 rend_t *crp; // cursor rendition pointer
2018 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
2019 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2056 int cursorwidth;
2020 2057
2021 want_refresh = 0; /* screen is current */ 2058 want_refresh = 0; /* screen is current */
2022 2059
2023 if (refresh_type == NO_REFRESH || !mapped) 2060 if (refresh_type == NO_REFRESH || !mapped)
2024 return; 2061 return;
… …
2027 * A: set up vars 2064 * A: set up vars
2028 */ 2065 */
2029 refresh_count = 0; 2066 refresh_count = 0;
2030 2067
2031 unsigned int old_screen_flags = screen.flags; 2068 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2069 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2070#ifdef HAVE_IMG
2034 have_bg = bg_pixmap != None; 2071 have_bg = bg_img != 0;
2035#endif 2072#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2073 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2074
2038 /* 2075 /*
2039 * B: reverse any characters which are selected 2076 * B: reverse any characters which are selected
… …
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2080 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2081#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2082 scr_swap_overlay ();
2046#endif 2083#endif
2047 2084
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2085 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2086
2050 /* 2087 /*
2051 * C: set the cursor character (s) 2088 * C: set the cursor character (s)
2052 */ 2089 */
2053 { 2090 {
2054 unsigned char setoldcursor;
2055
2056#ifdef CURSOR_BLINK 2091#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2092 if (hidden_cursor)
2058 showcursor = 0; 2093 showcursor = 0;
2059#endif 2094#endif
2060 2095
… …
2063 int col = screen.cur.col; 2098 int col = screen.cur.col;
2064 2099
2065 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2100 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2066 col--; 2101 col--;
2067 2102
2103 cursorwidth = 1;
2104 while (col + cursorwidth < ncol
2105 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2106 cursorwidth++;
2107
2068 crp = &ROW(screen.cur.row).r[col]; 2108 cur_rend = ROW(screen.cur.row).r[col];
2109 cur_col = col;
2069 2110
2070#ifndef NO_CURSORCOLOR 2111#ifndef NO_CURSORCOLOR
2071 cc1 = *crp & (RS_fgMask | RS_bgMask);
2072 if (ISSET_PIXCOLOR (Color_cursor)) 2112 if (ISSET_PIXCOLOR (Color_cursor))
2073 ccol1 = Color_cursor; 2113 ccol1 = Color_cursor;
2074 else 2114 else
2075#endif 2115#endif
2076#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2116#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2088 ccol2 = bgcolor_of (rstyle); 2128 ccol2 = bgcolor_of (rstyle);
2089#else 2129#else
2090 ccol2 = Color_bg; 2130 ccol2 = Color_bg;
2091#endif 2131#endif
2092 2132
2093 if (focus) 2133 if (focus && cursor_type == 0)
2094 { 2134 {
2095 if (option (Opt_cursorUnderline)) 2135 rend_t rend = cur_rend;
2096 *crp ^= RS_Uline; 2136
2097 else
2098 {
2099 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2100 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2101 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2102 } 2140
2141 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2103 } 2142 }
2104 } 2143 }
2105 2144
2106 /* make sure no outline cursor is left around */ 2145 /* make sure no outline cursor is left around */
2107 setoldcursor = 0; 2146 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2108 if (ocrow != -1) 2147 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2148
2149 // save the current cursor coordinates if the cursor is visible
2150 // and either the window is unfocused or the cursor style is
2151 // underline or vertical bar, so as to clear the outline cursor in
2152 // the next refresh if the cursor moves or becomes invisible
2153 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2109 { 2154 {
2110 if (screen.cur.row - view_start != ocrow 2155 oldcursor.row = screen.cur.row - view_start;
2111 || screen.cur.col != oldcursor.col) 2156 oldcursor.col = screen.cur.col;
2112 {
2113 if (ocrow < nrow
2114 && oldcursor.col < ncol)
2115 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2116
2117 if (focus || !showcursor)
2118 oldcursor.row = -1;
2119 else
2120 setoldcursor = 1;
2121 }
2122 } 2157 }
2123 else if (!focus) 2158 else
2124 setoldcursor = 1;
2125
2126 if (setoldcursor)
2127 {
2128 if (screen.cur.row - view_start >= nrow)
2129 oldcursor.row = -1; 2159 oldcursor.row = -1;
2130 else
2131 {
2132 oldcursor.row = screen.cur.row - view_start;
2133 oldcursor.col = screen.cur.col;
2134 }
2135 }
2136 } 2160 }
2137 2161
2138#ifndef NO_SLOW_LINK_SUPPORT 2162#ifndef NO_SLOW_LINK_SUPPORT
2139 /* 2163 /*
2140 * D: CopyArea pass - very useful for slower links 2164 * D: CopyArea pass - very useful for slower links
… …
2146 { 2170 {
2147 int16_t nits; 2171 int16_t nits;
2148 int i = num_scr; 2172 int i = num_scr;
2149 int j; 2173 int j;
2150 int len, wlen; 2174 int len, wlen;
2151 dLocal (int, num_scr);
2152 2175
2153 j = nrow; 2176 j = nrow;
2154 wlen = len = -1; 2177 wlen = len = -1;
2155 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2156 2179
… …
2222 int ypixel = (int)Row2Pixel (row); 2245 int ypixel = (int)Row2Pixel (row);
2223 2246
2224 for (col = 0; col < ncol; col++) 2247 for (col = 0; col < ncol; col++)
2225 { 2248 {
2226 /* compare new text with old - if exactly the same then continue */ 2249 /* compare new text with old - if exactly the same then continue */
2227 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2250 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2228 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2229 || (stp[col] == ' ' /* space w/ no background change */
2230 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2231 continue; 2251 continue;
2232 2252
2233 // redraw one or more characters 2253 // redraw one or more characters
2234 2254
2235 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2257 --col;
2238 2258
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2260 text_t *text = stp + col;
2241 int count = 1; 2261 int count = 1;
… …
2279 2299
2280 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2282 2302
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2305 count++, i--;
2286 2306
2287 /* 2307 /*
2288 * Determine the attributes for the string 2308 * Determine the attributes for the string
2289 */ 2309 */
2290 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2292 2312
2293 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2315 {
2296 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2297 2317
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2408 /*
2389 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2390 */ 2410 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2412
2393 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2414 {
2395 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2396 2416
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2405 did_clear: ; 2425 did_clear: ;
2406 } 2426 }
2407 else 2427 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2429
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2431 {
2432 if (showcursor && focus && row == screen.cur.row
2433 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2434 XSetForeground (dpy, gc, pix_colors[ccol1]);
2435 else
2412#if ENABLE_FRILLS 2436#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2437 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2438 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2439 else
2416#endif 2440#endif
… …
2428 */ 2452 */
2429 if (showcursor) 2453 if (showcursor)
2430 { 2454 {
2431 if (focus) 2455 if (focus)
2432 { 2456 {
2433 if (option (Opt_cursorUnderline)) 2457 if (cursor_type == 0)
2434 *crp ^= RS_Uline; 2458 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435 else 2459 else if (oldcursor.row >= 0)
2436 { 2460 {
2437 *crp ^= RS_RVid; 2461 XSetForeground (dpy, gc, pix_colors[ccol1]);
2438#ifndef NO_CURSORCOLOR 2462 if (cursor_type == 1)
2439 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2463 XFillRectangle (dpy, vt, gc,
2440#endif 2464 Col2Pixel (cur_col),
2465 Row2Pixel (oldcursor.row + 1) - 2,
2466 Width2Pixel (1),
2467 2);
2468 else
2469 XFillRectangle (dpy, vt, gc,
2470 Col2Pixel (cur_col),
2471 Row2Pixel (oldcursor.row),
2472 2,
2473 Height2Pixel (1));
2441 } 2474 }
2442 } 2475 }
2443 else if (oldcursor.row >= 0) 2476 else if (oldcursor.row >= 0)
2444 { 2477 {
2445 int cursorwidth = 1;
2446 int col = oldcursor.col;
2447
2448 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2449 col--;
2450
2451 while (col + cursorwidth < ncol
2452 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2453 cursorwidth++;
2454
2455#ifndef NO_CURSORCOLOR
2456 if (ISSET_PIXCOLOR (Color_cursor))
2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2458 else
2459#endif
2460 XSetForeground (dpy, gc, pix_colors[ccol1]); 2478 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 2479
2462 XDrawRectangle (dpy, vt, gc, 2480 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2481 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row), 2482 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2483 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2484 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2485 }
2468 } 2486 }
2469 2487
2470 /* 2488 /*
2471 * H: cleanup selection 2489 * H: cleanup selection
… …
2480 screen.flags = old_screen_flags; 2498 screen.flags = old_screen_flags;
2481 num_scr = 0; 2499 num_scr = 0;
2482 num_scr_allow = 1; 2500 num_scr_allow = 1;
2483} 2501}
2484 2502
2485void 2503void ecb_cold
2486rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2504rxvt_term::scr_remap_chars (line_t &l) noexcept
2487{ 2505{
2488 if (!l.t) 2506 if (!l.valid ())
2489 return; 2507 return;
2490 2508
2491 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2509 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2492 2510
2493 for (int i = ncol; i--; ) 2511 for (int i = ncol; i--; )
2494 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2512 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2495} 2513}
2496 2514
2497void 2515void ecb_cold
2498rxvt_term::scr_remap_chars () NOTHROW 2516rxvt_term::scr_remap_chars () noexcept
2499{ 2517{
2500 for (int i = total_rows; i--; ) 2518 for (int i = total_rows; i--; )
2501 scr_remap_chars (row_buf [i]); 2519 scr_remap_chars (row_buf [i]);
2502 2520
2503 for (int i = nrow; i--; ) 2521 for (int i = nrow; i--; )
… …
2505 scr_remap_chars (drawn_buf [i]); 2523 scr_remap_chars (drawn_buf [i]);
2506 scr_remap_chars (swap_buf [i]); 2524 scr_remap_chars (swap_buf [i]);
2507 } 2525 }
2508} 2526}
2509 2527
2510void 2528void ecb_cold
2511rxvt_term::scr_recolour (bool refresh) NOTHROW 2529rxvt_term::scr_recolor (bool refresh) noexcept
2512{ 2530{
2513 bool transparent = false; 2531 bool transparent = false;
2514 2532
2515#ifdef HAVE_BG_PIXMAP 2533#ifdef HAVE_IMG
2516 if (bg_pixmap != None) 2534 if (bg_img != 0)
2517 { 2535 {
2518# ifdef ENABLE_TRANSPARENCY 2536# if ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2537 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2538 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2539 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2540 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2541
2524 transparent = true; 2542 transparent = true;
2525 } 2543 }
2526 else 2544 else
2527# endif 2545# endif
2528 { 2546 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2548 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2531 } 2549 }
2532 } 2550 }
2533 else 2551 else
2534#endif 2552#endif
2535 { 2553 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2555 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2556 }
2539 2557
2540 XClearWindow (dpy, parent[0]); 2558 XClearWindow (dpy, parent);
2541 2559
2542 if (scrollBar.win) 2560 if (scrollBar.state && scrollBar.win)
2543 { 2561 {
2544 if (transparent) 2562 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2563 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2564 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2565 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2548 scrollBar.state = STATE_IDLE; 2566 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2567 scrollBar.show (0);
2550 } 2568 }
2551 2569
2552 if (refresh) 2570 if (refresh)
2553 { 2571 {
… …
2557 want_refresh = 1; 2575 want_refresh = 1;
2558} 2576}
2559 2577
2560/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2561void 2579void
2562rxvt_term::scr_clear (bool really) NOTHROW 2580rxvt_term::scr_clear (bool really) noexcept
2563{ 2581{
2564 if (!mapped) 2582 if (!mapped)
2565 return; 2583 return;
2566 2584
2567 num_scr_allow = 0; 2585 num_scr_allow = 0;
… …
2570 if (really) 2588 if (really)
2571 XClearWindow (dpy, vt); 2589 XClearWindow (dpy, vt);
2572} 2590}
2573 2591
2574void 2592void
2575rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2593rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2576{ 2594{
2577 int view_end = view_start + nrow; 2595 int view_end = view_start + nrow;
2578 int row, col; 2596 int row, col;
2579 2597
2580 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2598 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2592 srp[col] ^= rstyle2; 2610 srp[col] ^= rstyle2;
2593 } 2611 }
2594} 2612}
2595 2613
2596void 2614void
2597rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2615rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2598{ 2616{
2599 int view_end = view_start + nrow; 2617 int view_end = view_start + nrow;
2600 int row, col; 2618 int row, col;
2601 2619
2602 if (beg_row >= view_start) 2620 if (beg_row >= view_start)
… …
2618 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2636 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619 srp[col] ^= rstyle; 2637 srp[col] ^= rstyle;
2620} 2638}
2621 2639
2622/* ------------------------------------------------------------------------- */ 2640/* ------------------------------------------------------------------------- */
2623void 2641void ecb_hot
2624rxvt_term::scr_reverse_selection () NOTHROW 2642rxvt_term::scr_reverse_selection () noexcept
2625{ 2643{
2626 if (selection.op 2644 if (selection.op
2627 && current_screen == selection.screen 2645 && current_screen == selection.screen
2628 && selection.end.row >= view_start) 2646 && selection.end.row >= view_start)
2629 { 2647 {
… …
2645 * Dump the whole scrollback and screen to the passed filedescriptor. The 2663 * Dump the whole scrollback and screen to the passed filedescriptor. The
2646 * invoking routine must close the fd. 2664 * invoking routine must close the fd.
2647 */ 2665 */
2648#if 0 2666#if 0
2649void 2667void
2650rxvt_term::scr_dump (int fd) NOTHROW 2668rxvt_term::scr_dump (int fd) noexcept
2651{ 2669{
2652 int row, wrote; 2670 // if this method is needed, it can be implemented by factoring the
2653 unsigned int width, towrite; 2671 // relevant code in scr_printscreen
2654 const char r1[] = "\n";
2655
2656 for (row = saveLines + top_row;
2657 row < saveLines + nrow - 1; row++)
2658 {
2659 width = row_buf[row].l >= 0 ? row_buf[row].l
2660 : ncol;
2661 for (towrite = width; towrite; towrite -= wrote)
2662 {
2663 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2664 towrite);
2665 if (wrote < 0)
2666 return; /* XXX: death, no report */
2667 }
2668 if (row_buf[row].l >= 0)
2669 if (write (fd, r1, 1) <= 0)
2670 return; /* XXX: death, no report */
2671 }
2672} 2672}
2673#endif 2673#endif
2674 2674
2675/* ------------------------------------------------------------------------- * 2675/* ------------------------------------------------------------------------- *
2676 * CHARACTER SELECTION * 2676 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2677 * ------------------------------------------------------------------------- */
2678void 2678void
2679rxvt_term::selection_check (int check_more) NOTHROW 2679rxvt_term::selection_check (int check_more) noexcept
2680{ 2680{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2681 if (!selection.op)
2684 return; 2682 return;
2685 2683
2686 pos.row = pos.col = 0;
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2684 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2686 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2687 || (check_more == 1
2691 && current_screen == selection.screen 2688 && current_screen == selection.screen
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2689 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2690 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2694 || (check_more == 2
2695 && ROWCOL_IS_BEFORE (selection.beg, pos)
2696 && ROWCOL_IS_AFTER (selection.end, pos))
2697 || (check_more == 3
2698 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 4 /* screen width change */
2700 && (selection.beg.row != selection.end.row
2701 || selection.end.col > ncol)))
2702 CLEAR_SELECTION (); 2691 CLEAR_ALL_SELECTION ();
2692}
2693
2694void
2695rxvt_term::selection_changed () noexcept
2696{
2697 line_t &r1 = ROW (selection.beg.row);
2698 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2699 ++selection.beg.col;
2700
2701 line_t &r2 = ROW (selection.end.row);
2702 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2703 ++selection.end.col;
2704
2705 want_refresh = 1;
2703} 2706}
2704 2707
2705/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2706/* 2709/*
2707 * Paste a selection direct to the command fd 2710 * Paste a selection direct to the command fd
2708 */ 2711 */
2709void 2712void
2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2713rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2711{ 2714{
2712 /* convert normal newline chars into common keyboard Return key sequence */ 2715 /* convert normal newline chars into common keyboard Return key sequence */
2713 for (unsigned int i = 0; i < len; i++) 2716 for (unsigned int i = 0; i < len; i++)
2714 if (data[i] == C0_LF) 2717 if (data[i] == C0_LF)
2715 data[i] = C0_CR; 2718 data[i] = C0_CR;
2716 2719
2717 if (priv_modes & PrivMode_BracketPaste) 2720 #if ENABLE_FRILLS
2721 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2718 tt_printf ("\e[200~"); 2722 tt_printf ("\x1b[200~");
2723 #endif
2719 2724
2720 tt_write (data, len); 2725 tt_write (data, len);
2721 2726
2722 if (priv_modes & PrivMode_BracketPaste) 2727 #if ENABLE_FRILLS
2728 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2723 tt_printf ("\e[201~"); 2729 tt_printf ("\x1b[201~");
2730 #endif
2724} 2731}
2725 2732
2726void 2733void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW 2734rxvt_term::paste (char *data, unsigned int len) noexcept
2728{ 2735{
2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2736 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2730 return; 2737 return;
2731 2738
2732 tt_paste (data, len); 2739 tt_paste (data, len);
2733} 2740}
2734 2741
2735/* ------------------------------------------------------------------------- */ 2742/* ------------------------------------------------------------------------- */
2736/* 2743/*
2737 * Request the current selection: 2744 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2745 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2746 * as fallback
2740 * > CUT_BUFFER0
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2747 * EXT: button 2 release
2744 */ 2748 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 if (data)
2750 {
2751 rxvt_term *term = (rxvt_term *)ptr;
2752 term->paste (data, len);
2753 }
2754 delete rs;
2755}
2756
2757void 2749void
2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) noexcept
2759{ 2751{
2760 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2761 {
2762 /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste (str, strlen (str));
2765 free (str);
2766 return;
2767 } 2753 {
2768 else
2769 {
2770 new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2771 } 2756 }
2772} 2757}
2773 2758
2774/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2775/* 2760/*
2776 * Clear all selected text 2761 * Clear all selected text
2777 * EXT: SelectionClear 2762 * EXT: SelectionClear
2778 */ 2763 */
2779void 2764void
2780rxvt_term::selection_clear (bool clipboard) NOTHROW 2765rxvt_term::selection_clear (bool clipboard) noexcept
2781{ 2766{
2782 if (!clipboard) 2767 if (!clipboard)
2783 { 2768 {
2784 want_refresh = 1; 2769 want_refresh = 1;
2785 free (selection.text); 2770 free (selection.text);
… …
2870 if (*t == NOCHAR) 2855 if (*t == NOCHAR)
2871 t++; 2856 t++;
2872#if ENABLE_COMBINING 2857#if ENABLE_COMBINING
2873 else if (IS_COMPOSE (*t)) 2858 else if (IS_COMPOSE (*t))
2874 { 2859 {
2875 int len = rxvt_composite.expand (*t, 0); 2860 int len = rxvt_composite.expand (*t);
2876 2861
2877 extra -= (len - 1); 2862 extra -= (len - 1);
2878 2863
2879 if (extra < 0) 2864 if (extra < 0)
2880 { 2865 {
… …
2927 2912
2928 selection_grab (tm); 2913 selection_grab (tm);
2929} 2914}
2930 2915
2931bool 2916bool
2932rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2933{ 2918{
2934 Atom sel; 2919 Atom sel;
2935 2920
2936 if (!clipboard) 2921 if (!clipboard)
2937 { 2922 {
… …
2970/* ------------------------------------------------------------------------- */ 2955/* ------------------------------------------------------------------------- */
2971/* 2956/*
2972 * Mark or select text based upon number of clicks: 1, 2, or 3 2957 * Mark or select text based upon number of clicks: 1, 2, or 3
2973 * EXT: button 1 press 2958 * EXT: button 1 press
2974 */ 2959 */
2975void 2960void ecb_cold
2976rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2961rxvt_term::selection_click (int clicks, int x, int y) noexcept
2977{ 2962{
2978 clicks = ((clicks - 1) % 3) + 1; 2963 clicks = ((clicks - 1) % 3) + 1;
2979 selection.clicks = clicks; /* save clicks so extend will work */ 2964 selection.clicks = clicks; /* save clicks so extend will work */
2980 2965
2981 if (clicks == 2 && !selection.rect 2966 if (clicks == 2 && !selection.rect
… …
2999 2984
3000/* ------------------------------------------------------------------------- */ 2985/* ------------------------------------------------------------------------- */
3001/* 2986/*
3002 * Mark a selection at the specified col/row 2987 * Mark a selection at the specified col/row
3003 */ 2988 */
3004void 2989void ecb_cold
3005rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2990rxvt_term::selection_start_colrow (int col, int row) noexcept
3006{ 2991{
3007 want_refresh = 1; 2992 want_refresh = 1;
3008 2993
3009 selection.mark.row = row + view_start; 2994 selection.mark.row = row + view_start;
3010 selection.mark.col = col; 2995 selection.mark.col = col;
… …
3032 * Word select: select text for 2 clicks 3017 * Word select: select text for 2 clicks
3033 * We now only find out the boundary in one direction 3018 * We now only find out the boundary in one direction
3034 */ 3019 */
3035 3020
3036/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3021/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3037#define DELIMIT_TEXT(x) \ 3022#define DELIMIT_TEXT(x) \
3038 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3023 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3039#define DELIMIT_REND(x) 1 3024#define DELIMIT_REND(x) 1
3040 3025
3041void 3026void ecb_cold
3042rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3027rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3043{ 3028{
3044 int col, row, dirnadd, tcol, trow, w1, w2; 3029 int col, row, dirnadd, tcol, trow, w1, w2;
3045 row_col_t bound; 3030 row_col_t bound;
3046 text_t *stp; 3031 text_t *stp;
3047 rend_t *srp; 3032 rend_t *srp;
… …
3120 * EXT: button 3 press; button 1 or 3 drag 3105 * EXT: button 3 press; button 1 or 3 drag
3121 * flag == 0 ==> button 1 3106 * flag == 0 ==> button 1
3122 * flag == 1 ==> button 3 press 3107 * flag == 1 ==> button 3 press
3123 * flag == 2 ==> button 3 motion 3108 * flag == 2 ==> button 3 motion
3124 */ 3109 */
3125void 3110void ecb_cold
3126rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3111rxvt_term::selection_extend (int x, int y, int flag) noexcept
3127{ 3112{
3128 int col = clamp (Pixel2Col (x), 0, ncol); 3113 int col = clamp (Pixel2Col (x), 0, ncol);
3129 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3114 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3130 3115
3131 /* 3116 /*
… …
3156 3141
3157/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3158/* 3143/*
3159 * Extend the selection to the specified col/row 3144 * Extend the selection to the specified col/row
3160 */ 3145 */
3161void 3146void ecb_cold
3162rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3147rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3163{ 3148{
3164 row_col_t pos; 3149 row_col_t pos;
3165 enum { 3150 enum {
3166 LEFT, RIGHT 3151 LEFT, RIGHT
3167 } closeto = RIGHT; 3152 } closeto = RIGHT;
3168
3169 want_refresh = 1;
3170 3153
3171 switch (selection.op) 3154 switch (selection.op)
3172 { 3155 {
3173 case SELECTION_INIT: 3156 case SELECTION_INIT:
3174 CLEAR_SELECTION (); 3157 CLEAR_SELECTION ();
… …
3354 3337
3355#if !ENABLE_MINIMAL 3338#if !ENABLE_MINIMAL
3356 if (selection.rect && selection.beg.col > selection.end.col) 3339 if (selection.rect && selection.beg.col > selection.end.col)
3357 ::swap (selection.beg.col, selection.end.col); 3340 ::swap (selection.beg.col, selection.end.col);
3358#endif 3341#endif
3342
3343 selection_changed ();
3359} 3344}
3360 3345
3361#if !ENABLE_MINIMAL 3346#if !ENABLE_MINIMAL
3362void 3347void ecb_cold
3363rxvt_term::selection_remove_trailing_spaces () NOTHROW 3348rxvt_term::selection_remove_trailing_spaces () noexcept
3364{ 3349{
3365 int32_t end_col, end_row; 3350 int32_t end_col, end_row;
3366 text_t *stp; 3351 text_t *stp;
3367 3352
3368 end_col = selection.end.col; 3353 end_col = selection.end.col;
… …
3405/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3406/* 3391/*
3407 * Double click on button 3 when already selected 3392 * Double click on button 3 when already selected
3408 * EXT: button 3 double click 3393 * EXT: button 3 double click
3409 */ 3394 */
3410void 3395void ecb_cold
3411rxvt_term::selection_rotate (int x, int y) NOTHROW 3396rxvt_term::selection_rotate (int x, int y) noexcept
3412{ 3397{
3413 selection.clicks = selection.clicks % 3 + 1; 3398 selection.clicks = selection.clicks % 3 + 1;
3414 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3399 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3415} 3400}
3416 3401
3417/* ------------------------------------------------------------------------- */ 3402/* ------------------------------------------------------------------------- */
3418/* 3403/*
3419 * Respond to a request for our current selection 3404 * Respond to a request for our current selection
3420 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3421 */ 3406 */
3422void 3407void ecb_cold
3423rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3424{ 3409{
3410 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3411 XSelectionEvent ev;
3426 3412
3427 ev.type = SelectionNotify; 3413 ev.type = SelectionNotify;
3428 ev.property = None; 3414 ev.property = None;
3429 ev.display = rq.display; 3415 ev.display = rq.display;
… …
3444 *target++ = xa[XA_COMPOUND_TEXT]; 3430 *target++ = xa[XA_COMPOUND_TEXT];
3445#if X_HAVE_UTF8_STRING 3431#if X_HAVE_UTF8_STRING
3446 *target++ = xa[XA_UTF8_STRING]; 3432 *target++ = xa[XA_UTF8_STRING];
3447#endif 3433#endif
3448 3434
3449 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3435 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3450 32, PropModeReplace, 3436 32, PropModeReplace,
3451 (unsigned char *)target_list, target - target_list); 3437 (unsigned char *)target_list, target - target_list);
3452 ev.property = rq.property; 3438 ev.property = property;
3453 } 3439 }
3454#if TODO // TODO 3440#if TODO // TODO
3455 else if (rq.target == xa[XA_MULTIPLE]) 3441 else if (rq.target == xa[XA_MULTIPLE])
3456 { 3442 {
3457 /* TODO: Handle MULTIPLE */ 3443 /* TODO: Handle MULTIPLE */
3458 } 3444 }
3459#endif 3445#endif
3460 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3446 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3461 { 3447 {
3462 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3448 XChangeProperty (dpy, rq.requestor, property, rq.target,
3463 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3449 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3464 ev.property = rq.property; 3450 ev.property = property;
3465 } 3451 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3452 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3467 { 3453 {
3468 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3454 XChangeProperty (dpy, rq.requestor, property, rq.target,
3469 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3455 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3470 ev.property = rq.property; 3456 ev.property = property;
3471 } 3457 }
3472 else if (rq.target == XA_STRING 3458 else if (rq.target == XA_STRING
3473 || rq.target == xa[XA_TEXT] 3459 || rq.target == xa[XA_TEXT]
3474 || rq.target == xa[XA_COMPOUND_TEXT] 3460 || rq.target == xa[XA_COMPOUND_TEXT]
3475 || rq.target == xa[XA_UTF8_STRING] 3461 || rq.target == xa[XA_UTF8_STRING]
… …
3519 cl = selection.clip_text; 3505 cl = selection.clip_text;
3520 selectlen = selection.clip_len; 3506 selectlen = selection.clip_len;
3521 } 3507 }
3522 else 3508 else
3523 { 3509 {
3524 cl = L""; 3510 cl = (wchar_t *)L"";
3525 selectlen = 0; 3511 selectlen = 0;
3526 } 3512 }
3527 3513
3528#if !ENABLE_MINIMAL 3514#if !ENABLE_MINIMAL
3529 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3515 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3546 ct.value = (unsigned char *)cl; 3532 ct.value = (unsigned char *)cl;
3547 ct.nitems = selectlen; 3533 ct.nitems = selectlen;
3548 ct.encoding = target; 3534 ct.encoding = target;
3549 } 3535 }
3550 3536
3551 XChangeProperty (dpy, rq.requestor, rq.property, 3537 XChangeProperty (dpy, rq.requestor, property,
3552 ct.encoding, 8, PropModeReplace, 3538 ct.encoding, 8, PropModeReplace,
3553 ct.value, (int)ct.nitems); 3539 ct.value, (int)ct.nitems);
3554 ev.property = rq.property; 3540 ev.property = property;
3555 3541
3556 if (freect) 3542 if (freect)
3557 XFree (ct.value); 3543 XFree (ct.value);
3558 } 3544 }
3559 3545
3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3546 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3561} 3547}
3562 3548
3563/* ------------------------------------------------------------------------- */ 3549/* ------------------------------------------------------------------------- */
3564#ifdef USE_XIM 3550#if USE_XIM
3565void 3551void ecb_cold
3566rxvt_term::im_set_position (XPoint &pos) NOTHROW 3552rxvt_term::im_set_position (XPoint &pos) noexcept
3567{ 3553{
3568 XWindowAttributes xwa; 3554 XWindowAttributes xwa;
3569 3555
3570 XGetWindowAttributes (dpy, vt, &xwa); 3556 XGetWindowAttributes (dpy, vt, &xwa);
3571 3557
… …
3574} 3560}
3575#endif 3561#endif
3576 3562
3577#if ENABLE_OVERLAY 3563#if ENABLE_OVERLAY
3578void 3564void
3579rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3565rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3580{ 3566{
3581 if (nrow < 1 || ncol < 1) 3567 if (nrow < 1 || ncol < 1)
3582 return; 3568 return;
3583 3569
3584 want_refresh = 1; 3570 want_refresh = 1;
… …
3629 *rp = r; 3615 *rp = r;
3630 } 3616 }
3631} 3617}
3632 3618
3633void 3619void
3634rxvt_term::scr_overlay_off () NOTHROW 3620rxvt_term::scr_overlay_off () noexcept
3635{ 3621{
3636 if (!ov.text) 3622 if (!ov.text)
3637 return; 3623 return;
3638 3624
3639 want_refresh = 1; 3625 want_refresh = 1;
… …
3647 delete [] ov.text; ov.text = 0; 3633 delete [] ov.text; ov.text = 0;
3648 delete [] ov.rend; ov.rend = 0; 3634 delete [] ov.rend; ov.rend = 0;
3649} 3635}
3650 3636
3651void 3637void
3652rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3638rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3653{ 3639{
3654 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3640 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3655 return; 3641 return;
3656 3642
3657 x++, y++; 3643 x++, y++;
… …
3659 ov.text[y][x] = text; 3645 ov.text[y][x] = text;
3660 ov.rend[y][x] = rend; 3646 ov.rend[y][x] = rend;
3661} 3647}
3662 3648
3663void 3649void
3664rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3650rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3665{ 3651{
3666 while (*s) 3652 while (*s)
3667 scr_overlay_set (x++, y, *s++); 3653 scr_overlay_set (x++, y, *s++);
3668} 3654}
3669 3655
3670void 3656void
3671rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3657rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3672{ 3658{
3673 while (*s) 3659 while (*s)
3674 { 3660 {
3675 text_t t = *s++; 3661 text_t t = *s++;
3676 int width = WCWIDTH (t); 3662 int width = WCWIDTH (t);
… …
3682 } 3668 }
3683 } 3669 }
3684} 3670}
3685 3671
3686void 3672void
3687rxvt_term::scr_swap_overlay () NOTHROW 3673rxvt_term::scr_swap_overlay () noexcept
3688{ 3674{
3689 if (!ov.text) 3675 if (!ov.text)
3690 return; 3676 return;
3691 3677
3692 // hide cursor if it is within the overlay area 3678 // hide cursor if it is within the overlay area

Diff Legend

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