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.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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