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

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

Diff Legend

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