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.263 by root, Tue Apr 11 11:07:48 2006 UTC vs.
Revision 1.335 by root, Tue Mar 30 23:00:35 2010 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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
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.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
153} 135}
154 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
172 if (nrow == 0) 169 if (nrow == 0)
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 174
181 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
183 { 177 {
184 //TODO//FIXME 178 //TODO//FIXME
… …
237 selection.text = NULL; 231 selection.text = NULL;
238 selection.len = 0; 232 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
241 selection.clicks = 0; 235 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 236 selection.clip_text = NULL;
237 selection.clip_len = 0;
243 } 238 }
244 else 239 else
245 { 240 {
246 /* 241 /*
247 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 272 }
278 273
279 line_t *old_buf = row_buf; 274 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 276
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 278 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 279 int q = total_rows; // rewrapped row
285 280
286 if (top_row) 281 if (top_row)
287 { 282 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
290 286
291 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 289
294 do 290 do
295 { 291 {
296 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 294 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 296
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 298 {
… …
330 int qcol = 0; 324 int qcol = 0;
331 325
332 // see below for cursor adjustment rationale 326 // see below for cursor adjustment rationale
333 if (p == ocur.row) 327 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 328 screen.cur.row = q - (total_rows - nrow);
335 329
336 // fill a single destination line 330 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
338 { 332 {
339 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
… …
366 } 360 }
367 while (p != pend && q > 0); 361 while (p != pend && q > 0);
368 362
369 term_start = total_rows - nrow; 363 term_start = total_rows - nrow;
370 top_row = q - term_start; 364 top_row = q - term_start;
371 365
372 // make sure all terminal lines exist 366 // make sure all terminal lines exist
373 while (top_row > 0) 367 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 368 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 369 }
376 else 370 else
377 { 371 {
378 // if no scrollback exists (yet), wing, instead of wrap 372 // if no scrollback exists (yet), wing, instead of wrap
379 373
380 for (int row = min (nrow, prev_nrow); row--; ) 374 for (int row = min (nrow, prev_nrow); row--; )
381 { 375 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 377 line_t &qline = row_buf [row];
384 378
… …
398 delete old_ta; 392 delete old_ta;
399 delete old_ra; 393 delete old_ra;
400 394
401 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
403 398
404 free (tabs); 399 free (tabs);
405 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
406 404
407 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
408 406
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 409
420 tt_winch (); 410 tt_winch ();
421 411
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 413}
… …
435 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
436 426
437 free (row_buf); 427 free (row_buf);
438 free (swap_buf); 428 free (swap_buf);
439 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
440 free (tabs); 432 free (tabs);
441 433 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 434 }
444} 435}
445 436
446/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
447/* 438/*
448 * Hard reset 439 * Hard/Soft reset
449 */ 440 */
450void 441void
451rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
452{ 443{
453 scr_release (); 444 scr_release ();
454 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
455 scr_reset (); 448 scr_reset ();
456 449
457 scr_clear (true); 450 scr_clear (true);
458 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
459} 468}
460 469
461/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
501 } 510 }
502 511
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
509#endif
510} 517}
511 518
512void 519void
513rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
514{ 521{
515 if (!OPTION (Opt_secondaryScreen)) 522 if (!option (Opt_secondaryScreen))
516 return; 523 return;
517 524
518 for (int i = prev_nrow; i--; ) 525 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 526 ::swap (ROW(i), swap_buf [i]);
520 527
… …
539 want_refresh = 1; 546 want_refresh = 1;
540 view_start = 0; 547 view_start = 0;
541 548
542 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
543 550
544 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
545 552
546#if NSCREENS 553#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
548 { 555 {
549 num_scr = 0; 556 num_scr = 0;
550 557
551 scr_swap_screen (); 558 scr_swap_screen ();
552 559
… …
555 screen.flags |= Screen_VisibleCursor; 562 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 563 swap.flags |= Screen_VisibleCursor;
557 } 564 }
558 else 565 else
559#endif 566#endif
560 if (OPTION (Opt_secondaryScroll)) 567 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 568 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 569}
563 570
564// clear WrapNext indicator, solidifying position on next line 571// clear WrapNext indicator, solidifying position on next line
565void 572void
… …
598/* 605/*
599 * Change the rendition style for following text 606 * Change the rendition style for following text
600 */ 607 */
601void 608void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 609rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 610{
604 if (set) 611 if (set)
605 rstyle |= style; 612 rstyle |= style;
606 else if (style == ~RS_None) 613 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 614 rstyle = DEFAULT_RSTYLE;
608 else 615 else
609 rstyle &= ~style; 616 rstyle &= ~style;
610 } 617}
611 618
612/* ------------------------------------------------------------------------- */ 619/* ------------------------------------------------------------------------- */
613/* 620/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 621 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 622 * count positive ==> scroll up
… …
624 want_refresh = 1; 631 want_refresh = 1;
625 num_scr += count; 632 num_scr += count;
626 633
627 if (count > 0 634 if (count > 0
628 && row1 == 0 635 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 636 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 637 {
631 top_row = max (top_row - count, -saveLines); 638 top_row = max (top_row - count, -saveLines);
632 639
633 // scroll everything up 'count' lines 640 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 641 term_start = (term_start + count) % total_rows;
… …
666 line_t &l2 = ROW(i); 673 line_t &l2 = ROW(i);
667 674
668 ::swap (l1, l2); 675 ::swap (l1, l2);
669 l2.touch (); 676 l2.touch ();
670 } 677 }
671 678
672 // move and/or clear selection, if any 679 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 680 if (selection.op && current_screen == selection.screen)
674 { 681 {
675 selection.beg.row -= count; 682 selection.beg.row -= count;
676 selection.end.row -= count; 683 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 691 selection.op = SELECTION_CLEAR;
685 } 692 }
686 } 693 }
687 694
688 // finally move the view window, if desired 695 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 696 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 697 && view_start != 0
691 && view_start != -saveLines) 698 && view_start != -saveLines)
692 scr_page (UP, count); 699 scr_page (UP, count);
693 700
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 701 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 719 {
713 /* move selected region too */ 720 /* move selected region too */
714 selection.beg.row -= count; 721 selection.beg.row -= count;
715 selection.end.row -= count; 722 selection.end.row -= count;
716 selection.mark.row -= count; 723 selection.mark.row -= count;
717 724
718 selection_check (0); 725 selection_check (0);
719 } 726 }
720 } 727 }
721 728
722 // use a simple and robust scrolling algorithm, this 729 // use a simple and robust scrolling algorithm, this
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
776 } 783 }
777 } 784 }
778 785
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 789 int row = screen.cur.row;
785 790
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 792
788 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
789 794
790 while (str < strend) 795 while (str < strend)
791 { 796 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 798
794 if (c < 0x20) 799 if (expect_false (c < 0x20))
795 if (c == C0_LF) 800 if (c == C0_LF)
796 { 801 {
797 max_it (line->l, screen.cur.col); 802 max_it (line->l, screen.cur.col);
798 803
799 screen.flags &= ~Screen_WrapNext; 804 screen.flags &= ~Screen_WrapNext;
… …
818 { 823 {
819 scr_tab (1, true); 824 scr_tab (1, true);
820 continue; 825 continue;
821 } 826 }
822 827
828 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 829 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 831 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 ))
826 { 833 {
827 checksel = 0; 834 checksel = 0;
828 /* 835 /*
829 * If we wrote anywhere in the selected area, kill the selection 836 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 837 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 838 * should be a similar check.
832 */ 839 */
833 CLEAR_SELECTION (); 840 CLEAR_SELECTION ();
834 } 841 }
835 842
836 if (screen.flags & Screen_WrapNext) 843 if (expect_false (screen.flags & Screen_WrapNext))
837 { 844 {
838 scr_do_wrap (); 845 scr_do_wrap ();
839 846
840 line->l = ncol; 847 line->l = ncol;
841 line->is_longer (1); 848 line->is_longer (1);
842 849
843 row = screen.cur.row; 850 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 851 line = &ROW(row); /* _must_ refresh */
845 } 852 }
846 853
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 854 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 856 c = 0xfffd;
850 857
851 // rely on wcwidth to tell us the character width, do wcwidth before 858 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 859 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 860 // drawing characters below as they might be invalid in the current
854 // locale. 861 // locale.
855 int width = WCWIDTH (c); 862 int width = WCWIDTH (c);
856 863
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 865 {
859 // vt100 special graphics and line drawing 866 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 867 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 868 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 869 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 882 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 883 width = 1; // vt100 line drawing characters are always single-width
877 } 884 }
878 } 885 }
879 886
880 if (screen.flags & Screen_Insert) 887 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 888 scr_insdel_chars (width, INSERT);
882 889
883 if (width != 0) 890 if (width != 0)
884 { 891 {
885#if !UNICODE_3 892#if !UNICODE_3
… …
891 c = 0xfffd; 898 c = 0xfffd;
892# endif 899# endif
893#endif 900#endif
894 901
895 // nuke the character at this position, if required 902 // nuke the character at this position, if required
903 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
899 { 914 {
900 int col = screen.cur.col; 915 // ... artificially enlargen the previous one
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' '; 916 c = NOCHAR;
923 // and try the same character next loop iteration 917 // and try the same character next loop iteration
924 --str; 918 --str;
925 } 919 }
926 920
927 line->touch (); 921 line->touch ();
… …
929 do 923 do
930 { 924 {
931 line->t[screen.cur.col] = c; 925 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 926 line->r[screen.cur.col] = rend;
933 927
934 if (screen.cur.col < ncol - 1) 928 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 929 screen.cur.col++;
936 else 930 else
937 { 931 {
938 line->l = ncol; 932 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 933 if (screen.flags & Screen_Autowrap)
… …
941 break; 935 break;
942 } 936 }
943 937
944 c = NOCHAR; 938 c = NOCHAR;
945 } 939 }
946 while (--width > 0); 940 while (expect_false (--width > 0));
947 941
948 // pad with spaces when overwriting wide character with smaller one 942 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 943 if (expect_false (!width))
950 { 944 {
951 line->touch (); 945 line->touch ();
952 946
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 948 {
955 line->t[c] = ' '; 949 line->t[c] = ' ';
956 line->r[c] = rend; 950 line->r[c] = rend;
957 } 951 }
958 } 952 }
959 } 953 }
954#if ENABLE_COMBINING
960 else // width == 0 955 else // width == 0
961 { 956 {
962#if ENABLE_COMBINING 957 if (c != 0xfeff) // ignore BOM
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 { 958 {
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
973 linep = line; 969 linep = line;
974 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 995 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 } 996 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 997#endif
1000 }
1001 } 998 }
1002 999
1003 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
1004 1001
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1007#endif
1008} 1003}
1009 1004
1010/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1011/* 1006/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
1014 */ 1009 */
1015void 1010void
1016rxvt_term::scr_backspace () NOTHROW 1011rxvt_term::scr_backspace () NOTHROW
1017{ 1012{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1013 if (screen.cur.col == 0)
1021 { 1014 {
1022 if (screen.cur.row > 0) 1015 if (screen.cur.row > 0)
1023 { 1016 {
1024#ifdef TERMCAP_HAS_BW 1017#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1018 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1019 --screen.cur.row;
1027 return; 1020
1021 want_refresh = 1;
1028#endif 1022#endif
1029 } 1023 }
1030 } 1024 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1025 else
1032 scr_gotorc (0, -1, RELATIVE); 1026 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1027}
1036 1028
1037/* ------------------------------------------------------------------------- */ 1029/* ------------------------------------------------------------------------- */
1038/* 1030/*
1039 * Process Horizontal Tab 1031 * Process Horizontal Tab
… …
1062 x = i; 1054 x = i;
1063 1055
1064 if (!--count) 1056 if (!--count)
1065 break; 1057 break;
1066 } 1058 }
1067 else 1059 else
1068 ht &= l.t[i] == ' ' 1060 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1061 && RS_SAME (l.r[i], base_rend);
1070 1062
1071 if (count) 1063 if (count)
1072 x = ncol - 1; 1064 x = ncol - 1;
1073 1065
1074 // store horizontal tab commands as characters inside the text 1066 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1067 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1068 if (ht && option (Opt_pastableTabs))
1077 { 1069 {
1078 base_rend = SET_FONT (base_rend, 0); 1070 base_rend = SET_FONT (base_rend, 0);
1079 1071
1080 l.touch (x); 1072 l.touch (x);
1081 1073
… …
1188 } 1180 }
1189 } 1181 }
1190 else 1182 else
1191 { 1183 {
1192 if (screen.flags & Screen_Relative) 1184 if (screen.flags & Screen_Relative)
1185 {
1193 { /* relative origin mode */ 1186 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1187 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1188 min_it (screen.cur.row, screen.bscroll);
1196 } 1189 }
1197 else 1190 else
1198 screen.cur.row = row; 1191 screen.cur.row = row;
… …
1231/* 1224/*
1232 * Erase part or whole of a line 1225 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1226 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1227 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1228 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1229 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1230 */
1237void 1231void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1232rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1233{
1240 unsigned int col, num; 1234 unsigned int col, num;
… …
1249 line.touch (); 1243 line.touch ();
1250 line.is_longer (0); 1244 line.is_longer (0);
1251 1245
1252 switch (mode) 1246 switch (mode)
1253 { 1247 {
1248 case 3:
1249 if (screen.flags & Screen_WrapNext)
1250 return;
1251
1252 /* fall through */
1253
1254 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1255 col = screen.cur.col;
1256 num = ncol - col; 1256 num = ncol - col;
1257 min_it (line.l, col); 1257 min_it (line.l, col);
1258
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1259 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1260 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1261 break; 1262 break;
1263
1262 case 1: /* erase to beginning of line */ 1264 case 1: /* erase to beginning of line */
1263 col = 0; 1265 col = 0;
1264 num = screen.cur.col + 1; 1266 num = screen.cur.col + 1;
1267
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1268 break; 1271 break;
1272
1269 case 2: /* erase whole line */ 1273 case 2: /* erase whole line */
1270 col = 0; 1274 col = 0;
1271 num = ncol; 1275 num = ncol;
1272 line.l = 0; 1276 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1277 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1332 return; 1336 return;
1333 1337
1334 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1335 1339
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1336 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1346 {
1340 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1348
1349 if (mapped && !view_start)
1350 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False);
1342 } 1353 }
1343 else 1354 else
1344 { 1355 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1357
1358 if (mapped && !view_start)
1359 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1362 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start),
1364 (unsigned int)width,
1365 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1351 } 1369 }
1352 1370
1353 for (; num--; row++) 1371 for (; num--; row++)
1354 { 1372 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1377 }
1358} 1378}
1359 1379
1360#if !ENABLE_MINIMAL 1380#if !ENABLE_MINIMAL
1361void 1381void
… …
1435 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1436 */ 1456 */
1437void 1457void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1459{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1460 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1445 1462
1446 if (count <= 0) 1463 if (count <= 0)
1447 return; 1464 return;
… …
1449 scr_do_wrap (); 1466 scr_do_wrap ();
1450 1467
1451 selection_check (1); 1468 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1453 1470
1454 row = screen.cur.row; 1471 int row = screen.cur.row;
1455 1472
1456 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1457 1474
1458 line->touch (); 1475 line->touch ();
1459 line->is_longer (0); 1476 line->is_longer (0);
1460 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1461 switch (insdel) 1482 switch (insdel)
1462 { 1483 {
1463 case INSERT: 1484 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1491 {
1466 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1468 } 1494 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1495
1472 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1498 {
1475 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1500 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1478 else 1502 else
1503 {
1479 { /* shift selection */ 1504 /* shift selection */
1480 selection.beg.col += count; 1505 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1507 selection.end.col += count;
1483 } 1508 }
1484 } 1509 }
… …
1489 case ERASE: 1514 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1516 selection_check (1);
1492 screen.cur.col -= count; 1517 screen.cur.col -= count;
1493 1518
1494 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1524 break;
1497 1525
1498 case DELETE: 1526 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1500 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1534 {
1503 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1505 } 1537 }
1506 1538
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1540
1510 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1543 {
1513 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1623 */ 1654 */
1624void 1655void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1657{
1627 if (mode < 0) 1658 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1660 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1661 tabs [screen.cur.col] = !!mode;
1631} 1662}
1632 1663
1633/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1679 if (rvideo_state != on)
1649 { 1680 {
1650 rvideo_state = on; 1681 rvideo_state = on;
1651 1682
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1684#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1686#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1688
1661 XGCValues gcvalue; 1689 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1899 return true;
1872} 1900}
1873 1901
1874#ifndef NO_BELL 1902#ifndef NO_BELL
1875void 1903void
1876rxvt_term::bell_cb (time_watcher &w) 1904rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1905{
1878 rvideo_bell = false; 1906 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1880} 1909}
1881#endif 1910#endif
1882 1911
1883/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1884void 1913void
… …
1886{ 1915{
1887#ifndef NO_BELL 1916#ifndef NO_BELL
1888 1917
1889# ifndef NO_MAPALERT 1918# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1892# endif 1921# endif
1893 XMapWindow (dpy, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1894# endif 1923# endif
1895 1924
1925# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell))
1927 set_urgency (1);
1928# endif
1929
1896 if (OPTION (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1897 { 1931 {
1898 rvideo_bell = true; 1932 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1933 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1934 flush ();
1901 1935
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1937 }
1904 else 1938 else
1905 XBell (dpy, 0); 1939 XBell (dpy, 0);
1906 1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1941#endif
1908} 1942}
1909 1943
1910/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1945/* ARGSUSED */
1912void 1946void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1948{
1915#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1916 int nrows, row_start; 1950 int nrows, row_start;
1917 FILE *fd; 1951 FILE *fd = popen_printer ();
1918 1952
1919 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1920 return; 1954 return;
1921 1955
1922 if (fullhist) 1956 if (fullhist)
1923 { 1957 {
1924 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1964 row_start = view_start;
1931 } 1965 }
1932 1966
1933 wctomb (0, 0); 1967 wctomb (0, 0);
1934 1968
1935 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1970 {
1937 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1939 1973
1940 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2004 */
1971void 2005void
1972rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1973{ 2007{
1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2010 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2013#endif
1982 rend_t *crp; // cursor rendition pointer 2014 rend_t *crp; // cursor rendition pointer
2015 rend_t ccol1, /* Cursor colour */
2016 ccol2; /* Cursor colour2 */
1983 2017
1984 want_refresh = 0; /* screen is current */ 2018 want_refresh = 0; /* screen is current */
1985 2019
1986 if (refresh_type == NO_REFRESH || !mapped) 2020 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2021 return;
1988 2022
1989 /* 2023 /*
1990 * A: set up vars 2024 * A: set up vars
1991 */ 2025 */
1992 have_bg = 0;
1993 refresh_count = 0; 2026 refresh_count = 0;
1994 2027
1995#if XPM_BACKGROUND 2028 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2032#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2034
2003 /* 2035 /*
2004 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2005 */ 2037 */
2006 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2007 2046
2008 /* 2047 /*
2009 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2010 */ 2049 */
2011 { 2050 {
2012 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2052
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2054 if (hidden_cursor)
2019 showcursor = 0; 2055 showcursor = 0;
2020#endif 2056#endif
2021 2057
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2063 col--;
2028 2064
2029 crp = &ROW(screen.cur.row).r[col]; 2065 crp = &ROW(screen.cur.row).r[col];
2030 2066
2067#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor;
2071 else
2072#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2074 ccol1 = fgcolor_of (rstyle);
2075#else
2076 ccol1 = Color_fg;
2077#endif
2078
2079#ifndef NO_CURSORCOLOR
2080 if (ISSET_PIXCOLOR (Color_cursor2))
2081 ccol2 = Color_cursor2;
2082 else
2083#endif
2084#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2085 ccol2 = bgcolor_of (rstyle);
2086#else
2087 ccol2 = Color_bg;
2088#endif
2089
2031 if (showcursor && focus) 2090 if (showcursor && focus)
2032 { 2091 {
2033 if (OPTION (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2035 else 2094 else
2036 { 2095 {
2037 *crp ^= RS_RVid; 2096 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2097 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2098 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2099 }
2061 } 2100 }
2062 } 2101 }
2063 2102
2064 /* make sure no outline cursor is left around */ 2103 /* make sure no outline cursor is left around */
… …
2091 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2092 } 2131 }
2093 } 2132 }
2094 } 2133 }
2095 2134
2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2097#if ENABLE_OVERLAY
2098 scr_swap_overlay ();
2099#endif
2100
2101#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2102 /* 2136 /*
2103 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2105 */ 2139 */
… …
2194 continue; 2228 continue;
2195 2229
2196 // redraw one or more characters 2230 // redraw one or more characters
2197 2231
2198 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2199 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2200 --col; 2234 --col;
2201 2235
2202 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2203 text_t *text = stp + col; 2237 text_t *text = stp + col;
2204 int count = 1; 2238 int count = 1;
… …
2211 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2212 { 2246 {
2213 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2214 { 2248 {
2215 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2216 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2217 count++; 2252 count++;
2218 i++; 2253 i++;
2219 2254
2220 continue; 2255 continue;
2221 } 2256 }
… …
2241 2276
2242 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2243 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2244 2279
2245 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2246 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2247 count++, i--; 2282 count++, i--;
2248 2283
2249 /* 2284 /*
2250 * Determine the attributes for the string 2285 * Determine the attributes for the string
2251 */ 2286 */
2252 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2253 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2254 2289
2255 // only do special processing if any attributes are set, which is unlikely 2290 // only do special processing if any attributes are set, which is unlikely
2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2291 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2257 { 2292 {
2258#if ENABLE_STYLES
2259 // "careful" (too wide) character handling
2260
2261 // include previous careful character(s) if possible, looks nicer (best effort...)
2262 while (text > stp
2263 && srp[text - stp - 1] & RS_Careful
2264 && RS_SAME (rend, srp[text - stp - 1]))
2265 text--, count++, xpixel -= fwidth;
2266
2267 // force redraw after "careful" characters to avoid pixel droppings
2268 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2269 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2270
2271 // force redraw before "careful" characters to avoid pixel droppings
2272 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2273 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2274#endif
2275
2276 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2277 2294
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold
2280 && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
2281 { 2297 {
2282 if (ISSET_PIXCOLOR (Color_BD)) 2298 if (ISSET_PIXCOLOR (Color_BD))
2283 fore = Color_BD; 2299 fore = Color_BD;
2284# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2285 else 2301 else
2286 invert = !invert; 2302 invert = !invert;
2287# endif 2303# endif
2288 } 2304 }
2289 2305
2290 if (rend & RS_Italic 2306 if (rend & RS_Italic && fore == Color_fg)
2291 && fore == Color_fg)
2292 { 2307 {
2293 if (ISSET_PIXCOLOR (Color_IT)) 2308 if (ISSET_PIXCOLOR (Color_IT))
2294 fore = Color_IT; 2309 fore = Color_IT;
2295# if !ENABLE_STYLES 2310# if !ENABLE_STYLES
2296 else 2311 else
… …
2302 fore = Color_UL; 2317 fore = Color_UL;
2303#endif 2318#endif
2304 2319
2305 if (invert) 2320 if (invert)
2306 { 2321 {
2322#ifdef OPTION_HC
2323 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 || !ISSET_PIXCOLOR (Color_HC))
2325#endif
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2307 ::swap (fore, back); 2328 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2308 2333
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2334#ifndef NO_BOLD_UNDERLINE_REVERSE
2335# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV)) 2336 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV; 2337 back = Color_RV;
2312 2338# endif
2313 if (fore == back) 2339 if (fore == back)
2314 { 2340 {
2315 fore = Color_bg; 2341 fore = Color_bg;
2316 back = Color_fg; 2342 back = Color_fg;
2317 } 2343 }
… …
2319 } 2345 }
2320 2346
2321#ifdef TEXT_BLINK 2347#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2348 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2349 {
2324 if (!text_blink_ev.active) 2350 if (!text_blink_ev.is_active ())
2325 { 2351 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2352 text_blink_ev.again ();
2327 hidden_text = 0; 2353 hidden_text = 0;
2328 } 2354 }
2329 else if (hidden_text) 2355 else if (hidden_text)
2330 fore = back; 2356 fore = back;
2331 } 2357 }
2332#endif 2358#endif
2359
2360#if ENABLE_STYLES
2361 // "careful" (too wide) character handling
2362
2363 // include previous careful character(s) if possible, looks nicer (best effort...)
2364 while (text > stp
2365 && srp[text - stp - 1] & RS_Careful
2366 && RS_SAME (rend, srp[text - stp - 1]))
2367 text--, count++, xpixel -= fwidth;
2368
2369 // force redraw after "careful" characters to avoid pixel droppings
2370 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2371 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2372
2373 // force redraw before "careful" characters to avoid pixel droppings
2374 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2375 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2376#endif
2333 } 2377 }
2334 2378
2335 /* 2379 /*
2336 * Actually do the drawing of the string here 2380 * Actually do the drawing of the string here
2337 */ 2381 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2382 rxvt_font *font = fontset [GET_STYLE (rend)]->get (*text, GET_FONT (rend));
2339 2383
2340 if (back == fore) 2384 if (expect_true (have_bg && back == Color_bg))
2341 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2342 else if (back == Color_bg && have_bg)
2343 { 2385 {
2344 // this is very ugly, maybe push it into ->draw? 2386 // this is very ugly, maybe push it into ->draw?
2345 2387
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2388 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2389 if (text[i] != ' ')
2348 { 2390 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2391 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2392 goto did_clear;
2351 } 2393 }
2352 2394
2353 CLEAR_CHARS (xpixel, ypixel, count); 2395 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2396 did_clear: ;
2355 } 2397 }
2356 else 2398 else
2357 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2358 2400
2359 if (rend & RS_Uline && font->descent > 1 && fore != back) 2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2360 { 2402 {
2361#if ENABLE_FRILLS 2403#if ENABLE_FRILLS
2362 if (ISSET_PIXCOLOR (Color_underline)) 2404 if (ISSET_PIXCOLOR (Color_underline))
2363 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2405 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2364 else 2406 else
2365#endif 2407#endif
2366 XSetForeground (dpy, gc, pix_colors[fore]); 2408 XSetForeground (dpy, gc, pix_colors[fore]);
2367 2409
2368 XDrawLine (dpy, drawBuffer, gc, 2410 XDrawLine (dpy, vt, gc,
2369 xpixel, ypixel + font->ascent + 1, 2411 xpixel, ypixel + font->ascent + 1,
2370 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2412 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2371 } 2413 }
2372 } /* for (col....) */ 2414 } /* for (col....) */
2373 } /* for (row....) */ 2415 } /* for (row....) */
2374 2416
2375#if ENABLE_OVERLAY
2376 scr_swap_overlay ();
2377#endif
2378 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2379
2380 /* 2417 /*
2381 * G: cleanup cursor and display outline cursor if necessary 2418 * G: cleanup cursor and display outline cursor if necessary
2382 */ 2419 */
2383 if (showcursor) 2420 if (showcursor)
2384 { 2421 {
2385 if (focus) 2422 if (focus)
2386 { 2423 {
2387 if (OPTION (Opt_cursorUnderline)) 2424 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2425 *crp ^= RS_Uline;
2389 else 2426 else
2390 { 2427 {
2391 *crp ^= RS_RVid; 2428 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2429#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2444 cursorwidth++;
2408 2445
2409#ifndef NO_CURSORCOLOR 2446#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2447 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2448 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2449 else
2412#endif 2450#endif
2451 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2452
2414 XDrawRectangle (dpy, drawBuffer, gc, 2453 XDrawRectangle (dpy, vt, gc,
2415 Col2Pixel (col), 2454 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2455 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2456 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2418 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2457 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2419 } 2458 }
2420 } 2459 }
2421 2460
2422 /* 2461 /*
2423 * H: cleanup selection 2462 * H: cleanup selection
2424 */ 2463 */
2464#if ENABLE_OVERLAY
2465 scr_swap_overlay ();
2466#endif
2467 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2468
2425 scr_reverse_selection (); 2469 scr_reverse_selection ();
2426 2470
2471 screen.flags = old_screen_flags;
2427 num_scr = 0; 2472 num_scr = 0;
2428 num_scr_allow = 1; 2473 num_scr_allow = 1;
2429} 2474}
2430 2475
2431void 2476void
… …
2454} 2499}
2455 2500
2456void 2501void
2457rxvt_term::scr_recolour () NOTHROW 2502rxvt_term::scr_recolour () NOTHROW
2458{ 2503{
2459 if (1 2504#ifdef HAVE_BG_PIXMAP
2460#if TRANSPARENT 2505 bgPixmap.apply ();
2461 && !am_transparent 2506#else
2462#endif 2507
2463#if XPM_BACKGROUND
2464 && !bgPixmap.pixmap
2465#endif
2466 )
2467 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2469 XClearWindow (dpy, parent[0]); 2509 XClearWindow (dpy, parent[0]);
2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2471#if HAVE_SCROLLBARS 2511
2472 if (scrollBar.win) 2512 if (scrollBar.win)
2473 { 2513 {
2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475 scrollBar.setIdle (); 2515 scrollBar.state = STATE_IDLE;
2476 scrollbar_show (0); 2516 scrollBar.show (0);
2477 }
2478#endif
2479 } 2517 }
2480 2518
2519#endif
2520
2521 /* bgPixmap.apply () does not do the following : */
2481 scr_clear (); 2522 scr_clear ();
2482 scr_touch (true); 2523 scr_touch (true);
2483 want_refresh = 1; 2524 want_refresh = 1;
2484} 2525}
2485 2526
… …
2577{ 2618{
2578 int row, wrote; 2619 int row, wrote;
2579 unsigned int width, towrite; 2620 unsigned int width, towrite;
2580 char r1[] = "\n"; 2621 char r1[] = "\n";
2581 2622
2582 for (row = saveLines - nsaved; 2623 for (row = saveLines + top_row;
2583 row < saveLines + nrow - 1; row++) 2624 row < saveLines + nrow - 1; row++)
2584 { 2625 {
2585 width = row_buf[row].l >= 0 ? row_buf[row].l 2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2586 : ncol; 2627 : ncol;
2587 for (towrite = width; towrite; towrite -= wrote) 2628 for (towrite = width; towrite; towrite -= wrote)
… …
2638 /* convert normal newline chars into common keyboard Return key sequence */ 2679 /* convert normal newline chars into common keyboard Return key sequence */
2639 for (unsigned int i = 0; i < len; i++) 2680 for (unsigned int i = 0; i < len; i++)
2640 if (data[i] == C0_LF) 2681 if (data[i] == C0_LF)
2641 data[i] = C0_CR; 2682 data[i] = C0_CR;
2642 2683
2684 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~");
2686
2643 tt_write (data, len); 2687 tt_write (data, len);
2688
2689 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~");
2644} 2691}
2645 2692
2646/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2647/* 2694/*
2648 * Respond to a notification that a primary selection has been sent 2695 * Respond to a notification that a primary selection has been sent
… …
2723 if (!delete_prop) 2770 if (!delete_prop)
2724 XDeleteProperty (dpy, win, prop); 2771 XDeleteProperty (dpy, win, prop);
2725 2772
2726 selection_wait = Sel_incr; 2773 selection_wait = Sel_incr;
2727 incr_buf_fill = 0; 2774 incr_buf_fill = 0;
2728 incr_ev.start (NOW + 10); 2775 incr_ev.start (10);
2729 2776
2730 goto bailout; 2777 goto bailout;
2731 } 2778 }
2732 2779
2733 if (ct.nitems == 0) 2780 if (ct.nitems == 0)
… …
2742 ct.nitems = incr_buf_fill; 2789 ct.nitems = incr_buf_fill;
2743 incr_buf = 0; 2790 incr_buf = 0;
2744 incr_buf_size = 0; 2791 incr_buf_size = 0;
2745 incr_ev.stop (); 2792 incr_ev.stop ();
2746 } 2793 }
2747 else 2794 else
2748 { 2795 {
2749 if (selection_wait == Sel_normal 2796 if (selection_wait == Sel_normal
2750 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2751 { 2798 {
2752 /* 2799 /*
… …
2759 goto bailout; 2806 goto bailout;
2760 } 2807 }
2761 } 2808 }
2762 else if (selection_wait == Sel_incr) 2809 else if (selection_wait == Sel_incr)
2763 { 2810 {
2764 incr_ev.start (NOW + 10); 2811 incr_ev.start (10);
2765 2812
2766 while (incr_buf_fill + ct.nitems > incr_buf_size) 2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2767 { 2814 {
2768 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2769 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2809 if (selection_wait == Sel_normal) 2856 if (selection_wait == Sel_normal)
2810 selection_wait = Sel_none; 2857 selection_wait = Sel_none;
2811} 2858}
2812 2859
2813void 2860void
2814rxvt_term::incr_cb (time_watcher &w) NOTHROW 2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2815{ 2862{
2816 selection_wait = Sel_none; 2863 selection_wait = Sel_none;
2817 2864
2818 incr_buf_size = 0; 2865 incr_buf_size = 0;
2819 free (incr_buf); 2866 free (incr_buf);
… …
2830 selection_paste (win, prop, true); 2877 selection_paste (win, prop, true);
2831} 2878}
2832 2879
2833/* ------------------------------------------------------------------------- */ 2880/* ------------------------------------------------------------------------- */
2834/* 2881/*
2835 * Request the current selection: 2882 * Request the current selection:
2836 * Order: > internal selection if available 2883 * Order: > internal selection if available
2837 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2838 * > CUT_BUFFER0 2885 * > CUT_BUFFER0
2839 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2840 * will auto fallback to CUT_BUFFER0 2887 * will auto fallback to CUT_BUFFER0
… …
2842 */ 2889 */
2843void 2890void
2844rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845{ 2892{
2846 if (selection.text && selnum == Sel_Primary) 2893 if (selection.text && selnum == Sel_Primary)
2894 {
2847 { /* internal selection */ 2895 /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste (str, strlen (str)); 2897 paste (str, strlen (str));
2850 free (str); 2898 free (str);
2851 return; 2899 return;
2852 } 2900 }
… …
2898/* 2946/*
2899 * Clear all selected text 2947 * Clear all selected text
2900 * EXT: SelectionClear 2948 * EXT: SelectionClear
2901 */ 2949 */
2902void 2950void
2903rxvt_term::selection_clear () NOTHROW 2951rxvt_term::selection_clear (bool clipboard) NOTHROW
2904{ 2952{
2953 if (!clipboard)
2954 {
2905 want_refresh = 1; 2955 want_refresh = 1;
2906 free (selection.text); 2956 free (selection.text);
2907 selection.text = NULL; 2957 selection.text = NULL;
2908 selection.len = 0; 2958 selection.len = 0;
2909 CLEAR_SELECTION (); 2959 CLEAR_SELECTION ();
2910 2960
2911 if (display->selection_owner == this) 2961 if (display->selection_owner == this)
2912 display->selection_owner = 0; 2962 display->selection_owner = 0;
2963 }
2964 else
2965 {
2966 free (selection.clip_text);
2967 selection.clip_text = NULL;
2968 selection.clip_len = 0;
2969
2970 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0;
2972 }
2973}
2974
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2913} 2987}
2914 2988
2915/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
2916/* 2990/*
2917 * Copy a selection into the cut buffer 2991 * Copy a selection into the cut buffer
… …
3043 3117
3044 selection_grab (tm); 3118 selection_grab (tm);
3045} 3119}
3046 3120
3047bool 3121bool
3048rxvt_term::selection_grab (Time tm) NOTHROW 3122rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3049{ 3123{
3124 Atom sel;
3125
3126 if (!clipboard)
3127 {
3050 selection_time = tm; 3128 selection_time = tm;
3129 sel = XA_PRIMARY;
3130 }
3131 else
3132 {
3133 clipboard_time = tm;
3134 sel = xa[XA_CLIPBOARD];
3135 }
3051 3136
3052 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3137 XSetSelectionOwner (dpy, sel, vt, tm);
3053 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3138 if (XGetSelectionOwner (dpy, sel) == vt)
3054 { 3139 {
3055 display->set_selection_owner (this); 3140 display->set_selection_owner (this, clipboard);
3056 return true; 3141 return true;
3057 } 3142 }
3058 else 3143 else
3059 { 3144 {
3060 selection_clear (); 3145 selection_clear (clipboard);
3061 return false; 3146 return false;
3062 } 3147 }
3063 3148
3064#if 0 3149#if 0
3065 XTextProperty ct; 3150 XTextProperty ct;
… …
3118 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3203 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119 3204
3120 while (selection.mark.col > 0 3205 while (selection.mark.col > 0
3121 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3206 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122 --selection.mark.col; 3207 --selection.mark.col;
3123 3208
3124 if (selection.op) 3209 if (selection.op)
3210 {
3125 { /* clear the old selection */ 3211 /* clear the old selection */
3126 selection.beg.row = selection.end.row = selection.mark.row; 3212 selection.beg.row = selection.end.row = selection.mark.row;
3127 selection.beg.col = selection.end.col = selection.mark.col; 3213 selection.beg.col = selection.end.col = selection.mark.col;
3128 } 3214 }
3129 3215
3130 selection.op = SELECTION_INIT; 3216 selection.op = SELECTION_INIT;
… …
3319 * a point/word/line which is either the start or end of the selection 3405 * a point/word/line which is either the start or end of the selection
3320 * and it was decided by whichever point/word/line was `fixed' at the 3406 * and it was decided by whichever point/word/line was `fixed' at the
3321 * time of the most recent button3 press 3407 * time of the most recent button3 press
3322 */ 3408 */
3323 if (button3 && buttonpress) 3409 if (button3 && buttonpress)
3410 {
3324 { /* button3 press */ 3411 /* button3 press */
3325 /* 3412 /*
3326 * first determine which edge of the selection we are closest to 3413 * first determine which edge of the selection we are closest to
3327 */ 3414 */
3328 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3415 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329 || (!ROWCOL_IS_AFTER (pos, selection.end) 3416 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3347 selection.mark.row = selection.beg.row; 3434 selection.mark.row = selection.beg.row;
3348 selection.mark.col = selection.beg.col; 3435 selection.mark.col = selection.beg.col;
3349 } 3436 }
3350 } 3437 }
3351 else 3438 else
3439 {
3352 { /* button1 drag or button3 drag */ 3440 /* button1 drag or button3 drag */
3353 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3441 if (ROWCOL_IS_AFTER (selection.mark, pos))
3354 { 3442 {
3355 if (selection.mark.row == selection.end.row 3443 if (selection.mark.row == selection.end.row
3356 && selection.mark.col == selection.end.col 3444 && selection.mark.col == selection.end.col
3357 && clickchange 3445 && clickchange
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3488 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3489 }
3402 else if (selection.clicks == 3) 3490 else if (selection.clicks == 3)
3403 { 3491 {
3404#if ENABLE_FRILLS 3492#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3493 if (option (Opt_tripleclickwords))
3406 { 3494 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3495 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3496
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3497 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3498 {
… …
3438 selection.end.row++; 3526 selection.end.row++;
3439 } 3527 }
3440 } 3528 }
3441 3529
3442 if (button3 && buttonpress) 3530 if (button3 && buttonpress)
3531 {
3443 { /* mark may need to be changed */ 3532 /* mark may need to be changed */
3444 if (closeto == LEFT) 3533 if (closeto == LEFT)
3445 { 3534 {
3446 selection.mark.row = selection.end.row; 3535 selection.mark.row = selection.end.row;
3447 selection.mark.col = selection.end.col - (selection.clicks == 2); 3536 selection.mark.col = selection.end.col - (selection.clicks == 2);
3448 } 3537 }
… …
3556 else if (rq.target == xa[XA_MULTIPLE]) 3645 else if (rq.target == xa[XA_MULTIPLE])
3557 { 3646 {
3558 /* TODO: Handle MULTIPLE */ 3647 /* TODO: Handle MULTIPLE */
3559 } 3648 }
3560#endif 3649#endif
3561 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3562 { 3651 {
3563 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3564 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3653 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property;
3655 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3565 ev.property = rq.property; 3660 ev.property = rq.property;
3566 } 3661 }
3567 else if (rq.target == XA_STRING 3662 else if (rq.target == XA_STRING
3568 || rq.target == xa[XA_TEXT] 3663 || rq.target == xa[XA_TEXT]
3569 || rq.target == xa[XA_COMPOUND_TEXT] 3664 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3602 { 3697 {
3603 target = xa[XA_COMPOUND_TEXT]; 3698 target = xa[XA_COMPOUND_TEXT];
3604 style = enc_compound_text; 3699 style = enc_compound_text;
3605 } 3700 }
3606 3701
3607 if (selection.text) 3702 if (rq.selection == XA_PRIMARY && selection.text)
3608 { 3703 {
3609 cl = selection.text; 3704 cl = selection.text;
3610 selectlen = selection.len; 3705 selectlen = selection.len;
3706 }
3707 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3708 {
3709 cl = selection.clip_text;
3710 selectlen = selection.clip_len;
3611 } 3711 }
3612 else 3712 else
3613 { 3713 {
3614 cl = L""; 3714 cl = L"";
3615 selectlen = 0; 3715 selectlen = 0;
… …
3647 XFree (ct.value); 3747 XFree (ct.value);
3648 } 3748 }
3649 3749
3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3750 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3651} 3751}
3652
3653/* ------------------------------------------------------------------------- *
3654 * MOUSE ROUTINES *
3655 * ------------------------------------------------------------------------- */
3656
3657/*
3658 * return col/row values corresponding to x/y pixel values
3659 */
3660void
3661rxvt_term::pixel_position (int *x, int *y) NOTHROW
3662{
3663 *x = Pixel2Col (*x);
3664 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3665 *y = Pixel2Row (*y);
3666 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3667}
3668 3752
3669/* ------------------------------------------------------------------------- */ 3753/* ------------------------------------------------------------------------- */
3670#ifdef USE_XIM 3754#ifdef USE_XIM
3671void 3755void
3672rxvt_term::im_set_position (XPoint &pos) NOTHROW 3756rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3699 h += 2; min_it (h, nrow); 3783 h += 2; min_it (h, nrow);
3700 3784
3701 x -= 1; clamp_it (x, 0, ncol - w); 3785 x -= 1; clamp_it (x, 0, ncol - w);
3702 y -= 1; clamp_it (y, 0, nrow - h); 3786 y -= 1; clamp_it (y, 0, nrow - h);
3703 3787
3704 ov_x = x; ov_y = y; 3788 ov.x = x; ov.y = y;
3705 ov_w = w; ov_h = h; 3789 ov.w = w; ov.h = h;
3706 3790
3707 ov_text = new text_t *[h]; 3791 ov.text = new text_t *[h];
3708 ov_rend = new rend_t *[h]; 3792 ov.rend = new rend_t *[h];
3709 3793
3710 for (y = 0; y < h; y++) 3794 for (y = 0; y < h; y++)
3711 { 3795 {
3712 text_t *tp = ov_text[y] = new text_t[w]; 3796 text_t *tp = ov.text[y] = new text_t[w];
3713 rend_t *rp = ov_rend[y] = new rend_t[w]; 3797 rend_t *rp = ov.rend[y] = new rend_t[w];
3714 3798
3715 text_t t0, t1, t2; 3799 text_t t0, t1, t2;
3716 rend_t r = OVERLAY_RSTYLE; 3800 rend_t r = OVERLAY_RSTYLE;
3717 3801
3718 if (y == 0) 3802 if (y == 0)
… …
3737} 3821}
3738 3822
3739void 3823void
3740rxvt_term::scr_overlay_off () NOTHROW 3824rxvt_term::scr_overlay_off () NOTHROW
3741{ 3825{
3742 if (!ov_text) 3826 if (!ov.text)
3743 return; 3827 return;
3744 3828
3745 want_refresh = 1; 3829 want_refresh = 1;
3746 3830
3747 for (int y = 0; y < ov_h; y++) 3831 for (int y = 0; y < ov.h; y++)
3748 { 3832 {
3749 delete [] ov_text[y]; 3833 delete [] ov.text[y];
3750 delete [] ov_rend[y]; 3834 delete [] ov.rend[y];
3751 } 3835 }
3752 3836
3753 delete [] ov_text; ov_text = 0; 3837 delete [] ov.text; ov.text = 0;
3754 delete [] ov_rend; ov_rend = 0; 3838 delete [] ov.rend; ov.rend = 0;
3755} 3839}
3756 3840
3757void 3841void
3758rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3842rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3759{ 3843{
3760 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3844 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3761 return; 3845 return;
3762 3846
3763 x++, y++; 3847 x++, y++;
3764 3848
3765 ov_text[y][x] = text; 3849 ov.text[y][x] = text;
3766 ov_rend[y][x] = rend; 3850 ov.rend[y][x] = rend;
3767} 3851}
3768 3852
3769void 3853void
3770rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3854rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3771{ 3855{
… …
3790} 3874}
3791 3875
3792void 3876void
3793rxvt_term::scr_swap_overlay () NOTHROW 3877rxvt_term::scr_swap_overlay () NOTHROW
3794{ 3878{
3795 if (!ov_text) 3879 if (!ov.text)
3796 return; 3880 return;
3797 3881
3882 // hide cursor if it is within the overlay area
3883 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3884 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3885 screen.flags &= ~Screen_VisibleCursor;
3886
3798 // swap screen mem with overlay 3887 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3888 for (int y = ov.h; y--; )
3800 { 3889 {
3801 text_t *t1 = ov_text[y]; 3890 text_t *t1 = ov.text[y];
3802 rend_t *r1 = ov_rend[y]; 3891 rend_t *r1 = ov.rend[y];
3803 3892
3804 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3893 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3805 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3894 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3806 3895
3807 for (int x = ov_w; x--; ) 3896 for (int x = ov.w; x--; )
3808 { 3897 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3898 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3899 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3811 } 3900 }
3812 } 3901 }

Diff Legend

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