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.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

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

Diff Legend

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