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