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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.466 by root, Fri Aug 5 07:54:11 2022 UTC

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

Diff Legend

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