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.309 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 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 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * 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 9 * 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 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
130{ 127{
131 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
132 129
133 l.l = 0; 130 l.l = 0;
134 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
153}
154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
135} 163}
136 164
137/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
140 168
141void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
142rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
143{ 215{
144#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
145 scr_overlay_off (); 217 scr_overlay_off ();
146#endif 218#endif
147 219
148 rvideo_mode = false;
149 view_start = 0; 220 view_start = 0;
150 num_scr = 0; 221 num_scr = 0;
151 222
152 if (ncol == 0) 223 if (ncol == 0)
153 ncol = 80; 224 ncol = 80;
… …
155 if (nrow == 0) 226 if (nrow == 0)
156 nrow = 24; 227 nrow = 24;
157 228
158 if (ncol == prev_ncol && nrow == prev_nrow) 229 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 230 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 231
164 // we need at least two lines for wrapping to work correctly 232 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 233 while (nrow + saveLines < 2)
166 { 234 {
167 //TODO//FIXME 235 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
177 245
178 screen.tscroll = 0; 246 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
180 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
181 if (!row_buf) 257 if (!prev_row_buf)
182 { 258 {
183 /* 259 /*
184 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
185 */ 261 */
186 top_row = 0; 262 top_row = 0;
187 term_start = 0; 263 term_start = 0;
188
189 talloc = new rxvt_salloc (ncol * sizeof (text_t));
190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
191
192 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
193 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
195
196 for (int row = nrow; row--; )
197 {
198 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
199 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
200 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
201 }
202 264
203 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 282 selection.text = NULL;
221 selection.len = 0; 283 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 284 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 285 selection.screen = PRIMARY;
224 selection.clicks = 0; 286 selection.clicks = 0;
287 selection.clip_text = NULL;
288 selection.clip_len = 0;
225 } 289 }
226 else 290 else
227 { 291 {
228 /* 292 /*
229 * add or delete rows as appropriate 293 * add or delete rows as appropriate
230 */ 294 */
231 295
232 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
233 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
234
235#if 0
236 if (nrow < prev_nrow)
237 {
238 for (int row = nrow; row < prev_nrow; row++)
239 {
240 lfree (swap_buf [row]);
241 lfree (drawn_buf[row]);
242 }
243 }
244#endif
245
246 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
247 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
248
249 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
250 { 297 {
251 lresize (drawn_buf[row]); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
252 lresize (swap_buf [row]); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
253 }
254
255 for (int row = prev_nrow; row < nrow; row++)
256 { 300 }
257 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
259 }
260
261 line_t *old_buf = row_buf;
262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
263 301
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
267 305
268 if (top_row) 306 if (top_row)
269 { 307 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 308 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 309 // to come up with a lean and mean algorithm.
310 // TODO: maybe optimise when width didn't change
272 311
273 row_col_t ocur = screen.cur; 312 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 313 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 314
276 do 315 do
277 { 316 {
278 p = MOD (p - 1, prev_total_rows); 317 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 318 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 319 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 320 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 321
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 322 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 323 {
287 p = MOD (p - 1, prev_total_rows); 324 p = MOD (p - 1, prev_total_rows);
288 325
289 plines++; 326 plines++;
290 llen += prev_ncol; 327 llen += prev_ncol;
… …
303 340
304 // re-assemble the full line by destination lines 341 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 342 for (int qrow = q; qlines--; qrow++)
306 { 343 {
307 qline = row_buf + qrow; 344 qline = row_buf + qrow;
308 lalloc (*qline); 345 qline->alloc (); // redundant with next line
309 qline->l = ncol; 346 qline->l = ncol;
310 qline->is_longer (1); 347 qline->is_longer (1);
311 348
312 int qcol = 0; 349 int qcol = 0;
313 350
… …
328 // this seems to upset applications/shells/readline 365 // this seems to upset applications/shells/readline
329 // least. 366 // least.
330 if (prow == ocur.row) 367 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 368 screen.cur.row = q - (total_rows - nrow);
332 369
333 line_t &pline = old_buf [prow]; 370 line_t &pline = prev_row_buf [prow];
334 371
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 372 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 373
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 374 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 375 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 396 {
360 // if no scrollback exists (yet), wing, instead of wrap 397 // if no scrollback exists (yet), wing, instead of wrap
361 398
362 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
363 { 400 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 402 line_t &dst = row_buf [row];
366 403
367 qline = pline; 404 copy_line (dst, src);
368 lresize (qline);
369 } 405 }
370 406
371 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 409
376 term_start = 0; 410 term_start = 0;
377 } 411 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 412
383 clamp_it (screen.cur.row, 0, nrow - 1); 413 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 414 clamp_it (screen.cur.col, 0, ncol - 1);
415 }
385 416
417 for (int row = nrow; row--; )
418 {
419 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
420 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
422 }
423
424 chunk_free (prev_chunk, prev_chunk_size);
425
386 free (tabs); 426 free (tabs);
387 } 427 tabs = (char *)rxvt_malloc (ncol);
428
429 for (int col = ncol; col--; )
430 tabs [col] = col % TABSIZE == 0;
388 431
389 CLEAR_ALL_SELECTION (); 432 CLEAR_ALL_SELECTION ();
390 433
391 prev_nrow = nrow; 434 prev_nrow = nrow;
392 prev_ncol = ncol; 435 prev_ncol = ncol;
393 436
394 tabs = (char *)rxvt_malloc (ncol); 437 tt_winch ();
395 438
396 for (int col = ncol; --col; ) 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 440}
441
442void ecb_cold
443rxvt_term::scr_release () NOTHROW
444{
445 chunk_free (chunk, chunk_size);
446 chunk = 0;
447 row_buf = 0;
448
449 free (tabs);
450 tabs = 0;
451}
452
453/* ------------------------------------------------------------------------- */
454/*
455 * Hard/Soft reset
456 */
457void ecb_cold
458rxvt_term::scr_poweron ()
459{
460 scr_release ();
461
462 prev_nrow = prev_ncol = 0;
463 rvideo_mode = false;
464 scr_soft_reset ();
465 scr_reset ();
466
467 scr_clear (true);
468 scr_refresh ();
469}
470
471void ecb_cold
472rxvt_term::scr_soft_reset () NOTHROW
473{
474 /* only affects modes, nothing drastic such as clearing the screen */
475#if ENABLE_OVERLAY
476 scr_overlay_off ();
477#endif
398 478
399 if (current_screen != PRIMARY) 479 if (current_screen != PRIMARY)
400 scr_swap_screen (); 480 scr_swap_screen ();
401 481
402 tt_winch (); 482 scr_scroll_region (0, MAX_ROWS - 1);
403 483 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 484 scr_insert_mode (0);
405}
406
407/* ------------------------------------------------------------------------- */
408/*
409 * Free everything. That way malloc debugging can find leakage.
410 */
411void
412rxvt_term::scr_release () NOTHROW
413{
414 if (row_buf)
415 {
416 delete talloc; talloc = 0;
417 delete ralloc; ralloc = 0;
418
419 free (row_buf);
420 free (swap_buf);
421 free (drawn_buf);
422 free (tabs);
423
424 row_buf = 0; // signal that we freed all the arrays
425 }
426}
427
428/* ------------------------------------------------------------------------- */
429/*
430 * Hard reset
431 */
432void
433rxvt_term::scr_poweron ()
434{
435 scr_release ();
436 prev_nrow = prev_ncol = 0;
437 scr_reset ();
438
439 scr_clear (true);
440 scr_refresh ();
441} 485}
442 486
443/* ------------------------------------------------------------------------- * 487/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 488 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 489 * ------------------------------------------------------------------------- */
… …
483 } 527 }
484 528
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 529 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 530 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 531 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 533 assert (s->cur.col >= 0);
491#endif
492} 534}
493 535
494void 536void
495rxvt_term::scr_swap_screen () 537rxvt_term::scr_swap_screen () NOTHROW
496{ 538{
497 if (!option (Opt_secondaryScreen)) 539 if (!option (Opt_secondaryScreen))
498 return; 540 return;
499 541
500 for (int i = prev_nrow; i--; ) 542 for (int i = prev_nrow; i--; )
… …
519 return; 561 return;
520 562
521 want_refresh = 1; 563 want_refresh = 1;
522 view_start = 0; 564 view_start = 0;
523 565
524 selection_check (2); /* check for boundary cross */ 566 /* check for boundary cross */
567 row_col_t pos;
568 pos.row = pos.col = 0;
569 if (ROWCOL_IS_BEFORE (selection.beg, pos)
570 && ROWCOL_IS_AFTER (selection.end, pos))
571 CLEAR_SELECTION ();
525 572
526 int i = current_screen; current_screen = scrn; scrn = i; 573 current_screen = scrn;
527 574
528#if NSCREENS 575#if NSCREENS
529 if (option (Opt_secondaryScreen)) 576 if (option (Opt_secondaryScreen))
530 { 577 {
531 num_scr = 0; 578 num_scr = 0;
… …
595/* 642/*
596 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
597 * count positive ==> scroll up 644 * count positive ==> scroll up
598 * count negative ==> scroll down 645 * count negative ==> scroll down
599 */ 646 */
600int 647int ecb_hot
601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
602{ 649{
603 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
604 return 0; 651 return 0;
605 652
… …
608 655
609 if (count > 0 656 if (count > 0
610 && row1 == 0 657 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 658 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 659 {
660 min_it (count, total_rows - (nrow - (row2 + 1)));
661
613 top_row = max (top_row - count, -saveLines); 662 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 663
618 // sever bottommost line 664 // sever bottommost line
619 { 665 {
620 line_t &l = ROW(row2 - count); 666 line_t &l = ROW(row2);
621 l.is_longer (0); 667 l.is_longer (0);
622 l.touch (); 668 l.touch ();
623 } 669 }
624 670
671 // scroll everything up 'count' lines
672 term_start = (term_start + count) % total_rows;
673
674 // now copy lines below the scroll region bottom to the
675 // bottom of the screen again, so they look as if they
676 // hadn't moved.
677 for (int i = nrow; --i > row2; )
678 {
679 line_t &l1 = ROW(i - count);
680 line_t &l2 = ROW(i);
681
682 ::swap (l1, l2);
683 l2.touch ();
684 }
685
625 // erase newly scrolled-in lines 686 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 687 for (int i = count; i--; )
627 { 688 {
628 line_t &l = ROW(nrow - 1 - i); 689 line_t &l = ROW(row2 - i);
629 690
630 // optimize if already cleared, can be significant on slow machines 691 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 692 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 693 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 694 {
634 scr_blank_line (l, 0, l.l, rstyle); 695 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 696 l.l = 0;
… …
637 } 698 }
638 else 699 else
639 scr_blank_screen_mem (l, rstyle); 700 scr_blank_screen_mem (l, rstyle);
640 } 701 }
641 702
642 // now copy lines below the scroll region bottom to the
643 // bottom of the screen again, so they look as if they
644 // hadn't moved.
645 for (int i = nrow; --i > row2; )
646 {
647 line_t &l1 = ROW(i - count);
648 line_t &l2 = ROW(i);
649
650 ::swap (l1, l2);
651 l2.touch ();
652 }
653
654 // move and/or clear selection, if any 703 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 704 if (selection.op && current_screen == selection.screen
705 && selection.beg.row <= row2)
656 { 706 {
657 selection.beg.row -= count; 707 selection.beg.row -= count;
658 selection.end.row -= count; 708 selection.end.row -= count;
659 selection.mark.row -= count; 709 selection.mark.row -= count;
660 710
661 if (selection.beg.row < top_row 711 selection_check (0);
662 || selection.end.row < top_row
663 || selection.mark.row < top_row)
664 {
665 CLEAR_ALL_SELECTION ();
666 selection.op = SELECTION_CLEAR;
667 }
668 } 712 }
669 713
670 // finally move the view window, if desired 714 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 715 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 716 && view_start != 0
… …
702 } 746 }
703 747
704 // use a simple and robust scrolling algorithm, this 748 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 749 // part of scr_scroll_text is not time-critical.
706 750
751 // sever line above scroll region
752 if (row1)
753 {
754 line_t &l = ROW(row1 - 1);
755 l.is_longer (0);
756 l.touch ();
757 }
758
707 int rows = row2 - row1 + 1; 759 int rows = row2 - row1 + 1;
708 760
709 min_it (count, rows); 761 min_it (count, rows);
710 762
711 line_t *temp_buf = row_buf + total_rows; 763 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 764
713 for (int row = 0; row < rows; row++) 765 for (int row = 0; row < rows; row++)
714 { 766 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 767 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 768
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 770 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 771 }
720 772
721 for (int row = 0; row < rows; row++) 773 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 774 ROW(row1 + row) = temp_buf [row];
775
776 // sever bottommost line
777 {
778 line_t &l = ROW(row2);
779 l.is_longer (0);
780 l.touch ();
781 }
723 } 782 }
724 783
725 return count; 784 return count;
726} 785}
727 786
728/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
729/* 788/*
730 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
731 */ 790 */
732void 791void ecb_hot
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 793{
735 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
736 return; 795 return;
737 796
738 unsigned char checksel; 797 bool checksel;
739 unicode_t c; 798 unicode_t c;
740 int ncol = this->ncol; 799 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 800 const wchar_t *strend = str + len;
742 801
743 want_refresh = 1; 802 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 815 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 816 screen.cur.row -= minlines;
758 } 817 }
759 } 818 }
760 819
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 820 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 821 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 822 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 823 int row = screen.cur.row;
767 824
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 826
770 line_t *line = &ROW(row); 827 line_t *line = &ROW(row);
771 828
772 while (str < strend) 829 while (str < strend)
773 { 830 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 831 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 832
776 if (expect_false (c < 0x20)) 833 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 834 if (c == C0_LF)
778 { 835 {
779 max_it (line->l, screen.cur.col); 836 max_it (line->l, screen.cur.col);
780 837
781 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
… …
800 { 857 {
801 scr_tab (1, true); 858 scr_tab (1, true);
802 continue; 859 continue;
803 } 860 }
804 861
805 if (expect_false ( 862 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 863 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 864 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 865 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 866 ))
810 { 867 {
… …
815 * should be a similar check. 872 * should be a similar check.
816 */ 873 */
817 CLEAR_SELECTION (); 874 CLEAR_SELECTION ();
818 } 875 }
819 876
820 if (expect_false (screen.flags & Screen_WrapNext)) 877 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 878 {
822 scr_do_wrap (); 879 scr_do_wrap ();
823 880
824 line->l = ncol; 881 line->l = ncol;
825 line->is_longer (1); 882 line->is_longer (1);
… …
827 row = screen.cur.row; 884 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 885 line = &ROW(row); /* _must_ refresh */
829 } 886 }
830 887
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 888 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 889 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 890 c = 0xfffd;
834 891
835 // rely on wcwidth to tell us the character width, do wcwidth before 892 // rely on wcwidth to tell us the character width, do wcwidth before
836 // further replacements, as wcwidth might return -1 for the line 893 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 894 // drawing characters below as they might be invalid in the current
838 // locale. 895 // locale.
839 int width = WCWIDTH (c); 896 int width = WCWIDTH (c);
840 897
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 898 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 899 {
843 // vt100 special graphics and line drawing 900 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 901 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 902 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 903 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 916 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 917 width = 1; // vt100 line drawing characters are always single-width
861 } 918 }
862 } 919 }
863 920
864 if (expect_false (screen.flags & Screen_Insert)) 921 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 922 scr_insdel_chars (width, INSERT);
866 923
867 if (width != 0) 924 if (width != 0)
868 { 925 {
869#if !UNICODE_3 926#if !UNICODE_3
… …
874# else 931# else
875 c = 0xfffd; 932 c = 0xfffd;
876# endif 933# endif
877#endif 934#endif
878 935
936 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
937
938 // if the character doesn't fit into the remaining columns...
939 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
940 {
941 if (screen.flags & Screen_Autowrap)
942 {
943 // ... artificially enlargen the previous one
944 c = NOCHAR;
945 // and try the same character next loop iteration
946 --str;
947 }
948 else
949 screen.cur.col = ncol - width;
950 }
951
879 // nuke the character at this position, if required 952 // nuke the character at this position, if required
880 if (expect_false ( 953 // due to wonderful coincidences everywhere else in this loop
954 // we never have to check for overwriting a wide char itself,
955 // only its tail.
881 line->t[screen.cur.col] == NOCHAR 956 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 957 scr_kill_char (*line, screen.cur.col);
883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 958
913 line->touch (); 959 line->touch ();
914 960
915 do 961 do
916 { 962 {
917 line->t[screen.cur.col] = c; 963 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 964 line->r[screen.cur.col] = rend;
919 965
920 if (expect_true (screen.cur.col < ncol - 1)) 966 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 967 screen.cur.col++;
922 else 968 else
923 { 969 {
924 line->l = ncol; 970 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 971 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 972 screen.flags |= Screen_WrapNext;
927 break; 973
974 goto end_of_line;
928 } 975 }
929 976
930 c = NOCHAR; 977 c = NOCHAR;
931 } 978 }
932 while (expect_false (--width > 0)); 979 while (ecb_unlikely (--width > 0));
933 980
934 // pad with spaces when overwriting wide character with smaller one 981 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 982 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 983 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 984 line->t[c] = ' ';
942 line->r[c] = rend; 985 line->r[c] = rend;
943 }
944 } 986 }
987
988end_of_line:
989 ;
945 } 990 }
946#if ENABLE_COMBINING 991#if ENABLE_COMBINING
947 else // width == 0 992 else // width == 0
948 { 993 {
949 if (c != 0xfeff) // ignore BOM 994 if (c != 0xfeff) // ignore BOM
… …
989#endif 1034#endif
990 } 1035 }
991 1036
992 max_it (line->l, screen.cur.col); 1037 max_it (line->l, screen.cur.col);
993 1038
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1039 assert (screen.cur.row >= 0);
996#endif
997} 1040}
998 1041
999/* ------------------------------------------------------------------------- */ 1042/* ------------------------------------------------------------------------- */
1000/* 1043/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1044 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1057
1015 want_refresh = 1; 1058 want_refresh = 1;
1016#endif 1059#endif
1017 } 1060 }
1018 } 1061 }
1062 else if (screen.flags & Screen_WrapNext)
1063 screen.flags &= ~Screen_WrapNext;
1019 else 1064 else
1020 scr_gotorc (0, -1, RELATIVE); 1065 scr_gotorc (0, -1, RELATIVE);
1021} 1066}
1022 1067
1023/* ------------------------------------------------------------------------- */ 1068/* ------------------------------------------------------------------------- */
… …
1101 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1104 */ 1149 */
1105#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1106void 1151void ecb_cold
1107rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1108{ 1153{
1109 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1111 else 1156 else
… …
1118 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1121 */ 1166 */
1122#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1123void 1168void ecb_cold
1124rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1125{ 1170{
1126 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1128 else 1173 else
… …
1279 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1280} 1325}
1281 1326
1282/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1283/* 1328/*
1284 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1333 */
1289void 1334void
… …
1298 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1299 1344
1300 switch (mode) 1345 switch (mode)
1301 { 1346 {
1302 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1348 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1350 num = nrow - row;
1307 break; 1351 break;
1308 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1353 scr_erase_line (1);
1311 row = 0; 1354 row = 0;
1312 num = screen.cur.row; 1355 num = screen.cur.row;
1313 break; 1356 break;
1314 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1358 row = 0;
1317 num = nrow; 1359 num = nrow;
1318 break; 1360 break;
1319 default: 1361 default:
1320 return; 1362 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1371 if (row >= nrow) /* Out Of Bounds */
1330 return; 1372 return;
1331 1373
1332 min_it (num, nrow - row); 1374 min_it (num, nrow - row);
1333 1375
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1376 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1377 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1378 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1379 {
1339 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1340 1381
1341 if (mapped) 1382 if (mapped)
1342 XClearArea (dpy, vt, 0, 1383 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1344 (unsigned int)Height2Pixel (num), False); 1385 (unsigned int)Height2Pixel (num), False);
1345 } 1386 }
1346 else 1387 else
1347 { 1388 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1390
1391 if (mapped)
1392 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1395 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1396 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1397 (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num)); 1398 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1401 }
1358 } 1402 }
1359 1403
1360 for (; num--; row++) 1404 for (; num--; row++)
1361 { 1405 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1406 scr_blank_screen_mem (ROW(row), rstyle);
1407
1408 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1409 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1410 }
1365} 1411}
1366 1412
1367#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1368void 1414void
… …
1378/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1379/* 1425/*
1380 * Fill the screen with `E's 1426 * Fill the screen with `E's
1381 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1382 */ 1428 */
1383void 1429void ecb_cold
1384rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1385{ 1431{
1386 rend_t fs; 1432 rend_t fs;
1387 1433
1388 want_refresh = 1; 1434 want_refresh = 1;
1389 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1390 1436
1391 num_scr_allow = 0; 1437 num_scr_allow = 0;
1392 selection_check (3); 1438
1439 row_col_t pos;
1440 pos.row = pos.col = 0;
1441 if (ROWCOL_IS_AFTER (selection.end, pos))
1442 CLEAR_SELECTION ();
1393 1443
1394 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1395 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1396 { 1446 {
1397 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1442 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1443 */ 1493 */
1444void 1494void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1495rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1496{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1497 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1452 1499
1453 if (count <= 0) 1500 if (count <= 0)
1454 return; 1501 return;
… …
1456 scr_do_wrap (); 1503 scr_do_wrap ();
1457 1504
1458 selection_check (1); 1505 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1506 min_it (count, ncol - screen.cur.col);
1460 1507
1461 row = screen.cur.row; 1508 int row = screen.cur.row;
1462 1509
1463 line_t *line = &ROW(row); 1510 line_t *line = &ROW(row);
1464 1511
1465 line->touch (); 1512 line->touch ();
1466 line->is_longer (0); 1513 line->is_longer (0);
1467 1514
1515 // nuke wide spanning the start
1516 if (line->t[screen.cur.col] == NOCHAR)
1517 scr_kill_char (*line, screen.cur.col);
1518
1468 switch (insdel) 1519 switch (insdel)
1469 { 1520 {
1470 case INSERT: 1521 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1522 line->l = min (line->l + count, ncol);
1523
1524 if (line->t[screen.cur.col] == NOCHAR)
1525 scr_kill_char (*line, screen.cur.col);
1526
1527 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1528 {
1473 line->t[col] = line->t[col - count]; 1529 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1530 line->r[col] = line->r[col - count];
1475 } 1531 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1532
1479 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1535 {
1482 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1551 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1552 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1553 selection_check (1);
1500 screen.cur.col -= count; 1554 screen.cur.col -= count;
1501 1555
1502 line->l = max (line->l - count, 0); 1556 // nuke wide char after the end
1557 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1558 scr_kill_char (*line, screen.cur.col + count);
1559
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1560 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1561 break;
1505 1562
1506 case DELETE: 1563 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1564 line->l = max (line->l - count, 0);
1508 1565
1566 // nuke wide char spanning the end
1567 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1568 scr_kill_char (*line, screen.cur.col + count);
1569
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1570 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1571 {
1511 line->t[col] = line->t[col + count]; 1572 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1573 line->r[col] = line->r[col + count];
1513 } 1574 }
1514 1575
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1576 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1577
1518 if (selection.op && current_screen == selection.screen 1578 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1579 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1580 {
1521 if (selection.end.row != screen.cur.row 1581 if (selection.end.row != screen.cur.row
… …
1538/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1539/* 1599/*
1540 * Set the scrolling region 1600 * Set the scrolling region
1541 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1542 */ 1602 */
1543void 1603void ecb_cold
1544rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1545{ 1605{
1546 max_it (top, 0); 1606 max_it (top, 0);
1547 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1548 1608
… …
1558/* 1618/*
1559 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1560 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1561 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1562 */ 1622 */
1563void 1623void ecb_cold
1564rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1565{ 1625{
1566 want_refresh = 1; 1626 want_refresh = 1;
1567 1627
1568 if (mode) 1628 if (mode)
… …
1575/* 1635/*
1576 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1577 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1578 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1579 */ 1639 */
1580void 1640void ecb_cold
1581rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1582{ 1642{
1583 if (mode) 1643 if (mode)
1584 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1585 else 1645 else
… …
1594 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1595 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1596 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1597 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1598 */ 1658 */
1599void 1659void ecb_cold
1600rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1601{ 1661{
1602 if (mode) 1662 if (mode)
1603 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1604 else 1664 else
… …
1611/* 1671/*
1612 * Set insert/replace mode 1672 * Set insert/replace mode
1613 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1614 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1615 */ 1675 */
1616void 1676void ecb_cold
1617rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1618{ 1678{
1619 if (mode) 1679 if (mode)
1620 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1621 else 1681 else
… …
1627 * Set/Unset tabs 1687 * Set/Unset tabs
1628 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1629 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1630 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1631 */ 1691 */
1632void 1692void ecb_cold
1633rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1634{ 1694{
1635 if (mode < 0) 1695 if (mode < 0)
1636 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1637 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1656 if (rvideo_state != on) 1716 if (rvideo_state != on)
1657 { 1717 {
1658 rvideo_state = on; 1718 rvideo_state = on;
1659 1719
1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1661#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1662 if (bgPixmap.pixmap == None) 1722 if (bg_img == 0)
1663#endif 1723#endif
1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1665 1725
1666 XGCValues gcvalue; 1726 XGCValues gcvalue;
1667 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1676/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1677/* 1737/*
1678 * Report current cursor position 1738 * Report current cursor position
1679 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1680 */ 1740 */
1681void 1741void ecb_cold
1682rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1683{ 1743{
1684 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1685} 1745}
1686 1746
… …
1689 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1690 1750
1691/* 1751/*
1692 * Set font style 1752 * Set font style
1693 */ 1753 */
1694void 1754void ecb_cold
1695rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1696{ 1756{
1697#if 0 1757#if 0
1698 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1699 { 1759 {
… …
1721 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1722 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1723 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1724 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1725 */ 1785 */
1726void 1786void ecb_cold
1727rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1728{ 1788{
1729 screen.charset = set; 1789 screen.charset = set;
1730 set_font_style (); 1790 set_font_style ();
1731} 1791}
… …
1752 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1753 1813
1754/* 1814/*
1755 * refresh matching text. 1815 * refresh matching text.
1756 */ 1816 */
1757bool 1817bool ecb_cold
1758rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1759{ 1819{
1760 bool found = false; 1820 bool found = false;
1761 1821
1762 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1781 PART_BEG = 0, 1841 PART_BEG = 0,
1782 PART_END, 1842 PART_END,
1783 RC_COUNT 1843 RC_COUNT
1784}; 1844};
1785 1845
1786void 1846void ecb_hot
1787rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1788{ 1848{
1789 int i; 1849 int i;
1790 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1791 1851
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1871 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1872 {
1813 min_it (rc[i].col, ncol - 1); 1873 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1874 min_it (rc[i].row, nrow - 1);
1815 } 1875 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1876
1817 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1877 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1878 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819 1879
1820 num_scr_allow = 0; 1880 num_scr_allow = 0;
1821 1881
… …
1828 * Refresh the entire screen 1888 * Refresh the entire screen
1829 */ 1889 */
1830void 1890void
1831rxvt_term::scr_touch (bool refresh) NOTHROW 1891rxvt_term::scr_touch (bool refresh) NOTHROW
1832{ 1892{
1833 scr_expose (0, 0, width, height, refresh); 1893 scr_expose (0, 0, vt_width, vt_height, refresh);
1834} 1894}
1835 1895
1836/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1837/* 1897/*
1838 * Move the display so that the line represented by scrollbar value Y is at 1898 * Move the display so that the line represented by scrollbar value Y is at
… …
1894 1954
1895# ifndef NO_MAPALERT 1955# ifndef NO_MAPALERT
1896# ifdef MAPALERT_OPTION 1956# ifdef MAPALERT_OPTION
1897 if (option (Opt_mapAlert)) 1957 if (option (Opt_mapAlert))
1898# endif 1958# endif
1899 XMapWindow (dpy, parent[0]); 1959 XMapWindow (dpy, parent);
1900# endif 1960# endif
1901 1961
1902# if ENABLE_FRILLS 1962# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1963 if (option (Opt_urgentOnBell))
1904 { 1964 set_urgency (1);
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif 1965# endif
1912 1966
1913 if (option (Opt_visualBell)) 1967 if (option (Opt_visualBell))
1914 { 1968 {
1915 rvideo_bell = true; 1969 rvideo_bell = true;
… …
1918 1972
1919 bell_ev.start (VISUAL_BELL_DURATION); 1973 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1974 }
1921 else 1975 else
1922 XBell (dpy, 0); 1976 XBell (dpy, 0);
1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1978#endif
1924} 1979}
1925 1980
1926/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */ 1982void ecb_cold
1928void
1929rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1930{ 1984{
1931#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1932 int nrows, row_start; 1986 int nrows, row_start;
1933 FILE *fd = popen_printer (); 1987 FILE *fd = popen_printer ();
… …
1946 row_start = view_start; 2000 row_start = view_start;
1947 } 2001 }
1948 2002
1949 wctomb (0, 0); 2003 wctomb (0, 0);
1950 2004
1951 for (int r1 = 0; r1 < nrows; r1++) 2005 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 2006 {
1953 text_t *tp = ROW(r1).t; 2007 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 2008 int len = ROW(r1).l;
1955 2009
1956 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2010 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1982/* 2036/*
1983 * Refresh the screen 2037 * Refresh the screen
1984 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
1985 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2040 */
1987void 2041void ecb_hot
1988rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
1989{ 2043{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2046 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */
1997#endif
1998 rend_t *crp; // cursor rendition pointer
1999 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
2000 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
2001 2051
2002 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2003 2053
2004 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2005 return; 2055 return;
… …
2007 /* 2057 /*
2008 * A: set up vars 2058 * A: set up vars
2009 */ 2059 */
2010 refresh_count = 0; 2060 refresh_count = 0;
2011 2061
2062 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2063 bool have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2064#ifdef HAVE_IMG
2014 have_bg = bgPixmap.pixmap != None; 2065 have_bg = bg_img != 0;
2015#endif 2066#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2068
2018 /* 2069 /*
2019 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
2020 */ 2071 */
2021 scr_reverse_selection (); 2072 scr_reverse_selection ();
2022 2073
2074 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2075#if ENABLE_OVERLAY
2076 scr_swap_overlay ();
2077#endif
2078
2079 bool showcursor = screen.flags & Screen_VisibleCursor;
2080
2023 /* 2081 /*
2024 * C: set the cursor character (s) 2082 * C: set the cursor character (s)
2025 */ 2083 */
2026 { 2084 {
2027 unsigned char setoldcursor; 2085 bool setoldcursor;
2028 2086
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2087#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2088 if (hidden_cursor)
2032 showcursor = 0; 2089 showcursor = 0;
2033#endif 2090#endif
2034 2091
… …
2037 int col = screen.cur.col; 2094 int col = screen.cur.col;
2038 2095
2039 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2040 col--; 2097 col--;
2041 2098
2042 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2043 2101
2044#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2045 cc1 = *crp & (RS_fgMask | RS_bgMask);
2046 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2047 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2048 else 2105 else
2049#endif 2106#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2062 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2063#else 2120#else
2064 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2065#endif 2122#endif
2066 2123
2067 if (showcursor && focus) 2124 if (focus)
2068 { 2125 {
2126 rend_t rend = cur_rend;
2127
2069 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2071 else 2130 else
2072 { 2131 {
2073 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2074 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2075 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2076 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2077 } 2138 }
2078 } 2139 }
2079 2140
2080 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2081 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2107 oldcursor.col = screen.cur.col; 2168 oldcursor.col = screen.cur.col;
2108 } 2169 }
2109 } 2170 }
2110 } 2171 }
2111 2172
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2173#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2174 /*
2119 * D: CopyArea pass - very useful for slower links 2175 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2176 * This has been deliberately kept simple.
2121 */ 2177 */
… …
2125 { 2181 {
2126 int16_t nits; 2182 int16_t nits;
2127 int i = num_scr; 2183 int i = num_scr;
2128 int j; 2184 int j;
2129 int len, wlen; 2185 int len, wlen;
2130 dLocal (int, num_scr);
2131 2186
2132 j = nrow; 2187 j = nrow;
2133 wlen = len = -1; 2188 wlen = len = -1;
2134 row = i > 0 ? 0 : j - 1; 2189 row = i > 0 ? 0 : j - 1;
2135 2190
… …
2210 continue; 2265 continue;
2211 2266
2212 // redraw one or more characters 2267 // redraw one or more characters
2213 2268
2214 // seek to the beginning of wide characters 2269 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2270 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2216 --col; 2271 --col;
2217 2272
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2273 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2274 text_t *text = stp + col;
2220 int count = 1; 2275 int count = 1;
2221 2276
2222 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2223 drp[col] = rend; 2278 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2282 for (i = 0; ++col < ncol; )
2228 { 2283 {
2229 if (stp[col] == NOCHAR) 2284 if (stp[col] == NOCHAR)
2230 { 2285 {
2231 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2232 drp[col] = rend; 2287 drp[col] = srp[col];
2288
2233 count++; 2289 count++;
2234 i++; 2290 i++;
2235 2291
2236 continue; 2292 continue;
2237 } 2293 }
… …
2257 2313
2258 col--; /* went one too far. move back */ 2314 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2315 count -= i; /* dump any matching trailing chars */
2260 2316
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2317 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2318 while (ecb_unlikely (i && text[count] == NOCHAR))
2263 count++, i--; 2319 count++, i--;
2264 2320
2265 /* 2321 /*
2266 * Determine the attributes for the string 2322 * Determine the attributes for the string
2267 */ 2323 */
2268 int fore = fgcolor_of (rend); // desired foreground 2324 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2325 int back = bgcolor_of (rend); // desired background
2270 2326
2271 // only do special processing if any attributes are set, which is unlikely 2327 // only do special processing if any attributes are set, which is unlikely
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2328 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2329 {
2274 bool invert = rend & RS_RVid; 2330 bool invert = rend & RS_RVid;
2275 2331
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2333 if (rend & RS_Bold && fore == Color_fg)
… …
2296 2352
2297 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2353 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2298 fore = Color_UL; 2354 fore = Color_UL;
2299#endif 2355#endif
2300 2356
2357#ifdef OPTION_HC
2358 if (rend & RS_Sel)
2359 {
2360 /* invert the column if no highlightColor is set or it is the
2361 * current cursor column */
2362 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2363 && ISSET_PIXCOLOR (Color_HC))
2364 {
2365 if (ISSET_PIXCOLOR (Color_HTC))
2366 fore = Color_HTC;
2367 // if invert is 0 reverse video is set so we use bg color as fg color
2368 else if (!invert)
2369 fore = back;
2370
2371 back = Color_HC;
2372 invert = 0;
2373 }
2374 }
2375#endif
2376
2301 if (invert) 2377 if (invert)
2302 { 2378 {
2303#ifdef OPTION_HC
2304 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2305 || !ISSET_PIXCOLOR (Color_HC))
2306#endif
2307 /* invert the column if no highlightColor is set or it is the
2308 * current cursor column */
2309 ::swap (fore, back); 2379 ::swap (fore, back);
2310#ifdef OPTION_HC
2311 else if (ISSET_PIXCOLOR (Color_HC))
2312 back = Color_HC;
2313#endif
2314 2380
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2381#ifndef NO_BOLD_UNDERLINE_REVERSE
2316# ifndef OPTION_HC
2317 if (ISSET_PIXCOLOR (Color_RV))
2318 back = Color_RV;
2319# endif
2320 if (fore == back) 2382 if (fore == back)
2321 { 2383 {
2322 fore = Color_bg; 2384 fore = Color_bg;
2323 back = Color_fg; 2385 back = Color_fg;
2324 } 2386 }
… …
2360 /* 2422 /*
2361 * Actually do the drawing of the string here 2423 * Actually do the drawing of the string here
2362 */ 2424 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2425 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2426
2365 if (have_bg && back == Color_bg) 2427 if (ecb_likely (have_bg && back == Color_bg))
2366 { 2428 {
2367 // this is very ugly, maybe push it into ->draw? 2429 // this is very ugly, maybe push it into ->draw?
2368 2430
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2431 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2432 if (text[i] != ' ')
… …
2377 did_clear: ; 2439 did_clear: ;
2378 } 2440 }
2379 else 2441 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2442 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2443
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2444 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2445 {
2384#if ENABLE_FRILLS 2446#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2447 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2448 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2449 else
… …
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2455 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2456 }
2395 } /* for (col....) */ 2457 } /* for (col....) */
2396 } /* for (row....) */ 2458 } /* for (row....) */
2397 2459
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402
2403 /* 2460 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2462 */
2406 if (showcursor) 2463 if (showcursor)
2407 { 2464 {
2408 if (focus) 2465 if (focus)
2409 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2410 if (option (Opt_cursorUnderline))
2411 *crp ^= RS_Uline;
2412 else
2413 {
2414 *crp ^= RS_RVid;
2415#ifndef NO_CURSORCOLOR
2416 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2417#endif
2418 }
2419 }
2420 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2421 { 2468 {
2422 int cursorwidth = 1; 2469 int cursorwidth = 1;
2423 int col = oldcursor.col; 2470 int col = oldcursor.col;
2424 2471
… …
2438 2485
2439 XDrawRectangle (dpy, vt, gc, 2486 XDrawRectangle (dpy, vt, gc,
2440 Col2Pixel (col), 2487 Col2Pixel (col),
2441 Row2Pixel (oldcursor.row), 2488 Row2Pixel (oldcursor.row),
2442 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2489 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2443 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2490 (unsigned int) (Height2Pixel (1) - 1));
2444 } 2491 }
2445 } 2492 }
2446 2493
2447 /* 2494 /*
2448 * H: cleanup selection 2495 * H: cleanup selection
2449 */ 2496 */
2497#if ENABLE_OVERLAY
2498 scr_swap_overlay ();
2499#endif
2500 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2501
2450 scr_reverse_selection (); 2502 scr_reverse_selection ();
2451 2503
2504 screen.flags = old_screen_flags;
2452 num_scr = 0; 2505 num_scr = 0;
2453 num_scr_allow = 1; 2506 num_scr_allow = 1;
2454} 2507}
2455 2508
2456void 2509void ecb_cold
2457rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2458{ 2511{
2459 if (!l.t) 2512 if (!l.valid ())
2460 return; 2513 return;
2461 2514
2462 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2463 2516
2464 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2465 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2466} 2519}
2467 2520
2468void 2521void ecb_cold
2469rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2470{ 2523{
2471 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2472 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2473 2526
… …
2476 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2477 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2478 } 2531 }
2479} 2532}
2480 2533
2481void 2534void ecb_cold
2482rxvt_term::scr_recolour () NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2483{ 2536{
2484#ifdef HAVE_BG_PIXMAP 2537 bool transparent = false;
2485 bgPixmap.apply ();
2486#else
2487 2538
2539#ifdef HAVE_IMG
2540 if (bg_img != 0)
2541 {
2542# if ENABLE_TRANSPARENCY
2543 if (bg_flags & BG_IS_TRANSPARENT)
2544 {
2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547
2548 transparent = true;
2549 }
2550 else
2551# endif
2552 {
2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2555 }
2556 }
2557 else
2558#endif
2559 {
2488 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2560 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2489 XClearWindow (dpy, parent[0]);
2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2561 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2562 }
2563
2564 XClearWindow (dpy, parent);
2491 2565
2492 if (scrollBar.win) 2566 if (scrollBar.win)
2493 { 2567 {
2568 if (transparent)
2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2570 else
2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2495 scrollBar.state = STATE_IDLE; 2572 scrollBar.state = SB_STATE_IDLE;
2496 scrollBar.show (0); 2573 scrollBar.show (0);
2497 } 2574 }
2498 2575
2499#endif 2576 if (refresh)
2500 2577 {
2501 /* bgPixmap.apply () does not do the following : */
2502 scr_clear (); 2578 scr_clear ();
2503 scr_touch (true); 2579 scr_touch (true);
2580 }
2504 want_refresh = 1; 2581 want_refresh = 1;
2505} 2582}
2506 2583
2507/* ------------------------------------------------------------------------- */ 2584/* ------------------------------------------------------------------------- */
2508void 2585void
… …
2565 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2566 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2567} 2644}
2568 2645
2569/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2570void 2647void ecb_hot
2571rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2572{ 2649{
2573 if (selection.op 2650 if (selection.op
2574 && current_screen == selection.screen 2651 && current_screen == selection.screen
2575 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
2576 { 2653 {
2577#if !ENABLE_MINIMAL 2654#if !ENABLE_MINIMAL
2578 if (selection.rect) 2655 if (selection.rect)
2579 scr_xor_rect (selection.beg.row, selection.beg.col, 2656 scr_xor_rect (selection.beg.row, selection.beg.col,
2580 selection.end.row, selection.end.col, 2657 selection.end.row, selection.end.col,
2581 RS_RVid, RS_RVid | RS_Uline); 2658 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2582 else 2659 else
2583#endif 2660#endif
2584 scr_xor_span (selection.beg.row, selection.beg.col, 2661 scr_xor_span (selection.beg.row, selection.beg.col,
2585 selection.end.row, selection.end.col, 2662 selection.end.row, selection.end.col,
2586 RS_RVid); 2663 RS_Sel | RS_RVid);
2587 } 2664 }
2588} 2665}
2589 2666
2590/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2591/* 2668/*
… …
2594 */ 2671 */
2595#if 0 2672#if 0
2596void 2673void
2597rxvt_term::scr_dump (int fd) NOTHROW 2674rxvt_term::scr_dump (int fd) NOTHROW
2598{ 2675{
2599 int row, wrote; 2676 // if this method is needed, it can be implemented by factoring the
2600 unsigned int width, towrite; 2677 // relevant code in scr_printscreen
2601 char r1[] = "\n";
2602
2603 for (row = saveLines + top_row;
2604 row < saveLines + nrow - 1; row++)
2605 {
2606 width = row_buf[row].l >= 0 ? row_buf[row].l
2607 : ncol;
2608 for (towrite = width; towrite; towrite -= wrote)
2609 {
2610 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2611 towrite);
2612 if (wrote < 0)
2613 return; /* XXX: death, no report */
2614 }
2615 if (row_buf[row].l >= 0)
2616 if (write (fd, r1, 1) <= 0)
2617 return; /* XXX: death, no report */
2618 }
2619} 2678}
2620#endif 2679#endif
2621 2680
2622/* ------------------------------------------------------------------------- * 2681/* ------------------------------------------------------------------------- *
2623 * CHARACTER SELECTION * 2682 * CHARACTER SELECTION *
2624 * ------------------------------------------------------------------------- */ 2683 * ------------------------------------------------------------------------- */
2625void 2684void
2626rxvt_term::selection_check (int check_more) NOTHROW 2685rxvt_term::selection_check (int check_more) NOTHROW
2627{ 2686{
2628 row_col_t pos;
2629
2630 if (!selection.op) 2687 if (!selection.op)
2631 return; 2688 return;
2632 2689
2633 pos.row = pos.col = 0;
2634 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2635 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2636 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2637 || (check_more == 1 2693 || (check_more == 1
2638 && current_screen == selection.screen 2694 && current_screen == selection.screen
2639 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2640 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2641 || (check_more == 2
2642 && ROWCOL_IS_BEFORE (selection.beg, pos)
2643 && ROWCOL_IS_AFTER (selection.end, pos))
2644 || (check_more == 3
2645 && ROWCOL_IS_AFTER (selection.end, pos))
2646 || (check_more == 4 /* screen width change */
2647 && (selection.beg.row != selection.end.row
2648 || selection.end.col > ncol)))
2649 CLEAR_SELECTION (); 2697 CLEAR_ALL_SELECTION ();
2650} 2698}
2651 2699
2652/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2653/* 2701/*
2654 * Paste a selection direct to the command fd 2702 * Paste a selection direct to the command fd
2655 */ 2703 */
2656void 2704void
2657rxvt_term::paste (char *data, unsigned int len) NOTHROW 2705rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2658{ 2706{
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2707 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (unsigned int i = 0; i < len; i++) 2708 for (unsigned int i = 0; i < len; i++)
2661 if (data[i] == C0_LF) 2709 if (data[i] == C0_LF)
2662 data[i] = C0_CR; 2710 data[i] = C0_CR;
2663 2711
2664 if (priv_modes & PrivMode_BracketPaste) 2712 if (priv_modes & PrivMode_BracketPaste)
2665 tt_printf ("\e[200~"); 2713 tt_printf ("\x1b[200~");
2666 2714
2667 tt_write (data, len); 2715 tt_write (data, len);
2668 2716
2669 if (priv_modes & PrivMode_BracketPaste) 2717 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~"); 2718 tt_printf ("\x1b[201~");
2671} 2719}
2672 2720
2673/* ------------------------------------------------------------------------- */
2674/*
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void 2721void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2722rxvt_term::paste (char *data, unsigned int len) NOTHROW
2680{ 2723{
2681 if (prop == None) /* check for failed XConvertSelection */ 2724 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2682 {
2683 if ((selection_type & Sel_CompoundText))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = 0;
2688 if (selnum != Sel_direct)
2689 selection_request_other (XA_STRING, selnum);
2690 }
2691
2692 if ((selection_type & Sel_UTF8String))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = Sel_CompoundText;
2697 if (selnum != Sel_direct)
2698 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2699 else
2700 selection_type = 0;
2701 }
2702
2703 return;
2704 }
2705
2706 unsigned long bytes_after;
2707 XTextProperty ct;
2708
2709 if (XGetWindowProperty (dpy, win, prop,
2710 0, PROP_SIZE / 4,
2711 delete_prop, AnyPropertyType,
2712 &ct.encoding, &ct.format,
2713 &ct.nitems, &bytes_after,
2714 &ct.value) != Success)
2715 {
2716 ct.value = 0;
2717 goto bailout;
2718 }
2719
2720 if (ct.encoding == None)
2721 goto bailout;
2722
2723 if (bytes_after)
2724 {
2725 // fetch and append remaining data
2726 XTextProperty ct2;
2727
2728 if (XGetWindowProperty (dpy, win, prop,
2729 ct.nitems / 4, (bytes_after + 3) / 4,
2730 delete_prop, AnyPropertyType,
2731 &ct2.encoding, &ct2.format,
2732 &ct2.nitems, &bytes_after,
2733 &ct2.value) != Success)
2734 goto bailout;
2735
2736 // realloc should be compatible to XFree, here, and elsewhere, too
2737 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2738 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2739 ct.nitems += ct2.nitems;
2740
2741 XFree (ct2.value);
2742 }
2743
2744 if (ct.value == 0)
2745 goto bailout;
2746
2747 if (ct.encoding == xa[XA_INCR])
2748 {
2749 // INCR selection, start handshake
2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop);
2752
2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0;
2755 incr_ev.start (10);
2756
2757 goto bailout;
2758 }
2759
2760 if (ct.nitems == 0)
2761 {
2762 if (selection_wait == Sel_incr)
2763 {
2764 XFree (ct.value);
2765
2766 // finally complete, now paste the whole thing
2767 selection_wait = Sel_normal;
2768 ct.value = (unsigned char *)incr_buf;
2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0;
2771 incr_buf_size = 0;
2772 incr_ev.stop ();
2773 }
2774 else
2775 {
2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 {
2779 /*
2780 * pass through again trying CUT_BUFFER0 if we've come from
2781 * XConvertSelection () but nothing was presented
2782 */
2783 selection_paste (display->root, XA_CUT_BUFFER0, False);
2784 }
2785
2786 goto bailout;
2787 }
2788 }
2789 else if (selection_wait == Sel_incr)
2790 {
2791 incr_ev.start (10);
2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2797 }
2798
2799 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2800 incr_buf_fill += ct.nitems;
2801
2802 goto bailout;
2803 }
2804
2805 char **cl;
2806 int cr;
2807
2808#if !ENABLE_MINIMAL
2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2810 // so recode it manually
2811 if (ct.encoding == xa[XA_UTF8_STRING])
2812 {
2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2814 char *s = rxvt_wcstombs (w);
2815 free (w);
2816 // TODO: strlen == only the first element will be converted. well...
2817 paste (s, strlen (s));
2818 free (s);
2819 }
2820 else
2821#endif
2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2823 && cl)
2824 {
2825 for (int i = 0; i < cr; i++)
2826 paste (cl[i], strlen (cl[i]));
2827
2828 XFreeStringList (cl);
2829 }
2830 else
2831 paste ((char *)ct.value, ct.nitems); // paste raw
2832
2833bailout:
2834 XFree (ct.value);
2835
2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none;
2838}
2839
2840void
2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{
2843 selection_wait = Sel_none;
2844
2845 incr_buf_size = 0;
2846 free (incr_buf);
2847
2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2849}
2850
2851void
2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2853{
2854 if (prop == None || selection_wait != Sel_incr)
2855 return; 2725 return;
2856 2726
2857 selection_paste (win, prop, true); 2727 tt_paste (data, len);
2858} 2728}
2859 2729
2860/* ------------------------------------------------------------------------- */ 2730/* ------------------------------------------------------------------------- */
2861/* 2731/*
2862 * Request the current selection: 2732 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2863 * Order: > internal selection if available 2733 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2734 * as fallback
2865 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0
2868 * EXT: button 2 release 2735 * EXT: button 2 release
2869 */ 2736 */
2870void 2737void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2738rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2739{
2873 if (selection.text && selnum == Sel_Primary) 2740 if (!selection_req)
2874 {
2875 /* internal selection */
2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2877 paste (str, strlen (str));
2878 free (str);
2879 return;
2880 } 2741 {
2881 else 2742 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2743 selection_req->run ();
2882 { 2744 }
2883 selection_request_time = tm;
2884 selection_wait = Sel_normal;
2885
2886#if X_HAVE_UTF8_STRING
2887 selection_type = Sel_UTF8String;
2888 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2889 return;
2890#else
2891 selection_type = Sel_CompoundText;
2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2893 return;
2894#endif
2895 }
2896
2897 selection_wait = Sel_none; /* don't loop in selection_paste () */
2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2899}
2900
2901int
2902rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2903{
2904 Atom sel;
2905
2906 selection_type |= selnum;
2907
2908 if (selnum == Sel_Primary)
2909 sel = XA_PRIMARY;
2910 else if (selnum == Sel_Secondary)
2911 sel = XA_SECONDARY;
2912 else
2913 sel = xa[XA_CLIPBOARD];
2914
2915 if (XGetSelectionOwner (dpy, sel) != None)
2916 {
2917 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2918 vt, selection_request_time);
2919 return 1;
2920 }
2921
2922 return 0;
2923} 2745}
2924 2746
2925/* ------------------------------------------------------------------------- */ 2747/* ------------------------------------------------------------------------- */
2926/* 2748/*
2927 * Clear all selected text 2749 * Clear all selected text
2928 * EXT: SelectionClear 2750 * EXT: SelectionClear
2929 */ 2751 */
2930void 2752void
2931rxvt_term::selection_clear () NOTHROW 2753rxvt_term::selection_clear (bool clipboard) NOTHROW
2932{ 2754{
2755 if (!clipboard)
2756 {
2933 want_refresh = 1; 2757 want_refresh = 1;
2934 free (selection.text); 2758 free (selection.text);
2935 selection.text = NULL; 2759 selection.text = NULL;
2936 selection.len = 0; 2760 selection.len = 0;
2937 CLEAR_SELECTION (); 2761 CLEAR_SELECTION ();
2938 2762
2939 if (display->selection_owner == this) 2763 if (display->selection_owner == this)
2940 display->selection_owner = 0; 2764 display->selection_owner = 0;
2765 }
2766 else
2767 {
2768 free (selection.clip_text);
2769 selection.clip_text = NULL;
2770 selection.clip_len = 0;
2771
2772 if (display->clipboard_owner == this)
2773 display->clipboard_owner = 0;
2774 }
2941} 2775}
2942 2776
2943/* ------------------------------------------------------------------------- */ 2777/* ------------------------------------------------------------------------- */
2944/* 2778/*
2945 * Copy a selection into the cut buffer 2779 * Copy a selection into the cut buffer
2946 * EXT: button 1 or 3 release 2780 * EXT: button 1 or 3 release
2947 */ 2781 */
2948void 2782void
2949rxvt_term::selection_make (Time tm) 2783rxvt_term::selection_make (Time tm)
2950{ 2784{
2951 int i; 2785 int size;
2952 wchar_t *new_selection_text; 2786 wchar_t *new_selection_text;
2953 text_t *t; 2787 text_t *t;
2954 2788
2955 switch (selection.op) 2789 switch (selection.op)
2956 { 2790 {
… …
2972 return; /* nothing selected, go away */ 2806 return; /* nothing selected, go away */
2973 2807
2974 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2808 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2975 return; 2809 return;
2976 2810
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2811 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2812 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2979 2813
2980 int ofs = 0; 2814 int ofs = 0;
2981 int extra = 0; 2815 int extra = 0;
2982 2816
2983 int col = selection.beg.col; 2817 int col = selection.beg.col;
… …
2989 { 2823 {
2990#if !ENABLE_MINIMAL 2824#if !ENABLE_MINIMAL
2991 if (selection.rect) 2825 if (selection.rect)
2992 { 2826 {
2993 col = selection.beg.col; 2827 col = selection.beg.col;
2994 end_col = ncol + 1; 2828 end_col = selection.end.col;
2995 } 2829 }
2996 else 2830 else
2997#endif 2831#endif
2998 end_col = ROW(row).l; 2832 end_col = ROW(row).l;
2999 2833
3000 col = max (col, 0); 2834 col = max (col, 0);
3001 2835
3002 if (row == selection.end.row 2836 if (row == selection.end.row)
3003#if !ENABLE_MINIMAL
3004 || selection.rect
3005#endif
3006 )
3007 min_it (end_col, selection.end.col); 2837 min_it (end_col, selection.end.col);
3008 2838
3009 t = ROW(row).t + col; 2839 t = ROW(row).t + col;
3010 2840
3011 for (; col < end_col; col++) 2841 for (; col < end_col; col++)
… …
3019 2849
3020 extra -= (len - 1); 2850 extra -= (len - 1);
3021 2851
3022 if (extra < 0) 2852 if (extra < 0)
3023 { 2853 {
3024 extra += i; 2854 extra += size;
3025 i += i; 2855 size += size;
3026 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2856 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3027 } 2857 }
3028 2858
3029 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2859 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3030 } 2860 }
3031#endif 2861#endif
… …
3043 2873
3044 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3045 } 2875 }
3046 else 2876 else
3047#endif 2877#endif
3048 if (!ROW(row).is_longer () && row != selection.end.row) 2878 if (!ROW(row).is_longer ()
2879 && (row != selection.end.row || end_col != selection.end.col)
2880 && (row != selection.beg.row || selection.beg.col < ncol))
3049 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3050 } 2882 }
3051
3052 if (end_col != selection.end.col)
3053 new_selection_text[ofs++] = C0_LF;
3054 2883
3055 new_selection_text[ofs] = 0; 2884 new_selection_text[ofs] = 0;
3056 2885
3057 if (ofs == 0) 2886 if (ofs == 0)
3058 { 2887 {
… …
3071 2900
3072 selection_grab (tm); 2901 selection_grab (tm);
3073} 2902}
3074 2903
3075bool 2904bool
3076rxvt_term::selection_grab (Time tm) NOTHROW 2905rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077{ 2906{
2907 Atom sel;
2908
2909 if (!clipboard)
2910 {
3078 selection_time = tm; 2911 selection_time = tm;
2912 sel = XA_PRIMARY;
2913 }
2914 else
2915 {
2916 clipboard_time = tm;
2917 sel = xa[XA_CLIPBOARD];
2918 }
3079 2919
3080 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2920 XSetSelectionOwner (dpy, sel, vt, tm);
3081 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2921 if (XGetSelectionOwner (dpy, sel) == vt)
3082 { 2922 {
3083 display->set_selection_owner (this); 2923 display->set_selection_owner (this, clipboard);
3084 return true; 2924 return true;
3085 } 2925 }
3086 else 2926 else
3087 { 2927 {
3088 selection_clear (); 2928 selection_clear (clipboard);
3089 return false; 2929 return false;
3090 } 2930 }
3091 2931
3092#if 0 2932#if 0
3093 XTextProperty ct; 2933 XTextProperty ct;
… …
3103/* ------------------------------------------------------------------------- */ 2943/* ------------------------------------------------------------------------- */
3104/* 2944/*
3105 * Mark or select text based upon number of clicks: 1, 2, or 3 2945 * Mark or select text based upon number of clicks: 1, 2, or 3
3106 * EXT: button 1 press 2946 * EXT: button 1 press
3107 */ 2947 */
3108void 2948void ecb_cold
3109rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3110{ 2950{
3111 clicks = ((clicks - 1) % 3) + 1; 2951 clicks = ((clicks - 1) % 3) + 1;
3112 selection.clicks = clicks; /* save clicks so extend will work */ 2952 selection.clicks = clicks; /* save clicks so extend will work */
3113 2953
… …
3132 2972
3133/* ------------------------------------------------------------------------- */ 2973/* ------------------------------------------------------------------------- */
3134/* 2974/*
3135 * Mark a selection at the specified col/row 2975 * Mark a selection at the specified col/row
3136 */ 2976 */
3137void 2977void ecb_cold
3138rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3139{ 2979{
3140 want_refresh = 1; 2980 want_refresh = 1;
3141 2981
3142 selection.mark.row = row + view_start; 2982 selection.mark.row = row + view_start;
… …
3169/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3170#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
3171 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3172#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
3173 3013
3174void 3014void ecb_cold
3175rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3176{ 3016{
3177 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
3178 row_col_t bound; 3018 row_col_t bound;
3179 text_t *stp; 3019 text_t *stp;
… …
3253 * EXT: button 3 press; button 1 or 3 drag 3093 * EXT: button 3 press; button 1 or 3 drag
3254 * flag == 0 ==> button 1 3094 * flag == 0 ==> button 1
3255 * flag == 1 ==> button 3 press 3095 * flag == 1 ==> button 3 press
3256 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3257 */ 3097 */
3258void 3098void ecb_cold
3259rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3260{ 3100{
3261 int col = clamp (Pixel2Col (x), 0, ncol); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3262 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3263 3103
… …
3289 3129
3290/* ------------------------------------------------------------------------- */ 3130/* ------------------------------------------------------------------------- */
3291/* 3131/*
3292 * Extend the selection to the specified col/row 3132 * Extend the selection to the specified col/row
3293 */ 3133 */
3294void 3134void ecb_cold
3295rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3296{ 3136{
3297 row_col_t pos; 3137 row_col_t pos;
3298 enum { 3138 enum {
3299 LEFT, RIGHT 3139 LEFT, RIGHT
… …
3490 ::swap (selection.beg.col, selection.end.col); 3330 ::swap (selection.beg.col, selection.end.col);
3491#endif 3331#endif
3492} 3332}
3493 3333
3494#if !ENABLE_MINIMAL 3334#if !ENABLE_MINIMAL
3495void 3335void ecb_cold
3496rxvt_term::selection_remove_trailing_spaces () NOTHROW 3336rxvt_term::selection_remove_trailing_spaces () NOTHROW
3497{ 3337{
3498 int32_t end_col, end_row; 3338 int32_t end_col, end_row;
3499 text_t *stp; 3339 text_t *stp;
3500 3340
… …
3538/* ------------------------------------------------------------------------- */ 3378/* ------------------------------------------------------------------------- */
3539/* 3379/*
3540 * Double click on button 3 when already selected 3380 * Double click on button 3 when already selected
3541 * EXT: button 3 double click 3381 * EXT: button 3 double click
3542 */ 3382 */
3543void 3383void ecb_cold
3544rxvt_term::selection_rotate (int x, int y) NOTHROW 3384rxvt_term::selection_rotate (int x, int y) NOTHROW
3545{ 3385{
3546 selection.clicks = selection.clicks % 3 + 1; 3386 selection.clicks = selection.clicks % 3 + 1;
3547 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3548} 3388}
… …
3550/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3551/* 3391/*
3552 * Respond to a request for our current selection 3392 * Respond to a request for our current selection
3553 * EXT: SelectionRequest 3393 * EXT: SelectionRequest
3554 */ 3394 */
3555void 3395void ecb_cold
3556rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3557{ 3397{
3398 Atom property = rq.property == None ? rq.target : rq.property;
3558 XSelectionEvent ev; 3399 XSelectionEvent ev;
3559 3400
3560 ev.type = SelectionNotify; 3401 ev.type = SelectionNotify;
3561 ev.property = None; 3402 ev.property = None;
3562 ev.display = rq.display; 3403 ev.display = rq.display;
… …
3577 *target++ = xa[XA_COMPOUND_TEXT]; 3418 *target++ = xa[XA_COMPOUND_TEXT];
3578#if X_HAVE_UTF8_STRING 3419#if X_HAVE_UTF8_STRING
3579 *target++ = xa[XA_UTF8_STRING]; 3420 *target++ = xa[XA_UTF8_STRING];
3580#endif 3421#endif
3581 3422
3582 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3423 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3583 32, PropModeReplace, 3424 32, PropModeReplace,
3584 (unsigned char *)target_list, target - target_list); 3425 (unsigned char *)target_list, target - target_list);
3585 ev.property = rq.property; 3426 ev.property = property;
3586 } 3427 }
3587#if TODO // TODO 3428#if TODO // TODO
3588 else if (rq.target == xa[XA_MULTIPLE]) 3429 else if (rq.target == xa[XA_MULTIPLE])
3589 { 3430 {
3590 /* TODO: Handle MULTIPLE */ 3431 /* TODO: Handle MULTIPLE */
3591 } 3432 }
3592#endif 3433#endif
3593 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3434 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594 { 3435 {
3595 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3436 XChangeProperty (dpy, rq.requestor, property, rq.target,
3596 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3437 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3597 ev.property = rq.property; 3438 ev.property = property;
3439 }
3440 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3441 {
3442 XChangeProperty (dpy, rq.requestor, property, rq.target,
3443 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3444 ev.property = property;
3598 } 3445 }
3599 else if (rq.target == XA_STRING 3446 else if (rq.target == XA_STRING
3600 || rq.target == xa[XA_TEXT] 3447 || rq.target == xa[XA_TEXT]
3601 || rq.target == xa[XA_COMPOUND_TEXT] 3448 || rq.target == xa[XA_COMPOUND_TEXT]
3602 || rq.target == xa[XA_UTF8_STRING] 3449 || rq.target == xa[XA_UTF8_STRING]
… …
3634 { 3481 {
3635 target = xa[XA_COMPOUND_TEXT]; 3482 target = xa[XA_COMPOUND_TEXT];
3636 style = enc_compound_text; 3483 style = enc_compound_text;
3637 } 3484 }
3638 3485
3639 if (selection.text) 3486 if (rq.selection == XA_PRIMARY && selection.text)
3640 { 3487 {
3641 cl = selection.text; 3488 cl = selection.text;
3642 selectlen = selection.len; 3489 selectlen = selection.len;
3490 }
3491 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3492 {
3493 cl = selection.clip_text;
3494 selectlen = selection.clip_len;
3643 } 3495 }
3644 else 3496 else
3645 { 3497 {
3646 cl = L""; 3498 cl = L"";
3647 selectlen = 0; 3499 selectlen = 0;
… …
3668 ct.value = (unsigned char *)cl; 3520 ct.value = (unsigned char *)cl;
3669 ct.nitems = selectlen; 3521 ct.nitems = selectlen;
3670 ct.encoding = target; 3522 ct.encoding = target;
3671 } 3523 }
3672 3524
3673 XChangeProperty (dpy, rq.requestor, rq.property, 3525 XChangeProperty (dpy, rq.requestor, property,
3674 ct.encoding, 8, PropModeReplace, 3526 ct.encoding, 8, PropModeReplace,
3675 ct.value, (int)ct.nitems); 3527 ct.value, (int)ct.nitems);
3676 ev.property = rq.property; 3528 ev.property = property;
3677 3529
3678 if (freect) 3530 if (freect)
3679 XFree (ct.value); 3531 XFree (ct.value);
3680 } 3532 }
3681 3533
3682 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3683} 3535}
3684 3536
3685/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3686#ifdef USE_XIM 3538#if USE_XIM
3687void 3539void ecb_cold
3688rxvt_term::im_set_position (XPoint &pos) NOTHROW 3540rxvt_term::im_set_position (XPoint &pos) NOTHROW
3689{ 3541{
3690 XWindowAttributes xwa; 3542 XWindowAttributes xwa;
3691 3543
3692 XGetWindowAttributes (dpy, vt, &xwa); 3544 XGetWindowAttributes (dpy, vt, &xwa);
… …
3715 h += 2; min_it (h, nrow); 3567 h += 2; min_it (h, nrow);
3716 3568
3717 x -= 1; clamp_it (x, 0, ncol - w); 3569 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3570 y -= 1; clamp_it (y, 0, nrow - h);
3719 3571
3720 ov_x = x; ov_y = y; 3572 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3573 ov.w = w; ov.h = h;
3722 3574
3723 ov_text = new text_t *[h]; 3575 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3576 ov.rend = new rend_t *[h];
3725 3577
3726 for (y = 0; y < h; y++) 3578 for (y = 0; y < h; y++)
3727 { 3579 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3580 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3581 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3582
3731 text_t t0, t1, t2; 3583 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3584 rend_t r = OVERLAY_RSTYLE;
3733 3585
3734 if (y == 0) 3586 if (y == 0)
… …
3753} 3605}
3754 3606
3755void 3607void
3756rxvt_term::scr_overlay_off () NOTHROW 3608rxvt_term::scr_overlay_off () NOTHROW
3757{ 3609{
3758 if (!ov_text) 3610 if (!ov.text)
3759 return; 3611 return;
3760 3612
3761 want_refresh = 1; 3613 want_refresh = 1;
3762 3614
3763 for (int y = 0; y < ov_h; y++) 3615 for (int y = 0; y < ov.h; y++)
3764 { 3616 {
3765 delete [] ov_text[y]; 3617 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3618 delete [] ov.rend[y];
3767 } 3619 }
3768 3620
3769 delete [] ov_text; ov_text = 0; 3621 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3622 delete [] ov.rend; ov.rend = 0;
3771} 3623}
3772 3624
3773void 3625void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3626rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3627{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3628 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3629 return;
3778 3630
3779 x++, y++; 3631 x++, y++;
3780 3632
3781 ov_text[y][x] = text; 3633 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3634 ov.rend[y][x] = rend;
3783} 3635}
3784 3636
3785void 3637void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3638rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3639{
… …
3806} 3658}
3807 3659
3808void 3660void
3809rxvt_term::scr_swap_overlay () NOTHROW 3661rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3662{
3811 if (!ov_text) 3663 if (!ov.text)
3812 return; 3664 return;
3813 3665
3666 // hide cursor if it is within the overlay area
3667 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3668 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3669 screen.flags &= ~Screen_VisibleCursor;
3670
3814 // swap screen mem with overlay 3671 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3672 for (int y = ov.h; y--; )
3816 { 3673 {
3817 text_t *t1 = ov_text[y]; 3674 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3675 rend_t *r1 = ov.rend[y];
3819 3676
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3677 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3678 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3679
3823 for (int x = ov_w; x--; ) 3680 for (int x = ov.w; x--; )
3824 { 3681 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3682 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3683 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3684 }
3828 } 3685 }

Diff Legend

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