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 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
35 | static 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 | |
… | |
… | |
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 |
|
|
138 | void |
|
|
139 | rxvt_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 | |
159 | void |
160 | void |
… | |
… | |
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) |
… | |
… | |
598 | /* |
599 | /* |
599 | * Change the rendition style for following text |
600 | * Change the rendition style for following text |
600 | */ |
601 | */ |
601 | void |
602 | void |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
603 | rxvt_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 |
… | |
… | |
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; |
… | |
… | |
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 | */ |
1015 | void |
1008 | void |
1016 | rxvt_term::scr_backspace () NOTHROW |
1009 | rxvt_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; |
… | |
… | |
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 | */ |
1237 | void |
1229 | void |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1230 | rxvt_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++) |
… | |
… | |
1474 | { |
1485 | { |
1475 | if (selection.end.row != screen.cur.row |
1486 | if (selection.end.row != screen.cur.row |
1476 | || (selection.end.col + count >= ncol)) |
1487 | || (selection.end.col + count >= ncol)) |
1477 | CLEAR_SELECTION (); |
1488 | CLEAR_SELECTION (); |
1478 | else |
1489 | else |
|
|
1490 | { |
1479 | { /* shift selection */ |
1491 | /* shift selection */ |
1480 | selection.beg.col += count; |
1492 | selection.beg.col += count; |
1481 | selection.mark.col += count; /* XXX: yes? */ |
1493 | selection.mark.col += count; /* XXX: yes? */ |
1482 | selection.end.col += count; |
1494 | selection.end.col += count; |
1483 | } |
1495 | } |
1484 | } |
1496 | } |
… | |
… | |
1489 | case ERASE: |
1501 | case ERASE: |
1490 | screen.cur.col += count; /* don't worry if > ncol */ |
1502 | screen.cur.col += count; /* don't worry if > ncol */ |
1491 | selection_check (1); |
1503 | selection_check (1); |
1492 | screen.cur.col -= count; |
1504 | screen.cur.col -= count; |
1493 | |
1505 | |
1494 | line->l = max (line->l - count, 0); |
|
|
1495 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1506 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1496 | break; |
1507 | break; |
1497 | |
1508 | |
1498 | case DELETE: |
1509 | case DELETE: |
1499 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1510 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1623 | */ |
1634 | */ |
1624 | void |
1635 | void |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1636 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | { |
1637 | { |
1627 | if (mode < 0) |
1638 | if (mode < 0) |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1639 | memset (tabs, 0, ncol); |
1629 | else if (screen.cur.col < ncol) |
1640 | else if (screen.cur.col < ncol) |
1630 | tabs [screen.cur.col] = !!mode; |
1641 | tabs [screen.cur.col] = !!mode; |
1631 | } |
1642 | } |
1632 | |
1643 | |
1633 | /* ------------------------------------------------------------------------- */ |
1644 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | if (rvideo_state != on) |
1659 | if (rvideo_state != on) |
1649 | { |
1660 | { |
1650 | rvideo_state = on; |
1661 | rvideo_state = on; |
1651 | |
1662 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1663 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1664 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1665 | if (bgPixmap.pixmap == None) |
1655 | #endif |
|
|
1656 | #if TRANSPARENT |
|
|
1657 | if (!option (Opt_transparent) || am_transparent == 0) |
|
|
1658 | #endif |
1666 | #endif |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1667 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1668 | |
1661 | XGCValues gcvalue; |
1669 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1670 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1806 | for (i = PART_BEG; i < RC_COUNT; i++) |
1814 | for (i = PART_BEG; i < RC_COUNT; i++) |
1807 | { |
1815 | { |
1808 | min_it (rc[i].col, ncol - 1); |
1816 | min_it (rc[i].col, ncol - 1); |
1809 | min_it (rc[i].row, nrow - 1); |
1817 | min_it (rc[i].row, nrow - 1); |
1810 | } |
1818 | } |
1811 | |
1819 | // 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++) |
1820 | 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); |
1821 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1814 | |
1822 | |
1815 | num_scr_allow = 0; |
1823 | num_scr_allow = 0; |
1816 | |
1824 | |
… | |
… | |
1871 | return true; |
1879 | return true; |
1872 | } |
1880 | } |
1873 | |
1881 | |
1874 | #ifndef NO_BELL |
1882 | #ifndef NO_BELL |
1875 | void |
1883 | void |
1876 | rxvt_term::bell_cb (time_watcher &w) |
1884 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1877 | { |
1885 | { |
1878 | rvideo_bell = false; |
1886 | rvideo_bell = false; |
1879 | scr_rvideo_mode (rvideo_mode); |
1887 | scr_rvideo_mode (rvideo_mode); |
|
|
1888 | refresh_check (); |
1880 | } |
1889 | } |
1881 | #endif |
1890 | #endif |
1882 | |
1891 | |
1883 | /* ------------------------------------------------------------------------- */ |
1892 | /* ------------------------------------------------------------------------- */ |
1884 | void |
1893 | void |
… | |
… | |
1891 | if (option (Opt_mapAlert)) |
1900 | if (option (Opt_mapAlert)) |
1892 | # endif |
1901 | # endif |
1893 | XMapWindow (dpy, parent[0]); |
1902 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1903 | # endif |
1895 | |
1904 | |
|
|
1905 | # if ENABLE_FRILLS |
|
|
1906 | if (option (Opt_urgentOnBell)) |
|
|
1907 | set_urgency (1); |
|
|
1908 | # endif |
|
|
1909 | |
1896 | if (option (Opt_visualBell)) |
1910 | if (option (Opt_visualBell)) |
1897 | { |
1911 | { |
1898 | rvideo_bell = true; |
1912 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1913 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1914 | flush (); |
1901 | |
1915 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1916 | bell_ev.start (VISUAL_BELL_DURATION); |
1903 | } |
1917 | } |
1904 | else |
1918 | else |
1905 | XBell (dpy, 0); |
1919 | XBell (dpy, 0); |
1906 | |
|
|
1907 | #endif |
1920 | #endif |
1908 | } |
1921 | } |
1909 | |
1922 | |
1910 | /* ------------------------------------------------------------------------- */ |
1923 | /* ------------------------------------------------------------------------- */ |
1911 | /* ARGSUSED */ |
1924 | /* ARGSUSED */ |
1912 | void |
1925 | void |
1913 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1926 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1914 | { |
1927 | { |
1915 | #ifdef PRINTPIPE |
1928 | #ifdef PRINTPIPE |
1916 | int nrows, row_start; |
1929 | int nrows, row_start; |
1917 | FILE *fd; |
1930 | FILE *fd = popen_printer (); |
1918 | |
1931 | |
1919 | if ((fd = popen_printer ()) == NULL) |
1932 | if (!fd) |
1920 | return; |
1933 | return; |
1921 | |
1934 | |
1922 | if (fullhist) |
1935 | if (fullhist) |
1923 | { |
1936 | { |
1924 | nrows = nrow - top_row; |
1937 | nrows = nrow - top_row; |
… | |
… | |
1989 | return; |
2002 | return; |
1990 | |
2003 | |
1991 | /* |
2004 | /* |
1992 | * A: set up vars |
2005 | * A: set up vars |
1993 | */ |
2006 | */ |
|
|
2007 | refresh_count = 0; |
|
|
2008 | |
1994 | have_bg = 0; |
2009 | have_bg = 0; |
1995 | refresh_count = 0; |
2010 | #ifdef HAVE_BG_PIXMAP |
1996 | |
|
|
1997 | #if XPM_BACKGROUND |
|
|
1998 | have_bg |= bgPixmap.pixmap != None; |
2011 | have_bg = bgPixmap.pixmap != None; |
1999 | #endif |
|
|
2000 | #if TRANSPARENT |
|
|
2001 | have_bg |= option (Opt_transparent) && am_transparent; |
|
|
2002 | #endif |
2012 | #endif |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2013 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2004 | |
2014 | |
2005 | /* |
2015 | /* |
2006 | * B: reverse any characters which are selected |
2016 | * B: reverse any characters which are selected |
… | |
… | |
2197 | continue; |
2207 | continue; |
2198 | |
2208 | |
2199 | // redraw one or more characters |
2209 | // redraw one or more characters |
2200 | |
2210 | |
2201 | // seek to the beginning of wide characters |
2211 | // seek to the beginning of wide characters |
2202 | while (stp[col] == NOCHAR && col > 0) |
2212 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2203 | --col; |
2213 | --col; |
2204 | |
2214 | |
2205 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2215 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2206 | text_t *text = stp + col; |
2216 | text_t *text = stp + col; |
2207 | int count = 1; |
2217 | int count = 1; |
… | |
… | |
2244 | |
2254 | |
2245 | col--; /* went one too far. move back */ |
2255 | col--; /* went one too far. move back */ |
2246 | count -= i; /* dump any matching trailing chars */ |
2256 | count -= i; /* dump any matching trailing chars */ |
2247 | |
2257 | |
2248 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2258 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2249 | while (i && text[count] == NOCHAR) |
2259 | while (expect_false (i && text[count] == NOCHAR)) |
2250 | count++, i--; |
2260 | count++, i--; |
2251 | |
2261 | |
2252 | /* |
2262 | /* |
2253 | * Determine the attributes for the string |
2263 | * Determine the attributes for the string |
2254 | */ |
2264 | */ |
2255 | int fore = fgcolor_of (rend); // desired foreground |
2265 | int fore = fgcolor_of (rend); // desired foreground |
2256 | int back = bgcolor_of (rend); // desired background |
2266 | int back = bgcolor_of (rend); // desired background |
2257 | |
2267 | |
2258 | // only do special processing if any attributes are set, which is unlikely |
2268 | // 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)) |
2269 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2260 | { |
2270 | { |
2261 | bool invert = rend & RS_RVid; |
2271 | bool invert = rend & RS_RVid; |
2262 | |
2272 | |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2273 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2264 | if (rend & RS_Bold |
|
|
2265 | && fore == Color_fg) |
2274 | if (rend & RS_Bold && fore == Color_fg) |
2266 | { |
2275 | { |
2267 | if (ISSET_PIXCOLOR (Color_BD)) |
2276 | if (ISSET_PIXCOLOR (Color_BD)) |
2268 | fore = Color_BD; |
2277 | fore = Color_BD; |
2269 | # if !ENABLE_STYLES |
2278 | # if !ENABLE_STYLES |
2270 | else |
2279 | else |
2271 | invert = !invert; |
2280 | invert = !invert; |
2272 | # endif |
2281 | # endif |
2273 | } |
2282 | } |
2274 | |
2283 | |
2275 | if (rend & RS_Italic |
2284 | if (rend & RS_Italic && fore == Color_fg) |
2276 | && fore == Color_fg) |
|
|
2277 | { |
2285 | { |
2278 | if (ISSET_PIXCOLOR (Color_IT)) |
2286 | if (ISSET_PIXCOLOR (Color_IT)) |
2279 | fore = Color_IT; |
2287 | fore = Color_IT; |
2280 | # if !ENABLE_STYLES |
2288 | # if !ENABLE_STYLES |
2281 | else |
2289 | else |
… | |
… | |
2315 | } |
2323 | } |
2316 | |
2324 | |
2317 | #ifdef TEXT_BLINK |
2325 | #ifdef TEXT_BLINK |
2318 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2326 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2319 | { |
2327 | { |
2320 | if (!text_blink_ev.active) |
2328 | if (!text_blink_ev.is_active ()) |
2321 | { |
2329 | { |
2322 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2330 | text_blink_ev.again (); |
2323 | hidden_text = 0; |
2331 | hidden_text = 0; |
2324 | } |
2332 | } |
2325 | else if (hidden_text) |
2333 | else if (hidden_text) |
2326 | fore = back; |
2334 | fore = back; |
2327 | } |
2335 | } |
… | |
… | |
2349 | /* |
2357 | /* |
2350 | * Actually do the drawing of the string here |
2358 | * Actually do the drawing of the string here |
2351 | */ |
2359 | */ |
2352 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2360 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2353 | |
2361 | |
2354 | if (have_bg && back == Color_bg) |
2362 | if (expect_true (have_bg && back == Color_bg)) |
2355 | { |
2363 | { |
2356 | // this is very ugly, maybe push it into ->draw? |
2364 | // this is very ugly, maybe push it into ->draw? |
2357 | |
2365 | |
2358 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2366 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2359 | if (text[i] != ' ') |
2367 | if (text[i] != ' ') |
… | |
… | |
2366 | did_clear: ; |
2374 | did_clear: ; |
2367 | } |
2375 | } |
2368 | else |
2376 | else |
2369 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2377 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2370 | |
2378 | |
2371 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2379 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2372 | { |
2380 | { |
2373 | #if ENABLE_FRILLS |
2381 | #if ENABLE_FRILLS |
2374 | if (ISSET_PIXCOLOR (Color_underline)) |
2382 | if (ISSET_PIXCOLOR (Color_underline)) |
2375 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2383 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2376 | else |
2384 | else |
2377 | #endif |
2385 | #endif |
2378 | XSetForeground (dpy, gc, pix_colors[fore]); |
2386 | XSetForeground (dpy, gc, pix_colors[fore]); |
2379 | |
2387 | |
2380 | XDrawLine (dpy, drawBuffer, gc, |
2388 | XDrawLine (dpy, vt, gc, |
2381 | xpixel, ypixel + font->ascent + 1, |
2389 | xpixel, ypixel + font->ascent + 1, |
2382 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2390 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2383 | } |
2391 | } |
2384 | } /* for (col....) */ |
2392 | } /* for (col....) */ |
2385 | } /* for (row....) */ |
2393 | } /* for (row....) */ |
… | |
… | |
2423 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2431 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2424 | else |
2432 | else |
2425 | #endif |
2433 | #endif |
2426 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2434 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2427 | |
2435 | |
2428 | XDrawRectangle (dpy, drawBuffer, gc, |
2436 | XDrawRectangle (dpy, vt, gc, |
2429 | Col2Pixel (col), |
2437 | Col2Pixel (col), |
2430 | Row2Pixel (oldcursor.row), |
2438 | Row2Pixel (oldcursor.row), |
2431 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2439 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2432 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2440 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2433 | } |
2441 | } |
… | |
… | |
2468 | } |
2476 | } |
2469 | |
2477 | |
2470 | void |
2478 | void |
2471 | rxvt_term::scr_recolour () NOTHROW |
2479 | rxvt_term::scr_recolour () NOTHROW |
2472 | { |
2480 | { |
2473 | if (1 |
2481 | #ifdef HAVE_BG_PIXMAP |
2474 | #if TRANSPARENT |
2482 | bgPixmap.apply (); |
2475 | && !am_transparent |
2483 | #else |
2476 | #endif |
2484 | |
2477 | #if XPM_BACKGROUND |
|
|
2478 | && !bgPixmap.pixmap |
|
|
2479 | #endif |
|
|
2480 | ) |
|
|
2481 | { |
|
|
2482 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2485 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2483 | XClearWindow (dpy, parent[0]); |
2486 | XClearWindow (dpy, parent[0]); |
2484 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2487 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2485 | #if HAVE_SCROLLBARS |
2488 | |
2486 | if (scrollBar.win) |
2489 | if (scrollBar.win) |
2487 | { |
2490 | { |
2488 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2491 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2489 | scrollBar.setIdle (); |
2492 | scrollBar.state = STATE_IDLE; |
2490 | scrollbar_show (0); |
2493 | scrollBar.show (0); |
2491 | } |
|
|
2492 | #endif |
|
|
2493 | } |
2494 | } |
2494 | |
2495 | |
|
|
2496 | #endif |
|
|
2497 | |
|
|
2498 | /* bgPixmap.apply () does not do the following : */ |
2495 | scr_clear (); |
2499 | scr_clear (); |
2496 | scr_touch (true); |
2500 | scr_touch (true); |
2497 | want_refresh = 1; |
2501 | want_refresh = 1; |
2498 | } |
2502 | } |
2499 | |
2503 | |
… | |
… | |
2591 | { |
2595 | { |
2592 | int row, wrote; |
2596 | int row, wrote; |
2593 | unsigned int width, towrite; |
2597 | unsigned int width, towrite; |
2594 | char r1[] = "\n"; |
2598 | char r1[] = "\n"; |
2595 | |
2599 | |
2596 | for (row = saveLines - nsaved; |
2600 | for (row = saveLines + top_row; |
2597 | row < saveLines + nrow - 1; row++) |
2601 | row < saveLines + nrow - 1; row++) |
2598 | { |
2602 | { |
2599 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2603 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2600 | : ncol; |
2604 | : ncol; |
2601 | for (towrite = width; towrite; towrite -= wrote) |
2605 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2652 | /* convert normal newline chars into common keyboard Return key sequence */ |
2656 | /* convert normal newline chars into common keyboard Return key sequence */ |
2653 | for (unsigned int i = 0; i < len; i++) |
2657 | for (unsigned int i = 0; i < len; i++) |
2654 | if (data[i] == C0_LF) |
2658 | if (data[i] == C0_LF) |
2655 | data[i] = C0_CR; |
2659 | data[i] = C0_CR; |
2656 | |
2660 | |
|
|
2661 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2662 | tt_printf ("\e[200~"); |
|
|
2663 | |
2657 | tt_write (data, len); |
2664 | tt_write (data, len); |
|
|
2665 | |
|
|
2666 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2667 | tt_printf ("\e[201~"); |
2658 | } |
2668 | } |
2659 | |
2669 | |
2660 | /* ------------------------------------------------------------------------- */ |
2670 | /* ------------------------------------------------------------------------- */ |
2661 | /* |
2671 | /* |
2662 | * Respond to a notification that a primary selection has been sent |
2672 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2737 | if (!delete_prop) |
2747 | if (!delete_prop) |
2738 | XDeleteProperty (dpy, win, prop); |
2748 | XDeleteProperty (dpy, win, prop); |
2739 | |
2749 | |
2740 | selection_wait = Sel_incr; |
2750 | selection_wait = Sel_incr; |
2741 | incr_buf_fill = 0; |
2751 | incr_buf_fill = 0; |
2742 | incr_ev.start (NOW + 10); |
2752 | incr_ev.start (10); |
2743 | |
2753 | |
2744 | goto bailout; |
2754 | goto bailout; |
2745 | } |
2755 | } |
2746 | |
2756 | |
2747 | if (ct.nitems == 0) |
2757 | if (ct.nitems == 0) |
… | |
… | |
2756 | ct.nitems = incr_buf_fill; |
2766 | ct.nitems = incr_buf_fill; |
2757 | incr_buf = 0; |
2767 | incr_buf = 0; |
2758 | incr_buf_size = 0; |
2768 | incr_buf_size = 0; |
2759 | incr_ev.stop (); |
2769 | incr_ev.stop (); |
2760 | } |
2770 | } |
2761 | else |
2771 | else |
2762 | { |
2772 | { |
2763 | if (selection_wait == Sel_normal |
2773 | if (selection_wait == Sel_normal |
2764 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2774 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2765 | { |
2775 | { |
2766 | /* |
2776 | /* |
… | |
… | |
2773 | goto bailout; |
2783 | goto bailout; |
2774 | } |
2784 | } |
2775 | } |
2785 | } |
2776 | else if (selection_wait == Sel_incr) |
2786 | else if (selection_wait == Sel_incr) |
2777 | { |
2787 | { |
2778 | incr_ev.start (NOW + 10); |
2788 | incr_ev.start (10); |
2779 | |
2789 | |
2780 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2790 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2781 | { |
2791 | { |
2782 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2792 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2783 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2793 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2823 | if (selection_wait == Sel_normal) |
2833 | if (selection_wait == Sel_normal) |
2824 | selection_wait = Sel_none; |
2834 | selection_wait = Sel_none; |
2825 | } |
2835 | } |
2826 | |
2836 | |
2827 | void |
2837 | void |
2828 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2838 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2829 | { |
2839 | { |
2830 | selection_wait = Sel_none; |
2840 | selection_wait = Sel_none; |
2831 | |
2841 | |
2832 | incr_buf_size = 0; |
2842 | incr_buf_size = 0; |
2833 | free (incr_buf); |
2843 | free (incr_buf); |
… | |
… | |
2844 | selection_paste (win, prop, true); |
2854 | selection_paste (win, prop, true); |
2845 | } |
2855 | } |
2846 | |
2856 | |
2847 | /* ------------------------------------------------------------------------- */ |
2857 | /* ------------------------------------------------------------------------- */ |
2848 | /* |
2858 | /* |
2849 | * Request the current selection: |
2859 | * Request the current selection: |
2850 | * Order: > internal selection if available |
2860 | * Order: > internal selection if available |
2851 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2861 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2852 | * > CUT_BUFFER0 |
2862 | * > CUT_BUFFER0 |
2853 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2863 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2854 | * will auto fallback to CUT_BUFFER0 |
2864 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2856 | */ |
2866 | */ |
2857 | void |
2867 | void |
2858 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2868 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2859 | { |
2869 | { |
2860 | if (selection.text && selnum == Sel_Primary) |
2870 | if (selection.text && selnum == Sel_Primary) |
|
|
2871 | { |
2861 | { /* internal selection */ |
2872 | /* internal selection */ |
2862 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2873 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2863 | paste (str, strlen (str)); |
2874 | paste (str, strlen (str)); |
2864 | free (str); |
2875 | free (str); |
2865 | return; |
2876 | return; |
2866 | } |
2877 | } |
… | |
… | |
3132 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3143 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3133 | |
3144 | |
3134 | while (selection.mark.col > 0 |
3145 | while (selection.mark.col > 0 |
3135 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3146 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3136 | --selection.mark.col; |
3147 | --selection.mark.col; |
3137 | |
3148 | |
3138 | if (selection.op) |
3149 | if (selection.op) |
|
|
3150 | { |
3139 | { /* clear the old selection */ |
3151 | /* clear the old selection */ |
3140 | selection.beg.row = selection.end.row = selection.mark.row; |
3152 | selection.beg.row = selection.end.row = selection.mark.row; |
3141 | selection.beg.col = selection.end.col = selection.mark.col; |
3153 | selection.beg.col = selection.end.col = selection.mark.col; |
3142 | } |
3154 | } |
3143 | |
3155 | |
3144 | selection.op = SELECTION_INIT; |
3156 | selection.op = SELECTION_INIT; |
… | |
… | |
3333 | * a point/word/line which is either the start or end of the selection |
3345 | * a point/word/line which is either the start or end of the selection |
3334 | * and it was decided by whichever point/word/line was `fixed' at the |
3346 | * and it was decided by whichever point/word/line was `fixed' at the |
3335 | * time of the most recent button3 press |
3347 | * time of the most recent button3 press |
3336 | */ |
3348 | */ |
3337 | if (button3 && buttonpress) |
3349 | if (button3 && buttonpress) |
|
|
3350 | { |
3338 | { /* button3 press */ |
3351 | /* button3 press */ |
3339 | /* |
3352 | /* |
3340 | * first determine which edge of the selection we are closest to |
3353 | * first determine which edge of the selection we are closest to |
3341 | */ |
3354 | */ |
3342 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3355 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3343 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3356 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3361 | selection.mark.row = selection.beg.row; |
3374 | selection.mark.row = selection.beg.row; |
3362 | selection.mark.col = selection.beg.col; |
3375 | selection.mark.col = selection.beg.col; |
3363 | } |
3376 | } |
3364 | } |
3377 | } |
3365 | else |
3378 | else |
|
|
3379 | { |
3366 | { /* button1 drag or button3 drag */ |
3380 | /* button1 drag or button3 drag */ |
3367 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3381 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3368 | { |
3382 | { |
3369 | if (selection.mark.row == selection.end.row |
3383 | if (selection.mark.row == selection.end.row |
3370 | && selection.mark.col == selection.end.col |
3384 | && selection.mark.col == selection.end.col |
3371 | && clickchange |
3385 | && clickchange |
… | |
… | |
3452 | selection.end.row++; |
3466 | selection.end.row++; |
3453 | } |
3467 | } |
3454 | } |
3468 | } |
3455 | |
3469 | |
3456 | if (button3 && buttonpress) |
3470 | if (button3 && buttonpress) |
|
|
3471 | { |
3457 | { /* mark may need to be changed */ |
3472 | /* mark may need to be changed */ |
3458 | if (closeto == LEFT) |
3473 | if (closeto == LEFT) |
3459 | { |
3474 | { |
3460 | selection.mark.row = selection.end.row; |
3475 | selection.mark.row = selection.end.row; |
3461 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3476 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3462 | } |
3477 | } |
… | |
… | |
3661 | XFree (ct.value); |
3676 | XFree (ct.value); |
3662 | } |
3677 | } |
3663 | |
3678 | |
3664 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3679 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3665 | } |
3680 | } |
3666 | |
|
|
3667 | /* ------------------------------------------------------------------------- * |
|
|
3668 | * MOUSE ROUTINES * |
|
|
3669 | * ------------------------------------------------------------------------- */ |
|
|
3670 | |
|
|
3671 | /* |
|
|
3672 | * return col/row values corresponding to x/y pixel values |
|
|
3673 | */ |
|
|
3674 | void |
|
|
3675 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3676 | { |
|
|
3677 | *x = Pixel2Col (*x); |
|
|
3678 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3679 | *y = Pixel2Row (*y); |
|
|
3680 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3681 | } |
|
|
3682 | |
3681 | |
3683 | /* ------------------------------------------------------------------------- */ |
3682 | /* ------------------------------------------------------------------------- */ |
3684 | #ifdef USE_XIM |
3683 | #ifdef USE_XIM |
3685 | void |
3684 | void |
3686 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3685 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |