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.363 by sf-exg, Thu Jan 20 14:02:35 2011 UTC vs.
Revision 1.465 by root, Thu Aug 4 18:28:44 2022 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32 33
33#include "salloc.C" // HACK, should be a separate compile!
34
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--)
39 *start++ = value; 38 *start++ = value;
40} 39}
41 40
42/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
46 43
47/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
98 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
99 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
100 97
101/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
102void 99void
103rxvt_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
104{ 101{
105 if (!l.t) 102 if (!l.valid ())
106 { 103 {
107 lalloc (l); 104 l.alloc ();
108 col = 0; 105 col = 0;
109 width = ncol; 106 width = ncol;
110 } 107 }
111 108
112 l.touch (); 109 l.touch ();
113 110
114 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
115 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
116 113
117 text_t *et = l.t + col; 114 text_t *et = l.t + col;
118 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
119 116
120 while (width--) 117 while (width--)
125} 122}
126 123
127/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
128/* 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 */
129void 126void
130rxvt_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
131{ 128{
132 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
133 130
134 l.l = 0; 131 l.l = 0;
135 l.f = 0; 132 l.f = 0;
136} 133}
137 134
138// nuke a single wide character at the given column 135// nuke a single wide character at the given column
139void 136void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
141{ 138{
142 // find begin 139 // find begin
143 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
144 col--; 141 col--;
145 142
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
148 145
149 l.touch (); 146 l.touch ();
150 147
151 // found start, nuke 148 // found start, nuke
152 do { 149 do {
154 l.r[col] = rend; 151 l.r[col] = rend;
155 col++; 152 col++;
156 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
157} 154}
158 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
159/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
162 169
163void 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
164rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
165{ 216{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
166 view_start = 0; 221 view_start = 0;
167 num_scr = 0; 222 num_scr = 0;
168 223
169 if (ncol == 0) 224 if (ncol == 0)
170 ncol = 80; 225 ncol = 80;
190 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
191 246
192 screen.tscroll = 0; 247 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
194 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
195 if (!row_buf) 258 if (!prev_row_buf)
196 { 259 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 top_row = 0; 260 top_row = 0;
201 term_start = 0; 261 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 262
217 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
243 { 289 {
244 /* 290 /*
245 * add or delete rows as appropriate 291 * add or delete rows as appropriate
246 */ 292 */
247 293
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 295
251#if 0 296 // resize swap_buf, blank drawn_buf
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265 for (int row = min (nrow, prev_nrow); row--; ) 297 for (int row = min (nrow, prev_nrow); row--; )
266 { 298 {
267 lresize (drawn_buf[row]); 299 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 300 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269 } 301 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270 302
271 for (int row = prev_nrow; row < nrow; row++) 303 copy_line (swap_buf [row], prev_swap_buf [row]);
272 { 304 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 305
280 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
281 int pend = MOD (term_start + top_row , prev_total_rows); 307 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 308 int q = total_rows; // rewrapped row
283 309
284 if (top_row) 310#if ENABLE_FRILLS
311 if ((rewrap_always || top_row) && !rewrap_never)
285 { 312 {
286 // 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
287 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change 315 // TODO: maybe optimise when width didn't change
289 316
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 319
293 do 320 do
294 { 321 {
295 p = MOD (p - 1, prev_total_rows); 322 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 324 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 326
300 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 ())
301 { 328 {
302 p = MOD (p - 1, prev_total_rows); 329 p = MOD (p - 1, prev_total_rows);
303 330
304 plines++; 331 plines++;
305 llen += prev_ncol; 332 llen += prev_ncol;
306 } 333 }
307 334
308 int qlines = max (0, (llen - 1) / ncol) + 1; 335 int qlines = max (0, (llen - 1) / ncol) + 1;
309 336
337 q -= qlines;
338
310 // drop partial lines completely 339 // drop partial lines completely
311 if (q < qlines) 340 if (q < 0)
312 break; 341 break;
313
314 q -= qlines;
315 342
316 int lofs = 0; 343 int lofs = 0;
317 line_t *qline; 344 line_t *qline;
318 345
319 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 347 for (int qrow = q; qlines--; qrow++)
321 { 348 {
322 qline = row_buf + qrow; 349 qline = row_buf + qrow;
323 lalloc (*qline); 350 qline->alloc (); // redundant with next line
324 qline->l = ncol; 351 qline->l = ncol;
325 qline->is_longer (1); 352 qline->is_longer (1);
326 353
327 int qcol = 0; 354 int qcol = 0;
328 355
343 // this seems to upset applications/shells/readline 370 // this seems to upset applications/shells/readline
344 // least. 371 // least.
345 if (prow == ocur.row) 372 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 373 screen.cur.row = q - (total_rows - nrow);
347 374
348 line_t &pline = old_buf [prow]; 375 line_t &pline = prev_row_buf [prow];
349 376
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 378
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
361 qline->is_longer (0); 388 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 389 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 390 }
364 while (p != pend && q > 0); 391 while (p != pend && q > 0);
365 392
366 term_start = total_rows - nrow;
367 top_row = q - term_start;
368
369 // make sure all terminal lines exist 393 // make sure all terminal lines exist
370 while (top_row > 0) 394 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 395 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 396 }
373 else 397 else
398#endif
399 {
400 // wing, instead of wrap
374 { 401 do
375 // if no scrollback exists (yet), wing, instead of wrap
376
377 for (int row = min (nrow, prev_nrow); row--; )
378 { 402 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 p = MOD (p - 1, prev_total_rows);
380 line_t &qline = row_buf [row]; 404 q--;
381 405
382 qline = pline; 406 copy_line (row_buf [q], prev_row_buf [p]);
383 lresize (qline);
384 } 407 }
408 while (p != pend);
385 409
386 for (int row = prev_nrow; row < nrow; row++) 410 screen.cur.row += nrow - prev_nrow;
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 } 411 }
390 412
391 term_start = 0; 413 term_start = total_rows - nrow;
392 } 414 top_row = q - term_start;
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 415
398 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 418 }
401 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
402 free (tabs); 430 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 431 tabs = (char *)rxvt_malloc (ncol);
404 432
405 for (int col = ncol; col--; ) 433 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 434 tabs [col] = col % TABSIZE == 0;
413 tt_winch (); 441 tt_winch ();
414 442
415 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 443 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 444}
417 445
418/* ------------------------------------------------------------------------- */ 446void ecb_cold
419/*
420 * Free everything. That way malloc debugging can find leakage.
421 */
422void
423rxvt_term::scr_release () NOTHROW 447rxvt_term::scr_release () noexcept
424{ 448{
425 if (row_buf) 449 chunk_free (chunk, chunk_size);
426 { 450 chunk = 0;
427 delete talloc; talloc = 0; 451 row_buf = 0;
428 delete ralloc; ralloc = 0;
429 452
430 free (row_buf);
431 free (swap_buf);
432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
435 free (tabs); 453 free (tabs);
436 tabs = 0; 454 tabs = 0;
437 }
438} 455}
439 456
440/* ------------------------------------------------------------------------- */ 457/* ------------------------------------------------------------------------- */
441/* 458/*
442 * Hard/Soft reset 459 * Hard/Soft reset
443 */ 460 */
444void 461void ecb_cold
445rxvt_term::scr_poweron () 462rxvt_term::scr_poweron ()
446{ 463{
447 scr_release (); 464 scr_release ();
465
448 prev_nrow = prev_ncol = 0; 466 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 467 rvideo_mode = false;
450 scr_soft_reset (); 468 scr_soft_reset ();
451 scr_reset (); 469 scr_reset ();
452 470
453 scr_clear (true); 471 scr_clear (true);
454 scr_refresh (); 472 scr_refresh ();
455} 473}
456 474
457void 475void ecb_cold
458rxvt_term::scr_soft_reset () 476rxvt_term::scr_soft_reset () noexcept
459{ 477{
460 /* only affects modes, nothing drastic such as clearing the screen */ 478 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 479#if ENABLE_OVERLAY
462 scr_overlay_off (); 480 scr_overlay_off ();
463#endif 481#endif
477 * Save and Restore cursor 495 * Save and Restore cursor
478 * XTERM_SEQ: Save cursor : ESC 7 496 * XTERM_SEQ: Save cursor : ESC 7
479 * XTERM_SEQ: Restore cursor: ESC 8 497 * XTERM_SEQ: Restore cursor: ESC 8
480 */ 498 */
481void 499void
482rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 500rxvt_term::scr_cursor (cursor_mode mode) noexcept
483{ 501{
484 screen_t *s; 502 screen_t *s;
485 503
486#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 504#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
487 if (current_screen == SECONDARY) 505 if (current_screen == SECONDARY)
518 assert (s->cur.row >= 0); 536 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 537 assert (s->cur.col >= 0);
520} 538}
521 539
522void 540void
523rxvt_term::scr_swap_screen () 541rxvt_term::scr_swap_screen () noexcept
524{ 542{
525 if (!option (Opt_secondaryScreen)) 543 if (!option (Opt_secondaryScreen))
526 return; 544 return;
527 545
528 for (int i = prev_nrow; i--; ) 546 for (int i = prev_nrow; i--; )
547 return; 565 return;
548 566
549 want_refresh = 1; 567 want_refresh = 1;
550 view_start = 0; 568 view_start = 0;
551 569
552 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 ();
553 576
554 current_screen = scrn; 577 current_screen = scrn;
555 578
556#if NSCREENS 579#if NSCREENS
557 if (option (Opt_secondaryScreen)) 580 if (option (Opt_secondaryScreen))
571 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 594 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
572} 595}
573 596
574// clear WrapNext indicator, solidifying position on next line 597// clear WrapNext indicator, solidifying position on next line
575void 598void
576rxvt_term::scr_do_wrap () NOTHROW 599rxvt_term::scr_do_wrap () noexcept
577{ 600{
578 if (!(screen.flags & Screen_WrapNext)) 601 if (!(screen.flags & Screen_WrapNext))
579 return; 602 return;
580 603
581 screen.flags &= ~Screen_WrapNext; 604 screen.flags &= ~Screen_WrapNext;
591/* ------------------------------------------------------------------------- */ 614/* ------------------------------------------------------------------------- */
592/* 615/*
593 * Change the colour for following text 616 * Change the colour for following text
594 */ 617 */
595void 618void
596rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 619rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
597{ 620{
598 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 621 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
599 color = fgbg; 622 color = fgbg;
600 623
601 if (fgbg == Color_fg) 624 if (fgbg == Color_fg)
602 rstyle = SET_FGCOLOR (rstyle, color); 625 rstyle = SET_FGCOLOR (rstyle, color);
603 else 626 else
607/* ------------------------------------------------------------------------- */ 630/* ------------------------------------------------------------------------- */
608/* 631/*
609 * Change the rendition style for following text 632 * Change the rendition style for following text
610 */ 633 */
611void 634void
612rxvt_term::scr_rendition (int set, int style) NOTHROW 635rxvt_term::scr_rendition (int set, int style) noexcept
613{ 636{
614 if (set) 637 if (set)
615 rstyle |= style; 638 rstyle |= style;
616 else if (style == ~RS_None) 639 else if (style == ~RS_None)
617 rstyle = DEFAULT_RSTYLE; 640 rstyle = DEFAULT_RSTYLE;
623/* 646/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 647 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 648 * count positive ==> scroll up
626 * count negative ==> scroll down 649 * count negative ==> scroll down
627 */ 650 */
628int 651int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 652rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
630{ 653{
631 if (count == 0 || (row1 > row2)) 654 if (count == 0 || (row1 > row2))
632 return 0; 655 return 0;
633 656
634 want_refresh = 1; 657 want_refresh = 1;
636 659
637 if (count > 0 660 if (count > 0
638 && row1 == 0 661 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 662 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 663 {
664 min_it (count, total_rows - (nrow - (row2 + 1)));
665
641 top_row = max (top_row - count, -saveLines); 666 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 667
646 // sever bottommost line 668 // sever bottommost line
647 { 669 {
648 line_t &l = ROW(row2 - count); 670 line_t &l = ROW(row2);
649 l.is_longer (0); 671 l.is_longer (0);
650 l.touch (); 672 l.touch ();
651 } 673 }
652 674
675 // scroll everything up 'count' lines
676 term_start = (term_start + count) % total_rows;
677
678 // now copy lines below the scroll region bottom to the
679 // bottom of the screen again, so they look as if they
680 // hadn't moved.
681 for (int i = nrow; --i > row2; )
682 {
683 line_t &l1 = ROW(i - count);
684 line_t &l2 = ROW(i);
685
686 ::swap (l1, l2);
687 l2.touch ();
688 }
689
653 // erase newly scrolled-in lines 690 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 691 for (int i = count; i--; )
655 { 692 {
656 line_t &l = ROW(nrow - 1 - i); 693 line_t &l = ROW(row2 - i);
657 694
658 // optimize if already cleared, can be significant on slow machines 695 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 696 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 697 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 698 {
662 scr_blank_line (l, 0, l.l, rstyle); 699 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 700 l.l = 0;
665 } 702 }
666 else 703 else
667 scr_blank_screen_mem (l, rstyle); 704 scr_blank_screen_mem (l, rstyle);
668 } 705 }
669 706
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any 707 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 708 if (selection.op && current_screen == selection.screen
709 && selection.beg.row <= row2)
684 { 710 {
685 selection.beg.row -= count; 711 selection.beg.row -= count;
686 selection.end.row -= count; 712 selection.end.row -= count;
687 selection.mark.row -= count; 713 selection.mark.row -= count;
688 714
689 if (selection.beg.row < top_row 715 selection_check (0);
690 || selection.end.row < top_row
691 || selection.mark.row < top_row)
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 } 716 }
697 717
698 // finally move the view window, if desired 718 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 719 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 720 && view_start != 0
701 && view_start != -saveLines) 721 && view_start != -saveLines)
702 scr_page (UP, count); 722 scr_page (count);
703 723
704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 724 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
705 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));
706 } 726 }
707 else 727 else
730 } 750 }
731 751
732 // use a simple and robust scrolling algorithm, this 752 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 753 // part of scr_scroll_text is not time-critical.
734 754
755 // sever line above scroll region
756 if (row1)
757 {
758 line_t &l = ROW(row1 - 1);
759 l.is_longer (0);
760 l.touch ();
761 }
762
735 int rows = row2 - row1 + 1; 763 int rows = row2 - row1 + 1;
736 764
737 min_it (count, rows); 765 min_it (count, rows);
738 766
739 line_t *temp_buf = row_buf + total_rows; 767 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 768
741 for (int row = 0; row < rows; row++) 769 for (int row = 0; row < rows; row++)
742 { 770 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 771 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 772
746 scr_blank_screen_mem (temp_buf [row], rstyle); 774 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 775 }
748 776
749 for (int row = 0; row < rows; row++) 777 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 778 ROW(row1 + row) = temp_buf [row];
779
780 // sever bottommost line
781 {
782 line_t &l = ROW(row2);
783 l.is_longer (0);
784 l.touch ();
785 }
751 } 786 }
752 787
753 return count; 788 return count;
754} 789}
755 790
756/* ------------------------------------------------------------------------- */ 791/* ------------------------------------------------------------------------- */
757/* 792/*
758 * Add text given in <str> of length <len> to screen struct 793 * Add text given in <str> of length <len> to screen struct
759 */ 794 */
760void 795void ecb_hot
761rxvt_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
762{ 797{
763 if (len <= 0) /* sanity */ 798 if (len <= 0) /* sanity */
764 return; 799 return;
765 800
766 unsigned char checksel; 801 bool checksel;
767 unicode_t c; 802 unicode_t c;
768 int ncol = this->ncol; 803 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 804 const wchar_t *strend = str + len;
770 805
771 want_refresh = 1; 806 want_refresh = 1;
797 832
798 while (str < strend) 833 while (str < strend)
799 { 834 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 835 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 836
802 if (expect_false (c < 0x20)) 837 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 838 if (c == C0_LF)
804 { 839 {
805 max_it (line->l, screen.cur.col); 840 max_it (line->l, screen.cur.col);
806 841
807 screen.flags &= ~Screen_WrapNext; 842 screen.flags &= ~Screen_WrapNext;
826 { 861 {
827 scr_tab (1, true); 862 scr_tab (1, true);
828 continue; 863 continue;
829 } 864 }
830 865
831 if (expect_false ( 866 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 867 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 868 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 869 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 870 ))
836 { 871 {
841 * should be a similar check. 876 * should be a similar check.
842 */ 877 */
843 CLEAR_SELECTION (); 878 CLEAR_SELECTION ();
844 } 879 }
845 880
846 if (expect_false (screen.flags & Screen_WrapNext)) 881 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 882 {
848 scr_do_wrap (); 883 scr_do_wrap ();
849 884
850 line->l = ncol; 885 line->l = ncol;
851 line->is_longer (1); 886 line->is_longer (1);
853 row = screen.cur.row; 888 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 889 line = &ROW(row); /* _must_ refresh */
855 } 890 }
856 891
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 892 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 893 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 894 c = 0xfffd;
860 895
861 // rely on wcwidth to tell us the character width, do wcwidth before 896 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 897 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 898 // drawing characters below as they might be invalid in the current
864 // locale. 899 // locale.
865 int width = WCWIDTH (c); 900 int width = WCWIDTH (c);
866 901
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 902 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 903 {
869 // vt100 special graphics and line drawing 904 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 905 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 906 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 907 static uint16_t vt100_0[62] = { // 41 .. 7e
885 c = vt100_0[c - 0x41]; 920 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 921 width = 1; // vt100 line drawing characters are always single-width
887 } 922 }
888 } 923 }
889 924
890 if (expect_false (screen.flags & Screen_Insert)) 925 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 926 scr_insdel_chars (width, INSERT);
892 927
893 if (width != 0) 928 if (width != 0)
894 { 929 {
895#if !UNICODE_3 930#if !UNICODE_3
903#endif 938#endif
904 939
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 940 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 941
907 // if the character doesn't fit into the remaining columns... 942 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 943 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 944 {
910 if (screen.flags & Screen_Autowrap) 945 if (screen.flags & Screen_Autowrap)
911 { 946 {
912 // ... artificially enlargen the previous one 947 // ... artificially enlargen the previous one
913 c = NOCHAR; 948 c = NOCHAR;
920 955
921 // nuke the character at this position, if required 956 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop 957 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 958 // we never have to check for overwriting a wide char itself,
924 // only its tail. 959 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 960 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 961 scr_kill_char (*line, screen.cur.col);
927 962
928 line->touch (); 963 line->touch ();
929 964
930 do 965 do
931 { 966 {
932 line->t[screen.cur.col] = c; 967 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 968 line->r[screen.cur.col] = rend;
934 969
935 if (expect_true (screen.cur.col < ncol - 1)) 970 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 971 screen.cur.col++;
937 else 972 else
938 { 973 {
939 line->l = ncol; 974 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 975 if (screen.flags & Screen_Autowrap)
943 goto end_of_line; 978 goto end_of_line;
944 } 979 }
945 980
946 c = NOCHAR; 981 c = NOCHAR;
947 } 982 }
948 while (expect_false (--width > 0)); 983 while (ecb_unlikely (--width > 0));
949 984
950 // pad with spaces when overwriting wide character with smaller one 985 // pad with spaces when overwriting wide character with smaller one
951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 986 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 987 {
953 line->t[c] = ' '; 988 line->t[c] = ' ';
954 line->r[c] = rend; 989 line->r[c] = rend;
955 } 990 }
956 991
978 } 1013 }
979 else if (screen.cur.row > 0 1014 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ()) 1015 && ROW(screen.cur.row - 1).is_longer ())
981 { 1016 {
982 linep = &ROW(screen.cur.row - 1); 1017 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1; 1018 tp = linep->t + ncol - 1;
984 rp = line->r + ncol - 1; 1019 rp = linep->r + ncol - 1;
985 } 1020 }
986 else 1021 else
987 continue; 1022 continue;
988 1023
989 linep->touch (); 1024 linep->touch ();
1012/* 1047/*
1013 * 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
1014 * XTERM_SEQ: CTRL-H 1049 * XTERM_SEQ: CTRL-H
1015 */ 1050 */
1016void 1051void
1017rxvt_term::scr_backspace () NOTHROW 1052rxvt_term::scr_backspace () noexcept
1018{ 1053{
1019 if (screen.cur.col == 0) 1054 if (screen.cur.col == 0)
1020 { 1055 {
1021 if (screen.cur.row > 0) 1056 if (screen.cur.row > 0)
1022 { 1057 {
1039 * Process Horizontal Tab 1074 * Process Horizontal Tab
1040 * count: +ve = forward; -ve = backwards 1075 * count: +ve = forward; -ve = backwards
1041 * XTERM_SEQ: CTRL-I 1076 * XTERM_SEQ: CTRL-I
1042 */ 1077 */
1043void 1078void
1044rxvt_term::scr_tab (int count, bool ht) NOTHROW 1079rxvt_term::scr_tab (int count, bool ht) noexcept
1045{ 1080{
1046 int i, x; 1081 int i, x;
1047 1082
1048 want_refresh = 1; 1083 want_refresh = 1;
1049 i = x = screen.cur.col; 1084 i = x = screen.cur.col;
1115 * XTERM_SEQ: ESC 6 1150 * XTERM_SEQ: ESC 6
1116 * 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
1117 * in that row right. Clear left column. 1152 * in that row right. Clear left column.
1118 */ 1153 */
1119#if !ENABLE_MINIMAL 1154#if !ENABLE_MINIMAL
1120void 1155void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1156rxvt_term::scr_backindex () noexcept
1122{ 1157{
1123 if (screen.cur.col > 0) 1158 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1159 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1160 else
1126 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
1132 * XTERM_SEQ: ESC 9 1167 * XTERM_SEQ: ESC 9
1133 * 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
1134 * in that row left. Clear right column. 1169 * in that row left. Clear right column.
1135 */ 1170 */
1136#if !ENABLE_MINIMAL 1171#if !ENABLE_MINIMAL
1137void 1172void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1173rxvt_term::scr_forwardindex () noexcept
1139{ 1174{
1140 if (screen.cur.col < ncol - 1) 1175 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1176 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1177 else
1143 { 1178 {
1156/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1157/* 1192/*
1158 * Goto Row/Column 1193 * Goto Row/Column
1159 */ 1194 */
1160void 1195void
1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1196rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1162{ 1197{
1163 want_refresh = 1; 1198 want_refresh = 1;
1164 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1165 1200
1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1205/* ------------------------------------------------------------------------- */ 1240/* ------------------------------------------------------------------------- */
1206/* 1241/*
1207 * direction should be UP or DN 1242 * direction should be UP or DN
1208 */ 1243 */
1209void 1244void
1210rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1245rxvt_term::scr_index (enum page_dirn direction) noexcept
1211{ 1246{
1212 int dirn;
1213
1214 want_refresh = 1; 1247 want_refresh = 1;
1215 ZERO_SCROLLBACK (); 1248 ZERO_SCROLLBACK ();
1216 1249
1217 dirn = ((direction == UP) ? 1 : -1);
1218
1219 screen.flags &= ~Screen_WrapNext; 1250 screen.flags &= ~Screen_WrapNext;
1220 1251
1221 if ((screen.cur.row == screen.bscroll && direction == UP) 1252 if ((screen.cur.row == screen.bscroll && direction == UP)
1222 || (screen.cur.row == screen.tscroll && direction == DN)) 1253 || (screen.cur.row == screen.tscroll && direction == DN))
1223 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1254 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1224 else 1255 else
1225 screen.cur.row += dirn; 1256 screen.cur.row += direction;
1226 1257
1227 clamp_it (screen.cur.row, 0, nrow - 1); 1258 clamp_it (screen.cur.row, 0, nrow - 1);
1228 selection_check (0); 1259 selection_check (0);
1229} 1260}
1230 1261
1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K 1268 * extension: clear to right unless wrapped: ESC [ 3 K
1238 */ 1269 */
1239void 1270void
1240rxvt_term::scr_erase_line (int mode) NOTHROW 1271rxvt_term::scr_erase_line (int mode) noexcept
1241{ 1272{
1242 unsigned int col, num; 1273 unsigned int col, num;
1243 1274
1244 want_refresh = 1; 1275 want_refresh = 1;
1245 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
1293 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1294} 1325}
1295 1326
1296/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1297/* 1328/*
1298 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1333 */
1303void 1334void
1304rxvt_term::scr_erase_screen (int mode) NOTHROW 1335rxvt_term::scr_erase_screen (int mode) noexcept
1305{ 1336{
1306 int num; 1337 int num;
1307 int32_t row; 1338 int32_t row;
1308 rend_t ren; 1339 rend_t ren;
1309 XGCValues gcvalue; 1340 XGCValues gcvalue;
1312 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1313 1344
1314 switch (mode) 1345 switch (mode)
1315 { 1346 {
1316 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1348 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1350 num = nrow - row;
1321 break; 1351 break;
1322 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1353 scr_erase_line (1);
1325 row = 0; 1354 row = 0;
1326 num = screen.cur.row; 1355 num = screen.cur.row;
1327 break; 1356 break;
1328 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1358 row = 0;
1331 num = nrow; 1359 num = nrow;
1332 break; 1360 break;
1333 default: 1361 default:
1334 return; 1362 return;
1351 { 1379 {
1352 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1353 1381
1354 if (mapped) 1382 if (mapped)
1355 XClearArea (dpy, vt, 0, 1383 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1385 (unsigned int)Height2Pixel (num), False);
1358 } 1386 }
1359 else 1387 else
1360 { 1388 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 { 1392 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1395 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1396 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1397 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1398 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1401 }
1374 } 1402 }
1382 } 1410 }
1383} 1411}
1384 1412
1385#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1386void 1414void
1387rxvt_term::scr_erase_savelines () NOTHROW 1415rxvt_term::scr_erase_savelines () noexcept
1388{ 1416{
1389 want_refresh = 1; 1417 want_refresh = 1;
1390 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1391 1419
1392 top_row = 0; 1420 top_row = 0;
1396/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1397/* 1425/*
1398 * Fill the screen with `E's 1426 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1428 */
1401void 1429void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () noexcept
1403{ 1431{
1404 rend_t fs; 1432 rend_t fs;
1405 1433
1406 want_refresh = 1; 1434 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1408 1436
1409 num_scr_allow = 0; 1437 num_scr_allow = 0;
1410 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 ();
1411 1443
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1414 { 1446 {
1415 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
1428/* ------------------------------------------------------------------------- */ 1460/* ------------------------------------------------------------------------- */
1429/* 1461/*
1430 * Insert/Delete <count> lines 1462 * Insert/Delete <count> lines
1431 */ 1463 */
1432void 1464void
1433rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1434{ 1466{
1435 int end; 1467 int end;
1436 1468
1437 ZERO_SCROLLBACK (); 1469 ZERO_SCROLLBACK ();
1438 1470
1458/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
1459/* 1491/*
1460 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1461 */ 1493 */
1462void 1494void
1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1495rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1464{ 1496{
1465 want_refresh = 1; 1497 want_refresh = 1;
1466 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1467 1499
1468 if (count <= 0) 1500 if (count <= 0)
1566/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1567/* 1599/*
1568 * Set the scrolling region 1600 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1602 */
1571void 1603void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) noexcept
1573{ 1605{
1574 max_it (top, 0); 1606 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1576 1608
1577 if (top > bot) 1609 if (top > bot)
1586/* 1618/*
1587 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1622 */
1591void 1623void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) noexcept
1593{ 1625{
1594 want_refresh = 1; 1626 want_refresh = 1;
1595 1627
1596 if (mode) 1628 if (mode)
1597 screen.flags |= Screen_VisibleCursor; 1629 screen.flags |= Screen_VisibleCursor;
1603/* 1635/*
1604 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1639 */
1608void 1640void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) noexcept
1610{ 1642{
1611 if (mode) 1643 if (mode)
1612 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1613 else 1645 else
1614 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1646 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1622 * 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
1623 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1658 */
1627void 1659void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) noexcept
1629{ 1661{
1630 if (mode) 1662 if (mode)
1631 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1632 else 1664 else
1633 screen.flags &= ~Screen_Relative; 1665 screen.flags &= ~Screen_Relative;
1639/* 1671/*
1640 * Set insert/replace mode 1672 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1675 */
1644void 1676void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) noexcept
1646{ 1678{
1647 if (mode) 1679 if (mode)
1648 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1649 else 1681 else
1650 screen.flags &= ~Screen_Insert; 1682 screen.flags &= ~Screen_Insert;
1655 * Set/Unset tabs 1687 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1691 */
1660void 1692void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) noexcept
1662{ 1694{
1663 if (mode < 0) 1695 if (mode < 0)
1664 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
1666 tabs [screen.cur.col] = !!mode; 1698 tabs [screen.cur.col] = !!mode;
1671 * Set reverse/normal video 1703 * Set reverse/normal video
1672 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1704 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1673 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1705 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1674 */ 1706 */
1675void 1707void
1676rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1708rxvt_term::scr_rvideo_mode (bool on) noexcept
1677{ 1709{
1678 rvideo_mode = on; 1710 rvideo_mode = on;
1679 1711
1680#ifndef NO_BELL 1712#ifndef NO_BELL
1681 on ^= rvideo_bell; 1713 on ^= rvideo_bell;
1683 1715
1684 if (rvideo_state != on) 1716 if (rvideo_state != on)
1685 { 1717 {
1686 rvideo_state = on; 1718 rvideo_state = on;
1687 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
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1728 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1729#ifdef HAVE_IMG
1690 if (bgPixmap.pixmap == None) 1730 if (bg_img == 0)
1691#endif 1731#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1732 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1733
1694 XGCValues gcvalue; 1734 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1735 gcvalue.foreground = pix_colors[Color_fg];
1704/* ------------------------------------------------------------------------- */ 1744/* ------------------------------------------------------------------------- */
1705/* 1745/*
1706 * Report current cursor position 1746 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1747 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1748 */
1709void 1749void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1750rxvt_term::scr_report_position () noexcept
1711{ 1751{
1712 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);
1713} 1753}
1714 1754
1715/* ------------------------------------------------------------------------- * 1755/* ------------------------------------------------------------------------- *
1717 * ------------------------------------------------------------------------- */ 1757 * ------------------------------------------------------------------------- */
1718 1758
1719/* 1759/*
1720 * Set font style 1760 * Set font style
1721 */ 1761 */
1722void 1762void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1763rxvt_term::set_font_style () noexcept
1724{ 1764{
1725#if 0 1765#if 0
1726 switch (charsets [screen.charset]) 1766 switch (charsets [screen.charset])
1727 { 1767 {
1728 case '0': /* DEC Special Character & Line Drawing Set */ 1768 case '0': /* DEC Special Character & Line Drawing Set */
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1789 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1790 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1791 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1792 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1793 */
1754void 1794void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1795rxvt_term::scr_charset_choose (int set) noexcept
1756{ 1796{
1757 screen.charset = set; 1797 screen.charset = set;
1758 set_font_style (); 1798 set_font_style ();
1759} 1799}
1760 1800
1766 * XTERM_SEQ: Set G2 character set: ESC * <C> 1806 * XTERM_SEQ: Set G2 character set: ESC * <C>
1767 * XTERM_SEQ: Set G3 character set: ESC + <C> 1807 * XTERM_SEQ: Set G3 character set: ESC + <C>
1768 * See set_font_style for possible values for <C> 1808 * See set_font_style for possible values for <C>
1769 */ 1809 */
1770void 1810void
1771rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1811rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1772{ 1812{
1773 charsets[set] = (unsigned char)ch; 1813 charsets[set] = (unsigned char)ch;
1774 set_font_style (); 1814 set_font_style ();
1775} 1815}
1776 1816
1780 * ------------------------------------------------------------------------- */ 1820 * ------------------------------------------------------------------------- */
1781 1821
1782/* 1822/*
1783 * refresh matching text. 1823 * refresh matching text.
1784 */ 1824 */
1785bool 1825bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1826rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1787{ 1827{
1788 bool found = false; 1828 bool found = false;
1789 1829
1790 for (int i = 0; i < nrow; i++) 1830 for (int i = 0; i < nrow; i++)
1791 { 1831 {
1809 PART_BEG = 0, 1849 PART_BEG = 0,
1810 PART_END, 1850 PART_END,
1811 RC_COUNT 1851 RC_COUNT
1812}; 1852};
1813 1853
1814void 1854void ecb_hot
1815rxvt_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
1816{ 1856{
1817 int i; 1857 int i;
1818 row_col_t rc[RC_COUNT]; 1858 row_col_t rc[RC_COUNT];
1819 1859
1820 if (!drawn_buf) /* sanity check */ 1860 if (!drawn_buf) /* sanity check */
1854/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1855/* 1895/*
1856 * Refresh the entire screen 1896 * Refresh the entire screen
1857 */ 1897 */
1858void 1898void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1899rxvt_term::scr_touch (bool refresh) noexcept
1860{ 1900{
1861 scr_expose (0, 0, width, height, refresh); 1901 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1902}
1863 1903
1864/* ------------------------------------------------------------------------- */ 1904/* ------------------------------------------------------------------------- */
1865/* 1905/*
1866 * 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
1867 * the top of the screen 1907 * the top of the screen
1868 */ 1908 */
1869void 1909void
1870rxvt_term::scr_move_to (int y, int len) NOTHROW 1910rxvt_term::scr_move_to (int y, int len) noexcept
1871{ 1911{
1872 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);
1873} 1914}
1874 1915
1875/* ------------------------------------------------------------------------- */ 1916/* ------------------------------------------------------------------------- */
1876/* 1917/*
1877 * Page the screen up/down nlines 1918 * Page the screen up/down nlines
1878 * direction should be UP or DN 1919 * direction should be UP or DN
1879 */ 1920 */
1880bool 1921bool
1881rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1922rxvt_term::scr_page (int nlines) noexcept
1882{ 1923{
1883 int new_view_start =
1884 direction == UP ? view_start - nlines
1885 : view_start + nlines;
1886
1887 return scr_changeview (new_view_start); 1924 return scr_changeview (view_start - nlines);
1888} 1925}
1889 1926
1890bool 1927bool
1891rxvt_term::scr_changeview (int new_view_start) NOTHROW 1928rxvt_term::scr_changeview (int new_view_start) noexcept
1892{ 1929{
1893 clamp_it (new_view_start, top_row, 0); 1930 clamp_it (new_view_start, top_row, 0);
1894 1931
1895 if (new_view_start == view_start) 1932 if (new_view_start == view_start)
1896 return false; 1933 return false;
1914} 1951}
1915#endif 1952#endif
1916 1953
1917/* ------------------------------------------------------------------------- */ 1954/* ------------------------------------------------------------------------- */
1918void 1955void
1919rxvt_term::scr_bell () NOTHROW 1956rxvt_term::scr_bell () noexcept
1920{ 1957{
1921#ifndef NO_BELL 1958#ifndef NO_BELL
1922 1959
1923# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1962 if (option (Opt_mapAlert))
1926# endif 1963# endif
1927 XMapWindow (dpy, parent[0]); 1964 XMapWindow (dpy, parent);
1928# endif 1965# endif
1929 1966
1930# if ENABLE_FRILLS 1967# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1968 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1969 set_urgency (1);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1983#endif
1947} 1984}
1948 1985
1949/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1987void ecb_cold
1951void
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 = bgPixmap.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
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2257 --col;
2240 2258
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2260 text_t *text = stp + col;
2243 int count = 1; 2261 int count = 1;
2281 2299
2282 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2284 2302
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2305 count++, i--;
2288 2306
2289 /* 2307 /*
2290 * Determine the attributes for the string 2308 * Determine the attributes for the string
2291 */ 2309 */
2292 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2294 2312
2295 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2315 {
2298 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2299 2317
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
2390 /* 2408 /*
2391 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2392 */ 2410 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2412
2395 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2414 {
2397 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2398 2416
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2418 if (text[i] != ' ')
2407 did_clear: ; 2425 did_clear: ;
2408 } 2426 }
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 (expect_false (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 () NOTHROW 2529rxvt_term::scr_recolor (bool refresh) noexcept
2514{ 2530{
2515#ifdef HAVE_BG_PIXMAP 2531 bool transparent = false;
2516 bgPixmap.apply ();
2517#else
2518 2532
2533#ifdef HAVE_IMG
2534 if (bg_img != 0)
2535 {
2536# if ENABLE_TRANSPARENCY
2537 if (bg_flags & BG_IS_TRANSPARENT)
2538 {
2539 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2540 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2541
2542 transparent = true;
2543 }
2544 else
2545# endif
2546 {
2547 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2548 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2549 }
2550 }
2551 else
2552#endif
2553 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2555 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2522
2523 if (scrollBar.win)
2524 { 2556 }
2557
2558 XClearWindow (dpy, parent);
2559
2560 if (scrollBar.state && scrollBar.win)
2561 {
2562 if (transparent)
2563 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2564 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2565 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2526 scrollBar.state = STATE_IDLE; 2566 scrollBar.state = SB_STATE_IDLE;
2527 scrollBar.show (0); 2567 scrollBar.show (0);
2528 } 2568 }
2529 2569
2530#endif 2570 if (refresh)
2531 2571 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2572 scr_clear ();
2534 scr_touch (true); 2573 scr_touch (true);
2574 }
2535 want_refresh = 1; 2575 want_refresh = 1;
2536} 2576}
2537 2577
2538/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2539void 2579void
2540rxvt_term::scr_clear (bool really) NOTHROW 2580rxvt_term::scr_clear (bool really) noexcept
2541{ 2581{
2542 if (!mapped) 2582 if (!mapped)
2543 return; 2583 return;
2544 2584
2545 num_scr_allow = 0; 2585 num_scr_allow = 0;
2548 if (really) 2588 if (really)
2549 XClearWindow (dpy, vt); 2589 XClearWindow (dpy, vt);
2550} 2590}
2551 2591
2552void 2592void
2553rxvt_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
2554{ 2594{
2555 int view_end = view_start + nrow; 2595 int view_end = view_start + nrow;
2556 int row, col; 2596 int row, col;
2557 2597
2558 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++)
2570 srp[col] ^= rstyle2; 2610 srp[col] ^= rstyle2;
2571 } 2611 }
2572} 2612}
2573 2613
2574void 2614void
2575rxvt_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
2576{ 2616{
2577 int view_end = view_start + nrow; 2617 int view_end = view_start + nrow;
2578 int row, col; 2618 int row, col;
2579 2619
2580 if (beg_row >= view_start) 2620 if (beg_row >= view_start)
2596 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2636 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2597 srp[col] ^= rstyle; 2637 srp[col] ^= rstyle;
2598} 2638}
2599 2639
2600/* ------------------------------------------------------------------------- */ 2640/* ------------------------------------------------------------------------- */
2601void 2641void ecb_hot
2602rxvt_term::scr_reverse_selection () NOTHROW 2642rxvt_term::scr_reverse_selection () noexcept
2603{ 2643{
2604 if (selection.op 2644 if (selection.op
2605 && current_screen == selection.screen 2645 && current_screen == selection.screen
2606 && selection.end.row >= view_start) 2646 && selection.end.row >= view_start)
2607 { 2647 {
2623 * Dump the whole scrollback and screen to the passed filedescriptor. The 2663 * Dump the whole scrollback and screen to the passed filedescriptor. The
2624 * invoking routine must close the fd. 2664 * invoking routine must close the fd.
2625 */ 2665 */
2626#if 0 2666#if 0
2627void 2667void
2628rxvt_term::scr_dump (int fd) NOTHROW 2668rxvt_term::scr_dump (int fd) noexcept
2629{ 2669{
2630 int row, wrote; 2670 // if this method is needed, it can be implemented by factoring the
2631 unsigned int width, towrite; 2671 // relevant code in scr_printscreen
2632 const char r1[] = "\n";
2633
2634 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++)
2636 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2638 : ncol;
2639 for (towrite = width; towrite; towrite -= wrote)
2640 {
2641 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2642 towrite);
2643 if (wrote < 0)
2644 return; /* XXX: death, no report */
2645 }
2646 if (row_buf[row].l >= 0)
2647 if (write (fd, r1, 1) <= 0)
2648 return; /* XXX: death, no report */
2649 }
2650} 2672}
2651#endif 2673#endif
2652 2674
2653/* ------------------------------------------------------------------------- * 2675/* ------------------------------------------------------------------------- *
2654 * CHARACTER SELECTION * 2676 * CHARACTER SELECTION *
2655 * ------------------------------------------------------------------------- */ 2677 * ------------------------------------------------------------------------- */
2656void 2678void
2657rxvt_term::selection_check (int check_more) NOTHROW 2679rxvt_term::selection_check (int check_more) noexcept
2658{ 2680{
2659 row_col_t pos;
2660
2661 if (!selection.op) 2681 if (!selection.op)
2662 return; 2682 return;
2663 2683
2664 pos.row = pos.col = 0;
2665 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2684 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2666 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2686 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2668 || (check_more == 1 2687 || (check_more == 1
2669 && current_screen == selection.screen 2688 && current_screen == selection.screen
2670 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2689 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2671 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2690 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2672 || (check_more == 2
2673 && ROWCOL_IS_BEFORE (selection.beg, pos)
2674 && ROWCOL_IS_AFTER (selection.end, pos))
2675 || (check_more == 3
2676 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 4 /* screen width change */
2678 && (selection.beg.row != selection.end.row
2679 || selection.end.col > ncol)))
2680 CLEAR_SELECTION (); 2691 CLEAR_ALL_SELECTION ();
2692}
2693
2694void
2695rxvt_term::selection_changed () noexcept
2696{
2697 line_t &r1 = ROW (selection.beg.row);
2698 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2699 ++selection.beg.col;
2700
2701 line_t &r2 = ROW (selection.end.row);
2702 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2703 ++selection.end.col;
2704
2705 want_refresh = 1;
2681} 2706}
2682 2707
2683/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2684/* 2709/*
2685 * Paste a selection direct to the command fd 2710 * Paste a selection direct to the command fd
2686 */ 2711 */
2687void 2712void
2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW 2713rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2689{ 2714{
2690 /* convert normal newline chars into common keyboard Return key sequence */ 2715 /* convert normal newline chars into common keyboard Return key sequence */
2691 for (unsigned int i = 0; i < len; i++) 2716 for (unsigned int i = 0; i < len; i++)
2692 if (data[i] == C0_LF) 2717 if (data[i] == C0_LF)
2693 data[i] = C0_CR; 2718 data[i] = C0_CR;
2694 2719
2695 if (priv_modes & PrivMode_BracketPaste) 2720 #if ENABLE_FRILLS
2721 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2696 tt_printf ("\e[200~"); 2722 tt_printf ("\x1b[200~");
2723 #endif
2697 2724
2698 tt_write (data, len); 2725 tt_write (data, len);
2699 2726
2700 if (priv_modes & PrivMode_BracketPaste) 2727 #if ENABLE_FRILLS
2728 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2701 tt_printf ("\e[201~"); 2729 tt_printf ("\x1b[201~");
2730 #endif
2702} 2731}
2703 2732
2704void 2733void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW 2734rxvt_term::paste (char *data, unsigned int len) noexcept
2706{ 2735{
2707 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)))
2708 return; 2737 return;
2709 2738
2710 tt_paste (data, len); 2739 tt_paste (data, len);
2711} 2740}
2712 2741
2713/* ------------------------------------------------------------------------- */ 2742/* ------------------------------------------------------------------------- */
2714/* 2743/*
2715 * Respond to a notification that a primary selection has been sent 2744 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2745 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2746 * as fallback
2718void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{
2721 if (prop == None) /* check for failed XConvertSelection */
2722 {
2723 if ((selection_type & Sel_CompoundText))
2724 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum);
2730 }
2731
2732 if ((selection_type & Sel_UTF8String))
2733 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 }
2742
2743 return;
2744 }
2745
2746 unsigned long bytes_after;
2747 XTextProperty ct;
2748
2749 if (XGetWindowProperty (dpy, win, prop,
2750 0, PROP_SIZE / 4,
2751 delete_prop, AnyPropertyType,
2752 &ct.encoding, &ct.format,
2753 &ct.nitems, &bytes_after,
2754 &ct.value) != Success)
2755 {
2756 ct.value = 0;
2757 goto bailout;
2758 }
2759
2760 if (ct.encoding == None)
2761 goto bailout;
2762
2763 if (bytes_after)
2764 {
2765 // fetch and append remaining data
2766 XTextProperty ct2;
2767
2768 if (XGetWindowProperty (dpy, win, prop,
2769 ct.nitems / 4, (bytes_after + 3) / 4,
2770 delete_prop, AnyPropertyType,
2771 &ct2.encoding, &ct2.format,
2772 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success)
2774 goto bailout;
2775
2776 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems;
2780
2781 XFree (ct2.value);
2782 }
2783
2784 if (ct.value == 0)
2785 goto bailout;
2786
2787 if (ct.encoding == xa[XA_INCR])
2788 {
2789 // INCR selection, start handshake
2790 if (!delete_prop)
2791 XDeleteProperty (dpy, win, prop);
2792
2793 selection_wait = Sel_incr;
2794 incr_buf_fill = 0;
2795 incr_ev.start (10);
2796
2797 goto bailout;
2798 }
2799
2800 if (ct.nitems == 0)
2801 {
2802 if (selection_wait == Sel_incr)
2803 {
2804 XFree (ct.value);
2805
2806 // finally complete, now paste the whole thing
2807 selection_wait = Sel_normal;
2808 ct.value = (unsigned char *)incr_buf;
2809 ct.nitems = incr_buf_fill;
2810 incr_buf = 0;
2811 incr_buf_size = 0;
2812 incr_ev.stop ();
2813 }
2814 else
2815 {
2816 if (selection_wait == Sel_normal
2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2818 {
2819 /*
2820 * pass through again trying CUT_BUFFER0 if we've come from
2821 * XConvertSelection () but nothing was presented
2822 */
2823 selection_paste (display->root, XA_CUT_BUFFER0, False);
2824 }
2825
2826 goto bailout;
2827 }
2828 }
2829 else if (selection_wait == Sel_incr)
2830 {
2831 incr_ev.start (10);
2832
2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2837 }
2838
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems;
2841
2842 goto bailout;
2843 }
2844
2845 char **cl;
2846 int cr;
2847
2848#if !ENABLE_MINIMAL
2849 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2850 // so recode it manually
2851 if (ct.encoding == xa[XA_UTF8_STRING])
2852 {
2853 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2854 char *s = rxvt_wcstombs (w);
2855 free (w);
2856 // TODO: strlen == only the first element will be converted. well...
2857 paste (s, strlen (s));
2858 free (s);
2859 }
2860 else
2861#endif
2862 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2863 && cl)
2864 {
2865 for (int i = 0; i < cr; i++)
2866 paste (cl[i], strlen (cl[i]));
2867
2868 XFreeStringList (cl);
2869 }
2870 else
2871 paste ((char *)ct.value, ct.nitems); // paste raw
2872
2873bailout:
2874 XFree (ct.value);
2875
2876 if (selection_wait == Sel_normal)
2877 selection_wait = Sel_none;
2878}
2879
2880void
2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2882{
2883 selection_wait = Sel_none;
2884
2885 incr_buf_size = 0;
2886 free (incr_buf);
2887
2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889}
2890
2891void
2892rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2893{
2894 if (prop == None || selection_wait != Sel_incr)
2895 return;
2896
2897 selection_paste (win, prop, true);
2898}
2899
2900/* ------------------------------------------------------------------------- */
2901/*
2902 * Request the current selection:
2903 * Order: > internal selection if available
2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905 * > CUT_BUFFER0
2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2907 * will auto fallback to CUT_BUFFER0
2908 * EXT: button 2 release 2747 * EXT: button 2 release
2909 */ 2748 */
2910void 2749void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) noexcept
2912{ 2751{
2913 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2914 {
2915 /* internal selection */
2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2917 paste (str, strlen (str));
2918 free (str);
2919 return;
2920 } 2753 {
2921 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2922 { 2756 }
2923 selection_request_time = tm;
2924 selection_wait = Sel_normal;
2925
2926#if X_HAVE_UTF8_STRING
2927 selection_type = Sel_UTF8String;
2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2929 return;
2930#else
2931 selection_type = Sel_CompoundText;
2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2933 return;
2934#endif
2935 }
2936
2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2939}
2940
2941int
2942rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2943{
2944 Atom sel;
2945
2946 selection_type |= selnum;
2947
2948 if (selnum == Sel_Primary)
2949 sel = XA_PRIMARY;
2950 else if (selnum == Sel_Secondary)
2951 sel = XA_SECONDARY;
2952 else
2953 sel = xa[XA_CLIPBOARD];
2954
2955 if (XGetSelectionOwner (dpy, sel) != None)
2956 {
2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958 vt, selection_request_time);
2959 return 1;
2960 }
2961
2962 return 0;
2963} 2757}
2964 2758
2965/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2966/* 2760/*
2967 * Clear all selected text 2761 * Clear all selected text
2968 * EXT: SelectionClear 2762 * EXT: SelectionClear
2969 */ 2763 */
2970void 2764void
2971rxvt_term::selection_clear (bool clipboard) NOTHROW 2765rxvt_term::selection_clear (bool clipboard) noexcept
2972{ 2766{
2973 if (!clipboard) 2767 if (!clipboard)
2974 { 2768 {
2975 want_refresh = 1; 2769 want_refresh = 1;
2976 free (selection.text); 2770 free (selection.text);
3061 if (*t == NOCHAR) 2855 if (*t == NOCHAR)
3062 t++; 2856 t++;
3063#if ENABLE_COMBINING 2857#if ENABLE_COMBINING
3064 else if (IS_COMPOSE (*t)) 2858 else if (IS_COMPOSE (*t))
3065 { 2859 {
3066 int len = rxvt_composite.expand (*t, 0); 2860 int len = rxvt_composite.expand (*t);
3067 2861
3068 extra -= (len - 1); 2862 extra -= (len - 1);
3069 2863
3070 if (extra < 0) 2864 if (extra < 0)
3071 { 2865 {
3118 2912
3119 selection_grab (tm); 2913 selection_grab (tm);
3120} 2914}
3121 2915
3122bool 2916bool
3123rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
3124{ 2918{
3125 Atom sel; 2919 Atom sel;
3126 2920
3127 if (!clipboard) 2921 if (!clipboard)
3128 { 2922 {
3161/* ------------------------------------------------------------------------- */ 2955/* ------------------------------------------------------------------------- */
3162/* 2956/*
3163 * 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
3164 * EXT: button 1 press 2958 * EXT: button 1 press
3165 */ 2959 */
3166void 2960void ecb_cold
3167rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2961rxvt_term::selection_click (int clicks, int x, int y) noexcept
3168{ 2962{
3169 clicks = ((clicks - 1) % 3) + 1; 2963 clicks = ((clicks - 1) % 3) + 1;
3170 selection.clicks = clicks; /* save clicks so extend will work */ 2964 selection.clicks = clicks; /* save clicks so extend will work */
3171 2965
3172 if (clicks == 2 && !selection.rect 2966 if (clicks == 2 && !selection.rect
3190 2984
3191/* ------------------------------------------------------------------------- */ 2985/* ------------------------------------------------------------------------- */
3192/* 2986/*
3193 * Mark a selection at the specified col/row 2987 * Mark a selection at the specified col/row
3194 */ 2988 */
3195void 2989void ecb_cold
3196rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2990rxvt_term::selection_start_colrow (int col, int row) noexcept
3197{ 2991{
3198 want_refresh = 1; 2992 want_refresh = 1;
3199 2993
3200 selection.mark.row = row + view_start; 2994 selection.mark.row = row + view_start;
3201 selection.mark.col = col; 2995 selection.mark.col = col;
3223 * Word select: select text for 2 clicks 3017 * Word select: select text for 2 clicks
3224 * We now only find out the boundary in one direction 3018 * We now only find out the boundary in one direction
3225 */ 3019 */
3226 3020
3227/* 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 */
3228#define DELIMIT_TEXT(x) \ 3022#define DELIMIT_TEXT(x) \
3229 (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)))
3230#define DELIMIT_REND(x) 1 3024#define DELIMIT_REND(x) 1
3231 3025
3232void 3026void ecb_cold
3233rxvt_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
3234{ 3028{
3235 int col, row, dirnadd, tcol, trow, w1, w2; 3029 int col, row, dirnadd, tcol, trow, w1, w2;
3236 row_col_t bound; 3030 row_col_t bound;
3237 text_t *stp; 3031 text_t *stp;
3238 rend_t *srp; 3032 rend_t *srp;
3311 * EXT: button 3 press; button 1 or 3 drag 3105 * EXT: button 3 press; button 1 or 3 drag
3312 * flag == 0 ==> button 1 3106 * flag == 0 ==> button 1
3313 * flag == 1 ==> button 3 press 3107 * flag == 1 ==> button 3 press
3314 * flag == 2 ==> button 3 motion 3108 * flag == 2 ==> button 3 motion
3315 */ 3109 */
3316void 3110void ecb_cold
3317rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3111rxvt_term::selection_extend (int x, int y, int flag) noexcept
3318{ 3112{
3319 int col = clamp (Pixel2Col (x), 0, ncol); 3113 int col = clamp (Pixel2Col (x), 0, ncol);
3320 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3114 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3321 3115
3322 /* 3116 /*
3347 3141
3348/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3349/* 3143/*
3350 * Extend the selection to the specified col/row 3144 * Extend the selection to the specified col/row
3351 */ 3145 */
3352void 3146void ecb_cold
3353rxvt_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
3354{ 3148{
3355 row_col_t pos; 3149 row_col_t pos;
3356 enum { 3150 enum {
3357 LEFT, RIGHT 3151 LEFT, RIGHT
3358 } closeto = RIGHT; 3152 } closeto = RIGHT;
3359
3360 want_refresh = 1;
3361 3153
3362 switch (selection.op) 3154 switch (selection.op)
3363 { 3155 {
3364 case SELECTION_INIT: 3156 case SELECTION_INIT:
3365 CLEAR_SELECTION (); 3157 CLEAR_SELECTION ();
3545 3337
3546#if !ENABLE_MINIMAL 3338#if !ENABLE_MINIMAL
3547 if (selection.rect && selection.beg.col > selection.end.col) 3339 if (selection.rect && selection.beg.col > selection.end.col)
3548 ::swap (selection.beg.col, selection.end.col); 3340 ::swap (selection.beg.col, selection.end.col);
3549#endif 3341#endif
3342
3343 selection_changed ();
3550} 3344}
3551 3345
3552#if !ENABLE_MINIMAL 3346#if !ENABLE_MINIMAL
3553void 3347void ecb_cold
3554rxvt_term::selection_remove_trailing_spaces () NOTHROW 3348rxvt_term::selection_remove_trailing_spaces () noexcept
3555{ 3349{
3556 int32_t end_col, end_row; 3350 int32_t end_col, end_row;
3557 text_t *stp; 3351 text_t *stp;
3558 3352
3559 end_col = selection.end.col; 3353 end_col = selection.end.col;
3596/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3597/* 3391/*
3598 * Double click on button 3 when already selected 3392 * Double click on button 3 when already selected
3599 * EXT: button 3 double click 3393 * EXT: button 3 double click
3600 */ 3394 */
3601void 3395void ecb_cold
3602rxvt_term::selection_rotate (int x, int y) NOTHROW 3396rxvt_term::selection_rotate (int x, int y) noexcept
3603{ 3397{
3604 selection.clicks = selection.clicks % 3 + 1; 3398 selection.clicks = selection.clicks % 3 + 1;
3605 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3399 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3606} 3400}
3607 3401
3608/* ------------------------------------------------------------------------- */ 3402/* ------------------------------------------------------------------------- */
3609/* 3403/*
3610 * Respond to a request for our current selection 3404 * Respond to a request for our current selection
3611 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3612 */ 3406 */
3613void 3407void ecb_cold
3614rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3615{ 3409{
3410 Atom property = rq.property == None ? rq.target : rq.property;
3616 XSelectionEvent ev; 3411 XSelectionEvent ev;
3617 3412
3618 ev.type = SelectionNotify; 3413 ev.type = SelectionNotify;
3619 ev.property = None; 3414 ev.property = None;
3620 ev.display = rq.display; 3415 ev.display = rq.display;
3635 *target++ = xa[XA_COMPOUND_TEXT]; 3430 *target++ = xa[XA_COMPOUND_TEXT];
3636#if X_HAVE_UTF8_STRING 3431#if X_HAVE_UTF8_STRING
3637 *target++ = xa[XA_UTF8_STRING]; 3432 *target++ = xa[XA_UTF8_STRING];
3638#endif 3433#endif
3639 3434
3640 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3435 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3641 32, PropModeReplace, 3436 32, PropModeReplace,
3642 (unsigned char *)target_list, target - target_list); 3437 (unsigned char *)target_list, target - target_list);
3643 ev.property = rq.property; 3438 ev.property = property;
3644 } 3439 }
3645#if TODO // TODO 3440#if TODO // TODO
3646 else if (rq.target == xa[XA_MULTIPLE]) 3441 else if (rq.target == xa[XA_MULTIPLE])
3647 { 3442 {
3648 /* TODO: Handle MULTIPLE */ 3443 /* TODO: Handle MULTIPLE */
3649 } 3444 }
3650#endif 3445#endif
3651 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3446 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3652 { 3447 {
3653 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3448 XChangeProperty (dpy, rq.requestor, property, rq.target,
3654 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3449 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3655 ev.property = rq.property; 3450 ev.property = property;
3656 } 3451 }
3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3452 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3658 { 3453 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3454 XChangeProperty (dpy, rq.requestor, property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3455 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3661 ev.property = rq.property; 3456 ev.property = property;
3662 } 3457 }
3663 else if (rq.target == XA_STRING 3458 else if (rq.target == XA_STRING
3664 || rq.target == xa[XA_TEXT] 3459 || rq.target == xa[XA_TEXT]
3665 || rq.target == xa[XA_COMPOUND_TEXT] 3460 || rq.target == xa[XA_COMPOUND_TEXT]
3666 || rq.target == xa[XA_UTF8_STRING] 3461 || rq.target == xa[XA_UTF8_STRING]
3710 cl = selection.clip_text; 3505 cl = selection.clip_text;
3711 selectlen = selection.clip_len; 3506 selectlen = selection.clip_len;
3712 } 3507 }
3713 else 3508 else
3714 { 3509 {
3715 cl = L""; 3510 cl = (wchar_t *)L"";
3716 selectlen = 0; 3511 selectlen = 0;
3717 } 3512 }
3718 3513
3719#if !ENABLE_MINIMAL 3514#if !ENABLE_MINIMAL
3720 // 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
3737 ct.value = (unsigned char *)cl; 3532 ct.value = (unsigned char *)cl;
3738 ct.nitems = selectlen; 3533 ct.nitems = selectlen;
3739 ct.encoding = target; 3534 ct.encoding = target;
3740 } 3535 }
3741 3536
3742 XChangeProperty (dpy, rq.requestor, rq.property, 3537 XChangeProperty (dpy, rq.requestor, property,
3743 ct.encoding, 8, PropModeReplace, 3538 ct.encoding, 8, PropModeReplace,
3744 ct.value, (int)ct.nitems); 3539 ct.value, (int)ct.nitems);
3745 ev.property = rq.property; 3540 ev.property = property;
3746 3541
3747 if (freect) 3542 if (freect)
3748 XFree (ct.value); 3543 XFree (ct.value);
3749 } 3544 }
3750 3545
3751 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3546 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3752} 3547}
3753 3548
3754/* ------------------------------------------------------------------------- */ 3549/* ------------------------------------------------------------------------- */
3755#ifdef USE_XIM 3550#if USE_XIM
3756void 3551void ecb_cold
3757rxvt_term::im_set_position (XPoint &pos) NOTHROW 3552rxvt_term::im_set_position (XPoint &pos) noexcept
3758{ 3553{
3759 XWindowAttributes xwa; 3554 XWindowAttributes xwa;
3760 3555
3761 XGetWindowAttributes (dpy, vt, &xwa); 3556 XGetWindowAttributes (dpy, vt, &xwa);
3762 3557
3765} 3560}
3766#endif 3561#endif
3767 3562
3768#if ENABLE_OVERLAY 3563#if ENABLE_OVERLAY
3769void 3564void
3770rxvt_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
3771{ 3566{
3772 if (nrow < 1 || ncol < 1) 3567 if (nrow < 1 || ncol < 1)
3773 return; 3568 return;
3774 3569
3775 want_refresh = 1; 3570 want_refresh = 1;
3820 *rp = r; 3615 *rp = r;
3821 } 3616 }
3822} 3617}
3823 3618
3824void 3619void
3825rxvt_term::scr_overlay_off () NOTHROW 3620rxvt_term::scr_overlay_off () noexcept
3826{ 3621{
3827 if (!ov.text) 3622 if (!ov.text)
3828 return; 3623 return;
3829 3624
3830 want_refresh = 1; 3625 want_refresh = 1;
3838 delete [] ov.text; ov.text = 0; 3633 delete [] ov.text; ov.text = 0;
3839 delete [] ov.rend; ov.rend = 0; 3634 delete [] ov.rend; ov.rend = 0;
3840} 3635}
3841 3636
3842void 3637void
3843rxvt_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
3844{ 3639{
3845 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3640 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3846 return; 3641 return;
3847 3642
3848 x++, y++; 3643 x++, y++;
3850 ov.text[y][x] = text; 3645 ov.text[y][x] = text;
3851 ov.rend[y][x] = rend; 3646 ov.rend[y][x] = rend;
3852} 3647}
3853 3648
3854void 3649void
3855rxvt_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
3856{ 3651{
3857 while (*s) 3652 while (*s)
3858 scr_overlay_set (x++, y, *s++); 3653 scr_overlay_set (x++, y, *s++);
3859} 3654}
3860 3655
3861void 3656void
3862rxvt_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
3863{ 3658{
3864 while (*s) 3659 while (*s)
3865 { 3660 {
3866 text_t t = *s++; 3661 text_t t = *s++;
3867 int width = WCWIDTH (t); 3662 int width = WCWIDTH (t);
3873 } 3668 }
3874 } 3669 }
3875} 3670}
3876 3671
3877void 3672void
3878rxvt_term::scr_swap_overlay () NOTHROW 3673rxvt_term::scr_swap_overlay () noexcept
3879{ 3674{
3880 if (!ov.text) 3675 if (!ov.text)
3881 return; 3676 return;
3882 3677
3883 // 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