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.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 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! 34static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
41/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
45 43
46/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
… …
97 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
98 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
99 97
100/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
101void 99void
102rxvt_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
103{ 101{
104 if (!l.t) 102 if (!l.valid ())
105 { 103 {
106 lalloc (l); 104 l.alloc ();
107 col = 0; 105 col = 0;
108 width = ncol; 106 width = ncol;
109 } 107 }
110 108
111 l.touch (); 109 l.touch ();
112 110
113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
115 113
116 text_t *et = l.t + col; 114 text_t *et = l.t + col;
117 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
118 116
119 while (width--) 117 while (width--)
… …
124} 122}
125 123
126/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
127/* 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 */
128void 126void
129rxvt_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
130{ 128{
131 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
132 130
133 l.l = 0; 131 l.l = 0;
134 l.f = 0; 132 l.f = 0;
135} 133}
136 134
137// nuke a single wide character at the given column 135// nuke a single wide character at the given column
138void 136void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW 137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
140{ 138{
141 // find begin 139 // find begin
142 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 141 col--;
144 142
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
145
146 l.touch ();
147 147
148 // found start, nuke 148 // found start, nuke
149 do { 149 do {
150 l.t[col] = ' '; 150 l.t[col] = ' ';
151 l.r[col] = rend; 151 l.r[col] = rend;
152 col++; 152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
154} 154}
155 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
156/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
159 169
160void 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
161rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
162{ 216{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
163 view_start = 0; 221 view_start = 0;
164 num_scr = 0; 222 num_scr = 0;
165 223
166 if (ncol == 0) 224 if (ncol == 0)
167 ncol = 80; 225 ncol = 80;
… …
187 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
188 246
189 screen.tscroll = 0; 247 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
191 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
192 if (!row_buf) 258 if (!prev_row_buf)
193 { 259 {
194 /*
195 * first time called so just malloc everything: don't rely on realloc
196 */
197 top_row = 0; 260 top_row = 0;
198 term_start = 0; 261 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 262
214 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 280 selection.text = NULL;
232 selection.len = 0; 281 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 282 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 283 selection.screen = PRIMARY;
235 selection.clicks = 0; 284 selection.clicks = 0;
285 selection.clip_text = NULL;
286 selection.clip_len = 0;
236 } 287 }
237 else 288 else
238 { 289 {
239 /* 290 /*
240 * add or delete rows as appropriate 291 * add or delete rows as appropriate
241 */ 292 */
242 293
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259 295
260 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
261 { 297 {
262 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
264 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
265 301
266 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
267 { 303 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 304
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
278 308
279 if (top_row) 309 if ((rewrap_always || top_row) && !rewrap_never)
280 { 310 {
281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
282 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change 313 // TODO: maybe optimise when width didn't change
284 314
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 317
288 do 318 do
289 { 319 {
290 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
291 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292 int plines = 1; 322 int plines = 1;
293 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
294 324
295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
296 { 326 {
297 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
298 328
299 plines++; 329 plines++;
300 llen += prev_ncol; 330 llen += prev_ncol;
… …
313 343
314 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
315 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
316 { 346 {
317 qline = row_buf + qrow; 347 qline = row_buf + qrow;
318 lalloc (*qline); 348 qline->alloc (); // redundant with next line
319 qline->l = ncol; 349 qline->l = ncol;
320 qline->is_longer (1); 350 qline->is_longer (1);
321 351
322 int qcol = 0; 352 int qcol = 0;
323 353
… …
338 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
339 // least. 369 // least.
340 if (prow == ocur.row) 370 if (prow == ocur.row)
341 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
342 372
343 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
344 374
345 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
346 376
347 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
348 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
369 { 399 {
370 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
371 401
372 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
373 { 403 {
374 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
375 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
376 406
377 qline = pline; 407 copy_line (dst, src);
378 lresize (qline);
379 } 408 }
380 409
381 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
382 {
383 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
384 }
385 412
386 term_start = 0; 413 term_start = 0;
387 } 414 }
388
389 free (old_buf);
390 delete old_ta;
391 delete old_ra;
392 415
393 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
394 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
395 } 418 }
396 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
397 free (tabs); 429 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
399 431
400 for (int col = ncol; --col; ) 432 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
402 434
403 CLEAR_ALL_SELECTION (); 435 CLEAR_ALL_SELECTION ();
404 436
405 prev_nrow = nrow; 437 prev_nrow = nrow;
… …
408 tt_winch (); 440 tt_winch ();
409 441
410 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
411} 443}
412 444
413/* ------------------------------------------------------------------------- */ 445void ecb_cold
414/*
415 * Free everything. That way malloc debugging can find leakage.
416 */
417void
418rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () noexcept
419{ 447{
420 if (row_buf) 448 chunk_free (chunk, chunk_size);
421 { 449 chunk = 0;
422 delete talloc; talloc = 0; 450 row_buf = 0;
423 delete ralloc; ralloc = 0;
424 451
425 free (row_buf);
426 free (swap_buf);
427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
430 free (tabs); 452 free (tabs);
431 tabs = 0; 453 tabs = 0;
432 }
433} 454}
434 455
435/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
436/* 457/*
437 * Hard/Soft reset 458 * Hard/Soft reset
438 */ 459 */
439void 460void ecb_cold
440rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
441{ 462{
442 scr_release (); 463 scr_release ();
464
443 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false; 466 rvideo_mode = false;
445 scr_soft_reset (); 467 scr_soft_reset ();
446 scr_reset (); 468 scr_reset ();
447 469
448 scr_clear (true); 470 scr_clear (true);
449 scr_refresh (); 471 scr_refresh ();
450} 472}
451 473
452void 474void ecb_cold
453rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () noexcept
454{ 476{
455 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
457 scr_overlay_off (); 479 scr_overlay_off ();
458#endif 480#endif
… …
472 * Save and Restore cursor 494 * Save and Restore cursor
473 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
474 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
475 */ 497 */
476void 498void
477rxvt_term::scr_cursor (cursor_mode mode) NOTHROW 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
478{ 500{
479 screen_t *s; 501 screen_t *s;
480 502
481#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
482 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
513 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
514 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
515} 537}
516 538
517void 539void
518rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () noexcept
519{ 541{
520 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
521 return; 543 return;
522 544
523 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
542 return; 564 return;
543 565
544 want_refresh = 1; 566 want_refresh = 1;
545 view_start = 0; 567 view_start = 0;
546 568
547 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
548 575
549 current_screen = scrn; 576 current_screen = scrn;
550 577
551#if NSCREENS 578#if NSCREENS
552 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
566 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
567} 594}
568 595
569// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
570void 597void
571rxvt_term::scr_do_wrap () NOTHROW 598rxvt_term::scr_do_wrap () noexcept
572{ 599{
573 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
574 return; 601 return;
575 602
576 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
586/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
587/* 614/*
588 * Change the colour for following text 615 * Change the colour for following text
589 */ 616 */
590void 617void
591rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
592{ 619{
593 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
594 color = fgbg; 621 color = fgbg;
595 622
596 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
597 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
598 else 625 else
… …
602/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
603/* 630/*
604 * Change the rendition style for following text 631 * Change the rendition style for following text
605 */ 632 */
606void 633void
607rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) noexcept
608{ 635{
609 if (set) 636 if (set)
610 rstyle |= style; 637 rstyle |= style;
611 else if (style == ~RS_None) 638 else if (style == ~RS_None)
612 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
… …
618/* 645/*
619 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
620 * count positive ==> scroll up 647 * count positive ==> scroll up
621 * count negative ==> scroll down 648 * count negative ==> scroll down
622 */ 649 */
623int 650int ecb_hot
624rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
625{ 652{
626 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
627 return 0; 654 return 0;
628 655
629 want_refresh = 1; 656 want_refresh = 1;
… …
631 658
632 if (count > 0 659 if (count > 0
633 && row1 == 0 660 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
636 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 666
641 // sever bottommost line 667 // sever bottommost line
642 { 668 {
643 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
644 l.is_longer (0); 670 l.is_longer (0);
645 l.touch (); 671 l.touch ();
646 } 672 }
647 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
648 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 690 for (int i = count; i--; )
650 { 691 {
651 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
652 693
653 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
655 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
656 { 697 {
657 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 699 l.l = 0;
… …
660 } 701 }
661 else 702 else
662 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
663 } 704 }
664 705
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
677 // move and/or clear selection, if any 706 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
679 { 709 {
680 selection.beg.row -= count; 710 selection.beg.row -= count;
681 selection.end.row -= count; 711 selection.end.row -= count;
682 selection.mark.row -= count; 712 selection.mark.row -= count;
683 713
684 if (selection.beg.row < top_row 714 selection_check (0);
685 || selection.end.row < top_row
686 || selection.mark.row < top_row)
687 {
688 CLEAR_ALL_SELECTION ();
689 selection.op = SELECTION_CLEAR;
690 }
691 } 715 }
692 716
693 // finally move the view window, if desired 717 // finally move the view window, if desired
694 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
695 && view_start != 0 719 && view_start != 0
696 && view_start != -saveLines) 720 && view_start != -saveLines)
697 scr_page (UP, count); 721 scr_page (count);
698 722
699 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
700 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
701 } 725 }
702 else 726 else
… …
725 } 749 }
726 750
727 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
728 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
729 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
730 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
731 763
732 min_it (count, rows); 764 min_it (count, rows);
733 765
734 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
735 767
736 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
737 { 769 {
738 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
739 771
… …
741 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
742 } 774 }
743 775
744 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
745 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
746 } 785 }
747 786
748 return count; 787 return count;
749} 788}
750 789
751/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
752/* 791/*
753 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
754 */ 793 */
755void 794void ecb_hot
756rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
757{ 796{
758 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
759 return; 798 return;
760 799
761 unsigned char checksel; 800 bool checksel;
762 unicode_t c; 801 unicode_t c;
763 int ncol = this->ncol; 802 int ncol = this->ncol;
764 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
765 804
766 want_refresh = 1; 805 want_refresh = 1;
… …
792 831
793 while (str < strend) 832 while (str < strend)
794 { 833 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 835
797 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 837 if (c == C0_LF)
799 { 838 {
800 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
801 840
802 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
821 { 860 {
822 scr_tab (1, true); 861 scr_tab (1, true);
823 continue; 862 continue;
824 } 863 }
825 864
826 if (expect_false ( 865 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 869 ))
831 { 870 {
… …
836 * should be a similar check. 875 * should be a similar check.
837 */ 876 */
838 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
839 } 878 }
840 879
841 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 881 {
843 scr_do_wrap (); 882 scr_do_wrap ();
844 883
845 line->l = ncol; 884 line->l = ncol;
846 line->is_longer (1); 885 line->is_longer (1);
… …
848 row = screen.cur.row; 887 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
850 } 889 }
851 890
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 893 c = 0xfffd;
855 894
856 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
857 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
859 // locale. 898 // locale.
860 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
861 900
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 902 {
864 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 904 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
882 } 921 }
883 } 922 }
884 923
885 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
887 926
888 if (width != 0) 927 if (width != 0)
889 { 928 {
890#if !UNICODE_3 929#if !UNICODE_3
… …
895# else 934# else
896 c = 0xfffd; 935 c = 0xfffd;
897# endif 936# endif
898#endif 937#endif
899 938
939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
940
941 // if the character doesn't fit into the remaining columns...
942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
943 {
944 if (screen.flags & Screen_Autowrap)
945 {
946 // ... artificially enlargen the previous one
947 c = NOCHAR;
948 // and try the same character next loop iteration
949 --str;
950 }
951 else
952 screen.cur.col = ncol - width;
953 }
954
900 // nuke the character at this position, if required 955 // nuke the character at this position, if required
901 if (expect_false ( 956 // due to wonderful coincidences everywhere else in this loop
957 // we never have to check for overwriting a wide char itself,
958 // only its tail.
902 line->t[screen.cur.col] == NOCHAR 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 961
919 line->touch (); 962 line->touch ();
920 963
921 do 964 do
922 { 965 {
923 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
925 968
926 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 970 screen.cur.col++;
928 else 971 else
929 { 972 {
930 line->l = ncol; 973 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 975 screen.flags |= Screen_WrapNext;
933 break; 976
977 goto end_of_line;
934 } 978 }
935 979
936 c = NOCHAR; 980 c = NOCHAR;
937 } 981 }
938 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
939 983
940 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 986 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 987 line->t[c] = ' ';
948 line->r[c] = rend; 988 line->r[c] = rend;
949 }
950 } 989 }
990
991end_of_line:
992 ;
951 } 993 }
952#if ENABLE_COMBINING 994#if ENABLE_COMBINING
953 else // width == 0 995 else // width == 0
954 { 996 {
955 if (c != 0xfeff) // ignore BOM 997 if (c != 0xfeff) // ignore BOM
… …
970 } 1012 }
971 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
972 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
973 { 1015 {
974 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
975 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
976 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
977 } 1019 }
978 else 1020 else
979 continue; 1021 continue;
980 1022
981 linep->touch (); 1023 linep->touch ();
… …
1004/* 1046/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
1006 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1007 */ 1049 */
1008void 1050void
1009rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () noexcept
1010{ 1052{
1011 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1012 { 1054 {
1013 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1014 { 1056 {
… …
1018 1060
1019 want_refresh = 1; 1061 want_refresh = 1;
1020#endif 1062#endif
1021 } 1063 }
1022 } 1064 }
1065 else if (screen.flags & Screen_WrapNext)
1066 screen.flags &= ~Screen_WrapNext;
1023 else 1067 else
1024 scr_gotorc (0, -1, RELATIVE); 1068 scr_gotorc (0, -1, RELATIVE);
1025} 1069}
1026 1070
1027/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
… …
1029 * Process Horizontal Tab 1073 * Process Horizontal Tab
1030 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1031 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1032 */ 1076 */
1033void 1077void
1034rxvt_term::scr_tab (int count, bool ht) NOTHROW 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1035{ 1079{
1036 int i, x; 1080 int i, x;
1037 1081
1038 want_refresh = 1; 1082 want_refresh = 1;
1039 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1105 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1106 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1107 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1108 */ 1152 */
1109#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1110void 1154void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () noexcept
1112{ 1156{
1113 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1159 else
1116 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1122 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1123 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1124 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1125 */ 1169 */
1126#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1127void 1171void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () noexcept
1129{ 1173{
1130 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1176 else
1133 { 1177 {
… …
1146/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1147/* 1191/*
1148 * Goto Row/Column 1192 * Goto Row/Column
1149 */ 1193 */
1150void 1194void
1151rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1152{ 1196{
1153 want_refresh = 1; 1197 want_refresh = 1;
1154 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1155 1199
1156 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1195/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1196/* 1240/*
1197 * direction should be UP or DN 1241 * direction should be UP or DN
1198 */ 1242 */
1199void 1243void
1200rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1201{ 1245{
1202 int dirn;
1203
1204 want_refresh = 1; 1246 want_refresh = 1;
1205 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1206 1248
1207 dirn = ((direction == UP) ? 1 : -1);
1208
1209 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1210 1250
1211 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1212 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1213 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1214 else 1254 else
1215 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1216 1256
1217 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1218 selection_check (0); 1258 selection_check (0);
1219} 1259}
1220 1260
… …
1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K 1267 * extension: clear to right unless wrapped: ESC [ 3 K
1228 */ 1268 */
1229void 1269void
1230rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) noexcept
1231{ 1271{
1232 unsigned int col, num; 1272 unsigned int col, num;
1233 1273
1234 want_refresh = 1; 1274 want_refresh = 1;
1235 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1283 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1284} 1324}
1285 1325
1286/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1287/* 1327/*
1288 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1332 */
1293void 1333void
1294rxvt_term::scr_erase_screen (int mode) NOTHROW 1334rxvt_term::scr_erase_screen (int mode) noexcept
1295{ 1335{
1296 int num; 1336 int num;
1297 int32_t row; 1337 int32_t row;
1298 rend_t ren; 1338 rend_t ren;
1299 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1302 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1303 1343
1304 switch (mode) 1344 switch (mode)
1305 { 1345 {
1306 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1347 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1349 num = nrow - row;
1311 break; 1350 break;
1312 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1352 scr_erase_line (1);
1315 row = 0; 1353 row = 0;
1316 num = screen.cur.row; 1354 num = screen.cur.row;
1317 break; 1355 break;
1318 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1357 row = 0;
1321 num = nrow; 1358 num = nrow;
1322 break; 1359 break;
1323 default: 1360 default:
1324 return; 1361 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1370 if (row >= nrow) /* Out Of Bounds */
1334 return; 1371 return;
1335 1372
1336 min_it (num, nrow - row); 1373 min_it (num, nrow - row);
1337 1374
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1378 {
1345 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1346 1380
1347 if (mapped && !view_start) 1381 if (mapped)
1348 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1350 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1351 } 1385 }
1352 else 1386 else
1353 { 1387 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1389
1356 if (mapped && !view_start) 1390 if (mapped)
1357 { 1391 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1362 (unsigned int)width, 1396 (unsigned int)vt_width,
1363 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1364 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1365 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 } 1400 }
1367 } 1401 }
1368 1402
1369 for (; num--; row++) 1403 for (; num--; row++)
1370 { 1404 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1405 scr_blank_screen_mem (ROW(row), rstyle);
1372 1406
1373 if (!view_start) 1407 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1408 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1409 }
1376} 1410}
1377 1411
1378#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1379void 1413void
1380rxvt_term::scr_erase_savelines () NOTHROW 1414rxvt_term::scr_erase_savelines () noexcept
1381{ 1415{
1382 want_refresh = 1; 1416 want_refresh = 1;
1383 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1384 1418
1385 top_row = 0; 1419 top_row = 0;
… …
1389/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1390/* 1424/*
1391 * Fill the screen with `E's 1425 * Fill the screen with `E's
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1427 */
1394void 1428void ecb_cold
1395rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () noexcept
1396{ 1430{
1397 rend_t fs; 1431 rend_t fs;
1398 1432
1399 want_refresh = 1; 1433 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1401 1435
1402 num_scr_allow = 0; 1436 num_scr_allow = 0;
1403 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1404 1442
1405 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1407 { 1445 {
1408 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1421/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1422/* 1460/*
1423 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1424 */ 1462 */
1425void 1463void
1426rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1427{ 1465{
1428 int end; 1466 int end;
1429 1467
1430 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1431 1469
… …
1451/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1452/* 1490/*
1453 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1454 */ 1492 */
1455void 1493void
1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1457{ 1495{
1458 want_refresh = 1; 1496 want_refresh = 1;
1459 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1460 1498
1461 if (count <= 0) 1499 if (count <= 0)
… …
1559/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1560/* 1598/*
1561 * Set the scrolling region 1599 * Set the scrolling region
1562 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1563 */ 1601 */
1564void 1602void ecb_cold
1565rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1566{ 1604{
1567 max_it (top, 0); 1605 max_it (top, 0);
1568 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1569 1607
1570 if (top > bot) 1608 if (top > bot)
… …
1579/* 1617/*
1580 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1581 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1582 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1583 */ 1621 */
1584void 1622void ecb_cold
1585rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1586{ 1624{
1587 want_refresh = 1; 1625 want_refresh = 1;
1588 1626
1589 if (mode) 1627 if (mode)
1590 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1596/* 1634/*
1597 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1598 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1599 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1600 */ 1638 */
1601void 1639void ecb_cold
1602rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) noexcept
1603{ 1641{
1604 if (mode) 1642 if (mode)
1605 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1606 else 1644 else
1607 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1615 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1616 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1617 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1618 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1619 */ 1657 */
1620void 1658void ecb_cold
1621rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) noexcept
1622{ 1660{
1623 if (mode) 1661 if (mode)
1624 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1625 else 1663 else
1626 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1632/* 1670/*
1633 * Set insert/replace mode 1671 * Set insert/replace mode
1634 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1635 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1636 */ 1674 */
1637void 1675void ecb_cold
1638rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) noexcept
1639{ 1677{
1640 if (mode) 1678 if (mode)
1641 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1642 else 1680 else
1643 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1648 * Set/Unset tabs 1686 * Set/Unset tabs
1649 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1650 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1651 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1652 */ 1690 */
1653void 1691void ecb_cold
1654rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) noexcept
1655{ 1693{
1656 if (mode < 0) 1694 if (mode < 0)
1657 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1658 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1659 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
… …
1664 * Set reverse/normal video 1702 * Set reverse/normal video
1665 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1666 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1667 */ 1705 */
1668void 1706void
1669rxvt_term::scr_rvideo_mode (bool on) NOTHROW 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1670{ 1708{
1671 rvideo_mode = on; 1709 rvideo_mode = on;
1672 1710
1673#ifndef NO_BELL 1711#ifndef NO_BELL
1674 on ^= rvideo_bell; 1712 on ^= rvideo_bell;
… …
1676 1714
1677 if (rvideo_state != on) 1715 if (rvideo_state != on)
1678 { 1716 {
1679 rvideo_state = on; 1717 rvideo_state = on;
1680 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1683 if (bgPixmap.pixmap == None) 1729 if (bg_img == 0)
1684#endif 1730#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1732
1687 XGCValues gcvalue; 1733 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
… …
1697/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1698/* 1744/*
1699 * Report current cursor position 1745 * Report current cursor position
1700 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1701 */ 1747 */
1702void 1748void ecb_cold
1703rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () noexcept
1704{ 1750{
1705 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1706} 1752}
1707 1753
1708/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1710 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1711 1757
1712/* 1758/*
1713 * Set font style 1759 * Set font style
1714 */ 1760 */
1715void 1761void ecb_cold
1716rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () noexcept
1717{ 1763{
1718#if 0 1764#if 0
1719 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1720 { 1766 {
1721 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1742 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1743 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1744 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1745 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1746 */ 1792 */
1747void 1793void ecb_cold
1748rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) noexcept
1749{ 1795{
1750 screen.charset = set; 1796 screen.charset = set;
1751 set_font_style (); 1797 set_font_style ();
1752} 1798}
1753 1799
… …
1759 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1760 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1761 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1762 */ 1808 */
1763void 1809void
1764rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1765{ 1811{
1766 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1767 set_font_style (); 1813 set_font_style ();
1768} 1814}
1769 1815
… …
1773 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1774 1820
1775/* 1821/*
1776 * refresh matching text. 1822 * refresh matching text.
1777 */ 1823 */
1778bool 1824bool ecb_cold
1779rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1780{ 1826{
1781 bool found = false; 1827 bool found = false;
1782 1828
1783 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1784 { 1830 {
… …
1802 PART_BEG = 0, 1848 PART_BEG = 0,
1803 PART_END, 1849 PART_END,
1804 RC_COUNT 1850 RC_COUNT
1805}; 1851};
1806 1852
1807void 1853void ecb_hot
1808rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1809{ 1855{
1810 int i; 1856 int i;
1811 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1812 1858
1813 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1878 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1879 {
1834 min_it (rc[i].col, ncol - 1); 1880 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1881 min_it (rc[i].row, nrow - 1);
1836 } 1882 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1883
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1884 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1885 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1886
1841 num_scr_allow = 0; 1887 num_scr_allow = 0;
1842 1888
… …
1847/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1848/* 1894/*
1849 * Refresh the entire screen 1895 * Refresh the entire screen
1850 */ 1896 */
1851void 1897void
1852rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) noexcept
1853{ 1899{
1854 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1855} 1901}
1856 1902
1857/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1858/* 1904/*
1859 * Move the display so that the line represented by scrollbar value Y is at 1905 * Move the display so that the line represented by scrollbar value Y is at
1860 * the top of the screen 1906 * the top of the screen
1861 */ 1907 */
1862void 1908void
1863rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) noexcept
1864{ 1910{
1865 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1866} 1913}
1867 1914
1868/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1869/* 1916/*
1870 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1871 * direction should be UP or DN 1918 * direction should be UP or DN
1872 */ 1919 */
1873bool 1920bool
1874rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) noexcept
1875{ 1922{
1876 int new_view_start =
1877 direction == UP ? view_start - nlines
1878 : view_start + nlines;
1879
1880 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1881} 1924}
1882 1925
1883bool 1926bool
1884rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1885{ 1928{
1886 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1887 1930
1888 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1889 return false; 1932 return false;
… …
1907} 1950}
1908#endif 1951#endif
1909 1952
1910/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1911void 1954void
1912rxvt_term::scr_bell () NOTHROW 1955rxvt_term::scr_bell () noexcept
1913{ 1956{
1914#ifndef NO_BELL 1957#ifndef NO_BELL
1915 1958
1916# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1961 if (option (Opt_mapAlert))
1919# endif 1962# endif
1920 XMapWindow (dpy, parent[0]); 1963 XMapWindow (dpy, parent);
1921# endif 1964# endif
1922 1965
1923# if ENABLE_FRILLS 1966# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1967 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1968 set_urgency (1);
… …
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1939#endif 1982#endif
1940} 1983}
1941 1984
1942/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1943/* ARGSUSED */ 1986void ecb_cold
1944void
1945rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1946{ 1988{
1947#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1948 int nrows, row_start; 1990 int nrows, row_start;
1949 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
1950 1992
… …
1998/* 2040/*
1999 * Refresh the screen 2041 * Refresh the screen
2000 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2001 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2002 */ 2044 */
2003void 2045void ecb_hot
2004rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () noexcept
2005{ 2047{
2006 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2007 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2008 int i; /* tmp */ 2050 int i; /* tmp */
2009#ifndef NO_CURSORCOLOR
2010 rend_t cc1; /* store colours at cursor position (s) */
2011#endif
2012 rend_t *crp; // cursor rendition pointer
2013 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2015 2056
2016 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2017 2058
2018 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2019 return; 2060 return;
… …
2022 * A: set up vars 2063 * A: set up vars
2023 */ 2064 */
2024 refresh_count = 0; 2065 refresh_count = 0;
2025 2066
2026 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2068 bool have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2029 have_bg = bgPixmap.pixmap != None; 2070 have_bg = bg_img != 0;
2030#endif 2071#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2073
2033 /* 2074 /*
2034 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2040 scr_swap_overlay (); 2081 scr_swap_overlay ();
2041#endif 2082#endif
2042 2083
2043 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2044 2085
2045 /* 2086 /*
2046 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2047 */ 2088 */
2048 { 2089 {
2049 unsigned char setoldcursor;
2050
2051#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2052 if (hidden_cursor) 2091 if (hidden_cursor)
2053 showcursor = 0; 2092 showcursor = 0;
2054#endif 2093#endif
2055 2094
… …
2058 int col = screen.cur.col; 2097 int col = screen.cur.col;
2059 2098
2060 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2061 col--; 2100 col--;
2062 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2063 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2064 2109
2065#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2066 cc1 = *crp & (RS_fgMask | RS_bgMask);
2067 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2068 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2069 else 2113 else
2070#endif 2114#endif
2071#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2083 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2084#else 2128#else
2085 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2086#endif 2130#endif
2087 2131
2088 if (showcursor && focus) 2132 if (focus && cursor_type == 0)
2089 { 2133 {
2090 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2091 *crp ^= RS_Uline; 2135
2092 else
2093 {
2094 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2095 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2096 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2097 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2098 } 2141 }
2099 } 2142 }
2100 2143
2101 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2102 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2103 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2104 { 2153 {
2105 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2106 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2107 {
2108 if (ocrow < nrow
2109 && oldcursor.col < ncol)
2110 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2111
2112 if (focus || !showcursor)
2113 oldcursor.row = -1;
2114 else
2115 setoldcursor = 1;
2116 }
2117 } 2156 }
2118 else if (!focus) 2157 else
2119 setoldcursor = 1;
2120
2121 if (setoldcursor)
2122 {
2123 if (screen.cur.row - view_start >= nrow)
2124 oldcursor.row = -1; 2158 oldcursor.row = -1;
2125 else
2126 {
2127 oldcursor.row = screen.cur.row - view_start;
2128 oldcursor.col = screen.cur.col;
2129 }
2130 }
2131 } 2159 }
2132 2160
2133#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2134 /* 2162 /*
2135 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2141 { 2169 {
2142 int16_t nits; 2170 int16_t nits;
2143 int i = num_scr; 2171 int i = num_scr;
2144 int j; 2172 int j;
2145 int len, wlen; 2173 int len, wlen;
2146 dLocal (int, num_scr);
2147 2174
2148 j = nrow; 2175 j = nrow;
2149 wlen = len = -1; 2176 wlen = len = -1;
2150 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2151 2178
… …
2217 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2218 2245
2219 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2220 { 2247 {
2221 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2222 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2223 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2224 || (stp[col] == ' ' /* space w/ no background change */
2225 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2226 continue; 2250 continue;
2227 2251
2228 // redraw one or more characters 2252 // redraw one or more characters
2229 2253
2230 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2255 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2232 --col; 2256 --col;
2233 2257
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2258 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2259 text_t *text = stp + col;
2236 int count = 1; 2260 int count = 1;
2237 2261
2238 dtp[col] = stp[col]; 2262 dtp[col] = stp[col];
2239 drp[col] = rend; 2263 drp[col] = rend;
… …
2274 2298
2275 col--; /* went one too far. move back */ 2299 col--; /* went one too far. move back */
2276 count -= i; /* dump any matching trailing chars */ 2300 count -= i; /* dump any matching trailing chars */
2277 2301
2278 // sometimes we optimize away the trailing NOCHAR's, add them back 2302 // sometimes we optimize away the trailing NOCHAR's, add them back
2279 while (expect_false (i && text[count] == NOCHAR)) 2303 while (ecb_unlikely (i && text[count] == NOCHAR))
2280 count++, i--; 2304 count++, i--;
2281 2305
2282 /* 2306 /*
2283 * Determine the attributes for the string 2307 * Determine the attributes for the string
2284 */ 2308 */
2285 int fore = fgcolor_of (rend); // desired foreground 2309 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2310 int back = bgcolor_of (rend); // desired background
2287 2311
2288 // only do special processing if any attributes are set, which is unlikely 2312 // only do special processing if any attributes are set, which is unlikely
2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2313 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2314 {
2291 bool invert = rend & RS_RVid; 2315 bool invert = rend & RS_RVid;
2292 2316
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2318 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2337
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2338 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2339 fore = Color_UL;
2316#endif 2340#endif
2317 2341
2342#ifdef OPTION_HC
2343 if (rend & RS_Sel)
2344 {
2345 /* invert the column if no highlightColor is set or it is the
2346 * current cursor column */
2347 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2348 && ISSET_PIXCOLOR (Color_HC))
2349 {
2350 if (ISSET_PIXCOLOR (Color_HTC))
2351 fore = Color_HTC;
2352 // if invert is 0 reverse video is set so we use bg color as fg color
2353 else if (!invert)
2354 fore = back;
2355
2356 back = Color_HC;
2357 invert = 0;
2358 }
2359 }
2360#endif
2361
2318 if (invert) 2362 if (invert)
2319 { 2363 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2364 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2365
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2366#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2367 if (fore == back)
2338 { 2368 {
2339 fore = Color_bg; 2369 fore = Color_bg;
2340 back = Color_fg; 2370 back = Color_fg;
2341 } 2371 }
… …
2377 /* 2407 /*
2378 * Actually do the drawing of the string here 2408 * Actually do the drawing of the string here
2379 */ 2409 */
2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2410 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2381 2411
2382 if (expect_true (have_bg && back == Color_bg)) 2412 if (ecb_likely (have_bg && back == Color_bg))
2383 { 2413 {
2384 // this is very ugly, maybe push it into ->draw? 2414 // this is very ugly, maybe push it into ->draw?
2385 2415
2386 for (i = 0; i < count; i++) /* don't draw empty strings */ 2416 for (i = 0; i < count; i++) /* don't draw empty strings */
2387 if (text[i] != ' ') 2417 if (text[i] != ' ')
… …
2394 did_clear: ; 2424 did_clear: ;
2395 } 2425 }
2396 else 2426 else
2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2398 2428
2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2400 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2401#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2402 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2403 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2404 else 2438 else
2405#endif 2439#endif
… …
2417 */ 2451 */
2418 if (showcursor) 2452 if (showcursor)
2419 { 2453 {
2420 if (focus) 2454 if (focus)
2421 { 2455 {
2422 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2423 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2424 else 2458 else if (oldcursor.row >= 0)
2425 { 2459 {
2426 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2428 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2429#endif 2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2430 } 2473 }
2431 } 2474 }
2432 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2433 { 2476 {
2434 int cursorwidth = 1;
2435 int col = oldcursor.col;
2436
2437 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--;
2439
2440 while (col + cursorwidth < ncol
2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++;
2443
2444#ifndef NO_CURSORCOLOR
2445 if (ISSET_PIXCOLOR (Color_cursor))
2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2450 2478
2451 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2452 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2453 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2454 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2456 } 2484 }
2457 } 2485 }
2458 2486
2459 /* 2487 /*
2460 * H: cleanup selection 2488 * H: cleanup selection
… …
2469 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2470 num_scr = 0; 2498 num_scr = 0;
2471 num_scr_allow = 1; 2499 num_scr_allow = 1;
2472} 2500}
2473 2501
2474void 2502void ecb_cold
2475rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2476{ 2504{
2477 if (!l.t) 2505 if (!l.valid ())
2478 return; 2506 return;
2479 2507
2480 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2481 2509
2482 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2483 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2484} 2512}
2485 2513
2486void 2514void ecb_cold
2487rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () noexcept
2488{ 2516{
2489 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2490 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2491 2519
2492 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2494 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2495 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2496 } 2524 }
2497} 2525}
2498 2526
2499void 2527void ecb_cold
2500rxvt_term::scr_recolour () NOTHROW 2528rxvt_term::scr_recolor (bool refresh) noexcept
2501{ 2529{
2502#ifdef HAVE_BG_PIXMAP 2530 bool transparent = false;
2503 bgPixmap.apply ();
2504#else
2505 2531
2532#ifdef HAVE_IMG
2533 if (bg_img != 0)
2534 {
2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2540
2541 transparent = true;
2542 }
2543 else
2544# endif
2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 }
2549 }
2550 else
2551#endif
2552 {
2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2507 XClearWindow (dpy, parent[0]);
2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 }
2509 2556
2510 if (scrollBar.win) 2557 XClearWindow (dpy, parent);
2558
2559 if (scrollBar.state && scrollBar.win)
2511 { 2560 {
2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else
2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2513 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2514 scrollBar.show (0); 2566 scrollBar.show (0);
2515 } 2567 }
2516 2568
2517#endif 2569 if (refresh)
2518 2570 {
2519 /* bgPixmap.apply () does not do the following : */
2520 scr_clear (); 2571 scr_clear ();
2521 scr_touch (true); 2572 scr_touch (true);
2573 }
2522 want_refresh = 1; 2574 want_refresh = 1;
2523} 2575}
2524 2576
2525/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2526void 2578void
2527rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) noexcept
2528{ 2580{
2529 if (!mapped) 2581 if (!mapped)
2530 return; 2582 return;
2531 2583
2532 num_scr_allow = 0; 2584 num_scr_allow = 0;
… …
2535 if (really) 2587 if (really)
2536 XClearWindow (dpy, vt); 2588 XClearWindow (dpy, vt);
2537} 2589}
2538 2590
2539void 2591void
2540rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2592rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2541{ 2593{
2542 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2543 int row, col; 2595 int row, col;
2544 2596
2545 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2597 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2557 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2558 } 2610 }
2559} 2611}
2560 2612
2561void 2613void
2562rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW 2614rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2563{ 2615{
2564 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2565 int row, col; 2617 int row, col;
2566 2618
2567 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2583 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2584 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2585} 2637}
2586 2638
2587/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2588void 2640void ecb_hot
2589rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () noexcept
2590{ 2642{
2591 if (selection.op 2643 if (selection.op
2592 && current_screen == selection.screen 2644 && current_screen == selection.screen
2593 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2594 { 2646 {
2595#if !ENABLE_MINIMAL 2647#if !ENABLE_MINIMAL
2596 if (selection.rect) 2648 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2649 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2651 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2652 else
2601#endif 2653#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2654 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2604 RS_RVid); 2656 RS_Sel | RS_RVid);
2605 } 2657 }
2606} 2658}
2607 2659
2608/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2609/* 2661/*
2610 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2611 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2612 */ 2664 */
2613#if 0 2665#if 0
2614void 2666void
2615rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) noexcept
2616{ 2668{
2617 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2618 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2619 char r1[] = "\n";
2620
2621 for (row = saveLines + top_row;
2622 row < saveLines + nrow - 1; row++)
2623 {
2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2625 : ncol;
2626 for (towrite = width; towrite; towrite -= wrote)
2627 {
2628 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2629 towrite);
2630 if (wrote < 0)
2631 return; /* XXX: death, no report */
2632 }
2633 if (row_buf[row].l >= 0)
2634 if (write (fd, r1, 1) <= 0)
2635 return; /* XXX: death, no report */
2636 }
2637} 2671}
2638#endif 2672#endif
2639 2673
2640/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2641 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2642 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2643void 2677void
2644rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) noexcept
2645{ 2679{
2646 row_col_t pos;
2647
2648 if (!selection.op) 2680 if (!selection.op)
2649 return; 2681 return;
2650 2682
2651 pos.row = pos.col = 0;
2652 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2654 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2655 || (check_more == 1 2686 || (check_more == 1
2656 && current_screen == selection.screen 2687 && current_screen == selection.screen
2657 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2658 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2659 || (check_more == 2
2660 && ROWCOL_IS_BEFORE (selection.beg, pos)
2661 && ROWCOL_IS_AFTER (selection.end, pos))
2662 || (check_more == 3
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 4 /* screen width change */
2665 && (selection.beg.row != selection.end.row
2666 || selection.end.col > ncol)))
2667 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691}
2692
2693void
2694rxvt_term::selection_changed () noexcept
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2668} 2705}
2669 2706
2670/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2671/* 2708/*
2672 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2673 */ 2710 */
2674void 2711void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2676{ 2713{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2717 data[i] = C0_CR;
2681 2718
2682 if (priv_modes & PrivMode_BracketPaste) 2719 #if ENABLE_FRILLS
2720 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2683 tt_printf ("\e[200~"); 2721 tt_printf ("\x1b[200~");
2722 #endif
2684 2723
2685 tt_write (data, len); 2724 tt_write (data, len);
2686 2725
2687 if (priv_modes & PrivMode_BracketPaste) 2726 #if ENABLE_FRILLS
2727 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2688 tt_printf ("\e[201~"); 2728 tt_printf ("\x1b[201~");
2689}
2690
2691/* ------------------------------------------------------------------------- */
2692/*
2693 * Respond to a notification that a primary selection has been sent
2694 * EXT: SelectionNotify
2695 */
2696void
2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2698{
2699 if (prop == None) /* check for failed XConvertSelection */
2700 {
2701 if ((selection_type & Sel_CompoundText))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = 0;
2706 if (selnum != Sel_direct)
2707 selection_request_other (XA_STRING, selnum);
2708 }
2709
2710 if ((selection_type & Sel_UTF8String))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = Sel_CompoundText;
2715 if (selnum != Sel_direct)
2716 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2717 else
2718 selection_type = 0;
2719 }
2720
2721 return;
2722 }
2723
2724 unsigned long bytes_after;
2725 XTextProperty ct;
2726
2727 if (XGetWindowProperty (dpy, win, prop,
2728 0, PROP_SIZE / 4,
2729 delete_prop, AnyPropertyType,
2730 &ct.encoding, &ct.format,
2731 &ct.nitems, &bytes_after,
2732 &ct.value) != Success)
2733 {
2734 ct.value = 0;
2735 goto bailout;
2736 }
2737
2738 if (ct.encoding == None)
2739 goto bailout;
2740
2741 if (bytes_after)
2742 {
2743 // fetch and append remaining data
2744 XTextProperty ct2;
2745
2746 if (XGetWindowProperty (dpy, win, prop,
2747 ct.nitems / 4, (bytes_after + 3) / 4,
2748 delete_prop, AnyPropertyType,
2749 &ct2.encoding, &ct2.format,
2750 &ct2.nitems, &bytes_after,
2751 &ct2.value) != Success)
2752 goto bailout;
2753
2754 // realloc should be compatible to XFree, here, and elsewhere, too
2755 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2756 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2757 ct.nitems += ct2.nitems;
2758
2759 XFree (ct2.value);
2760 }
2761
2762 if (ct.value == 0)
2763 goto bailout;
2764
2765 if (ct.encoding == xa[XA_INCR])
2766 {
2767 // INCR selection, start handshake
2768 if (!delete_prop)
2769 XDeleteProperty (dpy, win, prop);
2770
2771 selection_wait = Sel_incr;
2772 incr_buf_fill = 0;
2773 incr_ev.start (10);
2774
2775 goto bailout;
2776 }
2777
2778 if (ct.nitems == 0)
2779 {
2780 if (selection_wait == Sel_incr)
2781 {
2782 XFree (ct.value);
2783
2784 // finally complete, now paste the whole thing
2785 selection_wait = Sel_normal;
2786 ct.value = (unsigned char *)incr_buf;
2787 ct.nitems = incr_buf_fill;
2788 incr_buf = 0;
2789 incr_buf_size = 0;
2790 incr_ev.stop ();
2791 }
2792 else
2793 {
2794 if (selection_wait == Sel_normal
2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2796 {
2797 /*
2798 * pass through again trying CUT_BUFFER0 if we've come from
2799 * XConvertSelection () but nothing was presented
2800 */
2801 selection_paste (display->root, XA_CUT_BUFFER0, False);
2802 }
2803
2804 goto bailout;
2805 }
2806 }
2807 else if (selection_wait == Sel_incr)
2808 {
2809 incr_ev.start (10);
2810
2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2812 {
2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2815 }
2816
2817 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2818 incr_buf_fill += ct.nitems;
2819
2820 goto bailout;
2821 }
2822
2823 char **cl;
2824 int cr;
2825
2826#if !ENABLE_MINIMAL
2827 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2828 // so recode it manually
2829 if (ct.encoding == xa[XA_UTF8_STRING])
2830 {
2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2832 char *s = rxvt_wcstombs (w);
2833 free (w);
2834 // TODO: strlen == only the first element will be converted. well...
2835 paste (s, strlen (s));
2836 free (s);
2837 }
2838 else
2839#endif 2729 #endif
2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2841 && cl)
2842 {
2843 for (int i = 0; i < cr; i++)
2844 paste (cl[i], strlen (cl[i]));
2845
2846 XFreeStringList (cl);
2847 }
2848 else
2849 paste ((char *)ct.value, ct.nitems); // paste raw
2850
2851bailout:
2852 XFree (ct.value);
2853
2854 if (selection_wait == Sel_normal)
2855 selection_wait = Sel_none;
2856} 2730}
2857 2731
2858void 2732void
2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2733rxvt_term::paste (char *data, unsigned int len) noexcept
2860{ 2734{
2861 selection_wait = Sel_none; 2735 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2862
2863 incr_buf_size = 0;
2864 free (incr_buf);
2865
2866 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2867}
2868
2869void
2870rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2871{
2872 if (prop == None || selection_wait != Sel_incr)
2873 return; 2736 return;
2874 2737
2875 selection_paste (win, prop, true); 2738 tt_paste (data, len);
2876} 2739}
2877 2740
2878/* ------------------------------------------------------------------------- */ 2741/* ------------------------------------------------------------------------- */
2879/* 2742/*
2880 * Request the current selection: 2743 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2881 * Order: > internal selection if available 2744 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2745 * as fallback
2883 * > CUT_BUFFER0
2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2885 * will auto fallback to CUT_BUFFER0
2886 * EXT: button 2 release 2746 * EXT: button 2 release
2887 */ 2747 */
2888void 2748void
2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2749rxvt_term::selection_request (Time tm, int selnum) noexcept
2890{ 2750{
2891 if (selection.text && selnum == Sel_Primary) 2751 if (!selection_req)
2892 {
2893 /* internal selection */
2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2895 paste (str, strlen (str));
2896 free (str);
2897 return;
2898 } 2752 {
2899 else 2753 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2754 selection_req->run ();
2900 { 2755 }
2901 selection_request_time = tm;
2902 selection_wait = Sel_normal;
2903
2904#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return;
2908#else
2909 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return;
2912#endif
2913 }
2914
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false);
2917}
2918
2919int
2920rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2921{
2922 Atom sel;
2923
2924 selection_type |= selnum;
2925
2926 if (selnum == Sel_Primary)
2927 sel = XA_PRIMARY;
2928 else if (selnum == Sel_Secondary)
2929 sel = XA_SECONDARY;
2930 else
2931 sel = xa[XA_CLIPBOARD];
2932
2933 if (XGetSelectionOwner (dpy, sel) != None)
2934 {
2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2936 vt, selection_request_time);
2937 return 1;
2938 }
2939
2940 return 0;
2941} 2756}
2942 2757
2943/* ------------------------------------------------------------------------- */ 2758/* ------------------------------------------------------------------------- */
2944/* 2759/*
2945 * Clear all selected text 2760 * Clear all selected text
2946 * EXT: SelectionClear 2761 * EXT: SelectionClear
2947 */ 2762 */
2948void 2763void
2949rxvt_term::selection_clear () NOTHROW 2764rxvt_term::selection_clear (bool clipboard) noexcept
2950{ 2765{
2766 if (!clipboard)
2767 {
2951 want_refresh = 1; 2768 want_refresh = 1;
2952 free (selection.text); 2769 free (selection.text);
2953 selection.text = NULL; 2770 selection.text = NULL;
2954 selection.len = 0; 2771 selection.len = 0;
2955 CLEAR_SELECTION (); 2772 CLEAR_SELECTION ();
2956 2773
2957 if (display->selection_owner == this) 2774 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2775 display->selection_owner = 0;
2776 }
2777 else
2778 {
2779 free (selection.clip_text);
2780 selection.clip_text = NULL;
2781 selection.clip_len = 0;
2782
2783 if (display->clipboard_owner == this)
2784 display->clipboard_owner = 0;
2785 }
2959} 2786}
2960 2787
2961/* ------------------------------------------------------------------------- */ 2788/* ------------------------------------------------------------------------- */
2962/* 2789/*
2963 * Copy a selection into the cut buffer 2790 * Copy a selection into the cut buffer
2964 * EXT: button 1 or 3 release 2791 * EXT: button 1 or 3 release
2965 */ 2792 */
2966void 2793void
2967rxvt_term::selection_make (Time tm) 2794rxvt_term::selection_make (Time tm)
2968{ 2795{
2969 int i; 2796 int size;
2970 wchar_t *new_selection_text; 2797 wchar_t *new_selection_text;
2971 text_t *t; 2798 text_t *t;
2972 2799
2973 switch (selection.op) 2800 switch (selection.op)
2974 { 2801 {
… …
2990 return; /* nothing selected, go away */ 2817 return; /* nothing selected, go away */
2991 2818
2992 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2819 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2993 return; 2820 return;
2994 2821
2995 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2822 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2823 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2997 2824
2998 int ofs = 0; 2825 int ofs = 0;
2999 int extra = 0; 2826 int extra = 0;
3000 2827
3001 int col = selection.beg.col; 2828 int col = selection.beg.col;
… …
3007 { 2834 {
3008#if !ENABLE_MINIMAL 2835#if !ENABLE_MINIMAL
3009 if (selection.rect) 2836 if (selection.rect)
3010 { 2837 {
3011 col = selection.beg.col; 2838 col = selection.beg.col;
3012 end_col = ncol + 1; 2839 end_col = selection.end.col;
3013 } 2840 }
3014 else 2841 else
3015#endif 2842#endif
3016 end_col = ROW(row).l; 2843 end_col = ROW(row).l;
3017 2844
3018 col = max (col, 0); 2845 col = max (col, 0);
3019 2846
3020 if (row == selection.end.row 2847 if (row == selection.end.row)
3021#if !ENABLE_MINIMAL
3022 || selection.rect
3023#endif
3024 )
3025 min_it (end_col, selection.end.col); 2848 min_it (end_col, selection.end.col);
3026 2849
3027 t = ROW(row).t + col; 2850 t = ROW(row).t + col;
3028 2851
3029 for (; col < end_col; col++) 2852 for (; col < end_col; col++)
… …
3031 if (*t == NOCHAR) 2854 if (*t == NOCHAR)
3032 t++; 2855 t++;
3033#if ENABLE_COMBINING 2856#if ENABLE_COMBINING
3034 else if (IS_COMPOSE (*t)) 2857 else if (IS_COMPOSE (*t))
3035 { 2858 {
3036 int len = rxvt_composite.expand (*t, 0); 2859 int len = rxvt_composite.expand (*t);
3037 2860
3038 extra -= (len - 1); 2861 extra -= (len - 1);
3039 2862
3040 if (extra < 0) 2863 if (extra < 0)
3041 { 2864 {
3042 extra += i; 2865 extra += size;
3043 i += i; 2866 size += size;
3044 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2867 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3045 } 2868 }
3046 2869
3047 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2870 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3048 } 2871 }
3049#endif 2872#endif
… …
3061 2884
3062 new_selection_text[ofs++] = C0_LF; 2885 new_selection_text[ofs++] = C0_LF;
3063 } 2886 }
3064 else 2887 else
3065#endif 2888#endif
3066 if (!ROW(row).is_longer () && row != selection.end.row) 2889 if (!ROW(row).is_longer ()
2890 && (row != selection.end.row || end_col != selection.end.col)
2891 && (row != selection.beg.row || selection.beg.col < ncol))
3067 new_selection_text[ofs++] = C0_LF; 2892 new_selection_text[ofs++] = C0_LF;
3068 } 2893 }
3069
3070 if (end_col != selection.end.col)
3071 new_selection_text[ofs++] = C0_LF;
3072 2894
3073 new_selection_text[ofs] = 0; 2895 new_selection_text[ofs] = 0;
3074 2896
3075 if (ofs == 0) 2897 if (ofs == 0)
3076 { 2898 {
… …
3089 2911
3090 selection_grab (tm); 2912 selection_grab (tm);
3091} 2913}
3092 2914
3093bool 2915bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 2916rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
3095{ 2917{
2918 Atom sel;
2919
2920 if (!clipboard)
2921 {
3096 selection_time = tm; 2922 selection_time = tm;
2923 sel = XA_PRIMARY;
2924 }
2925 else
2926 {
2927 clipboard_time = tm;
2928 sel = xa[XA_CLIPBOARD];
2929 }
3097 2930
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2931 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2932 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 2933 {
3101 display->set_selection_owner (this); 2934 display->set_selection_owner (this, clipboard);
3102 return true; 2935 return true;
3103 } 2936 }
3104 else 2937 else
3105 { 2938 {
3106 selection_clear (); 2939 selection_clear (clipboard);
3107 return false; 2940 return false;
3108 } 2941 }
3109 2942
3110#if 0 2943#if 0
3111 XTextProperty ct; 2944 XTextProperty ct;
… …
3121/* ------------------------------------------------------------------------- */ 2954/* ------------------------------------------------------------------------- */
3122/* 2955/*
3123 * Mark or select text based upon number of clicks: 1, 2, or 3 2956 * Mark or select text based upon number of clicks: 1, 2, or 3
3124 * EXT: button 1 press 2957 * EXT: button 1 press
3125 */ 2958 */
3126void 2959void ecb_cold
3127rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2960rxvt_term::selection_click (int clicks, int x, int y) noexcept
3128{ 2961{
3129 clicks = ((clicks - 1) % 3) + 1; 2962 clicks = ((clicks - 1) % 3) + 1;
3130 selection.clicks = clicks; /* save clicks so extend will work */ 2963 selection.clicks = clicks; /* save clicks so extend will work */
3131 2964
3132 if (clicks == 2 && !selection.rect 2965 if (clicks == 2 && !selection.rect
… …
3150 2983
3151/* ------------------------------------------------------------------------- */ 2984/* ------------------------------------------------------------------------- */
3152/* 2985/*
3153 * Mark a selection at the specified col/row 2986 * Mark a selection at the specified col/row
3154 */ 2987 */
3155void 2988void ecb_cold
3156rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2989rxvt_term::selection_start_colrow (int col, int row) noexcept
3157{ 2990{
3158 want_refresh = 1; 2991 want_refresh = 1;
3159 2992
3160 selection.mark.row = row + view_start; 2993 selection.mark.row = row + view_start;
3161 selection.mark.col = col; 2994 selection.mark.col = col;
… …
3183 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3184 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3185 */ 3018 */
3186 3019
3187/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3188#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3189 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3190#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3191 3024
3192void 3025void ecb_cold
3193rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3194{ 3027{
3195 int col, row, dirnadd, tcol, trow, w1, w2; 3028 int col, row, dirnadd, tcol, trow, w1, w2;
3196 row_col_t bound; 3029 row_col_t bound;
3197 text_t *stp; 3030 text_t *stp;
3198 rend_t *srp; 3031 rend_t *srp;
… …
3271 * EXT: button 3 press; button 1 or 3 drag 3104 * EXT: button 3 press; button 1 or 3 drag
3272 * flag == 0 ==> button 1 3105 * flag == 0 ==> button 1
3273 * flag == 1 ==> button 3 press 3106 * flag == 1 ==> button 3 press
3274 * flag == 2 ==> button 3 motion 3107 * flag == 2 ==> button 3 motion
3275 */ 3108 */
3276void 3109void ecb_cold
3277rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3110rxvt_term::selection_extend (int x, int y, int flag) noexcept
3278{ 3111{
3279 int col = clamp (Pixel2Col (x), 0, ncol); 3112 int col = clamp (Pixel2Col (x), 0, ncol);
3280 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3113 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3281 3114
3282 /* 3115 /*
… …
3307 3140
3308/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3309/* 3142/*
3310 * Extend the selection to the specified col/row 3143 * Extend the selection to the specified col/row
3311 */ 3144 */
3312void 3145void ecb_cold
3313rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3146rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3314{ 3147{
3315 row_col_t pos; 3148 row_col_t pos;
3316 enum { 3149 enum {
3317 LEFT, RIGHT 3150 LEFT, RIGHT
3318 } closeto = RIGHT; 3151 } closeto = RIGHT;
3319
3320 want_refresh = 1;
3321 3152
3322 switch (selection.op) 3153 switch (selection.op)
3323 { 3154 {
3324 case SELECTION_INIT: 3155 case SELECTION_INIT:
3325 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3505 3336
3506#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3507 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3508 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3509#endif 3340#endif
3341
3342 selection_changed ();
3510} 3343}
3511 3344
3512#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3513void 3346void ecb_cold
3514rxvt_term::selection_remove_trailing_spaces () NOTHROW 3347rxvt_term::selection_remove_trailing_spaces () noexcept
3515{ 3348{
3516 int32_t end_col, end_row; 3349 int32_t end_col, end_row;
3517 text_t *stp; 3350 text_t *stp;
3518 3351
3519 end_col = selection.end.col; 3352 end_col = selection.end.col;
… …
3556/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3557/* 3390/*
3558 * Double click on button 3 when already selected 3391 * Double click on button 3 when already selected
3559 * EXT: button 3 double click 3392 * EXT: button 3 double click
3560 */ 3393 */
3561void 3394void ecb_cold
3562rxvt_term::selection_rotate (int x, int y) NOTHROW 3395rxvt_term::selection_rotate (int x, int y) noexcept
3563{ 3396{
3564 selection.clicks = selection.clicks % 3 + 1; 3397 selection.clicks = selection.clicks % 3 + 1;
3565 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3398 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3566} 3399}
3567 3400
3568/* ------------------------------------------------------------------------- */ 3401/* ------------------------------------------------------------------------- */
3569/* 3402/*
3570 * Respond to a request for our current selection 3403 * Respond to a request for our current selection
3571 * EXT: SelectionRequest 3404 * EXT: SelectionRequest
3572 */ 3405 */
3573void 3406void ecb_cold
3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3407rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3575{ 3408{
3409 Atom property = rq.property == None ? rq.target : rq.property;
3576 XSelectionEvent ev; 3410 XSelectionEvent ev;
3577 3411
3578 ev.type = SelectionNotify; 3412 ev.type = SelectionNotify;
3579 ev.property = None; 3413 ev.property = None;
3580 ev.display = rq.display; 3414 ev.display = rq.display;
… …
3595 *target++ = xa[XA_COMPOUND_TEXT]; 3429 *target++ = xa[XA_COMPOUND_TEXT];
3596#if X_HAVE_UTF8_STRING 3430#if X_HAVE_UTF8_STRING
3597 *target++ = xa[XA_UTF8_STRING]; 3431 *target++ = xa[XA_UTF8_STRING];
3598#endif 3432#endif
3599 3433
3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3434 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3601 32, PropModeReplace, 3435 32, PropModeReplace,
3602 (unsigned char *)target_list, target - target_list); 3436 (unsigned char *)target_list, target - target_list);
3603 ev.property = rq.property; 3437 ev.property = property;
3604 } 3438 }
3605#if TODO // TODO 3439#if TODO // TODO
3606 else if (rq.target == xa[XA_MULTIPLE]) 3440 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3441 {
3608 /* TODO: Handle MULTIPLE */ 3442 /* TODO: Handle MULTIPLE */
3609 } 3443 }
3610#endif 3444#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3446 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3447 XChangeProperty (dpy, rq.requestor, property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3448 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3615 ev.property = rq.property; 3449 ev.property = property;
3450 }
3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3452 {
3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3455 ev.property = property;
3616 } 3456 }
3617 else if (rq.target == XA_STRING 3457 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3458 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3459 || rq.target == xa[XA_COMPOUND_TEXT]
3620 || rq.target == xa[XA_UTF8_STRING] 3460 || rq.target == xa[XA_UTF8_STRING]
… …
3652 { 3492 {
3653 target = xa[XA_COMPOUND_TEXT]; 3493 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3494 style = enc_compound_text;
3655 } 3495 }
3656 3496
3657 if (selection.text) 3497 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3498 {
3659 cl = selection.text; 3499 cl = selection.text;
3660 selectlen = selection.len; 3500 selectlen = selection.len;
3661 } 3501 }
3502 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3503 {
3504 cl = selection.clip_text;
3505 selectlen = selection.clip_len;
3506 }
3662 else 3507 else
3663 { 3508 {
3664 cl = L""; 3509 cl = (wchar_t *)L"";
3665 selectlen = 0; 3510 selectlen = 0;
3666 } 3511 }
3667 3512
3668#if !ENABLE_MINIMAL 3513#if !ENABLE_MINIMAL
3669 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
… …
3686 ct.value = (unsigned char *)cl; 3531 ct.value = (unsigned char *)cl;
3687 ct.nitems = selectlen; 3532 ct.nitems = selectlen;
3688 ct.encoding = target; 3533 ct.encoding = target;
3689 } 3534 }
3690 3535
3691 XChangeProperty (dpy, rq.requestor, rq.property, 3536 XChangeProperty (dpy, rq.requestor, property,
3692 ct.encoding, 8, PropModeReplace, 3537 ct.encoding, 8, PropModeReplace,
3693 ct.value, (int)ct.nitems); 3538 ct.value, (int)ct.nitems);
3694 ev.property = rq.property; 3539 ev.property = property;
3695 3540
3696 if (freect) 3541 if (freect)
3697 XFree (ct.value); 3542 XFree (ct.value);
3698 } 3543 }
3699 3544
3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3545 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3701} 3546}
3702 3547
3703/* ------------------------------------------------------------------------- */ 3548/* ------------------------------------------------------------------------- */
3704#ifdef USE_XIM 3549#if USE_XIM
3705void 3550void ecb_cold
3706rxvt_term::im_set_position (XPoint &pos) NOTHROW 3551rxvt_term::im_set_position (XPoint &pos) noexcept
3707{ 3552{
3708 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3709 3554
3710 XGetWindowAttributes (dpy, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3711 3556
… …
3714} 3559}
3715#endif 3560#endif
3716 3561
3717#if ENABLE_OVERLAY 3562#if ENABLE_OVERLAY
3718void 3563void
3719rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW 3564rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3720{ 3565{
3721 if (nrow < 1 || ncol < 1) 3566 if (nrow < 1 || ncol < 1)
3722 return; 3567 return;
3723 3568
3724 want_refresh = 1; 3569 want_refresh = 1;
… …
3769 *rp = r; 3614 *rp = r;
3770 } 3615 }
3771} 3616}
3772 3617
3773void 3618void
3774rxvt_term::scr_overlay_off () NOTHROW 3619rxvt_term::scr_overlay_off () noexcept
3775{ 3620{
3776 if (!ov.text) 3621 if (!ov.text)
3777 return; 3622 return;
3778 3623
3779 want_refresh = 1; 3624 want_refresh = 1;
… …
3787 delete [] ov.text; ov.text = 0; 3632 delete [] ov.text; ov.text = 0;
3788 delete [] ov.rend; ov.rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3789} 3634}
3790 3635
3791void 3636void
3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3793{ 3638{
3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3795 return; 3640 return;
3796 3641
3797 x++, y++; 3642 x++, y++;
… …
3799 ov.text[y][x] = text; 3644 ov.text[y][x] = text;
3800 ov.rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3801} 3646}
3802 3647
3803void 3648void
3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3805{ 3650{
3806 while (*s) 3651 while (*s)
3807 scr_overlay_set (x++, y, *s++); 3652 scr_overlay_set (x++, y, *s++);
3808} 3653}
3809 3654
3810void 3655void
3811rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3656rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3812{ 3657{
3813 while (*s) 3658 while (*s)
3814 { 3659 {
3815 text_t t = *s++; 3660 text_t t = *s++;
3816 int width = WCWIDTH (t); 3661 int width = WCWIDTH (t);
… …
3822 } 3667 }
3823 } 3668 }
3824} 3669}
3825 3670
3826void 3671void
3827rxvt_term::scr_swap_overlay () NOTHROW 3672rxvt_term::scr_swap_overlay () noexcept
3828{ 3673{
3829 if (!ov.text) 3674 if (!ov.text)
3830 return; 3675 return;
3831 3676
3832 // hide cursor if it is within the overlay area 3677 // hide cursor if it is within the overlay area

Diff Legend

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