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.382 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.472 by root, Mon Aug 8 10:33:14 2022 UTC

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

Diff Legend

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