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

Diff Legend

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