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.398 by sf-exg, Wed Nov 2 15:11:51 2011 UTC vs.
Revision 1.472 by root, Mon Aug 8 10:33:14 2022 UTC

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

Diff Legend

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