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.387 by root, Thu Jul 7 23:18:13 2011 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

… …
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32
33#include "salloc.C" // HACK, should be a separate compile!
34 33
35static inline void 34static inline void
36fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
… …
96 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
97 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
98 97
99/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
100void 99void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept
102{ 101{
103 if (!l.t) 102 if (!l.valid ())
104 { 103 {
105 lalloc (l); 104 l.alloc ();
106 col = 0; 105 col = 0;
107 width = ncol; 106 width = ncol;
108 } 107 }
109 108
110 l.touch (); 109 l.touch ();
111 110
112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
114 113
115 text_t *et = l.t + col; 114 text_t *et = l.t + col;
116 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
117 116
118 while (width--) 117 while (width--)
… …
123} 122}
124 123
125/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
126/* Fill a full line with blanks - make sure it is allocated first */ 125/* Fill a full line with blanks - make sure it is allocated first */
127void 126void
128rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW 127rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept
129{ 128{
130 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
131 130
132 l.l = 0; 131 l.l = 0;
133 l.f = 0; 132 l.f = 0;
134} 133}
135 134
136// nuke a single wide character at the given column 135// nuke a single wide character at the given column
137void 136void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
139{ 138{
140 // find begin 139 // find begin
141 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
142 col--; 141 col--;
143 142
144 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
146 145
147 l.touch (); 146 l.touch ();
148 147
149 // found start, nuke 148 // found start, nuke
150 do { 149 do {
… …
152 l.r[col] = rend; 151 l.r[col] = rend;
153 col++; 152 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
155} 154}
156 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
157/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
160 169
161void 170void
171rxvt_term::scr_alloc () noexcept
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
162rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
163{ 216{
164#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
165 scr_overlay_off (); 218 scr_overlay_off ();
166#endif 219#endif
… …
192 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
193 246
194 screen.tscroll = 0; 247 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
196 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
197 if (!row_buf) 258 if (!prev_row_buf)
198 { 259 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 260 top_row = 0;
203 term_start = 0; 261 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 262
219 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
245 { 289 {
246 /* 290 /*
247 * add or delete rows as appropriate 291 * add or delete rows as appropriate
248 */ 292 */
249 293
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266 295
267 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
268 { 297 {
269 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 301
273 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 303 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 304
282 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
283 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
285 308
286 if (top_row) 309 if ((rewrap_always || top_row) && !rewrap_never)
287 { 310 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change 313 // TODO: maybe optimise when width didn't change
291 314
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 317
295 do 318 do
296 { 319 {
297 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 322 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 324
302 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 ())
303 { 326 {
304 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
305 328
306 plines++; 329 plines++;
307 llen += prev_ncol; 330 llen += prev_ncol;
… …
320 343
321 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
323 { 346 {
324 qline = row_buf + qrow; 347 qline = row_buf + qrow;
325 lalloc (*qline); 348 qline->alloc (); // redundant with next line
326 qline->l = ncol; 349 qline->l = ncol;
327 qline->is_longer (1); 350 qline->is_longer (1);
328 351
329 int qcol = 0; 352 int qcol = 0;
330 353
… …
345 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
346 // least. 369 // least.
347 if (prow == ocur.row) 370 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
349 372
350 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
351 374
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 376
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 399 {
377 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
378 401
379 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
380 { 403 {
381 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)];
382 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
383 406
384 qline = pline; 407 copy_line (dst, src);
385 lresize (qline);
386 } 408 }
387 409
388 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 412
393 term_start = 0; 413 term_start = 0;
394 } 414 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 415
400 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 418 }
403 419
420 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
404 free (tabs); 429 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
406 431
407 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 440 tt_winch ();
416 441
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 443}
419 444
420/* ------------------------------------------------------------------------- */ 445void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
426{ 447{
427 if (row_buf) 448 chunk_free (chunk, chunk_size);
428 { 449 chunk = 0;
429 delete talloc; talloc = 0; 450 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 451
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 452 free (tabs);
438 tabs = 0; 453 tabs = 0;
439 }
440} 454}
441 455
442/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
443/* 457/*
444 * Hard/Soft reset 458 * Hard/Soft reset
445 */ 459 */
446void 460void ecb_cold
447rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
448{ 462{
449 scr_release (); 463 scr_release ();
464
450 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 466 rvideo_mode = false;
452 scr_soft_reset (); 467 scr_soft_reset ();
453 scr_reset (); 468 scr_reset ();
454 469
455 scr_clear (true); 470 scr_clear (true);
456 scr_refresh (); 471 scr_refresh ();
457} 472}
458 473
459void 474void ecb_cold
460rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () noexcept
461{ 476{
462 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
464 scr_overlay_off (); 479 scr_overlay_off ();
465#endif 480#endif
… …
479 * Save and Restore cursor 494 * Save and Restore cursor
480 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
481 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
482 */ 497 */
483void 498void
484rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
485{ 500{
486 screen_t *s; 501 screen_t *s;
487 502
488#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
489 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
520 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
522} 537}
523 538
524void 539void
525rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () noexcept
526{ 541{
527 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
528 return; 543 return;
529 544
530 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
549 return; 564 return;
550 565
551 want_refresh = 1; 566 want_refresh = 1;
552 view_start = 0; 567 view_start = 0;
553 568
554 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 ();
555 575
556 current_screen = scrn; 576 current_screen = scrn;
557 577
558#if NSCREENS 578#if NSCREENS
559 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
573 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
574} 594}
575 595
576// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
577void 597void
578rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
579{ 599{
580 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
581 return; 601 return;
582 602
583 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
593/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
594/* 614/*
595 * Change the colour for following text 615 * Change the colour for following text
596 */ 616 */
597void 617void
598rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
599{ 619{
600 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
601 color = fgbg; 621 color = fgbg;
602 622
603 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
604 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
605 else 625 else
… …
609/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
610/* 630/*
611 * Change the rendition style for following text 631 * Change the rendition style for following text
612 */ 632 */
613void 633void
614rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
615{ 635{
616 if (set) 636 if (set)
617 rstyle |= style; 637 rstyle |= style;
618 else if (style == ~RS_None) 638 else if (style == ~RS_None)
619 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
… …
625/* 645/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 647 * count positive ==> scroll up
628 * count negative ==> scroll down 648 * count negative ==> scroll down
629 */ 649 */
630int 650int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
632{ 652{
633 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
634 return 0; 654 return 0;
635 655
636 want_refresh = 1; 656 want_refresh = 1;
… …
638 658
639 if (count > 0 659 if (count > 0
640 && row1 == 0 660 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 662 {
643 min_it (count, row2 + total_rows); 663 min_it (count, total_rows - (nrow - (row2 + 1)));
644 664
645 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
646
647 // scroll everything up 'count' lines
648 term_start = (term_start + count) % total_rows;
649 666
650 // sever bottommost line 667 // sever bottommost line
651 { 668 {
652 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
653 l.is_longer (0); 670 l.is_longer (0);
654 l.touch (); 671 l.touch ();
655 } 672 }
656 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
657 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
658 for (int i = count; i--; ) 690 for (int i = count; i--; )
659 { 691 {
660 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
661 693
662 // optimise if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
663 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
664 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)))
665 { 697 {
… …
669 } 701 }
670 else 702 else
671 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
672 } 704 }
673 705
674 // now copy lines below the scroll region bottom to the
675 // bottom of the screen again, so they look as if they
676 // hadn't moved.
677 for (int i = nrow; --i > row2; )
678 {
679 line_t &l1 = ROW(i - count);
680 line_t &l2 = ROW(i);
681
682 ::swap (l1, l2);
683 l2.touch ();
684 }
685
686 // move and/or clear selection, if any 706 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
688 { 709 {
689 selection.beg.row -= count; 710 selection.beg.row -= count;
690 selection.end.row -= count; 711 selection.end.row -= count;
691 selection.mark.row -= count; 712 selection.mark.row -= count;
692 713
693 if (selection.beg.row < top_row 714 selection_check (0);
694 || selection.end.row < top_row
695 || selection.mark.row < top_row)
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR;
699 }
700 } 715 }
701 716
702 // finally move the view window, if desired 717 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 719 && view_start != 0
705 && view_start != -saveLines) 720 && view_start != -saveLines)
706 scr_page (UP, count); 721 scr_page (count);
707 722
708 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
709 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));
710 } 725 }
711 else 726 else
… …
734 } 749 }
735 750
736 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
737 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
738 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
739 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
740 763
741 min_it (count, rows); 764 min_it (count, rows);
742 765
743 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744 767
745 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
746 { 769 {
747 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 771
… …
750 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
751 } 774 }
752 775
753 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
754 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 }
755 } 785 }
756 786
757 return count; 787 return count;
758} 788}
759 789
760/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
761/* 791/*
762 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
763 */ 793 */
764void 794void ecb_hot
765rxvt_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
766{ 796{
767 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
768 return; 798 return;
769 799
770 unsigned char checksel; 800 bool checksel;
771 unicode_t c; 801 unicode_t c;
772 int ncol = this->ncol; 802 int ncol = this->ncol;
773 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
774 804
775 want_refresh = 1; 805 want_refresh = 1;
… …
982 } 1012 }
983 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
984 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
985 { 1015 {
986 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
987 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
988 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
989 } 1019 }
990 else 1020 else
991 continue; 1021 continue;
992 1022
993 linep->touch (); 1023 linep->touch ();
… …
1016/* 1046/*
1017 * 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
1018 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1019 */ 1049 */
1020void 1050void
1021rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1022{ 1052{
1023 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1024 { 1054 {
1025 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1026 { 1056 {
… …
1043 * Process Horizontal Tab 1073 * Process Horizontal Tab
1044 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1045 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1046 */ 1076 */
1047void 1077void
1048rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1049{ 1079{
1050 int i, x; 1080 int i, x;
1051 1081
1052 want_refresh = 1; 1082 want_refresh = 1;
1053 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1119 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1120 * 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
1121 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1122 */ 1152 */
1123#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1124void 1154void ecb_cold
1125rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1126{ 1156{
1127 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1128 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1129 else 1159 else
1130 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1136 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1137 * 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
1138 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1139 */ 1169 */
1140#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1141void 1171void ecb_cold
1142rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1143{ 1173{
1144 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1145 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1146 else 1176 else
1147 { 1177 {
… …
1160/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1161/* 1191/*
1162 * Goto Row/Column 1192 * Goto Row/Column
1163 */ 1193 */
1164void 1194void
1165rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1166{ 1196{
1167 want_refresh = 1; 1197 want_refresh = 1;
1168 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1169 1199
1170 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1209/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1210/* 1240/*
1211 * direction should be UP or DN 1241 * direction should be UP or DN
1212 */ 1242 */
1213void 1243void
1214rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1215{ 1245{
1216 int dirn;
1217
1218 want_refresh = 1; 1246 want_refresh = 1;
1219 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1220 1248
1221 dirn = ((direction == UP) ? 1 : -1);
1222
1223 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1224 1250
1225 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1226 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1227 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1228 else 1254 else
1229 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1230 1256
1231 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1232 selection_check (0); 1258 selection_check (0);
1233} 1259}
1234 1260
… …
1239 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1240 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1241 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1242 */ 1268 */
1243void 1269void
1244rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1245{ 1271{
1246 unsigned int col, num; 1272 unsigned int col, num;
1247 1273
1248 want_refresh = 1; 1274 want_refresh = 1;
1249 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1297 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1298} 1324}
1299 1325
1300/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1301/* 1327/*
1302 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1303 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1304 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1305 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1306 */ 1332 */
1307void 1333void
1308rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1309{ 1335{
1310 int num; 1336 int num;
1311 int32_t row; 1337 int32_t row;
1312 rend_t ren; 1338 rend_t ren;
1313 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1316 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1317 1343
1318 switch (mode) 1344 switch (mode)
1319 { 1345 {
1320 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1321 selection_check (1);
1322 scr_erase_line (0); 1347 scr_erase_line (0);
1323 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1324 num = nrow - row; 1349 num = nrow - row;
1325 break; 1350 break;
1326 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1327 selection_check (3);
1328 scr_erase_line (1); 1352 scr_erase_line (1);
1329 row = 0; 1353 row = 0;
1330 num = screen.cur.row; 1354 num = screen.cur.row;
1331 break; 1355 break;
1332 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1333 selection_check (3);
1334 row = 0; 1357 row = 0;
1335 num = nrow; 1358 num = nrow;
1336 break; 1359 break;
1337 default: 1360 default:
1338 return; 1361 return;
… …
1355 { 1378 {
1356 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1357 1380
1358 if (mapped) 1381 if (mapped)
1359 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1360 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1361 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1362 } 1385 }
1363 else 1386 else
1364 { 1387 {
1365 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1368 { 1391 {
1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1373 (unsigned int)width, 1396 (unsigned int)vt_width,
1374 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1375 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1376 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 } 1400 }
1378 } 1401 }
… …
1386 } 1409 }
1387} 1410}
1388 1411
1389#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1390void 1413void
1391rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1392{ 1415{
1393 want_refresh = 1; 1416 want_refresh = 1;
1394 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1395 1418
1396 top_row = 0; 1419 top_row = 0;
… …
1400/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1401/* 1424/*
1402 * Fill the screen with `E's 1425 * Fill the screen with `E's
1403 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1404 */ 1427 */
1405void 1428void ecb_cold
1406rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1407{ 1430{
1408 rend_t fs; 1431 rend_t fs;
1409 1432
1410 want_refresh = 1; 1433 want_refresh = 1;
1411 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1412 1435
1413 num_scr_allow = 0; 1436 num_scr_allow = 0;
1414 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 ();
1415 1442
1416 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1417 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1418 { 1445 {
1419 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1432/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1433/* 1460/*
1434 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1435 */ 1462 */
1436void 1463void
1437rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1438{ 1465{
1439 int end; 1466 int end;
1440 1467
1441 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1442 1469
… …
1462/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1463/* 1490/*
1464 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1465 */ 1492 */
1466void 1493void
1467rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1468{ 1495{
1469 want_refresh = 1; 1496 want_refresh = 1;
1470 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1471 1498
1472 if (count <= 0) 1499 if (count <= 0)
… …
1570/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1571/* 1598/*
1572 * Set the scrolling region 1599 * Set the scrolling region
1573 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1574 */ 1601 */
1575void 1602void ecb_cold
1576rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1577{ 1604{
1578 max_it (top, 0); 1605 max_it (top, 0);
1579 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1580 1607
1581 if (top > bot) 1608 if (top > bot)
… …
1590/* 1617/*
1591 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1592 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1593 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1594 */ 1621 */
1595void 1622void ecb_cold
1596rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1597{ 1624{
1598 want_refresh = 1; 1625 want_refresh = 1;
1599 1626
1600 if (mode) 1627 if (mode)
1601 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1607/* 1634/*
1608 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1609 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1610 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1611 */ 1638 */
1612void 1639void ecb_cold
1613rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1614{ 1641{
1615 if (mode) 1642 if (mode)
1616 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1617 else 1644 else
1618 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1626 * 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
1627 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1628 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1629 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1630 */ 1657 */
1631void 1658void ecb_cold
1632rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1633{ 1660{
1634 if (mode) 1661 if (mode)
1635 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1636 else 1663 else
1637 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1643/* 1670/*
1644 * Set insert/replace mode 1671 * Set insert/replace mode
1645 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1646 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1647 */ 1674 */
1648void 1675void ecb_cold
1649rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1650{ 1677{
1651 if (mode) 1678 if (mode)
1652 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1653 else 1680 else
1654 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1659 * Set/Unset tabs 1686 * Set/Unset tabs
1660 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1661 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1662 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1663 */ 1690 */
1664void 1691void ecb_cold
1665rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1666{ 1693{
1667 if (mode < 0) 1694 if (mode < 0)
1668 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1669 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1670 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
… …
1675 * Set reverse/normal video 1702 * Set reverse/normal video
1676 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1677 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1678 */ 1705 */
1679void 1706void
1680rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1681{ 1708{
1682 rvideo_mode = on; 1709 rvideo_mode = on;
1683 1710
1684#ifndef NO_BELL 1711#ifndef NO_BELL
1685 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
… …
1687 1714
1688 if (rvideo_state != on) 1715 if (rvideo_state != on)
1689 { 1716 {
1690 rvideo_state = on; 1717 rvideo_state = on;
1691 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
1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1694 if (bg_pixmap == None) 1729 if (bg_img == 0)
1695#endif 1730#endif
1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1697 1732
1698 XGCValues gcvalue; 1733 XGCValues gcvalue;
1699 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
… …
1708/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1709/* 1744/*
1710 * Report current cursor position 1745 * Report current cursor position
1711 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1712 */ 1747 */
1713void 1748void ecb_cold
1714rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1715{ 1750{
1716 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);
1717} 1752}
1718 1753
1719/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1721 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1722 1757
1723/* 1758/*
1724 * Set font style 1759 * Set font style
1725 */ 1760 */
1726void 1761void ecb_cold
1727rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1728{ 1763{
1729#if 0 1764#if 0
1730 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1731 { 1766 {
1732 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1753 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1754 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1755 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1756 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1757 */ 1792 */
1758void 1793void ecb_cold
1759rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1760{ 1795{
1761 screen.charset = set; 1796 screen.charset = set;
1762 set_font_style (); 1797 set_font_style ();
1763} 1798}
1764 1799
… …
1770 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1771 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1772 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1773 */ 1808 */
1774void 1809void
1775rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1776{ 1811{
1777 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1778 set_font_style (); 1813 set_font_style ();
1779} 1814}
1780 1815
… …
1784 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1785 1820
1786/* 1821/*
1787 * refresh matching text. 1822 * refresh matching text.
1788 */ 1823 */
1789bool 1824bool ecb_cold
1790rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1791{ 1826{
1792 bool found = false; 1827 bool found = false;
1793 1828
1794 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1795 { 1830 {
… …
1813 PART_BEG = 0, 1848 PART_BEG = 0,
1814 PART_END, 1849 PART_END,
1815 RC_COUNT 1850 RC_COUNT
1816}; 1851};
1817 1852
1818void 1853void ecb_hot
1819rxvt_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
1820{ 1855{
1821 int i; 1856 int i;
1822 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1823 1858
1824 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1858/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1859/* 1894/*
1860 * Refresh the entire screen 1895 * Refresh the entire screen
1861 */ 1896 */
1862void 1897void
1863rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1864{ 1899{
1865 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1866} 1901}
1867 1902
1868/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1869/* 1904/*
1870 * 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
1871 * the top of the screen 1906 * the top of the screen
1872 */ 1907 */
1873void 1908void
1874rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1875{ 1910{
1876 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);
1877} 1913}
1878 1914
1879/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1880/* 1916/*
1881 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1882 * direction should be UP or DN 1918 * direction should be UP or DN
1883 */ 1919 */
1884bool 1920bool
1885rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1886{ 1922{
1887 int new_view_start =
1888 direction == UP ? view_start - nlines
1889 : view_start + nlines;
1890
1891 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1892} 1924}
1893 1925
1894bool 1926bool
1895rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1896{ 1928{
1897 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1898 1930
1899 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1900 return false; 1932 return false;
… …
1918} 1950}
1919#endif 1951#endif
1920 1952
1921/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1922void 1954void
1923rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1924{ 1956{
1925#ifndef NO_BELL 1957#ifndef NO_BELL
1926 1958
1927# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1928# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
… …
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1950#endif 1982#endif
1951} 1983}
1952 1984
1953/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1954void 1986void ecb_cold
1955rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1956{ 1988{
1957#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1958 int nrows, row_start; 1990 int nrows, row_start;
1959 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1960 1992
… …
2008/* 2040/*
2009 * Refresh the screen 2041 * Refresh the screen
2010 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2011 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2012 */ 2044 */
2013void 2045void ecb_hot
2014rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2015{ 2047{
2016 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2017 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2018 int i; /* tmp */ 2050 int i; /* tmp */
2019#ifndef NO_CURSORCOLOR
2020 rend_t cc1; /* store colours at cursor position (s) */
2021#endif
2022 rend_t *crp; // cursor rendition pointer
2023 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2024 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2025 2056
2026 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2027 2058
2028 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2029 return; 2060 return;
… …
2032 * A: set up vars 2063 * A: set up vars
2033 */ 2064 */
2034 refresh_count = 0; 2065 refresh_count = 0;
2035 2066
2036 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0; 2068 bool have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2039 have_bg = bg_pixmap != None; 2070 have_bg = bg_img != 0;
2040#endif 2071#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2073
2043 /* 2074 /*
2044 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2050 scr_swap_overlay (); 2081 scr_swap_overlay ();
2051#endif 2082#endif
2052 2083
2053 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2054 2085
2055 /* 2086 /*
2056 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2057 */ 2088 */
2058 { 2089 {
2059 unsigned char setoldcursor;
2060
2061#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2062 if (hidden_cursor) 2091 if (hidden_cursor)
2063 showcursor = 0; 2092 showcursor = 0;
2064#endif 2093#endif
2065 2094
… …
2068 int col = screen.cur.col; 2097 int col = screen.cur.col;
2069 2098
2070 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2071 col--; 2100 col--;
2072 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2073 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2074 2109
2075#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2076 cc1 = *crp & (RS_fgMask | RS_bgMask);
2077 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2078 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2079 else 2113 else
2080#endif 2114#endif
2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2093 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2094#else 2128#else
2095 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2096#endif 2130#endif
2097 2131
2098 if (focus) 2132 if (focus && cursor_type == 0)
2099 { 2133 {
2100 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2101 *crp ^= RS_Uline; 2135
2102 else
2103 {
2104 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2105 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2106 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2107 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2108 } 2141 }
2109 } 2142 }
2110 2143
2111 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2112 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2113 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)
2114 { 2153 {
2115 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2116 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2117 {
2118 if (ocrow < nrow
2119 && oldcursor.col < ncol)
2120 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2121
2122 if (focus || !showcursor)
2123 oldcursor.row = -1;
2124 else
2125 setoldcursor = 1;
2126 }
2127 } 2156 }
2128 else if (!focus) 2157 else
2129 setoldcursor = 1;
2130
2131 if (setoldcursor)
2132 {
2133 if (screen.cur.row - view_start >= nrow)
2134 oldcursor.row = -1; 2158 oldcursor.row = -1;
2135 else
2136 {
2137 oldcursor.row = screen.cur.row - view_start;
2138 oldcursor.col = screen.cur.col;
2139 }
2140 }
2141 } 2159 }
2142 2160
2143#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2144 /* 2162 /*
2145 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2151 { 2169 {
2152 int16_t nits; 2170 int16_t nits;
2153 int i = num_scr; 2171 int i = num_scr;
2154 int j; 2172 int j;
2155 int len, wlen; 2173 int len, wlen;
2156 dLocal (int, num_scr);
2157 2174
2158 j = nrow; 2175 j = nrow;
2159 wlen = len = -1; 2176 wlen = len = -1;
2160 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2161 2178
… …
2227 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2228 2245
2229 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2230 { 2247 {
2231 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2232 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2233 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2234 || (stp[col] == ' ' /* space w/ no background change */
2235 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2236 continue; 2250 continue;
2237 2251
2238 // redraw one or more characters 2252 // redraw one or more characters
2239 2253
2240 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
… …
2412 else 2426 else
2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2414 2428
2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2416 { 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
2417#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2418 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2419 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2420 else 2438 else
2421#endif 2439#endif
… …
2433 */ 2451 */
2434 if (showcursor) 2452 if (showcursor)
2435 { 2453 {
2436 if (focus) 2454 if (focus)
2437 { 2455 {
2438 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2439 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2440 else 2458 else if (oldcursor.row >= 0)
2441 { 2459 {
2442 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2443#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2444 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2445#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));
2446 } 2473 }
2447 } 2474 }
2448 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2449 { 2476 {
2450 int cursorwidth = 1;
2451 int col = oldcursor.col;
2452
2453 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2454 col--;
2455
2456 while (col + cursorwidth < ncol
2457 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2458 cursorwidth++;
2459
2460#ifndef NO_CURSORCOLOR
2461 if (ISSET_PIXCOLOR (Color_cursor))
2462 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2463 else
2464#endif
2465 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2466 2478
2467 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2468 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2469 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2470 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2471 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2472 } 2484 }
2473 } 2485 }
2474 2486
2475 /* 2487 /*
2476 * H: cleanup selection 2488 * H: cleanup selection
… …
2485 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2486 num_scr = 0; 2498 num_scr = 0;
2487 num_scr_allow = 1; 2499 num_scr_allow = 1;
2488} 2500}
2489 2501
2490void 2502void ecb_cold
2491rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2492{ 2504{
2493 if (!l.t) 2505 if (!l.valid ())
2494 return; 2506 return;
2495 2507
2496 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
2497 2509
2498 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2499 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]));
2500} 2512}
2501 2513
2502void 2514void ecb_cold
2503rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2504{ 2516{
2505 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2506 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2507 2519
2508 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2510 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2511 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2512 } 2524 }
2513} 2525}
2514 2526
2515void 2527void ecb_cold
2516rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2517{ 2529{
2518 bool transparent = false; 2530 bool transparent = false;
2519 2531
2520#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_IMG
2521 if (bg_pixmap != None) 2533 if (bg_img != 0)
2522 { 2534 {
2523# ifdef ENABLE_TRANSPARENCY 2535# if ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2525 { 2537 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2528 2540
2529 transparent = true; 2541 transparent = true;
2530 } 2542 }
2531 else 2543 else
2532# endif 2544# endif
2533 { 2545 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2536 } 2548 }
2537 } 2549 }
2538 else 2550 else
2539#endif 2551#endif
2540 { 2552 {
… …
2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 } 2555 }
2544 2556
2545 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2546 2558
2547 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2548 { 2560 {
2549 if (transparent) 2561 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else 2563 else
2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2553 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2554 scrollBar.show (0); 2566 scrollBar.show (0);
2555 } 2567 }
2556 2568
2557 if (refresh) 2569 if (refresh)
2558 { 2570 {
… …
2562 want_refresh = 1; 2574 want_refresh = 1;
2563} 2575}
2564 2576
2565/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2566void 2578void
2567rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2568{ 2580{
2569 if (!mapped) 2581 if (!mapped)
2570 return; 2582 return;
2571 2583
2572 num_scr_allow = 0; 2584 num_scr_allow = 0;
… …
2575 if (really) 2587 if (really)
2576 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2577} 2589}
2578 2590
2579void 2591void
2580rxvt_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
2581{ 2593{
2582 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2583 int row, col; 2595 int row, col;
2584 2596
2585 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++)
… …
2597 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2598 } 2610 }
2599} 2611}
2600 2612
2601void 2613void
2602rxvt_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
2603{ 2615{
2604 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2605 int row, col; 2617 int row, col;
2606 2618
2607 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2623 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2624 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2625} 2637}
2626 2638
2627/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2628void 2640void ecb_hot
2629rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2630{ 2642{
2631 if (selection.op 2643 if (selection.op
2632 && current_screen == selection.screen 2644 && current_screen == selection.screen
2633 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2634 { 2646 {
… …
2650 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2651 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2652 */ 2664 */
2653#if 0 2665#if 0
2654void 2666void
2655rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2656{ 2668{
2657 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2658 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2659 const char r1[] = "\n";
2660
2661 for (row = saveLines + top_row;
2662 row < saveLines + nrow - 1; row++)
2663 {
2664 width = row_buf[row].l >= 0 ? row_buf[row].l
2665 : ncol;
2666 for (towrite = width; towrite; towrite -= wrote)
2667 {
2668 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2669 towrite);
2670 if (wrote < 0)
2671 return; /* XXX: death, no report */
2672 }
2673 if (row_buf[row].l >= 0)
2674 if (write (fd, r1, 1) <= 0)
2675 return; /* XXX: death, no report */
2676 }
2677} 2671}
2678#endif 2672#endif
2679 2673
2680/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2681 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2682 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2683void 2677void
2684rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2685{ 2679{
2686 row_col_t pos;
2687
2688 if (!selection.op) 2680 if (!selection.op)
2689 return; 2681 return;
2690 2682
2691 pos.row = pos.col = 0;
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695 || (check_more == 1 2686 || (check_more == 1
2696 && current_screen == selection.screen 2687 && current_screen == selection.screen
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699 || (check_more == 2
2700 && ROWCOL_IS_BEFORE (selection.beg, pos)
2701 && ROWCOL_IS_AFTER (selection.end, pos))
2702 || (check_more == 3
2703 && ROWCOL_IS_AFTER (selection.end, pos))
2704 || (check_more == 4 /* screen width change */
2705 && (selection.beg.row != selection.end.row
2706 || selection.end.col > ncol)))
2707 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;
2708} 2705}
2709 2706
2710/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2711/* 2708/*
2712 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2713 */ 2710 */
2714void 2711void
2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2716{ 2713{
2717 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2718 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2719 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2720 data[i] = C0_CR; 2717 data[i] = C0_CR;
2721 2718
2722 if (priv_modes & PrivMode_BracketPaste) 2719 #if ENABLE_FRILLS
2720 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2723 tt_printf ("\e[200~"); 2721 tt_printf ("\x1b[200~");
2722 #endif
2724 2723
2725 tt_write (data, len); 2724 tt_write (data, len);
2726 2725
2727 if (priv_modes & PrivMode_BracketPaste) 2726 #if ENABLE_FRILLS
2727 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2728 tt_printf ("\e[201~"); 2728 tt_printf ("\x1b[201~");
2729 #endif
2729} 2730}
2730 2731
2731void 2732void
2732rxvt_term::paste (char *data, unsigned int len) NOTHROW 2733rxvt_term::paste (char *data, unsigned int len) noexcept
2733{ 2734{
2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) 2735 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2735 return; 2736 return;
2736 2737
2737 tt_paste (data, len); 2738 tt_paste (data, len);
… …
2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used 2744 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2744 * as fallback 2745 * as fallback
2745 * EXT: button 2 release 2746 * EXT: button 2 release
2746 */ 2747 */
2747void 2748void
2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2749rxvt_term::selection_request (Time tm, int selnum) noexcept
2749{ 2750{
2750 if (!selection_req) 2751 if (!selection_req)
2751 { 2752 {
2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2753 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run (); 2754 selection_req->run ();
… …
2758/* 2759/*
2759 * Clear all selected text 2760 * Clear all selected text
2760 * EXT: SelectionClear 2761 * EXT: SelectionClear
2761 */ 2762 */
2762void 2763void
2763rxvt_term::selection_clear (bool clipboard) NOTHROW 2764rxvt_term::selection_clear (bool clipboard) noexcept
2764{ 2765{
2765 if (!clipboard) 2766 if (!clipboard)
2766 { 2767 {
2767 want_refresh = 1; 2768 want_refresh = 1;
2768 free (selection.text); 2769 free (selection.text);
… …
2853 if (*t == NOCHAR) 2854 if (*t == NOCHAR)
2854 t++; 2855 t++;
2855#if ENABLE_COMBINING 2856#if ENABLE_COMBINING
2856 else if (IS_COMPOSE (*t)) 2857 else if (IS_COMPOSE (*t))
2857 { 2858 {
2858 int len = rxvt_composite.expand (*t, 0); 2859 int len = rxvt_composite.expand (*t);
2859 2860
2860 extra -= (len - 1); 2861 extra -= (len - 1);
2861 2862
2862 if (extra < 0) 2863 if (extra < 0)
2863 { 2864 {
… …
2910 2911
2911 selection_grab (tm); 2912 selection_grab (tm);
2912} 2913}
2913 2914
2914bool 2915bool
2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2916rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2916{ 2917{
2917 Atom sel; 2918 Atom sel;
2918 2919
2919 if (!clipboard) 2920 if (!clipboard)
2920 { 2921 {
… …
2953/* ------------------------------------------------------------------------- */ 2954/* ------------------------------------------------------------------------- */
2954/* 2955/*
2955 * Mark or select text based upon number of clicks: 1, 2, or 3 2956 * Mark or select text based upon number of clicks: 1, 2, or 3
2956 * EXT: button 1 press 2957 * EXT: button 1 press
2957 */ 2958 */
2958void 2959void ecb_cold
2959rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2960rxvt_term::selection_click (int clicks, int x, int y) noexcept
2960{ 2961{
2961 clicks = ((clicks - 1) % 3) + 1; 2962 clicks = ((clicks - 1) % 3) + 1;
2962 selection.clicks = clicks; /* save clicks so extend will work */ 2963 selection.clicks = clicks; /* save clicks so extend will work */
2963 2964
2964 if (clicks == 2 && !selection.rect 2965 if (clicks == 2 && !selection.rect
… …
2982 2983
2983/* ------------------------------------------------------------------------- */ 2984/* ------------------------------------------------------------------------- */
2984/* 2985/*
2985 * Mark a selection at the specified col/row 2986 * Mark a selection at the specified col/row
2986 */ 2987 */
2987void 2988void ecb_cold
2988rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2989rxvt_term::selection_start_colrow (int col, int row) noexcept
2989{ 2990{
2990 want_refresh = 1; 2991 want_refresh = 1;
2991 2992
2992 selection.mark.row = row + view_start; 2993 selection.mark.row = row + view_start;
2993 selection.mark.col = col; 2994 selection.mark.col = col;
… …
3015 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3016 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3017 */ 3018 */
3018 3019
3019/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3020#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3021 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3022#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3023 3024
3024void 3025void ecb_cold
3025rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3026{ 3027{
3027 int col, row, dirnadd, tcol, trow, w1, w2; 3028 int col, row, dirnadd, tcol, trow, w1, w2;
3028 row_col_t bound; 3029 row_col_t bound;
3029 text_t *stp; 3030 text_t *stp;
3030 rend_t *srp; 3031 rend_t *srp;
… …
3103 * EXT: button 3 press; button 1 or 3 drag 3104 * EXT: button 3 press; button 1 or 3 drag
3104 * flag == 0 ==> button 1 3105 * flag == 0 ==> button 1
3105 * flag == 1 ==> button 3 press 3106 * flag == 1 ==> button 3 press
3106 * flag == 2 ==> button 3 motion 3107 * flag == 2 ==> button 3 motion
3107 */ 3108 */
3108void 3109void ecb_cold
3109rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3110rxvt_term::selection_extend (int x, int y, int flag) noexcept
3110{ 3111{
3111 int col = clamp (Pixel2Col (x), 0, ncol); 3112 int col = clamp (Pixel2Col (x), 0, ncol);
3112 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3113 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3113 3114
3114 /* 3115 /*
… …
3139 3140
3140/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3141/* 3142/*
3142 * Extend the selection to the specified col/row 3143 * Extend the selection to the specified col/row
3143 */ 3144 */
3144void 3145void ecb_cold
3145rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3146rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3146{ 3147{
3147 row_col_t pos; 3148 row_col_t pos;
3148 enum { 3149 enum {
3149 LEFT, RIGHT 3150 LEFT, RIGHT
3150 } closeto = RIGHT; 3151 } closeto = RIGHT;
3151
3152 want_refresh = 1;
3153 3152
3154 switch (selection.op) 3153 switch (selection.op)
3155 { 3154 {
3156 case SELECTION_INIT: 3155 case SELECTION_INIT:
3157 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3337 3336
3338#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3339 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3340 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3341#endif 3340#endif
3341
3342 selection_changed ();
3342} 3343}
3343 3344
3344#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3345void 3346void ecb_cold
3346rxvt_term::selection_remove_trailing_spaces () NOTHROW 3347rxvt_term::selection_remove_trailing_spaces () noexcept
3347{ 3348{
3348 int32_t end_col, end_row; 3349 int32_t end_col, end_row;
3349 text_t *stp; 3350 text_t *stp;
3350 3351
3351 end_col = selection.end.col; 3352 end_col = selection.end.col;
… …
3388/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3389/* 3390/*
3390 * Double click on button 3 when already selected 3391 * Double click on button 3 when already selected
3391 * EXT: button 3 double click 3392 * EXT: button 3 double click
3392 */ 3393 */
3393void 3394void ecb_cold
3394rxvt_term::selection_rotate (int x, int y) NOTHROW 3395rxvt_term::selection_rotate (int x, int y) noexcept
3395{ 3396{
3396 selection.clicks = selection.clicks % 3 + 1; 3397 selection.clicks = selection.clicks % 3 + 1;
3397 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3398 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3398} 3399}
3399 3400
3400/* ------------------------------------------------------------------------- */ 3401/* ------------------------------------------------------------------------- */
3401/* 3402/*
3402 * Respond to a request for our current selection 3403 * Respond to a request for our current selection
3403 * EXT: SelectionRequest 3404 * EXT: SelectionRequest
3404 */ 3405 */
3405void 3406void ecb_cold
3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3407rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3407{ 3408{
3408 Atom property = rq.property == None ? rq.target : rq.property; 3409 Atom property = rq.property == None ? rq.target : rq.property;
3409 XSelectionEvent ev; 3410 XSelectionEvent ev;
3410 3411
3411 ev.type = SelectionNotify; 3412 ev.type = SelectionNotify;
… …
3503 cl = selection.clip_text; 3504 cl = selection.clip_text;
3504 selectlen = selection.clip_len; 3505 selectlen = selection.clip_len;
3505 } 3506 }
3506 else 3507 else
3507 { 3508 {
3508 cl = L""; 3509 cl = (wchar_t *)L"";
3509 selectlen = 0; 3510 selectlen = 0;
3510 } 3511 }
3511 3512
3512#if !ENABLE_MINIMAL 3513#if !ENABLE_MINIMAL
3513 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3543 3544
3544 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3545 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3545} 3546}
3546 3547
3547/* ------------------------------------------------------------------------- */ 3548/* ------------------------------------------------------------------------- */
3548#ifdef USE_XIM 3549#if USE_XIM
3549void 3550void ecb_cold
3550rxvt_term::im_set_position (XPoint &pos) NOTHROW 3551rxvt_term::im_set_position (XPoint &pos) noexcept
3551{ 3552{
3552 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3553 3554
3554 XGetWindowAttributes (dpy, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3555 3556
… …
3558} 3559}
3559#endif 3560#endif
3560 3561
3561#if ENABLE_OVERLAY 3562#if ENABLE_OVERLAY
3562void 3563void
3563rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3564rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3564{ 3565{
3565 if (nrow < 1 || ncol < 1) 3566 if (nrow < 1 || ncol < 1)
3566 return; 3567 return;
3567 3568
3568 want_refresh = 1; 3569 want_refresh = 1;
… …
3613 *rp = r; 3614 *rp = r;
3614 } 3615 }
3615} 3616}
3616 3617
3617void 3618void
3618rxvt_term::scr_overlay_off () NOTHROW 3619rxvt_term::scr_overlay_off () noexcept
3619{ 3620{
3620 if (!ov.text) 3621 if (!ov.text)
3621 return; 3622 return;
3622 3623
3623 want_refresh = 1; 3624 want_refresh = 1;
… …
3631 delete [] ov.text; ov.text = 0; 3632 delete [] ov.text; ov.text = 0;
3632 delete [] ov.rend; ov.rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3633} 3634}
3634 3635
3635void 3636void
3636rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3637{ 3638{
3638 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3639 return; 3640 return;
3640 3641
3641 x++, y++; 3642 x++, y++;
… …
3643 ov.text[y][x] = text; 3644 ov.text[y][x] = text;
3644 ov.rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3645} 3646}
3646 3647
3647void 3648void
3648rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3649{ 3650{
3650 while (*s) 3651 while (*s)
3651 scr_overlay_set (x++, y, *s++); 3652 scr_overlay_set (x++, y, *s++);
3652} 3653}
3653 3654
3654void 3655void
3655rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3656rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3656{ 3657{
3657 while (*s) 3658 while (*s)
3658 { 3659 {
3659 text_t t = *s++; 3660 text_t t = *s++;
3660 int width = WCWIDTH (t); 3661 int width = WCWIDTH (t);
… …
3666 } 3667 }
3667 } 3668 }
3668} 3669}
3669 3670
3670void 3671void
3671rxvt_term::scr_swap_overlay () NOTHROW 3672rxvt_term::scr_swap_overlay () noexcept
3672{ 3673{
3673 if (!ov.text) 3674 if (!ov.text)
3674 return; 3675 return;
3675 3676
3676 // hide cursor if it is within the overlay area 3677 // hide cursor if it is within the overlay area

Diff Legend

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