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.352 by root, Fri Oct 15 20:52:15 2010 UTC vs.
Revision 1.467 by root, Mon Aug 8 09:45:06 2022 UTC

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

Diff Legend

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