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.265 by root, Tue Oct 3 11:56:48 2006 UTC vs.
Revision 1.314 by root, Tue Nov 4 14:34:13 2008 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 begin, 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
… …
161{ 162{
162#if ENABLE_OVERLAY 163#if ENABLE_OVERLAY
163 scr_overlay_off (); 164 scr_overlay_off ();
164#endif 165#endif
165 166
167 rvideo_mode = false;
166 view_start = 0; 168 view_start = 0;
167 num_scr = 0; 169 num_scr = 0;
168 170
169 if (ncol == 0) 171 if (ncol == 0)
170 ncol = 80; 172 ncol = 80;
… …
237 selection.text = NULL; 239 selection.text = NULL;
238 selection.len = 0; 240 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 241 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 242 selection.screen = PRIMARY;
241 selection.clicks = 0; 243 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 244 }
244 else 245 else
245 { 246 {
246 /* 247 /*
247 * add or delete rows as appropriate 248 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 278 }
278 279
279 line_t *old_buf = row_buf; 280 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 282
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 284 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 285 int q = total_rows; // rewrapped row
285 286
286 if (top_row) 287 if (top_row)
… …
330 int qcol = 0; 331 int qcol = 0;
331 332
332 // see below for cursor adjustment rationale 333 // see below for cursor adjustment rationale
333 if (p == ocur.row) 334 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 335 screen.cur.row = q - (total_rows - nrow);
335 336
336 // fill a single destination line 337 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 338 while (lofs < llen && qcol < ncol)
338 { 339 {
339 int prow = lofs / prev_ncol; 340 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 341 int pcol = lofs % prev_ncol;
… …
366 } 367 }
367 while (p != pend && q > 0); 368 while (p != pend && q > 0);
368 369
369 term_start = total_rows - nrow; 370 term_start = total_rows - nrow;
370 top_row = q - term_start; 371 top_row = q - term_start;
371 372
372 // make sure all terminal lines exist 373 // make sure all terminal lines exist
373 while (top_row > 0) 374 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 376 }
376 else 377 else
377 { 378 {
378 // if no scrollback exists (yet), wing, instead of wrap 379 // if no scrollback exists (yet), wing, instead of wrap
379 380
380 for (int row = min (nrow, prev_nrow); row--; ) 381 for (int row = min (nrow, prev_nrow); row--; )
381 { 382 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 384 line_t &qline = row_buf [row];
384 385
… …
407 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
408 409
409 prev_nrow = nrow; 410 prev_nrow = nrow;
410 prev_ncol = ncol; 411 prev_ncol = ncol;
411 412
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol);
413 414
414 for (int col = ncol; col--; ) 415 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
416 417
417 if (current_screen != PRIMARY) 418 if (current_screen != PRIMARY)
418 scr_swap_screen (); 419 scr_swap_screen ();
419 420
… …
510} 511}
511 512
512void 513void
513rxvt_term::scr_swap_screen () 514rxvt_term::scr_swap_screen ()
514{ 515{
515 if (!OPTION (Opt_secondaryScreen)) 516 if (!option (Opt_secondaryScreen))
516 return; 517 return;
517 518
518 for (int i = prev_nrow; i--; ) 519 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 520 ::swap (ROW(i), swap_buf [i]);
520 521
… …
542 selection_check (2); /* check for boundary cross */ 543 selection_check (2); /* check for boundary cross */
543 544
544 int i = current_screen; current_screen = scrn; scrn = i; 545 int i = current_screen; current_screen = scrn; scrn = i;
545 546
546#if NSCREENS 547#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 548 if (option (Opt_secondaryScreen))
548 { 549 {
549 num_scr = 0; 550 num_scr = 0;
550 551
551 scr_swap_screen (); 552 scr_swap_screen ();
552 553
… …
555 screen.flags |= Screen_VisibleCursor; 556 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 557 swap.flags |= Screen_VisibleCursor;
557 } 558 }
558 else 559 else
559#endif 560#endif
560 if (OPTION (Opt_secondaryScroll)) 561 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 562 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 563}
563 564
564// clear WrapNext indicator, solidifying position on next line 565// clear WrapNext indicator, solidifying position on next line
565void 566void
… …
598/* 599/*
599 * Change the rendition style for following text 600 * Change the rendition style for following text
600 */ 601 */
601void 602void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 603rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 604{
604 if (set) 605 if (set)
605 rstyle |= style; 606 rstyle |= style;
606 else if (style == ~RS_None) 607 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 608 rstyle = DEFAULT_RSTYLE;
608 else 609 else
609 rstyle &= ~style; 610 rstyle &= ~style;
610 } 611}
611 612
612/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
613/* 614/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 615 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 616 * count positive ==> scroll up
… …
624 want_refresh = 1; 625 want_refresh = 1;
625 num_scr += count; 626 num_scr += count;
626 627
627 if (count > 0 628 if (count > 0
628 && row1 == 0 629 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 630 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 631 {
631 top_row = max (top_row - count, -saveLines); 632 top_row = max (top_row - count, -saveLines);
632 633
633 // scroll everything up 'count' lines 634 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 635 term_start = (term_start + count) % total_rows;
… …
666 line_t &l2 = ROW(i); 667 line_t &l2 = ROW(i);
667 668
668 ::swap (l1, l2); 669 ::swap (l1, l2);
669 l2.touch (); 670 l2.touch ();
670 } 671 }
671 672
672 // move and/or clear selection, if any 673 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
674 { 675 {
675 selection.beg.row -= count; 676 selection.beg.row -= count;
676 selection.end.row -= count; 677 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
685 } 686 }
686 } 687 }
687 688
688 // finally move the view window, if desired 689 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 690 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 691 && view_start != 0
691 && view_start != -saveLines) 692 && view_start != -saveLines)
692 scr_page (UP, count); 693 scr_page (UP, count);
693 694
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 713 {
713 /* move selected region too */ 714 /* move selected region too */
714 selection.beg.row -= count; 715 selection.beg.row -= count;
715 selection.end.row -= count; 716 selection.end.row -= count;
716 selection.mark.row -= count; 717 selection.mark.row -= count;
717 718
718 selection_check (0); 719 selection_check (0);
719 } 720 }
720 } 721 }
721 722
722 // use a simple and robust scrolling algorithm, this 723 // use a simple and robust scrolling algorithm, this
… …
789 790
790 while (str < strend) 791 while (str < strend)
791 { 792 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 794
794 if (c < 0x20) 795 if (expect_false (c < 0x20))
795 if (c == C0_LF) 796 if (c == C0_LF)
796 { 797 {
797 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
798 799
799 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
818 { 819 {
819 scr_tab (1, true); 820 scr_tab (1, true);
820 continue; 821 continue;
821 } 822 }
822 823
824 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
826 { 829 {
827 checksel = 0; 830 checksel = 0;
828 /* 831 /*
829 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 834 * should be a similar check.
832 */ 835 */
833 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
834 } 837 }
835 838
836 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
837 { 840 {
838 scr_do_wrap (); 841 scr_do_wrap ();
839 842
840 line->l = ncol; 843 line->l = ncol;
841 line->is_longer (1); 844 line->is_longer (1);
842 845
843 row = screen.cur.row; 846 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
845 } 848 }
846 849
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 852 c = 0xfffd;
850 853
851 // rely on wcwidth to tell us the character width, do wcwidth before 854 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 855 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 856 // drawing characters below as they might be invalid in the current
854 // locale. 857 // locale.
855 int width = WCWIDTH (c); 858 int width = WCWIDTH (c);
856 859
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 861 {
859 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 863 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
877 } 880 }
878 } 881 }
879 882
880 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
882 885
883 if (width != 0) 886 if (width != 0)
884 { 887 {
885#if !UNICODE_3 888#if !UNICODE_3
… …
891 c = 0xfffd; 894 c = 0xfffd;
892# endif 895# endif
893#endif 896#endif
894 897
895 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
899 { 903 ))
900 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
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 905
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917 907
918 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
920 { 910 {
921 // ...output spaces 911 // ...output spaces
922 c = ' '; 912 c = ' ';
923 // and try the same character next loop iteration 913 // and try the same character next loop iteration
924 --str; 914 --str;
… …
929 do 919 do
930 { 920 {
931 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
933 923
934 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 925 screen.cur.col++;
936 else 926 else
937 { 927 {
938 line->l = ncol; 928 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
941 break; 931 break;
942 } 932 }
943 933
944 c = NOCHAR; 934 c = NOCHAR;
945 } 935 }
946 while (--width > 0); 936 while (expect_false (--width > 0));
947 937
948 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 939 if (expect_false (!width))
950 { 940 {
951 line->touch (); 941 line->touch ();
952 942
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 944 {
955 line->t[c] = ' '; 945 line->t[c] = ' ';
956 line->r[c] = rend; 946 line->r[c] = rend;
957 } 947 }
958 } 948 }
959 } 949 }
950#if ENABLE_COMBINING
960 else // width == 0 951 else // width == 0
961 { 952 {
962#if ENABLE_COMBINING 953 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 { 954 {
955 // handle combining characters
956 // we just tag the accent on the previous on-screen character.
957 // this is arguably not correct, but also arguably not wrong.
958 // we don't handle double-width characters nicely yet.
959 line_t *linep;
960 text_t *tp;
961 rend_t *rp;
962
963 if (screen.cur.col > 0)
964 {
973 linep = line; 965 linep = line;
974 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 967 rp = line->r + screen.cur.col - 1;
968 }
969 else if (screen.cur.row > 0
970 && ROW(screen.cur.row - 1).is_longer ())
971 {
972 linep = &ROW(screen.cur.row - 1);
973 tp = line->t + ncol - 1;
974 rp = line->r + ncol - 1;
975 }
976 else
977 continue;
978
979 linep->touch ();
980
981 while (*tp == NOCHAR && tp > linep->t)
982 tp--, rp--;
983
984 // first try to find a precomposed character
985 unicode_t n = rxvt_compose (*tp, c);
986 if (n == NOCHAR)
987 n = rxvt_composite.compose (*tp, c);
988
989 *tp = n;
990 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 991 }
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 } 992 }
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 993#endif
1000 }
1001 } 994 }
1002 995
1003 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
1004 997
1005#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1014 */ 1007 */
1015void 1008void
1016rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1017{ 1010{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1021 { 1012 {
1022 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1023 { 1014 {
1024#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1017 --screen.cur.row;
1027 return; 1018
1019 want_refresh = 1;
1028#endif 1020#endif
1029 } 1021 }
1030 } 1022 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1032 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1025}
1036 1026
1037/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1038/* 1028/*
1039 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1062 x = i; 1052 x = i;
1063 1053
1064 if (!--count) 1054 if (!--count)
1065 break; 1055 break;
1066 } 1056 }
1067 else 1057 else
1068 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1070 1060
1071 if (count) 1061 if (count)
1072 x = ncol - 1; 1062 x = ncol - 1;
1073 1063
1074 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1077 { 1067 {
1078 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1079 1069
1080 l.touch (x); 1070 l.touch (x);
1081 1071
… …
1188 } 1178 }
1189 } 1179 }
1190 else 1180 else
1191 { 1181 {
1192 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1193 { /* relative origin mode */ 1184 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1196 } 1187 }
1197 else 1188 else
1198 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1231/* 1222/*
1232 * Erase part or whole of a line 1223 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1228 */
1237void 1229void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1231{
1240 unsigned int col, num; 1232 unsigned int col, num;
… …
1249 line.touch (); 1241 line.touch ();
1250 line.is_longer (0); 1242 line.is_longer (0);
1251 1243
1252 switch (mode) 1244 switch (mode)
1253 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1254 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1253 col = screen.cur.col;
1256 num = ncol - col; 1254 num = ncol - col;
1257 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1261 break; 1260 break;
1261
1262 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1263 col = 0; 1263 col = 0;
1264 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1268 break; 1269 break;
1270
1269 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1270 col = 0; 1272 col = 0;
1271 num = ncol; 1273 num = ncol;
1272 line.l = 0; 1274 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1332 return; 1334 return;
1333 1335
1334 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1335 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1342 {
1340 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1344
1345 if (mapped)
1346 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False);
1342 } 1349 }
1343 else 1350 else
1344 { 1351 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1362 }
1352 1363
1353 for (; num--; row++) 1364 for (; num--; row++)
… …
1435 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1436 */ 1447 */
1437void 1448void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1450{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1451 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1445 1453
1446 if (count <= 0) 1454 if (count <= 0)
1447 return; 1455 return;
… …
1449 scr_do_wrap (); 1457 scr_do_wrap ();
1450 1458
1451 selection_check (1); 1459 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1453 1461
1454 row = screen.cur.row; 1462 int row = screen.cur.row;
1455 1463
1456 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1457 1465
1458 line->touch (); 1466 line->touch ();
1459 line->is_longer (0); 1467 line->is_longer (0);
1460 1468
1461 switch (insdel) 1469 switch (insdel)
1462 { 1470 {
1463 case INSERT: 1471 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1472 line->l = min (line->l + count, ncol);
1473
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1475 {
1466 line->t[col] = line->t[col - count]; 1476 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1477 line->r[col] = line->r[col - count];
1468 } 1478 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1479
1472 if (selection.op && current_screen == selection.screen 1480 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1481 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1482 {
1475 if (selection.end.row != screen.cur.row 1483 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1484 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1485 CLEAR_SELECTION ();
1478 else 1486 else
1487 {
1479 { /* shift selection */ 1488 /* shift selection */
1480 selection.beg.col += count; 1489 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1490 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1491 selection.end.col += count;
1483 } 1492 }
1484 } 1493 }
… …
1489 case ERASE: 1498 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1499 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1500 selection_check (1);
1492 screen.cur.col -= count; 1501 screen.cur.col -= count;
1493 1502
1494 line->l = max (line->l - count, 0);
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1503 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1504 break;
1497 1505
1498 case DELETE: 1506 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0);
1509
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1500 1511
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1512 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1513 {
1503 line->t[col] = line->t[col + count]; 1514 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1515 line->r[col] = line->r[col + count];
1505 } 1516 }
1506 1517
1507 line->l = max (line->l - count, 0); 1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1508 scr_blank_line (*line, ncol - count, count, tr); 1522 scr_blank_line (*line, ncol - count, count, tr);
1509 1523
1510 if (selection.op && current_screen == selection.screen 1524 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1526 {
1513 if (selection.end.row != screen.cur.row 1527 if (selection.end.row != screen.cur.row
1514 || (screen.cur.col >= selection.beg.col - count) 1528 || (screen.cur.col >= selection.beg.col - count)
1515 || selection.end.col >= ncol) 1529 || selection.end.col >= ncol)
1516 CLEAR_SELECTION (); 1530 CLEAR_SELECTION ();
1517 else 1531 else
1518 { 1532 {
1519 /* shift selection */ 1533 /* shift selection */
1520 selection.beg.col -= count; 1534 selection.beg.col -= count;
1521 selection.mark.col -= count; /* XXX: yes? */ 1535 selection.mark.col -= count; /* XXX: yes? */
1522 selection.end.col -= count; 1536 selection.end.col -= count;
1523 } 1537 }
1538 }
1524 } 1539 }
1525 1540
1526 break; 1541 break;
1527 } 1542 }
1528} 1543}
… …
1623 */ 1638 */
1624void 1639void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1640rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1641{
1627 if (mode < 0) 1642 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1643 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1644 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1645 tabs [screen.cur.col] = !!mode;
1631} 1646}
1632 1647
1633/* ------------------------------------------------------------------------- */ 1648/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1663 if (rvideo_state != on)
1649 { 1664 {
1650 rvideo_state = on; 1665 rvideo_state = on;
1651 1666
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1668#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1669 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1670#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1671 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1672
1661 XGCValues gcvalue; 1673 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1674 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1818 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1819 {
1808 min_it (rc[i].col, ncol - 1); 1820 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1821 min_it (rc[i].row, nrow - 1);
1810 } 1822 }
1811 1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1824 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1825 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1826
1815 num_scr_allow = 0; 1827 num_scr_allow = 0;
1816 1828
… …
1871 return true; 1883 return true;
1872} 1884}
1873 1885
1874#ifndef NO_BELL 1886#ifndef NO_BELL
1875void 1887void
1876rxvt_term::bell_cb (time_watcher &w) 1888rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1889{
1878 rvideo_bell = false; 1890 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1891 scr_rvideo_mode (rvideo_mode);
1892 refresh_check ();
1880} 1893}
1881#endif 1894#endif
1882 1895
1883/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1884void 1897void
… …
1886{ 1899{
1887#ifndef NO_BELL 1900#ifndef NO_BELL
1888 1901
1889# ifndef NO_MAPALERT 1902# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1903# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1904 if (option (Opt_mapAlert))
1892# endif 1905# endif
1893 XMapWindow (dpy, parent[0]); 1906 XMapWindow (dpy, parent[0]);
1894# endif 1907# endif
1895 1908
1909# if ENABLE_FRILLS
1910 if (option (Opt_urgentOnBell))
1911 set_urgency (1);
1912# endif
1913
1896 if (OPTION (Opt_visualBell)) 1914 if (option (Opt_visualBell))
1897 { 1915 {
1898 rvideo_bell = true; 1916 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1917 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1918 flush ();
1901 1919
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1920 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1921 }
1904 else 1922 else
1905 XBell (dpy, 0); 1923 XBell (dpy, 0);
1906
1907#endif 1924#endif
1908} 1925}
1909 1926
1910/* ------------------------------------------------------------------------- */ 1927/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1928/* ARGSUSED */
1912void 1929void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1930rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1931{
1915#ifdef PRINTPIPE 1932#ifdef PRINTPIPE
1916 int nrows, row_start; 1933 int nrows, row_start;
1917 FILE *fd; 1934 FILE *fd = popen_printer ();
1918 1935
1919 if ((fd = popen_printer ()) == NULL) 1936 if (!fd)
1920 return; 1937 return;
1921 1938
1922 if (fullhist) 1939 if (fullhist)
1923 { 1940 {
1924 nrows = nrow - top_row; 1941 nrows = nrow - top_row;
… …
1989 return; 2006 return;
1990 2007
1991 /* 2008 /*
1992 * A: set up vars 2009 * A: set up vars
1993 */ 2010 */
2011 refresh_count = 0;
2012
1994 have_bg = 0; 2013 have_bg = 0;
1995 refresh_count = 0; 2014#ifdef HAVE_BG_PIXMAP
1996
1997#if XPM_BACKGROUND
1998 have_bg |= bgPixmap.pixmap != None; 2015 have_bg = bgPixmap.pixmap != None;
1999#endif
2000#if TRANSPARENT
2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
2002#endif 2016#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2018
2005 /* 2019 /*
2006 * B: reverse any characters which are selected 2020 * B: reverse any characters which are selected
… …
2051 ccol2 = Color_bg; 2065 ccol2 = Color_bg;
2052#endif 2066#endif
2053 2067
2054 if (showcursor && focus) 2068 if (showcursor && focus)
2055 { 2069 {
2056 if (OPTION (Opt_cursorUnderline)) 2070 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2071 *crp ^= RS_Uline;
2058 else 2072 else
2059 { 2073 {
2060 *crp ^= RS_RVid; 2074 *crp ^= RS_RVid;
2061 *crp = SET_FGCOLOR (*crp, ccol1); 2075 *crp = SET_FGCOLOR (*crp, ccol1);
… …
2197 continue; 2211 continue;
2198 2212
2199 // redraw one or more characters 2213 // redraw one or more characters
2200 2214
2201 // seek to the beginning of wide characters 2215 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2216 while (expect_false (stp[col] == NOCHAR && col > 0))
2203 --col; 2217 --col;
2204 2218
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2206 text_t *text = stp + col; 2220 text_t *text = stp + col;
2207 int count = 1; 2221 int count = 1;
… …
2244 2258
2245 col--; /* went one too far. move back */ 2259 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2260 count -= i; /* dump any matching trailing chars */
2247 2261
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2262 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2263 while (expect_false (i && text[count] == NOCHAR))
2250 count++, i--; 2264 count++, i--;
2251 2265
2252 /* 2266 /*
2253 * Determine the attributes for the string 2267 * Determine the attributes for the string
2254 */ 2268 */
2255 int fore = fgcolor_of (rend); // desired foreground 2269 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2270 int back = bgcolor_of (rend); // desired background
2257 2271
2258 // only do special processing if any attributes are set, which is unlikely 2272 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2273 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2260 { 2274 {
2261 bool invert = rend & RS_RVid; 2275 bool invert = rend & RS_RVid;
2262 2276
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2277#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold
2265 && fore == Color_fg) 2278 if (rend & RS_Bold && fore == Color_fg)
2266 { 2279 {
2267 if (ISSET_PIXCOLOR (Color_BD)) 2280 if (ISSET_PIXCOLOR (Color_BD))
2268 fore = Color_BD; 2281 fore = Color_BD;
2269# if !ENABLE_STYLES 2282# if !ENABLE_STYLES
2270 else 2283 else
2271 invert = !invert; 2284 invert = !invert;
2272# endif 2285# endif
2273 } 2286 }
2274 2287
2275 if (rend & RS_Italic 2288 if (rend & RS_Italic && fore == Color_fg)
2276 && fore == Color_fg)
2277 { 2289 {
2278 if (ISSET_PIXCOLOR (Color_IT)) 2290 if (ISSET_PIXCOLOR (Color_IT))
2279 fore = Color_IT; 2291 fore = Color_IT;
2280# if !ENABLE_STYLES 2292# if !ENABLE_STYLES
2281 else 2293 else
… …
2315 } 2327 }
2316 2328
2317#ifdef TEXT_BLINK 2329#ifdef TEXT_BLINK
2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2330 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2319 { 2331 {
2320 if (!text_blink_ev.active) 2332 if (!text_blink_ev.is_active ())
2321 { 2333 {
2322 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2334 text_blink_ev.again ();
2323 hidden_text = 0; 2335 hidden_text = 0;
2324 } 2336 }
2325 else if (hidden_text) 2337 else if (hidden_text)
2326 fore = back; 2338 fore = back;
2327 } 2339 }
… …
2349 /* 2361 /*
2350 * Actually do the drawing of the string here 2362 * Actually do the drawing of the string here
2351 */ 2363 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2365
2354 if (back == fore) 2366 if (expect_true (have_bg && back == Color_bg))
2355 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2356 else if (back == Color_bg && have_bg)
2357 { 2367 {
2358 // this is very ugly, maybe push it into ->draw? 2368 // this is very ugly, maybe push it into ->draw?
2359 2369
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2370 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2371 if (text[i] != ' ')
2362 { 2372 {
2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2364 goto did_clear; 2374 goto did_clear;
2365 } 2375 }
2366 2376
2367 CLEAR_CHARS (xpixel, ypixel, count); 2377 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ; 2378 did_clear: ;
2369 } 2379 }
2370 else 2380 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2382
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2383 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2384 {
2375#if ENABLE_FRILLS 2385#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2386 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2387 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2388 else
2379#endif 2389#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2390 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2391
2382 XDrawLine (dpy, drawBuffer, gc, 2392 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2393 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2395 }
2386 } /* for (col....) */ 2396 } /* for (col....) */
2387 } /* for (row....) */ 2397 } /* for (row....) */
… …
2396 */ 2406 */
2397 if (showcursor) 2407 if (showcursor)
2398 { 2408 {
2399 if (focus) 2409 if (focus)
2400 { 2410 {
2401 if (OPTION (Opt_cursorUnderline)) 2411 if (option (Opt_cursorUnderline))
2402 *crp ^= RS_Uline; 2412 *crp ^= RS_Uline;
2403 else 2413 else
2404 { 2414 {
2405 *crp ^= RS_RVid; 2415 *crp ^= RS_RVid;
2406#ifndef NO_CURSORCOLOR 2416#ifndef NO_CURSORCOLOR
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2436 else
2427#endif 2437#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2439
2430 XDrawRectangle (dpy, drawBuffer, gc, 2440 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2441 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2442 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2443 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2445 }
… …
2470} 2480}
2471 2481
2472void 2482void
2473rxvt_term::scr_recolour () NOTHROW 2483rxvt_term::scr_recolour () NOTHROW
2474{ 2484{
2475 if (1 2485#ifdef HAVE_BG_PIXMAP
2476#if TRANSPARENT 2486 bgPixmap.apply ();
2477 && !am_transparent 2487#else
2478#endif 2488
2479#if XPM_BACKGROUND
2480 && !bgPixmap.pixmap
2481#endif
2482 )
2483 {
2484 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2489 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2485 XClearWindow (dpy, parent[0]); 2490 XClearWindow (dpy, parent[0]);
2486 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2487#if HAVE_SCROLLBARS 2492
2488 if (scrollBar.win) 2493 if (scrollBar.win)
2489 { 2494 {
2490 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2491 scrollBar.setIdle (); 2496 scrollBar.state = STATE_IDLE;
2492 scrollbar_show (0); 2497 scrollBar.show (0);
2493 }
2494#endif
2495 } 2498 }
2496 2499
2500#endif
2501
2502 /* bgPixmap.apply () does not do the following : */
2497 scr_clear (); 2503 scr_clear ();
2498 scr_touch (true); 2504 scr_touch (true);
2499 want_refresh = 1; 2505 want_refresh = 1;
2500} 2506}
2501 2507
… …
2593{ 2599{
2594 int row, wrote; 2600 int row, wrote;
2595 unsigned int width, towrite; 2601 unsigned int width, towrite;
2596 char r1[] = "\n"; 2602 char r1[] = "\n";
2597 2603
2598 for (row = saveLines - nsaved; 2604 for (row = saveLines + top_row;
2599 row < saveLines + nrow - 1; row++) 2605 row < saveLines + nrow - 1; row++)
2600 { 2606 {
2601 width = row_buf[row].l >= 0 ? row_buf[row].l 2607 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2608 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2609 for (towrite = width; towrite; towrite -= wrote)
… …
2654 /* convert normal newline chars into common keyboard Return key sequence */ 2660 /* convert normal newline chars into common keyboard Return key sequence */
2655 for (unsigned int i = 0; i < len; i++) 2661 for (unsigned int i = 0; i < len; i++)
2656 if (data[i] == C0_LF) 2662 if (data[i] == C0_LF)
2657 data[i] = C0_CR; 2663 data[i] = C0_CR;
2658 2664
2665 if (priv_modes & PrivMode_BracketPaste)
2666 tt_printf ("\e[200~");
2667
2659 tt_write (data, len); 2668 tt_write (data, len);
2669
2670 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~");
2660} 2672}
2661 2673
2662/* ------------------------------------------------------------------------- */ 2674/* ------------------------------------------------------------------------- */
2663/* 2675/*
2664 * Respond to a notification that a primary selection has been sent 2676 * Respond to a notification that a primary selection has been sent
… …
2739 if (!delete_prop) 2751 if (!delete_prop)
2740 XDeleteProperty (dpy, win, prop); 2752 XDeleteProperty (dpy, win, prop);
2741 2753
2742 selection_wait = Sel_incr; 2754 selection_wait = Sel_incr;
2743 incr_buf_fill = 0; 2755 incr_buf_fill = 0;
2744 incr_ev.start (NOW + 10); 2756 incr_ev.start (10);
2745 2757
2746 goto bailout; 2758 goto bailout;
2747 } 2759 }
2748 2760
2749 if (ct.nitems == 0) 2761 if (ct.nitems == 0)
… …
2758 ct.nitems = incr_buf_fill; 2770 ct.nitems = incr_buf_fill;
2759 incr_buf = 0; 2771 incr_buf = 0;
2760 incr_buf_size = 0; 2772 incr_buf_size = 0;
2761 incr_ev.stop (); 2773 incr_ev.stop ();
2762 } 2774 }
2763 else 2775 else
2764 { 2776 {
2765 if (selection_wait == Sel_normal 2777 if (selection_wait == Sel_normal
2766 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2778 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2767 { 2779 {
2768 /* 2780 /*
… …
2775 goto bailout; 2787 goto bailout;
2776 } 2788 }
2777 } 2789 }
2778 else if (selection_wait == Sel_incr) 2790 else if (selection_wait == Sel_incr)
2779 { 2791 {
2780 incr_ev.start (NOW + 10); 2792 incr_ev.start (10);
2781 2793
2782 while (incr_buf_fill + ct.nitems > incr_buf_size) 2794 while (incr_buf_fill + ct.nitems > incr_buf_size)
2783 { 2795 {
2784 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2785 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2825 if (selection_wait == Sel_normal) 2837 if (selection_wait == Sel_normal)
2826 selection_wait = Sel_none; 2838 selection_wait = Sel_none;
2827} 2839}
2828 2840
2829void 2841void
2830rxvt_term::incr_cb (time_watcher &w) NOTHROW 2842rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2831{ 2843{
2832 selection_wait = Sel_none; 2844 selection_wait = Sel_none;
2833 2845
2834 incr_buf_size = 0; 2846 incr_buf_size = 0;
2835 free (incr_buf); 2847 free (incr_buf);
… …
2846 selection_paste (win, prop, true); 2858 selection_paste (win, prop, true);
2847} 2859}
2848 2860
2849/* ------------------------------------------------------------------------- */ 2861/* ------------------------------------------------------------------------- */
2850/* 2862/*
2851 * Request the current selection: 2863 * Request the current selection:
2852 * Order: > internal selection if available 2864 * Order: > internal selection if available
2853 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2865 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2854 * > CUT_BUFFER0 2866 * > CUT_BUFFER0
2855 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2867 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2856 * will auto fallback to CUT_BUFFER0 2868 * will auto fallback to CUT_BUFFER0
… …
2858 */ 2870 */
2859void 2871void
2860rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2872rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2861{ 2873{
2862 if (selection.text && selnum == Sel_Primary) 2874 if (selection.text && selnum == Sel_Primary)
2875 {
2863 { /* internal selection */ 2876 /* internal selection */
2864 char *str = rxvt_wcstombs (selection.text, selection.len); 2877 char *str = rxvt_wcstombs (selection.text, selection.len);
2865 paste (str, strlen (str)); 2878 paste (str, strlen (str));
2866 free (str); 2879 free (str);
2867 return; 2880 return;
2868 } 2881 }
… …
3134 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3147 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3135 3148
3136 while (selection.mark.col > 0 3149 while (selection.mark.col > 0
3137 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3150 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3138 --selection.mark.col; 3151 --selection.mark.col;
3139 3152
3140 if (selection.op) 3153 if (selection.op)
3154 {
3141 { /* clear the old selection */ 3155 /* clear the old selection */
3142 selection.beg.row = selection.end.row = selection.mark.row; 3156 selection.beg.row = selection.end.row = selection.mark.row;
3143 selection.beg.col = selection.end.col = selection.mark.col; 3157 selection.beg.col = selection.end.col = selection.mark.col;
3144 } 3158 }
3145 3159
3146 selection.op = SELECTION_INIT; 3160 selection.op = SELECTION_INIT;
… …
3335 * a point/word/line which is either the start or end of the selection 3349 * a point/word/line which is either the start or end of the selection
3336 * and it was decided by whichever point/word/line was `fixed' at the 3350 * and it was decided by whichever point/word/line was `fixed' at the
3337 * time of the most recent button3 press 3351 * time of the most recent button3 press
3338 */ 3352 */
3339 if (button3 && buttonpress) 3353 if (button3 && buttonpress)
3354 {
3340 { /* button3 press */ 3355 /* button3 press */
3341 /* 3356 /*
3342 * first determine which edge of the selection we are closest to 3357 * first determine which edge of the selection we are closest to
3343 */ 3358 */
3344 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3359 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3345 || (!ROWCOL_IS_AFTER (pos, selection.end) 3360 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3363 selection.mark.row = selection.beg.row; 3378 selection.mark.row = selection.beg.row;
3364 selection.mark.col = selection.beg.col; 3379 selection.mark.col = selection.beg.col;
3365 } 3380 }
3366 } 3381 }
3367 else 3382 else
3383 {
3368 { /* button1 drag or button3 drag */ 3384 /* button1 drag or button3 drag */
3369 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3385 if (ROWCOL_IS_AFTER (selection.mark, pos))
3370 { 3386 {
3371 if (selection.mark.row == selection.end.row 3387 if (selection.mark.row == selection.end.row
3372 && selection.mark.col == selection.end.col 3388 && selection.mark.col == selection.end.col
3373 && clickchange 3389 && clickchange
… …
3416 selection_delimit_word (DN, &selection.end, &selection.end); 3432 selection_delimit_word (DN, &selection.end, &selection.end);
3417 } 3433 }
3418 else if (selection.clicks == 3) 3434 else if (selection.clicks == 3)
3419 { 3435 {
3420#if ENABLE_FRILLS 3436#if ENABLE_FRILLS
3421 if (OPTION (Opt_tripleclickwords)) 3437 if (option (Opt_tripleclickwords))
3422 { 3438 {
3423 selection_delimit_word (UP, &selection.beg, &selection.beg); 3439 selection_delimit_word (UP, &selection.beg, &selection.beg);
3424 3440
3425 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3441 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3426 { 3442 {
… …
3454 selection.end.row++; 3470 selection.end.row++;
3455 } 3471 }
3456 } 3472 }
3457 3473
3458 if (button3 && buttonpress) 3474 if (button3 && buttonpress)
3475 {
3459 { /* mark may need to be changed */ 3476 /* mark may need to be changed */
3460 if (closeto == LEFT) 3477 if (closeto == LEFT)
3461 { 3478 {
3462 selection.mark.row = selection.end.row; 3479 selection.mark.row = selection.end.row;
3463 selection.mark.col = selection.end.col - (selection.clicks == 2); 3480 selection.mark.col = selection.end.col - (selection.clicks == 2);
3464 } 3481 }
… …
3663 XFree (ct.value); 3680 XFree (ct.value);
3664 } 3681 }
3665 3682
3666 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3683 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3667} 3684}
3668
3669/* ------------------------------------------------------------------------- *
3670 * MOUSE ROUTINES *
3671 * ------------------------------------------------------------------------- */
3672
3673/*
3674 * return col/row values corresponding to x/y pixel values
3675 */
3676void
3677rxvt_term::pixel_position (int *x, int *y) NOTHROW
3678{
3679 *x = Pixel2Col (*x);
3680 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3681 *y = Pixel2Row (*y);
3682 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3683}
3684 3685
3685/* ------------------------------------------------------------------------- */ 3686/* ------------------------------------------------------------------------- */
3686#ifdef USE_XIM 3687#ifdef USE_XIM
3687void 3688void
3688rxvt_term::im_set_position (XPoint &pos) NOTHROW 3689rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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