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.384 by sf-exg, Mon May 30 18:39:04 2011 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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