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.341 by root, Sat Apr 17 23:05:48 2010 UTC vs.
Revision 1.465 by root, Thu Aug 4 18:28:44 2022 UTC

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

Diff Legend

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