ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.307 by root, Fri Jun 27 00:44:32 2008 UTC vs.
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 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);
135} 153}
136 154
137/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
140 158
141void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
142rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
143{ 195{
144#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
145 scr_overlay_off (); 197 scr_overlay_off ();
146#endif 198#endif
147 199
148 rvideo_mode = false;
149 view_start = 0; 200 view_start = 0;
150 num_scr = 0; 201 num_scr = 0;
151 202
152 if (ncol == 0) 203 if (ncol == 0)
153 ncol = 80; 204 ncol = 80;
… …
155 if (nrow == 0) 206 if (nrow == 0)
156 nrow = 24; 207 nrow = 24;
157 208
158 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 210 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 211
164 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
166 { 214 {
167 //TODO//FIXME 215 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
177 225
178 screen.tscroll = 0; 226 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
180 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
181 if (!row_buf) 238 if (!prev_row_buf)
182 { 239 {
183 /* 240 /*
184 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
185 */ 242 */
186 top_row = 0; 243 top_row = 0;
187 term_start = 0; 244 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 245
203 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 263 selection.text = NULL;
221 selection.len = 0; 264 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
224 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
225 } 270 }
226 else 271 else
227 { 272 {
228 /* 273 /*
229 * add or delete rows as appropriate 274 * add or delete rows as appropriate
230 */ 275 */
231 276
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--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
250 { 278 {
251 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
252 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
253 }
254 281
255 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
256 { 286 }
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 287
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
267 291
268 if (top_row) 292 if (top_row)
269 { 293 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 295 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change
272 297
273 row_col_t ocur = screen.cur; 298 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 300
276 do 301 do
277 { 302 {
278 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 305 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 307
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 309 {
287 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
288 311
289 plines++; 312 plines++;
290 llen += prev_ncol; 313 llen += prev_ncol;
… …
303 326
304 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
306 { 329 {
307 qline = row_buf + qrow; 330 qline = row_buf + qrow;
308 lalloc (*qline); 331 qline->alloc (); // redundant with next line
309 qline->l = ncol; 332 qline->l = ncol;
310 qline->is_longer (1); 333 qline->is_longer (1);
311 334
312 int qcol = 0; 335 int qcol = 0;
313 336
… …
328 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
329 // least. 352 // least.
330 if (prow == ocur.row) 353 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
332 355
333 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
334 357
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 359
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 382 {
360 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
361 384
362 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
363 { 386 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
366 389
367 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
368 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
369 } 394 }
370 395
371 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 398
376 term_start = 0; 399 term_start = 0;
377 } 400 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 401
383 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
404 }
385 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
386 free (tabs); 415 free (tabs);
387 } 416 tabs = (char *)rxvt_malloc (ncol);
417
418 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0;
388 420
389 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
390 422
391 prev_nrow = nrow; 423 prev_nrow = nrow;
392 prev_ncol = ncol; 424 prev_ncol = ncol;
393 425
394 tabs = (char *)rxvt_malloc (ncol); 426 tt_winch ();
395 427
396 for (int col = ncol; --col; ) 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 429}
430
431void ecb_cold
432rxvt_term::scr_release () NOTHROW
433{
434 chunk_free (chunk, chunk_size);
435 chunk = 0;
436 row_buf = 0;
437
438 free (tabs);
439 tabs = 0;
440}
441
442/* ------------------------------------------------------------------------- */
443/*
444 * Hard/Soft reset
445 */
446void ecb_cold
447rxvt_term::scr_poweron ()
448{
449 scr_release ();
450
451 prev_nrow = prev_ncol = 0;
452 rvideo_mode = false;
453 scr_soft_reset ();
454 scr_reset ();
455
456 scr_clear (true);
457 scr_refresh ();
458}
459
460void ecb_cold
461rxvt_term::scr_soft_reset () NOTHROW
462{
463 /* only affects modes, nothing drastic such as clearing the screen */
464#if ENABLE_OVERLAY
465 scr_overlay_off ();
466#endif
398 467
399 if (current_screen != PRIMARY) 468 if (current_screen != PRIMARY)
400 scr_swap_screen (); 469 scr_swap_screen ();
401 470
402 tt_winch (); 471 scr_scroll_region (0, MAX_ROWS - 1);
403 472 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 473 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} 474}
442 475
443/* ------------------------------------------------------------------------- * 476/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 477 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 478 * ------------------------------------------------------------------------- */
… …
483 } 516 }
484 517
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 518 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 519 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 520 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 521 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 522 assert (s->cur.col >= 0);
491#endif
492} 523}
493 524
494void 525void
495rxvt_term::scr_swap_screen () 526rxvt_term::scr_swap_screen () NOTHROW
496{ 527{
497 if (!option (Opt_secondaryScreen)) 528 if (!option (Opt_secondaryScreen))
498 return; 529 return;
499 530
500 for (int i = prev_nrow; i--; ) 531 for (int i = prev_nrow; i--; )
… …
519 return; 550 return;
520 551
521 want_refresh = 1; 552 want_refresh = 1;
522 view_start = 0; 553 view_start = 0;
523 554
524 selection_check (2); /* check for boundary cross */ 555 /* check for boundary cross */
556 row_col_t pos;
557 pos.row = pos.col = 0;
558 if (ROWCOL_IS_BEFORE (selection.beg, pos)
559 && ROWCOL_IS_AFTER (selection.end, pos))
560 CLEAR_SELECTION ();
525 561
526 int i = current_screen; current_screen = scrn; scrn = i; 562 current_screen = scrn;
527 563
528#if NSCREENS 564#if NSCREENS
529 if (option (Opt_secondaryScreen)) 565 if (option (Opt_secondaryScreen))
530 { 566 {
531 num_scr = 0; 567 num_scr = 0;
… …
595/* 631/*
596 * Scroll text between <row1> and <row2> inclusive, by <count> lines 632 * Scroll text between <row1> and <row2> inclusive, by <count> lines
597 * count positive ==> scroll up 633 * count positive ==> scroll up
598 * count negative ==> scroll down 634 * count negative ==> scroll down
599 */ 635 */
600int 636int ecb_hot
601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 637rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
602{ 638{
603 if (count == 0 || (row1 > row2)) 639 if (count == 0 || (row1 > row2))
604 return 0; 640 return 0;
605 641
… …
608 644
609 if (count > 0 645 if (count > 0
610 && row1 == 0 646 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 647 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 648 {
649 min_it (count, total_rows - (nrow - (row2 + 1)));
650
613 top_row = max (top_row - count, -saveLines); 651 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 652
618 // sever bottommost line 653 // sever bottommost line
619 { 654 {
620 line_t &l = ROW(row2 - count); 655 line_t &l = ROW(row2);
621 l.is_longer (0); 656 l.is_longer (0);
622 l.touch (); 657 l.touch ();
623 } 658 }
624 659
660 // scroll everything up 'count' lines
661 term_start = (term_start + count) % total_rows;
662
663 // now copy lines below the scroll region bottom to the
664 // bottom of the screen again, so they look as if they
665 // hadn't moved.
666 for (int i = nrow; --i > row2; )
667 {
668 line_t &l1 = ROW(i - count);
669 line_t &l2 = ROW(i);
670
671 ::swap (l1, l2);
672 l2.touch ();
673 }
674
625 // erase newly scrolled-in lines 675 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 676 for (int i = count; i--; )
627 { 677 {
628 line_t &l = ROW(nrow - 1 - i); 678 line_t &l = ROW(row2 - i);
629 679
630 // optimize if already cleared, can be significant on slow machines 680 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 681 // 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))) 682 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 683 {
634 scr_blank_line (l, 0, l.l, rstyle); 684 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 685 l.l = 0;
… …
637 } 687 }
638 else 688 else
639 scr_blank_screen_mem (l, rstyle); 689 scr_blank_screen_mem (l, rstyle);
640 } 690 }
641 691
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 692 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 693 if (selection.op && current_screen == selection.screen
694 && selection.beg.row <= row2)
656 { 695 {
657 selection.beg.row -= count; 696 selection.beg.row -= count;
658 selection.end.row -= count; 697 selection.end.row -= count;
659 selection.mark.row -= count; 698 selection.mark.row -= count;
660 699
661 if (selection.beg.row < top_row 700 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 } 701 }
669 702
670 // finally move the view window, if desired 703 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 704 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 705 && view_start != 0
… …
702 } 735 }
703 736
704 // use a simple and robust scrolling algorithm, this 737 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 738 // part of scr_scroll_text is not time-critical.
706 739
740 // sever line above scroll region
741 if (row1)
742 {
743 line_t &l = ROW(row1 - 1);
744 l.is_longer (0);
745 l.touch ();
746 }
747
707 int rows = row2 - row1 + 1; 748 int rows = row2 - row1 + 1;
708 749
709 min_it (count, rows); 750 min_it (count, rows);
710 751
711 line_t *temp_buf = row_buf + total_rows; 752 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 753
713 for (int row = 0; row < rows; row++) 754 for (int row = 0; row < rows; row++)
714 { 755 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 756 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 757
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 759 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 760 }
720 761
721 for (int row = 0; row < rows; row++) 762 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 763 ROW(row1 + row) = temp_buf [row];
764
765 // sever bottommost line
766 {
767 line_t &l = ROW(row2);
768 l.is_longer (0);
769 l.touch ();
770 }
723 } 771 }
724 772
725 return count; 773 return count;
726} 774}
727 775
728/* ------------------------------------------------------------------------- */ 776/* ------------------------------------------------------------------------- */
729/* 777/*
730 * Add text given in <str> of length <len> to screen struct 778 * Add text given in <str> of length <len> to screen struct
731 */ 779 */
732void 780void ecb_hot
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 782{
735 if (len <= 0) /* sanity */ 783 if (len <= 0) /* sanity */
736 return; 784 return;
737 785
738 unsigned char checksel; 786 bool checksel;
739 unicode_t c; 787 unicode_t c;
740 int ncol = this->ncol; 788 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 789 const wchar_t *strend = str + len;
742 790
743 want_refresh = 1; 791 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 804 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 805 screen.cur.row -= minlines;
758 } 806 }
759 } 807 }
760 808
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 809 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 810 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 811 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 812 int row = screen.cur.row;
767 813
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 814 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 815
770 line_t *line = &ROW(row); 816 line_t *line = &ROW(row);
771 817
772 while (str < strend) 818 while (str < strend)
773 { 819 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 821
776 if (c < 0x20) 822 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 823 if (c == C0_LF)
778 { 824 {
779 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
780 826
781 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
800 { 846 {
801 scr_tab (1, true); 847 scr_tab (1, true);
802 continue; 848 continue;
803 } 849 }
804 850
851 if (ecb_unlikely (
805 if (checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
806 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
855 ))
808 { 856 {
809 checksel = 0; 857 checksel = 0;
810 /* 858 /*
811 * If we wrote anywhere in the selected area, kill the selection 859 * If we wrote anywhere in the selected area, kill the selection
812 * XXX: should we kill the mark too? Possibly, but maybe that 860 * XXX: should we kill the mark too? Possibly, but maybe that
813 * should be a similar check. 861 * should be a similar check.
814 */ 862 */
815 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
816 } 864 }
817 865
818 if (screen.flags & Screen_WrapNext) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
819 { 867 {
820 scr_do_wrap (); 868 scr_do_wrap ();
821 869
822 line->l = ncol; 870 line->l = ncol;
823 line->is_longer (1); 871 line->is_longer (1);
… …
825 row = screen.cur.row; 873 row = screen.cur.row;
826 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
827 } 875 }
828 876
829 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
830 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831 c = 0xfffd; 879 c = 0xfffd;
832 880
833 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
834 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
835 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
836 // locale. 884 // locale.
837 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
838 886
839 if (charsets [screen.charset] == '0') // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
840 { 888 {
841 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
842 // 5f-7e standard vt100 890 // 5f-7e standard vt100
843 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
844 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
858 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
859 } 907 }
860 } 908 }
861 909
862 if (screen.flags & Screen_Insert) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
863 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
864 912
865 if (width != 0) 913 if (width != 0)
866 { 914 {
867#if !UNICODE_3 915#if !UNICODE_3
… …
872# else 920# else
873 c = 0xfffd; 921 c = 0xfffd;
874# endif 922# endif
875#endif 923#endif
876 924
925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
926
927 // if the character doesn't fit into the remaining columns...
928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
929 {
930 if (screen.flags & Screen_Autowrap)
931 {
932 // ... artificially enlargen the previous one
933 c = NOCHAR;
934 // and try the same character next loop iteration
935 --str;
936 }
937 else
938 screen.cur.col = ncol - width;
939 }
940
877 // nuke the character at this position, if required 941 // nuke the character at this position, if required
942 // due to wonderful coincidences everywhere else in this loop
943 // we never have to check for overwriting a wide char itself,
944 // only its tail.
878 if (line->t[screen.cur.col] == NOCHAR 945 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
879 || (screen.cur.col < ncol - 1 946 scr_kill_char (*line, screen.cur.col);
880 && line->t[screen.cur.col + 1] == NOCHAR))
881 {
882 int col = screen.cur.col;
883
884 // find begin
885 while (col > 0 && line->t[col] == NOCHAR)
886 col--;
887
888 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
889
890 // found begin, nuke
891 do {
892 line->t[col] = ' ';
893 line->r[col] = rend;
894 col++;
895 } while (col < ncol && line->t[col] == NOCHAR);
896 }
897
898 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899
900 // if the character doesn't fit into the remaining columns...
901 if (screen.cur.col > ncol - width && ncol >= width)
902 {
903 // ...output spaces
904 c = ' ';
905 // and try the same character next loop iteration
906 --str;
907 }
908 947
909 line->touch (); 948 line->touch ();
910 949
911 do 950 do
912 { 951 {
913 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
914 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
915 954
916 if (screen.cur.col < ncol - 1) 955 if (ecb_likely (screen.cur.col < ncol - 1))
917 screen.cur.col++; 956 screen.cur.col++;
918 else 957 else
919 { 958 {
920 line->l = ncol; 959 line->l = ncol;
921 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
922 screen.flags |= Screen_WrapNext; 961 screen.flags |= Screen_WrapNext;
923 break; 962
963 goto end_of_line;
924 } 964 }
925 965
926 c = NOCHAR; 966 c = NOCHAR;
927 } 967 }
928 while (--width > 0); 968 while (ecb_unlikely (--width > 0));
929 969
930 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
931 if (!width) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
932 { 972 {
933 line->touch (); 973 line->t[c] = ' ';
974 line->r[c] = rend;
975 }
934 976
935 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 977end_of_line:
978 ;
979 }
980#if ENABLE_COMBINING
981 else // width == 0
982 {
983 if (c != 0xfeff) // ignore BOM
984 {
985 // handle combining characters
986 // we just tag the accent on the previous on-screen character.
987 // this is arguably not correct, but also arguably not wrong.
988 // we don't handle double-width characters nicely yet.
989 line_t *linep;
990 text_t *tp;
991 rend_t *rp;
992
993 if (screen.cur.col > 0)
936 { 994 {
937 line->t[c] = ' ';
938 line->r[c] = rend; 995 linep = line;
996 tp = line->t + screen.cur.col - 1;
997 rp = line->r + screen.cur.col - 1;
939 } 998 }
999 else if (screen.cur.row > 0
1000 && ROW(screen.cur.row - 1).is_longer ())
1001 {
1002 linep = &ROW(screen.cur.row - 1);
1003 tp = line->t + ncol - 1;
1004 rp = line->r + ncol - 1;
1005 }
1006 else
1007 continue;
1008
1009 linep->touch ();
1010
1011 while (*tp == NOCHAR && tp > linep->t)
1012 tp--, rp--;
1013
1014 // first try to find a precomposed character
1015 unicode_t n = rxvt_compose (*tp, c);
1016 if (n == NOCHAR)
1017 n = rxvt_composite.compose (*tp, c);
1018
1019 *tp = n;
1020 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
940 } 1021 }
941 } 1022 }
942 else // width == 0
943 {
944#if ENABLE_COMBINING
945 // handle combining characters
946 // we just tag the accent on the previous on-screen character.
947 // this is arguably not correct, but also arguably not wrong.
948 // we don't handle double-width characters nicely yet.
949 line_t *linep;
950 text_t *tp;
951 rend_t *rp;
952
953 if (screen.cur.col > 0)
954 {
955 linep = line;
956 tp = line->t + screen.cur.col - 1;
957 rp = line->r + screen.cur.col - 1;
958 }
959 else if (screen.cur.row > 0
960 && ROW(screen.cur.row - 1).is_longer ())
961 {
962 linep = &ROW(screen.cur.row - 1);
963 tp = line->t + ncol - 1;
964 rp = line->r + ncol - 1;
965 }
966 else
967 continue;
968
969 linep->touch ();
970
971 while (*tp == NOCHAR && tp > linep->t)
972 tp--, rp--;
973
974 // first try to find a precomposed character
975 unicode_t n = rxvt_compose (*tp, c);
976 if (n == NOCHAR)
977 n = rxvt_composite.compose (*tp, c);
978
979 *tp = n;
980 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
981#endif 1023#endif
982 }
983 } 1024 }
984 1025
985 max_it (line->l, screen.cur.col); 1026 max_it (line->l, screen.cur.col);
986 1027
987#ifdef DEBUG_STRICT
988 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
989#endif
990} 1029}
991 1030
992/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
993/* 1032/*
994 * Process Backspace. Move back the cursor back a position, wrap if have to 1033 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1007 1046
1008 want_refresh = 1; 1047 want_refresh = 1;
1009#endif 1048#endif
1010 } 1049 }
1011 } 1050 }
1051 else if (screen.flags & Screen_WrapNext)
1052 screen.flags &= ~Screen_WrapNext;
1012 else 1053 else
1013 scr_gotorc (0, -1, RELATIVE); 1054 scr_gotorc (0, -1, RELATIVE);
1014} 1055}
1015 1056
1016/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1094 * XTERM_SEQ: ESC 6 1135 * XTERM_SEQ: ESC 6
1095 * Move cursor left in row. If we're at the left boundary, shift everything 1136 * Move cursor left in row. If we're at the left boundary, shift everything
1096 * in that row right. Clear left column. 1137 * in that row right. Clear left column.
1097 */ 1138 */
1098#if !ENABLE_MINIMAL 1139#if !ENABLE_MINIMAL
1099void 1140void ecb_cold
1100rxvt_term::scr_backindex () NOTHROW 1141rxvt_term::scr_backindex () NOTHROW
1101{ 1142{
1102 if (screen.cur.col > 0) 1143 if (screen.cur.col > 0)
1103 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1104 else 1145 else
… …
1111 * XTERM_SEQ: ESC 9 1152 * XTERM_SEQ: ESC 9
1112 * Move cursor right in row. If we're at the right boundary, shift everything 1153 * Move cursor right in row. If we're at the right boundary, shift everything
1113 * in that row left. Clear right column. 1154 * in that row left. Clear right column.
1114 */ 1155 */
1115#if !ENABLE_MINIMAL 1156#if !ENABLE_MINIMAL
1116void 1157void ecb_cold
1117rxvt_term::scr_forwardindex () NOTHROW 1158rxvt_term::scr_forwardindex () NOTHROW
1118{ 1159{
1119 if (screen.cur.col < ncol - 1) 1160 if (screen.cur.col < ncol - 1)
1120 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1121 else 1162 else
… …
1272 scr_blank_line (line, col, num, rstyle); 1313 scr_blank_line (line, col, num, rstyle);
1273} 1314}
1274 1315
1275/* ------------------------------------------------------------------------- */ 1316/* ------------------------------------------------------------------------- */
1276/* 1317/*
1277 * Erase part of whole of the screen 1318 * Erase part or whole of the screen
1278 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1279 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1280 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1281 */ 1322 */
1282void 1323void
… …
1291 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1292 1333
1293 switch (mode) 1334 switch (mode)
1294 { 1335 {
1295 case 0: /* erase to end of screen */ 1336 case 0: /* erase to end of screen */
1296 selection_check (1);
1297 scr_erase_line (0); 1337 scr_erase_line (0);
1298 row = screen.cur.row + 1; /* possible OOB */ 1338 row = screen.cur.row + 1; /* possible OOB */
1299 num = nrow - row; 1339 num = nrow - row;
1300 break; 1340 break;
1301 case 1: /* erase to beginning of screen */ 1341 case 1: /* erase to beginning of screen */
1302 selection_check (3);
1303 scr_erase_line (1); 1342 scr_erase_line (1);
1304 row = 0; 1343 row = 0;
1305 num = screen.cur.row; 1344 num = screen.cur.row;
1306 break; 1345 break;
1307 case 2: /* erase whole screen */ 1346 case 2: /* erase whole screen */
1308 selection_check (3);
1309 row = 0; 1347 row = 0;
1310 num = nrow; 1348 num = nrow;
1311 break; 1349 break;
1312 default: 1350 default:
1313 return; 1351 return;
… …
1322 if (row >= nrow) /* Out Of Bounds */ 1360 if (row >= nrow) /* Out Of Bounds */
1323 return; 1361 return;
1324 1362
1325 min_it (num, nrow - row); 1363 min_it (num, nrow - row);
1326 1364
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1328 if (rstyle & (RS_RVid | RS_Uline)) 1365 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1329 ren = (rend_t) ~RS_None; 1366 ren = (rend_t) ~RS_None;
1330 else if (GET_BASEBG (rstyle) == Color_bg) 1367 else if (GET_BASEBG (rstyle) == Color_bg)
1331 { 1368 {
1332 ren = DEFAULT_RSTYLE; 1369 ren = DEFAULT_RSTYLE;
1333 1370
1334 if (mapped) 1371 if (mapped)
1335 XClearArea (dpy, vt, 0, 1372 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width, 1373 Row2Pixel (row - view_start), (unsigned int)vt_width,
1337 (unsigned int)Height2Pixel (num), False); 1374 (unsigned int)Height2Pixel (num), False);
1338 } 1375 }
1339 else 1376 else
1340 { 1377 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1378 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 1379
1380 if (mapped)
1381 {
1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1382 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1383 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1345 XFillRectangle (dpy, vt, gc, 1384 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row), 1385 0, Row2Pixel (row - view_start),
1347 (unsigned int)width, 1386 (unsigned int)vt_width,
1348 (unsigned int)Height2Pixel (num)); 1387 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1390 }
1351 } 1391 }
1352 1392
1353 for (; num--; row++) 1393 for (; num--; row++)
1354 { 1394 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1395 scr_blank_screen_mem (ROW(row), rstyle);
1396
1397 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1398 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1399 }
1358} 1400}
1359 1401
1360#if !ENABLE_MINIMAL 1402#if !ENABLE_MINIMAL
1361void 1403void
… …
1371/* ------------------------------------------------------------------------- */ 1413/* ------------------------------------------------------------------------- */
1372/* 1414/*
1373 * Fill the screen with `E's 1415 * Fill the screen with `E's
1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1416 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1375 */ 1417 */
1376void 1418void ecb_cold
1377rxvt_term::scr_E () NOTHROW 1419rxvt_term::scr_E () NOTHROW
1378{ 1420{
1379 rend_t fs; 1421 rend_t fs;
1380 1422
1381 want_refresh = 1; 1423 want_refresh = 1;
1382 ZERO_SCROLLBACK (); 1424 ZERO_SCROLLBACK ();
1383 1425
1384 num_scr_allow = 0; 1426 num_scr_allow = 0;
1385 selection_check (3); 1427
1428 row_col_t pos;
1429 pos.row = pos.col = 0;
1430 if (ROWCOL_IS_AFTER (selection.end, pos))
1431 CLEAR_SELECTION ();
1386 1432
1387 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1433 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1388 for (int row = nrow; row--; ) 1434 for (int row = nrow; row--; )
1389 { 1435 {
1390 line_t &line = ROW(row); 1436 line_t &line = ROW(row);
… …
1435 * Insert/Delete <count> characters from the current position 1481 * Insert/Delete <count> characters from the current position
1436 */ 1482 */
1437void 1483void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1484rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1485{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1486 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1487 ZERO_SCROLLBACK ();
1445 1488
1446 if (count <= 0) 1489 if (count <= 0)
1447 return; 1490 return;
… …
1449 scr_do_wrap (); 1492 scr_do_wrap ();
1450 1493
1451 selection_check (1); 1494 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1495 min_it (count, ncol - screen.cur.col);
1453 1496
1454 row = screen.cur.row; 1497 int row = screen.cur.row;
1455 1498
1456 line_t *line = &ROW(row); 1499 line_t *line = &ROW(row);
1457 1500
1458 line->touch (); 1501 line->touch ();
1459 line->is_longer (0); 1502 line->is_longer (0);
1460 1503
1504 // nuke wide spanning the start
1505 if (line->t[screen.cur.col] == NOCHAR)
1506 scr_kill_char (*line, screen.cur.col);
1507
1461 switch (insdel) 1508 switch (insdel)
1462 { 1509 {
1463 case INSERT: 1510 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1511 line->l = min (line->l + count, ncol);
1512
1513 if (line->t[screen.cur.col] == NOCHAR)
1514 scr_kill_char (*line, screen.cur.col);
1515
1516 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1517 {
1466 line->t[col] = line->t[col - count]; 1518 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1519 line->r[col] = line->r[col - count];
1468 } 1520 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1521
1472 if (selection.op && current_screen == selection.screen 1522 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1523 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1524 {
1475 if (selection.end.row != screen.cur.row 1525 if (selection.end.row != screen.cur.row
… …
1490 case ERASE: 1540 case ERASE:
1491 screen.cur.col += count; /* don't worry if > ncol */ 1541 screen.cur.col += count; /* don't worry if > ncol */
1492 selection_check (1); 1542 selection_check (1);
1493 screen.cur.col -= count; 1543 screen.cur.col -= count;
1494 1544
1495 line->l = max (line->l - count, 0); 1545 // nuke wide char after the end
1546 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1547 scr_kill_char (*line, screen.cur.col + count);
1548
1496 scr_blank_line (*line, screen.cur.col, count, rstyle); 1549 scr_blank_line (*line, screen.cur.col, count, rstyle);
1497 break; 1550 break;
1498 1551
1499 case DELETE: 1552 case DELETE:
1500 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1553 line->l = max (line->l - count, 0);
1501 1554
1555 // nuke wide char spanning the end
1556 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1557 scr_kill_char (*line, screen.cur.col + count);
1558
1502 for (col = screen.cur.col; (col + count) < ncol; col++) 1559 for (int col = screen.cur.col; (col + count) < ncol; col++)
1503 { 1560 {
1504 line->t[col] = line->t[col + count]; 1561 line->t[col] = line->t[col + count];
1505 line->r[col] = line->r[col + count]; 1562 line->r[col] = line->r[col + count];
1506 } 1563 }
1507 1564
1508 line->l = max (line->l - count, 0);
1509 scr_blank_line (*line, ncol - count, count, tr); 1565 scr_blank_line (*line, ncol - count, count, rstyle);
1510 1566
1511 if (selection.op && current_screen == selection.screen 1567 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1568 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1569 {
1514 if (selection.end.row != screen.cur.row 1570 if (selection.end.row != screen.cur.row
… …
1531/* ------------------------------------------------------------------------- */ 1587/* ------------------------------------------------------------------------- */
1532/* 1588/*
1533 * Set the scrolling region 1589 * Set the scrolling region
1534 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1590 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1535 */ 1591 */
1536void 1592void ecb_cold
1537rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1593rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1538{ 1594{
1539 max_it (top, 0); 1595 max_it (top, 0);
1540 min_it (bot, nrow - 1); 1596 min_it (bot, nrow - 1);
1541 1597
… …
1551/* 1607/*
1552 * Make the cursor visible/invisible 1608 * Make the cursor visible/invisible
1553 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1609 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1554 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1610 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1555 */ 1611 */
1556void 1612void ecb_cold
1557rxvt_term::scr_cursor_visible (int mode) NOTHROW 1613rxvt_term::scr_cursor_visible (int mode) NOTHROW
1558{ 1614{
1559 want_refresh = 1; 1615 want_refresh = 1;
1560 1616
1561 if (mode) 1617 if (mode)
… …
1568/* 1624/*
1569 * Set/unset automatic wrapping 1625 * Set/unset automatic wrapping
1570 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1626 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1571 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1627 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1572 */ 1628 */
1573void 1629void ecb_cold
1574rxvt_term::scr_autowrap (int mode) NOTHROW 1630rxvt_term::scr_autowrap (int mode) NOTHROW
1575{ 1631{
1576 if (mode) 1632 if (mode)
1577 screen.flags |= Screen_Autowrap; 1633 screen.flags |= Screen_Autowrap;
1578 else 1634 else
… …
1587 * Relative mode: line numbers are relative to top margin of scrolling region 1643 * Relative mode: line numbers are relative to top margin of scrolling region
1588 * and the cursor cannot be moved outside. 1644 * and the cursor cannot be moved outside.
1589 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1645 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1590 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1646 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1591 */ 1647 */
1592void 1648void ecb_cold
1593rxvt_term::scr_relative_origin (int mode) NOTHROW 1649rxvt_term::scr_relative_origin (int mode) NOTHROW
1594{ 1650{
1595 if (mode) 1651 if (mode)
1596 screen.flags |= Screen_Relative; 1652 screen.flags |= Screen_Relative;
1597 else 1653 else
… …
1604/* 1660/*
1605 * Set insert/replace mode 1661 * Set insert/replace mode
1606 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1662 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1607 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1663 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1608 */ 1664 */
1609void 1665void ecb_cold
1610rxvt_term::scr_insert_mode (int mode) NOTHROW 1666rxvt_term::scr_insert_mode (int mode) NOTHROW
1611{ 1667{
1612 if (mode) 1668 if (mode)
1613 screen.flags |= Screen_Insert; 1669 screen.flags |= Screen_Insert;
1614 else 1670 else
… …
1620 * Set/Unset tabs 1676 * Set/Unset tabs
1621 * XTERM_SEQ: Set tab at current column : ESC H 1677 * XTERM_SEQ: Set tab at current column : ESC H
1622 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1678 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1623 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1679 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1624 */ 1680 */
1625void 1681void ecb_cold
1626rxvt_term::scr_set_tab (int mode) NOTHROW 1682rxvt_term::scr_set_tab (int mode) NOTHROW
1627{ 1683{
1628 if (mode < 0) 1684 if (mode < 0)
1629 memset (tabs, 0, ncol); 1685 memset (tabs, 0, ncol);
1630 else if (screen.cur.col < ncol) 1686 else if (screen.cur.col < ncol)
… …
1650 { 1706 {
1651 rvideo_state = on; 1707 rvideo_state = on;
1652 1708
1653 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1654#ifdef HAVE_BG_PIXMAP 1710#ifdef HAVE_BG_PIXMAP
1655 if (bgPixmap.pixmap == None) 1711 if (bg_img == 0)
1656#endif 1712#endif
1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658 1714
1659 XGCValues gcvalue; 1715 XGCValues gcvalue;
1660 gcvalue.foreground = pix_colors[Color_fg]; 1716 gcvalue.foreground = pix_colors[Color_fg];
… …
1669/* ------------------------------------------------------------------------- */ 1725/* ------------------------------------------------------------------------- */
1670/* 1726/*
1671 * Report current cursor position 1727 * Report current cursor position
1672 * XTERM_SEQ: Report position: ESC [ 6 n 1728 * XTERM_SEQ: Report position: ESC [ 6 n
1673 */ 1729 */
1674void 1730void ecb_cold
1675rxvt_term::scr_report_position () NOTHROW 1731rxvt_term::scr_report_position () NOTHROW
1676{ 1732{
1677 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1733 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1678} 1734}
1679 1735
… …
1682 * ------------------------------------------------------------------------- */ 1738 * ------------------------------------------------------------------------- */
1683 1739
1684/* 1740/*
1685 * Set font style 1741 * Set font style
1686 */ 1742 */
1687void 1743void ecb_cold
1688rxvt_term::set_font_style () NOTHROW 1744rxvt_term::set_font_style () NOTHROW
1689{ 1745{
1690#if 0 1746#if 0
1691 switch (charsets [screen.charset]) 1747 switch (charsets [screen.charset])
1692 { 1748 {
… …
1714 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1770 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1715 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1771 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1716 * XTERM_SEQ: Invoke G2 character set: ESC N 1772 * XTERM_SEQ: Invoke G2 character set: ESC N
1717 * XTERM_SEQ: Invoke G3 character set: ESC O 1773 * XTERM_SEQ: Invoke G3 character set: ESC O
1718 */ 1774 */
1719void 1775void ecb_cold
1720rxvt_term::scr_charset_choose (int set) NOTHROW 1776rxvt_term::scr_charset_choose (int set) NOTHROW
1721{ 1777{
1722 screen.charset = set; 1778 screen.charset = set;
1723 set_font_style (); 1779 set_font_style ();
1724} 1780}
… …
1745 * ------------------------------------------------------------------------- */ 1801 * ------------------------------------------------------------------------- */
1746 1802
1747/* 1803/*
1748 * refresh matching text. 1804 * refresh matching text.
1749 */ 1805 */
1750bool 1806bool ecb_cold
1751rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1807rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1752{ 1808{
1753 bool found = false; 1809 bool found = false;
1754 1810
1755 for (int i = 0; i < nrow; i++) 1811 for (int i = 0; i < nrow; i++)
… …
1774 PART_BEG = 0, 1830 PART_BEG = 0,
1775 PART_END, 1831 PART_END,
1776 RC_COUNT 1832 RC_COUNT
1777}; 1833};
1778 1834
1779void 1835void ecb_hot
1780rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1836rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1781{ 1837{
1782 int i; 1838 int i;
1783 row_col_t rc[RC_COUNT]; 1839 row_col_t rc[RC_COUNT];
1784 1840
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1860 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1861 {
1806 min_it (rc[i].col, ncol - 1); 1862 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1863 min_it (rc[i].row, nrow - 1);
1808 } 1864 }
1809// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1865
1810 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1866 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1811 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1867 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1812 1868
1813 num_scr_allow = 0; 1869 num_scr_allow = 0;
1814 1870
… …
1821 * Refresh the entire screen 1877 * Refresh the entire screen
1822 */ 1878 */
1823void 1879void
1824rxvt_term::scr_touch (bool refresh) NOTHROW 1880rxvt_term::scr_touch (bool refresh) NOTHROW
1825{ 1881{
1826 scr_expose (0, 0, width, height, refresh); 1882 scr_expose (0, 0, vt_width, vt_height, refresh);
1827} 1883}
1828 1884
1829/* ------------------------------------------------------------------------- */ 1885/* ------------------------------------------------------------------------- */
1830/* 1886/*
1831 * Move the display so that the line represented by scrollbar value Y is at 1887 * Move the display so that the line represented by scrollbar value Y is at
… …
1887 1943
1888# ifndef NO_MAPALERT 1944# ifndef NO_MAPALERT
1889# ifdef MAPALERT_OPTION 1945# ifdef MAPALERT_OPTION
1890 if (option (Opt_mapAlert)) 1946 if (option (Opt_mapAlert))
1891# endif 1947# endif
1892 XMapWindow (dpy, parent[0]); 1948 XMapWindow (dpy, parent);
1893# endif 1949# endif
1894 1950
1895# if ENABLE_FRILLS 1951# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1952 if (option (Opt_urgentOnBell))
1897 { 1953 set_urgency (1);
1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 {
1900 h->flags |= XUrgencyHint;
1901 XSetWMHints (dpy, parent[0], h);
1902 }
1903 }
1904# endif 1954# endif
1905 1955
1906 if (option (Opt_visualBell)) 1956 if (option (Opt_visualBell))
1907 { 1957 {
1908 rvideo_bell = true; 1958 rvideo_bell = true;
… …
1911 1961
1912 bell_ev.start (VISUAL_BELL_DURATION); 1962 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1963 }
1914 else 1964 else
1915 XBell (dpy, 0); 1965 XBell (dpy, 0);
1966 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1967#endif
1917} 1968}
1918 1969
1919/* ------------------------------------------------------------------------- */ 1970/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1971void ecb_cold
1921void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1972rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1973{
1924#ifdef PRINTPIPE 1974#ifdef PRINTPIPE
1925 int nrows, row_start; 1975 int nrows, row_start;
1926 FILE *fd; 1976 FILE *fd = popen_printer ();
1927 1977
1928 if ((fd = popen_printer ()) == NULL) 1978 if (!fd)
1929 return; 1979 return;
1930 1980
1931 if (fullhist) 1981 if (fullhist)
1932 { 1982 {
1933 nrows = nrow - top_row; 1983 nrows = nrow - top_row;
… …
1939 row_start = view_start; 1989 row_start = view_start;
1940 } 1990 }
1941 1991
1942 wctomb (0, 0); 1992 wctomb (0, 0);
1943 1993
1944 for (int r1 = 0; r1 < nrows; r1++) 1994 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1995 {
1946 text_t *tp = ROW(r1).t; 1996 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 1997 int len = ROW(r1).l;
1948 1998
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1999 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1975/* 2025/*
1976 * Refresh the screen 2026 * Refresh the screen
1977 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
1978 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2029 */
1980void 2030void ecb_hot
1981rxvt_term::scr_refresh () NOTHROW 2031rxvt_term::scr_refresh () NOTHROW
1982{ 2032{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2035 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2048 /*
2001 * A: set up vars 2049 * A: set up vars
2002 */ 2050 */
2003 refresh_count = 0; 2051 refresh_count = 0;
2004 2052
2053 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2054 bool have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2055#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2056 have_bg = bg_img != 0;
2008#endif 2057#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2059
2011 /* 2060 /*
2012 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
2013 */ 2062 */
2014 scr_reverse_selection (); 2063 scr_reverse_selection ();
2015 2064
2065 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2066#if ENABLE_OVERLAY
2067 scr_swap_overlay ();
2068#endif
2069
2070 bool showcursor = screen.flags & Screen_VisibleCursor;
2071
2016 /* 2072 /*
2017 * C: set the cursor character (s) 2073 * C: set the cursor character (s)
2018 */ 2074 */
2019 { 2075 {
2020 unsigned char setoldcursor; 2076 bool setoldcursor;
2021 2077
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2078#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2079 if (hidden_cursor)
2025 showcursor = 0; 2080 showcursor = 0;
2026#endif 2081#endif
2027 2082
… …
2055 ccol2 = bgcolor_of (rstyle); 2110 ccol2 = bgcolor_of (rstyle);
2056#else 2111#else
2057 ccol2 = Color_bg; 2112 ccol2 = Color_bg;
2058#endif 2113#endif
2059 2114
2060 if (showcursor && focus) 2115 if (focus)
2061 { 2116 {
2062 if (option (Opt_cursorUnderline)) 2117 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2118 *crp ^= RS_Uline;
2064 else 2119 else
2065 { 2120 {
… …
2100 oldcursor.col = screen.cur.col; 2155 oldcursor.col = screen.cur.col;
2101 } 2156 }
2102 } 2157 }
2103 } 2158 }
2104 2159
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2160#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2161 /*
2112 * D: CopyArea pass - very useful for slower links 2162 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2163 * This has been deliberately kept simple.
2114 */ 2164 */
… …
2118 { 2168 {
2119 int16_t nits; 2169 int16_t nits;
2120 int i = num_scr; 2170 int i = num_scr;
2121 int j; 2171 int j;
2122 int len, wlen; 2172 int len, wlen;
2123 dLocal (int, num_scr);
2124 2173
2125 j = nrow; 2174 j = nrow;
2126 wlen = len = -1; 2175 wlen = len = -1;
2127 row = i > 0 ? 0 : j - 1; 2176 row = i > 0 ? 0 : j - 1;
2128 2177
… …
2203 continue; 2252 continue;
2204 2253
2205 // redraw one or more characters 2254 // redraw one or more characters
2206 2255
2207 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2208 while (stp[col] == NOCHAR && col > 0) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2209 --col; 2258 --col;
2210 2259
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2261 text_t *text = stp + col;
2213 int count = 1; 2262 int count = 1;
2214 2263
2215 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2216 drp[col] = rend; 2265 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2221 { 2270 {
2222 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2223 { 2272 {
2224 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2225 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2226 count++; 2276 count++;
2227 i++; 2277 i++;
2228 2278
2229 continue; 2279 continue;
2230 } 2280 }
… …
2250 2300
2251 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2253 2303
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (i && text[count] == NOCHAR) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2256 count++, i--; 2306 count++, i--;
2257 2307
2258 /* 2308 /*
2259 * Determine the attributes for the string 2309 * Determine the attributes for the string
2260 */ 2310 */
2261 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2263 2313
2264 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2265 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2316 {
2267 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2268 2318
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2339
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2341 fore = Color_UL;
2292#endif 2342#endif
2293 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2294 if (invert) 2364 if (invert)
2295 { 2365 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2366 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2367
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2369 if (fore == back)
2314 { 2370 {
2315 fore = Color_bg; 2371 fore = Color_bg;
2316 back = Color_fg; 2372 back = Color_fg;
2317 } 2373 }
… …
2353 /* 2409 /*
2354 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2355 */ 2411 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2413
2358 if (have_bg && back == Color_bg) 2414 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2415 {
2360 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2361 2417
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2370 did_clear: ; 2426 did_clear: ;
2371 } 2427 }
2372 else 2428 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2430
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2432 {
2377#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2436 else
… …
2385 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2443 }
2388 } /* for (col....) */ 2444 } /* for (col....) */
2389 } /* for (row....) */ 2445 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2446
2396 /* 2447 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2449 */
2399 if (showcursor) 2450 if (showcursor)
… …
2431 2482
2432 XDrawRectangle (dpy, vt, gc, 2483 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2484 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - 1));
2437 } 2488 }
2438 } 2489 }
2439 2490
2440 /* 2491 /*
2441 * H: cleanup selection 2492 * H: cleanup selection
2442 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2443 scr_reverse_selection (); 2499 scr_reverse_selection ();
2444 2500
2501 screen.flags = old_screen_flags;
2445 num_scr = 0; 2502 num_scr = 0;
2446 num_scr_allow = 1; 2503 num_scr_allow = 1;
2447} 2504}
2448 2505
2449void 2506void ecb_cold
2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2451{ 2508{
2452 if (!l.t) 2509 if (!l.valid ())
2453 return; 2510 return;
2454 2511
2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2456 2513
2457 for (int i = ncol; i--; ) 2514 for (int i = ncol; i--; )
2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2459} 2516}
2460 2517
2461void 2518void ecb_cold
2462rxvt_term::scr_remap_chars () NOTHROW 2519rxvt_term::scr_remap_chars () NOTHROW
2463{ 2520{
2464 for (int i = total_rows; i--; ) 2521 for (int i = total_rows; i--; )
2465 scr_remap_chars (row_buf [i]); 2522 scr_remap_chars (row_buf [i]);
2466 2523
… …
2469 scr_remap_chars (drawn_buf [i]); 2526 scr_remap_chars (drawn_buf [i]);
2470 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2471 } 2528 }
2472} 2529}
2473 2530
2474void 2531void ecb_cold
2475rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2533{
2534 bool transparent = false;
2535
2477#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2537 if (bg_img != 0)
2479#else 2538 {
2539# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2480 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 }
2553 }
2554 else
2555#endif
2556 {
2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2482 XClearWindow (dpy, parent[0]);
2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2560
2561 XClearWindow (dpy, parent);
2484 2562
2485 if (scrollBar.win) 2563 if (scrollBar.win)
2486 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = SB_STATE_IDLE;
2489 scrollBar.show (0); 2570 scrollBar.show (0);
2490 } 2571 }
2491 2572
2492#endif 2573 if (refresh)
2493 2574 {
2494 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2575 scr_clear ();
2496 scr_touch (true); 2576 scr_touch (true);
2577 }
2497 want_refresh = 1; 2578 want_refresh = 1;
2498} 2579}
2499 2580
2500/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2501void 2582void
… …
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2639 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle; 2640 srp[col] ^= rstyle;
2560} 2641}
2561 2642
2562/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2563void 2644void ecb_hot
2564rxvt_term::scr_reverse_selection () NOTHROW 2645rxvt_term::scr_reverse_selection () NOTHROW
2565{ 2646{
2566 if (selection.op 2647 if (selection.op
2567 && current_screen == selection.screen 2648 && current_screen == selection.screen
2568 && selection.end.row >= view_start) 2649 && selection.end.row >= view_start)
2569 { 2650 {
2570#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2571 if (selection.rect) 2652 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2656 else
2576#endif 2657#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2579 RS_RVid); 2660 RS_Sel | RS_RVid);
2580 } 2661 }
2581} 2662}
2582 2663
2583/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2584/* 2665/*
… …
2587 */ 2668 */
2588#if 0 2669#if 0
2589void 2670void
2590rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2672{
2592 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2594 char r1[] = "\n";
2595
2596 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++)
2598 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2604 towrite);
2605 if (wrote < 0)
2606 return; /* XXX: death, no report */
2607 }
2608 if (row_buf[row].l >= 0)
2609 if (write (fd, r1, 1) <= 0)
2610 return; /* XXX: death, no report */
2611 }
2612} 2675}
2613#endif 2676#endif
2614 2677
2615/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2618void 2681void
2619rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2683{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2684 if (!selection.op)
2624 return; 2685 return;
2625 2686
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2690 || (check_more == 1
2631 && current_screen == selection.screen 2691 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2634 || (check_more == 2
2635 && ROWCOL_IS_BEFORE (selection.beg, pos)
2636 && ROWCOL_IS_AFTER (selection.end, pos))
2637 || (check_more == 3
2638 && ROWCOL_IS_AFTER (selection.end, pos))
2639 || (check_more == 4 /* screen width change */
2640 && (selection.beg.row != selection.end.row
2641 || selection.end.col > ncol)))
2642 CLEAR_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2643} 2695}
2644 2696
2645/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2646/* 2698/*
2647 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
2648 */ 2700 */
2649void 2701void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2703{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2704 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2707 data[i] = C0_CR;
2656 2708
2657 if (priv_modes & PrivMode_BracketPaste) 2709 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~"); 2710 tt_printf ("\x1b[200~");
2659 2711
2660 tt_write (data, len); 2712 tt_write (data, len);
2661 2713
2662 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~"); 2715 tt_printf ("\x1b[201~");
2664} 2716}
2665 2717
2666/* ------------------------------------------------------------------------- */
2667/*
2668 * Respond to a notification that a primary selection has been sent
2669 * EXT: SelectionNotify
2670 */
2671void 2718void
2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673{ 2720{
2674 if (prop == None) /* check for failed XConvertSelection */ 2721 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2675 {
2676 if ((selection_type & Sel_CompoundText))
2677 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = 0;
2681 if (selnum != Sel_direct)
2682 selection_request_other (XA_STRING, selnum);
2683 }
2684
2685 if ((selection_type & Sel_UTF8String))
2686 {
2687 int selnum = selection_type & Sel_whereMask;
2688
2689 selection_type = Sel_CompoundText;
2690 if (selnum != Sel_direct)
2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2692 else
2693 selection_type = 0;
2694 }
2695
2696 return;
2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (dpy, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct2.encoding, &ct2.format,
2725 &ct2.nitems, &bytes_after,
2726 &ct2.value) != Success)
2727 goto bailout;
2728
2729 // realloc should be compatible to XFree, here, and elsewhere, too
2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems;
2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2740 if (ct.encoding == xa[XA_INCR])
2741 {
2742 // INCR selection, start handshake
2743 if (!delete_prop)
2744 XDeleteProperty (dpy, win, prop);
2745
2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2748 incr_ev.start (10);
2749
2750 goto bailout;
2751 }
2752
2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2766 }
2767 else
2768 {
2769 if (selection_wait == Sel_normal
2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2771 {
2772 /*
2773 * pass through again trying CUT_BUFFER0 if we've come from
2774 * XConvertSelection () but nothing was presented
2775 */
2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2777 }
2778
2779 goto bailout;
2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2793 incr_buf_fill += ct.nitems;
2794
2795 goto bailout;
2796 }
2797
2798 char **cl;
2799 int cr;
2800
2801#if !ENABLE_MINIMAL
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste (s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2816 && cl)
2817 {
2818 for (int i = 0; i < cr; i++)
2819 paste (cl[i], strlen (cl[i]));
2820
2821 XFreeStringList (cl);
2822 }
2823 else
2824 paste ((char *)ct.value, ct.nitems); // paste raw
2825
2826bailout:
2827 XFree (ct.value);
2828
2829 if (selection_wait == Sel_normal)
2830 selection_wait = Sel_none;
2831}
2832
2833void
2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2835{
2836 selection_wait = Sel_none;
2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2842}
2843
2844void
2845rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2846{
2847 if (prop == None || selection_wait != Sel_incr)
2848 return; 2722 return;
2849 2723
2850 selection_paste (win, prop, true); 2724 tt_paste (data, len);
2851} 2725}
2852 2726
2853/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2854/* 2728/*
2855 * Request the current selection: 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2856 * Order: > internal selection if available 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2731 * as fallback
2858 * > CUT_BUFFER0
2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2860 * will auto fallback to CUT_BUFFER0
2861 * EXT: button 2 release 2732 * EXT: button 2 release
2862 */ 2733 */
2863void 2734void
2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2865{ 2736{
2866 if (selection.text && selnum == Sel_Primary) 2737 if (!selection_req)
2867 {
2868 /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste (str, strlen (str));
2871 free (str);
2872 return;
2873 } 2738 {
2874 else 2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run ();
2875 { 2741 }
2876 selection_request_time = tm;
2877 selection_wait = Sel_normal;
2878
2879#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return;
2883#else
2884 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return;
2887#endif
2888 }
2889
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false);
2892}
2893
2894int
2895rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2896{
2897 Atom sel;
2898
2899 selection_type |= selnum;
2900
2901 if (selnum == Sel_Primary)
2902 sel = XA_PRIMARY;
2903 else if (selnum == Sel_Secondary)
2904 sel = XA_SECONDARY;
2905 else
2906 sel = xa[XA_CLIPBOARD];
2907
2908 if (XGetSelectionOwner (dpy, sel) != None)
2909 {
2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2911 vt, selection_request_time);
2912 return 1;
2913 }
2914
2915 return 0;
2916} 2742}
2917 2743
2918/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2919/* 2745/*
2920 * Clear all selected text 2746 * Clear all selected text
2921 * EXT: SelectionClear 2747 * EXT: SelectionClear
2922 */ 2748 */
2923void 2749void
2924rxvt_term::selection_clear () NOTHROW 2750rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2751{
2752 if (!clipboard)
2753 {
2926 want_refresh = 1; 2754 want_refresh = 1;
2927 free (selection.text); 2755 free (selection.text);
2928 selection.text = NULL; 2756 selection.text = NULL;
2929 selection.len = 0; 2757 selection.len = 0;
2930 CLEAR_SELECTION (); 2758 CLEAR_SELECTION ();
2931 2759
2932 if (display->selection_owner == this) 2760 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2761 display->selection_owner = 0;
2762 }
2763 else
2764 {
2765 free (selection.clip_text);
2766 selection.clip_text = NULL;
2767 selection.clip_len = 0;
2768
2769 if (display->clipboard_owner == this)
2770 display->clipboard_owner = 0;
2771 }
2934} 2772}
2935 2773
2936/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2937/* 2775/*
2938 * Copy a selection into the cut buffer 2776 * Copy a selection into the cut buffer
2939 * EXT: button 1 or 3 release 2777 * EXT: button 1 or 3 release
2940 */ 2778 */
2941void 2779void
2942rxvt_term::selection_make (Time tm) 2780rxvt_term::selection_make (Time tm)
2943{ 2781{
2944 int i; 2782 int size;
2945 wchar_t *new_selection_text; 2783 wchar_t *new_selection_text;
2946 text_t *t; 2784 text_t *t;
2947 2785
2948 switch (selection.op) 2786 switch (selection.op)
2949 { 2787 {
… …
2965 return; /* nothing selected, go away */ 2803 return; /* nothing selected, go away */
2966 2804
2967 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2805 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968 return; 2806 return;
2969 2807
2970 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2808 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2809 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972 2810
2973 int ofs = 0; 2811 int ofs = 0;
2974 int extra = 0; 2812 int extra = 0;
2975 2813
2976 int col = selection.beg.col; 2814 int col = selection.beg.col;
… …
2982 { 2820 {
2983#if !ENABLE_MINIMAL 2821#if !ENABLE_MINIMAL
2984 if (selection.rect) 2822 if (selection.rect)
2985 { 2823 {
2986 col = selection.beg.col; 2824 col = selection.beg.col;
2987 end_col = ncol + 1; 2825 end_col = selection.end.col;
2988 } 2826 }
2989 else 2827 else
2990#endif 2828#endif
2991 end_col = ROW(row).l; 2829 end_col = ROW(row).l;
2992 2830
2993 col = max (col, 0); 2831 col = max (col, 0);
2994 2832
2995 if (row == selection.end.row 2833 if (row == selection.end.row)
2996#if !ENABLE_MINIMAL
2997 || selection.rect
2998#endif
2999 )
3000 min_it (end_col, selection.end.col); 2834 min_it (end_col, selection.end.col);
3001 2835
3002 t = ROW(row).t + col; 2836 t = ROW(row).t + col;
3003 2837
3004 for (; col < end_col; col++) 2838 for (; col < end_col; col++)
… …
3012 2846
3013 extra -= (len - 1); 2847 extra -= (len - 1);
3014 2848
3015 if (extra < 0) 2849 if (extra < 0)
3016 { 2850 {
3017 extra += i; 2851 extra += size;
3018 i += i; 2852 size += size;
3019 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020 } 2854 }
3021 2855
3022 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023 } 2857 }
3024#endif 2858#endif
… …
3036 2870
3037 new_selection_text[ofs++] = C0_LF; 2871 new_selection_text[ofs++] = C0_LF;
3038 } 2872 }
3039 else 2873 else
3040#endif 2874#endif
3041 if (!ROW(row).is_longer () && row != selection.end.row) 2875 if (!ROW(row).is_longer ()
2876 && (row != selection.end.row || end_col != selection.end.col)
2877 && (row != selection.beg.row || selection.beg.col < ncol))
3042 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3043 } 2879 }
3044
3045 if (end_col != selection.end.col)
3046 new_selection_text[ofs++] = C0_LF;
3047 2880
3048 new_selection_text[ofs] = 0; 2881 new_selection_text[ofs] = 0;
3049 2882
3050 if (ofs == 0) 2883 if (ofs == 0)
3051 { 2884 {
… …
3064 2897
3065 selection_grab (tm); 2898 selection_grab (tm);
3066} 2899}
3067 2900
3068bool 2901bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 2903{
2904 Atom sel;
2905
2906 if (!clipboard)
2907 {
3071 selection_time = tm; 2908 selection_time = tm;
2909 sel = XA_PRIMARY;
2910 }
2911 else
2912 {
2913 clipboard_time = tm;
2914 sel = xa[XA_CLIPBOARD];
2915 }
3072 2916
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2917 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2918 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 2919 {
3076 display->set_selection_owner (this); 2920 display->set_selection_owner (this, clipboard);
3077 return true; 2921 return true;
3078 } 2922 }
3079 else 2923 else
3080 { 2924 {
3081 selection_clear (); 2925 selection_clear (clipboard);
3082 return false; 2926 return false;
3083 } 2927 }
3084 2928
3085#if 0 2929#if 0
3086 XTextProperty ct; 2930 XTextProperty ct;
… …
3096/* ------------------------------------------------------------------------- */ 2940/* ------------------------------------------------------------------------- */
3097/* 2941/*
3098 * Mark or select text based upon number of clicks: 1, 2, or 3 2942 * Mark or select text based upon number of clicks: 1, 2, or 3
3099 * EXT: button 1 press 2943 * EXT: button 1 press
3100 */ 2944 */
3101void 2945void ecb_cold
3102rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3103{ 2947{
3104 clicks = ((clicks - 1) % 3) + 1; 2948 clicks = ((clicks - 1) % 3) + 1;
3105 selection.clicks = clicks; /* save clicks so extend will work */ 2949 selection.clicks = clicks; /* save clicks so extend will work */
3106 2950
… …
3125 2969
3126/* ------------------------------------------------------------------------- */ 2970/* ------------------------------------------------------------------------- */
3127/* 2971/*
3128 * Mark a selection at the specified col/row 2972 * Mark a selection at the specified col/row
3129 */ 2973 */
3130void 2974void ecb_cold
3131rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3132{ 2976{
3133 want_refresh = 1; 2977 want_refresh = 1;
3134 2978
3135 selection.mark.row = row + view_start; 2979 selection.mark.row = row + view_start;
… …
3162/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3163#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3164 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3165#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3166 3010
3167void 3011void ecb_cold
3168rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3169{ 3013{
3170 int col, row, dirnadd, tcol, trow, w1, w2; 3014 int col, row, dirnadd, tcol, trow, w1, w2;
3171 row_col_t bound; 3015 row_col_t bound;
3172 text_t *stp; 3016 text_t *stp;
… …
3246 * EXT: button 3 press; button 1 or 3 drag 3090 * EXT: button 3 press; button 1 or 3 drag
3247 * flag == 0 ==> button 1 3091 * flag == 0 ==> button 1
3248 * flag == 1 ==> button 3 press 3092 * flag == 1 ==> button 3 press
3249 * flag == 2 ==> button 3 motion 3093 * flag == 2 ==> button 3 motion
3250 */ 3094 */
3251void 3095void ecb_cold
3252rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3253{ 3097{
3254 int col = clamp (Pixel2Col (x), 0, ncol); 3098 int col = clamp (Pixel2Col (x), 0, ncol);
3255 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3099 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3256 3100
… …
3282 3126
3283/* ------------------------------------------------------------------------- */ 3127/* ------------------------------------------------------------------------- */
3284/* 3128/*
3285 * Extend the selection to the specified col/row 3129 * Extend the selection to the specified col/row
3286 */ 3130 */
3287void 3131void ecb_cold
3288rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3289{ 3133{
3290 row_col_t pos; 3134 row_col_t pos;
3291 enum { 3135 enum {
3292 LEFT, RIGHT 3136 LEFT, RIGHT
… …
3483 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3484#endif 3328#endif
3485} 3329}
3486 3330
3487#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3488void 3332void ecb_cold
3489rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
3490{ 3334{
3491 int32_t end_col, end_row; 3335 int32_t end_col, end_row;
3492 text_t *stp; 3336 text_t *stp;
3493 3337
… …
3531/* ------------------------------------------------------------------------- */ 3375/* ------------------------------------------------------------------------- */
3532/* 3376/*
3533 * Double click on button 3 when already selected 3377 * Double click on button 3 when already selected
3534 * EXT: button 3 double click 3378 * EXT: button 3 double click
3535 */ 3379 */
3536void 3380void ecb_cold
3537rxvt_term::selection_rotate (int x, int y) NOTHROW 3381rxvt_term::selection_rotate (int x, int y) NOTHROW
3538{ 3382{
3539 selection.clicks = selection.clicks % 3 + 1; 3383 selection.clicks = selection.clicks % 3 + 1;
3540 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3541} 3385}
… …
3543/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3544/* 3388/*
3545 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3546 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3547 */ 3391 */
3548void 3392void ecb_cold
3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550{ 3394{
3395 Atom property = rq.property == None ? rq.target : rq.property;
3551 XSelectionEvent ev; 3396 XSelectionEvent ev;
3552 3397
3553 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3554 ev.property = None; 3399 ev.property = None;
3555 ev.display = rq.display; 3400 ev.display = rq.display;
… …
3570 *target++ = xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3571#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3572 *target++ = xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3573#endif 3418#endif
3574 3419
3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3576 32, PropModeReplace, 3421 32, PropModeReplace,
3577 (unsigned char *)target_list, target - target_list); 3422 (unsigned char *)target_list, target - target_list);
3578 ev.property = rq.property; 3423 ev.property = property;
3579 } 3424 }
3580#if TODO // TODO 3425#if TODO // TODO
3581 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3427 {
3583 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3584 } 3429 }
3585#endif 3430#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3432 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3433 XChangeProperty (dpy, rq.requestor, property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3590 ev.property = rq.property; 3435 ev.property = property;
3436 }
3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3438 {
3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3440 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3441 ev.property = property;
3591 } 3442 }
3592 else if (rq.target == XA_STRING 3443 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3444 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3445 || rq.target == xa[XA_COMPOUND_TEXT]
3595 || rq.target == xa[XA_UTF8_STRING] 3446 || rq.target == xa[XA_UTF8_STRING]
… …
3627 { 3478 {
3628 target = xa[XA_COMPOUND_TEXT]; 3479 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3480 style = enc_compound_text;
3630 } 3481 }
3631 3482
3632 if (selection.text) 3483 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3484 {
3634 cl = selection.text; 3485 cl = selection.text;
3635 selectlen = selection.len; 3486 selectlen = selection.len;
3487 }
3488 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3489 {
3490 cl = selection.clip_text;
3491 selectlen = selection.clip_len;
3636 } 3492 }
3637 else 3493 else
3638 { 3494 {
3639 cl = L""; 3495 cl = L"";
3640 selectlen = 0; 3496 selectlen = 0;
… …
3661 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3662 ct.nitems = selectlen; 3518 ct.nitems = selectlen;
3663 ct.encoding = target; 3519 ct.encoding = target;
3664 } 3520 }
3665 3521
3666 XChangeProperty (dpy, rq.requestor, rq.property, 3522 XChangeProperty (dpy, rq.requestor, property,
3667 ct.encoding, 8, PropModeReplace, 3523 ct.encoding, 8, PropModeReplace,
3668 ct.value, (int)ct.nitems); 3524 ct.value, (int)ct.nitems);
3669 ev.property = rq.property; 3525 ev.property = property;
3670 3526
3671 if (freect) 3527 if (freect)
3672 XFree (ct.value); 3528 XFree (ct.value);
3673 } 3529 }
3674 3530
3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3676} 3532}
3677 3533
3678/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3679#ifdef USE_XIM 3535#if USE_XIM
3680void 3536void ecb_cold
3681rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3682{ 3538{
3683 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3684 3540
3685 XGetWindowAttributes (dpy, vt, &xwa); 3541 XGetWindowAttributes (dpy, vt, &xwa);
… …
3708 h += 2; min_it (h, nrow); 3564 h += 2; min_it (h, nrow);
3709 3565
3710 x -= 1; clamp_it (x, 0, ncol - w); 3566 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3567 y -= 1; clamp_it (y, 0, nrow - h);
3712 3568
3713 ov_x = x; ov_y = y; 3569 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3570 ov.w = w; ov.h = h;
3715 3571
3716 ov_text = new text_t *[h]; 3572 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3573 ov.rend = new rend_t *[h];
3718 3574
3719 for (y = 0; y < h; y++) 3575 for (y = 0; y < h; y++)
3720 { 3576 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3577 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3578 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3579
3724 text_t t0, t1, t2; 3580 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3581 rend_t r = OVERLAY_RSTYLE;
3726 3582
3727 if (y == 0) 3583 if (y == 0)
… …
3746} 3602}
3747 3603
3748void 3604void
3749rxvt_term::scr_overlay_off () NOTHROW 3605rxvt_term::scr_overlay_off () NOTHROW
3750{ 3606{
3751 if (!ov_text) 3607 if (!ov.text)
3752 return; 3608 return;
3753 3609
3754 want_refresh = 1; 3610 want_refresh = 1;
3755 3611
3756 for (int y = 0; y < ov_h; y++) 3612 for (int y = 0; y < ov.h; y++)
3757 { 3613 {
3758 delete [] ov_text[y]; 3614 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3615 delete [] ov.rend[y];
3760 } 3616 }
3761 3617
3762 delete [] ov_text; ov_text = 0; 3618 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3619 delete [] ov.rend; ov.rend = 0;
3764} 3620}
3765 3621
3766void 3622void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3623rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3624{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3625 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3626 return;
3771 3627
3772 x++, y++; 3628 x++, y++;
3773 3629
3774 ov_text[y][x] = text; 3630 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3631 ov.rend[y][x] = rend;
3776} 3632}
3777 3633
3778void 3634void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3636{
… …
3799} 3655}
3800 3656
3801void 3657void
3802rxvt_term::scr_swap_overlay () NOTHROW 3658rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3659{
3804 if (!ov_text) 3660 if (!ov.text)
3805 return; 3661 return;
3806 3662
3663 // hide cursor if it is within the overlay area
3664 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3665 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3666 screen.flags &= ~Screen_VisibleCursor;
3667
3807 // swap screen mem with overlay 3668 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3669 for (int y = ov.h; y--; )
3809 { 3670 {
3810 text_t *t1 = ov_text[y]; 3671 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3672 rend_t *r1 = ov.rend[y];
3812 3673
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3674 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3675 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3676
3816 for (int x = ov_w; x--; ) 3677 for (int x = ov.w; x--; )
3817 { 3678 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3679 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3681 }
3821 } 3682 }

Diff Legend

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