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.326 by root, Wed Nov 5 13:04:51 2008 UTC vs.
Revision 1.465 by root, Thu Aug 4 18:28:44 2022 UTC

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

Diff Legend

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