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.338 by sf-exg, Sat Apr 3 16:30:39 2010 UTC vs.
Revision 1.460 by sf-exg, Thu May 13 19:40:20 2021 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
33#include "salloc.C" // HACK, should be a seperate compile! 34static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
41/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
45 43
46/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
… …
97 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
98 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
99 97
100/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
101void 99void
102rxvt_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
103{ 101{
104 if (!l.t) 102 if (!l.valid ())
105 { 103 {
106 lalloc (l); 104 l.alloc ();
107 col = 0; 105 col = 0;
108 width = ncol; 106 width = ncol;
109 } 107 }
110 108
111 l.touch (); 109 l.touch ();
… …
124} 122}
125 123
126/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
127/* 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 */
128void 126void
129rxvt_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
130{ 128{
131 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
132 130
133 l.l = 0; 131 l.l = 0;
134 l.f = 0; 132 l.f = 0;
135} 133}
136 134
137// nuke a single wide character at the given column 135// nuke a single wide character at the given column
138void 136void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
140{ 138{
141 // find begin 139 // find begin
142 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 141 col--;
144 142
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
145
146 l.touch ();
147 147
148 // found start, nuke 148 // found start, nuke
149 do { 149 do {
150 l.t[col] = ' '; 150 l.t[col] = ' ';
151 l.r[col] = rend; 151 l.r[col] = rend;
152 col++; 152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
154} 154}
155 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
156/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
159 169
160void 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
161rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
162{ 216{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
163 view_start = 0; 221 view_start = 0;
164 num_scr = 0; 222 num_scr = 0;
165 223
166 if (ncol == 0) 224 if (ncol == 0)
167 ncol = 80; 225 ncol = 80;
… …
187 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
188 246
189 screen.tscroll = 0; 247 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
191 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
192 if (!row_buf) 258 if (!prev_row_buf)
193 { 259 {
194 /*
195 * first time called so just malloc everything: don't rely on realloc
196 */
197 top_row = 0; 260 top_row = 0;
198 term_start = 0; 261 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 262
214 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
240 { 289 {
241 /* 290 /*
242 * add or delete rows as appropriate 291 * add or delete rows as appropriate
243 */ 292 */
244 293
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247
248#if 0
249 if (nrow < prev_nrow)
250 {
251 for (int row = nrow; row < prev_nrow; row++)
252 {
253 lfree (swap_buf [row]);
254 lfree (drawn_buf[row]);
255 }
256 }
257#endif
258
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 295
262 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
263 { 297 {
264 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
265 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
266 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
267 301
268 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
269 { 303 }
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf;
275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 304
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
280 308
… …
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 317
290 do 318 do
291 { 319 {
292 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
293 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294 int plines = 1; 322 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 324
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 326 {
299 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
300 328
301 plines++; 329 plines++;
302 llen += prev_ncol; 330 llen += prev_ncol;
… …
315 343
316 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
318 { 346 {
319 qline = row_buf + qrow; 347 qline = row_buf + qrow;
320 lalloc (*qline); 348 qline->alloc (); // redundant with next line
321 qline->l = ncol; 349 qline->l = ncol;
322 qline->is_longer (1); 350 qline->is_longer (1);
323 351
324 int qcol = 0; 352 int qcol = 0;
325 353
… …
340 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
341 // least. 369 // least.
342 if (prow == ocur.row) 370 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
344 372
345 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
346 374
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 376
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 399 {
372 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
373 401
374 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
375 { 403 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
378 406
379 qline = pline; 407 copy_line (dst, src);
380 lresize (qline);
381 } 408 }
382 409
383 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 412
388 term_start = 0; 413 term_start = 0;
389 } 414 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 415
395 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 418 }
398 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
399 free (tabs); 429 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
401 431
402 for (int col = ncol; --col; ) 432 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
404 434
405 CLEAR_ALL_SELECTION (); 435 CLEAR_ALL_SELECTION ();
406 436
407 prev_nrow = nrow; 437 prev_nrow = nrow;
… …
410 tt_winch (); 440 tt_winch ();
411 441
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 443}
414 444
415/* ------------------------------------------------------------------------- */ 445void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
421{ 447{
422 if (row_buf) 448 chunk_free (chunk, chunk_size);
423 { 449 chunk = 0;
424 delete talloc; talloc = 0; 450 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 451
427 free (row_buf);
428 free (swap_buf);
429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
432 free (tabs); 452 free (tabs);
433 tabs = 0; 453 tabs = 0;
434 }
435} 454}
436 455
437/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
438/* 457/*
439 * Hard/Soft reset 458 * Hard/Soft reset
440 */ 459 */
441void 460void ecb_cold
442rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
443{ 462{
444 scr_release (); 463 scr_release ();
464
445 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 466 rvideo_mode = false;
447 scr_soft_reset (); 467 scr_soft_reset ();
448 scr_reset (); 468 scr_reset ();
449 469
450 scr_clear (true); 470 scr_clear (true);
451 scr_refresh (); 471 scr_refresh ();
452} 472}
453 473
454void 474void ecb_cold
455rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () noexcept
456{ 476{
457 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
459 scr_overlay_off (); 479 scr_overlay_off ();
460#endif 480#endif
… …
474 * Save and Restore cursor 494 * Save and Restore cursor
475 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
476 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
477 */ 497 */
478void 498void
479rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
480{ 500{
481 screen_t *s; 501 screen_t *s;
482 502
483#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
484 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
515 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
516 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
517} 537}
518 538
519void 539void
520rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () noexcept
521{ 541{
522 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
523 return; 543 return;
524 544
525 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
544 return; 564 return;
545 565
546 want_refresh = 1; 566 want_refresh = 1;
547 view_start = 0; 567 view_start = 0;
548 568
549 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
550 575
551 current_screen = scrn; 576 current_screen = scrn;
552 577
553#if NSCREENS 578#if NSCREENS
554 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
568 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
569} 594}
570 595
571// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
572void 597void
573rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
574{ 599{
575 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
576 return; 601 return;
577 602
578 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
588/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
589/* 614/*
590 * Change the colour for following text 615 * Change the colour for following text
591 */ 616 */
592void 617void
593rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
594{ 619{
595 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
596 color = fgbg; 621 color = fgbg;
597 622
598 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
599 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
600 else 625 else
… …
604/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
605/* 630/*
606 * Change the rendition style for following text 631 * Change the rendition style for following text
607 */ 632 */
608void 633void
609rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
610{ 635{
611 if (set) 636 if (set)
612 rstyle |= style; 637 rstyle |= style;
613 else if (style == ~RS_None) 638 else if (style == ~RS_None)
614 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
… …
620/* 645/*
621 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
622 * count positive ==> scroll up 647 * count positive ==> scroll up
623 * count negative ==> scroll down 648 * count negative ==> scroll down
624 */ 649 */
625int 650int ecb_hot
626rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
627{ 652{
628 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
629 return 0; 654 return 0;
630 655
631 want_refresh = 1; 656 want_refresh = 1;
… …
633 658
634 if (count > 0 659 if (count > 0
635 && row1 == 0 660 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
638 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 666
643 // sever bottommost line 667 // sever bottommost line
644 { 668 {
645 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
646 l.is_longer (0); 670 l.is_longer (0);
647 l.touch (); 671 l.touch ();
648 } 672 }
649 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
650 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 690 for (int i = count; i--; )
652 { 691 {
653 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
654 693
655 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
657 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 697 {
659 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 699 l.l = 0;
… …
662 } 701 }
663 else 702 else
664 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
665 } 704 }
666 705
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
679 // move and/or clear selection, if any 706 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
681 { 709 {
682 selection.beg.row -= count; 710 selection.beg.row -= count;
683 selection.end.row -= count; 711 selection.end.row -= count;
684 selection.mark.row -= count; 712 selection.mark.row -= count;
685 713
686 if (selection.beg.row < top_row 714 selection_check (0);
687 || selection.end.row < top_row
688 || selection.mark.row < top_row)
689 {
690 CLEAR_ALL_SELECTION ();
691 selection.op = SELECTION_CLEAR;
692 }
693 } 715 }
694 716
695 // finally move the view window, if desired 717 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 719 && view_start != 0
698 && view_start != -saveLines) 720 && view_start != -saveLines)
699 scr_page (UP, count); 721 scr_page (count);
700 722
701 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
702 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
703 } 725 }
704 else 726 else
… …
727 } 749 }
728 750
729 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
731 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
732 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
733 763
734 min_it (count, rows); 764 min_it (count, rows);
735 765
736 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 767
738 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
739 { 769 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 771
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 774 }
745 775
746 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
748 } 785 }
749 786
750 return count; 787 return count;
751} 788}
752 789
753/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
754/* 791/*
755 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
756 */ 793 */
757void 794void ecb_hot
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
759{ 796{
760 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
761 return; 798 return;
762 799
763 unsigned char checksel; 800 bool checksel;
764 unicode_t c; 801 unicode_t c;
765 int ncol = this->ncol; 802 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
767 804
768 want_refresh = 1; 805 want_refresh = 1;
… …
794 831
795 while (str < strend) 832 while (str < strend)
796 { 833 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 835
799 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 837 if (c == C0_LF)
801 { 838 {
802 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
803 840
804 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
823 { 860 {
824 scr_tab (1, true); 861 scr_tab (1, true);
825 continue; 862 continue;
826 } 863 }
827 864
828 if (expect_false ( 865 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 869 ))
833 { 870 {
… …
838 * should be a similar check. 875 * should be a similar check.
839 */ 876 */
840 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
841 } 878 }
842 879
843 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 881 {
845 scr_do_wrap (); 882 scr_do_wrap ();
846 883
847 line->l = ncol; 884 line->l = ncol;
848 line->is_longer (1); 885 line->is_longer (1);
… …
850 row = screen.cur.row; 887 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
852 } 889 }
853 890
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 893 c = 0xfffd;
857 894
858 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
861 // locale. 898 // locale.
862 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
863 900
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 902 {
866 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 904 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
884 } 921 }
885 } 922 }
886 923
887 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
889 926
890 if (width != 0) 927 if (width != 0)
891 { 928 {
892#if !UNICODE_3 929#if !UNICODE_3
… …
897# else 934# else
898 c = 0xfffd; 935 c = 0xfffd;
899# endif 936# endif
900#endif 937#endif
901 938
939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
940
941 // if the character doesn't fit into the remaining columns...
942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
943 {
944 if (screen.flags & Screen_Autowrap)
945 {
946 // ... artificially enlargen the previous one
947 c = NOCHAR;
948 // and try the same character next loop iteration
949 --str;
950 }
951 else
952 screen.cur.col = ncol - width;
953 }
954
902 // nuke the character at this position, if required 955 // nuke the character at this position, if required
903 if (expect_false ( 956 // due to wonderful coincidences everywhere else in this loop
957 // we never have to check for overwriting a wide char itself,
958 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 {
915 // ... artificially enlargen the previous one
916 c = NOCHAR;
917 // and try the same character next loop iteration
918 --str;
919 }
920 961
921 line->touch (); 962 line->touch ();
922 963
923 do 964 do
924 { 965 {
925 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
927 968
928 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 970 screen.cur.col++;
930 else 971 else
931 { 972 {
932 line->l = ncol; 973 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 975 screen.flags |= Screen_WrapNext;
935 break; 976
977 goto end_of_line;
936 } 978 }
937 979
938 c = NOCHAR; 980 c = NOCHAR;
939 } 981 }
940 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
941 983
942 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 986 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 987 line->t[c] = ' ';
950 line->r[c] = rend; 988 line->r[c] = rend;
951 }
952 } 989 }
990
991end_of_line:
992 ;
953 } 993 }
954#if ENABLE_COMBINING 994#if ENABLE_COMBINING
955 else // width == 0 995 else // width == 0
956 { 996 {
957 if (c != 0xfeff) // ignore BOM 997 if (c != 0xfeff) // ignore BOM
… …
972 } 1012 }
973 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
975 { 1015 {
976 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
978 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
979 } 1019 }
980 else 1020 else
981 continue; 1021 continue;
982 1022
983 linep->touch (); 1023 linep->touch ();
… …
1006/* 1046/*
1007 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
1008 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1009 */ 1049 */
1010void 1050void
1011rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1012{ 1052{
1013 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1014 { 1054 {
1015 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1016 { 1056 {
… …
1020 1060
1021 want_refresh = 1; 1061 want_refresh = 1;
1022#endif 1062#endif
1023 } 1063 }
1024 } 1064 }
1065 else if (screen.flags & Screen_WrapNext)
1066 screen.flags &= ~Screen_WrapNext;
1025 else 1067 else
1026 scr_gotorc (0, -1, RELATIVE); 1068 scr_gotorc (0, -1, RELATIVE);
1027} 1069}
1028 1070
1029/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
… …
1031 * Process Horizontal Tab 1073 * Process Horizontal Tab
1032 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1033 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1034 */ 1076 */
1035void 1077void
1036rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1037{ 1079{
1038 int i, x; 1080 int i, x;
1039 1081
1040 want_refresh = 1; 1082 want_refresh = 1;
1041 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1107 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1108 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1109 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1110 */ 1152 */
1111#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1112void 1154void ecb_cold
1113rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1114{ 1156{
1115 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1116 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1117 else 1159 else
1118 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1124 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1125 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1126 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1127 */ 1169 */
1128#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1129void 1171void ecb_cold
1130rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1131{ 1173{
1132 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1133 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1134 else 1176 else
1135 { 1177 {
… …
1148/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1149/* 1191/*
1150 * Goto Row/Column 1192 * Goto Row/Column
1151 */ 1193 */
1152void 1194void
1153rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1154{ 1196{
1155 want_refresh = 1; 1197 want_refresh = 1;
1156 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1157 1199
1158 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1197/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1198/* 1240/*
1199 * direction should be UP or DN 1241 * direction should be UP or DN
1200 */ 1242 */
1201void 1243void
1202rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1203{ 1245{
1204 int dirn;
1205
1206 want_refresh = 1; 1246 want_refresh = 1;
1207 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1208 1248
1209 dirn = ((direction == UP) ? 1 : -1);
1210
1211 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1212 1250
1213 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1214 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1215 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1216 else 1254 else
1217 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1218 1256
1219 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1220 selection_check (0); 1258 selection_check (0);
1221} 1259}
1222 1260
… …
1227 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1228 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1229 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1230 */ 1268 */
1231void 1269void
1232rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1233{ 1271{
1234 unsigned int col, num; 1272 unsigned int col, num;
1235 1273
1236 want_refresh = 1; 1274 want_refresh = 1;
1237 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1285 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1286} 1324}
1287 1325
1288/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1289/* 1327/*
1290 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1291 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1292 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1293 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1294 */ 1332 */
1295void 1333void
1296rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1297{ 1335{
1298 int num; 1336 int num;
1299 int32_t row; 1337 int32_t row;
1300 rend_t ren; 1338 rend_t ren;
1301 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1304 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1305 1343
1306 switch (mode) 1344 switch (mode)
1307 { 1345 {
1308 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1347 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1349 num = nrow - row;
1313 break; 1350 break;
1314 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1352 scr_erase_line (1);
1317 row = 0; 1353 row = 0;
1318 num = screen.cur.row; 1354 num = screen.cur.row;
1319 break; 1355 break;
1320 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1357 row = 0;
1323 num = nrow; 1358 num = nrow;
1324 break; 1359 break;
1325 default: 1360 default:
1326 return; 1361 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1370 if (row >= nrow) /* Out Of Bounds */
1336 return; 1371 return;
1337 1372
1338 min_it (num, nrow - row); 1373 min_it (num, nrow - row);
1339 1374
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1378 {
1347 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1348 1380
1349 if (mapped && !view_start) 1381 if (mapped)
1350 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1352 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1353 } 1385 }
1354 else 1386 else
1355 { 1387 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1389
1358 if (mapped && !view_start) 1390 if (mapped)
1359 { 1391 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1364 (unsigned int)width, 1396 (unsigned int)vt_width,
1365 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1366 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 } 1400 }
1369 } 1401 }
1370 1402
1371 for (; num--; row++) 1403 for (; num--; row++)
1372 { 1404 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1405 scr_blank_screen_mem (ROW(row), rstyle);
1374 1406
1375 if (!view_start) 1407 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1408 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1409 }
1378} 1410}
1379 1411
1380#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1381void 1413void
1382rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1383{ 1415{
1384 want_refresh = 1; 1416 want_refresh = 1;
1385 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1386 1418
1387 top_row = 0; 1419 top_row = 0;
… …
1391/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1392/* 1424/*
1393 * Fill the screen with `E's 1425 * Fill the screen with `E's
1394 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1395 */ 1427 */
1396void 1428void ecb_cold
1397rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1398{ 1430{
1399 rend_t fs; 1431 rend_t fs;
1400 1432
1401 want_refresh = 1; 1433 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1403 1435
1404 num_scr_allow = 0; 1436 num_scr_allow = 0;
1405 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1406 1442
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1409 { 1445 {
1410 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1423/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1424/* 1460/*
1425 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1426 */ 1462 */
1427void 1463void
1428rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1429{ 1465{
1430 int end; 1466 int end;
1431 1467
1432 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1433 1469
… …
1453/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1454/* 1490/*
1455 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1456 */ 1492 */
1457void 1493void
1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1459{ 1495{
1460 want_refresh = 1; 1496 want_refresh = 1;
1461 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1462 1498
1463 if (count <= 0) 1499 if (count <= 0)
… …
1561/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1562/* 1598/*
1563 * Set the scrolling region 1599 * Set the scrolling region
1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1565 */ 1601 */
1566void 1602void ecb_cold
1567rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1568{ 1604{
1569 max_it (top, 0); 1605 max_it (top, 0);
1570 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1571 1607
1572 if (top > bot) 1608 if (top > bot)
… …
1581/* 1617/*
1582 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1585 */ 1621 */
1586void 1622void ecb_cold
1587rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1588{ 1624{
1589 want_refresh = 1; 1625 want_refresh = 1;
1590 1626
1591 if (mode) 1627 if (mode)
1592 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1598/* 1634/*
1599 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1602 */ 1638 */
1603void 1639void ecb_cold
1604rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1605{ 1641{
1606 if (mode) 1642 if (mode)
1607 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1608 else 1644 else
1609 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1617 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1618 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1621 */ 1657 */
1622void 1658void ecb_cold
1623rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1624{ 1660{
1625 if (mode) 1661 if (mode)
1626 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1627 else 1663 else
1628 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1634/* 1670/*
1635 * Set insert/replace mode 1671 * Set insert/replace mode
1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1638 */ 1674 */
1639void 1675void ecb_cold
1640rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1641{ 1677{
1642 if (mode) 1678 if (mode)
1643 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1644 else 1680 else
1645 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1650 * Set/Unset tabs 1686 * Set/Unset tabs
1651 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1654 */ 1690 */
1655void 1691void ecb_cold
1656rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1657{ 1693{
1658 if (mode < 0) 1694 if (mode < 0)
1659 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1660 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1661 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
… …
1666 * Set reverse/normal video 1702 * Set reverse/normal video
1667 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1668 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1669 */ 1705 */
1670void 1706void
1671rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1672{ 1708{
1673 rvideo_mode = on; 1709 rvideo_mode = on;
1674 1710
1675#ifndef NO_BELL 1711#ifndef NO_BELL
1676 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
… …
1678 1714
1679 if (rvideo_state != on) 1715 if (rvideo_state != on)
1680 { 1716 {
1681 rvideo_state = on; 1717 rvideo_state = on;
1682 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1685 if (bgPixmap.pixmap == None) 1729 if (bg_img == 0)
1686#endif 1730#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1732
1689 XGCValues gcvalue; 1733 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
… …
1699/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1700/* 1744/*
1701 * Report current cursor position 1745 * Report current cursor position
1702 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1703 */ 1747 */
1704void 1748void ecb_cold
1705rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1706{ 1750{
1707 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1708} 1752}
1709 1753
1710/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1712 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1713 1757
1714/* 1758/*
1715 * Set font style 1759 * Set font style
1716 */ 1760 */
1717void 1761void ecb_cold
1718rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1719{ 1763{
1720#if 0 1764#if 0
1721 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1722 { 1766 {
1723 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1744 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1745 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1746 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1747 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1748 */ 1792 */
1749void 1793void ecb_cold
1750rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1751{ 1795{
1752 screen.charset = set; 1796 screen.charset = set;
1753 set_font_style (); 1797 set_font_style ();
1754} 1798}
1755 1799
… …
1761 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1762 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1763 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1764 */ 1808 */
1765void 1809void
1766rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1767{ 1811{
1768 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1769 set_font_style (); 1813 set_font_style ();
1770} 1814}
1771 1815
… …
1775 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1776 1820
1777/* 1821/*
1778 * refresh matching text. 1822 * refresh matching text.
1779 */ 1823 */
1780bool 1824bool ecb_cold
1781rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1782{ 1826{
1783 bool found = false; 1827 bool found = false;
1784 1828
1785 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1786 { 1830 {
… …
1804 PART_BEG = 0, 1848 PART_BEG = 0,
1805 PART_END, 1849 PART_END,
1806 RC_COUNT 1850 RC_COUNT
1807}; 1851};
1808 1852
1809void 1853void ecb_hot
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1811{ 1855{
1812 int i; 1856 int i;
1813 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1814 1858
1815 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1849/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1850/* 1894/*
1851 * Refresh the entire screen 1895 * Refresh the entire screen
1852 */ 1896 */
1853void 1897void
1854rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1855{ 1899{
1856 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1857} 1901}
1858 1902
1859/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1860/* 1904/*
1861 * Move the display so that the line represented by scrollbar value Y is at 1905 * Move the display so that the line represented by scrollbar value Y is at
1862 * the top of the screen 1906 * the top of the screen
1863 */ 1907 */
1864void 1908void
1865rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1866{ 1910{
1867 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1868} 1913}
1869 1914
1870/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1871/* 1916/*
1872 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1873 * direction should be UP or DN 1918 * direction should be UP or DN
1874 */ 1919 */
1875bool 1920bool
1876rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1877{ 1922{
1878 int new_view_start =
1879 direction == UP ? view_start - nlines
1880 : view_start + nlines;
1881
1882 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1883} 1924}
1884 1925
1885bool 1926bool
1886rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1887{ 1928{
1888 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1889 1930
1890 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1891 return false; 1932 return false;
… …
1909} 1950}
1910#endif 1951#endif
1911 1952
1912/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1913void 1954void
1914rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1915{ 1956{
1916#ifndef NO_BELL 1957#ifndef NO_BELL
1917 1958
1918# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1961 if (option (Opt_mapAlert))
1921# endif 1962# endif
1922 XMapWindow (dpy, parent[0]); 1963 XMapWindow (dpy, parent);
1923# endif 1964# endif
1924 1965
1925# if ENABLE_FRILLS 1966# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1967 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1968 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1982#endif
1942} 1983}
1943 1984
1944/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */ 1986void ecb_cold
1946void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1948{ 1988{
1949#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1950 int nrows, row_start; 1990 int nrows, row_start;
1951 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1952 1992
… …
2000/* 2040/*
2001 * Refresh the screen 2041 * Refresh the screen
2002 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2003 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2044 */
2005void 2045void ecb_hot
2006rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2007{ 2047{
2008 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2009 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2010 int i; /* tmp */ 2050 int i; /* tmp */
2011#ifndef NO_CURSORCOLOR
2012 rend_t cc1; /* store colours at cursor position (s) */
2013#endif
2014 rend_t *crp; // cursor rendition pointer
2015 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2016 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2017 2056
2018 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2019 2058
2020 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2021 return; 2060 return;
… …
2024 * A: set up vars 2063 * A: set up vars
2025 */ 2064 */
2026 refresh_count = 0; 2065 refresh_count = 0;
2027 2066
2028 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2068 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2031 have_bg = bgPixmap.pixmap != None; 2070 have_bg = bg_img != 0;
2032#endif 2071#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2073
2035 /* 2074 /*
2036 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2081 scr_swap_overlay ();
2043#endif 2082#endif
2044 2083
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2085
2047 /* 2086 /*
2048 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2049 */ 2088 */
2050 { 2089 {
2051 unsigned char setoldcursor;
2052
2053#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2091 if (hidden_cursor)
2055 showcursor = 0; 2092 showcursor = 0;
2056#endif 2093#endif
2057 2094
… …
2060 int col = screen.cur.col; 2097 int col = screen.cur.col;
2061 2098
2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2063 col--; 2100 col--;
2064 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2065 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2066 2109
2067#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2071 else 2113 else
2072#endif 2114#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2085 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2086#else 2128#else
2087 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2088#endif 2130#endif
2089 2131
2090 if (focus) 2132 if (focus && cursor_type == 0)
2091 { 2133 {
2092 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2093 *crp ^= RS_Uline; 2135
2094 else
2095 {
2096 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2097 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2098 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2099 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2100 } 2141 }
2101 } 2142 }
2102 2143
2103 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2104 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2105 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2106 { 2153 {
2107 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2108 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2109 {
2110 if (ocrow < nrow
2111 && oldcursor.col < ncol)
2112 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2113
2114 if (focus || !showcursor)
2115 oldcursor.row = -1;
2116 else
2117 setoldcursor = 1;
2118 }
2119 } 2156 }
2120 else if (!focus) 2157 else
2121 setoldcursor = 1;
2122
2123 if (setoldcursor)
2124 {
2125 if (screen.cur.row - view_start >= nrow)
2126 oldcursor.row = -1; 2158 oldcursor.row = -1;
2127 else
2128 {
2129 oldcursor.row = screen.cur.row - view_start;
2130 oldcursor.col = screen.cur.col;
2131 }
2132 }
2133 } 2159 }
2134 2160
2135#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2136 /* 2162 /*
2137 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2143 { 2169 {
2144 int16_t nits; 2170 int16_t nits;
2145 int i = num_scr; 2171 int i = num_scr;
2146 int j; 2172 int j;
2147 int len, wlen; 2173 int len, wlen;
2148 dLocal (int, num_scr);
2149 2174
2150 j = nrow; 2175 j = nrow;
2151 wlen = len = -1; 2176 wlen = len = -1;
2152 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2153 2178
… …
2219 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2220 2245
2221 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2222 { 2247 {
2223 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2224 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2225 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2226 || (stp[col] == ' ' /* space w/ no background change */
2227 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2228 continue; 2250 continue;
2229 2251
2230 // redraw one or more characters 2252 // redraw one or more characters
2231 2253
2232 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2255 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2256 --col;
2235 2257
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2258 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2259 text_t *text = stp + col;
2238 int count = 1; 2260 int count = 1;
2239 2261
2240 dtp[col] = stp[col]; 2262 dtp[col] = stp[col];
2241 drp[col] = rend; 2263 drp[col] = rend;
… …
2276 2298
2277 col--; /* went one too far. move back */ 2299 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2300 count -= i; /* dump any matching trailing chars */
2279 2301
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2302 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2303 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2304 count++, i--;
2283 2305
2284 /* 2306 /*
2285 * Determine the attributes for the string 2307 * Determine the attributes for the string
2286 */ 2308 */
2287 int fore = fgcolor_of (rend); // desired foreground 2309 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2310 int back = bgcolor_of (rend); // desired background
2289 2311
2290 // only do special processing if any attributes are set, which is unlikely 2312 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2313 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2314 {
2293 bool invert = rend & RS_RVid; 2315 bool invert = rend & RS_RVid;
2294 2316
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2318 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2337
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2338 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2339 fore = Color_UL;
2318#endif 2340#endif
2319 2341
2342#ifdef OPTION_HC
2343 if (rend & RS_Sel)
2344 {
2345 /* invert the column if no highlightColor is set or it is the
2346 * current cursor column */
2347 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2348 && ISSET_PIXCOLOR (Color_HC))
2349 {
2350 if (ISSET_PIXCOLOR (Color_HTC))
2351 fore = Color_HTC;
2352 // if invert is 0 reverse video is set so we use bg color as fg color
2353 else if (!invert)
2354 fore = back;
2355
2356 back = Color_HC;
2357 invert = 0;
2358 }
2359 }
2360#endif
2361
2320 if (invert) 2362 if (invert)
2321 { 2363 {
2322#ifdef OPTION_HC
2323 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 || !ISSET_PIXCOLOR (Color_HC))
2325#endif
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 ::swap (fore, back); 2364 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2365
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2366#ifndef NO_BOLD_UNDERLINE_REVERSE
2335# ifndef OPTION_HC
2336 if (ISSET_PIXCOLOR (Color_RV))
2337 back = Color_RV;
2338# endif
2339 if (fore == back) 2367 if (fore == back)
2340 { 2368 {
2341 fore = Color_bg; 2369 fore = Color_bg;
2342 back = Color_fg; 2370 back = Color_fg;
2343 } 2371 }
… …
2379 /* 2407 /*
2380 * Actually do the drawing of the string here 2408 * Actually do the drawing of the string here
2381 */ 2409 */
2382 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2410 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2383 2411
2384 if (expect_true (have_bg && back == Color_bg)) 2412 if (ecb_likely (have_bg && back == Color_bg))
2385 { 2413 {
2386 // this is very ugly, maybe push it into ->draw? 2414 // this is very ugly, maybe push it into ->draw?
2387 2415
2388 for (i = 0; i < count; i++) /* don't draw empty strings */ 2416 for (i = 0; i < count; i++) /* don't draw empty strings */
2389 if (text[i] != ' ') 2417 if (text[i] != ' ')
… …
2396 did_clear: ; 2424 did_clear: ;
2397 } 2425 }
2398 else 2426 else
2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2400 2428
2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2402 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2403#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2404 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2405 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2406 else 2438 else
2407#endif 2439#endif
… …
2419 */ 2451 */
2420 if (showcursor) 2452 if (showcursor)
2421 { 2453 {
2422 if (focus) 2454 if (focus)
2423 { 2455 {
2424 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2425 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2426 else 2458 else if (oldcursor.row >= 0)
2427 { 2459 {
2428 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2430 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2431#endif 2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2432 } 2473 }
2433 } 2474 }
2434 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2435 { 2476 {
2436 int cursorwidth = 1;
2437 int col = oldcursor.col;
2438
2439 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2440 col--;
2441
2442 while (col + cursorwidth < ncol
2443 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2444 cursorwidth++;
2445
2446#ifndef NO_CURSORCOLOR
2447 if (ISSET_PIXCOLOR (Color_cursor))
2448 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2449 else
2450#endif
2451 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2452 2478
2453 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2454 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2455 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2456 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2457 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2458 } 2484 }
2459 } 2485 }
2460 2486
2461 /* 2487 /*
2462 * H: cleanup selection 2488 * H: cleanup selection
… …
2471 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2472 num_scr = 0; 2498 num_scr = 0;
2473 num_scr_allow = 1; 2499 num_scr_allow = 1;
2474} 2500}
2475 2501
2476void 2502void ecb_cold
2477rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2478{ 2504{
2479 if (!l.t) 2505 if (!l.valid ())
2480 return; 2506 return;
2481 2507
2482 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2483 2509
2484 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2485 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2486} 2512}
2487 2513
2488void 2514void ecb_cold
2489rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2490{ 2516{
2491 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2492 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2493 2519
2494 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2496 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2497 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2498 } 2524 }
2499} 2525}
2500 2526
2501void 2527void ecb_cold
2502rxvt_term::scr_recolour () NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2503{ 2529{
2504#ifdef HAVE_BG_PIXMAP 2530 bool transparent = false;
2505 bgPixmap.apply ();
2506#else
2507 2531
2532#ifdef HAVE_IMG
2533 if (bg_img != 0)
2534 {
2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2540
2541 transparent = true;
2542 }
2543 else
2544# endif
2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 }
2549 }
2550 else
2551#endif
2552 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 }
2511 2556
2512 if (scrollBar.win) 2557 XClearWindow (dpy, parent);
2558
2559 if (scrollBar.state && scrollBar.win)
2513 { 2560 {
2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2515 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2566 scrollBar.show (0);
2517 } 2567 }
2518 2568
2519#endif 2569 if (refresh)
2520 2570 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2571 scr_clear ();
2523 scr_touch (true); 2572 scr_touch (true);
2573 }
2524 want_refresh = 1; 2574 want_refresh = 1;
2525} 2575}
2526 2576
2527/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2528void 2578void
2529rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2530{ 2580{
2531 if (!mapped) 2581 if (!mapped)
2532 return; 2582 return;
2533 2583
2534 num_scr_allow = 0; 2584 num_scr_allow = 0;
… …
2537 if (really) 2587 if (really)
2538 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2539} 2589}
2540 2590
2541void 2591void
2542rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2592rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2543{ 2593{
2544 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2545 int row, col; 2595 int row, col;
2546 2596
2547 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2597 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2559 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2560 } 2610 }
2561} 2611}
2562 2612
2563void 2613void
2564rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2614rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2565{ 2615{
2566 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2567 int row, col; 2617 int row, col;
2568 2618
2569 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2585 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2586 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2587} 2637}
2588 2638
2589/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2590void 2640void ecb_hot
2591rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2592{ 2642{
2593 if (selection.op 2643 if (selection.op
2594 && current_screen == selection.screen 2644 && current_screen == selection.screen
2595 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2596 { 2646 {
2597#if !ENABLE_MINIMAL 2647#if !ENABLE_MINIMAL
2598 if (selection.rect) 2648 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2649 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2651 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2652 else
2603#endif 2653#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2654 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2606 RS_RVid); 2656 RS_Sel | RS_RVid);
2607 } 2657 }
2608} 2658}
2609 2659
2610/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2611/* 2661/*
2612 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2613 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2614 */ 2664 */
2615#if 0 2665#if 0
2616void 2666void
2617rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2618{ 2668{
2619 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2620 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2621 char r1[] = "\n";
2622
2623 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++)
2625 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2627 : ncol;
2628 for (towrite = width; towrite; towrite -= wrote)
2629 {
2630 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2631 towrite);
2632 if (wrote < 0)
2633 return; /* XXX: death, no report */
2634 }
2635 if (row_buf[row].l >= 0)
2636 if (write (fd, r1, 1) <= 0)
2637 return; /* XXX: death, no report */
2638 }
2639} 2671}
2640#endif 2672#endif
2641 2673
2642/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2643 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2645void 2677void
2646rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2647{ 2679{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2680 if (!selection.op)
2651 return; 2681 return;
2652 2682
2653 pos.row = pos.col = 0;
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2686 || (check_more == 1
2658 && current_screen == selection.screen 2687 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2661 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos))
2666 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row
2668 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691}
2692
2693void
2694rxvt_term::selection_changed () noexcept
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2670} 2705}
2671 2706
2672/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2673/* 2708/*
2674 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2675 */ 2710 */
2676void 2711void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2678{ 2713{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2717 data[i] = C0_CR;
2683 2718
2684 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~"); 2720 tt_printf ("\x1b[200~");
2686 2721
2687 tt_write (data, len); 2722 tt_write (data, len);
2688 2723
2689 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2725 tt_printf ("\x1b[201~");
2691} 2726}
2692 2727
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2728void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2729rxvt_term::paste (char *data, unsigned int len) noexcept
2700{ 2730{
2701 if (prop == None) /* check for failed XConvertSelection */ 2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2732 return;
2876 2733
2877 selection_paste (win, prop, true); 2734 tt_paste (data, len);
2878} 2735}
2879 2736
2880/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2881/* 2738/*
2882 * Request the current selection: 2739 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2741 * as fallback
2885 * > CUT_BUFFER0
2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887 * will auto fallback to CUT_BUFFER0
2888 * EXT: button 2 release 2742 * EXT: button 2 release
2889 */ 2743 */
2890void 2744void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) noexcept
2892{ 2746{
2893 if (selection.text && selnum == Sel_Primary) 2747 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2748 {
2901 else 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2750 selection_req->run ();
2902 { 2751 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2752}
2944 2753
2945/* ------------------------------------------------------------------------- */ 2754/* ------------------------------------------------------------------------- */
2946/* 2755/*
2947 * Clear all selected text 2756 * Clear all selected text
2948 * EXT: SelectionClear 2757 * EXT: SelectionClear
2949 */ 2758 */
2950void 2759void
2951rxvt_term::selection_clear (bool clipboard) NOTHROW 2760rxvt_term::selection_clear (bool clipboard) noexcept
2952{ 2761{
2953 if (!clipboard) 2762 if (!clipboard)
2954 { 2763 {
2955 want_refresh = 1; 2764 want_refresh = 1;
2956 free (selection.text); 2765 free (selection.text);
… …
2970 if (display->clipboard_owner == this) 2779 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2780 display->clipboard_owner = 0;
2972 } 2781 }
2973} 2782}
2974 2783
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2987}
2988
2989/* ------------------------------------------------------------------------- */ 2784/* ------------------------------------------------------------------------- */
2990/* 2785/*
2991 * Copy a selection into the cut buffer 2786 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 2787 * EXT: button 1 or 3 release
2993 */ 2788 */
2994void 2789void
2995rxvt_term::selection_make (Time tm) 2790rxvt_term::selection_make (Time tm)
2996{ 2791{
2997 int i; 2792 int size;
2998 wchar_t *new_selection_text; 2793 wchar_t *new_selection_text;
2999 text_t *t; 2794 text_t *t;
3000 2795
3001 switch (selection.op) 2796 switch (selection.op)
3002 { 2797 {
… …
3018 return; /* nothing selected, go away */ 2813 return; /* nothing selected, go away */
3019 2814
3020 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2815 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3021 return; 2816 return;
3022 2817
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2818 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2819 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3025 2820
3026 int ofs = 0; 2821 int ofs = 0;
3027 int extra = 0; 2822 int extra = 0;
3028 2823
3029 int col = selection.beg.col; 2824 int col = selection.beg.col;
… …
3035 { 2830 {
3036#if !ENABLE_MINIMAL 2831#if !ENABLE_MINIMAL
3037 if (selection.rect) 2832 if (selection.rect)
3038 { 2833 {
3039 col = selection.beg.col; 2834 col = selection.beg.col;
3040 end_col = ncol + 1; 2835 end_col = selection.end.col;
3041 } 2836 }
3042 else 2837 else
3043#endif 2838#endif
3044 end_col = ROW(row).l; 2839 end_col = ROW(row).l;
3045 2840
3046 col = max (col, 0); 2841 col = max (col, 0);
3047 2842
3048 if (row == selection.end.row 2843 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 2844 min_it (end_col, selection.end.col);
3054 2845
3055 t = ROW(row).t + col; 2846 t = ROW(row).t + col;
3056 2847
3057 for (; col < end_col; col++) 2848 for (; col < end_col; col++)
… …
3065 2856
3066 extra -= (len - 1); 2857 extra -= (len - 1);
3067 2858
3068 if (extra < 0) 2859 if (extra < 0)
3069 { 2860 {
3070 extra += i; 2861 extra += size;
3071 i += i; 2862 size += size;
3072 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2863 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3073 } 2864 }
3074 2865
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2866 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 2867 }
3077#endif 2868#endif
… …
3089 2880
3090 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3091 } 2882 }
3092 else 2883 else
3093#endif 2884#endif
3094 if (!ROW(row).is_longer () && row != selection.end.row) 2885 if (!ROW(row).is_longer ()
2886 && (row != selection.end.row || end_col != selection.end.col)
2887 && (row != selection.beg.row || selection.beg.col < ncol))
3095 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3096 } 2889 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 2890
3101 new_selection_text[ofs] = 0; 2891 new_selection_text[ofs] = 0;
3102 2892
3103 if (ofs == 0) 2893 if (ofs == 0)
3104 { 2894 {
… …
3117 2907
3118 selection_grab (tm); 2908 selection_grab (tm);
3119} 2909}
3120 2910
3121bool 2911bool
3122rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2912rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
3123{ 2913{
3124 Atom sel; 2914 Atom sel;
3125 2915
3126 if (!clipboard) 2916 if (!clipboard)
3127 { 2917 {
… …
3160/* ------------------------------------------------------------------------- */ 2950/* ------------------------------------------------------------------------- */
3161/* 2951/*
3162 * Mark or select text based upon number of clicks: 1, 2, or 3 2952 * Mark or select text based upon number of clicks: 1, 2, or 3
3163 * EXT: button 1 press 2953 * EXT: button 1 press
3164 */ 2954 */
3165void 2955void ecb_cold
3166rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2956rxvt_term::selection_click (int clicks, int x, int y) noexcept
3167{ 2957{
3168 clicks = ((clicks - 1) % 3) + 1; 2958 clicks = ((clicks - 1) % 3) + 1;
3169 selection.clicks = clicks; /* save clicks so extend will work */ 2959 selection.clicks = clicks; /* save clicks so extend will work */
3170 2960
3171 if (clicks == 2 && !selection.rect 2961 if (clicks == 2 && !selection.rect
… …
3189 2979
3190/* ------------------------------------------------------------------------- */ 2980/* ------------------------------------------------------------------------- */
3191/* 2981/*
3192 * Mark a selection at the specified col/row 2982 * Mark a selection at the specified col/row
3193 */ 2983 */
3194void 2984void ecb_cold
3195rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2985rxvt_term::selection_start_colrow (int col, int row) noexcept
3196{ 2986{
3197 want_refresh = 1; 2987 want_refresh = 1;
3198 2988
3199 selection.mark.row = row + view_start; 2989 selection.mark.row = row + view_start;
3200 selection.mark.col = col; 2990 selection.mark.col = col;
… …
3222 * Word select: select text for 2 clicks 3012 * Word select: select text for 2 clicks
3223 * We now only find out the boundary in one direction 3013 * We now only find out the boundary in one direction
3224 */ 3014 */
3225 3015
3226/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3227#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3228 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3229#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3230 3020
3231void 3021void ecb_cold
3232rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3233{ 3023{
3234 int col, row, dirnadd, tcol, trow, w1, w2; 3024 int col, row, dirnadd, tcol, trow, w1, w2;
3235 row_col_t bound; 3025 row_col_t bound;
3236 text_t *stp; 3026 text_t *stp;
3237 rend_t *srp; 3027 rend_t *srp;
… …
3310 * EXT: button 3 press; button 1 or 3 drag 3100 * EXT: button 3 press; button 1 or 3 drag
3311 * flag == 0 ==> button 1 3101 * flag == 0 ==> button 1
3312 * flag == 1 ==> button 3 press 3102 * flag == 1 ==> button 3 press
3313 * flag == 2 ==> button 3 motion 3103 * flag == 2 ==> button 3 motion
3314 */ 3104 */
3315void 3105void ecb_cold
3316rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3106rxvt_term::selection_extend (int x, int y, int flag) noexcept
3317{ 3107{
3318 int col = clamp (Pixel2Col (x), 0, ncol); 3108 int col = clamp (Pixel2Col (x), 0, ncol);
3319 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3109 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3320 3110
3321 /* 3111 /*
… …
3346 3136
3347/* ------------------------------------------------------------------------- */ 3137/* ------------------------------------------------------------------------- */
3348/* 3138/*
3349 * Extend the selection to the specified col/row 3139 * Extend the selection to the specified col/row
3350 */ 3140 */
3351void 3141void ecb_cold
3352rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3142rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3353{ 3143{
3354 row_col_t pos; 3144 row_col_t pos;
3355 enum { 3145 enum {
3356 LEFT, RIGHT 3146 LEFT, RIGHT
3357 } closeto = RIGHT; 3147 } closeto = RIGHT;
3358
3359 want_refresh = 1;
3360 3148
3361 switch (selection.op) 3149 switch (selection.op)
3362 { 3150 {
3363 case SELECTION_INIT: 3151 case SELECTION_INIT:
3364 CLEAR_SELECTION (); 3152 CLEAR_SELECTION ();
… …
3544 3332
3545#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3546 if (selection.rect && selection.beg.col > selection.end.col) 3334 if (selection.rect && selection.beg.col > selection.end.col)
3547 ::swap (selection.beg.col, selection.end.col); 3335 ::swap (selection.beg.col, selection.end.col);
3548#endif 3336#endif
3337
3338 selection_changed ();
3549} 3339}
3550 3340
3551#if !ENABLE_MINIMAL 3341#if !ENABLE_MINIMAL
3552void 3342void ecb_cold
3553rxvt_term::selection_remove_trailing_spaces () NOTHROW 3343rxvt_term::selection_remove_trailing_spaces () noexcept
3554{ 3344{
3555 int32_t end_col, end_row; 3345 int32_t end_col, end_row;
3556 text_t *stp; 3346 text_t *stp;
3557 3347
3558 end_col = selection.end.col; 3348 end_col = selection.end.col;
… …
3595/* ------------------------------------------------------------------------- */ 3385/* ------------------------------------------------------------------------- */
3596/* 3386/*
3597 * Double click on button 3 when already selected 3387 * Double click on button 3 when already selected
3598 * EXT: button 3 double click 3388 * EXT: button 3 double click
3599 */ 3389 */
3600void 3390void ecb_cold
3601rxvt_term::selection_rotate (int x, int y) NOTHROW 3391rxvt_term::selection_rotate (int x, int y) noexcept
3602{ 3392{
3603 selection.clicks = selection.clicks % 3 + 1; 3393 selection.clicks = selection.clicks % 3 + 1;
3604 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3605} 3395}
3606 3396
3607/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3608/* 3398/*
3609 * Respond to a request for our current selection 3399 * Respond to a request for our current selection
3610 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3611 */ 3401 */
3612void 3402void ecb_cold
3613rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3614{ 3404{
3405 Atom property = rq.property == None ? rq.target : rq.property;
3615 XSelectionEvent ev; 3406 XSelectionEvent ev;
3616 3407
3617 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3618 ev.property = None; 3409 ev.property = None;
3619 ev.display = rq.display; 3410 ev.display = rq.display;
… …
3634 *target++ = xa[XA_COMPOUND_TEXT]; 3425 *target++ = xa[XA_COMPOUND_TEXT];
3635#if X_HAVE_UTF8_STRING 3426#if X_HAVE_UTF8_STRING
3636 *target++ = xa[XA_UTF8_STRING]; 3427 *target++ = xa[XA_UTF8_STRING];
3637#endif 3428#endif
3638 3429
3639 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3430 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3640 32, PropModeReplace, 3431 32, PropModeReplace,
3641 (unsigned char *)target_list, target - target_list); 3432 (unsigned char *)target_list, target - target_list);
3642 ev.property = rq.property; 3433 ev.property = property;
3643 } 3434 }
3644#if TODO // TODO 3435#if TODO // TODO
3645 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3646 { 3437 {
3647 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3648 } 3439 }
3649#endif 3440#endif
3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3651 { 3442 {
3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3653 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property; 3445 ev.property = property;
3655 } 3446 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 { 3448 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3660 ev.property = rq.property; 3451 ev.property = property;
3661 } 3452 }
3662 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3663 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3664 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
3665 || rq.target == xa[XA_UTF8_STRING] 3456 || rq.target == xa[XA_UTF8_STRING]
… …
3709 cl = selection.clip_text; 3500 cl = selection.clip_text;
3710 selectlen = selection.clip_len; 3501 selectlen = selection.clip_len;
3711 } 3502 }
3712 else 3503 else
3713 { 3504 {
3714 cl = L""; 3505 cl = (wchar_t *)L"";
3715 selectlen = 0; 3506 selectlen = 0;
3716 } 3507 }
3717 3508
3718#if !ENABLE_MINIMAL 3509#if !ENABLE_MINIMAL
3719 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3510 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3736 ct.value = (unsigned char *)cl; 3527 ct.value = (unsigned char *)cl;
3737 ct.nitems = selectlen; 3528 ct.nitems = selectlen;
3738 ct.encoding = target; 3529 ct.encoding = target;
3739 } 3530 }
3740 3531
3741 XChangeProperty (dpy, rq.requestor, rq.property, 3532 XChangeProperty (dpy, rq.requestor, property,
3742 ct.encoding, 8, PropModeReplace, 3533 ct.encoding, 8, PropModeReplace,
3743 ct.value, (int)ct.nitems); 3534 ct.value, (int)ct.nitems);
3744 ev.property = rq.property; 3535 ev.property = property;
3745 3536
3746 if (freect) 3537 if (freect)
3747 XFree (ct.value); 3538 XFree (ct.value);
3748 } 3539 }
3749 3540
3750 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3541 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3751} 3542}
3752 3543
3753/* ------------------------------------------------------------------------- */ 3544/* ------------------------------------------------------------------------- */
3754#ifdef USE_XIM 3545#if USE_XIM
3755void 3546void ecb_cold
3756rxvt_term::im_set_position (XPoint &pos) NOTHROW 3547rxvt_term::im_set_position (XPoint &pos) noexcept
3757{ 3548{
3758 XWindowAttributes xwa; 3549 XWindowAttributes xwa;
3759 3550
3760 XGetWindowAttributes (dpy, vt, &xwa); 3551 XGetWindowAttributes (dpy, vt, &xwa);
3761 3552
… …
3764} 3555}
3765#endif 3556#endif
3766 3557
3767#if ENABLE_OVERLAY 3558#if ENABLE_OVERLAY
3768void 3559void
3769rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3560rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3770{ 3561{
3771 if (nrow < 1 || ncol < 1) 3562 if (nrow < 1 || ncol < 1)
3772 return; 3563 return;
3773 3564
3774 want_refresh = 1; 3565 want_refresh = 1;
… …
3819 *rp = r; 3610 *rp = r;
3820 } 3611 }
3821} 3612}
3822 3613
3823void 3614void
3824rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () noexcept
3825{ 3616{
3826 if (!ov.text) 3617 if (!ov.text)
3827 return; 3618 return;
3828 3619
3829 want_refresh = 1; 3620 want_refresh = 1;
… …
3837 delete [] ov.text; ov.text = 0; 3628 delete [] ov.text; ov.text = 0;
3838 delete [] ov.rend; ov.rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3839} 3630}
3840 3631
3841void 3632void
3842rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3843{ 3634{
3844 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3845 return; 3636 return;
3846 3637
3847 x++, y++; 3638 x++, y++;
… …
3849 ov.text[y][x] = text; 3640 ov.text[y][x] = text;
3850 ov.rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3851} 3642}
3852 3643
3853void 3644void
3854rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3855{ 3646{
3856 while (*s) 3647 while (*s)
3857 scr_overlay_set (x++, y, *s++); 3648 scr_overlay_set (x++, y, *s++);
3858} 3649}
3859 3650
3860void 3651void
3861rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3862{ 3653{
3863 while (*s) 3654 while (*s)
3864 { 3655 {
3865 text_t t = *s++; 3656 text_t t = *s++;
3866 int width = WCWIDTH (t); 3657 int width = WCWIDTH (t);
… …
3872 } 3663 }
3873 } 3664 }
3874} 3665}
3875 3666
3876void 3667void
3877rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () noexcept
3878{ 3669{
3879 if (!ov.text) 3670 if (!ov.text)
3880 return; 3671 return;
3881 3672
3882 // hide cursor if it is within the overlay area 3673 // hide cursor if it is within the overlay area

Diff Legend

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