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.369 by sf-exg, Sun Feb 6 11:42:03 2011 UTC vs.
Revision 1.470 by root, Mon Aug 8 10:09:49 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;
… …
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));
… …
367 // make sure all terminal lines exist 396 // make sure all terminal lines exist
368 while (top_row > 0) 397 while (top_row > 0)
369 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 398 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
370 } 399 }
371 else 400 else
401#endif
402 {
403 // wing, instead of wrap
372 { 404 do
373 // if no scrollback exists (yet), wing, instead of wrap
374
375 for (int row = min (nrow, prev_nrow); row--; )
376 { 405 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 406 p = MOD (p - 1, prev_total_rows);
378 line_t &qline = row_buf [row]; 407 q--;
379 408
380 qline = pline; 409 copy_line (row_buf [q], prev_row_buf [p]);
381 lresize (qline);
382 } 410 }
411 while (p != pend);
383 412
384 for (int row = prev_nrow; row < nrow; row++) 413 screen.cur.row += nrow - prev_nrow;
385 { 414 term_start = total_rows - nrow;
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 } 415 }
388
389 term_start = 0;
390 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 416
396 clamp_it (screen.cur.row, 0, nrow - 1); 417 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 418 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 419 }
399 420
421 // ensure drawn_buf, swap_buf and terminal rows are all initialized
422 for (int row = nrow; row--; )
423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
427 }
428
429 chunk_free (prev_chunk, prev_chunk_size);
430
400 free (tabs); 431 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 432 tabs = (char *)rxvt_malloc (ncol);
402 433
403 for (int col = ncol; col--; ) 434 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 435 tabs [col] = col % TABSIZE == 0;
… …
411 tt_winch (); 442 tt_winch ();
412 443
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 445}
415 446
416/* ------------------------------------------------------------------------- */ 447void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 448rxvt_term::scr_release () noexcept
422{ 449{
423 if (row_buf) 450 chunk_free (chunk, chunk_size);
424 { 451 chunk = 0;
425 delete talloc; talloc = 0; 452 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 453
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); 454 free (tabs);
434 tabs = 0; 455 tabs = 0;
435 }
436} 456}
437 457
438/* ------------------------------------------------------------------------- */ 458/* ------------------------------------------------------------------------- */
439/* 459/*
440 * Hard/Soft reset 460 * Hard/Soft reset
441 */ 461 */
442void 462void ecb_cold
443rxvt_term::scr_poweron () 463rxvt_term::scr_poweron ()
444{ 464{
445 scr_release (); 465 scr_release ();
466
446 prev_nrow = prev_ncol = 0; 467 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 468 rvideo_mode = false;
448 scr_soft_reset (); 469 scr_soft_reset ();
449 scr_reset (); 470 scr_reset ();
450 471
451 scr_clear (true); 472 scr_clear (true);
452 scr_refresh (); 473 scr_refresh ();
453} 474}
454 475
455void 476void ecb_cold
456rxvt_term::scr_soft_reset () 477rxvt_term::scr_soft_reset () noexcept
457{ 478{
458 /* only affects modes, nothing drastic such as clearing the screen */ 479 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 480#if ENABLE_OVERLAY
460 scr_overlay_off (); 481 scr_overlay_off ();
461#endif 482#endif
… …
475 * Save and Restore cursor 496 * Save and Restore cursor
476 * XTERM_SEQ: Save cursor : ESC 7 497 * XTERM_SEQ: Save cursor : ESC 7
477 * XTERM_SEQ: Restore cursor: ESC 8 498 * XTERM_SEQ: Restore cursor: ESC 8
478 */ 499 */
479void 500void
480rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 501rxvt_term::scr_cursor (cursor_mode mode) noexcept
481{ 502{
482 screen_t *s; 503 screen_t *s;
483 504
484#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 505#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
485 if (current_screen == SECONDARY) 506 if (current_screen == SECONDARY)
… …
516 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
518} 539}
519 540
520void 541void
521rxvt_term::scr_swap_screen () 542rxvt_term::scr_swap_screen () noexcept
522{ 543{
523 if (!option (Opt_secondaryScreen)) 544 if (!option (Opt_secondaryScreen))
524 return; 545 return;
525 546
526 for (int i = prev_nrow; i--; ) 547 for (int i = prev_nrow; i--; )
… …
545 return; 566 return;
546 567
547 want_refresh = 1; 568 want_refresh = 1;
548 view_start = 0; 569 view_start = 0;
549 570
550 selection_check (2); /* check for boundary cross */ 571 /* check for boundary cross */
572 row_col_t pos;
573 pos.row = pos.col = 0;
574 if (ROWCOL_IS_BEFORE (selection.beg, pos)
575 && ROWCOL_IS_AFTER (selection.end, pos))
576 CLEAR_SELECTION ();
551 577
552 current_screen = scrn; 578 current_screen = scrn;
553 579
554#if NSCREENS 580#if NSCREENS
555 if (option (Opt_secondaryScreen)) 581 if (option (Opt_secondaryScreen))
… …
569 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 595 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
570} 596}
571 597
572// clear WrapNext indicator, solidifying position on next line 598// clear WrapNext indicator, solidifying position on next line
573void 599void
574rxvt_term::scr_do_wrap () NOTHROW 600rxvt_term::scr_do_wrap () noexcept
575{ 601{
576 if (!(screen.flags & Screen_WrapNext)) 602 if (!(screen.flags & Screen_WrapNext))
577 return; 603 return;
578 604
579 screen.flags &= ~Screen_WrapNext; 605 screen.flags &= ~Screen_WrapNext;
… …
589/* ------------------------------------------------------------------------- */ 615/* ------------------------------------------------------------------------- */
590/* 616/*
591 * Change the colour for following text 617 * Change the colour for following text
592 */ 618 */
593void 619void
594rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 620rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
595{ 621{
596 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 622 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
597 color = fgbg; 623 color = fgbg;
598 624
599 if (fgbg == Color_fg) 625 if (fgbg == Color_fg)
600 rstyle = SET_FGCOLOR (rstyle, color); 626 rstyle = SET_FGCOLOR (rstyle, color);
601 else 627 else
… …
605/* ------------------------------------------------------------------------- */ 631/* ------------------------------------------------------------------------- */
606/* 632/*
607 * Change the rendition style for following text 633 * Change the rendition style for following text
608 */ 634 */
609void 635void
610rxvt_term::scr_rendition (int set, int style) NOTHROW 636rxvt_term::scr_rendition (int set, int style) noexcept
611{ 637{
612 if (set) 638 if (set)
613 rstyle |= style; 639 rstyle |= style;
614 else if (style == ~RS_None) 640 else if (style == ~RS_None)
615 rstyle = DEFAULT_RSTYLE; 641 rstyle = DEFAULT_RSTYLE;
… …
621/* 647/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 649 * count positive ==> scroll up
624 * count negative ==> scroll down 650 * count negative ==> scroll down
625 */ 651 */
626int 652int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
628{ 654{
629 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
630 return 0; 656 return 0;
631 657
632 want_refresh = 1; 658 want_refresh = 1;
… …
634 660
635 if (count > 0 661 if (count > 0
636 && row1 == 0 662 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 663 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 664 {
665 min_it (count, total_rows - (nrow - (row2 + 1)));
666
639 top_row = max (top_row - count, -saveLines); 667 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 668
644 // sever bottommost line 669 // sever bottommost line
645 { 670 {
646 line_t &l = ROW(row2 - count); 671 line_t &l = ROW(row2);
647 l.is_longer (0); 672 l.is_longer (0);
648 l.touch (); 673 l.touch ();
649 } 674 }
650 675
676 // scroll everything up 'count' lines
677 term_start = (term_start + count) % total_rows;
678
679 // now copy lines below the scroll region bottom to the
680 // bottom of the screen again, so they look as if they
681 // hadn't moved.
682 for (int i = nrow; --i > row2; )
683 {
684 line_t &l1 = ROW(i - count);
685 line_t &l2 = ROW(i);
686
687 ::swap (l1, l2);
688 l2.touch ();
689 }
690
651 // erase newly scrolled-in lines 691 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 692 for (int i = count; i--; )
653 { 693 {
654 line_t &l = ROW(nrow - 1 - i); 694 line_t &l = ROW(row2 - i);
655 695
656 // optimize if already cleared, can be significant on slow machines 696 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 697 // 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))) 698 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 699 {
660 scr_blank_line (l, 0, l.l, rstyle); 700 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 701 l.l = 0;
… …
663 } 703 }
664 else 704 else
665 scr_blank_screen_mem (l, rstyle); 705 scr_blank_screen_mem (l, rstyle);
666 } 706 }
667 707
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 708 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen
710 && selection.beg.row <= row2)
682 { 711 {
683 selection.beg.row -= count; 712 selection.beg.row -= count;
684 selection.end.row -= count; 713 selection.end.row -= count;
685 selection.mark.row -= count; 714 selection.mark.row -= count;
686 715
687 if (selection.beg.row < top_row 716 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 } 717 }
695 718
696 // finally move the view window, if desired 719 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 720 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 721 && view_start != 0
699 && view_start != -saveLines) 722 && view_start != -saveLines)
700 scr_page (UP, count); 723 scr_page (count);
701 724
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 725 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 726 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
704 } 727 }
705 else 728 else
… …
728 } 751 }
729 752
730 // use a simple and robust scrolling algorithm, this 753 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 754 // part of scr_scroll_text is not time-critical.
732 755
756 // sever line above scroll region
757 if (row1)
758 {
759 line_t &l = ROW(row1 - 1);
760 l.is_longer (0);
761 l.touch ();
762 }
763
733 int rows = row2 - row1 + 1; 764 int rows = row2 - row1 + 1;
734 765
735 min_it (count, rows); 766 min_it (count, rows);
736 767
737 line_t *temp_buf = row_buf + total_rows; 768 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 769
739 for (int row = 0; row < rows; row++) 770 for (int row = 0; row < rows; row++)
740 { 771 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 772 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 773
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 775 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 776 }
746 777
747 for (int row = 0; row < rows; row++) 778 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 779 ROW(row1 + row) = temp_buf [row];
780
781 // sever bottommost line
782 {
783 line_t &l = ROW(row2);
784 l.is_longer (0);
785 l.touch ();
786 }
749 } 787 }
750 788
751 return count; 789 return count;
752} 790}
753 791
754/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
755/* 793/*
756 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
757 */ 795 */
758void 796void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
760{ 798{
761 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
762 return; 800 return;
763 801
764 unsigned char checksel; 802 bool checksel;
765 unicode_t c; 803 unicode_t c;
766 int ncol = this->ncol; 804 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 805 const wchar_t *strend = str + len;
768 806
769 want_refresh = 1; 807 want_refresh = 1;
… …
795 833
796 while (str < strend) 834 while (str < strend)
797 { 835 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 836 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 837
800 if (expect_false (c < 0x20)) 838 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 839 if (c == C0_LF)
802 { 840 {
803 max_it (line->l, screen.cur.col); 841 max_it (line->l, screen.cur.col);
804 842
805 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
… …
824 { 862 {
825 scr_tab (1, true); 863 scr_tab (1, true);
826 continue; 864 continue;
827 } 865 }
828 866
829 if (expect_false ( 867 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 868 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 869 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 870 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 871 ))
834 { 872 {
… …
839 * should be a similar check. 877 * should be a similar check.
840 */ 878 */
841 CLEAR_SELECTION (); 879 CLEAR_SELECTION ();
842 } 880 }
843 881
844 if (expect_false (screen.flags & Screen_WrapNext)) 882 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 883 {
846 scr_do_wrap (); 884 scr_do_wrap ();
847 885
848 line->l = ncol; 886 line->l = ncol;
849 line->is_longer (1); 887 line->is_longer (1);
… …
851 row = screen.cur.row; 889 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 890 line = &ROW(row); /* _must_ refresh */
853 } 891 }
854 892
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 893 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 894 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 895 c = 0xfffd;
858 896
859 // rely on wcwidth to tell us the character width, do wcwidth before 897 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 898 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 899 // drawing characters below as they might be invalid in the current
862 // locale. 900 // locale.
863 int width = WCWIDTH (c); 901 int width = WCWIDTH (c);
864 902
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 903 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 904 {
867 // vt100 special graphics and line drawing 905 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 906 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 907 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 908 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 921 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 922 width = 1; // vt100 line drawing characters are always single-width
885 } 923 }
886 } 924 }
887 925
888 if (expect_false (screen.flags & Screen_Insert)) 926 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 927 scr_insdel_chars (width, INSERT);
890 928
891 if (width != 0) 929 if (width != 0)
892 { 930 {
893#if !UNICODE_3 931#if !UNICODE_3
… …
901#endif 939#endif
902 940
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 941 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 942
905 // if the character doesn't fit into the remaining columns... 943 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 944 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 945 {
908 if (screen.flags & Screen_Autowrap) 946 if (screen.flags & Screen_Autowrap)
909 { 947 {
910 // ... artificially enlargen the previous one 948 // ... artificially enlargen the previous one
911 c = NOCHAR; 949 c = NOCHAR;
… …
918 956
919 // nuke the character at this position, if required 957 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 958 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 959 // we never have to check for overwriting a wide char itself,
922 // only its tail. 960 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 961 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 962 scr_kill_char (*line, screen.cur.col);
925 963
926 line->touch (); 964 line->touch ();
927 965
928 do 966 do
929 { 967 {
930 line->t[screen.cur.col] = c; 968 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 969 line->r[screen.cur.col] = rend;
932 970
933 if (expect_true (screen.cur.col < ncol - 1)) 971 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 972 screen.cur.col++;
935 else 973 else
936 { 974 {
937 line->l = ncol; 975 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 976 if (screen.flags & Screen_Autowrap)
… …
941 goto end_of_line; 979 goto end_of_line;
942 } 980 }
943 981
944 c = NOCHAR; 982 c = NOCHAR;
945 } 983 }
946 while (expect_false (--width > 0)); 984 while (ecb_unlikely (--width > 0));
947 985
948 // pad with spaces when overwriting wide character with smaller one 986 // 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++) 987 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 988 {
951 line->t[c] = ' '; 989 line->t[c] = ' ';
952 line->r[c] = rend; 990 line->r[c] = rend;
953 } 991 }
954 992
… …
976 } 1014 }
977 else if (screen.cur.row > 0 1015 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ()) 1016 && ROW(screen.cur.row - 1).is_longer ())
979 { 1017 {
980 linep = &ROW(screen.cur.row - 1); 1018 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1; 1019 tp = linep->t + ncol - 1;
982 rp = line->r + ncol - 1; 1020 rp = linep->r + ncol - 1;
983 } 1021 }
984 else 1022 else
985 continue; 1023 continue;
986 1024
987 linep->touch (); 1025 linep->touch ();
… …
1010/* 1048/*
1011 * Process Backspace. Move back the cursor back a position, wrap if have to 1049 * Process Backspace. Move back the cursor back a position, wrap if have to
1012 * XTERM_SEQ: CTRL-H 1050 * XTERM_SEQ: CTRL-H
1013 */ 1051 */
1014void 1052void
1015rxvt_term::scr_backspace () NOTHROW 1053rxvt_term::scr_backspace () noexcept
1016{ 1054{
1017 if (screen.cur.col == 0) 1055 if (screen.cur.col == 0)
1018 { 1056 {
1019 if (screen.cur.row > 0) 1057 if (screen.cur.row > 0)
1020 { 1058 {
… …
1037 * Process Horizontal Tab 1075 * Process Horizontal Tab
1038 * count: +ve = forward; -ve = backwards 1076 * count: +ve = forward; -ve = backwards
1039 * XTERM_SEQ: CTRL-I 1077 * XTERM_SEQ: CTRL-I
1040 */ 1078 */
1041void 1079void
1042rxvt_term::scr_tab (int count, bool ht) NOTHROW 1080rxvt_term::scr_tab (int count, bool ht) noexcept
1043{ 1081{
1044 int i, x; 1082 int i, x;
1045 1083
1046 want_refresh = 1; 1084 want_refresh = 1;
1047 i = x = screen.cur.col; 1085 i = x = screen.cur.col;
… …
1113 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1116 */ 1154 */
1117#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1118void 1156void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () noexcept
1120{ 1158{
1121 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1161 else
1124 scr_insdel_chars (1, INSERT); 1162 scr_insdel_chars (1, INSERT);
… …
1130 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1133 */ 1171 */
1134#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1135void 1173void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () noexcept
1137{ 1175{
1138 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1178 else
1141 { 1179 {
… …
1154/* ------------------------------------------------------------------------- */ 1192/* ------------------------------------------------------------------------- */
1155/* 1193/*
1156 * Goto Row/Column 1194 * Goto Row/Column
1157 */ 1195 */
1158void 1196void
1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1197rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1160{ 1198{
1161 want_refresh = 1; 1199 want_refresh = 1;
1162 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
1163 1201
1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1202 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1203/* ------------------------------------------------------------------------- */ 1241/* ------------------------------------------------------------------------- */
1204/* 1242/*
1205 * direction should be UP or DN 1243 * direction should be UP or DN
1206 */ 1244 */
1207void 1245void
1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1246rxvt_term::scr_index (enum page_dirn direction) noexcept
1209{ 1247{
1210 int dirn;
1211
1212 want_refresh = 1; 1248 want_refresh = 1;
1213 ZERO_SCROLLBACK (); 1249 ZERO_SCROLLBACK ();
1214 1250
1215 dirn = ((direction == UP) ? 1 : -1);
1216
1217 screen.flags &= ~Screen_WrapNext; 1251 screen.flags &= ~Screen_WrapNext;
1218 1252
1219 if ((screen.cur.row == screen.bscroll && direction == UP) 1253 if ((screen.cur.row == screen.bscroll && direction == UP)
1220 || (screen.cur.row == screen.tscroll && direction == DN)) 1254 || (screen.cur.row == screen.tscroll && direction == DN))
1221 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1255 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1222 else 1256 else
1223 screen.cur.row += dirn; 1257 screen.cur.row += direction;
1224 1258
1225 clamp_it (screen.cur.row, 0, nrow - 1); 1259 clamp_it (screen.cur.row, 0, nrow - 1);
1226 selection_check (0); 1260 selection_check (0);
1227} 1261}
1228 1262
… …
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K 1269 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1270 */
1237void 1271void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1272rxvt_term::scr_erase_line (int mode) noexcept
1239{ 1273{
1240 unsigned int col, num; 1274 unsigned int col, num;
1241 1275
1242 want_refresh = 1; 1276 want_refresh = 1;
1243 ZERO_SCROLLBACK (); 1277 ZERO_SCROLLBACK ();
… …
1291 scr_blank_line (line, col, num, rstyle); 1325 scr_blank_line (line, col, num, rstyle);
1292} 1326}
1293 1327
1294/* ------------------------------------------------------------------------- */ 1328/* ------------------------------------------------------------------------- */
1295/* 1329/*
1296 * Erase part of whole of the screen 1330 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1331 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1332 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1333 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1334 */
1301void 1335void
1302rxvt_term::scr_erase_screen (int mode) NOTHROW 1336rxvt_term::scr_erase_screen (int mode) noexcept
1303{ 1337{
1304 int num; 1338 int num;
1305 int32_t row; 1339 int32_t row;
1306 rend_t ren; 1340 rend_t ren;
1307 XGCValues gcvalue; 1341 XGCValues gcvalue;
… …
1310 ZERO_SCROLLBACK (); 1344 ZERO_SCROLLBACK ();
1311 1345
1312 switch (mode) 1346 switch (mode)
1313 { 1347 {
1314 case 0: /* erase to end of screen */ 1348 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1349 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1350 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1351 num = nrow - row;
1319 break; 1352 break;
1320 case 1: /* erase to beginning of screen */ 1353 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1354 scr_erase_line (1);
1323 row = 0; 1355 row = 0;
1324 num = screen.cur.row; 1356 num = screen.cur.row;
1325 break; 1357 break;
1326 case 2: /* erase whole screen */ 1358 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1359 row = 0;
1329 num = nrow; 1360 num = nrow;
1330 break; 1361 break;
1331 default: 1362 default:
1332 return; 1363 return;
… …
1349 { 1380 {
1350 ren = DEFAULT_RSTYLE; 1381 ren = DEFAULT_RSTYLE;
1351 1382
1352 if (mapped) 1383 if (mapped)
1353 XClearArea (dpy, vt, 0, 1384 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width, 1385 Row2Pixel (row - view_start), (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num), False); 1386 (unsigned int)Height2Pixel (num), False);
1356 } 1387 }
1357 else 1388 else
1358 { 1389 {
1359 ren = rstyle & (RS_fgMask | RS_bgMask); 1390 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1362 { 1393 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1394 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1396 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start), 1397 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1398 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1399 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1400 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1401 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 } 1402 }
1372 } 1403 }
… …
1380 } 1411 }
1381} 1412}
1382 1413
1383#if !ENABLE_MINIMAL 1414#if !ENABLE_MINIMAL
1384void 1415void
1385rxvt_term::scr_erase_savelines () NOTHROW 1416rxvt_term::scr_erase_savelines () noexcept
1386{ 1417{
1387 want_refresh = 1; 1418 want_refresh = 1;
1388 ZERO_SCROLLBACK (); 1419 ZERO_SCROLLBACK ();
1389 1420
1390 top_row = 0; 1421 top_row = 0;
… …
1394/* ------------------------------------------------------------------------- */ 1425/* ------------------------------------------------------------------------- */
1395/* 1426/*
1396 * Fill the screen with `E's 1427 * Fill the screen with `E's
1397 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1428 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1398 */ 1429 */
1399void 1430void ecb_cold
1400rxvt_term::scr_E () NOTHROW 1431rxvt_term::scr_E () noexcept
1401{ 1432{
1402 rend_t fs; 1433 rend_t fs;
1403 1434
1404 want_refresh = 1; 1435 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1436 ZERO_SCROLLBACK ();
1406 1437
1407 num_scr_allow = 0; 1438 num_scr_allow = 0;
1408 selection_check (3); 1439
1440 row_col_t pos;
1441 pos.row = pos.col = 0;
1442 if (ROWCOL_IS_AFTER (selection.end, pos))
1443 CLEAR_SELECTION ();
1409 1444
1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1445 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411 for (int row = nrow; row--; ) 1446 for (int row = nrow; row--; )
1412 { 1447 {
1413 line_t &line = ROW(row); 1448 line_t &line = ROW(row);
… …
1426/* ------------------------------------------------------------------------- */ 1461/* ------------------------------------------------------------------------- */
1427/* 1462/*
1428 * Insert/Delete <count> lines 1463 * Insert/Delete <count> lines
1429 */ 1464 */
1430void 1465void
1431rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1466rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1432{ 1467{
1433 int end; 1468 int end;
1434 1469
1435 ZERO_SCROLLBACK (); 1470 ZERO_SCROLLBACK ();
1436 1471
… …
1456/* ------------------------------------------------------------------------- */ 1491/* ------------------------------------------------------------------------- */
1457/* 1492/*
1458 * Insert/Delete <count> characters from the current position 1493 * Insert/Delete <count> characters from the current position
1459 */ 1494 */
1460void 1495void
1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1496rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1462{ 1497{
1463 want_refresh = 1; 1498 want_refresh = 1;
1464 ZERO_SCROLLBACK (); 1499 ZERO_SCROLLBACK ();
1465 1500
1466 if (count <= 0) 1501 if (count <= 0)
… …
1564/* ------------------------------------------------------------------------- */ 1599/* ------------------------------------------------------------------------- */
1565/* 1600/*
1566 * Set the scrolling region 1601 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1602 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1603 */
1569void 1604void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1605rxvt_term::scr_scroll_region (int top, int bot) noexcept
1571{ 1606{
1572 max_it (top, 0); 1607 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1608 min_it (bot, nrow - 1);
1574 1609
1575 if (top > bot) 1610 if (top > bot)
… …
1584/* 1619/*
1585 * Make the cursor visible/invisible 1620 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1621 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1622 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1623 */
1589void 1624void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1625rxvt_term::scr_cursor_visible (int mode) noexcept
1591{ 1626{
1592 want_refresh = 1; 1627 want_refresh = 1;
1593 1628
1594 if (mode) 1629 if (mode)
1595 screen.flags |= Screen_VisibleCursor; 1630 screen.flags |= Screen_VisibleCursor;
… …
1601/* 1636/*
1602 * Set/unset automatic wrapping 1637 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1638 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1639 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1640 */
1606void 1641void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1642rxvt_term::scr_autowrap (int mode) noexcept
1608{ 1643{
1609 if (mode) 1644 if (mode)
1610 screen.flags |= Screen_Autowrap; 1645 screen.flags |= Screen_Autowrap;
1611 else 1646 else
1612 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1647 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1620 * Relative mode: line numbers are relative to top margin of scrolling region 1655 * Relative mode: line numbers are relative to top margin of scrolling region
1621 * and the cursor cannot be moved outside. 1656 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1657 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1658 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1659 */
1625void 1660void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1661rxvt_term::scr_relative_origin (int mode) noexcept
1627{ 1662{
1628 if (mode) 1663 if (mode)
1629 screen.flags |= Screen_Relative; 1664 screen.flags |= Screen_Relative;
1630 else 1665 else
1631 screen.flags &= ~Screen_Relative; 1666 screen.flags &= ~Screen_Relative;
… …
1637/* 1672/*
1638 * Set insert/replace mode 1673 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1674 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1675 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1676 */
1642void 1677void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1678rxvt_term::scr_insert_mode (int mode) noexcept
1644{ 1679{
1645 if (mode) 1680 if (mode)
1646 screen.flags |= Screen_Insert; 1681 screen.flags |= Screen_Insert;
1647 else 1682 else
1648 screen.flags &= ~Screen_Insert; 1683 screen.flags &= ~Screen_Insert;
… …
1653 * Set/Unset tabs 1688 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1689 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1690 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1691 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1692 */
1658void 1693void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1694rxvt_term::scr_set_tab (int mode) noexcept
1660{ 1695{
1661 if (mode < 0) 1696 if (mode < 0)
1662 memset (tabs, 0, ncol); 1697 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1698 else if (screen.cur.col < ncol)
1664 tabs [screen.cur.col] = !!mode; 1699 tabs [screen.cur.col] = !!mode;
… …
1669 * Set reverse/normal video 1704 * Set reverse/normal video
1670 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1705 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1671 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1706 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1672 */ 1707 */
1673void 1708void
1674rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1709rxvt_term::scr_rvideo_mode (bool on) noexcept
1675{ 1710{
1676 rvideo_mode = on; 1711 rvideo_mode = on;
1677 1712
1678#ifndef NO_BELL 1713#ifndef NO_BELL
1679 on ^= rvideo_bell; 1714 on ^= rvideo_bell;
… …
1681 1716
1682 if (rvideo_state != on) 1717 if (rvideo_state != on)
1683 { 1718 {
1684 rvideo_state = on; 1719 rvideo_state = on;
1685 1720
1721#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade])
1723 {
1724 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1725 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1726 }
1727 else
1728#endif
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1729 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1730#ifdef HAVE_IMG
1688 if (bg_pixmap == None) 1731 if (bg_img == 0)
1689#endif 1732#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1733 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1734
1692 XGCValues gcvalue; 1735 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1736 gcvalue.foreground = pix_colors[Color_fg];
… …
1702/* ------------------------------------------------------------------------- */ 1745/* ------------------------------------------------------------------------- */
1703/* 1746/*
1704 * Report current cursor position 1747 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1748 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1749 */
1707void 1750void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1751rxvt_term::scr_report_position () noexcept
1709{ 1752{
1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1753 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711} 1754}
1712 1755
1713/* ------------------------------------------------------------------------- * 1756/* ------------------------------------------------------------------------- *
… …
1715 * ------------------------------------------------------------------------- */ 1758 * ------------------------------------------------------------------------- */
1716 1759
1717/* 1760/*
1718 * Set font style 1761 * Set font style
1719 */ 1762 */
1720void 1763void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1764rxvt_term::set_font_style () noexcept
1722{ 1765{
1723#if 0 1766#if 0
1724 switch (charsets [screen.charset]) 1767 switch (charsets [screen.charset])
1725 { 1768 {
1726 case '0': /* DEC Special Character & Line Drawing Set */ 1769 case '0': /* DEC Special Character & Line Drawing Set */
… …
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1790 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1791 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1792 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1793 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1794 */
1752void 1795void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1796rxvt_term::scr_charset_choose (int set) noexcept
1754{ 1797{
1755 screen.charset = set; 1798 screen.charset = set;
1756 set_font_style (); 1799 set_font_style ();
1757} 1800}
1758 1801
… …
1764 * XTERM_SEQ: Set G2 character set: ESC * <C> 1807 * XTERM_SEQ: Set G2 character set: ESC * <C>
1765 * XTERM_SEQ: Set G3 character set: ESC + <C> 1808 * XTERM_SEQ: Set G3 character set: ESC + <C>
1766 * See set_font_style for possible values for <C> 1809 * See set_font_style for possible values for <C>
1767 */ 1810 */
1768void 1811void
1769rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1812rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1770{ 1813{
1771 charsets[set] = (unsigned char)ch; 1814 charsets[set] = (unsigned char)ch;
1772 set_font_style (); 1815 set_font_style ();
1773} 1816}
1774 1817
… …
1778 * ------------------------------------------------------------------------- */ 1821 * ------------------------------------------------------------------------- */
1779 1822
1780/* 1823/*
1781 * refresh matching text. 1824 * refresh matching text.
1782 */ 1825 */
1783bool 1826bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1827rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1785{ 1828{
1786 bool found = false; 1829 bool found = false;
1787 1830
1788 for (int i = 0; i < nrow; i++) 1831 for (int i = 0; i < nrow; i++)
1789 { 1832 {
… …
1807 PART_BEG = 0, 1850 PART_BEG = 0,
1808 PART_END, 1851 PART_END,
1809 RC_COUNT 1852 RC_COUNT
1810}; 1853};
1811 1854
1812void 1855void ecb_hot
1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1856rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1814{ 1857{
1815 int i; 1858 int i;
1816 row_col_t rc[RC_COUNT]; 1859 row_col_t rc[RC_COUNT];
1817 1860
1818 if (!drawn_buf) /* sanity check */ 1861 if (!drawn_buf) /* sanity check */
… …
1852/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1853/* 1896/*
1854 * Refresh the entire screen 1897 * Refresh the entire screen
1855 */ 1898 */
1856void 1899void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1900rxvt_term::scr_touch (bool refresh) noexcept
1858{ 1901{
1859 scr_expose (0, 0, width, height, refresh); 1902 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1903}
1861 1904
1862/* ------------------------------------------------------------------------- */ 1905/* ------------------------------------------------------------------------- */
1863/* 1906/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1907 * Move the display so that the line represented by scrollbar value Y is at
1865 * the top of the screen 1908 * the top of the screen
1866 */ 1909 */
1867void 1910void
1868rxvt_term::scr_move_to (int y, int len) NOTHROW 1911rxvt_term::scr_move_to (int y, int len) noexcept
1869{ 1912{
1870 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1913 // lerp (y, 0, len, top_row, nrow - 1)
1914 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1871} 1915}
1872 1916
1873/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1874/* 1918/*
1875 * Page the screen up/down nlines 1919 * Page the screen up/down nlines
1876 * direction should be UP or DN 1920 * direction should be UP or DN
1877 */ 1921 */
1878bool 1922bool
1879rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1923rxvt_term::scr_page (int nlines) noexcept
1880{ 1924{
1881 int new_view_start =
1882 direction == UP ? view_start - nlines
1883 : view_start + nlines;
1884
1885 return scr_changeview (new_view_start); 1925 return scr_changeview (view_start - nlines);
1886} 1926}
1887 1927
1888bool 1928bool
1889rxvt_term::scr_changeview (int new_view_start) NOTHROW 1929rxvt_term::scr_changeview (int new_view_start) noexcept
1890{ 1930{
1891 clamp_it (new_view_start, top_row, 0); 1931 clamp_it (new_view_start, top_row, 0);
1892 1932
1893 if (new_view_start == view_start) 1933 if (new_view_start == view_start)
1894 return false; 1934 return false;
… …
1912} 1952}
1913#endif 1953#endif
1914 1954
1915/* ------------------------------------------------------------------------- */ 1955/* ------------------------------------------------------------------------- */
1916void 1956void
1917rxvt_term::scr_bell () NOTHROW 1957rxvt_term::scr_bell () noexcept
1918{ 1958{
1919#ifndef NO_BELL 1959#ifndef NO_BELL
1920 1960
1921# ifndef NO_MAPALERT 1961# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1962# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1963 if (option (Opt_mapAlert))
1924# endif 1964# endif
1925 XMapWindow (dpy, parent[0]); 1965 XMapWindow (dpy, parent);
1926# endif 1966# endif
1927 1967
1928# if ENABLE_FRILLS 1968# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1969 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1970 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1983 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1984#endif
1945} 1985}
1946 1986
1947/* ------------------------------------------------------------------------- */ 1987/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */ 1988void ecb_cold
1949void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1989rxvt_term::scr_printscreen (int fullhist) noexcept
1951{ 1990{
1952#ifdef PRINTPIPE 1991#ifdef PRINTPIPE
1953 int nrows, row_start; 1992 int nrows, row_start;
1954 FILE *fd = popen_printer (); 1993 FILE *fd = popen_printer ();
1955 1994
… …
2003/* 2042/*
2004 * Refresh the screen 2043 * Refresh the screen
2005 * drawn_text/drawn_rend contain the screen information before the update. 2044 * drawn_text/drawn_rend contain the screen information before the update.
2006 * screen.text/screen.rend contain what the screen will change to. 2045 * screen.text/screen.rend contain what the screen will change to.
2007 */ 2046 */
2008void 2047void ecb_hot
2009rxvt_term::scr_refresh () NOTHROW 2048rxvt_term::scr_refresh () noexcept
2010{ 2049{
2011 int16_t col, row, /* column/row we're processing */ 2050 int16_t col, row, /* column/row we're processing */
2012 ocrow; /* old cursor row */ 2051 ocrow; /* old cursor row */
2013 int i; /* tmp */ 2052 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 */ 2053 rend_t ccol1, /* Cursor colour */
2019 ccol2; /* Cursor colour2 */ 2054 ccol2; /* Cursor colour2 */
2055 rend_t cur_rend;
2056 int cur_col;
2057 int cursorwidth;
2020 2058
2021 want_refresh = 0; /* screen is current */ 2059 want_refresh = 0; /* screen is current */
2022 2060
2023 if (refresh_type == NO_REFRESH || !mapped) 2061 if (refresh_type == NO_REFRESH || !mapped)
2024 return; 2062 return;
… …
2027 * A: set up vars 2065 * A: set up vars
2028 */ 2066 */
2029 refresh_count = 0; 2067 refresh_count = 0;
2030 2068
2031 unsigned int old_screen_flags = screen.flags; 2069 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2070 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2071#ifdef HAVE_IMG
2034 have_bg = bg_pixmap != None; 2072 have_bg = bg_img != 0;
2035#endif 2073#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2074 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2075
2038 /* 2076 /*
2039 * B: reverse any characters which are selected 2077 * B: reverse any characters which are selected
… …
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2081 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2082#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2083 scr_swap_overlay ();
2046#endif 2084#endif
2047 2085
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2086 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2087
2050 /* 2088 /*
2051 * C: set the cursor character (s) 2089 * C: set the cursor character (s)
2052 */ 2090 */
2053 { 2091 {
2054 unsigned char setoldcursor;
2055
2056#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2093 if (hidden_cursor)
2058 showcursor = 0; 2094 showcursor = 0;
2059#endif 2095#endif
2060 2096
… …
2063 int col = screen.cur.col; 2099 int col = screen.cur.col;
2064 2100
2065 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2066 col--; 2102 col--;
2067 2103
2104 cursorwidth = 1;
2105 while (col + cursorwidth < ncol
2106 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2107 cursorwidth++;
2108
2068 crp = &ROW(screen.cur.row).r[col]; 2109 cur_rend = ROW(screen.cur.row).r[col];
2110 cur_col = col;
2069 2111
2070#ifndef NO_CURSORCOLOR 2112#ifndef NO_CURSORCOLOR
2071 cc1 = *crp & (RS_fgMask | RS_bgMask);
2072 if (ISSET_PIXCOLOR (Color_cursor)) 2113 if (ISSET_PIXCOLOR (Color_cursor))
2073 ccol1 = Color_cursor; 2114 ccol1 = Color_cursor;
2074 else 2115 else
2075#endif 2116#endif
2076#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2117#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2088 ccol2 = bgcolor_of (rstyle); 2129 ccol2 = bgcolor_of (rstyle);
2089#else 2130#else
2090 ccol2 = Color_bg; 2131 ccol2 = Color_bg;
2091#endif 2132#endif
2092 2133
2093 if (focus) 2134 if (focus && cursor_type == 0)
2094 { 2135 {
2095 if (option (Opt_cursorUnderline)) 2136 rend_t rend = cur_rend;
2096 *crp ^= RS_Uline; 2137
2097 else
2098 {
2099 *crp ^= RS_RVid; 2138 rend ^= RS_RVid;
2100 *crp = SET_FGCOLOR (*crp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2101 *crp = SET_BGCOLOR (*crp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2102 } 2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2103 } 2143 }
2104 } 2144 }
2105 2145
2106 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2107 setoldcursor = 0; 2147 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2108 if (ocrow != -1) 2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2149
2150 // save the current cursor coordinates if the cursor is visible
2151 // and either the window is unfocused or the cursor style is
2152 // underline or vertical bar, so as to clear the outline cursor in
2153 // the next refresh if the cursor moves or becomes invisible
2154 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2109 { 2155 {
2110 if (screen.cur.row - view_start != ocrow 2156 oldcursor.row = screen.cur.row - view_start;
2111 || screen.cur.col != oldcursor.col) 2157 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 } 2158 }
2123 else if (!focus) 2159 else
2124 setoldcursor = 1;
2125
2126 if (setoldcursor)
2127 {
2128 if (screen.cur.row - view_start >= nrow)
2129 oldcursor.row = -1; 2160 oldcursor.row = -1;
2130 else
2131 {
2132 oldcursor.row = screen.cur.row - view_start;
2133 oldcursor.col = screen.cur.col;
2134 }
2135 }
2136 } 2161 }
2137 2162
2138#ifndef NO_SLOW_LINK_SUPPORT 2163#ifndef NO_SLOW_LINK_SUPPORT
2139 /* 2164 /*
2140 * D: CopyArea pass - very useful for slower links 2165 * D: CopyArea pass - very useful for slower links
… …
2146 { 2171 {
2147 int16_t nits; 2172 int16_t nits;
2148 int i = num_scr; 2173 int i = num_scr;
2149 int j; 2174 int j;
2150 int len, wlen; 2175 int len, wlen;
2151 dLocal (int, num_scr);
2152 2176
2153 j = nrow; 2177 j = nrow;
2154 wlen = len = -1; 2178 wlen = len = -1;
2155 row = i > 0 ? 0 : j - 1; 2179 row = i > 0 ? 0 : j - 1;
2156 2180
… …
2222 int ypixel = (int)Row2Pixel (row); 2246 int ypixel = (int)Row2Pixel (row);
2223 2247
2224 for (col = 0; col < ncol; col++) 2248 for (col = 0; col < ncol; col++)
2225 { 2249 {
2226 /* compare new text with old - if exactly the same then continue */ 2250 /* compare new text with old - if exactly the same then continue */
2227 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2251 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; 2252 continue;
2232 2253
2233 // redraw one or more characters 2254 // redraw one or more characters
2234 2255
2235 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2258 --col;
2238 2259
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2261 text_t *text = stp + col;
2241 int count = 1; 2262 int count = 1;
… …
2279 2300
2280 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2282 2303
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2306 count++, i--;
2286 2307
2287 /* 2308 /*
2288 * Determine the attributes for the string 2309 * Determine the attributes for the string
2289 */ 2310 */
2290 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2292 2313
2293 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2316 {
2296 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2297 2318
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2409 /*
2389 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2390 */ 2411 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2413
2393 if (expect_true (have_bg && back == Color_bg)) 2414 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2415 {
2395 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2396 2417
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2405 did_clear: ; 2426 did_clear: ;
2406 } 2427 }
2407 else 2428 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2430
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2432 {
2433 if (showcursor && focus && row == screen.cur.row
2434 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2436 else
2412#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2440 else
2416#endif 2441#endif
… …
2428 */ 2453 */
2429 if (showcursor) 2454 if (showcursor)
2430 { 2455 {
2431 if (focus) 2456 if (focus)
2432 { 2457 {
2433 if (option (Opt_cursorUnderline)) 2458 if (cursor_type == 0)
2434 *crp ^= RS_Uline; 2459 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435 else 2460 else if (oldcursor.row >= 0)
2436 { 2461 {
2437 *crp ^= RS_RVid; 2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2438#ifndef NO_CURSORCOLOR 2463 if (cursor_type == 1)
2439 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2464 XFillRectangle (dpy, vt, gc,
2440#endif 2465 Col2Pixel (cur_col),
2466 Row2Pixel (oldcursor.row + 1) - 2,
2467 Width2Pixel (1),
2468 2);
2469 else
2470 XFillRectangle (dpy, vt, gc,
2471 Col2Pixel (cur_col),
2472 Row2Pixel (oldcursor.row),
2473 2,
2474 Height2Pixel (1));
2441 } 2475 }
2442 } 2476 }
2443 else if (oldcursor.row >= 0) 2477 else if (oldcursor.row >= 0)
2444 { 2478 {
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]); 2479 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 2480
2462 XDrawRectangle (dpy, vt, gc, 2481 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2482 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row), 2483 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2484 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2485 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2486 }
2468 } 2487 }
2469 2488
2470 /* 2489 /*
2471 * H: cleanup selection 2490 * H: cleanup selection
… …
2480 screen.flags = old_screen_flags; 2499 screen.flags = old_screen_flags;
2481 num_scr = 0; 2500 num_scr = 0;
2482 num_scr_allow = 1; 2501 num_scr_allow = 1;
2483} 2502}
2484 2503
2485void 2504void ecb_cold
2486rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2505rxvt_term::scr_remap_chars (line_t &l) noexcept
2487{ 2506{
2488 if (!l.t) 2507 if (!l.valid ())
2489 return; 2508 return;
2490 2509
2491 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2510 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2492 2511
2493 for (int i = ncol; i--; ) 2512 for (int i = ncol; i--; )
2494 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2513 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2495} 2514}
2496 2515
2497void 2516void ecb_cold
2498rxvt_term::scr_remap_chars () NOTHROW 2517rxvt_term::scr_remap_chars () noexcept
2499{ 2518{
2500 for (int i = total_rows; i--; ) 2519 for (int i = total_rows; i--; )
2501 scr_remap_chars (row_buf [i]); 2520 scr_remap_chars (row_buf [i]);
2502 2521
2503 for (int i = nrow; i--; ) 2522 for (int i = nrow; i--; )
… …
2505 scr_remap_chars (drawn_buf [i]); 2524 scr_remap_chars (drawn_buf [i]);
2506 scr_remap_chars (swap_buf [i]); 2525 scr_remap_chars (swap_buf [i]);
2507 } 2526 }
2508} 2527}
2509 2528
2510void 2529void ecb_cold
2511rxvt_term::scr_recolour (bool refresh) NOTHROW 2530rxvt_term::scr_recolor (bool refresh) noexcept
2512{ 2531{
2513 bool transparent = false; 2532 bool transparent = false;
2514 2533
2515#ifdef HAVE_BG_PIXMAP 2534#ifdef HAVE_IMG
2516 if (bg_pixmap != None) 2535 if (bg_img != 0)
2517 { 2536 {
2518# ifdef ENABLE_TRANSPARENCY 2537# if ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2538 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2539 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2540 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2541 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2542
2524 transparent = true; 2543 transparent = true;
2525 } 2544 }
2526 else 2545 else
2527# endif 2546# endif
2528 { 2547 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2548 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2549 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2531 } 2550 }
2532 } 2551 }
2533 else 2552 else
2534#endif 2553#endif
2535 { 2554 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2556 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2557 }
2539 2558
2540 XClearWindow (dpy, parent[0]); 2559 XClearWindow (dpy, parent);
2541 2560
2542 if (scrollBar.win) 2561 if (scrollBar.state && scrollBar.win)
2543 { 2562 {
2544 if (transparent) 2563 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2564 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2565 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2566 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2548 scrollBar.state = STATE_IDLE; 2567 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2568 scrollBar.show (0);
2550 } 2569 }
2551 2570
2552 if (refresh) 2571 if (refresh)
2553 { 2572 {
… …
2557 want_refresh = 1; 2576 want_refresh = 1;
2558} 2577}
2559 2578
2560/* ------------------------------------------------------------------------- */ 2579/* ------------------------------------------------------------------------- */
2561void 2580void
2562rxvt_term::scr_clear (bool really) NOTHROW 2581rxvt_term::scr_clear (bool really) noexcept
2563{ 2582{
2564 if (!mapped) 2583 if (!mapped)
2565 return; 2584 return;
2566 2585
2567 num_scr_allow = 0; 2586 num_scr_allow = 0;
… …
2570 if (really) 2589 if (really)
2571 XClearWindow (dpy, vt); 2590 XClearWindow (dpy, vt);
2572} 2591}
2573 2592
2574void 2593void
2575rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2594rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2576{ 2595{
2577 int view_end = view_start + nrow; 2596 int view_end = view_start + nrow;
2578 int row, col; 2597 int row, col;
2579 2598
2580 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2599 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2592 srp[col] ^= rstyle2; 2611 srp[col] ^= rstyle2;
2593 } 2612 }
2594} 2613}
2595 2614
2596void 2615void
2597rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2616rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2598{ 2617{
2599 int view_end = view_start + nrow; 2618 int view_end = view_start + nrow;
2600 int row, col; 2619 int row, col;
2601 2620
2602 if (beg_row >= view_start) 2621 if (beg_row >= view_start)
… …
2618 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2637 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619 srp[col] ^= rstyle; 2638 srp[col] ^= rstyle;
2620} 2639}
2621 2640
2622/* ------------------------------------------------------------------------- */ 2641/* ------------------------------------------------------------------------- */
2623void 2642void ecb_hot
2624rxvt_term::scr_reverse_selection () NOTHROW 2643rxvt_term::scr_reverse_selection () noexcept
2625{ 2644{
2626 if (selection.op 2645 if (selection.op
2627 && current_screen == selection.screen 2646 && current_screen == selection.screen
2628 && selection.end.row >= view_start) 2647 && selection.end.row >= view_start)
2629 { 2648 {
… …
2645 * Dump the whole scrollback and screen to the passed filedescriptor. The 2664 * Dump the whole scrollback and screen to the passed filedescriptor. The
2646 * invoking routine must close the fd. 2665 * invoking routine must close the fd.
2647 */ 2666 */
2648#if 0 2667#if 0
2649void 2668void
2650rxvt_term::scr_dump (int fd) NOTHROW 2669rxvt_term::scr_dump (int fd) noexcept
2651{ 2670{
2652 int row, wrote; 2671 // if this method is needed, it can be implemented by factoring the
2653 unsigned int width, towrite; 2672 // 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} 2673}
2673#endif 2674#endif
2674 2675
2675/* ------------------------------------------------------------------------- * 2676/* ------------------------------------------------------------------------- *
2676 * CHARACTER SELECTION * 2677 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2678 * ------------------------------------------------------------------------- */
2678void 2679void
2679rxvt_term::selection_check (int check_more) NOTHROW 2680rxvt_term::selection_check (int check_more) noexcept
2680{ 2681{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2682 if (!selection.op)
2684 return; 2683 return;
2685 2684
2686 pos.row = pos.col = 0;
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2685 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2686 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2687 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2688 || (check_more == 1
2691 && current_screen == selection.screen 2689 && current_screen == selection.screen
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2690 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2691 && 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 (); 2692 CLEAR_ALL_SELECTION ();
2693}
2694
2695void
2696rxvt_term::selection_changed () noexcept
2697{
2698 line_t &r1 = ROW (selection.beg.row);
2699 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2700 ++selection.beg.col;
2701
2702 line_t &r2 = ROW (selection.end.row);
2703 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2704 ++selection.end.col;
2705
2706 want_refresh = 1;
2703} 2707}
2704 2708
2705/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2706/* 2710/*
2707 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2708 */ 2712 */
2709void 2713void
2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2711{ 2715{
2712 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2713 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2714 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2715 data[i] = C0_CR; 2719 data[i] = C0_CR;
2716 2720
2717 if (priv_modes & PrivMode_BracketPaste) 2721 #if ENABLE_FRILLS
2722 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2718 tt_printf ("\e[200~"); 2723 tt_printf ("\x1b[200~");
2724 #endif
2719 2725
2720 tt_write (data, len); 2726 tt_write (data, len);
2721 2727
2722 if (priv_modes & PrivMode_BracketPaste) 2728 #if ENABLE_FRILLS
2729 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2723 tt_printf ("\e[201~"); 2730 tt_printf ("\x1b[201~");
2731 #endif
2724} 2732}
2725 2733
2726void 2734void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW 2735rxvt_term::paste (char *data, unsigned int len) noexcept
2728{ 2736{
2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2737 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2730 return; 2738 return;
2731 2739
2732 tt_paste (data, len); 2740 tt_paste (data, len);
2733} 2741}
2734 2742
2735/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2736/* 2744/*
2737 * Respond to a notification that a primary selection has been sent 2745 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * EXT: SelectionNotify 2746 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 */ 2747 * as fallback
2740void
2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2742{
2743 if (prop == None) /* check for failed XConvertSelection */
2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2747 if (selnum == Sel_direct)
2748 selection_type = 0;
2749
2750 if ((selection_type & Sel_CompoundText))
2751 {
2752 selection_type = 0;
2753 selection_request_other (XA_STRING, selnum);
2754 }
2755
2756 if ((selection_type & Sel_UTF8String))
2757 {
2758 selection_type = Sel_CompoundText;
2759 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2760 }
2761
2762 return;
2763 }
2764
2765 unsigned long bytes_after;
2766 XTextProperty ct;
2767
2768 // length == (2^31 - 1) / 4, as gdk
2769 if (XGetWindowProperty (dpy, win, prop,
2770 0, 0x1fffffff,
2771 delete_prop, AnyPropertyType,
2772 &ct.encoding, &ct.format,
2773 &ct.nitems, &bytes_after,
2774 &ct.value) != Success)
2775 {
2776 ct.value = 0;
2777 goto bailout;
2778 }
2779
2780 if (ct.encoding == None)
2781 goto bailout;
2782
2783 if (ct.value == 0)
2784 goto bailout;
2785
2786 if (ct.encoding == xa[XA_INCR])
2787 {
2788 // INCR selection, start handshake
2789 if (!delete_prop)
2790 XDeleteProperty (dpy, win, prop);
2791
2792 selection_wait = Sel_incr;
2793 incr_buf_fill = 0;
2794 incr_ev.start (10);
2795
2796 goto bailout;
2797 }
2798
2799 if (ct.nitems == 0)
2800 {
2801 if (selection_wait == Sel_incr)
2802 {
2803 XFree (ct.value);
2804
2805 // finally complete, now paste the whole thing
2806 selection_wait = Sel_normal;
2807 ct.value = (unsigned char *)incr_buf;
2808 ct.nitems = incr_buf_fill;
2809 incr_buf = 0;
2810 incr_buf_size = 0;
2811 incr_ev.stop ();
2812 }
2813 else
2814 {
2815 if (selection_wait == Sel_normal
2816 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2817 {
2818 /*
2819 * pass through again trying CUT_BUFFER0 if we've come from
2820 * XConvertSelection () but nothing was presented
2821 */
2822 selection_paste (display->root, XA_CUT_BUFFER0, false);
2823 }
2824
2825 goto bailout;
2826 }
2827 }
2828 else if (selection_wait == Sel_incr)
2829 {
2830 incr_ev.start (10);
2831
2832 while (incr_buf_fill + ct.nitems > incr_buf_size)
2833 {
2834 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2835 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2836 }
2837
2838 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2839 incr_buf_fill += ct.nitems;
2840
2841 goto bailout;
2842 }
2843
2844 char **cl;
2845 int cr;
2846
2847#if !ENABLE_MINIMAL
2848 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2849 // so recode it manually
2850 if (ct.encoding == xa[XA_UTF8_STRING])
2851 {
2852 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2853 char *s = rxvt_wcstombs (w);
2854 free (w);
2855 // TODO: strlen == only the first element will be converted. well...
2856 paste (s, strlen (s));
2857 free (s);
2858 }
2859 else
2860#endif
2861 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2862 && cl)
2863 {
2864 for (int i = 0; i < cr; i++)
2865 paste (cl[i], strlen (cl[i]));
2866
2867 XFreeStringList (cl);
2868 }
2869 else
2870 paste ((char *)ct.value, ct.nitems); // paste raw
2871
2872bailout:
2873 XFree (ct.value);
2874
2875 if (selection_wait == Sel_normal)
2876 selection_wait = Sel_none;
2877}
2878
2879void
2880rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2881{
2882 selection_wait = Sel_none;
2883
2884 incr_buf_size = 0;
2885 free (incr_buf);
2886
2887 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2888}
2889
2890void
2891rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2892{
2893 if (prop == None || selection_wait != Sel_incr)
2894 return;
2895
2896 selection_paste (win, prop, true);
2897}
2898
2899/* ------------------------------------------------------------------------- */
2900/*
2901 * Request the current selection:
2902 * Order: > internal selection if available
2903 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2904 * > CUT_BUFFER0
2905 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2906 * will auto fallback to CUT_BUFFER0
2907 * EXT: button 2 release 2748 * EXT: button 2 release
2908 */ 2749 */
2909void 2750void
2910rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2751rxvt_term::selection_request (Time tm, int selnum) noexcept
2911{ 2752{
2912 if (selection.text && selnum == Sel_Primary) 2753 if (!selection_req)
2913 {
2914 /* internal selection */
2915 char *str = rxvt_wcstombs (selection.text, selection.len);
2916 paste (str, strlen (str));
2917 free (str);
2918 return;
2919 } 2754 {
2920 else 2755 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2756 selection_req->run ();
2921 { 2757 }
2922 selection_request_time = tm;
2923 selection_wait = Sel_normal;
2924
2925#if X_HAVE_UTF8_STRING
2926 selection_type = Sel_UTF8String;
2927 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2928 return;
2929#else
2930 selection_type = Sel_CompoundText;
2931 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2932 return;
2933#endif
2934 }
2935
2936 selection_wait = Sel_none; /* don't loop in selection_paste () */
2937 selection_paste (display->root, XA_CUT_BUFFER0, false);
2938}
2939
2940int
2941rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2942{
2943 Atom sel;
2944
2945 selection_type |= selnum;
2946
2947 if (selnum == Sel_Primary)
2948 sel = XA_PRIMARY;
2949 else if (selnum == Sel_Secondary)
2950 sel = XA_SECONDARY;
2951 else
2952 sel = xa[XA_CLIPBOARD];
2953
2954 if (XGetSelectionOwner (dpy, sel) != None)
2955 {
2956 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2957 vt, selection_request_time);
2958 return 1;
2959 }
2960
2961 return 0;
2962} 2758}
2963 2759
2964/* ------------------------------------------------------------------------- */ 2760/* ------------------------------------------------------------------------- */
2965/* 2761/*
2966 * Clear all selected text 2762 * Clear all selected text
2967 * EXT: SelectionClear 2763 * EXT: SelectionClear
2968 */ 2764 */
2969void 2765void
2970rxvt_term::selection_clear (bool clipboard) NOTHROW 2766rxvt_term::selection_clear (bool clipboard) noexcept
2971{ 2767{
2972 if (!clipboard) 2768 if (!clipboard)
2973 { 2769 {
2974 want_refresh = 1; 2770 want_refresh = 1;
2975 free (selection.text); 2771 free (selection.text);
… …
3060 if (*t == NOCHAR) 2856 if (*t == NOCHAR)
3061 t++; 2857 t++;
3062#if ENABLE_COMBINING 2858#if ENABLE_COMBINING
3063 else if (IS_COMPOSE (*t)) 2859 else if (IS_COMPOSE (*t))
3064 { 2860 {
3065 int len = rxvt_composite.expand (*t, 0); 2861 int len = rxvt_composite.expand (*t);
3066 2862
3067 extra -= (len - 1); 2863 extra -= (len - 1);
3068 2864
3069 if (extra < 0) 2865 if (extra < 0)
3070 { 2866 {
… …
3117 2913
3118 selection_grab (tm); 2914 selection_grab (tm);
3119} 2915}
3120 2916
3121bool 2917bool
3122rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2918rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
3123{ 2919{
3124 Atom sel; 2920 Atom sel;
3125 2921
3126 if (!clipboard) 2922 if (!clipboard)
3127 { 2923 {
… …
3160/* ------------------------------------------------------------------------- */ 2956/* ------------------------------------------------------------------------- */
3161/* 2957/*
3162 * Mark or select text based upon number of clicks: 1, 2, or 3 2958 * Mark or select text based upon number of clicks: 1, 2, or 3
3163 * EXT: button 1 press 2959 * EXT: button 1 press
3164 */ 2960 */
3165void 2961void ecb_cold
3166rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2962rxvt_term::selection_click (int clicks, int x, int y) noexcept
3167{ 2963{
3168 clicks = ((clicks - 1) % 3) + 1; 2964 clicks = ((clicks - 1) % 3) + 1;
3169 selection.clicks = clicks; /* save clicks so extend will work */ 2965 selection.clicks = clicks; /* save clicks so extend will work */
3170 2966
3171 if (clicks == 2 && !selection.rect 2967 if (clicks == 2 && !selection.rect
… …
3189 2985
3190/* ------------------------------------------------------------------------- */ 2986/* ------------------------------------------------------------------------- */
3191/* 2987/*
3192 * Mark a selection at the specified col/row 2988 * Mark a selection at the specified col/row
3193 */ 2989 */
3194void 2990void ecb_cold
3195rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2991rxvt_term::selection_start_colrow (int col, int row) noexcept
3196{ 2992{
3197 want_refresh = 1; 2993 want_refresh = 1;
3198 2994
3199 selection.mark.row = row + view_start; 2995 selection.mark.row = row + view_start;
3200 selection.mark.col = col; 2996 selection.mark.col = col;
… …
3222 * Word select: select text for 2 clicks 3018 * Word select: select text for 2 clicks
3223 * We now only find out the boundary in one direction 3019 * We now only find out the boundary in one direction
3224 */ 3020 */
3225 3021
3226/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3022/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3227#define DELIMIT_TEXT(x) \ 3023#define DELIMIT_TEXT(x) \
3228 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3024 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3229#define DELIMIT_REND(x) 1 3025#define DELIMIT_REND(x) 1
3230 3026
3231void 3027void ecb_cold
3232rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3028rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3233{ 3029{
3234 int col, row, dirnadd, tcol, trow, w1, w2; 3030 int col, row, dirnadd, tcol, trow, w1, w2;
3235 row_col_t bound; 3031 row_col_t bound;
3236 text_t *stp; 3032 text_t *stp;
3237 rend_t *srp; 3033 rend_t *srp;
… …
3310 * EXT: button 3 press; button 1 or 3 drag 3106 * EXT: button 3 press; button 1 or 3 drag
3311 * flag == 0 ==> button 1 3107 * flag == 0 ==> button 1
3312 * flag == 1 ==> button 3 press 3108 * flag == 1 ==> button 3 press
3313 * flag == 2 ==> button 3 motion 3109 * flag == 2 ==> button 3 motion
3314 */ 3110 */
3315void 3111void ecb_cold
3316rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3112rxvt_term::selection_extend (int x, int y, int flag) noexcept
3317{ 3113{
3318 int col = clamp (Pixel2Col (x), 0, ncol); 3114 int col = clamp (Pixel2Col (x), 0, ncol);
3319 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3115 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3320 3116
3321 /* 3117 /*
… …
3346 3142
3347/* ------------------------------------------------------------------------- */ 3143/* ------------------------------------------------------------------------- */
3348/* 3144/*
3349 * Extend the selection to the specified col/row 3145 * Extend the selection to the specified col/row
3350 */ 3146 */
3351void 3147void ecb_cold
3352rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3148rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3353{ 3149{
3354 row_col_t pos; 3150 row_col_t pos;
3355 enum { 3151 enum {
3356 LEFT, RIGHT 3152 LEFT, RIGHT
3357 } closeto = RIGHT; 3153 } closeto = RIGHT;
3358
3359 want_refresh = 1;
3360 3154
3361 switch (selection.op) 3155 switch (selection.op)
3362 { 3156 {
3363 case SELECTION_INIT: 3157 case SELECTION_INIT:
3364 CLEAR_SELECTION (); 3158 CLEAR_SELECTION ();
… …
3544 3338
3545#if !ENABLE_MINIMAL 3339#if !ENABLE_MINIMAL
3546 if (selection.rect && selection.beg.col > selection.end.col) 3340 if (selection.rect && selection.beg.col > selection.end.col)
3547 ::swap (selection.beg.col, selection.end.col); 3341 ::swap (selection.beg.col, selection.end.col);
3548#endif 3342#endif
3343
3344 selection_changed ();
3549} 3345}
3550 3346
3551#if !ENABLE_MINIMAL 3347#if !ENABLE_MINIMAL
3552void 3348void ecb_cold
3553rxvt_term::selection_remove_trailing_spaces () NOTHROW 3349rxvt_term::selection_remove_trailing_spaces () noexcept
3554{ 3350{
3555 int32_t end_col, end_row; 3351 int32_t end_col, end_row;
3556 text_t *stp; 3352 text_t *stp;
3557 3353
3558 end_col = selection.end.col; 3354 end_col = selection.end.col;
… …
3595/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3596/* 3392/*
3597 * Double click on button 3 when already selected 3393 * Double click on button 3 when already selected
3598 * EXT: button 3 double click 3394 * EXT: button 3 double click
3599 */ 3395 */
3600void 3396void ecb_cold
3601rxvt_term::selection_rotate (int x, int y) NOTHROW 3397rxvt_term::selection_rotate (int x, int y) noexcept
3602{ 3398{
3603 selection.clicks = selection.clicks % 3 + 1; 3399 selection.clicks = selection.clicks % 3 + 1;
3604 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3400 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3605} 3401}
3606 3402
3607/* ------------------------------------------------------------------------- */ 3403/* ------------------------------------------------------------------------- */
3608/* 3404/*
3609 * Respond to a request for our current selection 3405 * Respond to a request for our current selection
3610 * EXT: SelectionRequest 3406 * EXT: SelectionRequest
3611 */ 3407 */
3612void 3408void ecb_cold
3613rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3409rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3614{ 3410{
3411 Atom property = rq.property == None ? rq.target : rq.property;
3615 XSelectionEvent ev; 3412 XSelectionEvent ev;
3616 3413
3617 ev.type = SelectionNotify; 3414 ev.type = SelectionNotify;
3618 ev.property = None; 3415 ev.property = None;
3619 ev.display = rq.display; 3416 ev.display = rq.display;
… …
3634 *target++ = xa[XA_COMPOUND_TEXT]; 3431 *target++ = xa[XA_COMPOUND_TEXT];
3635#if X_HAVE_UTF8_STRING 3432#if X_HAVE_UTF8_STRING
3636 *target++ = xa[XA_UTF8_STRING]; 3433 *target++ = xa[XA_UTF8_STRING];
3637#endif 3434#endif
3638 3435
3639 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3436 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3640 32, PropModeReplace, 3437 32, PropModeReplace,
3641 (unsigned char *)target_list, target - target_list); 3438 (unsigned char *)target_list, target - target_list);
3642 ev.property = rq.property; 3439 ev.property = property;
3643 } 3440 }
3644#if TODO // TODO 3441#if TODO // TODO
3645 else if (rq.target == xa[XA_MULTIPLE]) 3442 else if (rq.target == xa[XA_MULTIPLE])
3646 { 3443 {
3647 /* TODO: Handle MULTIPLE */ 3444 /* TODO: Handle MULTIPLE */
3648 } 3445 }
3649#endif 3446#endif
3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3651 { 3448 {
3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3653 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3450 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property; 3451 ev.property = property;
3655 } 3452 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 { 3454 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3456 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3660 ev.property = rq.property; 3457 ev.property = property;
3661 } 3458 }
3662 else if (rq.target == XA_STRING 3459 else if (rq.target == XA_STRING
3663 || rq.target == xa[XA_TEXT] 3460 || rq.target == xa[XA_TEXT]
3664 || rq.target == xa[XA_COMPOUND_TEXT] 3461 || rq.target == xa[XA_COMPOUND_TEXT]
3665 || rq.target == xa[XA_UTF8_STRING] 3462 || rq.target == xa[XA_UTF8_STRING]
… …
3709 cl = selection.clip_text; 3506 cl = selection.clip_text;
3710 selectlen = selection.clip_len; 3507 selectlen = selection.clip_len;
3711 } 3508 }
3712 else 3509 else
3713 { 3510 {
3714 cl = L""; 3511 cl = (wchar_t *)L"";
3715 selectlen = 0; 3512 selectlen = 0;
3716 } 3513 }
3717 3514
3718#if !ENABLE_MINIMAL 3515#if !ENABLE_MINIMAL
3719 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3516 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3736 ct.value = (unsigned char *)cl; 3533 ct.value = (unsigned char *)cl;
3737 ct.nitems = selectlen; 3534 ct.nitems = selectlen;
3738 ct.encoding = target; 3535 ct.encoding = target;
3739 } 3536 }
3740 3537
3741 XChangeProperty (dpy, rq.requestor, rq.property, 3538 XChangeProperty (dpy, rq.requestor, property,
3742 ct.encoding, 8, PropModeReplace, 3539 ct.encoding, 8, PropModeReplace,
3743 ct.value, (int)ct.nitems); 3540 ct.value, (int)ct.nitems);
3744 ev.property = rq.property; 3541 ev.property = property;
3745 3542
3746 if (freect) 3543 if (freect)
3747 XFree (ct.value); 3544 XFree (ct.value);
3748 } 3545 }
3749 3546
3750 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3547 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3751} 3548}
3752 3549
3753/* ------------------------------------------------------------------------- */ 3550/* ------------------------------------------------------------------------- */
3754#ifdef USE_XIM 3551#if USE_XIM
3755void 3552void ecb_cold
3756rxvt_term::im_set_position (XPoint &pos) NOTHROW 3553rxvt_term::im_set_position (XPoint &pos) noexcept
3757{ 3554{
3758 XWindowAttributes xwa; 3555 XWindowAttributes xwa;
3759 3556
3760 XGetWindowAttributes (dpy, vt, &xwa); 3557 XGetWindowAttributes (dpy, vt, &xwa);
3761 3558
… …
3764} 3561}
3765#endif 3562#endif
3766 3563
3767#if ENABLE_OVERLAY 3564#if ENABLE_OVERLAY
3768void 3565void
3769rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3566rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3770{ 3567{
3771 if (nrow < 1 || ncol < 1) 3568 if (nrow < 1 || ncol < 1)
3772 return; 3569 return;
3773 3570
3774 want_refresh = 1; 3571 want_refresh = 1;
… …
3819 *rp = r; 3616 *rp = r;
3820 } 3617 }
3821} 3618}
3822 3619
3823void 3620void
3824rxvt_term::scr_overlay_off () NOTHROW 3621rxvt_term::scr_overlay_off () noexcept
3825{ 3622{
3826 if (!ov.text) 3623 if (!ov.text)
3827 return; 3624 return;
3828 3625
3829 want_refresh = 1; 3626 want_refresh = 1;
… …
3837 delete [] ov.text; ov.text = 0; 3634 delete [] ov.text; ov.text = 0;
3838 delete [] ov.rend; ov.rend = 0; 3635 delete [] ov.rend; ov.rend = 0;
3839} 3636}
3840 3637
3841void 3638void
3842rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3843{ 3640{
3844 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3641 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3845 return; 3642 return;
3846 3643
3847 x++, y++; 3644 x++, y++;
… …
3849 ov.text[y][x] = text; 3646 ov.text[y][x] = text;
3850 ov.rend[y][x] = rend; 3647 ov.rend[y][x] = rend;
3851} 3648}
3852 3649
3853void 3650void
3854rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3651rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3855{ 3652{
3856 while (*s) 3653 while (*s)
3857 scr_overlay_set (x++, y, *s++); 3654 scr_overlay_set (x++, y, *s++);
3858} 3655}
3859 3656
3860void 3657void
3861rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3658rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3862{ 3659{
3863 while (*s) 3660 while (*s)
3864 { 3661 {
3865 text_t t = *s++; 3662 text_t t = *s++;
3866 int width = WCWIDTH (t); 3663 int width = WCWIDTH (t);
… …
3872 } 3669 }
3873 } 3670 }
3874} 3671}
3875 3672
3876void 3673void
3877rxvt_term::scr_swap_overlay () NOTHROW 3674rxvt_term::scr_swap_overlay () noexcept
3878{ 3675{
3879 if (!ov.text) 3676 if (!ov.text)
3880 return; 3677 return;
3881 3678
3882 // hide cursor if it is within the overlay area 3679 // hide cursor if it is within the overlay area

Diff Legend

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