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

Diff Legend

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