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 (dpy, drawBuffer, 0, \ |
|
|
99 | Row2Pixel (row), (unsigned int)width, \ |
|
|
100 | (unsigned int)Height2Pixel (num), False) |
|
|
101 | |
|
|
102 | #define CLEAR_CHARS(x, y, num) \ |
90 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
91 | if (mapped) \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
92 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
93 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
94 | (unsigned int)Height2Pixel (1), False) |
107 | |
|
|
108 | #define ERASE_ROWS(row, num) \ |
|
|
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
|
|
110 | 0, Row2Pixel (row), \ |
|
|
111 | (unsigned int)width, \ |
|
|
112 | (unsigned int)Height2Pixel (num)) |
|
|
113 | |
95 | |
114 | /* ------------------------------------------------------------------------- * |
96 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
97 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
98 | * ------------------------------------------------------------------------- */ |
117 | |
99 | |
… | |
… | |
161 | { |
143 | { |
162 | #if ENABLE_OVERLAY |
144 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
145 | scr_overlay_off (); |
164 | #endif |
146 | #endif |
165 | |
147 | |
|
|
148 | rvideo_mode = false; |
166 | view_start = 0; |
149 | view_start = 0; |
167 | num_scr = 0; |
150 | num_scr = 0; |
168 | |
151 | |
169 | if (ncol == 0) |
152 | if (ncol == 0) |
170 | ncol = 80; |
153 | ncol = 80; |
… | |
… | |
237 | selection.text = NULL; |
220 | selection.text = NULL; |
238 | selection.len = 0; |
221 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
222 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
223 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
224 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
|
|
243 | } |
225 | } |
244 | else |
226 | else |
245 | { |
227 | { |
246 | /* |
228 | /* |
247 | * add or delete rows as appropriate |
229 | * add or delete rows as appropriate |
… | |
… | |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
258 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | } |
259 | } |
278 | |
260 | |
279 | line_t *old_buf = row_buf; |
261 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
262 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
281 | |
263 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
264 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
265 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
266 | int q = total_rows; // rewrapped row |
285 | |
267 | |
286 | if (top_row) |
268 | if (top_row) |
… | |
… | |
330 | int qcol = 0; |
312 | int qcol = 0; |
331 | |
313 | |
332 | // see below for cursor adjustment rationale |
314 | // see below for cursor adjustment rationale |
333 | if (p == ocur.row) |
315 | if (p == ocur.row) |
334 | screen.cur.row = q - (total_rows - nrow); |
316 | screen.cur.row = q - (total_rows - nrow); |
335 | |
317 | |
336 | // fill a single destination line |
318 | // fill a single destination line |
337 | while (lofs < llen && qcol < ncol) |
319 | while (lofs < llen && qcol < ncol) |
338 | { |
320 | { |
339 | int prow = lofs / prev_ncol; |
321 | int prow = lofs / prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
322 | int pcol = lofs % prev_ncol; |
… | |
… | |
366 | } |
348 | } |
367 | while (p != pend && q > 0); |
349 | while (p != pend && q > 0); |
368 | |
350 | |
369 | term_start = total_rows - nrow; |
351 | term_start = total_rows - nrow; |
370 | top_row = q - term_start; |
352 | top_row = q - term_start; |
371 | |
353 | |
372 | // make sure all terminal lines exist |
354 | // make sure all terminal lines exist |
373 | while (top_row > 0) |
355 | while (top_row > 0) |
374 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
356 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | } |
357 | } |
376 | else |
358 | else |
377 | { |
359 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
360 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
361 | |
380 | for (int row = min (nrow, prev_nrow); row--; ) |
362 | for (int row = min (nrow, prev_nrow); row--; ) |
381 | { |
363 | { |
382 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
364 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
383 | line_t &qline = row_buf [row]; |
365 | line_t &qline = row_buf [row]; |
384 | |
366 | |
… | |
… | |
407 | CLEAR_ALL_SELECTION (); |
389 | CLEAR_ALL_SELECTION (); |
408 | |
390 | |
409 | prev_nrow = nrow; |
391 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
392 | prev_ncol = ncol; |
411 | |
393 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
394 | tabs = (char *)rxvt_malloc (ncol); |
413 | |
395 | |
414 | for (int col = ncol; col--; ) |
396 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
397 | tabs [col] = col % TABSIZE == 0; |
416 | |
398 | |
417 | if (current_screen != PRIMARY) |
399 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
400 | scr_swap_screen (); |
419 | |
401 | |
… | |
… | |
510 | } |
492 | } |
511 | |
493 | |
512 | void |
494 | void |
513 | rxvt_term::scr_swap_screen () |
495 | rxvt_term::scr_swap_screen () |
514 | { |
496 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
497 | if (!option (Opt_secondaryScreen)) |
516 | return; |
498 | return; |
517 | |
499 | |
518 | for (int i = prev_nrow; i--; ) |
500 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
501 | ::swap (ROW(i), swap_buf [i]); |
520 | |
502 | |
… | |
… | |
542 | selection_check (2); /* check for boundary cross */ |
524 | selection_check (2); /* check for boundary cross */ |
543 | |
525 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | |
527 | |
546 | #if NSCREENS |
528 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
529 | if (option (Opt_secondaryScreen)) |
548 | { |
530 | { |
549 | num_scr = 0; |
531 | num_scr = 0; |
550 | |
532 | |
551 | scr_swap_screen (); |
533 | scr_swap_screen (); |
552 | |
534 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
537 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
538 | swap.flags |= Screen_VisibleCursor; |
557 | } |
539 | } |
558 | else |
540 | else |
559 | #endif |
541 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
542 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
543 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
544 | } |
563 | |
545 | |
564 | // clear WrapNext indicator, solidifying position on next line |
546 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
547 | void |
… | |
… | |
598 | /* |
580 | /* |
599 | * Change the rendition style for following text |
581 | * Change the rendition style for following text |
600 | */ |
582 | */ |
601 | void |
583 | void |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
584 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
603 | { |
585 | { |
604 | if (set) |
586 | if (set) |
605 | rstyle |= style; |
587 | rstyle |= style; |
606 | else if (style == ~RS_None) |
588 | else if (style == ~RS_None) |
607 | rstyle = DEFAULT_RSTYLE; |
589 | rstyle = DEFAULT_RSTYLE; |
608 | else |
590 | else |
609 | rstyle &= ~style; |
591 | rstyle &= ~style; |
610 | } |
592 | } |
611 | |
593 | |
612 | /* ------------------------------------------------------------------------- */ |
594 | /* ------------------------------------------------------------------------- */ |
613 | /* |
595 | /* |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
596 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
615 | * count positive ==> scroll up |
597 | * count positive ==> scroll up |
… | |
… | |
624 | want_refresh = 1; |
606 | want_refresh = 1; |
625 | num_scr += count; |
607 | num_scr += count; |
626 | |
608 | |
627 | if (count > 0 |
609 | if (count > 0 |
628 | && row1 == 0 |
610 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
611 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
612 | { |
631 | top_row = max (top_row - count, -saveLines); |
613 | top_row = max (top_row - count, -saveLines); |
632 | |
614 | |
633 | // scroll everything up 'count' lines |
615 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
616 | term_start = (term_start + count) % total_rows; |
… | |
… | |
666 | line_t &l2 = ROW(i); |
648 | line_t &l2 = ROW(i); |
667 | |
649 | |
668 | ::swap (l1, l2); |
650 | ::swap (l1, l2); |
669 | l2.touch (); |
651 | l2.touch (); |
670 | } |
652 | } |
671 | |
653 | |
672 | // move and/or clear selection, if any |
654 | // move and/or clear selection, if any |
673 | if (selection.op && current_screen == selection.screen) |
655 | if (selection.op && current_screen == selection.screen) |
674 | { |
656 | { |
675 | selection.beg.row -= count; |
657 | selection.beg.row -= count; |
676 | selection.end.row -= count; |
658 | selection.end.row -= count; |
… | |
… | |
684 | selection.op = SELECTION_CLEAR; |
666 | selection.op = SELECTION_CLEAR; |
685 | } |
667 | } |
686 | } |
668 | } |
687 | |
669 | |
688 | // finally move the view window, if desired |
670 | // finally move the view window, if desired |
689 | if (OPTION (Opt_scrollWithBuffer) |
671 | if (option (Opt_scrollWithBuffer) |
690 | && view_start != 0 |
672 | && view_start != 0 |
691 | && view_start != -saveLines) |
673 | && view_start != -saveLines) |
692 | scr_page (UP, count); |
674 | scr_page (UP, count); |
693 | |
675 | |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
676 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
712 | { |
694 | { |
713 | /* move selected region too */ |
695 | /* move selected region too */ |
714 | selection.beg.row -= count; |
696 | selection.beg.row -= count; |
715 | selection.end.row -= count; |
697 | selection.end.row -= count; |
716 | selection.mark.row -= count; |
698 | selection.mark.row -= count; |
717 | |
699 | |
718 | selection_check (0); |
700 | selection_check (0); |
719 | } |
701 | } |
720 | } |
702 | } |
721 | |
703 | |
722 | // use a simple and robust scrolling algorithm, this |
704 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
789 | |
771 | |
790 | while (str < strend) |
772 | while (str < strend) |
791 | { |
773 | { |
792 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
774 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
793 | |
775 | |
794 | if (c < 0x20) |
776 | if (expect_false (c < 0x20)) |
795 | if (c == C0_LF) |
777 | if (c == C0_LF) |
796 | { |
778 | { |
797 | max_it (line->l, screen.cur.col); |
779 | max_it (line->l, screen.cur.col); |
798 | |
780 | |
799 | screen.flags &= ~Screen_WrapNext; |
781 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
818 | { |
800 | { |
819 | scr_tab (1, true); |
801 | scr_tab (1, true); |
820 | continue; |
802 | continue; |
821 | } |
803 | } |
822 | |
804 | |
|
|
805 | if (expect_false ( |
823 | if (checksel /* see if we're writing within selection */ |
806 | checksel /* see if we're writing within selection */ |
824 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
807 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
825 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
808 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
809 | )) |
826 | { |
810 | { |
827 | checksel = 0; |
811 | checksel = 0; |
828 | /* |
812 | /* |
829 | * If we wrote anywhere in the selected area, kill the selection |
813 | * If we wrote anywhere in the selected area, kill the selection |
830 | * XXX: should we kill the mark too? Possibly, but maybe that |
814 | * XXX: should we kill the mark too? Possibly, but maybe that |
831 | * should be a similar check. |
815 | * should be a similar check. |
832 | */ |
816 | */ |
833 | CLEAR_SELECTION (); |
817 | CLEAR_SELECTION (); |
834 | } |
818 | } |
835 | |
819 | |
836 | if (screen.flags & Screen_WrapNext) |
820 | if (expect_false (screen.flags & Screen_WrapNext)) |
837 | { |
821 | { |
838 | scr_do_wrap (); |
822 | scr_do_wrap (); |
839 | |
823 | |
840 | line->l = ncol; |
824 | line->l = ncol; |
841 | line->is_longer (1); |
825 | line->is_longer (1); |
842 | |
826 | |
843 | row = screen.cur.row; |
827 | row = screen.cur.row; |
844 | line = &ROW(row); /* _must_ refresh */ |
828 | line = &ROW(row); /* _must_ refresh */ |
845 | } |
829 | } |
846 | |
830 | |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
831 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
832 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
849 | c = 0xfffd; |
833 | c = 0xfffd; |
850 | |
834 | |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
835 | // rely on wcwidth to tell us the character width, do wcwidth before |
852 | // further replacements, as wcwidth might return -1 for the line |
836 | // further replacements, as wcwidth might return -1 for the line |
853 | // drawing characters below as they might be invalid in the current |
837 | // drawing characters below as they might be invalid in the current |
854 | // locale. |
838 | // locale. |
855 | int width = WCWIDTH (c); |
839 | int width = WCWIDTH (c); |
856 | |
840 | |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
841 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
858 | { |
842 | { |
859 | // vt100 special graphics and line drawing |
843 | // vt100 special graphics and line drawing |
860 | // 5f-7e standard vt100 |
844 | // 5f-7e standard vt100 |
861 | // 40-5e rxvt extension for extra curses acs chars |
845 | // 40-5e rxvt extension for extra curses acs chars |
862 | static uint16_t vt100_0[62] = { // 41 .. 7e |
846 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
875 | c = vt100_0[c - 0x41]; |
859 | c = vt100_0[c - 0x41]; |
876 | width = 1; // vt100 line drawing characters are always single-width |
860 | width = 1; // vt100 line drawing characters are always single-width |
877 | } |
861 | } |
878 | } |
862 | } |
879 | |
863 | |
880 | if (screen.flags & Screen_Insert) |
864 | if (expect_false (screen.flags & Screen_Insert)) |
881 | scr_insdel_chars (width, INSERT); |
865 | scr_insdel_chars (width, INSERT); |
882 | |
866 | |
883 | if (width != 0) |
867 | if (width != 0) |
884 | { |
868 | { |
885 | #if !UNICODE_3 |
869 | #if !UNICODE_3 |
… | |
… | |
891 | c = 0xfffd; |
875 | c = 0xfffd; |
892 | # endif |
876 | # endif |
893 | #endif |
877 | #endif |
894 | |
878 | |
895 | // nuke the character at this position, if required |
879 | // nuke the character at this position, if required |
|
|
880 | if (expect_false ( |
896 | if (line->t[screen.cur.col] == NOCHAR |
881 | line->t[screen.cur.col] == NOCHAR |
897 | || (screen.cur.col < ncol - 1 |
882 | || (screen.cur.col < ncol - 1 |
898 | && line->t[screen.cur.col + 1] == NOCHAR)) |
883 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
884 | )) |
899 | { |
885 | { |
900 | int col = screen.cur.col; |
886 | int col = screen.cur.col; |
901 | |
887 | |
902 | // find begin |
888 | // find begin |
903 | while (col > 0 && line->t[col] == NOCHAR) |
889 | while (col > 0 && line->t[col] == NOCHAR) |
… | |
… | |
914 | } |
900 | } |
915 | |
901 | |
916 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
902 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
917 | |
903 | |
918 | // if the character doesn't fit into the remaining columns... |
904 | // if the character doesn't fit into the remaining columns... |
919 | if (screen.cur.col > ncol - width && ncol >= width) |
905 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
920 | { |
906 | { |
921 | // ...output spaces |
907 | // ...output spaces |
922 | c = ' '; |
908 | c = ' '; |
923 | // and try the same character next loop iteration |
909 | // and try the same character next loop iteration |
924 | --str; |
910 | --str; |
… | |
… | |
929 | do |
915 | do |
930 | { |
916 | { |
931 | line->t[screen.cur.col] = c; |
917 | line->t[screen.cur.col] = c; |
932 | line->r[screen.cur.col] = rend; |
918 | line->r[screen.cur.col] = rend; |
933 | |
919 | |
934 | if (screen.cur.col < ncol - 1) |
920 | if (expect_true (screen.cur.col < ncol - 1)) |
935 | screen.cur.col++; |
921 | screen.cur.col++; |
936 | else |
922 | else |
937 | { |
923 | { |
938 | line->l = ncol; |
924 | line->l = ncol; |
939 | if (screen.flags & Screen_Autowrap) |
925 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
941 | break; |
927 | break; |
942 | } |
928 | } |
943 | |
929 | |
944 | c = NOCHAR; |
930 | c = NOCHAR; |
945 | } |
931 | } |
946 | while (--width > 0); |
932 | while (expect_false (--width > 0)); |
947 | |
933 | |
948 | // pad with spaces when overwriting wide character with smaller one |
934 | // pad with spaces when overwriting wide character with smaller one |
949 | if (!width) |
935 | if (expect_false (!width)) |
950 | { |
936 | { |
951 | line->touch (); |
937 | line->touch (); |
952 | |
938 | |
953 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
939 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
954 | { |
940 | { |
955 | line->t[c] = ' '; |
941 | line->t[c] = ' '; |
956 | line->r[c] = rend; |
942 | line->r[c] = rend; |
957 | } |
943 | } |
958 | } |
944 | } |
959 | } |
945 | } |
|
|
946 | #if ENABLE_COMBINING |
960 | else // width == 0 |
947 | else // width == 0 |
961 | { |
948 | { |
962 | #if ENABLE_COMBINING |
949 | if (c != 0xfeff) // ignore BOM |
963 | // handle combining characters |
|
|
964 | // we just tag the accent on the previous on-screen character. |
|
|
965 | // this is arguably not correct, but also arguably not wrong. |
|
|
966 | // we don't handle double-width characters nicely yet. |
|
|
967 | line_t *linep; |
|
|
968 | text_t *tp; |
|
|
969 | rend_t *rp; |
|
|
970 | |
|
|
971 | if (screen.cur.col > 0) |
|
|
972 | { |
950 | { |
|
|
951 | // handle combining characters |
|
|
952 | // we just tag the accent on the previous on-screen character. |
|
|
953 | // this is arguably not correct, but also arguably not wrong. |
|
|
954 | // we don't handle double-width characters nicely yet. |
|
|
955 | line_t *linep; |
|
|
956 | text_t *tp; |
|
|
957 | rend_t *rp; |
|
|
958 | |
|
|
959 | if (screen.cur.col > 0) |
|
|
960 | { |
973 | linep = line; |
961 | linep = line; |
974 | tp = line->t + screen.cur.col - 1; |
962 | tp = line->t + screen.cur.col - 1; |
975 | rp = line->r + screen.cur.col - 1; |
963 | rp = line->r + screen.cur.col - 1; |
|
|
964 | } |
|
|
965 | else if (screen.cur.row > 0 |
|
|
966 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
967 | { |
|
|
968 | linep = &ROW(screen.cur.row - 1); |
|
|
969 | tp = line->t + ncol - 1; |
|
|
970 | rp = line->r + ncol - 1; |
|
|
971 | } |
|
|
972 | else |
|
|
973 | continue; |
|
|
974 | |
|
|
975 | linep->touch (); |
|
|
976 | |
|
|
977 | while (*tp == NOCHAR && tp > linep->t) |
|
|
978 | tp--, rp--; |
|
|
979 | |
|
|
980 | // first try to find a precomposed character |
|
|
981 | unicode_t n = rxvt_compose (*tp, c); |
|
|
982 | if (n == NOCHAR) |
|
|
983 | n = rxvt_composite.compose (*tp, c); |
|
|
984 | |
|
|
985 | *tp = n; |
|
|
986 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
976 | } |
987 | } |
977 | else if (screen.cur.row > 0 |
|
|
978 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
979 | { |
|
|
980 | linep = &ROW(screen.cur.row - 1); |
|
|
981 | tp = line->t + ncol - 1; |
|
|
982 | rp = line->r + ncol - 1; |
|
|
983 | } |
988 | } |
984 | else |
|
|
985 | continue; |
|
|
986 | |
|
|
987 | linep->touch (); |
|
|
988 | |
|
|
989 | while (*tp == NOCHAR && tp > linep->t) |
|
|
990 | tp--, rp--; |
|
|
991 | |
|
|
992 | // first try to find a precomposed character |
|
|
993 | unicode_t n = rxvt_compose (*tp, c); |
|
|
994 | if (n == NOCHAR) |
|
|
995 | n = rxvt_composite.compose (*tp, c); |
|
|
996 | |
|
|
997 | *tp = n; |
|
|
998 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
999 | #endif |
989 | #endif |
1000 | } |
|
|
1001 | } |
990 | } |
1002 | |
991 | |
1003 | max_it (line->l, screen.cur.col); |
992 | max_it (line->l, screen.cur.col); |
1004 | |
993 | |
1005 | #ifdef DEBUG_STRICT |
994 | #ifdef DEBUG_STRICT |
… | |
… | |
1013 | * XTERM_SEQ: CTRL-H |
1002 | * XTERM_SEQ: CTRL-H |
1014 | */ |
1003 | */ |
1015 | void |
1004 | void |
1016 | rxvt_term::scr_backspace () NOTHROW |
1005 | rxvt_term::scr_backspace () NOTHROW |
1017 | { |
1006 | { |
1018 | want_refresh = 1; |
|
|
1019 | |
|
|
1020 | if (screen.cur.col == 0) |
1007 | if (screen.cur.col == 0) |
1021 | { |
1008 | { |
1022 | if (screen.cur.row > 0) |
1009 | if (screen.cur.row > 0) |
1023 | { |
1010 | { |
1024 | #ifdef TERMCAP_HAS_BW |
1011 | #ifdef TERMCAP_HAS_BW |
1025 | screen.cur.col = ncol - 1; |
1012 | screen.cur.col = ncol - 1; |
1026 | screen.cur.row--; |
1013 | --screen.cur.row; |
1027 | return; |
1014 | |
|
|
1015 | want_refresh = 1; |
1028 | #endif |
1016 | #endif |
1029 | } |
1017 | } |
1030 | } |
1018 | } |
1031 | else if (!(screen.flags & Screen_WrapNext)) |
1019 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1020 | scr_gotorc (0, -1, RELATIVE); |
1033 | |
|
|
1034 | screen.flags &= ~Screen_WrapNext; |
|
|
1035 | } |
1021 | } |
1036 | |
1022 | |
1037 | /* ------------------------------------------------------------------------- */ |
1023 | /* ------------------------------------------------------------------------- */ |
1038 | /* |
1024 | /* |
1039 | * Process Horizontal Tab |
1025 | * Process Horizontal Tab |
… | |
… | |
1062 | x = i; |
1048 | x = i; |
1063 | |
1049 | |
1064 | if (!--count) |
1050 | if (!--count) |
1065 | break; |
1051 | break; |
1066 | } |
1052 | } |
1067 | else |
1053 | else |
1068 | ht &= l.t[i] == ' ' |
1054 | ht &= l.t[i] == ' ' |
1069 | && RS_SAME (l.r[i], base_rend); |
1055 | && RS_SAME (l.r[i], base_rend); |
1070 | |
1056 | |
1071 | if (count) |
1057 | if (count) |
1072 | x = ncol - 1; |
1058 | x = ncol - 1; |
1073 | |
1059 | |
1074 | // store horizontal tab commands as characters inside the text |
1060 | // store horizontal tab commands as characters inside the text |
1075 | // buffer so they can be selected and pasted. |
1061 | // buffer so they can be selected and pasted. |
1076 | if (ht && OPTION (Opt_pastableTabs)) |
1062 | if (ht && option (Opt_pastableTabs)) |
1077 | { |
1063 | { |
1078 | base_rend = SET_FONT (base_rend, 0); |
1064 | base_rend = SET_FONT (base_rend, 0); |
1079 | |
1065 | |
1080 | l.touch (x); |
1066 | l.touch (x); |
1081 | |
1067 | |
… | |
… | |
1188 | } |
1174 | } |
1189 | } |
1175 | } |
1190 | else |
1176 | else |
1191 | { |
1177 | { |
1192 | if (screen.flags & Screen_Relative) |
1178 | if (screen.flags & Screen_Relative) |
|
|
1179 | { |
1193 | { /* relative origin mode */ |
1180 | /* relative origin mode */ |
1194 | screen.cur.row = row + screen.tscroll; |
1181 | screen.cur.row = row + screen.tscroll; |
1195 | min_it (screen.cur.row, screen.bscroll); |
1182 | min_it (screen.cur.row, screen.bscroll); |
1196 | } |
1183 | } |
1197 | else |
1184 | else |
1198 | screen.cur.row = row; |
1185 | screen.cur.row = row; |
… | |
… | |
1231 | /* |
1218 | /* |
1232 | * Erase part or whole of a line |
1219 | * Erase part or whole of a line |
1233 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1220 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1234 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1221 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1235 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1222 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1223 | * extension: clear to right unless wrapped: ESC [ 3 K |
1236 | */ |
1224 | */ |
1237 | void |
1225 | void |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1226 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1239 | { |
1227 | { |
1240 | unsigned int col, num; |
1228 | unsigned int col, num; |
… | |
… | |
1249 | line.touch (); |
1237 | line.touch (); |
1250 | line.is_longer (0); |
1238 | line.is_longer (0); |
1251 | |
1239 | |
1252 | switch (mode) |
1240 | switch (mode) |
1253 | { |
1241 | { |
|
|
1242 | case 3: |
|
|
1243 | if (screen.flags & Screen_WrapNext) |
|
|
1244 | return; |
|
|
1245 | |
|
|
1246 | /* fall through */ |
|
|
1247 | |
1254 | case 0: /* erase to end of line */ |
1248 | case 0: /* erase to end of line */ |
1255 | col = screen.cur.col; |
1249 | col = screen.cur.col; |
1256 | num = ncol - col; |
1250 | num = ncol - col; |
1257 | min_it (line.l, col); |
1251 | min_it (line.l, col); |
|
|
1252 | |
1258 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1253 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1259 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1254 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1260 | CLEAR_SELECTION (); |
1255 | CLEAR_SELECTION (); |
1261 | break; |
1256 | break; |
|
|
1257 | |
1262 | case 1: /* erase to beginning of line */ |
1258 | case 1: /* erase to beginning of line */ |
1263 | col = 0; |
1259 | col = 0; |
1264 | num = screen.cur.col + 1; |
1260 | num = screen.cur.col + 1; |
|
|
1261 | |
1265 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1262 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1266 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1263 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1267 | CLEAR_SELECTION (); |
1264 | CLEAR_SELECTION (); |
1268 | break; |
1265 | break; |
|
|
1266 | |
1269 | case 2: /* erase whole line */ |
1267 | case 2: /* erase whole line */ |
1270 | col = 0; |
1268 | col = 0; |
1271 | num = ncol; |
1269 | num = ncol; |
1272 | line.l = 0; |
1270 | line.l = 0; |
1273 | if (selection.beg.row <= screen.cur.row |
1271 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1331 | if (row >= nrow) /* Out Of Bounds */ |
1329 | if (row >= nrow) /* Out Of Bounds */ |
1332 | return; |
1330 | return; |
1333 | |
1331 | |
1334 | min_it (num, nrow - row); |
1332 | min_it (num, nrow - row); |
1335 | |
1333 | |
|
|
1334 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1336 | if (rstyle & (RS_RVid | RS_Uline)) |
1335 | if (rstyle & (RS_RVid | RS_Uline)) |
1337 | ren = (rend_t) ~RS_None; |
1336 | ren = (rend_t) ~RS_None; |
1338 | else if (GET_BASEBG (rstyle) == Color_bg) |
1337 | else if (GET_BASEBG (rstyle) == Color_bg) |
1339 | { |
1338 | { |
1340 | ren = DEFAULT_RSTYLE; |
1339 | ren = DEFAULT_RSTYLE; |
1341 | CLEAR_ROWS (row, num); |
1340 | |
|
|
1341 | if (mapped) |
|
|
1342 | XClearArea (dpy, vt, 0, |
|
|
1343 | Row2Pixel (row), (unsigned int)width, |
|
|
1344 | (unsigned int)Height2Pixel (num), False); |
1342 | } |
1345 | } |
1343 | else |
1346 | else |
1344 | { |
1347 | { |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1348 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1349 | |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1350 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1347 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1351 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1348 | ERASE_ROWS (row, num); |
1352 | XFillRectangle (dpy, vt, gc, |
|
|
1353 | 0, Row2Pixel (row), |
|
|
1354 | (unsigned int)width, |
|
|
1355 | (unsigned int)Height2Pixel (num)); |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1356 | gcvalue.foreground = pix_colors[Color_fg]; |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1357 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1351 | } |
1358 | } |
1352 | |
1359 | |
1353 | for (; num--; row++) |
1360 | for (; num--; row++) |
… | |
… | |
1474 | { |
1481 | { |
1475 | if (selection.end.row != screen.cur.row |
1482 | if (selection.end.row != screen.cur.row |
1476 | || (selection.end.col + count >= ncol)) |
1483 | || (selection.end.col + count >= ncol)) |
1477 | CLEAR_SELECTION (); |
1484 | CLEAR_SELECTION (); |
1478 | else |
1485 | else |
|
|
1486 | { |
1479 | { /* shift selection */ |
1487 | /* shift selection */ |
1480 | selection.beg.col += count; |
1488 | selection.beg.col += count; |
1481 | selection.mark.col += count; /* XXX: yes? */ |
1489 | selection.mark.col += count; /* XXX: yes? */ |
1482 | selection.end.col += count; |
1490 | selection.end.col += count; |
1483 | } |
1491 | } |
1484 | } |
1492 | } |
… | |
… | |
1489 | case ERASE: |
1497 | case ERASE: |
1490 | screen.cur.col += count; /* don't worry if > ncol */ |
1498 | screen.cur.col += count; /* don't worry if > ncol */ |
1491 | selection_check (1); |
1499 | selection_check (1); |
1492 | screen.cur.col -= count; |
1500 | screen.cur.col -= count; |
1493 | |
1501 | |
1494 | line->l = max (line->l - count, 0); |
|
|
1495 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1502 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1496 | break; |
1503 | break; |
1497 | |
1504 | |
1498 | case DELETE: |
1505 | case DELETE: |
1499 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1506 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1623 | */ |
1630 | */ |
1624 | void |
1631 | void |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1632 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | { |
1633 | { |
1627 | if (mode < 0) |
1634 | if (mode < 0) |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1635 | memset (tabs, 0, ncol); |
1629 | else if (screen.cur.col < ncol) |
1636 | else if (screen.cur.col < ncol) |
1630 | tabs [screen.cur.col] = !!mode; |
1637 | tabs [screen.cur.col] = !!mode; |
1631 | } |
1638 | } |
1632 | |
1639 | |
1633 | /* ------------------------------------------------------------------------- */ |
1640 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | if (rvideo_state != on) |
1655 | if (rvideo_state != on) |
1649 | { |
1656 | { |
1650 | rvideo_state = on; |
1657 | rvideo_state = on; |
1651 | |
1658 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1659 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1660 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1661 | if (bgPixmap.pixmap == None) |
1655 | #endif |
|
|
1656 | #if TRANSPARENT |
|
|
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1658 | #endif |
1662 | #endif |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1663 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1664 | |
1661 | XGCValues gcvalue; |
1665 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1666 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1806 | for (i = PART_BEG; i < RC_COUNT; i++) |
1810 | for (i = PART_BEG; i < RC_COUNT; i++) |
1807 | { |
1811 | { |
1808 | min_it (rc[i].col, ncol - 1); |
1812 | min_it (rc[i].col, ncol - 1); |
1809 | min_it (rc[i].row, nrow - 1); |
1813 | min_it (rc[i].row, nrow - 1); |
1810 | } |
1814 | } |
1811 | |
1815 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1812 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1816 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1813 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1817 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1814 | |
1818 | |
1815 | num_scr_allow = 0; |
1819 | num_scr_allow = 0; |
1816 | |
1820 | |
… | |
… | |
1871 | return true; |
1875 | return true; |
1872 | } |
1876 | } |
1873 | |
1877 | |
1874 | #ifndef NO_BELL |
1878 | #ifndef NO_BELL |
1875 | void |
1879 | void |
1876 | rxvt_term::bell_cb (time_watcher &w) |
1880 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1877 | { |
1881 | { |
1878 | rvideo_bell = false; |
1882 | rvideo_bell = false; |
1879 | scr_rvideo_mode (rvideo_mode); |
1883 | scr_rvideo_mode (rvideo_mode); |
|
|
1884 | refresh_check (); |
1880 | } |
1885 | } |
1881 | #endif |
1886 | #endif |
1882 | |
1887 | |
1883 | /* ------------------------------------------------------------------------- */ |
1888 | /* ------------------------------------------------------------------------- */ |
1884 | void |
1889 | void |
… | |
… | |
1886 | { |
1891 | { |
1887 | #ifndef NO_BELL |
1892 | #ifndef NO_BELL |
1888 | |
1893 | |
1889 | # ifndef NO_MAPALERT |
1894 | # ifndef NO_MAPALERT |
1890 | # ifdef MAPALERT_OPTION |
1895 | # ifdef MAPALERT_OPTION |
1891 | if (OPTION (Opt_mapAlert)) |
1896 | if (option (Opt_mapAlert)) |
1892 | # endif |
1897 | # endif |
1893 | XMapWindow (dpy, parent[0]); |
1898 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1899 | # endif |
1895 | |
1900 | |
|
|
1901 | # if ENABLE_FRILLS |
|
|
1902 | if (option (Opt_urgentOnBell)) |
|
|
1903 | set_urgency (1); |
|
|
1904 | # endif |
|
|
1905 | |
1896 | if (OPTION (Opt_visualBell)) |
1906 | if (option (Opt_visualBell)) |
1897 | { |
1907 | { |
1898 | rvideo_bell = true; |
1908 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1909 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1910 | flush (); |
1901 | |
1911 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1912 | bell_ev.start (VISUAL_BELL_DURATION); |
1903 | } |
1913 | } |
1904 | else |
1914 | else |
1905 | XBell (dpy, 0); |
1915 | XBell (dpy, 0); |
1906 | |
|
|
1907 | #endif |
1916 | #endif |
1908 | } |
1917 | } |
1909 | |
1918 | |
1910 | /* ------------------------------------------------------------------------- */ |
1919 | /* ------------------------------------------------------------------------- */ |
1911 | /* ARGSUSED */ |
1920 | /* ARGSUSED */ |
1912 | void |
1921 | void |
1913 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1922 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1914 | { |
1923 | { |
1915 | #ifdef PRINTPIPE |
1924 | #ifdef PRINTPIPE |
1916 | int nrows, row_start; |
1925 | int nrows, row_start; |
1917 | FILE *fd; |
1926 | FILE *fd = popen_printer (); |
1918 | |
1927 | |
1919 | if ((fd = popen_printer ()) == NULL) |
1928 | if (!fd) |
1920 | return; |
1929 | return; |
1921 | |
1930 | |
1922 | if (fullhist) |
1931 | if (fullhist) |
1923 | { |
1932 | { |
1924 | nrows = nrow - top_row; |
1933 | nrows = nrow - top_row; |
… | |
… | |
1978 | int i; /* tmp */ |
1987 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1988 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1989 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
1990 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
1991 | rend_t *crp; // cursor rendition pointer |
|
|
1992 | rend_t ccol1, /* Cursor colour */ |
|
|
1993 | ccol2; /* Cursor colour2 */ |
1983 | |
1994 | |
1984 | want_refresh = 0; /* screen is current */ |
1995 | want_refresh = 0; /* screen is current */ |
1985 | |
1996 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
1997 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
1998 | return; |
1988 | |
1999 | |
1989 | /* |
2000 | /* |
1990 | * A: set up vars |
2001 | * A: set up vars |
1991 | */ |
2002 | */ |
|
|
2003 | refresh_count = 0; |
|
|
2004 | |
1992 | have_bg = 0; |
2005 | have_bg = 0; |
1993 | refresh_count = 0; |
2006 | #ifdef HAVE_BG_PIXMAP |
1994 | |
|
|
1995 | #if XPM_BACKGROUND |
|
|
1996 | have_bg |= bgPixmap.pixmap != None; |
2007 | have_bg = bgPixmap.pixmap != None; |
1997 | #endif |
|
|
1998 | #if TRANSPARENT |
|
|
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
|
|
2000 | #endif |
2008 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2009 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2010 | |
2003 | /* |
2011 | /* |
2004 | * B: reverse any characters which are selected |
2012 | * B: reverse any characters which are selected |
… | |
… | |
2008 | /* |
2016 | /* |
2009 | * C: set the cursor character (s) |
2017 | * C: set the cursor character (s) |
2010 | */ |
2018 | */ |
2011 | { |
2019 | { |
2012 | unsigned char setoldcursor; |
2020 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2021 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2022 | showcursor = (screen.flags & Screen_VisibleCursor); |
2017 | #ifdef CURSOR_BLINK |
2023 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2024 | if (hidden_cursor) |
2019 | showcursor = 0; |
2025 | showcursor = 0; |
… | |
… | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2032 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2033 | col--; |
2028 | |
2034 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2035 | crp = &ROW(screen.cur.row).r[col]; |
2030 | |
2036 | |
|
|
2037 | #ifndef NO_CURSORCOLOR |
|
|
2038 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2039 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2040 | ccol1 = Color_cursor; |
|
|
2041 | else |
|
|
2042 | #endif |
|
|
2043 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2044 | ccol1 = fgcolor_of (rstyle); |
|
|
2045 | #else |
|
|
2046 | ccol1 = Color_fg; |
|
|
2047 | #endif |
|
|
2048 | |
|
|
2049 | #ifndef NO_CURSORCOLOR |
|
|
2050 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2051 | ccol2 = Color_cursor2; |
|
|
2052 | else |
|
|
2053 | #endif |
|
|
2054 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2055 | ccol2 = bgcolor_of (rstyle); |
|
|
2056 | #else |
|
|
2057 | ccol2 = Color_bg; |
|
|
2058 | #endif |
|
|
2059 | |
2031 | if (showcursor && focus) |
2060 | if (showcursor && focus) |
2032 | { |
2061 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2062 | if (option (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2063 | *crp ^= RS_Uline; |
2035 | else |
2064 | else |
2036 | { |
2065 | { |
2037 | *crp ^= RS_RVid; |
2066 | *crp ^= RS_RVid; |
2038 | |
|
|
2039 | #ifndef NO_CURSORCOLOR |
|
|
2040 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2041 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2042 | ccol1 = Color_cursor; |
|
|
2043 | else |
|
|
2044 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2045 | ccol1 = fgcolor_of (rstyle); |
|
|
2046 | #else |
|
|
2047 | ccol1 = Color_fg; |
|
|
2048 | #endif |
|
|
2049 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2050 | ccol2 = Color_cursor2; |
|
|
2051 | else |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | *crp = SET_FGCOLOR (*crp, ccol1); |
2067 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2068 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2069 | } |
2061 | } |
2070 | } |
2062 | } |
2071 | } |
2063 | |
2072 | |
2064 | /* make sure no outline cursor is left around */ |
2073 | /* make sure no outline cursor is left around */ |
… | |
… | |
2106 | if (!display->is_local |
2115 | if (!display->is_local |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2116 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2108 | && abs (num_scr) < nrow && !have_bg) |
2117 | && abs (num_scr) < nrow && !have_bg) |
2109 | { |
2118 | { |
2110 | int16_t nits; |
2119 | int16_t nits; |
|
|
2120 | int i = num_scr; |
2111 | int j; |
2121 | int j; |
2112 | int len, wlen; |
2122 | int len, wlen; |
2113 | dLocal (int, num_scr); |
2123 | dLocal (int, num_scr); |
2114 | |
2124 | |
2115 | j = nrow; |
2125 | j = nrow; |
2116 | wlen = len = -1; |
2126 | wlen = len = -1; |
2117 | row = i > 0 ? 0 : j - 1; |
2127 | row = i > 0 ? 0 : j - 1; |
|
|
2128 | |
2118 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2129 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2119 | { |
2130 | { |
2120 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2131 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2121 | { |
2132 | { |
2122 | line_t s = ROW(view_start + row); |
2133 | line_t s = ROW(view_start + row); |
… | |
… | |
2143 | wlen = row; |
2154 | wlen = row; |
2144 | continue; |
2155 | continue; |
2145 | } |
2156 | } |
2146 | } |
2157 | } |
2147 | |
2158 | |
2148 | if (len != -1) |
2159 | if (len >= 0) |
2149 | { |
2160 | { |
2150 | /* also comes here at end if needed because of >= above */ |
2161 | /* also comes here at end if needed because of >= above */ |
2151 | if (wlen < len) |
2162 | if (wlen < len) |
2152 | ::swap (wlen, len); |
2163 | ::swap (wlen, len); |
2153 | |
2164 | |
… | |
… | |
2192 | continue; |
2203 | continue; |
2193 | |
2204 | |
2194 | // redraw one or more characters |
2205 | // redraw one or more characters |
2195 | |
2206 | |
2196 | // seek to the beginning of wide characters |
2207 | // seek to the beginning of wide characters |
2197 | while (stp[col] == NOCHAR && col > 0) |
2208 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2198 | --col; |
2209 | --col; |
2199 | |
2210 | |
2200 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2211 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2201 | text_t *text = stp + col; |
2212 | text_t *text = stp + col; |
2202 | int count = 1; |
2213 | int count = 1; |
… | |
… | |
2239 | |
2250 | |
2240 | col--; /* went one too far. move back */ |
2251 | col--; /* went one too far. move back */ |
2241 | count -= i; /* dump any matching trailing chars */ |
2252 | count -= i; /* dump any matching trailing chars */ |
2242 | |
2253 | |
2243 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2254 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2244 | while (i && text[count] == NOCHAR) |
2255 | while (expect_false (i && text[count] == NOCHAR)) |
2245 | count++, i--; |
2256 | count++, i--; |
2246 | |
2257 | |
2247 | /* |
2258 | /* |
2248 | * Determine the attributes for the string |
2259 | * Determine the attributes for the string |
2249 | */ |
2260 | */ |
2250 | int fore = fgcolor_of (rend); // desired foreground |
2261 | int fore = fgcolor_of (rend); // desired foreground |
2251 | int back = bgcolor_of (rend); // desired background |
2262 | int back = bgcolor_of (rend); // desired background |
2252 | |
2263 | |
2253 | // only do special processing if any attributes are set, which is unlikely |
2264 | // only do special processing if any attributes are set, which is unlikely |
2254 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2265 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2255 | { |
2266 | { |
2256 | #if ENABLE_STYLES |
|
|
2257 | // "careful" (too wide) character handling |
|
|
2258 | |
|
|
2259 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2260 | while (text > stp |
|
|
2261 | && srp[text - stp - 1] & RS_Careful |
|
|
2262 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2263 | text--, count++, xpixel -= fwidth; |
|
|
2264 | |
|
|
2265 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2266 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2267 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2268 | |
|
|
2269 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2270 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2271 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2272 | #endif |
|
|
2273 | |
|
|
2274 | bool invert = rend & RS_RVid; |
2267 | bool invert = rend & RS_RVid; |
2275 | |
2268 | |
2276 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2269 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2277 | if (rend & RS_Bold |
|
|
2278 | && fore == Color_fg) |
2270 | if (rend & RS_Bold && fore == Color_fg) |
2279 | { |
2271 | { |
2280 | if (ISSET_PIXCOLOR (Color_BD)) |
2272 | if (ISSET_PIXCOLOR (Color_BD)) |
2281 | fore = Color_BD; |
2273 | fore = Color_BD; |
2282 | # if !ENABLE_STYLES |
2274 | # if !ENABLE_STYLES |
2283 | else |
2275 | else |
2284 | invert = !invert; |
2276 | invert = !invert; |
2285 | # endif |
2277 | # endif |
2286 | } |
2278 | } |
2287 | |
2279 | |
2288 | if (rend & RS_Italic |
2280 | if (rend & RS_Italic && fore == Color_fg) |
2289 | && fore == Color_fg) |
|
|
2290 | { |
2281 | { |
2291 | if (ISSET_PIXCOLOR (Color_IT)) |
2282 | if (ISSET_PIXCOLOR (Color_IT)) |
2292 | fore = Color_IT; |
2283 | fore = Color_IT; |
2293 | # if !ENABLE_STYLES |
2284 | # if !ENABLE_STYLES |
2294 | else |
2285 | else |
2295 | invert = !invert; |
2286 | invert = !invert; |
2296 | # endif |
2287 | # endif |
2297 | } |
2288 | } |
2298 | |
2289 | |
2299 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2290 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2300 | fore = Color_UL; |
2291 | fore = Color_UL; |
2301 | #endif |
2292 | #endif |
2302 | |
2293 | |
2303 | if (invert) |
2294 | if (invert) |
2304 | { |
2295 | { |
|
|
2296 | #ifdef OPTION_HC |
|
|
2297 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2298 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | #endif |
|
|
2300 | /* invert the column if no highlightColor is set or it is the |
|
|
2301 | * current cursor column */ |
2305 | ::swap (fore, back); |
2302 | ::swap (fore, back); |
|
|
2303 | #ifdef OPTION_HC |
|
|
2304 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | back = Color_HC; |
|
|
2306 | #endif |
2306 | |
2307 | |
2307 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2308 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2309 | # ifndef OPTION_HC |
2308 | if (ISSET_PIXCOLOR (Color_RV)) |
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
2309 | back = Color_RV; |
2311 | back = Color_RV; |
2310 | |
2312 | # endif |
2311 | if (fore == back) |
2313 | if (fore == back) |
2312 | { |
2314 | { |
2313 | fore = Color_bg; |
2315 | fore = Color_bg; |
2314 | back = Color_fg; |
2316 | back = Color_fg; |
2315 | } |
2317 | } |
… | |
… | |
2317 | } |
2319 | } |
2318 | |
2320 | |
2319 | #ifdef TEXT_BLINK |
2321 | #ifdef TEXT_BLINK |
2320 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2322 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2321 | { |
2323 | { |
2322 | if (!text_blink_ev.active) |
2324 | if (!text_blink_ev.is_active ()) |
2323 | { |
2325 | { |
2324 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2326 | text_blink_ev.again (); |
2325 | hidden_text = 0; |
2327 | hidden_text = 0; |
2326 | } |
2328 | } |
2327 | else if (hidden_text) |
2329 | else if (hidden_text) |
2328 | fore = back; |
2330 | fore = back; |
2329 | } |
2331 | } |
2330 | #endif |
2332 | #endif |
|
|
2333 | |
|
|
2334 | #if ENABLE_STYLES |
|
|
2335 | // "careful" (too wide) character handling |
|
|
2336 | |
|
|
2337 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2338 | while (text > stp |
|
|
2339 | && srp[text - stp - 1] & RS_Careful |
|
|
2340 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2341 | text--, count++, xpixel -= fwidth; |
|
|
2342 | |
|
|
2343 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2344 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2345 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2346 | |
|
|
2347 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2348 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2349 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2350 | #endif |
2331 | } |
2351 | } |
2332 | |
2352 | |
2333 | /* |
2353 | /* |
2334 | * Actually do the drawing of the string here |
2354 | * Actually do the drawing of the string here |
2335 | */ |
2355 | */ |
2336 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2337 | |
2357 | |
2338 | if (back == fore) |
2358 | if (expect_true (have_bg && back == Color_bg)) |
2339 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
|
|
2340 | else if (back == Color_bg && have_bg) |
|
|
2341 | { |
2359 | { |
2342 | // this is very ugly, maybe push it into ->draw? |
2360 | // this is very ugly, maybe push it into ->draw? |
2343 | |
2361 | |
2344 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2345 | if (text[i] != ' ') |
2363 | if (text[i] != ' ') |
2346 | { |
2364 | { |
2347 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2365 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2348 | goto did_clear; |
2366 | goto did_clear; |
2349 | } |
2367 | } |
2350 | |
2368 | |
2351 | CLEAR_CHARS (xpixel, ypixel, count); |
2369 | CLEAR_CHARS (xpixel, ypixel, count); |
2352 | did_clear: ; |
2370 | did_clear: ; |
2353 | } |
2371 | } |
2354 | else |
2372 | else |
2355 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2356 | |
2374 | |
2357 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2375 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2358 | { |
2376 | { |
2359 | #if ENABLE_FRILLS |
2377 | #if ENABLE_FRILLS |
2360 | if (ISSET_PIXCOLOR (Color_underline)) |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2361 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2362 | else |
2380 | else |
2363 | #endif |
2381 | #endif |
2364 | XSetForeground (dpy, gc, pix_colors[fore]); |
2382 | XSetForeground (dpy, gc, pix_colors[fore]); |
2365 | |
2383 | |
2366 | XDrawLine (dpy, drawBuffer, gc, |
2384 | XDrawLine (dpy, vt, gc, |
2367 | xpixel, ypixel + font->ascent + 1, |
2385 | xpixel, ypixel + font->ascent + 1, |
2368 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2369 | } |
2387 | } |
2370 | } /* for (col....) */ |
2388 | } /* for (col....) */ |
2371 | } /* for (row....) */ |
2389 | } /* for (row....) */ |
… | |
… | |
2380 | */ |
2398 | */ |
2381 | if (showcursor) |
2399 | if (showcursor) |
2382 | { |
2400 | { |
2383 | if (focus) |
2401 | if (focus) |
2384 | { |
2402 | { |
2385 | if (OPTION (Opt_cursorUnderline)) |
2403 | if (option (Opt_cursorUnderline)) |
2386 | *crp ^= RS_Uline; |
2404 | *crp ^= RS_Uline; |
2387 | else |
2405 | else |
2388 | { |
2406 | { |
2389 | *crp ^= RS_RVid; |
2407 | *crp ^= RS_RVid; |
2390 | #ifndef NO_CURSORCOLOR |
2408 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2405 | cursorwidth++; |
2423 | cursorwidth++; |
2406 | |
2424 | |
2407 | #ifndef NO_CURSORCOLOR |
2425 | #ifndef NO_CURSORCOLOR |
2408 | if (ISSET_PIXCOLOR (Color_cursor)) |
2426 | if (ISSET_PIXCOLOR (Color_cursor)) |
2409 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2427 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2428 | else |
2410 | #endif |
2429 | #endif |
|
|
2430 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2411 | |
2431 | |
2412 | XDrawRectangle (dpy, drawBuffer, gc, |
2432 | XDrawRectangle (dpy, vt, gc, |
2413 | Col2Pixel (col), |
2433 | Col2Pixel (col), |
2414 | Row2Pixel (oldcursor.row), |
2434 | Row2Pixel (oldcursor.row), |
2415 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2435 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2416 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2436 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2417 | } |
2437 | } |
… | |
… | |
2452 | } |
2472 | } |
2453 | |
2473 | |
2454 | void |
2474 | void |
2455 | rxvt_term::scr_recolour () NOTHROW |
2475 | rxvt_term::scr_recolour () NOTHROW |
2456 | { |
2476 | { |
2457 | if (1 |
2477 | #ifdef HAVE_BG_PIXMAP |
2458 | #if TRANSPARENT |
2478 | bgPixmap.apply (); |
2459 | && !am_transparent |
2479 | #else |
2460 | #endif |
2480 | |
2461 | #if XPM_BACKGROUND |
|
|
2462 | && !bgPixmap.pixmap |
|
|
2463 | #endif |
|
|
2464 | ) |
|
|
2465 | { |
|
|
2466 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2481 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2467 | XClearWindow (dpy, parent[0]); |
2482 | XClearWindow (dpy, parent[0]); |
2468 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2483 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2469 | #if HAVE_SCROLLBARS |
2484 | |
2470 | if (scrollBar.win) |
2485 | if (scrollBar.win) |
2471 | { |
2486 | { |
2472 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2487 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2473 | scrollBar.setIdle (); |
2488 | scrollBar.state = STATE_IDLE; |
2474 | scrollbar_show (0); |
2489 | scrollBar.show (0); |
2475 | } |
|
|
2476 | #endif |
|
|
2477 | } |
2490 | } |
2478 | |
2491 | |
|
|
2492 | #endif |
|
|
2493 | |
|
|
2494 | /* bgPixmap.apply () does not do the following : */ |
2479 | scr_clear (); |
2495 | scr_clear (); |
2480 | scr_touch (true); |
2496 | scr_touch (true); |
2481 | want_refresh = 1; |
2497 | want_refresh = 1; |
2482 | } |
2498 | } |
2483 | |
2499 | |
… | |
… | |
2575 | { |
2591 | { |
2576 | int row, wrote; |
2592 | int row, wrote; |
2577 | unsigned int width, towrite; |
2593 | unsigned int width, towrite; |
2578 | char r1[] = "\n"; |
2594 | char r1[] = "\n"; |
2579 | |
2595 | |
2580 | for (row = saveLines - nsaved; |
2596 | for (row = saveLines + top_row; |
2581 | row < saveLines + nrow - 1; row++) |
2597 | row < saveLines + nrow - 1; row++) |
2582 | { |
2598 | { |
2583 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2599 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2584 | : ncol; |
2600 | : ncol; |
2585 | for (towrite = width; towrite; towrite -= wrote) |
2601 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2636 | /* convert normal newline chars into common keyboard Return key sequence */ |
2652 | /* convert normal newline chars into common keyboard Return key sequence */ |
2637 | for (unsigned int i = 0; i < len; i++) |
2653 | for (unsigned int i = 0; i < len; i++) |
2638 | if (data[i] == C0_LF) |
2654 | if (data[i] == C0_LF) |
2639 | data[i] = C0_CR; |
2655 | data[i] = C0_CR; |
2640 | |
2656 | |
|
|
2657 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2658 | tt_printf ("\e[200~"); |
|
|
2659 | |
2641 | tt_write (data, len); |
2660 | tt_write (data, len); |
|
|
2661 | |
|
|
2662 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2663 | tt_printf ("\e[201~"); |
2642 | } |
2664 | } |
2643 | |
2665 | |
2644 | /* ------------------------------------------------------------------------- */ |
2666 | /* ------------------------------------------------------------------------- */ |
2645 | /* |
2667 | /* |
2646 | * Respond to a notification that a primary selection has been sent |
2668 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2721 | if (!delete_prop) |
2743 | if (!delete_prop) |
2722 | XDeleteProperty (dpy, win, prop); |
2744 | XDeleteProperty (dpy, win, prop); |
2723 | |
2745 | |
2724 | selection_wait = Sel_incr; |
2746 | selection_wait = Sel_incr; |
2725 | incr_buf_fill = 0; |
2747 | incr_buf_fill = 0; |
2726 | incr_ev.start (NOW + 10); |
2748 | incr_ev.start (10); |
2727 | |
2749 | |
2728 | goto bailout; |
2750 | goto bailout; |
2729 | } |
2751 | } |
2730 | |
2752 | |
2731 | if (ct.nitems == 0) |
2753 | if (ct.nitems == 0) |
… | |
… | |
2740 | ct.nitems = incr_buf_fill; |
2762 | ct.nitems = incr_buf_fill; |
2741 | incr_buf = 0; |
2763 | incr_buf = 0; |
2742 | incr_buf_size = 0; |
2764 | incr_buf_size = 0; |
2743 | incr_ev.stop (); |
2765 | incr_ev.stop (); |
2744 | } |
2766 | } |
2745 | else |
2767 | else |
2746 | { |
2768 | { |
2747 | if (selection_wait == Sel_normal |
2769 | if (selection_wait == Sel_normal |
2748 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2770 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2749 | { |
2771 | { |
2750 | /* |
2772 | /* |
… | |
… | |
2757 | goto bailout; |
2779 | goto bailout; |
2758 | } |
2780 | } |
2759 | } |
2781 | } |
2760 | else if (selection_wait == Sel_incr) |
2782 | else if (selection_wait == Sel_incr) |
2761 | { |
2783 | { |
2762 | incr_ev.start (NOW + 10); |
2784 | incr_ev.start (10); |
2763 | |
2785 | |
2764 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2786 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2765 | { |
2787 | { |
2766 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2788 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2767 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2789 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2807 | if (selection_wait == Sel_normal) |
2829 | if (selection_wait == Sel_normal) |
2808 | selection_wait = Sel_none; |
2830 | selection_wait = Sel_none; |
2809 | } |
2831 | } |
2810 | |
2832 | |
2811 | void |
2833 | void |
2812 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2834 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2813 | { |
2835 | { |
2814 | selection_wait = Sel_none; |
2836 | selection_wait = Sel_none; |
2815 | |
2837 | |
2816 | incr_buf_size = 0; |
2838 | incr_buf_size = 0; |
2817 | free (incr_buf); |
2839 | free (incr_buf); |
… | |
… | |
2828 | selection_paste (win, prop, true); |
2850 | selection_paste (win, prop, true); |
2829 | } |
2851 | } |
2830 | |
2852 | |
2831 | /* ------------------------------------------------------------------------- */ |
2853 | /* ------------------------------------------------------------------------- */ |
2832 | /* |
2854 | /* |
2833 | * Request the current selection: |
2855 | * Request the current selection: |
2834 | * Order: > internal selection if available |
2856 | * Order: > internal selection if available |
2835 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2857 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2836 | * > CUT_BUFFER0 |
2858 | * > CUT_BUFFER0 |
2837 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2859 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2838 | * will auto fallback to CUT_BUFFER0 |
2860 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2840 | */ |
2862 | */ |
2841 | void |
2863 | void |
2842 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2864 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2843 | { |
2865 | { |
2844 | if (selection.text && selnum == Sel_Primary) |
2866 | if (selection.text && selnum == Sel_Primary) |
|
|
2867 | { |
2845 | { /* internal selection */ |
2868 | /* internal selection */ |
2846 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2869 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2847 | paste (str, strlen (str)); |
2870 | paste (str, strlen (str)); |
2848 | free (str); |
2871 | free (str); |
2849 | return; |
2872 | return; |
2850 | } |
2873 | } |
… | |
… | |
3116 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3139 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3117 | |
3140 | |
3118 | while (selection.mark.col > 0 |
3141 | while (selection.mark.col > 0 |
3119 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3142 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3120 | --selection.mark.col; |
3143 | --selection.mark.col; |
3121 | |
3144 | |
3122 | if (selection.op) |
3145 | if (selection.op) |
|
|
3146 | { |
3123 | { /* clear the old selection */ |
3147 | /* clear the old selection */ |
3124 | selection.beg.row = selection.end.row = selection.mark.row; |
3148 | selection.beg.row = selection.end.row = selection.mark.row; |
3125 | selection.beg.col = selection.end.col = selection.mark.col; |
3149 | selection.beg.col = selection.end.col = selection.mark.col; |
3126 | } |
3150 | } |
3127 | |
3151 | |
3128 | selection.op = SELECTION_INIT; |
3152 | selection.op = SELECTION_INIT; |
… | |
… | |
3317 | * a point/word/line which is either the start or end of the selection |
3341 | * a point/word/line which is either the start or end of the selection |
3318 | * and it was decided by whichever point/word/line was `fixed' at the |
3342 | * and it was decided by whichever point/word/line was `fixed' at the |
3319 | * time of the most recent button3 press |
3343 | * time of the most recent button3 press |
3320 | */ |
3344 | */ |
3321 | if (button3 && buttonpress) |
3345 | if (button3 && buttonpress) |
|
|
3346 | { |
3322 | { /* button3 press */ |
3347 | /* button3 press */ |
3323 | /* |
3348 | /* |
3324 | * first determine which edge of the selection we are closest to |
3349 | * first determine which edge of the selection we are closest to |
3325 | */ |
3350 | */ |
3326 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3351 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3327 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3352 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3345 | selection.mark.row = selection.beg.row; |
3370 | selection.mark.row = selection.beg.row; |
3346 | selection.mark.col = selection.beg.col; |
3371 | selection.mark.col = selection.beg.col; |
3347 | } |
3372 | } |
3348 | } |
3373 | } |
3349 | else |
3374 | else |
|
|
3375 | { |
3350 | { /* button1 drag or button3 drag */ |
3376 | /* button1 drag or button3 drag */ |
3351 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3377 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3352 | { |
3378 | { |
3353 | if (selection.mark.row == selection.end.row |
3379 | if (selection.mark.row == selection.end.row |
3354 | && selection.mark.col == selection.end.col |
3380 | && selection.mark.col == selection.end.col |
3355 | && clickchange |
3381 | && clickchange |
… | |
… | |
3398 | selection_delimit_word (DN, &selection.end, &selection.end); |
3424 | selection_delimit_word (DN, &selection.end, &selection.end); |
3399 | } |
3425 | } |
3400 | else if (selection.clicks == 3) |
3426 | else if (selection.clicks == 3) |
3401 | { |
3427 | { |
3402 | #if ENABLE_FRILLS |
3428 | #if ENABLE_FRILLS |
3403 | if (OPTION (Opt_tripleclickwords)) |
3429 | if (option (Opt_tripleclickwords)) |
3404 | { |
3430 | { |
3405 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3431 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3406 | |
3432 | |
3407 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3433 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3408 | { |
3434 | { |
… | |
… | |
3436 | selection.end.row++; |
3462 | selection.end.row++; |
3437 | } |
3463 | } |
3438 | } |
3464 | } |
3439 | |
3465 | |
3440 | if (button3 && buttonpress) |
3466 | if (button3 && buttonpress) |
|
|
3467 | { |
3441 | { /* mark may need to be changed */ |
3468 | /* mark may need to be changed */ |
3442 | if (closeto == LEFT) |
3469 | if (closeto == LEFT) |
3443 | { |
3470 | { |
3444 | selection.mark.row = selection.end.row; |
3471 | selection.mark.row = selection.end.row; |
3445 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3472 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3446 | } |
3473 | } |
… | |
… | |
3645 | XFree (ct.value); |
3672 | XFree (ct.value); |
3646 | } |
3673 | } |
3647 | |
3674 | |
3648 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3675 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3649 | } |
3676 | } |
3650 | |
|
|
3651 | /* ------------------------------------------------------------------------- * |
|
|
3652 | * MOUSE ROUTINES * |
|
|
3653 | * ------------------------------------------------------------------------- */ |
|
|
3654 | |
|
|
3655 | /* |
|
|
3656 | * return col/row values corresponding to x/y pixel values |
|
|
3657 | */ |
|
|
3658 | void |
|
|
3659 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3660 | { |
|
|
3661 | *x = Pixel2Col (*x); |
|
|
3662 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3663 | *y = Pixel2Row (*y); |
|
|
3664 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3665 | } |
|
|
3666 | |
3677 | |
3667 | /* ------------------------------------------------------------------------- */ |
3678 | /* ------------------------------------------------------------------------- */ |
3668 | #ifdef USE_XIM |
3679 | #ifdef USE_XIM |
3669 | void |
3680 | void |
3670 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3681 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |