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.311 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.465 by root, Thu Aug 4 18:28:44 2022 UTC

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

Diff Legend

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