1 | /*--------------------------------*-C-*--------------------------------------* |
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 | |
… | |
… | |
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 (display->display, 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 (display->display, 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 (display->display, 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 | |
… | |
… | |
126 | width = ncol; |
108 | width = ncol; |
127 | } |
109 | } |
128 | |
110 | |
129 | l.touch (); |
111 | l.touch (); |
130 | |
112 | |
131 | efs &= ~RS_baseattrMask; |
113 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
114 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
115 | |
134 | text_t *et = l.t + col; |
116 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
117 | rend_t *er = l.r + col; |
136 | |
118 | |
… | |
… | |
148 | { |
130 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
131 | scr_blank_line (l, 0, ncol, efs); |
150 | |
132 | |
151 | l.l = 0; |
133 | l.l = 0; |
152 | l.f = 0; |
134 | l.f = 0; |
|
|
135 | } |
|
|
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); |
153 | } |
154 | } |
154 | |
155 | |
155 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
156 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
157 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
… | |
… | |
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 | |
512 | void |
513 | void |
513 | rxvt_term::scr_swap_screen () |
514 | rxvt_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 |
565 | void |
566 | void |
… | |
… | |
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 |
… | |
… | |
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; |
… | |
… | |
641 | } |
642 | } |
642 | |
643 | |
643 | // erase newly scrolled-in lines |
644 | // erase newly scrolled-in lines |
644 | for (int i = count; i--; ) |
645 | for (int i = count; i--; ) |
645 | { |
646 | { |
646 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
647 | // it is worth the effort on slower machines |
|
|
648 | line_t &l = ROW(nrow - 1 - i); |
647 | line_t &l = ROW(nrow - 1 - i); |
649 | |
648 | |
|
|
649 | // optimize if already cleared, can be significant on slow machines |
|
|
650 | // could be rolled into scr_blank_screen_mem |
|
|
651 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
652 | { |
650 | scr_blank_line (l, 0, l.l, rstyle); |
653 | scr_blank_line (l, 0, l.l, rstyle); |
651 | |
|
|
652 | l.l = 0; |
654 | l.l = 0; |
653 | l.f = 0; |
655 | l.f = 0; |
|
|
656 | } |
|
|
657 | else |
|
|
658 | scr_blank_screen_mem (l, rstyle); |
654 | } |
659 | } |
655 | |
660 | |
656 | // now copy lines below the scroll region bottom to the |
661 | // now copy lines below the scroll region bottom to the |
657 | // bottom of the screen again, so they look as if they |
662 | // bottom of the screen again, so they look as if they |
658 | // hadn't moved. |
663 | // hadn't moved. |
… | |
… | |
662 | line_t &l2 = ROW(i); |
667 | line_t &l2 = ROW(i); |
663 | |
668 | |
664 | ::swap (l1, l2); |
669 | ::swap (l1, l2); |
665 | l2.touch (); |
670 | l2.touch (); |
666 | } |
671 | } |
667 | |
672 | |
668 | // move and/or clear selection, if any |
673 | // move and/or clear selection, if any |
669 | if (selection.op && current_screen == selection.screen) |
674 | if (selection.op && current_screen == selection.screen) |
670 | { |
675 | { |
671 | selection.beg.row -= count; |
676 | selection.beg.row -= count; |
672 | selection.end.row -= count; |
677 | selection.end.row -= count; |
… | |
… | |
680 | selection.op = SELECTION_CLEAR; |
685 | selection.op = SELECTION_CLEAR; |
681 | } |
686 | } |
682 | } |
687 | } |
683 | |
688 | |
684 | // finally move the view window, if desired |
689 | // finally move the view window, if desired |
685 | if (OPTION (Opt_scrollWithBuffer) |
690 | if (option (Opt_scrollWithBuffer) |
686 | && view_start != 0 |
691 | && view_start != 0 |
687 | && view_start != -saveLines) |
692 | && view_start != -saveLines) |
688 | scr_page (UP, count); |
693 | scr_page (UP, count); |
689 | |
694 | |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
695 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
708 | { |
713 | { |
709 | /* move selected region too */ |
714 | /* move selected region too */ |
710 | selection.beg.row -= count; |
715 | selection.beg.row -= count; |
711 | selection.end.row -= count; |
716 | selection.end.row -= count; |
712 | selection.mark.row -= count; |
717 | selection.mark.row -= count; |
713 | |
718 | |
714 | selection_check (0); |
719 | selection_check (0); |
715 | } |
720 | } |
716 | } |
721 | } |
717 | |
722 | |
718 | // use a simple and robust scrolling algorithm, this |
723 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
758 | ZERO_SCROLLBACK (); |
763 | ZERO_SCROLLBACK (); |
759 | |
764 | |
760 | if (minlines > 0) |
765 | if (minlines > 0) |
761 | { |
766 | { |
762 | minlines += screen.cur.row - screen.bscroll; |
767 | minlines += screen.cur.row - screen.bscroll; |
|
|
768 | min_it (minlines, screen.cur.row - top_row); |
763 | |
769 | |
764 | if (minlines > 0 |
770 | if (minlines > 0 |
765 | && screen.tscroll == 0 |
771 | && screen.tscroll == 0 |
766 | && screen.bscroll == nrow - 1) |
772 | && screen.bscroll == nrow - 1) |
767 | { |
773 | { |
… | |
… | |
784 | |
790 | |
785 | while (str < strend) |
791 | while (str < strend) |
786 | { |
792 | { |
787 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
793 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
788 | |
794 | |
789 | if (c < 0x20) |
795 | if (expect_false (c < 0x20)) |
790 | if (c == C0_LF) |
796 | if (c == C0_LF) |
791 | { |
797 | { |
792 | max_it (line->l, screen.cur.col); |
798 | max_it (line->l, screen.cur.col); |
793 | |
799 | |
794 | screen.flags &= ~Screen_WrapNext; |
800 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
813 | { |
819 | { |
814 | scr_tab (1, true); |
820 | scr_tab (1, true); |
815 | continue; |
821 | continue; |
816 | } |
822 | } |
817 | |
823 | |
|
|
824 | if (expect_false ( |
818 | if (checksel /* see if we're writing within selection */ |
825 | checksel /* see if we're writing within selection */ |
819 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
826 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
820 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
827 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
828 | )) |
821 | { |
829 | { |
822 | checksel = 0; |
830 | checksel = 0; |
823 | /* |
831 | /* |
824 | * If we wrote anywhere in the selected area, kill the selection |
832 | * If we wrote anywhere in the selected area, kill the selection |
825 | * XXX: should we kill the mark too? Possibly, but maybe that |
833 | * XXX: should we kill the mark too? Possibly, but maybe that |
826 | * should be a similar check. |
834 | * should be a similar check. |
827 | */ |
835 | */ |
828 | CLEAR_SELECTION (); |
836 | CLEAR_SELECTION (); |
829 | } |
837 | } |
830 | |
838 | |
831 | if (screen.flags & Screen_WrapNext) |
839 | if (expect_false (screen.flags & Screen_WrapNext)) |
832 | { |
840 | { |
833 | scr_do_wrap (); |
841 | scr_do_wrap (); |
834 | |
842 | |
835 | line->l = ncol; |
843 | line->l = ncol; |
836 | line->is_longer (1); |
844 | line->is_longer (1); |
837 | |
845 | |
838 | row = screen.cur.row; |
846 | row = screen.cur.row; |
839 | line = &ROW(row); /* _must_ refresh */ |
847 | line = &ROW(row); /* _must_ refresh */ |
840 | } |
848 | } |
841 | |
849 | |
842 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
850 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
851 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
844 | c = 0xfffd; |
852 | c = 0xfffd; |
845 | |
853 | |
846 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
854 | // rely on wcwidth to tell us the character width, do wcwidth before |
847 | // do wcwidth before further replacements, as wcwidth might return -1 |
855 | // further replacements, as wcwidth might return -1 for the line |
848 | // for the line drawing characters below as they might be invalid in the current |
856 | // drawing characters below as they might be invalid in the current |
849 | // locale. |
857 | // locale. |
850 | int width = c < 0x100 ? 1 : wcwidth (c); |
858 | int width = WCWIDTH (c); |
851 | |
859 | |
852 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
860 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
853 | { |
861 | { |
854 | // vt100 special graphics and line drawing |
862 | // vt100 special graphics and line drawing |
855 | // 5f-7e standard vt100 |
863 | // 5f-7e standard vt100 |
856 | // 40-5e rxvt extension for extra curses acs chars |
864 | // 40-5e rxvt extension for extra curses acs chars |
857 | static uint16_t vt100_0[62] = { // 41 .. 7e |
865 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
870 | c = vt100_0[c - 0x41]; |
878 | c = vt100_0[c - 0x41]; |
871 | width = 1; // vt100 line drawing characters are always single-width |
879 | width = 1; // vt100 line drawing characters are always single-width |
872 | } |
880 | } |
873 | } |
881 | } |
874 | |
882 | |
875 | if (screen.flags & Screen_Insert) |
883 | if (expect_false (screen.flags & Screen_Insert)) |
876 | scr_insdel_chars (width, INSERT); |
884 | scr_insdel_chars (width, INSERT); |
877 | |
885 | |
878 | if (width != 0) |
886 | if (width != 0) |
879 | { |
887 | { |
880 | #if !UNICODE_3 |
888 | #if !UNICODE_3 |
… | |
… | |
886 | c = 0xfffd; |
894 | c = 0xfffd; |
887 | # endif |
895 | # endif |
888 | #endif |
896 | #endif |
889 | |
897 | |
890 | // nuke the character at this position, if required |
898 | // nuke the character at this position, if required |
|
|
899 | if (expect_false ( |
891 | if (line->t[screen.cur.col] == NOCHAR |
900 | line->t[screen.cur.col] == NOCHAR |
892 | || (screen.cur.col < ncol - 1 |
901 | || (screen.cur.col < ncol - 1 |
893 | && line->t[screen.cur.col + 1] == NOCHAR)) |
902 | && line->t[screen.cur.col + 1] == NOCHAR) |
894 | { |
903 | )) |
895 | int col = screen.cur.col; |
904 | scr_kill_char (*line, screen.cur.col); |
896 | |
|
|
897 | // find begin |
|
|
898 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
899 | col--; |
|
|
900 | |
|
|
901 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
902 | |
|
|
903 | // found begin, nuke |
|
|
904 | do { |
|
|
905 | line->t[col] = ' '; |
|
|
906 | line->r[col] = rend; |
|
|
907 | col++; |
|
|
908 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
909 | } |
|
|
910 | |
905 | |
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
912 | |
907 | |
913 | // if the character doesn't fit into the remaining columns... |
908 | // if the character doesn't fit into the remaining columns... |
914 | if (screen.cur.col > ncol - width && ncol >= width) |
909 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
915 | { |
910 | { |
916 | // ...output spaces |
911 | // ...output spaces |
917 | c = ' '; |
912 | c = ' '; |
918 | // and try the same character next loop iteration |
913 | // and try the same character next loop iteration |
919 | --str; |
914 | --str; |
… | |
… | |
924 | do |
919 | do |
925 | { |
920 | { |
926 | line->t[screen.cur.col] = c; |
921 | line->t[screen.cur.col] = c; |
927 | line->r[screen.cur.col] = rend; |
922 | line->r[screen.cur.col] = rend; |
928 | |
923 | |
929 | if (screen.cur.col < ncol - 1) |
924 | if (expect_true (screen.cur.col < ncol - 1)) |
930 | screen.cur.col++; |
925 | screen.cur.col++; |
931 | else |
926 | else |
932 | { |
927 | { |
933 | line->l = ncol; |
928 | line->l = ncol; |
934 | if (screen.flags & Screen_Autowrap) |
929 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
936 | break; |
931 | break; |
937 | } |
932 | } |
938 | |
933 | |
939 | c = NOCHAR; |
934 | c = NOCHAR; |
940 | } |
935 | } |
941 | while (--width > 0); |
936 | while (expect_false (--width > 0)); |
942 | |
937 | |
943 | // pad with spaces when overwriting wide character with smaller one |
938 | // pad with spaces when overwriting wide character with smaller one |
944 | if (!width) |
939 | if (expect_false (!width)) |
945 | { |
940 | { |
946 | line->touch (); |
941 | line->touch (); |
947 | |
942 | |
948 | 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++) |
949 | { |
944 | { |
950 | line->t[c] = ' '; |
945 | line->t[c] = ' '; |
951 | line->r[c] = rend; |
946 | line->r[c] = rend; |
952 | } |
947 | } |
953 | } |
948 | } |
954 | } |
949 | } |
|
|
950 | #if ENABLE_COMBINING |
955 | else // width == 0 |
951 | else // width == 0 |
956 | { |
952 | { |
957 | #if ENABLE_COMBINING |
953 | if (c != 0xfeff) // ignore BOM |
958 | // handle combining characters |
|
|
959 | // we just tag the accent on the previous on-screen character. |
|
|
960 | // this is arguably not correct, but also arguably not wrong. |
|
|
961 | // we don't handle double-width characters nicely yet. |
|
|
962 | line_t *linep; |
|
|
963 | text_t *tp; |
|
|
964 | rend_t *rp; |
|
|
965 | |
|
|
966 | if (screen.cur.col > 0) |
|
|
967 | { |
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 | { |
968 | linep = line; |
965 | linep = line; |
969 | tp = line->t + screen.cur.col - 1; |
966 | tp = line->t + screen.cur.col - 1; |
970 | 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)); |
971 | } |
991 | } |
972 | else if (screen.cur.row > 0 |
|
|
973 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
974 | { |
|
|
975 | linep = &ROW(screen.cur.row - 1); |
|
|
976 | tp = line->t + ncol - 1; |
|
|
977 | rp = line->r + ncol - 1; |
|
|
978 | } |
992 | } |
979 | else |
|
|
980 | continue; |
|
|
981 | |
|
|
982 | linep->touch (); |
|
|
983 | |
|
|
984 | while (*tp == NOCHAR && tp > linep->t) |
|
|
985 | tp--, rp--; |
|
|
986 | |
|
|
987 | // first try to find a precomposed character |
|
|
988 | unicode_t n = rxvt_compose (*tp, c); |
|
|
989 | if (n == NOCHAR) |
|
|
990 | n = rxvt_composite.compose (*tp, c); |
|
|
991 | |
|
|
992 | *tp = n; |
|
|
993 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
994 | #endif |
993 | #endif |
995 | } |
|
|
996 | } |
994 | } |
997 | |
995 | |
998 | max_it (line->l, screen.cur.col); |
996 | max_it (line->l, screen.cur.col); |
999 | |
997 | |
1000 | #ifdef DEBUG_STRICT |
998 | #ifdef DEBUG_STRICT |
… | |
… | |
1008 | * XTERM_SEQ: CTRL-H |
1006 | * XTERM_SEQ: CTRL-H |
1009 | */ |
1007 | */ |
1010 | void |
1008 | void |
1011 | rxvt_term::scr_backspace () NOTHROW |
1009 | rxvt_term::scr_backspace () NOTHROW |
1012 | { |
1010 | { |
1013 | want_refresh = 1; |
|
|
1014 | |
|
|
1015 | if (screen.cur.col == 0) |
1011 | if (screen.cur.col == 0) |
1016 | { |
1012 | { |
1017 | if (screen.cur.row > 0) |
1013 | if (screen.cur.row > 0) |
1018 | { |
1014 | { |
1019 | #ifdef TERMCAP_HAS_BW |
1015 | #ifdef TERMCAP_HAS_BW |
1020 | screen.cur.col = ncol - 1; |
1016 | screen.cur.col = ncol - 1; |
1021 | screen.cur.row--; |
1017 | --screen.cur.row; |
1022 | return; |
1018 | |
|
|
1019 | want_refresh = 1; |
1023 | #endif |
1020 | #endif |
1024 | } |
1021 | } |
1025 | } |
1022 | } |
1026 | else if (!(screen.flags & Screen_WrapNext)) |
1023 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1024 | scr_gotorc (0, -1, RELATIVE); |
1028 | |
|
|
1029 | screen.flags &= ~Screen_WrapNext; |
|
|
1030 | } |
1025 | } |
1031 | |
1026 | |
1032 | /* ------------------------------------------------------------------------- */ |
1027 | /* ------------------------------------------------------------------------- */ |
1033 | /* |
1028 | /* |
1034 | * Process Horizontal Tab |
1029 | * Process Horizontal Tab |
… | |
… | |
1057 | x = i; |
1052 | x = i; |
1058 | |
1053 | |
1059 | if (!--count) |
1054 | if (!--count) |
1060 | break; |
1055 | break; |
1061 | } |
1056 | } |
1062 | else |
1057 | else |
1063 | ht &= l.t[i] == ' ' |
1058 | ht &= l.t[i] == ' ' |
1064 | && RS_SAME (l.r[i], base_rend); |
1059 | && RS_SAME (l.r[i], base_rend); |
1065 | |
1060 | |
1066 | if (count) |
1061 | if (count) |
1067 | x = ncol - 1; |
1062 | x = ncol - 1; |
1068 | |
1063 | |
1069 | // store horizontal tab commands as characters inside the text |
1064 | // store horizontal tab commands as characters inside the text |
1070 | // buffer so they can be selected and pasted. |
1065 | // buffer so they can be selected and pasted. |
1071 | if (ht && OPTION (Opt_pastableTabs)) |
1066 | if (ht && option (Opt_pastableTabs)) |
1072 | { |
1067 | { |
1073 | base_rend = SET_FONT (base_rend, 0); |
1068 | base_rend = SET_FONT (base_rend, 0); |
1074 | |
1069 | |
1075 | l.touch (x); |
1070 | l.touch (x); |
1076 | |
1071 | |
… | |
… | |
1109 | * Process DEC Back Index |
1104 | * Process DEC Back Index |
1110 | * XTERM_SEQ: ESC 6 |
1105 | * XTERM_SEQ: ESC 6 |
1111 | * Move cursor left in row. If we're at the left boundary, shift everything |
1106 | * Move cursor left in row. If we're at the left boundary, shift everything |
1112 | * in that row right. Clear left column. |
1107 | * in that row right. Clear left column. |
1113 | */ |
1108 | */ |
1114 | #if ENABLE_FRILLS |
1109 | #if !ENABLE_MINIMAL |
1115 | void |
1110 | void |
1116 | rxvt_term::scr_backindex () NOTHROW |
1111 | rxvt_term::scr_backindex () NOTHROW |
1117 | { |
1112 | { |
1118 | if (screen.cur.col > 0) |
1113 | if (screen.cur.col > 0) |
1119 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1114 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1126 | * Process DEC Forward Index |
1121 | * Process DEC Forward Index |
1127 | * XTERM_SEQ: ESC 9 |
1122 | * XTERM_SEQ: ESC 9 |
1128 | * Move cursor right in row. If we're at the right boundary, shift everything |
1123 | * Move cursor right in row. If we're at the right boundary, shift everything |
1129 | * in that row left. Clear right column. |
1124 | * in that row left. Clear right column. |
1130 | */ |
1125 | */ |
1131 | #if ENABLE_FRILLS |
1126 | #if !ENABLE_MINIMAL |
1132 | void |
1127 | void |
1133 | rxvt_term::scr_forwardindex () NOTHROW |
1128 | rxvt_term::scr_forwardindex () NOTHROW |
1134 | { |
1129 | { |
1135 | if (screen.cur.col < ncol - 1) |
1130 | if (screen.cur.col < ncol - 1) |
1136 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1131 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1183 | } |
1178 | } |
1184 | } |
1179 | } |
1185 | else |
1180 | else |
1186 | { |
1181 | { |
1187 | if (screen.flags & Screen_Relative) |
1182 | if (screen.flags & Screen_Relative) |
|
|
1183 | { |
1188 | { /* relative origin mode */ |
1184 | /* relative origin mode */ |
1189 | screen.cur.row = row + screen.tscroll; |
1185 | screen.cur.row = row + screen.tscroll; |
1190 | min_it (screen.cur.row, screen.bscroll); |
1186 | min_it (screen.cur.row, screen.bscroll); |
1191 | } |
1187 | } |
1192 | else |
1188 | else |
1193 | screen.cur.row = row; |
1189 | screen.cur.row = row; |
… | |
… | |
1226 | /* |
1222 | /* |
1227 | * Erase part or whole of a line |
1223 | * Erase part or whole of a line |
1228 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1224 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1229 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1225 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1230 | * 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 |
1231 | */ |
1228 | */ |
1232 | void |
1229 | void |
1233 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1230 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1234 | { |
1231 | { |
1235 | unsigned int col, num; |
1232 | unsigned int col, num; |
… | |
… | |
1244 | line.touch (); |
1241 | line.touch (); |
1245 | line.is_longer (0); |
1242 | line.is_longer (0); |
1246 | |
1243 | |
1247 | switch (mode) |
1244 | switch (mode) |
1248 | { |
1245 | { |
|
|
1246 | case 3: |
|
|
1247 | if (screen.flags & Screen_WrapNext) |
|
|
1248 | return; |
|
|
1249 | |
|
|
1250 | /* fall through */ |
|
|
1251 | |
1249 | case 0: /* erase to end of line */ |
1252 | case 0: /* erase to end of line */ |
1250 | col = screen.cur.col; |
1253 | col = screen.cur.col; |
1251 | num = ncol - col; |
1254 | num = ncol - col; |
1252 | min_it (line.l, col); |
1255 | min_it (line.l, col); |
|
|
1256 | |
1253 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1257 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1254 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1258 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1255 | CLEAR_SELECTION (); |
1259 | CLEAR_SELECTION (); |
1256 | break; |
1260 | break; |
|
|
1261 | |
1257 | case 1: /* erase to beginning of line */ |
1262 | case 1: /* erase to beginning of line */ |
1258 | col = 0; |
1263 | col = 0; |
1259 | num = screen.cur.col + 1; |
1264 | num = screen.cur.col + 1; |
|
|
1265 | |
1260 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1266 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1261 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1267 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1262 | CLEAR_SELECTION (); |
1268 | CLEAR_SELECTION (); |
1263 | break; |
1269 | break; |
|
|
1270 | |
1264 | case 2: /* erase whole line */ |
1271 | case 2: /* erase whole line */ |
1265 | col = 0; |
1272 | col = 0; |
1266 | num = ncol; |
1273 | num = ncol; |
1267 | line.l = 0; |
1274 | line.l = 0; |
1268 | if (selection.beg.row <= screen.cur.row |
1275 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1326 | if (row >= nrow) /* Out Of Bounds */ |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1327 | return; |
1334 | return; |
1328 | |
1335 | |
1329 | min_it (num, nrow - row); |
1336 | min_it (num, nrow - row); |
1330 | |
1337 | |
|
|
1338 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1331 | if (rstyle & (RS_RVid | RS_Uline)) |
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1332 | ren = (rend_t) ~RS_None; |
1340 | ren = (rend_t) ~RS_None; |
1333 | else if (GET_BASEBG (rstyle) == Color_bg) |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1334 | { |
1342 | { |
1335 | ren = DEFAULT_RSTYLE; |
1343 | ren = DEFAULT_RSTYLE; |
1336 | 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); |
1337 | } |
1349 | } |
1338 | else |
1350 | else |
1339 | { |
1351 | { |
1340 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1353 | |
1341 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1343 | ERASE_ROWS (row, num); |
1356 | XFillRectangle (dpy, vt, gc, |
|
|
1357 | 0, Row2Pixel (row), |
|
|
1358 | (unsigned int)width, |
|
|
1359 | (unsigned int)Height2Pixel (num)); |
1344 | gcvalue.foreground = pix_colors[Color_fg]; |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1346 | } |
1362 | } |
1347 | |
1363 | |
1348 | for (; num--; row++) |
1364 | for (; num--; row++) |
1349 | { |
1365 | { |
1350 | scr_blank_screen_mem (ROW(row), rstyle); |
1366 | scr_blank_screen_mem (ROW(row), rstyle); |
1351 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1367 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1352 | } |
1368 | } |
1353 | } |
1369 | } |
1354 | |
1370 | |
1355 | #if ENABLE_FRILLS |
1371 | #if !ENABLE_MINIMAL |
1356 | void |
1372 | void |
1357 | rxvt_term::scr_erase_savelines () NOTHROW |
1373 | rxvt_term::scr_erase_savelines () NOTHROW |
1358 | { |
1374 | { |
1359 | want_refresh = 1; |
1375 | want_refresh = 1; |
1360 | ZERO_SCROLLBACK (); |
1376 | ZERO_SCROLLBACK (); |
… | |
… | |
1469 | { |
1485 | { |
1470 | if (selection.end.row != screen.cur.row |
1486 | if (selection.end.row != screen.cur.row |
1471 | || (selection.end.col + count >= ncol)) |
1487 | || (selection.end.col + count >= ncol)) |
1472 | CLEAR_SELECTION (); |
1488 | CLEAR_SELECTION (); |
1473 | else |
1489 | else |
|
|
1490 | { |
1474 | { /* shift selection */ |
1491 | /* shift selection */ |
1475 | selection.beg.col += count; |
1492 | selection.beg.col += count; |
1476 | selection.mark.col += count; /* XXX: yes? */ |
1493 | selection.mark.col += count; /* XXX: yes? */ |
1477 | selection.end.col += count; |
1494 | selection.end.col += count; |
1478 | } |
1495 | } |
1479 | } |
1496 | } |
… | |
… | |
1484 | case ERASE: |
1501 | case ERASE: |
1485 | screen.cur.col += count; /* don't worry if > ncol */ |
1502 | screen.cur.col += count; /* don't worry if > ncol */ |
1486 | selection_check (1); |
1503 | selection_check (1); |
1487 | screen.cur.col -= count; |
1504 | screen.cur.col -= count; |
1488 | |
1505 | |
1489 | line->l = max (line->l - count, 0); |
|
|
1490 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1506 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1491 | break; |
1507 | break; |
1492 | |
1508 | |
1493 | case DELETE: |
1509 | case DELETE: |
1494 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1510 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1618 | */ |
1634 | */ |
1619 | void |
1635 | void |
1620 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1636 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1621 | { |
1637 | { |
1622 | if (mode < 0) |
1638 | if (mode < 0) |
1623 | memset (tabs, 0, ncol * sizeof (char)); |
1639 | memset (tabs, 0, ncol); |
1624 | else if (screen.cur.col < ncol) |
1640 | else if (screen.cur.col < ncol) |
1625 | tabs [screen.cur.col] = !!mode; |
1641 | tabs [screen.cur.col] = !!mode; |
1626 | } |
1642 | } |
1627 | |
1643 | |
1628 | /* ------------------------------------------------------------------------- */ |
1644 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1643 | if (rvideo_state != on) |
1659 | if (rvideo_state != on) |
1644 | { |
1660 | { |
1645 | rvideo_state = on; |
1661 | rvideo_state = on; |
1646 | |
1662 | |
1647 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1663 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1648 | #if XPM_BACKGROUND |
1664 | #ifdef HAVE_BG_PIXMAP |
1649 | if (bgPixmap.pixmap == None) |
1665 | if (bgPixmap.pixmap == None) |
1650 | #endif |
1666 | #endif |
1651 | #if TRANSPARENT |
|
|
1652 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1653 | #endif |
|
|
1654 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1667 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1655 | |
1668 | |
1656 | XGCValues gcvalue; |
1669 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1670 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1671 | gcvalue.background = pix_colors[Color_bg]; |
1659 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1672 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1660 | |
1673 | |
1661 | scr_clear (); |
1674 | scr_clear (); |
1662 | scr_touch (true); |
1675 | scr_touch (true); |
1663 | } |
1676 | } |
1664 | } |
1677 | } |
… | |
… | |
1749 | { |
1762 | { |
1750 | bool found = false; |
1763 | bool found = false; |
1751 | |
1764 | |
1752 | for (int i = 0; i < nrow; i++) |
1765 | for (int i = 0; i < nrow; i++) |
1753 | { |
1766 | { |
1754 | int col = 0; |
|
|
1755 | rend_t *drp = drawn_buf[i].r; |
1767 | rend_t *drp = drawn_buf[i].r; |
1756 | |
1768 | |
1757 | for (; col < ncol; col++, drp++) |
1769 | for (int col = 0; col < ncol; col++, drp++) |
1758 | if ((*drp & mask) == value) |
1770 | if ((*drp & mask) == value) |
1759 | { |
1771 | { |
1760 | found = true; |
1772 | found = true; |
1761 | *drp = ~value; |
1773 | *drp = ~value; |
1762 | } |
1774 | } |
… | |
… | |
1802 | for (i = PART_BEG; i < RC_COUNT; i++) |
1814 | for (i = PART_BEG; i < RC_COUNT; i++) |
1803 | { |
1815 | { |
1804 | min_it (rc[i].col, ncol - 1); |
1816 | min_it (rc[i].col, ncol - 1); |
1805 | min_it (rc[i].row, nrow - 1); |
1817 | min_it (rc[i].row, nrow - 1); |
1806 | } |
1818 | } |
1807 | |
1819 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1808 | 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++) |
1809 | 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); |
1810 | |
1822 | |
1811 | num_scr_allow = 0; |
1823 | num_scr_allow = 0; |
1812 | |
1824 | |
… | |
… | |
1867 | return true; |
1879 | return true; |
1868 | } |
1880 | } |
1869 | |
1881 | |
1870 | #ifndef NO_BELL |
1882 | #ifndef NO_BELL |
1871 | void |
1883 | void |
1872 | rxvt_term::bell_cb (time_watcher &w) |
1884 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1873 | { |
1885 | { |
1874 | rvideo_bell = false; |
1886 | rvideo_bell = false; |
1875 | scr_rvideo_mode (rvideo_mode); |
1887 | scr_rvideo_mode (rvideo_mode); |
|
|
1888 | refresh_check (); |
1876 | } |
1889 | } |
1877 | #endif |
1890 | #endif |
1878 | |
1891 | |
1879 | /* ------------------------------------------------------------------------- */ |
1892 | /* ------------------------------------------------------------------------- */ |
1880 | void |
1893 | void |
… | |
… | |
1882 | { |
1895 | { |
1883 | #ifndef NO_BELL |
1896 | #ifndef NO_BELL |
1884 | |
1897 | |
1885 | # ifndef NO_MAPALERT |
1898 | # ifndef NO_MAPALERT |
1886 | # ifdef MAPALERT_OPTION |
1899 | # ifdef MAPALERT_OPTION |
1887 | if (OPTION (Opt_mapAlert)) |
1900 | if (option (Opt_mapAlert)) |
1888 | # endif |
1901 | # endif |
1889 | XMapWindow (display->display, parent[0]); |
1902 | XMapWindow (dpy, parent[0]); |
1890 | # endif |
1903 | # endif |
1891 | |
1904 | |
|
|
1905 | # if ENABLE_FRILLS |
|
|
1906 | if (option (Opt_urgentOnBell)) |
|
|
1907 | set_urgency (1); |
|
|
1908 | # endif |
|
|
1909 | |
1892 | if (OPTION (Opt_visualBell)) |
1910 | if (option (Opt_visualBell)) |
1893 | { |
1911 | { |
1894 | rvideo_bell = true; |
1912 | rvideo_bell = true; |
1895 | scr_rvideo_mode (rvideo_mode); |
1913 | scr_rvideo_mode (rvideo_mode); |
1896 | display->flush (); |
1914 | flush (); |
1897 | |
1915 | |
1898 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1916 | bell_ev.start (VISUAL_BELL_DURATION); |
1899 | } |
1917 | } |
1900 | else |
1918 | else |
1901 | XBell (display->display, 0); |
1919 | XBell (dpy, 0); |
1902 | |
|
|
1903 | #endif |
1920 | #endif |
1904 | } |
1921 | } |
1905 | |
1922 | |
1906 | /* ------------------------------------------------------------------------- */ |
1923 | /* ------------------------------------------------------------------------- */ |
1907 | /* ARGSUSED */ |
1924 | /* ARGSUSED */ |
1908 | void |
1925 | void |
1909 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1926 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1910 | { |
1927 | { |
1911 | #ifdef PRINTPIPE |
1928 | #ifdef PRINTPIPE |
1912 | int nrows, row_start; |
1929 | int nrows, row_start; |
1913 | FILE *fd; |
1930 | FILE *fd = popen_printer (); |
1914 | |
1931 | |
1915 | if ((fd = popen_printer ()) == NULL) |
1932 | if (!fd) |
1916 | return; |
1933 | return; |
1917 | |
1934 | |
1918 | if (fullhist) |
1935 | if (fullhist) |
1919 | { |
1936 | { |
1920 | nrows = nrow - top_row; |
1937 | nrows = nrow - top_row; |
… | |
… | |
1965 | * screen.text/screen.rend contain what the screen will change to. |
1982 | * screen.text/screen.rend contain what the screen will change to. |
1966 | */ |
1983 | */ |
1967 | void |
1984 | void |
1968 | rxvt_term::scr_refresh () NOTHROW |
1985 | rxvt_term::scr_refresh () NOTHROW |
1969 | { |
1986 | { |
1970 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1987 | unsigned char have_bg, |
1971 | showcursor; /* show the cursor */ |
1988 | showcursor; /* show the cursor */ |
1972 | int16_t col, row, /* column/row we're processing */ |
1989 | int16_t col, row, /* column/row we're processing */ |
1973 | ocrow; /* old cursor row */ |
1990 | ocrow; /* old cursor row */ |
1974 | int i; /* tmp */ |
1991 | int i; /* tmp */ |
1975 | #ifndef NO_CURSORCOLOR |
1992 | #ifndef NO_CURSORCOLOR |
1976 | rend_t cc1; /* store colours at cursor position (s) */ |
1993 | rend_t cc1; /* store colours at cursor position (s) */ |
1977 | #endif |
1994 | #endif |
1978 | rend_t *crp; // cursor rendition pointer |
1995 | rend_t *crp; // cursor rendition pointer |
|
|
1996 | rend_t ccol1, /* Cursor colour */ |
|
|
1997 | ccol2; /* Cursor colour2 */ |
1979 | |
1998 | |
1980 | want_refresh = 0; /* screen is current */ |
1999 | want_refresh = 0; /* screen is current */ |
1981 | |
2000 | |
1982 | if (refresh_type == NO_REFRESH || !mapped) |
2001 | if (refresh_type == NO_REFRESH || !mapped) |
1983 | return; |
2002 | return; |
1984 | |
2003 | |
1985 | /* |
2004 | /* |
1986 | * A: set up vars |
2005 | * A: set up vars |
1987 | */ |
2006 | */ |
1988 | must_clear = 0; |
|
|
1989 | refresh_count = 0; |
2007 | refresh_count = 0; |
1990 | |
2008 | |
1991 | #if XPM_BACKGROUND |
2009 | have_bg = 0; |
|
|
2010 | #ifdef HAVE_BG_PIXMAP |
1992 | must_clear |= bgPixmap.pixmap != None; |
2011 | have_bg = bgPixmap.pixmap != None; |
1993 | #endif |
|
|
1994 | #if TRANSPARENT |
|
|
1995 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1996 | #endif |
2012 | #endif |
1997 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2013 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1998 | |
2014 | |
1999 | /* |
2015 | /* |
2000 | * B: reverse any characters which are selected |
2016 | * B: reverse any characters which are selected |
… | |
… | |
2004 | /* |
2020 | /* |
2005 | * C: set the cursor character (s) |
2021 | * C: set the cursor character (s) |
2006 | */ |
2022 | */ |
2007 | { |
2023 | { |
2008 | unsigned char setoldcursor; |
2024 | unsigned char setoldcursor; |
2009 | rend_t ccol1, /* Cursor colour */ |
|
|
2010 | ccol2; /* Cursor colour2 */ |
|
|
2011 | |
2025 | |
2012 | showcursor = (screen.flags & Screen_VisibleCursor); |
2026 | showcursor = (screen.flags & Screen_VisibleCursor); |
2013 | #ifdef CURSOR_BLINK |
2027 | #ifdef CURSOR_BLINK |
2014 | if (hidden_cursor) |
2028 | if (hidden_cursor) |
2015 | showcursor = 0; |
2029 | showcursor = 0; |
… | |
… | |
2022 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2036 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2023 | col--; |
2037 | col--; |
2024 | |
2038 | |
2025 | crp = &ROW(screen.cur.row).r[col]; |
2039 | crp = &ROW(screen.cur.row).r[col]; |
2026 | |
2040 | |
|
|
2041 | #ifndef NO_CURSORCOLOR |
|
|
2042 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2043 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2044 | ccol1 = Color_cursor; |
|
|
2045 | else |
|
|
2046 | #endif |
|
|
2047 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2048 | ccol1 = fgcolor_of (rstyle); |
|
|
2049 | #else |
|
|
2050 | ccol1 = Color_fg; |
|
|
2051 | #endif |
|
|
2052 | |
|
|
2053 | #ifndef NO_CURSORCOLOR |
|
|
2054 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2055 | ccol2 = Color_cursor2; |
|
|
2056 | else |
|
|
2057 | #endif |
|
|
2058 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2059 | ccol2 = bgcolor_of (rstyle); |
|
|
2060 | #else |
|
|
2061 | ccol2 = Color_bg; |
|
|
2062 | #endif |
|
|
2063 | |
2027 | if (showcursor && focus) |
2064 | if (showcursor && focus) |
2028 | { |
2065 | { |
2029 | if (OPTION (Opt_cursorUnderline)) |
2066 | if (option (Opt_cursorUnderline)) |
2030 | *crp ^= RS_Uline; |
2067 | *crp ^= RS_Uline; |
2031 | else |
2068 | else |
2032 | { |
2069 | { |
2033 | *crp ^= RS_RVid; |
2070 | *crp ^= RS_RVid; |
2034 | |
|
|
2035 | #ifndef NO_CURSORCOLOR |
|
|
2036 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2037 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2038 | ccol1 = Color_cursor; |
|
|
2039 | else |
|
|
2040 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2041 | ccol1 = fgcolor_of (rstyle); |
|
|
2042 | #else |
|
|
2043 | ccol1 = Color_fg; |
|
|
2044 | #endif |
|
|
2045 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2046 | ccol2 = Color_cursor2; |
|
|
2047 | else |
|
|
2048 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2049 | ccol2 = bgcolor_of (rstyle); |
|
|
2050 | #else |
|
|
2051 | ccol2 = Color_bg; |
|
|
2052 | #endif |
|
|
2053 | *crp = SET_FGCOLOR (*crp, ccol1); |
2071 | *crp = SET_FGCOLOR (*crp, ccol1); |
2054 | *crp = SET_BGCOLOR (*crp, ccol2); |
2072 | *crp = SET_BGCOLOR (*crp, ccol2); |
2055 | #endif |
|
|
2056 | } |
2073 | } |
2057 | } |
2074 | } |
2058 | } |
2075 | } |
2059 | |
2076 | |
2060 | /* make sure no outline cursor is left around */ |
2077 | /* make sure no outline cursor is left around */ |
… | |
… | |
2099 | * D: CopyArea pass - very useful for slower links |
2116 | * D: CopyArea pass - very useful for slower links |
2100 | * This has been deliberately kept simple. |
2117 | * This has been deliberately kept simple. |
2101 | */ |
2118 | */ |
2102 | if (!display->is_local |
2119 | if (!display->is_local |
2103 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2120 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2104 | && abs (num_scr) < nrow && !must_clear) |
2121 | && abs (num_scr) < nrow && !have_bg) |
2105 | { |
2122 | { |
2106 | int16_t nits; |
2123 | int16_t nits; |
|
|
2124 | int i = num_scr; |
2107 | int j; |
2125 | int j; |
2108 | int len, wlen; |
2126 | int len, wlen; |
2109 | dLocal (int, num_scr); |
2127 | dLocal (int, num_scr); |
2110 | |
2128 | |
2111 | j = nrow; |
2129 | j = nrow; |
2112 | wlen = len = -1; |
2130 | wlen = len = -1; |
2113 | row = i > 0 ? 0 : j - 1; |
2131 | row = i > 0 ? 0 : j - 1; |
|
|
2132 | |
2114 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2133 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2115 | { |
2134 | { |
2116 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2135 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2117 | { |
2136 | { |
2118 | line_t s = ROW(view_start + row); |
2137 | line_t s = ROW(view_start + row); |
… | |
… | |
2139 | wlen = row; |
2158 | wlen = row; |
2140 | continue; |
2159 | continue; |
2141 | } |
2160 | } |
2142 | } |
2161 | } |
2143 | |
2162 | |
2144 | if (len != -1) |
2163 | if (len >= 0) |
2145 | { |
2164 | { |
2146 | /* also comes here at end if needed because of >= above */ |
2165 | /* also comes here at end if needed because of >= above */ |
2147 | if (wlen < len) |
2166 | if (wlen < len) |
2148 | ::swap (wlen, len); |
2167 | ::swap (wlen, len); |
2149 | |
2168 | |
|
|
2169 | XGCValues gcv; |
|
|
2170 | |
|
|
2171 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2150 | XCopyArea (display->display, vt, vt, |
2172 | XCopyArea (dpy, vt, vt, |
2151 | gc, 0, Row2Pixel (len + i), |
2173 | gc, 0, Row2Pixel (len + i), |
2152 | (unsigned int)this->width, |
2174 | (unsigned int)this->width, |
2153 | (unsigned int)Height2Pixel (wlen - len + 1), |
2175 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | 0, Row2Pixel (len)); |
2176 | 0, Row2Pixel (len)); |
|
|
2177 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2178 | |
2155 | len = -1; |
2179 | len = -1; |
2156 | } |
2180 | } |
2157 | } |
2181 | } |
2158 | } |
2182 | } |
2159 | #endif |
2183 | #endif |
… | |
… | |
2183 | continue; |
2207 | continue; |
2184 | |
2208 | |
2185 | // redraw one or more characters |
2209 | // redraw one or more characters |
2186 | |
2210 | |
2187 | // seek to the beginning of wide characters |
2211 | // seek to the beginning of wide characters |
2188 | while (stp[col] == NOCHAR && col > 0) |
2212 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2189 | --col; |
2213 | --col; |
2190 | |
2214 | |
2191 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2215 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2192 | text_t *text = stp + col; |
2216 | text_t *text = stp + col; |
2193 | int count = 1; |
2217 | int count = 1; |
… | |
… | |
2215 | count++; |
2239 | count++; |
2216 | |
2240 | |
2217 | if (stp[col] != dtp[col] |
2241 | if (stp[col] != dtp[col] |
2218 | || !RS_SAME (srp[col], drp[col])) |
2242 | || !RS_SAME (srp[col], drp[col])) |
2219 | { |
2243 | { |
2220 | if (must_clear && (i++ > count / 2)) |
2244 | if (have_bg && (i++ > count / 2)) |
2221 | break; |
2245 | break; |
2222 | |
2246 | |
2223 | dtp[col] = stp[col]; |
2247 | dtp[col] = stp[col]; |
2224 | drp[col] = rend; |
2248 | drp[col] = rend; |
2225 | i = 0; |
2249 | i = 0; |
2226 | } |
2250 | } |
2227 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2251 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2228 | break; |
2252 | break; |
2229 | } |
2253 | } |
2230 | |
2254 | |
2231 | col--; /* went one too far. move back */ |
2255 | col--; /* went one too far. move back */ |
2232 | count -= i; /* dump any matching trailing chars */ |
2256 | count -= i; /* dump any matching trailing chars */ |
2233 | |
2257 | |
2234 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2258 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2235 | while (i && text[count] == NOCHAR) |
2259 | while (expect_false (i && text[count] == NOCHAR)) |
2236 | count++, i--; |
2260 | count++, i--; |
2237 | |
2261 | |
2238 | /* |
2262 | /* |
2239 | * Determine the attributes for the string |
2263 | * Determine the attributes for the string |
2240 | */ |
2264 | */ |
2241 | int fore = fgcolor_of (rend); // desired foreground |
2265 | int fore = fgcolor_of (rend); // desired foreground |
2242 | int back = bgcolor_of (rend); // desired background |
2266 | int back = bgcolor_of (rend); // desired background |
2243 | |
2267 | |
2244 | // 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 |
2245 | 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))) |
2246 | { |
2270 | { |
2247 | #if ENABLE_STYLES |
|
|
2248 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2249 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2250 | drp[col + 1] = ~srp[col + 1]; |
|
|
2251 | |
|
|
2252 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2253 | while (text > stp |
|
|
2254 | && srp[text - stp - 1] & RS_Careful |
|
|
2255 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2256 | text--, count++, xpixel -= fwidth; |
|
|
2257 | #endif |
|
|
2258 | |
|
|
2259 | bool invert = rend & RS_RVid; |
2271 | bool invert = rend & RS_RVid; |
2260 | |
2272 | |
2261 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2273 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2262 | if (rend & RS_Bold |
|
|
2263 | && fore == Color_fg) |
2274 | if (rend & RS_Bold && fore == Color_fg) |
2264 | { |
2275 | { |
2265 | if (ISSET_PIXCOLOR (Color_BD)) |
2276 | if (ISSET_PIXCOLOR (Color_BD)) |
2266 | fore = Color_BD; |
2277 | fore = Color_BD; |
2267 | # if !ENABLE_STYLES |
2278 | # if !ENABLE_STYLES |
2268 | else |
2279 | else |
2269 | invert = !invert; |
2280 | invert = !invert; |
2270 | # endif |
2281 | # endif |
2271 | } |
2282 | } |
2272 | |
2283 | |
2273 | if (rend & RS_Italic |
2284 | if (rend & RS_Italic && fore == Color_fg) |
2274 | && fore == Color_fg) |
|
|
2275 | { |
2285 | { |
2276 | if (ISSET_PIXCOLOR (Color_IT)) |
2286 | if (ISSET_PIXCOLOR (Color_IT)) |
2277 | fore = Color_IT; |
2287 | fore = Color_IT; |
2278 | # if !ENABLE_STYLES |
2288 | # if !ENABLE_STYLES |
2279 | else |
2289 | else |
2280 | invert = !invert; |
2290 | invert = !invert; |
2281 | # endif |
2291 | # endif |
2282 | } |
2292 | } |
2283 | |
2293 | |
2284 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2294 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2285 | fore = Color_UL; |
2295 | fore = Color_UL; |
2286 | #endif |
2296 | #endif |
2287 | |
2297 | |
2288 | if (invert) |
2298 | if (invert) |
2289 | { |
2299 | { |
|
|
2300 | #ifdef OPTION_HC |
|
|
2301 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2302 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2303 | #endif |
|
|
2304 | /* invert the column if no highlightColor is set or it is the |
|
|
2305 | * current cursor column */ |
2290 | ::swap (fore, back); |
2306 | ::swap (fore, back); |
|
|
2307 | #ifdef OPTION_HC |
|
|
2308 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2309 | back = Color_HC; |
|
|
2310 | #endif |
2291 | |
2311 | |
2292 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2312 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2313 | # ifndef OPTION_HC |
2293 | if (ISSET_PIXCOLOR (Color_RV)) |
2314 | if (ISSET_PIXCOLOR (Color_RV)) |
2294 | back = Color_RV; |
2315 | back = Color_RV; |
2295 | |
2316 | # endif |
2296 | if (fore == back) |
2317 | if (fore == back) |
2297 | { |
2318 | { |
2298 | fore = Color_bg; |
2319 | fore = Color_bg; |
2299 | back = Color_fg; |
2320 | back = Color_fg; |
2300 | } |
2321 | } |
… | |
… | |
2302 | } |
2323 | } |
2303 | |
2324 | |
2304 | #ifdef TEXT_BLINK |
2325 | #ifdef TEXT_BLINK |
2305 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2326 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2306 | { |
2327 | { |
2307 | if (!text_blink_ev.active) |
2328 | if (!text_blink_ev.is_active ()) |
2308 | { |
2329 | { |
2309 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2330 | text_blink_ev.again (); |
2310 | hidden_text = 0; |
2331 | hidden_text = 0; |
2311 | } |
2332 | } |
2312 | else if (hidden_text) |
2333 | else if (hidden_text) |
2313 | fore = back; |
2334 | fore = back; |
2314 | } |
2335 | } |
2315 | #endif |
2336 | #endif |
|
|
2337 | |
|
|
2338 | #if ENABLE_STYLES |
|
|
2339 | // "careful" (too wide) character handling |
|
|
2340 | |
|
|
2341 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2342 | while (text > stp |
|
|
2343 | && srp[text - stp - 1] & RS_Careful |
|
|
2344 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2345 | text--, count++, xpixel -= fwidth; |
|
|
2346 | |
|
|
2347 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2348 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2349 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2350 | |
|
|
2351 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2352 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2353 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2354 | #endif |
2316 | } |
2355 | } |
2317 | |
2356 | |
2318 | /* |
2357 | /* |
2319 | * Actually do the drawing of the string here |
2358 | * Actually do the drawing of the string here |
2320 | */ |
2359 | */ |
2321 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2360 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2322 | |
2361 | |
2323 | if (back == fore) |
2362 | if (expect_true (have_bg && back == Color_bg)) |
2324 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2325 | fwidth * count, fheight, |
|
|
2326 | back); |
|
|
2327 | else if (back == Color_bg) |
|
|
2328 | { |
2363 | { |
2329 | if (must_clear) |
2364 | // this is very ugly, maybe push it into ->draw? |
2330 | { |
|
|
2331 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2332 | |
2365 | |
2333 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2366 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2334 | if (text[i] != ' ') |
2367 | if (text[i] != ' ') |
2335 | { |
2368 | { |
2336 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2369 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2337 | break; |
2370 | goto did_clear; |
2338 | } |
|
|
2339 | } |
2371 | } |
2340 | else |
2372 | |
2341 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2373 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2374 | did_clear: ; |
2342 | } |
2375 | } |
2343 | else |
2376 | else |
2344 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2377 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2345 | |
2378 | |
2346 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2379 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2347 | { |
2380 | { |
2348 | #if ENABLE_FRILLS |
2381 | #if ENABLE_FRILLS |
2349 | if (ISSET_PIXCOLOR (Color_underline)) |
2382 | if (ISSET_PIXCOLOR (Color_underline)) |
2350 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2383 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2351 | else |
2384 | else |
2352 | #endif |
2385 | #endif |
2353 | XSetForeground (display->display, gc, pix_colors[fore]); |
2386 | XSetForeground (dpy, gc, pix_colors[fore]); |
2354 | |
2387 | |
2355 | XDrawLine (display->display, drawBuffer, gc, |
2388 | XDrawLine (dpy, vt, gc, |
2356 | xpixel, ypixel + font->ascent + 1, |
2389 | xpixel, ypixel + font->ascent + 1, |
2357 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2390 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2358 | } |
2391 | } |
2359 | } /* for (col....) */ |
2392 | } /* for (col....) */ |
2360 | } /* for (row....) */ |
2393 | } /* for (row....) */ |
… | |
… | |
2369 | */ |
2402 | */ |
2370 | if (showcursor) |
2403 | if (showcursor) |
2371 | { |
2404 | { |
2372 | if (focus) |
2405 | if (focus) |
2373 | { |
2406 | { |
2374 | if (OPTION (Opt_cursorUnderline)) |
2407 | if (option (Opt_cursorUnderline)) |
2375 | *crp ^= RS_Uline; |
2408 | *crp ^= RS_Uline; |
2376 | else |
2409 | else |
2377 | { |
2410 | { |
2378 | *crp ^= RS_RVid; |
2411 | *crp ^= RS_RVid; |
2379 | #ifndef NO_CURSORCOLOR |
2412 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2393 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2426 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2394 | cursorwidth++; |
2427 | cursorwidth++; |
2395 | |
2428 | |
2396 | #ifndef NO_CURSORCOLOR |
2429 | #ifndef NO_CURSORCOLOR |
2397 | if (ISSET_PIXCOLOR (Color_cursor)) |
2430 | if (ISSET_PIXCOLOR (Color_cursor)) |
2398 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2431 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2432 | else |
2399 | #endif |
2433 | #endif |
|
|
2434 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2400 | |
2435 | |
2401 | XDrawRectangle (display->display, drawBuffer, gc, |
2436 | XDrawRectangle (dpy, vt, gc, |
2402 | Col2Pixel (col), |
2437 | Col2Pixel (col), |
2403 | Row2Pixel (oldcursor.row), |
2438 | Row2Pixel (oldcursor.row), |
2404 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2439 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2405 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2440 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2406 | } |
2441 | } |
… | |
… | |
2441 | } |
2476 | } |
2442 | |
2477 | |
2443 | void |
2478 | void |
2444 | rxvt_term::scr_recolour () NOTHROW |
2479 | rxvt_term::scr_recolour () NOTHROW |
2445 | { |
2480 | { |
2446 | if (1 |
2481 | #ifdef HAVE_BG_PIXMAP |
2447 | #if TRANSPARENT |
2482 | bgPixmap.apply (); |
2448 | && !am_transparent |
2483 | #else |
2449 | #endif |
2484 | |
2450 | #if XPM_BACKGROUND |
|
|
2451 | && !bgPixmap.pixmap |
|
|
2452 | #endif |
|
|
2453 | ) |
|
|
2454 | { |
|
|
2455 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2485 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2456 | XClearWindow (display->display, parent[0]); |
2486 | XClearWindow (dpy, parent[0]); |
2457 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2487 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2458 | #if HAVE_SCROLLBARS |
2488 | |
2459 | if (scrollBar.win) |
2489 | if (scrollBar.win) |
2460 | { |
2490 | { |
2461 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2491 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2462 | scrollBar.setIdle (); |
2492 | scrollBar.state = STATE_IDLE; |
2463 | scrollbar_show (0); |
2493 | scrollBar.show (0); |
2464 | } |
|
|
2465 | #endif |
|
|
2466 | } |
2494 | } |
2467 | |
2495 | |
|
|
2496 | #endif |
|
|
2497 | |
|
|
2498 | /* bgPixmap.apply () does not do the following : */ |
2468 | scr_clear (); |
2499 | scr_clear (); |
2469 | scr_touch (true); |
2500 | scr_touch (true); |
2470 | want_refresh = 1; |
2501 | want_refresh = 1; |
2471 | } |
2502 | } |
2472 | |
2503 | |
… | |
… | |
2479 | |
2510 | |
2480 | num_scr_allow = 0; |
2511 | num_scr_allow = 0; |
2481 | want_refresh = 1; |
2512 | want_refresh = 1; |
2482 | |
2513 | |
2483 | if (really) |
2514 | if (really) |
2484 | XClearWindow (display->display, vt); |
2515 | XClearWindow (dpy, vt); |
2485 | } |
2516 | } |
2486 | |
2517 | |
2487 | void |
2518 | void |
2488 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2519 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2489 | { |
2520 | { |
… | |
… | |
2538 | { |
2569 | { |
2539 | if (selection.op |
2570 | if (selection.op |
2540 | && current_screen == selection.screen |
2571 | && current_screen == selection.screen |
2541 | && selection.end.row >= view_start) |
2572 | && selection.end.row >= view_start) |
2542 | { |
2573 | { |
2543 | #if ENABLE_FRILLS |
2574 | #if !ENABLE_MINIMAL |
2544 | if (selection.rect) |
2575 | if (selection.rect) |
2545 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2576 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2546 | selection.end.row, selection.end.col, |
2577 | selection.end.row, selection.end.col, |
2547 | RS_RVid, RS_RVid | RS_Uline); |
2578 | RS_RVid, RS_RVid | RS_Uline); |
2548 | else |
2579 | else |
… | |
… | |
2564 | { |
2595 | { |
2565 | int row, wrote; |
2596 | int row, wrote; |
2566 | unsigned int width, towrite; |
2597 | unsigned int width, towrite; |
2567 | char r1[] = "\n"; |
2598 | char r1[] = "\n"; |
2568 | |
2599 | |
2569 | for (row = saveLines - nsaved; |
2600 | for (row = saveLines + top_row; |
2570 | row < saveLines + nrow - 1; row++) |
2601 | row < saveLines + nrow - 1; row++) |
2571 | { |
2602 | { |
2572 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2603 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2573 | : ncol; |
2604 | : ncol; |
2574 | for (towrite = width; towrite; towrite -= wrote) |
2605 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2625 | /* convert normal newline chars into common keyboard Return key sequence */ |
2656 | /* convert normal newline chars into common keyboard Return key sequence */ |
2626 | for (unsigned int i = 0; i < len; i++) |
2657 | for (unsigned int i = 0; i < len; i++) |
2627 | if (data[i] == C0_LF) |
2658 | if (data[i] == C0_LF) |
2628 | data[i] = C0_CR; |
2659 | data[i] = C0_CR; |
2629 | |
2660 | |
|
|
2661 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2662 | tt_printf ("\e[200~"); |
|
|
2663 | |
2630 | tt_write (data, len); |
2664 | tt_write (data, len); |
|
|
2665 | |
|
|
2666 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2667 | tt_printf ("\e[201~"); |
2631 | } |
2668 | } |
2632 | |
2669 | |
2633 | /* ------------------------------------------------------------------------- */ |
2670 | /* ------------------------------------------------------------------------- */ |
2634 | /* |
2671 | /* |
2635 | * Respond to a notification that a primary selection has been sent |
2672 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2664 | } |
2701 | } |
2665 | |
2702 | |
2666 | unsigned long bytes_after; |
2703 | unsigned long bytes_after; |
2667 | XTextProperty ct; |
2704 | XTextProperty ct; |
2668 | |
2705 | |
2669 | if (XGetWindowProperty (display->display, win, prop, |
2706 | if (XGetWindowProperty (dpy, win, prop, |
2670 | 0, PROP_SIZE / 4, |
2707 | 0, PROP_SIZE / 4, |
2671 | delete_prop, AnyPropertyType, |
2708 | delete_prop, AnyPropertyType, |
2672 | &ct.encoding, &ct.format, |
2709 | &ct.encoding, &ct.format, |
2673 | &ct.nitems, &bytes_after, |
2710 | &ct.nitems, &bytes_after, |
2674 | &ct.value) != Success) |
2711 | &ct.value) != Success) |
… | |
… | |
2683 | if (bytes_after) |
2720 | if (bytes_after) |
2684 | { |
2721 | { |
2685 | // fetch and append remaining data |
2722 | // fetch and append remaining data |
2686 | XTextProperty ct2; |
2723 | XTextProperty ct2; |
2687 | |
2724 | |
2688 | if (XGetWindowProperty (display->display, win, prop, |
2725 | if (XGetWindowProperty (dpy, win, prop, |
2689 | ct.nitems / 4, (bytes_after + 3) / 4, |
2726 | ct.nitems / 4, (bytes_after + 3) / 4, |
2690 | delete_prop, AnyPropertyType, |
2727 | delete_prop, AnyPropertyType, |
2691 | &ct2.encoding, &ct2.format, |
2728 | &ct2.encoding, &ct2.format, |
2692 | &ct2.nitems, &bytes_after, |
2729 | &ct2.nitems, &bytes_after, |
2693 | &ct2.value) != Success) |
2730 | &ct2.value) != Success) |
… | |
… | |
2706 | |
2743 | |
2707 | if (ct.encoding == xa[XA_INCR]) |
2744 | if (ct.encoding == xa[XA_INCR]) |
2708 | { |
2745 | { |
2709 | // INCR selection, start handshake |
2746 | // INCR selection, start handshake |
2710 | if (!delete_prop) |
2747 | if (!delete_prop) |
2711 | XDeleteProperty (display->display, win, prop); |
2748 | XDeleteProperty (dpy, win, prop); |
2712 | |
2749 | |
2713 | selection_wait = Sel_incr; |
2750 | selection_wait = Sel_incr; |
2714 | incr_buf_fill = 0; |
2751 | incr_buf_fill = 0; |
2715 | incr_ev.start (NOW + 10); |
2752 | incr_ev.start (10); |
2716 | |
2753 | |
2717 | goto bailout; |
2754 | goto bailout; |
2718 | } |
2755 | } |
2719 | |
2756 | |
2720 | if (ct.nitems == 0) |
2757 | if (ct.nitems == 0) |
… | |
… | |
2729 | ct.nitems = incr_buf_fill; |
2766 | ct.nitems = incr_buf_fill; |
2730 | incr_buf = 0; |
2767 | incr_buf = 0; |
2731 | incr_buf_size = 0; |
2768 | incr_buf_size = 0; |
2732 | incr_ev.stop (); |
2769 | incr_ev.stop (); |
2733 | } |
2770 | } |
2734 | else |
2771 | else |
2735 | { |
2772 | { |
2736 | if (selection_wait == Sel_normal |
2773 | if (selection_wait == Sel_normal |
2737 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2774 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2738 | { |
2775 | { |
2739 | /* |
2776 | /* |
… | |
… | |
2746 | goto bailout; |
2783 | goto bailout; |
2747 | } |
2784 | } |
2748 | } |
2785 | } |
2749 | else if (selection_wait == Sel_incr) |
2786 | else if (selection_wait == Sel_incr) |
2750 | { |
2787 | { |
2751 | incr_ev.start (NOW + 10); |
2788 | incr_ev.start (10); |
2752 | |
2789 | |
2753 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2790 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2754 | { |
2791 | { |
2755 | 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; |
2756 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2793 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2763 | } |
2800 | } |
2764 | |
2801 | |
2765 | char **cl; |
2802 | char **cl; |
2766 | int cr; |
2803 | int cr; |
2767 | |
2804 | |
2768 | #if ENABLE_FRILLS |
2805 | #if !ENABLE_MINIMAL |
2769 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2806 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2770 | // so recode it manually |
2807 | // so recode it manually |
2771 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2808 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2772 | { |
2809 | { |
2773 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2810 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2777 | paste (s, strlen (s)); |
2814 | paste (s, strlen (s)); |
2778 | free (s); |
2815 | free (s); |
2779 | } |
2816 | } |
2780 | else |
2817 | else |
2781 | #endif |
2818 | #endif |
2782 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2819 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2783 | && cl) |
2820 | && cl) |
2784 | { |
2821 | { |
2785 | for (int i = 0; i < cr; i++) |
2822 | for (int i = 0; i < cr; i++) |
2786 | paste (cl[i], strlen (cl[i])); |
2823 | paste (cl[i], strlen (cl[i])); |
2787 | |
2824 | |
… | |
… | |
2796 | if (selection_wait == Sel_normal) |
2833 | if (selection_wait == Sel_normal) |
2797 | selection_wait = Sel_none; |
2834 | selection_wait = Sel_none; |
2798 | } |
2835 | } |
2799 | |
2836 | |
2800 | void |
2837 | void |
2801 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2838 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2802 | { |
2839 | { |
2803 | selection_wait = Sel_none; |
2840 | selection_wait = Sel_none; |
2804 | |
2841 | |
2805 | incr_buf_size = 0; |
2842 | incr_buf_size = 0; |
2806 | free (incr_buf); |
2843 | free (incr_buf); |
… | |
… | |
2817 | selection_paste (win, prop, true); |
2854 | selection_paste (win, prop, true); |
2818 | } |
2855 | } |
2819 | |
2856 | |
2820 | /* ------------------------------------------------------------------------- */ |
2857 | /* ------------------------------------------------------------------------- */ |
2821 | /* |
2858 | /* |
2822 | * Request the current selection: |
2859 | * Request the current selection: |
2823 | * Order: > internal selection if available |
2860 | * Order: > internal selection if available |
2824 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2861 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2825 | * > CUT_BUFFER0 |
2862 | * > CUT_BUFFER0 |
2826 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2863 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2827 | * will auto fallback to CUT_BUFFER0 |
2864 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2829 | */ |
2866 | */ |
2830 | void |
2867 | void |
2831 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2868 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2832 | { |
2869 | { |
2833 | if (selection.text && selnum == Sel_Primary) |
2870 | if (selection.text && selnum == Sel_Primary) |
|
|
2871 | { |
2834 | { /* internal selection */ |
2872 | /* internal selection */ |
2835 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2873 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2836 | paste (str, strlen (str)); |
2874 | paste (str, strlen (str)); |
2837 | free (str); |
2875 | free (str); |
2838 | return; |
2876 | return; |
2839 | } |
2877 | } |
… | |
… | |
2869 | else if (selnum == Sel_Secondary) |
2907 | else if (selnum == Sel_Secondary) |
2870 | sel = XA_SECONDARY; |
2908 | sel = XA_SECONDARY; |
2871 | else |
2909 | else |
2872 | sel = xa[XA_CLIPBOARD]; |
2910 | sel = xa[XA_CLIPBOARD]; |
2873 | |
2911 | |
2874 | if (XGetSelectionOwner (display->display, sel) != None) |
2912 | if (XGetSelectionOwner (dpy, sel) != None) |
2875 | { |
2913 | { |
2876 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2914 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2877 | vt, selection_request_time); |
2915 | vt, selection_request_time); |
2878 | return 1; |
2916 | return 1; |
2879 | } |
2917 | } |
2880 | |
2918 | |
2881 | return 0; |
2919 | return 0; |
… | |
… | |
2944 | |
2982 | |
2945 | int end_col; |
2983 | int end_col; |
2946 | |
2984 | |
2947 | for (; row <= selection.end.row; row++, col = 0) |
2985 | for (; row <= selection.end.row; row++, col = 0) |
2948 | { |
2986 | { |
2949 | #if ENABLE_FRILLS |
2987 | #if !ENABLE_MINIMAL |
2950 | if (selection.rect) |
2988 | if (selection.rect) |
2951 | { |
2989 | { |
2952 | col = selection.beg.col; |
2990 | col = selection.beg.col; |
2953 | end_col = ncol + 1; |
2991 | end_col = ncol + 1; |
2954 | } |
2992 | } |
… | |
… | |
2957 | end_col = ROW(row).l; |
2995 | end_col = ROW(row).l; |
2958 | |
2996 | |
2959 | col = max (col, 0); |
2997 | col = max (col, 0); |
2960 | |
2998 | |
2961 | if (row == selection.end.row |
2999 | if (row == selection.end.row |
2962 | #if ENABLE_FRILLS |
3000 | #if !ENABLE_MINIMAL |
2963 | || selection.rect |
3001 | || selection.rect |
2964 | #endif |
3002 | #endif |
2965 | ) |
3003 | ) |
2966 | min_it (end_col, selection.end.col); |
3004 | min_it (end_col, selection.end.col); |
2967 | |
3005 | |
… | |
… | |
2990 | #endif |
3028 | #endif |
2991 | else |
3029 | else |
2992 | new_selection_text[ofs++] = *t++; |
3030 | new_selection_text[ofs++] = *t++; |
2993 | } |
3031 | } |
2994 | |
3032 | |
2995 | #if ENABLE_FRILLS |
3033 | #if !ENABLE_MINIMAL |
2996 | if (selection.rect) |
3034 | if (selection.rect) |
2997 | { |
3035 | { |
2998 | while (ofs |
3036 | while (ofs |
2999 | && new_selection_text[ofs - 1] != C0_LF |
3037 | && new_selection_text[ofs - 1] != C0_LF |
3000 | && unicode::is_space (new_selection_text[ofs - 1])) |
3038 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3034 | bool |
3072 | bool |
3035 | rxvt_term::selection_grab (Time tm) NOTHROW |
3073 | rxvt_term::selection_grab (Time tm) NOTHROW |
3036 | { |
3074 | { |
3037 | selection_time = tm; |
3075 | selection_time = tm; |
3038 | |
3076 | |
3039 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3077 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3040 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3078 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3041 | { |
3079 | { |
3042 | display->set_selection_owner (this); |
3080 | display->set_selection_owner (this); |
3043 | return true; |
3081 | return true; |
3044 | } |
3082 | } |
3045 | else |
3083 | else |
… | |
… | |
3049 | } |
3087 | } |
3050 | |
3088 | |
3051 | #if 0 |
3089 | #if 0 |
3052 | XTextProperty ct; |
3090 | XTextProperty ct; |
3053 | |
3091 | |
3054 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3092 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3055 | { |
3093 | { |
3056 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3094 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3057 | XFree (ct.value); |
3095 | XFree (ct.value); |
3058 | } |
3096 | } |
3059 | #endif |
3097 | #endif |
… | |
… | |
3105 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3143 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3106 | |
3144 | |
3107 | while (selection.mark.col > 0 |
3145 | while (selection.mark.col > 0 |
3108 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3146 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3109 | --selection.mark.col; |
3147 | --selection.mark.col; |
3110 | |
3148 | |
3111 | if (selection.op) |
3149 | if (selection.op) |
|
|
3150 | { |
3112 | { /* clear the old selection */ |
3151 | /* clear the old selection */ |
3113 | selection.beg.row = selection.end.row = selection.mark.row; |
3152 | selection.beg.row = selection.end.row = selection.mark.row; |
3114 | selection.beg.col = selection.end.col = selection.mark.col; |
3153 | selection.beg.col = selection.end.col = selection.mark.col; |
3115 | } |
3154 | } |
3116 | |
3155 | |
3117 | selection.op = SELECTION_INIT; |
3156 | selection.op = SELECTION_INIT; |
… | |
… | |
3306 | * 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 |
3307 | * 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 |
3308 | * time of the most recent button3 press |
3347 | * time of the most recent button3 press |
3309 | */ |
3348 | */ |
3310 | if (button3 && buttonpress) |
3349 | if (button3 && buttonpress) |
|
|
3350 | { |
3311 | { /* button3 press */ |
3351 | /* button3 press */ |
3312 | /* |
3352 | /* |
3313 | * first determine which edge of the selection we are closest to |
3353 | * first determine which edge of the selection we are closest to |
3314 | */ |
3354 | */ |
3315 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3355 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3316 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3356 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3334 | selection.mark.row = selection.beg.row; |
3374 | selection.mark.row = selection.beg.row; |
3335 | selection.mark.col = selection.beg.col; |
3375 | selection.mark.col = selection.beg.col; |
3336 | } |
3376 | } |
3337 | } |
3377 | } |
3338 | else |
3378 | else |
|
|
3379 | { |
3339 | { /* button1 drag or button3 drag */ |
3380 | /* button1 drag or button3 drag */ |
3340 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3381 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3341 | { |
3382 | { |
3342 | if (selection.mark.row == selection.end.row |
3383 | if (selection.mark.row == selection.end.row |
3343 | && selection.mark.col == selection.end.col |
3384 | && selection.mark.col == selection.end.col |
3344 | && clickchange |
3385 | && clickchange |
… | |
… | |
3361 | |
3402 | |
3362 | if (selection.clicks == 1) |
3403 | if (selection.clicks == 1) |
3363 | { |
3404 | { |
3364 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3405 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3365 | && !ROW(selection.beg.row).is_longer () |
3406 | && !ROW(selection.beg.row).is_longer () |
3366 | #if ENABLE_FRILLS |
3407 | #if !ENABLE_MINIMAL |
3367 | && !selection.rect |
3408 | && !selection.rect |
3368 | #endif |
3409 | #endif |
3369 | ) |
3410 | ) |
3370 | selection.beg.col = ncol; |
3411 | selection.beg.col = ncol; |
3371 | |
3412 | |
3372 | if ( |
3413 | if ( |
3373 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3414 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3374 | && !ROW(selection.end.row).is_longer () |
3415 | && !ROW(selection.end.row).is_longer () |
3375 | #if ENABLE_FRILLS |
3416 | #if !ENABLE_MINIMAL |
3376 | && !selection.rect |
3417 | && !selection.rect |
3377 | #endif |
3418 | #endif |
3378 | ) |
3419 | ) |
3379 | selection.end.col = ncol; |
3420 | selection.end.col = ncol; |
3380 | } |
3421 | } |
… | |
… | |
3387 | selection_delimit_word (DN, &selection.end, &selection.end); |
3428 | selection_delimit_word (DN, &selection.end, &selection.end); |
3388 | } |
3429 | } |
3389 | else if (selection.clicks == 3) |
3430 | else if (selection.clicks == 3) |
3390 | { |
3431 | { |
3391 | #if ENABLE_FRILLS |
3432 | #if ENABLE_FRILLS |
3392 | if (OPTION (Opt_tripleclickwords)) |
3433 | if (option (Opt_tripleclickwords)) |
3393 | { |
3434 | { |
3394 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3435 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3395 | |
3436 | |
3396 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3437 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3397 | { |
3438 | { |
3398 | if (!ROW(end_row).is_longer ()) |
3439 | if (!ROW(end_row).is_longer ()) |
3399 | { |
3440 | { |
3400 | selection.end.row = end_row; |
3441 | selection.end.row = end_row; |
3401 | selection.end.col = ROW(end_row).l; |
3442 | selection.end.col = ROW(end_row).l; |
|
|
3443 | # if !ENABLE_MINIMAL |
3402 | selection_remove_trailing_spaces (); |
3444 | selection_remove_trailing_spaces (); |
|
|
3445 | # endif |
3403 | break; |
3446 | break; |
3404 | } |
3447 | } |
3405 | } |
3448 | } |
3406 | } |
3449 | } |
3407 | else |
3450 | else |
… | |
… | |
3423 | selection.end.row++; |
3466 | selection.end.row++; |
3424 | } |
3467 | } |
3425 | } |
3468 | } |
3426 | |
3469 | |
3427 | if (button3 && buttonpress) |
3470 | if (button3 && buttonpress) |
|
|
3471 | { |
3428 | { /* mark may need to be changed */ |
3472 | /* mark may need to be changed */ |
3429 | if (closeto == LEFT) |
3473 | if (closeto == LEFT) |
3430 | { |
3474 | { |
3431 | selection.mark.row = selection.end.row; |
3475 | selection.mark.row = selection.end.row; |
3432 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3476 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3433 | } |
3477 | } |
… | |
… | |
3436 | selection.mark.row = selection.beg.row; |
3480 | selection.mark.row = selection.beg.row; |
3437 | selection.mark.col = selection.beg.col; |
3481 | selection.mark.col = selection.beg.col; |
3438 | } |
3482 | } |
3439 | } |
3483 | } |
3440 | |
3484 | |
3441 | #if ENABLE_FRILLS |
3485 | #if !ENABLE_MINIMAL |
3442 | if (selection.rect && selection.beg.col > selection.end.col) |
3486 | if (selection.rect && selection.beg.col > selection.end.col) |
3443 | ::swap (selection.beg.col, selection.end.col); |
3487 | ::swap (selection.beg.col, selection.end.col); |
3444 | #endif |
3488 | #endif |
3445 | } |
3489 | } |
3446 | |
3490 | |
3447 | #if ENABLE_FRILLS |
3491 | #if !ENABLE_MINIMAL |
3448 | void |
3492 | void |
3449 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3493 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3450 | { |
3494 | { |
3451 | int32_t end_col, end_row; |
3495 | int32_t end_col, end_row; |
3452 | text_t *stp; |
3496 | text_t *stp; |
… | |
… | |
3507 | */ |
3551 | */ |
3508 | void |
3552 | void |
3509 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3553 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3510 | { |
3554 | { |
3511 | XSelectionEvent ev; |
3555 | XSelectionEvent ev; |
3512 | dDisp; |
|
|
3513 | |
3556 | |
3514 | ev.type = SelectionNotify; |
3557 | ev.type = SelectionNotify; |
3515 | ev.property = None; |
3558 | ev.property = None; |
3516 | ev.display = rq.display; |
3559 | ev.display = rq.display; |
3517 | ev.requestor = rq.requestor; |
3560 | ev.requestor = rq.requestor; |
… | |
… | |
3531 | *target++ = xa[XA_COMPOUND_TEXT]; |
3574 | *target++ = xa[XA_COMPOUND_TEXT]; |
3532 | #if X_HAVE_UTF8_STRING |
3575 | #if X_HAVE_UTF8_STRING |
3533 | *target++ = xa[XA_UTF8_STRING]; |
3576 | *target++ = xa[XA_UTF8_STRING]; |
3534 | #endif |
3577 | #endif |
3535 | |
3578 | |
3536 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3579 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3537 | 32, PropModeReplace, |
3580 | 32, PropModeReplace, |
3538 | (unsigned char *)target_list, target - target_list); |
3581 | (unsigned char *)target_list, target - target_list); |
3539 | ev.property = rq.property; |
3582 | ev.property = rq.property; |
3540 | } |
3583 | } |
3541 | #if TODO // TODO |
3584 | #if TODO // TODO |
… | |
… | |
3544 | /* TODO: Handle MULTIPLE */ |
3587 | /* TODO: Handle MULTIPLE */ |
3545 | } |
3588 | } |
3546 | #endif |
3589 | #endif |
3547 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3590 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3548 | { |
3591 | { |
3549 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3592 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3550 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3593 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3551 | ev.property = rq.property; |
3594 | ev.property = rq.property; |
3552 | } |
3595 | } |
3553 | else if (rq.target == XA_STRING |
3596 | else if (rq.target == XA_STRING |
3554 | || rq.target == xa[XA_TEXT] |
3597 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3578 | style = enc_string; |
3621 | style = enc_string; |
3579 | else if (target == xa[XA_TEXT]) |
3622 | else if (target == xa[XA_TEXT]) |
3580 | style = enc_text; |
3623 | style = enc_text; |
3581 | else if (target == xa[XA_COMPOUND_TEXT]) |
3624 | else if (target == xa[XA_COMPOUND_TEXT]) |
3582 | style = enc_compound_text; |
3625 | style = enc_compound_text; |
3583 | #if ENABLE_FRILLS |
3626 | #if !ENABLE_MINIMAL |
3584 | else if (target == xa[XA_UTF8_STRING]) |
3627 | else if (target == xa[XA_UTF8_STRING]) |
3585 | style = enc_utf8; |
3628 | style = enc_utf8; |
3586 | #endif |
3629 | #endif |
3587 | else |
3630 | else |
3588 | { |
3631 | { |
… | |
… | |
3599 | { |
3642 | { |
3600 | cl = L""; |
3643 | cl = L""; |
3601 | selectlen = 0; |
3644 | selectlen = 0; |
3602 | } |
3645 | } |
3603 | |
3646 | |
3604 | #if ENABLE_FRILLS |
3647 | #if !ENABLE_MINIMAL |
3605 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3648 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3606 | // so recode it manually |
3649 | // so recode it manually |
3607 | if (style == enc_utf8) |
3650 | if (style == enc_utf8) |
3608 | { |
3651 | { |
3609 | freect = 1; |
3652 | freect = 1; |
… | |
… | |
3612 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3655 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3613 | ct.nitems = strlen ((char *)ct.value); |
3656 | ct.nitems = strlen ((char *)ct.value); |
3614 | } |
3657 | } |
3615 | else |
3658 | else |
3616 | #endif |
3659 | #endif |
3617 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3660 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3618 | freect = 1; |
3661 | freect = 1; |
3619 | else |
3662 | else |
3620 | { |
3663 | { |
3621 | /* if we failed to convert then send it raw */ |
3664 | /* if we failed to convert then send it raw */ |
3622 | ct.value = (unsigned char *)cl; |
3665 | ct.value = (unsigned char *)cl; |
3623 | ct.nitems = selectlen; |
3666 | ct.nitems = selectlen; |
3624 | ct.encoding = target; |
3667 | ct.encoding = target; |
3625 | } |
3668 | } |
3626 | |
3669 | |
3627 | XChangeProperty (disp, rq.requestor, rq.property, |
3670 | XChangeProperty (dpy, rq.requestor, rq.property, |
3628 | ct.encoding, 8, PropModeReplace, |
3671 | ct.encoding, 8, PropModeReplace, |
3629 | ct.value, (int)ct.nitems); |
3672 | ct.value, (int)ct.nitems); |
3630 | ev.property = rq.property; |
3673 | ev.property = rq.property; |
3631 | |
3674 | |
3632 | if (freect) |
3675 | if (freect) |
3633 | XFree (ct.value); |
3676 | XFree (ct.value); |
3634 | } |
3677 | } |
3635 | |
3678 | |
3636 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3679 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3637 | } |
|
|
3638 | |
|
|
3639 | /* ------------------------------------------------------------------------- * |
|
|
3640 | * MOUSE ROUTINES * |
|
|
3641 | * ------------------------------------------------------------------------- */ |
|
|
3642 | |
|
|
3643 | /* |
|
|
3644 | * return col/row values corresponding to x/y pixel values |
|
|
3645 | */ |
|
|
3646 | void |
|
|
3647 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3648 | { |
|
|
3649 | *x = Pixel2Col (*x); |
|
|
3650 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3651 | *y = Pixel2Row (*y); |
|
|
3652 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3653 | } |
3680 | } |
3654 | |
3681 | |
3655 | /* ------------------------------------------------------------------------- */ |
3682 | /* ------------------------------------------------------------------------- */ |
3656 | #ifdef USE_XIM |
3683 | #ifdef USE_XIM |
3657 | void |
3684 | void |
3658 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3685 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3659 | { |
3686 | { |
3660 | XWindowAttributes xwa; |
3687 | XWindowAttributes xwa; |
3661 | |
3688 | |
3662 | XGetWindowAttributes (display->display, vt, &xwa); |
3689 | XGetWindowAttributes (dpy, vt, &xwa); |
3663 | |
3690 | |
3664 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3691 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3665 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3692 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3666 | } |
3693 | } |
3667 | #endif |
3694 | #endif |
… | |
… | |
3763 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3790 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3764 | { |
3791 | { |
3765 | while (*s) |
3792 | while (*s) |
3766 | { |
3793 | { |
3767 | text_t t = *s++; |
3794 | text_t t = *s++; |
3768 | int width = wcwidth (t); |
3795 | int width = WCWIDTH (t); |
3769 | |
3796 | |
3770 | while (width--) |
3797 | while (width--) |
3771 | { |
3798 | { |
3772 | scr_overlay_set (x++, y, t); |
3799 | scr_overlay_set (x++, y, t); |
3773 | t = NOCHAR; |
3800 | t = NOCHAR; |