1 | /*---------------------------------------------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
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. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
143 | col--; |
142 | col--; |
144 | |
143 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
148 | // found start, nuke |
149 | // found start, nuke |
149 | do { |
150 | do { |
150 | l.t[col] = ' '; |
151 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
152 | l.r[col] = rend; |
152 | col++; |
153 | col++; |
… | |
… | |
158 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
159 | |
160 | |
160 | void |
161 | void |
161 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
162 | { |
163 | { |
163 | scr_soft_reset (); |
164 | #if ENABLE_OVERLAY |
|
|
165 | scr_overlay_off (); |
|
|
166 | #endif |
164 | |
167 | |
165 | view_start = 0; |
168 | view_start = 0; |
166 | num_scr = 0; |
169 | num_scr = 0; |
167 | |
170 | |
168 | if (ncol == 0) |
171 | if (ncol == 0) |
… | |
… | |
233 | selection.text = NULL; |
236 | selection.text = NULL; |
234 | selection.len = 0; |
237 | selection.len = 0; |
235 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
236 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
237 | selection.clicks = 0; |
240 | selection.clicks = 0; |
|
|
241 | selection.clip_text = NULL; |
|
|
242 | selection.clip_len = 0; |
238 | } |
243 | } |
239 | else |
244 | else |
240 | { |
245 | { |
241 | /* |
246 | /* |
242 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
280 | |
285 | |
281 | if (top_row) |
286 | if (top_row) |
282 | { |
287 | { |
283 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // to come up with a lean and mean algorithm. |
289 | // to come up with a lean and mean algorithm. |
|
|
290 | // TODO: maybe optimise when width didn't change |
285 | |
291 | |
286 | row_col_t ocur = screen.cur; |
292 | row_col_t ocur = screen.cur; |
287 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | |
294 | |
289 | do |
295 | do |
290 | { |
296 | { |
291 | p = MOD (p - 1, prev_total_rows); |
297 | p = MOD (p - 1, prev_total_rows); |
292 | #ifdef DEBUG_STRICT |
|
|
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | #endif |
|
|
295 | int plines = 1; |
299 | int plines = 1; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
297 | |
301 | |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
302 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
299 | { |
303 | { |
… | |
… | |
395 | |
399 | |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
398 | } |
402 | } |
399 | |
403 | |
|
|
404 | free (tabs); |
|
|
405 | tabs = (char *)rxvt_malloc (ncol); |
|
|
406 | |
|
|
407 | for (int col = ncol; col--; ) |
|
|
408 | tabs [col] = col % TABSIZE == 0; |
|
|
409 | |
400 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
401 | |
411 | |
402 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
403 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
404 | |
414 | |
… | |
… | |
436 | void |
446 | void |
437 | rxvt_term::scr_poweron () |
447 | rxvt_term::scr_poweron () |
438 | { |
448 | { |
439 | scr_release (); |
449 | scr_release (); |
440 | prev_nrow = prev_ncol = 0; |
450 | prev_nrow = prev_ncol = 0; |
|
|
451 | rvideo_mode = false; |
|
|
452 | scr_soft_reset (); |
441 | scr_reset (); |
453 | scr_reset (); |
442 | |
454 | |
443 | scr_clear (true); |
455 | scr_clear (true); |
444 | scr_refresh (); |
456 | scr_refresh (); |
445 | } |
457 | } |
… | |
… | |
450 | /* only affects modes, nothing drastic such as clearing the screen */ |
462 | /* only affects modes, nothing drastic such as clearing the screen */ |
451 | #if ENABLE_OVERLAY |
463 | #if ENABLE_OVERLAY |
452 | scr_overlay_off (); |
464 | scr_overlay_off (); |
453 | #endif |
465 | #endif |
454 | |
466 | |
455 | rvideo_mode = false; |
|
|
456 | |
|
|
457 | if (current_screen != PRIMARY) |
467 | if (current_screen != PRIMARY) |
458 | scr_swap_screen (); |
468 | scr_swap_screen (); |
459 | |
|
|
460 | free (tabs); |
|
|
461 | tabs = (char *)rxvt_malloc (ncol); |
|
|
462 | |
|
|
463 | for (int col = ncol; --col; ) |
|
|
464 | tabs [col] = col % TABSIZE == 0; |
|
|
465 | |
469 | |
466 | scr_scroll_region (0, MAX_ROWS - 1); |
470 | scr_scroll_region (0, MAX_ROWS - 1); |
467 | scr_rendition (0, ~RS_None); |
471 | scr_rendition (0, ~RS_None); |
468 | scr_insert_mode (0); |
472 | scr_insert_mode (0); |
469 | } |
473 | } |
… | |
… | |
511 | } |
515 | } |
512 | |
516 | |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
517 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
514 | min_it (s->cur.row, nrow - 1); |
518 | min_it (s->cur.row, nrow - 1); |
515 | min_it (s->cur.col, ncol - 1); |
519 | min_it (s->cur.col, ncol - 1); |
516 | #ifdef DEBUG_STRICT |
|
|
517 | assert (s->cur.row >= 0); |
520 | assert (s->cur.row >= 0); |
518 | assert (s->cur.col >= 0); |
521 | assert (s->cur.col >= 0); |
519 | #endif |
|
|
520 | } |
522 | } |
521 | |
523 | |
522 | void |
524 | void |
523 | rxvt_term::scr_swap_screen () |
525 | rxvt_term::scr_swap_screen () |
524 | { |
526 | { |
… | |
… | |
549 | want_refresh = 1; |
551 | want_refresh = 1; |
550 | view_start = 0; |
552 | view_start = 0; |
551 | |
553 | |
552 | selection_check (2); /* check for boundary cross */ |
554 | selection_check (2); /* check for boundary cross */ |
553 | |
555 | |
554 | int i = current_screen; current_screen = scrn; scrn = i; |
556 | current_screen = scrn; |
555 | |
557 | |
556 | #if NSCREENS |
558 | #if NSCREENS |
557 | if (option (Opt_secondaryScreen)) |
559 | if (option (Opt_secondaryScreen)) |
558 | { |
560 | { |
559 | num_scr = 0; |
561 | num_scr = 0; |
… | |
… | |
636 | |
638 | |
637 | if (count > 0 |
639 | if (count > 0 |
638 | && row1 == 0 |
640 | && row1 == 0 |
639 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
640 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
641 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
642 | |
|
|
643 | // scroll everything up 'count' lines |
|
|
644 | term_start = (term_start + count) % total_rows; |
|
|
645 | |
646 | |
646 | // sever bottommost line |
647 | // sever bottommost line |
647 | { |
648 | { |
648 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2 - 1); |
649 | l.is_longer (0); |
650 | l.is_longer (0); |
650 | l.touch (); |
651 | l.touch (); |
651 | } |
652 | } |
652 | |
653 | |
|
|
654 | // scroll everything up 'count' lines |
|
|
655 | term_start = (term_start + count) % total_rows; |
|
|
656 | |
|
|
657 | // now copy lines below the scroll region bottom to the |
|
|
658 | // bottom of the screen again, so they look as if they |
|
|
659 | // hadn't moved. |
|
|
660 | for (int i = nrow; --i > row2; ) |
|
|
661 | { |
|
|
662 | line_t &l1 = ROW(i - count); |
|
|
663 | line_t &l2 = ROW(i); |
|
|
664 | |
|
|
665 | ::swap (l1, l2); |
|
|
666 | l2.touch (); |
|
|
667 | } |
|
|
668 | |
653 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
654 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
655 | { |
671 | { |
656 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
657 | |
673 | |
658 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
659 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
660 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
676 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
661 | { |
677 | { |
662 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
663 | l.l = 0; |
679 | l.l = 0; |
664 | l.f = 0; |
680 | l.f = 0; |
665 | } |
681 | } |
666 | else |
682 | else |
667 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
668 | } |
|
|
669 | |
|
|
670 | // now copy lines below the scroll region bottom to the |
|
|
671 | // bottom of the screen again, so they look as if they |
|
|
672 | // hadn't moved. |
|
|
673 | for (int i = nrow; --i > row2; ) |
|
|
674 | { |
|
|
675 | line_t &l1 = ROW(i - count); |
|
|
676 | line_t &l2 = ROW(i); |
|
|
677 | |
|
|
678 | ::swap (l1, l2); |
|
|
679 | l2.touch (); |
|
|
680 | } |
684 | } |
681 | |
685 | |
682 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
683 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen) |
684 | { |
688 | { |
… | |
… | |
784 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
788 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
785 | screen.cur.row -= minlines; |
789 | screen.cur.row -= minlines; |
786 | } |
790 | } |
787 | } |
791 | } |
788 | |
792 | |
789 | #ifdef DEBUG_STRICT |
|
|
790 | assert (screen.cur.col < ncol); |
793 | assert (screen.cur.col < ncol); |
791 | assert (screen.cur.row < nrow |
794 | assert (screen.cur.row < nrow |
792 | && screen.cur.row >= top_row); |
795 | && screen.cur.row >= top_row); |
793 | #endif |
|
|
794 | int row = screen.cur.row; |
796 | int row = screen.cur.row; |
795 | |
797 | |
796 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
798 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
797 | |
799 | |
798 | line_t *line = &ROW(row); |
800 | line_t *line = &ROW(row); |
799 | |
801 | |
800 | while (str < strend) |
802 | while (str < strend) |
801 | { |
803 | { |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
804 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
803 | |
805 | |
804 | if (expect_false (c < 0x20)) |
806 | if (ecb_unlikely (c < 0x20)) |
805 | if (c == C0_LF) |
807 | if (c == C0_LF) |
806 | { |
808 | { |
807 | max_it (line->l, screen.cur.col); |
809 | max_it (line->l, screen.cur.col); |
808 | |
810 | |
809 | screen.flags &= ~Screen_WrapNext; |
811 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
828 | { |
830 | { |
829 | scr_tab (1, true); |
831 | scr_tab (1, true); |
830 | continue; |
832 | continue; |
831 | } |
833 | } |
832 | |
834 | |
833 | if (expect_false ( |
835 | if (ecb_unlikely ( |
834 | checksel /* see if we're writing within selection */ |
836 | checksel /* see if we're writing within selection */ |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
837 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
838 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
837 | )) |
839 | )) |
838 | { |
840 | { |
… | |
… | |
843 | * should be a similar check. |
845 | * should be a similar check. |
844 | */ |
846 | */ |
845 | CLEAR_SELECTION (); |
847 | CLEAR_SELECTION (); |
846 | } |
848 | } |
847 | |
849 | |
848 | if (expect_false (screen.flags & Screen_WrapNext)) |
850 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
849 | { |
851 | { |
850 | scr_do_wrap (); |
852 | scr_do_wrap (); |
851 | |
853 | |
852 | line->l = ncol; |
854 | line->l = ncol; |
853 | line->is_longer (1); |
855 | line->is_longer (1); |
… | |
… | |
855 | row = screen.cur.row; |
857 | row = screen.cur.row; |
856 | line = &ROW(row); /* _must_ refresh */ |
858 | line = &ROW(row); /* _must_ refresh */ |
857 | } |
859 | } |
858 | |
860 | |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
861 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
860 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
862 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
861 | c = 0xfffd; |
863 | c = 0xfffd; |
862 | |
864 | |
863 | // rely on wcwidth to tell us the character width, do wcwidth before |
865 | // rely on wcwidth to tell us the character width, do wcwidth before |
864 | // further replacements, as wcwidth might return -1 for the line |
866 | // further replacements, as wcwidth might return -1 for the line |
865 | // drawing characters below as they might be invalid in the current |
867 | // drawing characters below as they might be invalid in the current |
866 | // locale. |
868 | // locale. |
867 | int width = WCWIDTH (c); |
869 | int width = WCWIDTH (c); |
868 | |
870 | |
869 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
871 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
870 | { |
872 | { |
871 | // vt100 special graphics and line drawing |
873 | // vt100 special graphics and line drawing |
872 | // 5f-7e standard vt100 |
874 | // 5f-7e standard vt100 |
873 | // 40-5e rxvt extension for extra curses acs chars |
875 | // 40-5e rxvt extension for extra curses acs chars |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
876 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
887 | c = vt100_0[c - 0x41]; |
889 | c = vt100_0[c - 0x41]; |
888 | width = 1; // vt100 line drawing characters are always single-width |
890 | width = 1; // vt100 line drawing characters are always single-width |
889 | } |
891 | } |
890 | } |
892 | } |
891 | |
893 | |
892 | if (expect_false (screen.flags & Screen_Insert)) |
894 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
893 | scr_insdel_chars (width, INSERT); |
895 | scr_insdel_chars (width, INSERT); |
894 | |
896 | |
895 | if (width != 0) |
897 | if (width != 0) |
896 | { |
898 | { |
897 | #if !UNICODE_3 |
899 | #if !UNICODE_3 |
… | |
… | |
902 | # else |
904 | # else |
903 | c = 0xfffd; |
905 | c = 0xfffd; |
904 | # endif |
906 | # endif |
905 | #endif |
907 | #endif |
906 | |
908 | |
|
|
909 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
910 | |
|
|
911 | // if the character doesn't fit into the remaining columns... |
|
|
912 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
913 | { |
|
|
914 | if (screen.flags & Screen_Autowrap) |
|
|
915 | { |
|
|
916 | // ... artificially enlargen the previous one |
|
|
917 | c = NOCHAR; |
|
|
918 | // and try the same character next loop iteration |
|
|
919 | --str; |
|
|
920 | } |
|
|
921 | else |
|
|
922 | screen.cur.col = ncol - width; |
|
|
923 | } |
|
|
924 | |
907 | // nuke the character at this position, if required |
925 | // nuke the character at this position, if required |
908 | if (expect_false ( |
926 | // due to wonderful coincidences everywhere else in this loop |
|
|
927 | // we never have to check for overwriting a wide char itself, |
|
|
928 | // only its tail. |
909 | line->t[screen.cur.col] == NOCHAR |
929 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
910 | || (screen.cur.col < ncol - 1 |
|
|
911 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
912 | )) |
|
|
913 | scr_kill_char (*line, screen.cur.col); |
930 | scr_kill_char (*line, screen.cur.col); |
914 | |
|
|
915 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
916 | |
|
|
917 | // if the character doesn't fit into the remaining columns... |
|
|
918 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
919 | { |
|
|
920 | // ... artificially enlargen the previous one |
|
|
921 | c = NOCHAR; |
|
|
922 | // and try the same character next loop iteration |
|
|
923 | --str; |
|
|
924 | } |
|
|
925 | |
931 | |
926 | line->touch (); |
932 | line->touch (); |
927 | |
933 | |
928 | do |
934 | do |
929 | { |
935 | { |
930 | line->t[screen.cur.col] = c; |
936 | line->t[screen.cur.col] = c; |
931 | line->r[screen.cur.col] = rend; |
937 | line->r[screen.cur.col] = rend; |
932 | |
938 | |
933 | if (expect_true (screen.cur.col < ncol - 1)) |
939 | if (ecb_likely (screen.cur.col < ncol - 1)) |
934 | screen.cur.col++; |
940 | screen.cur.col++; |
935 | else |
941 | else |
936 | { |
942 | { |
937 | line->l = ncol; |
943 | line->l = ncol; |
938 | if (screen.flags & Screen_Autowrap) |
944 | if (screen.flags & Screen_Autowrap) |
939 | screen.flags |= Screen_WrapNext; |
945 | screen.flags |= Screen_WrapNext; |
940 | break; |
946 | |
|
|
947 | goto end_of_line; |
941 | } |
948 | } |
942 | |
949 | |
943 | c = NOCHAR; |
950 | c = NOCHAR; |
944 | } |
951 | } |
945 | while (expect_false (--width > 0)); |
952 | while (ecb_unlikely (--width > 0)); |
946 | |
953 | |
947 | // pad with spaces when overwriting wide character with smaller one |
954 | // pad with spaces when overwriting wide character with smaller one |
948 | if (expect_false (!width)) |
955 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
949 | { |
956 | { |
950 | line->touch (); |
|
|
951 | |
|
|
952 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
953 | { |
|
|
954 | line->t[c] = ' '; |
957 | line->t[c] = ' '; |
955 | line->r[c] = rend; |
958 | line->r[c] = rend; |
956 | } |
|
|
957 | } |
959 | } |
|
|
960 | |
|
|
961 | end_of_line: |
|
|
962 | ; |
958 | } |
963 | } |
959 | #if ENABLE_COMBINING |
964 | #if ENABLE_COMBINING |
960 | else // width == 0 |
965 | else // width == 0 |
961 | { |
966 | { |
962 | if (c != 0xfeff) // ignore BOM |
967 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1002 | #endif |
1007 | #endif |
1003 | } |
1008 | } |
1004 | |
1009 | |
1005 | max_it (line->l, screen.cur.col); |
1010 | max_it (line->l, screen.cur.col); |
1006 | |
1011 | |
1007 | #ifdef DEBUG_STRICT |
|
|
1008 | assert (screen.cur.row >= 0); |
1012 | assert (screen.cur.row >= 0); |
1009 | #endif |
|
|
1010 | } |
1013 | } |
1011 | |
1014 | |
1012 | /* ------------------------------------------------------------------------- */ |
1015 | /* ------------------------------------------------------------------------- */ |
1013 | /* |
1016 | /* |
1014 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1017 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1027 | |
1030 | |
1028 | want_refresh = 1; |
1031 | want_refresh = 1; |
1029 | #endif |
1032 | #endif |
1030 | } |
1033 | } |
1031 | } |
1034 | } |
|
|
1035 | else if (screen.flags & Screen_WrapNext) |
|
|
1036 | screen.flags &= ~Screen_WrapNext; |
1032 | else |
1037 | else |
1033 | scr_gotorc (0, -1, RELATIVE); |
1038 | scr_gotorc (0, -1, RELATIVE); |
1034 | } |
1039 | } |
1035 | |
1040 | |
1036 | /* ------------------------------------------------------------------------- */ |
1041 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1342 | if (row >= nrow) /* Out Of Bounds */ |
1347 | if (row >= nrow) /* Out Of Bounds */ |
1343 | return; |
1348 | return; |
1344 | |
1349 | |
1345 | min_it (num, nrow - row); |
1350 | min_it (num, nrow - row); |
1346 | |
1351 | |
1347 | // TODO: the code below does not work when view_start != 0 |
|
|
1348 | // the workaround is to disable the clear and use a normal refresh |
|
|
1349 | // when view_start != 0. mysterious. |
|
|
1350 | if (rstyle & (RS_RVid | RS_Uline)) |
1352 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1351 | ren = (rend_t) ~RS_None; |
1353 | ren = (rend_t) ~RS_None; |
1352 | else if (GET_BASEBG (rstyle) == Color_bg) |
1354 | else if (GET_BASEBG (rstyle) == Color_bg) |
1353 | { |
1355 | { |
1354 | ren = DEFAULT_RSTYLE; |
1356 | ren = DEFAULT_RSTYLE; |
1355 | |
1357 | |
1356 | if (mapped && !view_start) |
1358 | if (mapped) |
1357 | XClearArea (dpy, vt, 0, |
1359 | XClearArea (dpy, vt, 0, |
1358 | Row2Pixel (row - view_start), (unsigned int)width, |
1360 | Row2Pixel (row - view_start), (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num), False); |
1361 | (unsigned int)Height2Pixel (num), False); |
1360 | } |
1362 | } |
1361 | else |
1363 | else |
1362 | { |
1364 | { |
1363 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1365 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1364 | |
1366 | |
1365 | if (mapped && !view_start) |
1367 | if (mapped) |
1366 | { |
1368 | { |
1367 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1369 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1368 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1369 | XFillRectangle (dpy, vt, gc, |
1371 | XFillRectangle (dpy, vt, gc, |
1370 | 0, Row2Pixel (row - view_start), |
1372 | 0, Row2Pixel (row - view_start), |
… | |
… | |
1377 | |
1379 | |
1378 | for (; num--; row++) |
1380 | for (; num--; row++) |
1379 | { |
1381 | { |
1380 | scr_blank_screen_mem (ROW(row), rstyle); |
1382 | scr_blank_screen_mem (ROW(row), rstyle); |
1381 | |
1383 | |
1382 | if (!view_start) |
1384 | if (row - view_start < nrow) |
1383 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1385 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1384 | } |
1386 | } |
1385 | } |
1387 | } |
1386 | |
1388 | |
1387 | #if !ENABLE_MINIMAL |
1389 | #if !ENABLE_MINIMAL |
1388 | void |
1390 | void |
… | |
… | |
1541 | { |
1543 | { |
1542 | line->t[col] = line->t[col + count]; |
1544 | line->t[col] = line->t[col + count]; |
1543 | line->r[col] = line->r[col + count]; |
1545 | line->r[col] = line->r[col + count]; |
1544 | } |
1546 | } |
1545 | |
1547 | |
1546 | scr_blank_line (*line, ncol - count, count, |
1548 | scr_blank_line (*line, ncol - count, count, rstyle); |
1547 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
|
|
1548 | |
1549 | |
1549 | if (selection.op && current_screen == selection.screen |
1550 | if (selection.op && current_screen == selection.screen |
1550 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1551 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1551 | { |
1552 | { |
1552 | if (selection.end.row != screen.cur.row |
1553 | if (selection.end.row != screen.cur.row |
… | |
… | |
1688 | { |
1689 | { |
1689 | rvideo_state = on; |
1690 | rvideo_state = on; |
1690 | |
1691 | |
1691 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1692 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1692 | #ifdef HAVE_BG_PIXMAP |
1693 | #ifdef HAVE_BG_PIXMAP |
1693 | if (bgPixmap.pixmap == None) |
1694 | if (bg_pixmap == None) |
1694 | #endif |
1695 | #endif |
1695 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1696 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1696 | |
1697 | |
1697 | XGCValues gcvalue; |
1698 | XGCValues gcvalue; |
1698 | gcvalue.foreground = pix_colors[Color_fg]; |
1699 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1842 | for (i = PART_BEG; i < RC_COUNT; i++) |
1843 | for (i = PART_BEG; i < RC_COUNT; i++) |
1843 | { |
1844 | { |
1844 | min_it (rc[i].col, ncol - 1); |
1845 | min_it (rc[i].col, ncol - 1); |
1845 | min_it (rc[i].row, nrow - 1); |
1846 | min_it (rc[i].row, nrow - 1); |
1846 | } |
1847 | } |
1847 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1848 | |
1848 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1849 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1849 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1850 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1850 | |
1851 | |
1851 | num_scr_allow = 0; |
1852 | num_scr_allow = 0; |
1852 | |
1853 | |
… | |
… | |
1925 | |
1926 | |
1926 | # ifndef NO_MAPALERT |
1927 | # ifndef NO_MAPALERT |
1927 | # ifdef MAPALERT_OPTION |
1928 | # ifdef MAPALERT_OPTION |
1928 | if (option (Opt_mapAlert)) |
1929 | if (option (Opt_mapAlert)) |
1929 | # endif |
1930 | # endif |
1930 | XMapWindow (dpy, parent[0]); |
1931 | XMapWindow (dpy, parent); |
1931 | # endif |
1932 | # endif |
1932 | |
1933 | |
1933 | # if ENABLE_FRILLS |
1934 | # if ENABLE_FRILLS |
1934 | if (option (Opt_urgentOnBell)) |
1935 | if (option (Opt_urgentOnBell)) |
1935 | set_urgency (1); |
1936 | set_urgency (1); |
… | |
… | |
1943 | |
1944 | |
1944 | bell_ev.start (VISUAL_BELL_DURATION); |
1945 | bell_ev.start (VISUAL_BELL_DURATION); |
1945 | } |
1946 | } |
1946 | else |
1947 | else |
1947 | XBell (dpy, 0); |
1948 | XBell (dpy, 0); |
|
|
1949 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1948 | #endif |
1950 | #endif |
1949 | } |
1951 | } |
1950 | |
1952 | |
1951 | /* ------------------------------------------------------------------------- */ |
1953 | /* ------------------------------------------------------------------------- */ |
1952 | /* ARGSUSED */ |
|
|
1953 | void |
1954 | void |
1954 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1955 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1955 | { |
1956 | { |
1956 | #ifdef PRINTPIPE |
1957 | #ifdef PRINTPIPE |
1957 | int nrows, row_start; |
1958 | int nrows, row_start; |
… | |
… | |
1971 | row_start = view_start; |
1972 | row_start = view_start; |
1972 | } |
1973 | } |
1973 | |
1974 | |
1974 | wctomb (0, 0); |
1975 | wctomb (0, 0); |
1975 | |
1976 | |
1976 | for (int r1 = 0; r1 < nrows; r1++) |
1977 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1977 | { |
1978 | { |
1978 | text_t *tp = ROW(r1).t; |
1979 | text_t *tp = ROW(r1).t; |
1979 | int len = ROW(r1).l; |
1980 | int len = ROW(r1).l; |
1980 | |
1981 | |
1981 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1982 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
2010 | * screen.text/screen.rend contain what the screen will change to. |
2011 | * screen.text/screen.rend contain what the screen will change to. |
2011 | */ |
2012 | */ |
2012 | void |
2013 | void |
2013 | rxvt_term::scr_refresh () NOTHROW |
2014 | rxvt_term::scr_refresh () NOTHROW |
2014 | { |
2015 | { |
2015 | unsigned char have_bg, |
|
|
2016 | showcursor; /* show the cursor */ |
|
|
2017 | int16_t col, row, /* column/row we're processing */ |
2016 | int16_t col, row, /* column/row we're processing */ |
2018 | ocrow; /* old cursor row */ |
2017 | ocrow; /* old cursor row */ |
2019 | int i; /* tmp */ |
2018 | int i; /* tmp */ |
2020 | #ifndef NO_CURSORCOLOR |
2019 | #ifndef NO_CURSORCOLOR |
2021 | rend_t cc1; /* store colours at cursor position (s) */ |
2020 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2032 | /* |
2031 | /* |
2033 | * A: set up vars |
2032 | * A: set up vars |
2034 | */ |
2033 | */ |
2035 | refresh_count = 0; |
2034 | refresh_count = 0; |
2036 | |
2035 | |
|
|
2036 | unsigned int old_screen_flags = screen.flags; |
2037 | have_bg = 0; |
2037 | char have_bg = 0; |
2038 | #ifdef HAVE_BG_PIXMAP |
2038 | #ifdef HAVE_BG_PIXMAP |
2039 | have_bg = bgPixmap.pixmap != None; |
2039 | have_bg = bg_pixmap != None; |
2040 | #endif |
2040 | #endif |
2041 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2041 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2042 | |
2042 | |
2043 | /* |
2043 | /* |
2044 | * B: reverse any characters which are selected |
2044 | * B: reverse any characters which are selected |
2045 | */ |
2045 | */ |
2046 | scr_reverse_selection (); |
2046 | scr_reverse_selection (); |
|
|
2047 | |
|
|
2048 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2049 | #if ENABLE_OVERLAY |
|
|
2050 | scr_swap_overlay (); |
|
|
2051 | #endif |
|
|
2052 | |
|
|
2053 | char showcursor = screen.flags & Screen_VisibleCursor; |
2047 | |
2054 | |
2048 | /* |
2055 | /* |
2049 | * C: set the cursor character (s) |
2056 | * C: set the cursor character (s) |
2050 | */ |
2057 | */ |
2051 | { |
2058 | { |
2052 | unsigned char setoldcursor; |
2059 | unsigned char setoldcursor; |
2053 | |
2060 | |
2054 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2055 | #ifdef CURSOR_BLINK |
2061 | #ifdef CURSOR_BLINK |
2056 | if (hidden_cursor) |
2062 | if (hidden_cursor) |
2057 | showcursor = 0; |
2063 | showcursor = 0; |
2058 | #endif |
2064 | #endif |
2059 | |
2065 | |
… | |
… | |
2087 | ccol2 = bgcolor_of (rstyle); |
2093 | ccol2 = bgcolor_of (rstyle); |
2088 | #else |
2094 | #else |
2089 | ccol2 = Color_bg; |
2095 | ccol2 = Color_bg; |
2090 | #endif |
2096 | #endif |
2091 | |
2097 | |
2092 | if (showcursor && focus) |
2098 | if (focus) |
2093 | { |
2099 | { |
2094 | if (option (Opt_cursorUnderline)) |
2100 | if (option (Opt_cursorUnderline)) |
2095 | *crp ^= RS_Uline; |
2101 | *crp ^= RS_Uline; |
2096 | else |
2102 | else |
2097 | { |
2103 | { |
… | |
… | |
2132 | oldcursor.col = screen.cur.col; |
2138 | oldcursor.col = screen.cur.col; |
2133 | } |
2139 | } |
2134 | } |
2140 | } |
2135 | } |
2141 | } |
2136 | |
2142 | |
2137 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2138 | #if ENABLE_OVERLAY |
|
|
2139 | scr_swap_overlay (); |
|
|
2140 | #endif |
|
|
2141 | |
|
|
2142 | #ifndef NO_SLOW_LINK_SUPPORT |
2143 | #ifndef NO_SLOW_LINK_SUPPORT |
2143 | /* |
2144 | /* |
2144 | * D: CopyArea pass - very useful for slower links |
2145 | * D: CopyArea pass - very useful for slower links |
2145 | * This has been deliberately kept simple. |
2146 | * This has been deliberately kept simple. |
2146 | */ |
2147 | */ |
… | |
… | |
2235 | continue; |
2236 | continue; |
2236 | |
2237 | |
2237 | // redraw one or more characters |
2238 | // redraw one or more characters |
2238 | |
2239 | |
2239 | // seek to the beginning of wide characters |
2240 | // seek to the beginning of wide characters |
2240 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2241 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2241 | --col; |
2242 | --col; |
2242 | |
2243 | |
2243 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2244 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2244 | text_t *text = stp + col; |
2245 | text_t *text = stp + col; |
2245 | int count = 1; |
2246 | int count = 1; |
2246 | |
2247 | |
2247 | dtp[col] = stp[col]; |
2248 | dtp[col] = stp[col]; |
2248 | drp[col] = rend; |
2249 | drp[col] = rend; |
… | |
… | |
2252 | for (i = 0; ++col < ncol; ) |
2253 | for (i = 0; ++col < ncol; ) |
2253 | { |
2254 | { |
2254 | if (stp[col] == NOCHAR) |
2255 | if (stp[col] == NOCHAR) |
2255 | { |
2256 | { |
2256 | dtp[col] = stp[col]; |
2257 | dtp[col] = stp[col]; |
2257 | drp[col] = rend; |
2258 | drp[col] = srp[col]; |
|
|
2259 | |
2258 | count++; |
2260 | count++; |
2259 | i++; |
2261 | i++; |
2260 | |
2262 | |
2261 | continue; |
2263 | continue; |
2262 | } |
2264 | } |
… | |
… | |
2282 | |
2284 | |
2283 | col--; /* went one too far. move back */ |
2285 | col--; /* went one too far. move back */ |
2284 | count -= i; /* dump any matching trailing chars */ |
2286 | count -= i; /* dump any matching trailing chars */ |
2285 | |
2287 | |
2286 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2288 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2287 | while (expect_false (i && text[count] == NOCHAR)) |
2289 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2288 | count++, i--; |
2290 | count++, i--; |
2289 | |
2291 | |
2290 | /* |
2292 | /* |
2291 | * Determine the attributes for the string |
2293 | * Determine the attributes for the string |
2292 | */ |
2294 | */ |
2293 | int fore = fgcolor_of (rend); // desired foreground |
2295 | int fore = fgcolor_of (rend); // desired foreground |
2294 | int back = bgcolor_of (rend); // desired background |
2296 | int back = bgcolor_of (rend); // desired background |
2295 | |
2297 | |
2296 | // only do special processing if any attributes are set, which is unlikely |
2298 | // only do special processing if any attributes are set, which is unlikely |
2297 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2299 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2298 | { |
2300 | { |
2299 | bool invert = rend & RS_RVid; |
2301 | bool invert = rend & RS_RVid; |
2300 | |
2302 | |
2301 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2302 | if (rend & RS_Bold && fore == Color_fg) |
2304 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2321 | |
2323 | |
2322 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2324 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2323 | fore = Color_UL; |
2325 | fore = Color_UL; |
2324 | #endif |
2326 | #endif |
2325 | |
2327 | |
|
|
2328 | #ifdef OPTION_HC |
|
|
2329 | if (rend & RS_Sel) |
|
|
2330 | { |
|
|
2331 | /* invert the column if no highlightColor is set or it is the |
|
|
2332 | * current cursor column */ |
|
|
2333 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2334 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2335 | { |
|
|
2336 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2337 | fore = Color_HTC; |
|
|
2338 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2339 | else if (!invert) |
|
|
2340 | fore = back; |
|
|
2341 | |
|
|
2342 | back = Color_HC; |
|
|
2343 | invert = 0; |
|
|
2344 | } |
|
|
2345 | } |
|
|
2346 | #endif |
|
|
2347 | |
2326 | if (invert) |
2348 | if (invert) |
2327 | { |
2349 | { |
2328 | #ifdef OPTION_HC |
|
|
2329 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2330 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2331 | #endif |
|
|
2332 | /* invert the column if no highlightColor is set or it is the |
|
|
2333 | * current cursor column */ |
|
|
2334 | ::swap (fore, back); |
2350 | ::swap (fore, back); |
2335 | #ifdef OPTION_HC |
|
|
2336 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2337 | back = Color_HC; |
|
|
2338 | #endif |
|
|
2339 | |
2351 | |
2340 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2352 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2341 | # ifndef OPTION_HC |
|
|
2342 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2343 | back = Color_RV; |
|
|
2344 | # endif |
|
|
2345 | if (fore == back) |
2353 | if (fore == back) |
2346 | { |
2354 | { |
2347 | fore = Color_bg; |
2355 | fore = Color_bg; |
2348 | back = Color_fg; |
2356 | back = Color_fg; |
2349 | } |
2357 | } |
… | |
… | |
2385 | /* |
2393 | /* |
2386 | * Actually do the drawing of the string here |
2394 | * Actually do the drawing of the string here |
2387 | */ |
2395 | */ |
2388 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2396 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2389 | |
2397 | |
2390 | if (expect_true (have_bg && back == Color_bg)) |
2398 | if (ecb_likely (have_bg && back == Color_bg)) |
2391 | { |
2399 | { |
2392 | // this is very ugly, maybe push it into ->draw? |
2400 | // this is very ugly, maybe push it into ->draw? |
2393 | |
2401 | |
2394 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2402 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2395 | if (text[i] != ' ') |
2403 | if (text[i] != ' ') |
… | |
… | |
2402 | did_clear: ; |
2410 | did_clear: ; |
2403 | } |
2411 | } |
2404 | else |
2412 | else |
2405 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2413 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2406 | |
2414 | |
2407 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2415 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2408 | { |
2416 | { |
2409 | #if ENABLE_FRILLS |
2417 | #if ENABLE_FRILLS |
2410 | if (ISSET_PIXCOLOR (Color_underline)) |
2418 | if (ISSET_PIXCOLOR (Color_underline)) |
2411 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2419 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2412 | else |
2420 | else |
… | |
… | |
2417 | xpixel, ypixel + font->ascent + 1, |
2425 | xpixel, ypixel + font->ascent + 1, |
2418 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2426 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2419 | } |
2427 | } |
2420 | } /* for (col....) */ |
2428 | } /* for (col....) */ |
2421 | } /* for (row....) */ |
2429 | } /* for (row....) */ |
2422 | |
|
|
2423 | #if ENABLE_OVERLAY |
|
|
2424 | scr_swap_overlay (); |
|
|
2425 | #endif |
|
|
2426 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2427 | |
2430 | |
2428 | /* |
2431 | /* |
2429 | * G: cleanup cursor and display outline cursor if necessary |
2432 | * G: cleanup cursor and display outline cursor if necessary |
2430 | */ |
2433 | */ |
2431 | if (showcursor) |
2434 | if (showcursor) |
… | |
… | |
2470 | } |
2473 | } |
2471 | |
2474 | |
2472 | /* |
2475 | /* |
2473 | * H: cleanup selection |
2476 | * H: cleanup selection |
2474 | */ |
2477 | */ |
|
|
2478 | #if ENABLE_OVERLAY |
|
|
2479 | scr_swap_overlay (); |
|
|
2480 | #endif |
|
|
2481 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2482 | |
2475 | scr_reverse_selection (); |
2483 | scr_reverse_selection (); |
2476 | |
2484 | |
|
|
2485 | screen.flags = old_screen_flags; |
2477 | num_scr = 0; |
2486 | num_scr = 0; |
2478 | num_scr_allow = 1; |
2487 | num_scr_allow = 1; |
2479 | } |
2488 | } |
2480 | |
2489 | |
2481 | void |
2490 | void |
… | |
… | |
2502 | scr_remap_chars (swap_buf [i]); |
2511 | scr_remap_chars (swap_buf [i]); |
2503 | } |
2512 | } |
2504 | } |
2513 | } |
2505 | |
2514 | |
2506 | void |
2515 | void |
2507 | rxvt_term::scr_recolour () NOTHROW |
2516 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2508 | { |
2517 | { |
|
|
2518 | bool transparent = false; |
|
|
2519 | |
2509 | #ifdef HAVE_BG_PIXMAP |
2520 | #ifdef HAVE_BG_PIXMAP |
2510 | bgPixmap.apply (); |
2521 | if (bg_pixmap != None) |
2511 | #else |
2522 | { |
|
|
2523 | # ifdef ENABLE_TRANSPARENCY |
|
|
2524 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2525 | { |
|
|
2526 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2527 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2512 | |
2528 | |
|
|
2529 | transparent = true; |
|
|
2530 | } |
|
|
2531 | else |
|
|
2532 | # endif |
|
|
2533 | { |
|
|
2534 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2535 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2536 | } |
|
|
2537 | } |
|
|
2538 | else |
|
|
2539 | #endif |
|
|
2540 | { |
2513 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2541 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2514 | XClearWindow (dpy, parent[0]); |
|
|
2515 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2542 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2543 | } |
|
|
2544 | |
|
|
2545 | XClearWindow (dpy, parent); |
2516 | |
2546 | |
2517 | if (scrollBar.win) |
2547 | if (scrollBar.win) |
2518 | { |
2548 | { |
|
|
2549 | if (transparent) |
|
|
2550 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2551 | else |
2519 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2552 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2520 | scrollBar.state = STATE_IDLE; |
2553 | scrollBar.state = STATE_IDLE; |
2521 | scrollBar.show (0); |
2554 | scrollBar.show (0); |
2522 | } |
2555 | } |
2523 | |
2556 | |
2524 | #endif |
2557 | if (refresh) |
2525 | |
2558 | { |
2526 | /* bgPixmap.apply () does not do the following : */ |
|
|
2527 | scr_clear (); |
2559 | scr_clear (); |
2528 | scr_touch (true); |
2560 | scr_touch (true); |
|
|
2561 | } |
2529 | want_refresh = 1; |
2562 | want_refresh = 1; |
2530 | } |
2563 | } |
2531 | |
2564 | |
2532 | /* ------------------------------------------------------------------------- */ |
2565 | /* ------------------------------------------------------------------------- */ |
2533 | void |
2566 | void |
… | |
… | |
2601 | { |
2634 | { |
2602 | #if !ENABLE_MINIMAL |
2635 | #if !ENABLE_MINIMAL |
2603 | if (selection.rect) |
2636 | if (selection.rect) |
2604 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2637 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2605 | selection.end.row, selection.end.col, |
2638 | selection.end.row, selection.end.col, |
2606 | RS_RVid, RS_RVid | RS_Uline); |
2639 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2607 | else |
2640 | else |
2608 | #endif |
2641 | #endif |
2609 | scr_xor_span (selection.beg.row, selection.beg.col, |
2642 | scr_xor_span (selection.beg.row, selection.beg.col, |
2610 | selection.end.row, selection.end.col, |
2643 | selection.end.row, selection.end.col, |
2611 | RS_RVid); |
2644 | RS_Sel | RS_RVid); |
2612 | } |
2645 | } |
2613 | } |
2646 | } |
2614 | |
2647 | |
2615 | /* ------------------------------------------------------------------------- */ |
2648 | /* ------------------------------------------------------------------------- */ |
2616 | /* |
2649 | /* |
… | |
… | |
2621 | void |
2654 | void |
2622 | rxvt_term::scr_dump (int fd) NOTHROW |
2655 | rxvt_term::scr_dump (int fd) NOTHROW |
2623 | { |
2656 | { |
2624 | int row, wrote; |
2657 | int row, wrote; |
2625 | unsigned int width, towrite; |
2658 | unsigned int width, towrite; |
2626 | char r1[] = "\n"; |
2659 | const char r1[] = "\n"; |
2627 | |
2660 | |
2628 | for (row = saveLines + top_row; |
2661 | for (row = saveLines + top_row; |
2629 | row < saveLines + nrow - 1; row++) |
2662 | row < saveLines + nrow - 1; row++) |
2630 | { |
2663 | { |
2631 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2664 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2677 | /* ------------------------------------------------------------------------- */ |
2710 | /* ------------------------------------------------------------------------- */ |
2678 | /* |
2711 | /* |
2679 | * Paste a selection direct to the command fd |
2712 | * Paste a selection direct to the command fd |
2680 | */ |
2713 | */ |
2681 | void |
2714 | void |
2682 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2715 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2683 | { |
2716 | { |
2684 | /* convert normal newline chars into common keyboard Return key sequence */ |
2717 | /* convert normal newline chars into common keyboard Return key sequence */ |
2685 | for (unsigned int i = 0; i < len; i++) |
2718 | for (unsigned int i = 0; i < len; i++) |
2686 | if (data[i] == C0_LF) |
2719 | if (data[i] == C0_LF) |
2687 | data[i] = C0_CR; |
2720 | data[i] = C0_CR; |
… | |
… | |
2693 | |
2726 | |
2694 | if (priv_modes & PrivMode_BracketPaste) |
2727 | if (priv_modes & PrivMode_BracketPaste) |
2695 | tt_printf ("\e[201~"); |
2728 | tt_printf ("\e[201~"); |
2696 | } |
2729 | } |
2697 | |
2730 | |
2698 | /* ------------------------------------------------------------------------- */ |
|
|
2699 | /* |
|
|
2700 | * Respond to a notification that a primary selection has been sent |
|
|
2701 | * EXT: SelectionNotify |
|
|
2702 | */ |
|
|
2703 | void |
2731 | void |
2704 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2732 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2705 | { |
2733 | { |
2706 | if (prop == None) /* check for failed XConvertSelection */ |
2734 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2707 | { |
|
|
2708 | if ((selection_type & Sel_CompoundText)) |
|
|
2709 | { |
|
|
2710 | int selnum = selection_type & Sel_whereMask; |
|
|
2711 | |
|
|
2712 | selection_type = 0; |
|
|
2713 | if (selnum != Sel_direct) |
|
|
2714 | selection_request_other (XA_STRING, selnum); |
|
|
2715 | } |
|
|
2716 | |
|
|
2717 | if ((selection_type & Sel_UTF8String)) |
|
|
2718 | { |
|
|
2719 | int selnum = selection_type & Sel_whereMask; |
|
|
2720 | |
|
|
2721 | selection_type = Sel_CompoundText; |
|
|
2722 | if (selnum != Sel_direct) |
|
|
2723 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2724 | else |
|
|
2725 | selection_type = 0; |
|
|
2726 | } |
|
|
2727 | |
|
|
2728 | return; |
|
|
2729 | } |
|
|
2730 | |
|
|
2731 | unsigned long bytes_after; |
|
|
2732 | XTextProperty ct; |
|
|
2733 | |
|
|
2734 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2735 | 0, PROP_SIZE / 4, |
|
|
2736 | delete_prop, AnyPropertyType, |
|
|
2737 | &ct.encoding, &ct.format, |
|
|
2738 | &ct.nitems, &bytes_after, |
|
|
2739 | &ct.value) != Success) |
|
|
2740 | { |
|
|
2741 | ct.value = 0; |
|
|
2742 | goto bailout; |
|
|
2743 | } |
|
|
2744 | |
|
|
2745 | if (ct.encoding == None) |
|
|
2746 | goto bailout; |
|
|
2747 | |
|
|
2748 | if (bytes_after) |
|
|
2749 | { |
|
|
2750 | // fetch and append remaining data |
|
|
2751 | XTextProperty ct2; |
|
|
2752 | |
|
|
2753 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2754 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2755 | delete_prop, AnyPropertyType, |
|
|
2756 | &ct2.encoding, &ct2.format, |
|
|
2757 | &ct2.nitems, &bytes_after, |
|
|
2758 | &ct2.value) != Success) |
|
|
2759 | goto bailout; |
|
|
2760 | |
|
|
2761 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2762 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2763 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2764 | ct.nitems += ct2.nitems; |
|
|
2765 | |
|
|
2766 | XFree (ct2.value); |
|
|
2767 | } |
|
|
2768 | |
|
|
2769 | if (ct.value == 0) |
|
|
2770 | goto bailout; |
|
|
2771 | |
|
|
2772 | if (ct.encoding == xa[XA_INCR]) |
|
|
2773 | { |
|
|
2774 | // INCR selection, start handshake |
|
|
2775 | if (!delete_prop) |
|
|
2776 | XDeleteProperty (dpy, win, prop); |
|
|
2777 | |
|
|
2778 | selection_wait = Sel_incr; |
|
|
2779 | incr_buf_fill = 0; |
|
|
2780 | incr_ev.start (10); |
|
|
2781 | |
|
|
2782 | goto bailout; |
|
|
2783 | } |
|
|
2784 | |
|
|
2785 | if (ct.nitems == 0) |
|
|
2786 | { |
|
|
2787 | if (selection_wait == Sel_incr) |
|
|
2788 | { |
|
|
2789 | XFree (ct.value); |
|
|
2790 | |
|
|
2791 | // finally complete, now paste the whole thing |
|
|
2792 | selection_wait = Sel_normal; |
|
|
2793 | ct.value = (unsigned char *)incr_buf; |
|
|
2794 | ct.nitems = incr_buf_fill; |
|
|
2795 | incr_buf = 0; |
|
|
2796 | incr_buf_size = 0; |
|
|
2797 | incr_ev.stop (); |
|
|
2798 | } |
|
|
2799 | else |
|
|
2800 | { |
|
|
2801 | if (selection_wait == Sel_normal |
|
|
2802 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2803 | { |
|
|
2804 | /* |
|
|
2805 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2806 | * XConvertSelection () but nothing was presented |
|
|
2807 | */ |
|
|
2808 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2809 | } |
|
|
2810 | |
|
|
2811 | goto bailout; |
|
|
2812 | } |
|
|
2813 | } |
|
|
2814 | else if (selection_wait == Sel_incr) |
|
|
2815 | { |
|
|
2816 | incr_ev.start (10); |
|
|
2817 | |
|
|
2818 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2819 | { |
|
|
2820 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2821 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2822 | } |
|
|
2823 | |
|
|
2824 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2825 | incr_buf_fill += ct.nitems; |
|
|
2826 | |
|
|
2827 | goto bailout; |
|
|
2828 | } |
|
|
2829 | |
|
|
2830 | char **cl; |
|
|
2831 | int cr; |
|
|
2832 | |
|
|
2833 | #if !ENABLE_MINIMAL |
|
|
2834 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2835 | // so recode it manually |
|
|
2836 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2837 | { |
|
|
2838 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2839 | char *s = rxvt_wcstombs (w); |
|
|
2840 | free (w); |
|
|
2841 | // TODO: strlen == only the first element will be converted. well... |
|
|
2842 | paste (s, strlen (s)); |
|
|
2843 | free (s); |
|
|
2844 | } |
|
|
2845 | else |
|
|
2846 | #endif |
|
|
2847 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2848 | && cl) |
|
|
2849 | { |
|
|
2850 | for (int i = 0; i < cr; i++) |
|
|
2851 | paste (cl[i], strlen (cl[i])); |
|
|
2852 | |
|
|
2853 | XFreeStringList (cl); |
|
|
2854 | } |
|
|
2855 | else |
|
|
2856 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2857 | |
|
|
2858 | bailout: |
|
|
2859 | XFree (ct.value); |
|
|
2860 | |
|
|
2861 | if (selection_wait == Sel_normal) |
|
|
2862 | selection_wait = Sel_none; |
|
|
2863 | } |
|
|
2864 | |
|
|
2865 | void |
|
|
2866 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2867 | { |
|
|
2868 | selection_wait = Sel_none; |
|
|
2869 | |
|
|
2870 | incr_buf_size = 0; |
|
|
2871 | free (incr_buf); |
|
|
2872 | |
|
|
2873 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2874 | } |
|
|
2875 | |
|
|
2876 | void |
|
|
2877 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2878 | { |
|
|
2879 | if (prop == None || selection_wait != Sel_incr) |
|
|
2880 | return; |
2735 | return; |
2881 | |
2736 | |
2882 | selection_paste (win, prop, true); |
2737 | tt_paste (data, len); |
2883 | } |
2738 | } |
2884 | |
2739 | |
2885 | /* ------------------------------------------------------------------------- */ |
2740 | /* ------------------------------------------------------------------------- */ |
2886 | /* |
2741 | /* |
2887 | * Request the current selection: |
2742 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2888 | * Order: > internal selection if available |
2743 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2889 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2744 | * as fallback |
2890 | * > CUT_BUFFER0 |
|
|
2891 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2892 | * will auto fallback to CUT_BUFFER0 |
|
|
2893 | * EXT: button 2 release |
2745 | * EXT: button 2 release |
2894 | */ |
2746 | */ |
2895 | void |
2747 | void |
2896 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2748 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2897 | { |
2749 | { |
2898 | if (selection.text && selnum == Sel_Primary) |
2750 | if (!selection_req) |
2899 | { |
|
|
2900 | /* internal selection */ |
|
|
2901 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2902 | paste (str, strlen (str)); |
|
|
2903 | free (str); |
|
|
2904 | return; |
|
|
2905 | } |
2751 | { |
2906 | else |
2752 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2753 | selection_req->run (); |
2907 | { |
2754 | } |
2908 | selection_request_time = tm; |
|
|
2909 | selection_wait = Sel_normal; |
|
|
2910 | |
|
|
2911 | #if X_HAVE_UTF8_STRING |
|
|
2912 | selection_type = Sel_UTF8String; |
|
|
2913 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2914 | return; |
|
|
2915 | #else |
|
|
2916 | selection_type = Sel_CompoundText; |
|
|
2917 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2918 | return; |
|
|
2919 | #endif |
|
|
2920 | } |
|
|
2921 | |
|
|
2922 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2923 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2924 | } |
|
|
2925 | |
|
|
2926 | int |
|
|
2927 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2928 | { |
|
|
2929 | Atom sel; |
|
|
2930 | |
|
|
2931 | selection_type |= selnum; |
|
|
2932 | |
|
|
2933 | if (selnum == Sel_Primary) |
|
|
2934 | sel = XA_PRIMARY; |
|
|
2935 | else if (selnum == Sel_Secondary) |
|
|
2936 | sel = XA_SECONDARY; |
|
|
2937 | else |
|
|
2938 | sel = xa[XA_CLIPBOARD]; |
|
|
2939 | |
|
|
2940 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2941 | { |
|
|
2942 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2943 | vt, selection_request_time); |
|
|
2944 | return 1; |
|
|
2945 | } |
|
|
2946 | |
|
|
2947 | return 0; |
|
|
2948 | } |
2755 | } |
2949 | |
2756 | |
2950 | /* ------------------------------------------------------------------------- */ |
2757 | /* ------------------------------------------------------------------------- */ |
2951 | /* |
2758 | /* |
2952 | * Clear all selected text |
2759 | * Clear all selected text |
2953 | * EXT: SelectionClear |
2760 | * EXT: SelectionClear |
2954 | */ |
2761 | */ |
2955 | void |
2762 | void |
2956 | rxvt_term::selection_clear () NOTHROW |
2763 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2957 | { |
2764 | { |
|
|
2765 | if (!clipboard) |
|
|
2766 | { |
2958 | want_refresh = 1; |
2767 | want_refresh = 1; |
2959 | free (selection.text); |
2768 | free (selection.text); |
2960 | selection.text = NULL; |
2769 | selection.text = NULL; |
2961 | selection.len = 0; |
2770 | selection.len = 0; |
2962 | CLEAR_SELECTION (); |
2771 | CLEAR_SELECTION (); |
2963 | |
2772 | |
2964 | if (display->selection_owner == this) |
2773 | if (display->selection_owner == this) |
2965 | display->selection_owner = 0; |
2774 | display->selection_owner = 0; |
|
|
2775 | } |
|
|
2776 | else |
|
|
2777 | { |
|
|
2778 | free (selection.clip_text); |
|
|
2779 | selection.clip_text = NULL; |
|
|
2780 | selection.clip_len = 0; |
|
|
2781 | |
|
|
2782 | if (display->clipboard_owner == this) |
|
|
2783 | display->clipboard_owner = 0; |
|
|
2784 | } |
2966 | } |
2785 | } |
2967 | |
2786 | |
2968 | /* ------------------------------------------------------------------------- */ |
2787 | /* ------------------------------------------------------------------------- */ |
2969 | /* |
2788 | /* |
2970 | * Copy a selection into the cut buffer |
2789 | * Copy a selection into the cut buffer |
2971 | * EXT: button 1 or 3 release |
2790 | * EXT: button 1 or 3 release |
2972 | */ |
2791 | */ |
2973 | void |
2792 | void |
2974 | rxvt_term::selection_make (Time tm) |
2793 | rxvt_term::selection_make (Time tm) |
2975 | { |
2794 | { |
2976 | int i; |
2795 | int size; |
2977 | wchar_t *new_selection_text; |
2796 | wchar_t *new_selection_text; |
2978 | text_t *t; |
2797 | text_t *t; |
2979 | |
2798 | |
2980 | switch (selection.op) |
2799 | switch (selection.op) |
2981 | { |
2800 | { |
… | |
… | |
2997 | return; /* nothing selected, go away */ |
2816 | return; /* nothing selected, go away */ |
2998 | |
2817 | |
2999 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2818 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3000 | return; |
2819 | return; |
3001 | |
2820 | |
3002 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2821 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3003 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2822 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3004 | |
2823 | |
3005 | int ofs = 0; |
2824 | int ofs = 0; |
3006 | int extra = 0; |
2825 | int extra = 0; |
3007 | |
2826 | |
3008 | int col = selection.beg.col; |
2827 | int col = selection.beg.col; |
… | |
… | |
3014 | { |
2833 | { |
3015 | #if !ENABLE_MINIMAL |
2834 | #if !ENABLE_MINIMAL |
3016 | if (selection.rect) |
2835 | if (selection.rect) |
3017 | { |
2836 | { |
3018 | col = selection.beg.col; |
2837 | col = selection.beg.col; |
3019 | end_col = ncol + 1; |
2838 | end_col = selection.end.col; |
3020 | } |
2839 | } |
3021 | else |
2840 | else |
3022 | #endif |
2841 | #endif |
3023 | end_col = ROW(row).l; |
2842 | end_col = ROW(row).l; |
3024 | |
2843 | |
3025 | col = max (col, 0); |
2844 | col = max (col, 0); |
3026 | |
2845 | |
3027 | if (row == selection.end.row |
2846 | if (row == selection.end.row) |
3028 | #if !ENABLE_MINIMAL |
|
|
3029 | || selection.rect |
|
|
3030 | #endif |
|
|
3031 | ) |
|
|
3032 | min_it (end_col, selection.end.col); |
2847 | min_it (end_col, selection.end.col); |
3033 | |
2848 | |
3034 | t = ROW(row).t + col; |
2849 | t = ROW(row).t + col; |
3035 | |
2850 | |
3036 | for (; col < end_col; col++) |
2851 | for (; col < end_col; col++) |
… | |
… | |
3044 | |
2859 | |
3045 | extra -= (len - 1); |
2860 | extra -= (len - 1); |
3046 | |
2861 | |
3047 | if (extra < 0) |
2862 | if (extra < 0) |
3048 | { |
2863 | { |
3049 | extra += i; |
2864 | extra += size; |
3050 | i += i; |
2865 | size += size; |
3051 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2866 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3052 | } |
2867 | } |
3053 | |
2868 | |
3054 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2869 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3055 | } |
2870 | } |
3056 | #endif |
2871 | #endif |
… | |
… | |
3068 | |
2883 | |
3069 | new_selection_text[ofs++] = C0_LF; |
2884 | new_selection_text[ofs++] = C0_LF; |
3070 | } |
2885 | } |
3071 | else |
2886 | else |
3072 | #endif |
2887 | #endif |
3073 | if (!ROW(row).is_longer () && row != selection.end.row) |
2888 | if (!ROW(row).is_longer () |
|
|
2889 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2890 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3074 | new_selection_text[ofs++] = C0_LF; |
2891 | new_selection_text[ofs++] = C0_LF; |
3075 | } |
2892 | } |
3076 | |
|
|
3077 | if (end_col != selection.end.col) |
|
|
3078 | new_selection_text[ofs++] = C0_LF; |
|
|
3079 | |
2893 | |
3080 | new_selection_text[ofs] = 0; |
2894 | new_selection_text[ofs] = 0; |
3081 | |
2895 | |
3082 | if (ofs == 0) |
2896 | if (ofs == 0) |
3083 | { |
2897 | { |
… | |
… | |
3096 | |
2910 | |
3097 | selection_grab (tm); |
2911 | selection_grab (tm); |
3098 | } |
2912 | } |
3099 | |
2913 | |
3100 | bool |
2914 | bool |
3101 | rxvt_term::selection_grab (Time tm) NOTHROW |
2915 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3102 | { |
2916 | { |
|
|
2917 | Atom sel; |
|
|
2918 | |
|
|
2919 | if (!clipboard) |
|
|
2920 | { |
3103 | selection_time = tm; |
2921 | selection_time = tm; |
|
|
2922 | sel = XA_PRIMARY; |
|
|
2923 | } |
|
|
2924 | else |
|
|
2925 | { |
|
|
2926 | clipboard_time = tm; |
|
|
2927 | sel = xa[XA_CLIPBOARD]; |
|
|
2928 | } |
3104 | |
2929 | |
3105 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2930 | XSetSelectionOwner (dpy, sel, vt, tm); |
3106 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2931 | if (XGetSelectionOwner (dpy, sel) == vt) |
3107 | { |
2932 | { |
3108 | display->set_selection_owner (this); |
2933 | display->set_selection_owner (this, clipboard); |
3109 | return true; |
2934 | return true; |
3110 | } |
2935 | } |
3111 | else |
2936 | else |
3112 | { |
2937 | { |
3113 | selection_clear (); |
2938 | selection_clear (clipboard); |
3114 | return false; |
2939 | return false; |
3115 | } |
2940 | } |
3116 | |
2941 | |
3117 | #if 0 |
2942 | #if 0 |
3118 | XTextProperty ct; |
2943 | XTextProperty ct; |
… | |
… | |
3578 | * EXT: SelectionRequest |
3403 | * EXT: SelectionRequest |
3579 | */ |
3404 | */ |
3580 | void |
3405 | void |
3581 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3406 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3582 | { |
3407 | { |
|
|
3408 | Atom property = rq.property == None ? rq.target : rq.property; |
3583 | XSelectionEvent ev; |
3409 | XSelectionEvent ev; |
3584 | |
3410 | |
3585 | ev.type = SelectionNotify; |
3411 | ev.type = SelectionNotify; |
3586 | ev.property = None; |
3412 | ev.property = None; |
3587 | ev.display = rq.display; |
3413 | ev.display = rq.display; |
… | |
… | |
3602 | *target++ = xa[XA_COMPOUND_TEXT]; |
3428 | *target++ = xa[XA_COMPOUND_TEXT]; |
3603 | #if X_HAVE_UTF8_STRING |
3429 | #if X_HAVE_UTF8_STRING |
3604 | *target++ = xa[XA_UTF8_STRING]; |
3430 | *target++ = xa[XA_UTF8_STRING]; |
3605 | #endif |
3431 | #endif |
3606 | |
3432 | |
3607 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3433 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3608 | 32, PropModeReplace, |
3434 | 32, PropModeReplace, |
3609 | (unsigned char *)target_list, target - target_list); |
3435 | (unsigned char *)target_list, target - target_list); |
3610 | ev.property = rq.property; |
3436 | ev.property = property; |
3611 | } |
3437 | } |
3612 | #if TODO // TODO |
3438 | #if TODO // TODO |
3613 | else if (rq.target == xa[XA_MULTIPLE]) |
3439 | else if (rq.target == xa[XA_MULTIPLE]) |
3614 | { |
3440 | { |
3615 | /* TODO: Handle MULTIPLE */ |
3441 | /* TODO: Handle MULTIPLE */ |
3616 | } |
3442 | } |
3617 | #endif |
3443 | #endif |
3618 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3444 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3619 | { |
3445 | { |
3620 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3446 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3621 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3447 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3622 | ev.property = rq.property; |
3448 | ev.property = property; |
|
|
3449 | } |
|
|
3450 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3451 | { |
|
|
3452 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3453 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3454 | ev.property = property; |
3623 | } |
3455 | } |
3624 | else if (rq.target == XA_STRING |
3456 | else if (rq.target == XA_STRING |
3625 | || rq.target == xa[XA_TEXT] |
3457 | || rq.target == xa[XA_TEXT] |
3626 | || rq.target == xa[XA_COMPOUND_TEXT] |
3458 | || rq.target == xa[XA_COMPOUND_TEXT] |
3627 | || rq.target == xa[XA_UTF8_STRING] |
3459 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3659 | { |
3491 | { |
3660 | target = xa[XA_COMPOUND_TEXT]; |
3492 | target = xa[XA_COMPOUND_TEXT]; |
3661 | style = enc_compound_text; |
3493 | style = enc_compound_text; |
3662 | } |
3494 | } |
3663 | |
3495 | |
3664 | if (selection.text) |
3496 | if (rq.selection == XA_PRIMARY && selection.text) |
3665 | { |
3497 | { |
3666 | cl = selection.text; |
3498 | cl = selection.text; |
3667 | selectlen = selection.len; |
3499 | selectlen = selection.len; |
|
|
3500 | } |
|
|
3501 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3502 | { |
|
|
3503 | cl = selection.clip_text; |
|
|
3504 | selectlen = selection.clip_len; |
3668 | } |
3505 | } |
3669 | else |
3506 | else |
3670 | { |
3507 | { |
3671 | cl = L""; |
3508 | cl = L""; |
3672 | selectlen = 0; |
3509 | selectlen = 0; |
… | |
… | |
3693 | ct.value = (unsigned char *)cl; |
3530 | ct.value = (unsigned char *)cl; |
3694 | ct.nitems = selectlen; |
3531 | ct.nitems = selectlen; |
3695 | ct.encoding = target; |
3532 | ct.encoding = target; |
3696 | } |
3533 | } |
3697 | |
3534 | |
3698 | XChangeProperty (dpy, rq.requestor, rq.property, |
3535 | XChangeProperty (dpy, rq.requestor, property, |
3699 | ct.encoding, 8, PropModeReplace, |
3536 | ct.encoding, 8, PropModeReplace, |
3700 | ct.value, (int)ct.nitems); |
3537 | ct.value, (int)ct.nitems); |
3701 | ev.property = rq.property; |
3538 | ev.property = property; |
3702 | |
3539 | |
3703 | if (freect) |
3540 | if (freect) |
3704 | XFree (ct.value); |
3541 | XFree (ct.value); |
3705 | } |
3542 | } |
3706 | |
3543 | |
… | |
… | |
3740 | h += 2; min_it (h, nrow); |
3577 | h += 2; min_it (h, nrow); |
3741 | |
3578 | |
3742 | x -= 1; clamp_it (x, 0, ncol - w); |
3579 | x -= 1; clamp_it (x, 0, ncol - w); |
3743 | y -= 1; clamp_it (y, 0, nrow - h); |
3580 | y -= 1; clamp_it (y, 0, nrow - h); |
3744 | |
3581 | |
3745 | ov_x = x; ov_y = y; |
3582 | ov.x = x; ov.y = y; |
3746 | ov_w = w; ov_h = h; |
3583 | ov.w = w; ov.h = h; |
3747 | |
3584 | |
3748 | ov_text = new text_t *[h]; |
3585 | ov.text = new text_t *[h]; |
3749 | ov_rend = new rend_t *[h]; |
3586 | ov.rend = new rend_t *[h]; |
3750 | |
3587 | |
3751 | for (y = 0; y < h; y++) |
3588 | for (y = 0; y < h; y++) |
3752 | { |
3589 | { |
3753 | text_t *tp = ov_text[y] = new text_t[w]; |
3590 | text_t *tp = ov.text[y] = new text_t[w]; |
3754 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3591 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3755 | |
3592 | |
3756 | text_t t0, t1, t2; |
3593 | text_t t0, t1, t2; |
3757 | rend_t r = OVERLAY_RSTYLE; |
3594 | rend_t r = OVERLAY_RSTYLE; |
3758 | |
3595 | |
3759 | if (y == 0) |
3596 | if (y == 0) |
… | |
… | |
3778 | } |
3615 | } |
3779 | |
3616 | |
3780 | void |
3617 | void |
3781 | rxvt_term::scr_overlay_off () NOTHROW |
3618 | rxvt_term::scr_overlay_off () NOTHROW |
3782 | { |
3619 | { |
3783 | if (!ov_text) |
3620 | if (!ov.text) |
3784 | return; |
3621 | return; |
3785 | |
3622 | |
3786 | want_refresh = 1; |
3623 | want_refresh = 1; |
3787 | |
3624 | |
3788 | for (int y = 0; y < ov_h; y++) |
3625 | for (int y = 0; y < ov.h; y++) |
3789 | { |
3626 | { |
3790 | delete [] ov_text[y]; |
3627 | delete [] ov.text[y]; |
3791 | delete [] ov_rend[y]; |
3628 | delete [] ov.rend[y]; |
3792 | } |
3629 | } |
3793 | |
3630 | |
3794 | delete [] ov_text; ov_text = 0; |
3631 | delete [] ov.text; ov.text = 0; |
3795 | delete [] ov_rend; ov_rend = 0; |
3632 | delete [] ov.rend; ov.rend = 0; |
3796 | } |
3633 | } |
3797 | |
3634 | |
3798 | void |
3635 | void |
3799 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3636 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3800 | { |
3637 | { |
3801 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3638 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3802 | return; |
3639 | return; |
3803 | |
3640 | |
3804 | x++, y++; |
3641 | x++, y++; |
3805 | |
3642 | |
3806 | ov_text[y][x] = text; |
3643 | ov.text[y][x] = text; |
3807 | ov_rend[y][x] = rend; |
3644 | ov.rend[y][x] = rend; |
3808 | } |
3645 | } |
3809 | |
3646 | |
3810 | void |
3647 | void |
3811 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3648 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3812 | { |
3649 | { |
… | |
… | |
3831 | } |
3668 | } |
3832 | |
3669 | |
3833 | void |
3670 | void |
3834 | rxvt_term::scr_swap_overlay () NOTHROW |
3671 | rxvt_term::scr_swap_overlay () NOTHROW |
3835 | { |
3672 | { |
3836 | if (!ov_text) |
3673 | if (!ov.text) |
3837 | return; |
3674 | return; |
3838 | |
3675 | |
|
|
3676 | // hide cursor if it is within the overlay area |
|
|
3677 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3678 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3679 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3680 | |
3839 | // swap screen mem with overlay |
3681 | // swap screen mem with overlay |
3840 | for (int y = ov_h; y--; ) |
3682 | for (int y = ov.h; y--; ) |
3841 | { |
3683 | { |
3842 | text_t *t1 = ov_text[y]; |
3684 | text_t *t1 = ov.text[y]; |
3843 | rend_t *r1 = ov_rend[y]; |
3685 | rend_t *r1 = ov.rend[y]; |
3844 | |
3686 | |
3845 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3687 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3846 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3688 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3847 | |
3689 | |
3848 | for (int x = ov_w; x--; ) |
3690 | for (int x = ov.w; x--; ) |
3849 | { |
3691 | { |
3850 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3692 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3851 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3693 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3852 | } |
3694 | } |
3853 | } |
3695 | } |