ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 2004 UTC

23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 29
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 31
34#include <inttypes.h> 32#include <inttypes.h>
35#include <wchar.h> 33#include <wchar.h>
48 46
49/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
53 if (Options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 52 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
113 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
114 112
115/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 120{
122 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 123
125 while (width--) 124 while (width--)
126 { 125 {
127 *et++ = ' '; 126 *et++ = ' ';
128 *er++ = efs; 127 *er++ = efs;
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
222 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
223 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
224 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
225 } 226 }
226 227
227 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
228 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
229 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
230 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
231 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
232 screen.charset = 0; 233 screen.charset = 0;
416} 417}
417 418
418void 419void
419rxvt_term::scr_reset_realloc () 420rxvt_term::scr_reset_realloc ()
420{ 421{
421 uint16_t total_rows, nrow; 422 unsigned int total_rows, nrow;
422 423
423 nrow = TermWin.nrow; 424 nrow = TermWin.nrow;
424 total_rows = nrow + TermWin.saveLines; 425 total_rows = nrow + TermWin.saveLines;
425 /* *INDENT-OFF* */ 426 /* *INDENT-OFF* */
426 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
443 * Free everything. That way malloc debugging can find leakage. 444 * Free everything. That way malloc debugging can find leakage.
444 */ 445 */
445void 446void
446rxvt_term::scr_release () 447rxvt_term::scr_release ()
447{ 448{
448 uint16_t total_rows; 449 unsigned int total_rows;
449 int i; 450 int i;
450 451
451 total_rows = TermWin.nrow + TermWin.saveLines; 452 total_rows = TermWin.nrow + TermWin.saveLines;
452 453
453 delete talloc; talloc = 0; 454 delete talloc; talloc = 0;
479 * Hard reset 480 * Hard reset
480 */ 481 */
481void 482void
482rxvt_term::scr_poweron () 483rxvt_term::scr_poweron ()
483{ 484{
484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
485
486 scr_release (); 485 scr_release ();
487 prev_nrow = prev_ncol = 0; 486 prev_nrow = prev_ncol = 0;
488 scr_reset (); 487 scr_reset ();
489 488
490 scr_clear (true); 489 scr_clear (true);
501 */ 500 */
502void 501void
503rxvt_term::scr_cursor (int mode) 502rxvt_term::scr_cursor (int mode)
504{ 503{
505 screen_t *s; 504 screen_t *s;
506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 505
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 506#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 507 if (current_screen == SECONDARY)
511 s = &swap; 508 s = &swap;
512 else 509 else
514 s = &screen; 511 s = &screen;
515 512
516 switch (mode) 513 switch (mode)
517 { 514 {
518 case SAVE: 515 case SAVE:
519 s->s_cur.row = s->cur.row; 516 s->s_cur.row = screen.cur.row;
520 s->s_cur.col = s->cur.col; 517 s->s_cur.col = screen.cur.col;
521 s->s_rstyle = rstyle; 518 s->s_rstyle = rstyle;
522 s->s_charset = s->charset; 519 s->s_charset = screen.charset;
523 s->s_charset_char = charsets[s->charset]; 520 s->s_charset_char = charsets[screen.charset];
524 break; 521 break;
525 522
526 case RESTORE: 523 case RESTORE:
527 want_refresh = 1; 524 want_refresh = 1;
528 s->cur.row = s->s_cur.row; 525 screen.cur.row = s->s_cur.row;
529 s->cur.col = s->s_cur.col; 526 screen.cur.col = s->s_cur.col;
530 s->flags &= ~Screen_WrapNext; 527 screen.flags &= ~Screen_WrapNext;
531 rstyle = s->s_rstyle; 528 rstyle = s->s_rstyle;
532 s->charset = s->s_charset; 529 screen.charset = s->s_charset;
533 charsets[s->charset] = s->s_charset_char; 530 charsets[screen.charset] = s->s_charset_char;
534 set_font_style (); 531 set_font_style ();
535 break; 532 break;
536 } 533 }
537 534
538 /* boundary check in case screen size changed between SAVE and RESTORE */ 535 /* boundary check in case screen size changed between SAVE and RESTORE */
561 int offset; 558 int offset;
562#endif 559#endif
563 560
564 want_refresh = 1; 561 want_refresh = 1;
565 562
566 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
567
568 TermWin.view_start = 0; 563 TermWin.view_start = 0;
569 564
570 if (current_screen == scrn) 565 if (current_screen == scrn)
571 return scrn; 566 return scrn;
572 567
573 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
574 569
575 SWAP_IT (current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
576#if NSCREENS 571#if NSCREENS
577 if (Options & Opt_secondaryScreen) 572 if (options & Opt_secondaryScreen)
578 { 573 {
579 num_scr = 0; 574 num_scr = 0;
580 offset = TermWin.saveLines; 575 offset = TermWin.saveLines;
581 for (i = prev_nrow; i--;) 576 for (i = prev_nrow; i--;)
582 { 577 {
600 screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
601 swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
602 } 597 }
603 else 598 else
604#endif 599#endif
605 if (Options & Opt_secondaryScroll) 600 if (options & Opt_secondaryScroll)
606 //if (current_screen == PRIMARY) 601 //if (current_screen == PRIMARY)
607 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
608 return scrn; 603 return scrn;
609} 604}
610 605
606// clear WrapNext indicator, solidifying position on next line
607void
608rxvt_term::scr_do_wrap ()
609{
610 if (!(screen.flags & Screen_WrapNext))
611 return;
612
613 screen.flags &= ~Screen_WrapNext;
614
615 screen.cur.col = 0;
616
617 if (screen.cur.row == screen.bscroll)
618 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
619 else if (screen.cur.row < TermWin.nrow - 1)
620 screen.cur.row++;
621}
622
611/* ------------------------------------------------------------------------- */ 623/* ------------------------------------------------------------------------- */
612/* 624/*
613 * Change the colour for following text 625 * Change the colour for following text
614 */ 626 */
615void 627void
616rxvt_term::scr_color (unsigned int color, int fgbg) 628rxvt_term::scr_color (unsigned int color, int fgbg)
617{ 629{
618 color &= RS_fgMask; 630 if (color > maxTermCOLOR)
631 color = fgbg;
632
619 if (fgbg == Color_fg) 633 if (fgbg == Color_fg)
620 rstyle = SET_FGCOLOR (rstyle, color); 634 rstyle = SET_FGCOLOR (rstyle, color);
621 else 635 else
622 rstyle = SET_BGCOLOR (rstyle, color); 636 rstyle = SET_BGCOLOR (rstyle, color);
623} 637}
652 666
653 if (count == 0 || (row1 > row2)) 667 if (count == 0 || (row1 > row2))
654 return 0; 668 return 0;
655 669
656 want_refresh = 1; 670 want_refresh = 1;
657 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
658 671
659 if (row1 == 0 && count > 0 672 if (row1 == 0 && count > 0
660 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 673 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
661 { 674 {
662 nscrolled = (long)TermWin.nscrolled + (long)count; 675 nscrolled = (long)TermWin.nscrolled + (long)count;
663 676
664 if (nscrolled > (long)TermWin.saveLines) 677 if (nscrolled > (long)TermWin.saveLines)
665 TermWin.nscrolled = TermWin.saveLines; 678 TermWin.nscrolled = TermWin.saveLines;
666 else 679 else
667 TermWin.nscrolled = (uint16_t)nscrolled; 680 TermWin.nscrolled = (unsigned int)nscrolled;
668 681
669 if ((Options & Opt_scrollWithBuffer) 682 if ((options & Opt_scrollWithBuffer)
670 && TermWin.view_start != 0 683 && TermWin.view_start != 0
671 && TermWin.view_start != TermWin.saveLines) 684 && TermWin.view_start != TermWin.saveLines)
672 scr_page (UP, count); 685 scr_page (UP, count);
673 } 686 }
674 else if (!spec) 687 else if (!spec)
765 * Add text given in <str> of length <len> to screen struct 778 * Add text given in <str> of length <len> to screen struct
766 */ 779 */
767void 780void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 781rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
769{ 782{
770 unsigned char checksel, clearsel; 783 unsigned char checksel;
771 unicode_t c; 784 unicode_t c;
772 int i, row, last_col; 785 int i, row, last_col;
773 text_t *stp; 786 text_t *stp;
774 rend_t *srp; 787 rend_t *srp;
775 788
776 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
777 return; 790 return;
778 791
779 want_refresh = 1; 792 want_refresh = 1;
793 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 794 last_col = TermWin.ncol;
781 795
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 796 if (nlines > 0)
785 { 797 {
786 nlines += screen.cur.row - screen.bscroll; 798 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 799 if ((nlines > 0)
788 && (screen.tscroll == 0) 800 && (screen.tscroll == 0)
804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 816 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
805#endif 817#endif
806 row = screen.cur.row + TermWin.saveLines; 818 row = screen.cur.row + TermWin.saveLines;
807 819
808 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 820 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
809 clearsel = 0;
810 821
811 stp = screen.text[row]; 822 stp = screen.text[row];
812 srp = screen.rend[row]; 823 srp = screen.rend[row];
813 824
814 while (len--) 825 while (len--)
817 828
818 if (c < 0x20) 829 if (c < 0x20)
819 switch (c) 830 switch (c)
820 { 831 {
821 case C0_HT: 832 case C0_HT:
822 scr_tab (1); 833 scr_tab (1, true);
823 continue; 834 continue;
824 835
825 case C0_LF: 836 case C0_LF:
826 if (screen.tlen[row] != -1) /* XXX: think about this */ 837 if (screen.tlen[row] != -1) /* XXX: think about this */
827 MAX_IT (screen.tlen[row], screen.cur.col); 838 MAX_IT (screen.tlen[row], screen.cur.col);
849 if (checksel /* see if we're writing within selection */ 860 if (checksel /* see if we're writing within selection */
850 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 861 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
851 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 862 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
852 { 863 {
853 checksel = 0; 864 checksel = 0;
854 clearsel = 1; 865 /*
866 * If we wrote anywhere in the selected area, kill the selection
867 * XXX: should we kill the mark too? Possibly, but maybe that
868 * should be a similar check.
869 */
870 CLEAR_SELECTION ();
855 } 871 }
856 872
857 if (screen.flags & Screen_WrapNext) 873 if (screen.flags & Screen_WrapNext)
858 { 874 {
859 screen.tlen[row] = -1; 875 screen.tlen[row] = -1;
860 if (screen.cur.row == screen.bscroll) 876
861 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
862 else if (screen.cur.row < (TermWin.nrow - 1))
863 row = (++screen.cur.row) + TermWin.saveLines; 877 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
864 878
865 stp = screen.text[row]; /* _must_ refresh */ 879 stp = screen.text[row]; /* _must_ refresh */
866 srp = screen.rend[row]; /* _must_ refresh */ 880 srp = screen.rend[row]; /* _must_ refresh */
867 screen.cur.col = 0;
868 screen.flags &= ~Screen_WrapNext;
869 } 881 }
870 882
871 if (screen.flags & Screen_Insert) 883 if (screen.flags & Screen_Insert)
872 scr_insdel_chars (1, INSERT); 884 scr_insdel_chars (1, INSERT);
873 885
877 int width = c < 0x100 ? 1 : wcwidth (c); 889 int width = c < 0x100 ? 1 : wcwidth (c);
878 890
879 if (charsets[screen.charset] == '0') // DEC SPECIAL 891 if (charsets[screen.charset] == '0') // DEC SPECIAL
880 { 892 {
881 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars
882 static uint16_t vt100_0[32] = { // 5f .. 7e 896 static uint16_t vt100_0[63] = { // 5f .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
883 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
884 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
885 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
886 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
887 }; 905 };
888 906
889 if (c >= 0x5f && c <= 0x7e) 907 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
890 { 908 {
891 c = vt100_0[c - 0x5f]; 909 c = vt100_0[c - 0x40];
892 width = 1; 910 width = 1;
893 } 911 }
894 } 912 }
895 913
896 if (width != 0) 914 if (width != 0)
897 { 915 {
898#if !UNICODE_3 && ENABLE_COMBINING 916 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd;
919
920#if !UNICODE_3
899 // trim characters we can't store directly :( 921 // trim characters we can't store directly :(
900 if (c >= 0x10000) 922 if (c >= 0x10000)
923# if ENABLE_COMBINING
901 c = rxvt_composite.compose (c); // map to lower 16 bits 924 c = rxvt_composite.compose (c); // map to lower 16 bits
925# else
926 c = 0xfffd;
902#endif 927# endif
903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 928#endif
904 rend_t rend = SET_FONT (rstyle, 929
905 c > 0x7f || bold || c < 0x20 930 // nuke the character at this position, if required
906 ? TermWin.fontset->find_font (c, bold) 931 if (stp[screen.cur.col] == NOCHAR
907 : TermWin.ascii_map [c - 0x20]); 932 || (screen.cur.col < TermWin.ncol - 1
933 && stp[screen.cur.col + 1] == NOCHAR))
934 {
935 int col = screen.cur.col;
936
937 // find begin
938 while (col > 0 && stp[col] == NOCHAR)
939 col--;
940
941 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
942
943 // found begin, nuke
944 do {
945 stp[col] = ' ';
946 srp[col] = rend;
947 col++;
948 } while (col < TermWin.ncol && stp[col] == NOCHAR);
949 }
950
951 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 952
909 do 953 do
910 { 954 {
911 stp[screen.cur.col] = c; 955 stp[screen.cur.col] = c;
912 srp[screen.cur.col] = rend; 956 srp[screen.cur.col] = rend;
957 else 1001 else
958 continue; 1002 continue;
959 1003
960 // handle double-width-chars by making them look extremely ugly 1004 // handle double-width-chars by making them look extremely ugly
961 if (*tp == NOCHAR) 1005 if (*tp == NOCHAR)
1006 {
962 *tp = ' '; // hack //D //TODO //--tp, --rp; 1007 // hack //D //TODO //--tp, --rp;
1008 *tp = ' ';
1009 *rp &= ~RS_baseattrMask;
1010 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1011 }
963 1012
964 // first try to find a precomposed character 1013 // first try to find a precomposed character
965 unicode_t n = rxvt_compose (*tp, c); 1014 unicode_t n = rxvt_compose (*tp, c);
966 if (n == NOCHAR) 1015 if (n == NOCHAR)
967 n = rxvt_composite.compose (*tp, c); 1016 n = rxvt_composite.compose (*tp, c);
968 1017
969 *tp = n; 1018 *tp = n;
970 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1019 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
971#endif 1020#endif
972 } 1021 }
973 } 1022 }
974 1023
975 if (screen.tlen[row] != -1) /* XXX: think about this */ 1024 if (screen.tlen[row] != -1) /* XXX: think about this */
976 MAX_IT (screen.tlen[row], screen.cur.col); 1025 MAX_IT (screen.tlen[row], screen.cur.col);
977
978 /*
979 * If we wrote anywhere in the selected area, kill the selection
980 * XXX: should we kill the mark too? Possibly, but maybe that
981 * should be a similar check.
982 */
983 if (clearsel)
984 CLEAR_SELECTION ();
985 1026
986#ifdef DEBUG_STRICT 1027#ifdef DEBUG_STRICT
987 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
988#else /* drive with your eyes closed */ 1029#else /* drive with your eyes closed */
989 MAX_IT (screen.cur.row, 0); 1030 MAX_IT (screen.cur.row, 0);
1007#ifdef TERMCAP_HAS_BW 1048#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = TermWin.ncol - 1; 1049 screen.cur.col = TermWin.ncol - 1;
1009 screen.cur.row--; 1050 screen.cur.row--;
1010 return; 1051 return;
1011#endif 1052#endif
1012
1013 } 1053 }
1014 } 1054 }
1015 else if ((screen.flags & Screen_WrapNext) == 0) 1055 else if (!(screen.flags & Screen_WrapNext))
1016 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1017 1057
1018 screen.flags &= ~Screen_WrapNext; 1058 screen.flags &= ~Screen_WrapNext;
1019} 1059}
1020 1060
1023 * Process Horizontal Tab 1063 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1064 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1065 * XTERM_SEQ: CTRL-I
1026 */ 1066 */
1027void 1067void
1028rxvt_term::scr_tab (int count) 1068rxvt_term::scr_tab (int count, bool ht)
1029{ 1069{
1030 int i, x; 1070 int i, x;
1031 1071
1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1033 want_refresh = 1; 1072 want_refresh = 1;
1034 i = x = screen.cur.col; 1073 i = x = screen.cur.col;
1035 1074
1036 if (count == 0) 1075 if (count == 0)
1037 return; 1076 return;
1038 else if (count > 0) 1077 else if (count > 0)
1039 { 1078 {
1079 int row = TermWin.saveLines + screen.cur.row;
1080 text_t *tp = screen.text[row];
1081 rend_t *rp = screen.rend[row];
1082 rend_t base_rend = rp[i];
1083 ht &= tp[i] == ' ';
1084
1040 for (; ++i < TermWin.ncol; ) 1085 for (; ++i < TermWin.ncol; )
1041 if (tabs[i]) 1086 if (tabs[i])
1042 { 1087 {
1043 x = i; 1088 x = i;
1044 if (!--count) 1089 if (!--count)
1045 break; 1090 break;
1046 } 1091 }
1092 else
1093 ht &= tp[i] == ' '
1094 && RS_SAME (rp[i], base_rend);
1047 1095
1048 if (count) 1096 if (count)
1049 x = TermWin.ncol - 1; 1097 x = TermWin.ncol - 1;
1098
1099 // store horizontal tab commands as characters inside the text
1100 // buffer so they can be selected and pasted.
1101 if (ht)
1102 {
1103 base_rend = SET_FONT (base_rend, 0);
1104
1105 if (screen.tlen[row] != -1) /* XXX: think about this */
1106 MAX_IT (screen.tlen[row], x);
1107
1108 i = screen.cur.col;
1109
1110 tp[i] = '\t';
1111 rp[i] = base_rend;
1112
1113 while (++i < x)
1114 {
1115 tp[i] = NOCHAR;
1116 rp[i] = base_rend;
1117 }
1118 }
1050 } 1119 }
1051 else /* if (count < 0) */ 1120 else /* if (count < 0) */
1052 { 1121 {
1053 for (; --i >= 0; ) 1122 for (; --i >= 0; )
1054 if (tabs[i]) 1123 if (tabs[i])
1071 * Process DEC Back Index 1140 * Process DEC Back Index
1072 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1073 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1074 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1075 */ 1144 */
1076#ifndef NO_FRILLS 1145#if ENABLE_FRILLS
1077void 1146void
1078rxvt_term::scr_backindex () 1147rxvt_term::scr_backindex ()
1079{ 1148{
1080 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1081 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1082 else 1151 else
1083 { 1152 {
1084 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1153 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1085 return; /* um, yeah? */ 1154 return; /* um, yeah? */
1155
1086 scr_insdel_chars (1, INSERT); 1156 scr_insdel_chars (1, INSERT);
1087 } 1157 }
1088} 1158}
1089#endif 1159#endif
1090/* ------------------------------------------------------------------------- */ 1160/* ------------------------------------------------------------------------- */
1092 * Process DEC Forward Index 1162 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1096 */ 1166 */
1097#ifndef NO_FRILLS 1167#if ENABLE_FRILLS
1098void 1168void
1099rxvt_term::scr_forwardindex () 1169rxvt_term::scr_forwardindex ()
1100{ 1170{
1101 int row; 1171 int row;
1102 1172
1103 if (screen.cur.col < TermWin.ncol - 1) 1173 if (screen.cur.col < TermWin.ncol - 1)
1104 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1105 else 1175 else
1106 { 1176 {
1107 row = screen.cur.row + TermWin.saveLines; 1177 row = screen.cur.row + TermWin.saveLines;
1178
1108 if (screen.tlen[row] == 0) 1179 if (screen.tlen[row] == 0)
1109 return; /* um, yeah? */ 1180 return; /* um, yeah? */
1110 else if (screen.tlen[row] == -1) 1181 else if (screen.tlen[row] == -1)
1111 screen.tlen[row] = TermWin.ncol; 1182 screen.tlen[row] = TermWin.ncol;
1183
1112 scr_gotorc (0, 0, R_RELATIVE); 1184 scr_gotorc (0, 0, R_RELATIVE);
1113 scr_insdel_chars (1, DELETE); 1185 scr_insdel_chars (1, DELETE);
1114 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1186 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1115 } 1187 }
1116} 1188}
1124rxvt_term::scr_gotorc (int row, int col, int relative) 1196rxvt_term::scr_gotorc (int row, int col, int relative)
1125{ 1197{
1126 want_refresh = 1; 1198 want_refresh = 1;
1127 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1128 1200
1129 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1130
1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1132 MAX_IT (screen.cur.col, 0); 1202 MAX_IT (screen.cur.col, 0);
1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1203 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1134 1204
1135 screen.flags &= ~Screen_WrapNext; 1205 screen.flags &= ~Screen_WrapNext;
1206
1136 if (relative & R_RELATIVE) 1207 if (relative & R_RELATIVE)
1137 { 1208 {
1138 if (row > 0) 1209 if (row > 0)
1139 { 1210 {
1140 if (screen.cur.row <= screen.bscroll 1211 if (screen.cur.row <= screen.bscroll
1160 MIN_IT (screen.cur.row, screen.bscroll); 1231 MIN_IT (screen.cur.row, screen.bscroll);
1161 } 1232 }
1162 else 1233 else
1163 screen.cur.row = row; 1234 screen.cur.row = row;
1164 } 1235 }
1236
1165 MAX_IT (screen.cur.row, 0); 1237 MAX_IT (screen.cur.row, 0);
1166 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1238 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1167
1168 while (screen.cur.col > 0
1169 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1170 screen.cur.col--;
1171} 1239}
1172 1240
1173/* ------------------------------------------------------------------------- */ 1241/* ------------------------------------------------------------------------- */
1174/* 1242/*
1175 * direction should be UP or DN 1243 * direction should be UP or DN
1176 */ 1244 */
1177void 1245void
1178rxvt_term::scr_index (enum page_dirn direction) 1246rxvt_term::scr_index (enum page_dirn direction)
1179{ 1247{
1180 int dirn; 1248 int dirn;
1181 1249
1182 want_refresh = 1; 1250 want_refresh = 1;
1251 ZERO_SCROLLBACK ();
1252
1183 dirn = ((direction == UP) ? 1 : -1); 1253 dirn = ((direction == UP) ? 1 : -1);
1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1185
1186 ZERO_SCROLLBACK ();
1187 1254
1188 screen.flags &= ~Screen_WrapNext; 1255 screen.flags &= ~Screen_WrapNext;
1256
1189 if ((screen.cur.row == screen.bscroll && direction == UP) 1257 if ((screen.cur.row == screen.bscroll && direction == UP)
1190 || (screen.cur.row == screen.tscroll && direction == DN)) 1258 || (screen.cur.row == screen.tscroll && direction == DN))
1191 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1259 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1192 else 1260 else
1193 screen.cur.row += dirn; 1261 screen.cur.row += dirn;
1262
1194 MAX_IT (screen.cur.row, 0); 1263 MAX_IT (screen.cur.row, 0);
1195 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1264 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1196 selection_check (0); 1265 selection_check (0);
1197} 1266}
1198 1267
1207rxvt_term::scr_erase_line (int mode) 1276rxvt_term::scr_erase_line (int mode)
1208{ 1277{
1209 unsigned int row, col, num; 1278 unsigned int row, col, num;
1210 1279
1211 want_refresh = 1; 1280 want_refresh = 1;
1212 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1213 ZERO_SCROLLBACK (); 1281 ZERO_SCROLLBACK ();
1214 1282
1215 selection_check (1); 1283 selection_check (1);
1216
1217 screen.flags &= ~Screen_WrapNext;
1218 1284
1219 row = TermWin.saveLines + screen.cur.row; 1285 row = TermWin.saveLines + screen.cur.row;
1220 switch (mode) 1286 switch (mode)
1221 { 1287 {
1222 case 0: /* erase to end of line */ 1288 case 0: /* erase to end of line */
1266 int32_t row, row_offset; 1332 int32_t row, row_offset;
1267 rend_t ren; 1333 rend_t ren;
1268 XGCValues gcvalue; 1334 XGCValues gcvalue;
1269 1335
1270 want_refresh = 1; 1336 want_refresh = 1;
1271 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1272 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1338
1273 row_offset = (int32_t)TermWin.saveLines; 1339 row_offset = (int32_t)TermWin.saveLines;
1274 1340
1275 switch (mode) 1341 switch (mode)
1276 { 1342 {
1277 case 0: /* erase to end of screen */ 1343 case 0: /* erase to end of screen */
1314 CLEAR_ROWS (row, num); 1380 CLEAR_ROWS (row, num);
1315 } 1381 }
1316 else 1382 else
1317 { 1383 {
1318 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1384 ren = (rstyle & (RS_fgMask | RS_bgMask));
1319 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1385 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1386 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1387 ERASE_ROWS (row, num);
1322 gcvalue.foreground = PixColors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1389 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1324 } 1390 }
1325 1391
1326 for (; num--; row++) 1392 for (; num--; row++)
1327 { 1393 {
1343{ 1409{
1344 int i, j, k; 1410 int i, j, k;
1345 rend_t *r1, fs; 1411 rend_t *r1, fs;
1346 1412
1347 want_refresh = 1; 1413 want_refresh = 1;
1414 ZERO_SCROLLBACK ();
1415
1348 num_scr_allow = 0; 1416 num_scr_allow = 0;
1349 ZERO_SCROLLBACK ();
1350 selection_check (3); 1417 selection_check (3);
1351 1418
1352 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1419 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1353 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1420 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1354 { 1421 {
1355 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1422 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1356 fill_text (screen.text[k], 'E', TermWin.ncol); 1423 fill_text (screen.text[k], 'E', TermWin.ncol);
1357 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1424 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1381 if (insdel == DELETE) 1448 if (insdel == DELETE)
1382 return; 1449 return;
1383 else if (insdel == INSERT) 1450 else if (insdel == INSERT)
1384 count = end; 1451 count = end;
1385 } 1452 }
1386 screen.flags &= ~Screen_WrapNext; 1453
1454 scr_do_wrap ();
1387 1455
1388 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1456 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1389} 1457}
1390 1458
1391/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1405 ZERO_SCROLLBACK (); 1473 ZERO_SCROLLBACK ();
1406 1474
1407 if (count <= 0) 1475 if (count <= 0)
1408 return; 1476 return;
1409 1477
1478 scr_do_wrap ();
1479
1410 selection_check (1); 1480 selection_check (1);
1411 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1481 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1412 1482
1413 row = screen.cur.row + TermWin.saveLines; 1483 row = screen.cur.row + TermWin.saveLines;
1414 screen.flags &= ~Screen_WrapNext;
1415 1484
1416 stp = screen.text[row]; 1485 stp = screen.text[row];
1417 srp = screen.rend[row]; 1486 srp = screen.rend[row];
1418 slp = & (screen.tlen[row]); 1487 slp = &screen.tlen[row];
1419 1488
1420 switch (insdel) 1489 switch (insdel)
1421 { 1490 {
1422 case INSERT: 1491 case INSERT:
1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1544rxvt_term::scr_autowrap (int mode) 1613rxvt_term::scr_autowrap (int mode)
1545{ 1614{
1546 if (mode) 1615 if (mode)
1547 screen.flags |= Screen_Autowrap; 1616 screen.flags |= Screen_Autowrap;
1548 else 1617 else
1549 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1618 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1550} 1619}
1551 1620
1552/* ------------------------------------------------------------------------- */ 1621/* ------------------------------------------------------------------------- */
1553/* 1622/*
1554 * Set/unset margin origin mode 1623 * Set/unset margin origin mode
1564{ 1633{
1565 if (mode) 1634 if (mode)
1566 screen.flags |= Screen_Relative; 1635 screen.flags |= Screen_Relative;
1567 else 1636 else
1568 screen.flags &= ~Screen_Relative; 1637 screen.flags &= ~Screen_Relative;
1638
1569 scr_gotorc (0, 0, 0); 1639 scr_gotorc (0, 0, 0);
1570} 1640}
1571 1641
1572/* ------------------------------------------------------------------------- */ 1642/* ------------------------------------------------------------------------- */
1573/* 1643/*
1593 */ 1663 */
1594void 1664void
1595rxvt_term::scr_set_tab (int mode) 1665rxvt_term::scr_set_tab (int mode)
1596{ 1666{
1597 if (mode < 0) 1667 if (mode < 0)
1598 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1668 memset (tabs, 0, TermWin.ncol * sizeof (char));
1599 else if (screen.cur.col < TermWin.ncol) 1669 else if (screen.cur.col < TermWin.ncol)
1600 tabs[screen.cur.col] = (mode ? 1 : 0); 1670 tabs[screen.cur.col] = (mode ? 1 : 0);
1601} 1671}
1602 1672
1603/* ------------------------------------------------------------------------- */ 1673/* ------------------------------------------------------------------------- */
1607 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1677 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1608 */ 1678 */
1609void 1679void
1610rxvt_term::scr_rvideo_mode (int mode) 1680rxvt_term::scr_rvideo_mode (int mode)
1611{ 1681{
1612 XGCValues gcvalue; 1682 XGCValues gcvalue;
1613 1683
1614 if (rvideo != mode) 1684 if (rvideo != mode)
1615 { 1685 {
1616 rvideo = mode; 1686 rvideo = mode;
1617 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1687 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1618#if defined(XPM_BACKGROUND) 1688#if XPM_BACKGROUND
1619 if (bgPixmap.pixmap == None) 1689 if (bgPixmap.pixmap == None)
1620#endif 1690#endif
1621#if defined(TRANSPARENT) 1691#if TRANSPARENT
1622 if (! (Options & Opt_transparent) || am_transparent == 0) 1692 if (! (options & Opt_transparent) || am_transparent == 0)
1623#endif 1693#endif
1624 XSetWindowBackground (display->display, TermWin.vt, 1694 XSetWindowBackground (display->display, TermWin.vt,
1625 PixColors[Color_bg]); 1695 pix_colors[Color_bg]);
1626 1696
1627 gcvalue.foreground = PixColors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1628 gcvalue.background = PixColors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1629 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1699 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1630 &gcvalue); 1700 &gcvalue);
1631 scr_clear (); 1701 scr_clear ();
1632 scr_touch (true); 1702 scr_touch (true);
1633 } 1703 }
1778 { 1848 {
1779 MIN_IT (rc[i].col, TermWin.ncol - 1); 1849 MIN_IT (rc[i].col, TermWin.ncol - 1);
1780 MIN_IT (rc[i].row, TermWin.nrow - 1); 1850 MIN_IT (rc[i].row, TermWin.nrow - 1);
1781 } 1851 }
1782 1852
1783 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1784
1785 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1853 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1786 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1854 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1787 1855
1788 if (refresh) 1856 if (refresh)
1789 scr_refresh (SLOW_REFRESH); 1857 scr_refresh (SLOW_REFRESH);
1806 */ 1874 */
1807int 1875int
1808rxvt_term::scr_move_to (int y, int len) 1876rxvt_term::scr_move_to (int y, int len)
1809{ 1877{
1810 long p = 0; 1878 long p = 0;
1811 uint16_t oldviewstart; 1879 unsigned int oldviewstart;
1812 1880
1813 oldviewstart = TermWin.view_start; 1881 oldviewstart = TermWin.view_start;
1882
1814 if (y < len) 1883 if (y < len)
1815 { 1884 {
1816 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1885 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1817 p -= (long) (TermWin.nrow - 1); 1886 p -= (long) (TermWin.nrow - 1);
1818 p = max (p, 0); 1887 p = max (p, 0);
1819 } 1888 }
1889
1820 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1890 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1821 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1822 1891
1823 return scr_changeview (oldviewstart); 1892 return scr_changeview (oldviewstart);
1824} 1893}
1825 1894
1826/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1830 */ 1899 */
1831int 1900int
1832rxvt_term::scr_page (enum page_dirn direction, int nlines) 1901rxvt_term::scr_page (enum page_dirn direction, int nlines)
1833{ 1902{
1834 int n; 1903 int n;
1835 uint16_t oldviewstart; 1904 unsigned int oldviewstart;
1836 1905
1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1838#ifdef DEBUG_STRICT 1906#ifdef DEBUG_STRICT
1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1840#endif 1908#endif
1841 oldviewstart = TermWin.view_start; 1909 oldviewstart = TermWin.view_start;
1842 if (direction == UP) 1910 if (direction == UP)
1851 } 1919 }
1852 return scr_changeview (oldviewstart); 1920 return scr_changeview (oldviewstart);
1853} 1921}
1854 1922
1855int 1923int
1856rxvt_term::scr_changeview (uint16_t oldviewstart) 1924rxvt_term::scr_changeview (unsigned int oldviewstart)
1857{ 1925{
1858 if (TermWin.view_start != oldviewstart) 1926 if (TermWin.view_start != oldviewstart)
1859 { 1927 {
1860 want_refresh = 1; 1928 want_refresh = 1;
1861 num_scr -= (TermWin.view_start - oldviewstart); 1929 num_scr -= (TermWin.view_start - oldviewstart);
1869rxvt_term::scr_bell () 1937rxvt_term::scr_bell ()
1870{ 1938{
1871#ifndef NO_BELL 1939#ifndef NO_BELL
1872# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1873# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1874 if (Options & Opt_mapAlert) 1942 if (options & Opt_mapAlert)
1875# endif 1943# endif
1876 XMapWindow (display->display, TermWin.parent[0]); 1944 XMapWindow (display->display, TermWin.parent[0]);
1877# endif 1945# endif
1878 if (Options & Opt_visualBell) 1946 if (options & Opt_visualBell)
1879 { 1947 {
1880 scr_rvideo_mode (!rvideo); /* refresh also done */ 1948 scr_rvideo_mode (!rvideo); /* refresh also done */
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 } 1950 }
1883 else 1951 else
1889/* ARGSUSED */ 1957/* ARGSUSED */
1890void 1958void
1891rxvt_term::scr_printscreen (int fullhist) 1959rxvt_term::scr_printscreen (int fullhist)
1892{ 1960{
1893#ifdef PRINTPIPE 1961#ifdef PRINTPIPE
1894 int i, r1, nrows, row_offset; 1962 int i, r1, nrows, row_offset;
1895 text_t *t; 1963 FILE *fd;
1896 FILE *fd;
1897 1964
1898 if ((fd = popen_printer ()) == NULL) 1965 if ((fd = popen_printer ()) == NULL)
1899 return; 1966 return;
1967
1900 nrows = TermWin.nrow; 1968 nrows = TermWin.nrow;
1901 row_offset = TermWin.saveLines; 1969 row_offset = TermWin.saveLines;
1970
1902 if (!fullhist) 1971 if (!fullhist)
1903 row_offset -= TermWin.view_start; 1972 row_offset -= TermWin.view_start;
1904 else 1973 else
1905 { 1974 {
1906 nrows += TermWin.nscrolled; 1975 nrows += TermWin.nscrolled;
1907 row_offset -= TermWin.nscrolled; 1976 row_offset -= TermWin.nscrolled;
1908 } 1977 }
1909 1978
1979 wctomb (0, 0);
1980
1910 for (r1 = 0; r1 < nrows; r1++) 1981 for (r1 = 0; r1 < nrows; r1++)
1911 { 1982 {
1912 t = screen.text[r1 + row_offset]; 1983 text_t *tp = screen.text[r1 + row_offset];
1913 for (i = TermWin.ncol - 1; i >= 0; i--) 1984 int len = screen.tlen[r1 + row_offset];
1914 if (!isspace (t[i])) 1985
1915 break; 1986 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1916 fprintf (fd, "%.*s\n", (i + 1), t); 1987 {
1988 char mb[MB_LEN_MAX];
1989 text_t t = *tp++;
1990 if (t == NOCHAR)
1991 continue;
1992
1993 len = wctomb (mb, t);
1994
1995 if (len <= 0)
1996 {
1997 mb[0] = ' ';
1998 len = 1;
1999 }
2000
2001 fwrite (mb, 1, len, fd);
2002 }
2003
2004 fputc ('\n', fd);
1917 } 2005 }
2006
1918 pclose_printer (fd); 2007 pclose_printer (fd);
1919#endif 2008#endif
1920} 2009}
1921 2010
1922/* ------------------------------------------------------------------------- */ 2011/* ------------------------------------------------------------------------- */
1937 2026
1938void 2027void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 2028rxvt_term::scr_refresh (unsigned char refresh_type)
1940{ 2029{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 2030 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 rvid, /* reverse video this position */
1943 showcursor; /* show the cursor */ 2031 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1946 int i, /* tmp */ 2034 int i, /* tmp */
1947 row_offset; /* basic offset in screen structure */ 2035 row_offset; /* basic offset in screen structure */
1948#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1949 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
1950#endif 2038#endif
1951 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2039 rend_t *crp; // cursor rendition pointer
1952 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1953 2040
1954 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2041 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1955 return; 2042 return;
1956 2043
1957 /* 2044 /*
1958 * A: set up vars 2045 * A: set up vars
1959 */ 2046 */
1960 must_clear = 0; 2047 must_clear = 0;
1961
1962 refresh_count = 0; 2048 refresh_count = 0;
1963 2049
1964 row_offset = TermWin.saveLines - TermWin.view_start; 2050 row_offset = TermWin.saveLines - TermWin.view_start;
1965 2051
1966#ifdef XPM_BACKGROUND 2052#if XPM_BACKGROUND
1967 must_clear |= (bgPixmap.pixmap != None); 2053 must_clear |= (bgPixmap.pixmap != None);
1968#endif 2054#endif
1969#ifdef TRANSPARENT 2055#if TRANSPARENT
1970 must_clear |= ((Options & Opt_transparent) && am_transparent); 2056 must_clear |= ((options & Opt_transparent) && am_transparent);
1971#endif 2057#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2059
1974 /* 2060 /*
1975 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
1990 showcursor = 0; 2076 showcursor = 0;
1991#endif 2077#endif
1992 2078
1993 if (showcursor) 2079 if (showcursor)
1994 { 2080 {
2081 int col = screen.cur.col;
2082
2083 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2084 col--;
2085
1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2086 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1996 2087
1997 if (showcursor && TermWin.focus) 2088 if (showcursor && TermWin.focus)
1998 { 2089 {
1999 *srp ^= RS_RVid; 2090 *crp ^= RS_RVid;
2000#ifndef NO_CURSORCOLOR 2091#ifndef NO_CURSORCOLOR
2001 cc1 = *srp & (RS_fgMask | RS_bgMask); 2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
2002 if (ISSET_PIXCOLOR (Color_cursor)) 2093 if (ISSET_PIXCOLOR (Color_cursor))
2003 ccol1 = Color_cursor; 2094 ccol1 = Color_cursor;
2004 else 2095 else
2005#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2006 ccol1 = GET_FGCOLOR (rstyle); 2097 ccol1 = GET_FGCOLOR (rstyle);
2013#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014 ccol2 = GET_BGCOLOR (rstyle); 2105 ccol2 = GET_BGCOLOR (rstyle);
2015#else 2106#else
2016 ccol2 = Color_bg; 2107 ccol2 = Color_bg;
2017#endif 2108#endif
2018 *srp = SET_FGCOLOR (*srp, ccol1); 2109 *crp = SET_FGCOLOR (*crp, ccol1);
2019 *srp = SET_BGCOLOR (*srp, ccol2); 2110 *crp = SET_BGCOLOR (*crp, ccol2);
2020#endif 2111#endif
2021 } 2112 }
2022 } 2113 }
2023 2114
2024 /* make sure no outline cursor is left around */ 2115 /* make sure no outline cursor is left around */
2051 oldcursor.col = screen.cur.col; 2142 oldcursor.col = screen.cur.col;
2052 } 2143 }
2053 } 2144 }
2054 } 2145 }
2055 2146
2147#if ENABLE_OVERLAY
2148 scr_swap_overlay ();
2149#endif
2150
2151 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2152 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2153
2056#ifndef NO_SLOW_LINK_SUPPORT 2154#ifndef NO_SLOW_LINK_SUPPORT
2057 /* 2155 /*
2058 * D: CopyArea pass - very useful for slower links 2156 * D: CopyArea pass - very useful for slower links
2059 * This has been deliberately kept simple. 2157 * This has been deliberately kept simple.
2060 */ 2158 */
2063 && refresh_type == FAST_REFRESH && num_scr_allow && i 2161 && refresh_type == FAST_REFRESH && num_scr_allow && i
2064 && abs (i) < TermWin.nrow && !must_clear) 2162 && abs (i) < TermWin.nrow && !must_clear)
2065 { 2163 {
2066 int16_t nits; 2164 int16_t nits;
2067 int j; 2165 int j;
2068 rend_t *drp2;
2069 text_t *dtp2;
2070 int len, wlen; 2166 int len, wlen;
2071 2167
2072 j = TermWin.nrow; 2168 j = TermWin.nrow;
2073 wlen = len = -1; 2169 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2170 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2171 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2172 {
2077 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2173 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2078 { 2174 {
2079 stp = screen.text[row + row_offset]; 2175 text_t *stp = screen.text[row + row_offset];
2080 srp = screen.rend[row + row_offset]; 2176 rend_t *srp = screen.rend[row + row_offset];
2081 dtp = drawn_text[row]; 2177 text_t *dtp = drawn_text[row];
2082 dtp2 = drawn_text[row + i]; 2178 text_t *dtp2 = drawn_text[row + i];
2083 drp = drawn_rend[row]; 2179 rend_t *drp = drawn_rend[row];
2084 drp2 = drawn_rend[row + i]; 2180 rend_t *drp2 = drawn_rend[row + i];
2085 2181
2086 for (nits = 0, col = TermWin.ncol; col--; ) 2182 for (nits = 0, col = TermWin.ncol; col--; )
2087 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2183 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2088 nits--; 2184 nits--;
2089 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2185 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2109 { 2205 {
2110 /* also comes here at end if needed because of >= above */ 2206 /* also comes here at end if needed because of >= above */
2111 if (wlen < len) 2207 if (wlen < len)
2112 SWAP_IT (wlen, len, int); 2208 SWAP_IT (wlen, len, int);
2113 2209
2114 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2115 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2210 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2116 TermWin.gc, 0, Row2Pixel (len + i), 2211 TermWin.gc, 0, Row2Pixel (len + i),
2117 (unsigned int)TermWin_TotalWidth (), 2212 (unsigned int)TermWin_TotalWidth (),
2118 (unsigned int)Height2Pixel (wlen - len + 1), 2213 (unsigned int)Height2Pixel (wlen - len + 1),
2119 0, Row2Pixel (len)); 2214 0, Row2Pixel (len));
2126 /* 2221 /*
2127 * E: main pass across every character 2222 * E: main pass across every character
2128 */ 2223 */
2129 for (row = 0; row < TermWin.nrow; row++) 2224 for (row = 0; row < TermWin.nrow; row++)
2130 { 2225 {
2131 stp = screen.text[row + row_offset]; 2226 text_t *stp = screen.text[row + row_offset];
2132 srp = screen.rend[row + row_offset]; 2227 rend_t *srp = screen.rend[row + row_offset];
2133 dtp = drawn_text[row]; 2228 text_t *dtp = drawn_text[row];
2134 drp = drawn_rend[row]; 2229 rend_t *drp = drawn_rend[row];
2135 2230
2136 /* 2231 /*
2137 * E2: OK, now the real pass 2232 * E2: OK, now the real pass
2138 */ 2233 */
2139 int ypixel = (int)Row2Pixel (row); 2234 int ypixel = (int)Row2Pixel (row);
2140 2235
2141 for (col = 0; col < TermWin.ncol; col++) 2236 for (col = 0; col < TermWin.ncol; col++)
2142 { 2237 {
2143 /* compare new text with old - if exactly the same then continue */ 2238 /* compare new text with old - if exactly the same then continue */
2144 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2239 if (stp[col] == dtp[col] /* Must match characters to skip. */
2145 && (srp[col] == drp[col] /* Either rendition the same or */ 2240 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2146 || (stp[col] == ' ' /* space w/ no background change */ 2241 || (stp[col] == ' ' /* space w/ no background change */
2147 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2148 continue; 2243 continue;
2149 2244
2150 // redraw one or more characters 2245 // redraw one or more characters
2160 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2161 drp[col] = rend; 2256 drp[col] = rend;
2162 2257
2163 int xpixel = Col2Pixel (col); 2258 int xpixel = Col2Pixel (col);
2164 2259
2165 // this loop looks very messy, it can probably be optimized
2166 // and cleaned a bit by you?
2167 for (i = 0; ++col < TermWin.ncol; ) 2260 for (i = 0; ++col < TermWin.ncol; )
2168 { 2261 {
2169 if (stp[col] == NOCHAR) 2262 if (stp[col] == NOCHAR)
2170 { 2263 {
2171 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2172 drp[col] = rend; 2265 drp[col] = rend;
2173 count++; 2266 count++;
2174
2175 if (i) // only possible skip if char unchanged
2176 i++; 2267 i++;
2177 2268
2178 continue; 2269 continue;
2179 } 2270 }
2180 2271
2181 if (rend != srp[col]) 2272 if (!RS_SAME (rend, srp[col]))
2182 break; 2273 break;
2183 2274
2184 count++; 2275 count++;
2185 2276
2186 if (stp[col] != dtp[col] 2277 if (stp[col] != dtp[col]
2187 || srp[col] != drp[col]) 2278 || !RS_SAME (srp[col], drp[col]))
2188 { 2279 {
2189 if (must_clear && (i++ > (count / 2))) 2280 if (must_clear && (i++ > count / 2))
2190 break; 2281 break;
2191 2282
2192 dtp[col] = stp[col]; 2283 dtp[col] = stp[col];
2193 drp[col] = rend; 2284 drp[col] = rend;
2194 i = 0; 2285 i = 0;
2195 } 2286 }
2196 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2287 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2197 break; 2288 break;
2198 } 2289 }
2199 2290
2200 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2201 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2293
2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2295 while (i && text[count] == NOCHAR)
2296 count++, i--;
2297
2298#if ENABLE_STYLES
2299 // force redraw after "careful" characters to avoid pixel droppings
2300 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2301 drp[col + 1] = ~srp[col + 1];
2302
2303 // include previous careful character(s) if possible, looks nicer (best effort...)
2304 while (text > stp
2305 && srp[text - stp - 1] & RS_Careful
2306 && RS_SAME (rend, srp[text - stp - 1]))
2307 text--, count++, xpixel -= TermWin.fwidth;
2308#endif
2202 2309
2203 /* 2310 /*
2204 * Determine the attributes for the string 2311 * Determine the attributes for the string
2205 */ 2312 */
2206 int fid = GET_FONT (rend);
2207 int fore = GET_FGCOLOR (rend); // desired foreground 2313 int fore = GET_FGCOLOR (rend); // desired foreground
2208 int back = GET_BGCOLOR (rend); // desired background 2314 int back = GET_BGCOLOR (rend); // desired background
2209 2315
2210 rend = GET_ATTR (rend); 2316 // only do special processing if ana attributes are set, which is rare
2211 2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2212 rvid = !!(rend & RS_RVid); 2318 {
2319 bool invert = rend & RS_RVid;
2213 2320
2214#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2322 if (rend & RS_Bold
2323 && fore == Color_fg)
2216 { 2324 {
2217 if (ISSET_PIXCOLOR (Color_BD)) 2325 if (ISSET_PIXCOLOR (Color_BD))
2218 fore = Color_BD; 2326 fore = Color_BD;
2327# if !ENABLE_STYLES
2219 else 2328 else
2220 rvid = !rvid; 2329 invert = !invert;
2330# endif
2331 }
2332
2333 if (rend & RS_Italic
2334 && fore == Color_fg)
2335 {
2336 if (ISSET_PIXCOLOR (Color_IT))
2337 fore = Color_IT;
2338# if !ENABLE_STYLES
2339 else
2340 invert = !invert;
2341# endif
2342 }
2343
2344 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2345 fore = Color_UL;
2346#endif
2347
2348 if (invert)
2349 {
2350 SWAP_IT (fore, back, int);
2351
2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2353 if (ISSET_PIXCOLOR (Color_RV))
2354 back = Color_RV;
2355#endif
2356 }
2357
2358#ifdef TEXT_BLINK
2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2360 {
2361 if (!text_blink_ev.active)
2362 {
2363 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2364 hidden_text = 0;
2365 }
2366 else if (hidden_text)
2367 fore = back;
2368 }
2369#endif
2221 } 2370 }
2222
2223 if (rend & RS_Uline)
2224 if (ISSET_PIXCOLOR (Color_UL))
2225 fore = Color_UL;
2226#endif
2227
2228 if (rvid)
2229 {
2230 SWAP_IT (fore, back, int);
2231
2232#ifndef NO_BOLD_UNDERLINE_REVERSE
2233 if (ISSET_PIXCOLOR (Color_RV)
2234# ifndef NO_CURSORCOLOR
2235 && !ISSET_PIXCOLOR (Color_cursor)
2236# endif
2237 )
2238 back = Color_RV;
2239#endif
2240 }
2241
2242#ifdef TEXT_BLINK
2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2244 {
2245 if (!text_blink_ev.active)
2246 {
2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2248 hidden_text = 0;
2249 }
2250 else if (hidden_text)
2251 fore = back;
2252 }
2253#endif
2254 2371
2255 /* 2372 /*
2256 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2257 */ 2374 */
2258 rxvt_font *font = (*TermWin.fontset)[fid]; 2375 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2259 2376
2260 if (back == fore) 2377 if (back == fore)
2261 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2378 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2262 TermWin.fwidth * count, TermWin.fheight, 2379 TermWin.fwidth * count, TermWin.fheight,
2263 back); 2380 back);
2285 xpixel, ypixel + font->ascent + 1, 2402 xpixel, ypixel + font->ascent + 1,
2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2287 } /* for (col....) */ 2404 } /* for (col....) */
2288 } /* for (row....) */ 2405 } /* for (row....) */
2289 2406
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410
2290 /* 2411 /*
2291 * G: cleanup cursor and display outline cursor if necessary 2412 * G: cleanup cursor and display outline cursor if necessary
2292 */ 2413 */
2293 if (showcursor) 2414 if (showcursor)
2294 { 2415 {
2295 if (TermWin.focus) 2416 if (TermWin.focus)
2296 { 2417 {
2297 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2298 [screen.cur.col]);
2299 *srp ^= RS_RVid; 2418 *crp ^= RS_RVid;
2300#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2301 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2420 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2302#endif 2421#endif
2303 } 2422 }
2304 else if (oldcursor.row >= 0) 2423 else if (oldcursor.row >= 0)
2305 { 2424 {
2306#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2307 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2308 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2427 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2309#endif 2428#endif
2310 int cursorwidth = 1; 2429 int cursorwidth = 1;
2311 while (oldcursor.col + cursorwidth < TermWin.ncol 2430 while (oldcursor.col + cursorwidth < TermWin.ncol
2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2431 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2313 cursorwidth++; 2432 cursorwidth++;
2338{ 2457{
2339 if (!rp || !tp) 2458 if (!rp || !tp)
2340 return; 2459 return;
2341 2460
2342 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2461 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2343 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2462 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2344} 2463}
2345 2464
2346void 2465void
2347rxvt_term::scr_remap_chars () 2466rxvt_term::scr_remap_chars ()
2348{ 2467{
2354 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2473 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2355 scr_remap_chars (swap.text[i], swap.rend[i]); 2474 scr_remap_chars (swap.text[i], swap.rend[i]);
2356 } 2475 }
2357} 2476}
2358 2477
2478void
2479rxvt_term::scr_recolour ()
2480{
2481 if (1
2482#if TRANSPARENT
2483 && !am_transparent
2484#endif
2485#if XPM_BACKGROUND
2486 && !bgPixmap.pixmap
2487#endif
2488 )
2489 {
2490 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2491 XClearWindow (display->display, TermWin.parent[0]);
2492 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2493#if HAVE_SCROLLBARS
2494 if (scrollBar.win)
2495 {
2496 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2497 scrollBar.setIdle ();
2498 scrollbar_show (0);
2499 }
2500#endif
2501 }
2502
2503 scr_clear ();
2504 scr_touch (true);
2505 want_refresh = 1;
2506}
2507
2359/* ------------------------------------------------------------------------- */ 2508/* ------------------------------------------------------------------------- */
2360void 2509void
2361rxvt_term::scr_clear (bool really) 2510rxvt_term::scr_clear (bool really)
2362{ 2511{
2363 if (!TermWin.mapped) 2512 if (!TermWin.mapped)
2364 return; 2513 return;
2365 2514
2366 num_scr_allow = 0; 2515 num_scr_allow = 0;
2367 want_refresh = 1; 2516 want_refresh = 1;
2368 2517
2369#ifdef TRANSPARENT 2518#if TRANSPARENT
2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2519 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2371 { 2520 {
2372 int i; 2521 int i;
2373 2522
2374 if (! (Options & Opt_transparent_all)) 2523 if (!(options & Opt_transparent_all))
2375 i = 0; 2524 i = 0;
2376 else 2525 else
2377 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2526 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2378 2527
2379 while (i--) 2528 while (i--)
2456 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2605 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2457 */ 2606 */
2458void 2607void
2459rxvt_term::selection_check (int check_more) 2608rxvt_term::selection_check (int check_more)
2460{ 2609{
2461 row_col_t pos; 2610 row_col_t pos;
2462 2611
2463 if (!selection.op) 2612 if (!selection.op)
2464 return; 2613 return;
2465 2614
2466 pos.row = pos.col = 0; 2615 pos.row = pos.col = 0;
2493rxvt_term::paste (const unsigned char *data, unsigned int len) 2642rxvt_term::paste (const unsigned char *data, unsigned int len)
2494{ 2643{
2495 unsigned int i, j, n; 2644 unsigned int i, j, n;
2496 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2645 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2497 2646
2498#if 0
2499 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2500 ZERO_SCROLLBACK (r);
2501#endif
2502
2503 /* convert normal newline chars into common keyboard Return key sequence */ 2647 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (i = 0; i < len; i += PROP_SIZE) 2648 for (i = 0; i < len; i += PROP_SIZE)
2505 { 2649 {
2506 n = min (len - i, PROP_SIZE); 2650 n = min (len - i, PROP_SIZE);
2507 MEMCPY (ds, data + i, n); 2651 memcpy (ds, data + i, n);
2508 2652
2509 for (j = 0; j < n; j++) 2653 for (j = 0; j < n; j++)
2510 if (ds[j] == C0_LF) 2654 if (ds[j] == C0_LF)
2511 ds[j] = C0_CR; 2655 ds[j] = C0_CR;
2512 2656
2525rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2526{ 2670{
2527 long nread = 0; 2671 long nread = 0;
2528 unsigned long bytes_after; 2672 unsigned long bytes_after;
2529 XTextProperty ct; 2673 XTextProperty ct;
2530
2531 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2532 2674
2533 if (prop == None) /* check for failed XConvertSelection */ 2675 if (prop == None) /* check for failed XConvertSelection */
2534 { 2676 {
2535 if ((selection_type & Sel_CompoundText)) 2677 if ((selection_type & Sel_CompoundText))
2536 { 2678 {
2563 &ct.nitems, &bytes_after, 2705 &ct.nitems, &bytes_after,
2564 &ct.value) != Success) 2706 &ct.value) != Success)
2565 break; 2707 break;
2566 2708
2567 if (ct.encoding == 0) 2709 if (ct.encoding == 0)
2568 {
2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2570 break; 2710 break;
2571 } 2711
2572 else if (ct.encoding == xa[XA_INCR]) 2712 if (ct.encoding == xa[XA_INCR])
2573 { 2713 {
2574 // INCR selection, start handshake 2714 // INCR selection, start handshake
2575 XDeleteProperty (display->display, win, prop); 2715 XDeleteProperty (display->display, win, prop);
2576 selection_wait = Sel_incr; 2716 selection_wait = Sel_incr;
2577 incr_ev.start (NOW + 10); 2717 incr_ev.start (NOW + 10);
2578 break; 2718 break;
2579 } 2719 }
2580 2720
2581 if (ct.value == NULL) 2721 if (ct.value == NULL)
2582 {
2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2584 continue; 2722 continue;
2585 }
2586 2723
2587 if (ct.nitems == 0) 2724 if (ct.nitems == 0)
2588 { 2725 {
2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2590
2591 if (selection_wait == Sel_normal && nread == 0 2726 if (selection_wait == Sel_normal && nread == 0
2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2593 { 2728 {
2594 /* 2729 /*
2595 * pass through again trying CUT_BUFFER0 if we've come from 2730 * pass through again trying CUT_BUFFER0 if we've come from
2596 * XConvertSelection () but nothing was presented 2731 * XConvertSelection () but nothing was presented
2597 */ 2732 */
2598 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2599 selection_paste (display->root, XA_CUT_BUFFER0, False); 2733 selection_paste (display->root, XA_CUT_BUFFER0, False);
2600 } 2734 }
2601 2735
2602 nread = -1; /* discount any previous stuff */ 2736 nread = -1; /* discount any previous stuff */
2603 break; 2737 break;
2608 char **cl; 2742 char **cl;
2609 int cr; 2743 int cr;
2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2611 { 2745 {
2612 for (int i = 0; i < cr; i++) 2746 for (int i = 0; i < cr; i++)
2613 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2747 paste ((unsigned char *)cl[i], strlen (cl[i]));
2614 2748
2615 XFreeStringList (cl); 2749 XFreeStringList (cl);
2616 } 2750 }
2617 else 2751 else
2618 paste (ct.value, ct.nitems); 2752 paste (ct.value, ct.nitems);
2627 XFree (ct.value); 2761 XFree (ct.value);
2628 2762
2629 if (selection_wait == Sel_normal) 2763 if (selection_wait == Sel_normal)
2630 selection_wait = Sel_none; 2764 selection_wait = Sel_none;
2631 2765
2632 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2633 return (int)nread; 2766 return (int)nread;
2634} 2767}
2635 2768
2636void 2769void
2637rxvt_term::incr_cb (time_watcher &w) 2770rxvt_term::incr_cb (time_watcher &w)
2670 * EXT: button 2 release 2803 * EXT: button 2 release
2671 */ 2804 */
2672void 2805void
2673rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm, int x, int y)
2674{ 2807{
2675 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2676
2677 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2808 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2678 return; /* outside window */ 2809 return; /* outside window */
2679 2810
2680 if (selection.text) 2811 if (selection.text)
2681 { /* internal selection */ 2812 { /* internal selection */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2683 char *str = rxvt_wcstombs (selection.text, selection.len); 2813 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str)); 2814 paste ((unsigned char *)str, strlen (str));
2685 free (str); 2815 free (str);
2686 return; 2816 return;
2687 } 2817 }
2706 2836
2707 } 2837 }
2708 } 2838 }
2709 2839
2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2711 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2712 selection_paste (display->root, XA_CUT_BUFFER0, False); 2841 selection_paste (display->root, XA_CUT_BUFFER0, False);
2713} 2842}
2714 2843
2715int 2844int
2716rxvt_term::selection_request_other (Atom target, int selnum) 2845rxvt_term::selection_request_other (Atom target, int selnum)
2729 else 2858 else
2730 sel = xa[XA_CLIPBOARD]; 2859 sel = xa[XA_CLIPBOARD];
2731 2860
2732 if (XGetSelectionOwner (display->display, sel) != None) 2861 if (XGetSelectionOwner (display->display, sel) != None)
2733 { 2862 {
2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2863 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2736 TermWin.vt, selection_request_time); 2864 TermWin.vt, selection_request_time);
2737 return 1; 2865 return 1;
2738 } 2866 }
2739 2867
2746 * EXT: SelectionClear 2874 * EXT: SelectionClear
2747 */ 2875 */
2748void 2876void
2749rxvt_term::selection_clear () 2877rxvt_term::selection_clear ()
2750{ 2878{
2751 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2752
2753 want_refresh = 1; 2879 want_refresh = 1;
2754 free (selection.text); 2880 free (selection.text);
2755 selection.text = NULL; 2881 selection.text = NULL;
2756 selection.len = 0; 2882 selection.len = 0;
2757 CLEAR_SELECTION (); 2883 CLEAR_SELECTION ();
2770{ 2896{
2771 int i, col, end_col, row, end_row; 2897 int i, col, end_col, row, end_row;
2772 wchar_t *new_selection_text; 2898 wchar_t *new_selection_text;
2773 text_t *t; 2899 text_t *t;
2774 2900
2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2776 switch (selection.op) 2901 switch (selection.op)
2777 { 2902 {
2778 case SELECTION_CONT: 2903 case SELECTION_CONT:
2779 break; 2904 break;
2780 case SELECTION_INIT: 2905 case SELECTION_INIT:
2802 int ofs = 0; 2927 int ofs = 0;
2803 int extra = 0; 2928 int extra = 0;
2804 2929
2805 for (; row <= end_row; row++, col = 0) 2930 for (; row <= end_row; row++, col = 0)
2806 { 2931 {
2807 t = &(screen.text[row][col]); 2932 t = &screen.text[row][col];
2808 2933
2809 end_col = screen.tlen[row]; 2934 end_col = screen.tlen[row];
2810 2935
2811 if (end_col == -1) 2936 if (end_col == -1)
2812 end_col = TermWin.ncol; 2937 end_col = TermWin.ncol;
2876 XFree (ct.value); 3001 XFree (ct.value);
2877 } 3002 }
2878#endif 3003#endif
2879 3004
2880 selection_time = tm; 3005 selection_time = tm;
2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2882} 3006}
2883 3007
2884/* ------------------------------------------------------------------------- */ 3008/* ------------------------------------------------------------------------- */
2885/* 3009/*
2886 * Mark or select text based upon number of clicks: 1, 2, or 3 3010 * Mark or select text based upon number of clicks: 1, 2, or 3
2887 * EXT: button 1 press 3011 * EXT: button 1 press
2888 */ 3012 */
2889void 3013void
2890rxvt_term::selection_click (int clicks, int x, int y) 3014rxvt_term::selection_click (int clicks, int x, int y)
2891{ 3015{
2892 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2893
2894 clicks = ((clicks - 1) % 3) + 1; 3016 clicks = ((clicks - 1) % 3) + 1;
2895 selection.clicks = clicks; /* save clicks so extend will work */ 3017 selection.clicks = clicks; /* save clicks so extend will work */
2896 3018
2897 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3019 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2898 3020
2940 * We now only find out the boundary in one direction 3062 * We now only find out the boundary in one direction
2941 */ 3063 */
2942 3064
2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3065/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2944#define DELIMIT_TEXT(x) \ 3066#define DELIMIT_TEXT(x) \
2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3067 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2946#define DELIMIT_REND(x) 1 3068#define DELIMIT_REND(x) 1
2947 3069
2948void 3070void
2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3071rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2950{ 3072{
2968 3090
2969 row = mark->row + TermWin.saveLines; 3091 row = mark->row + TermWin.saveLines;
2970 col = mark->col; 3092 col = mark->col;
2971 MAX_IT (col, 0); 3093 MAX_IT (col, 0);
2972 /* find the edge of a word */ 3094 /* find the edge of a word */
2973 stp = & (screen.text[row][col]); 3095 stp = &screen.text[row][col];
2974 w1 = DELIMIT_TEXT (*stp); 3096 w1 = DELIMIT_TEXT (*stp);
2975 3097
2976 srp = (&screen.rend[row][col]); 3098 srp = &screen.rend[row][col];
2977 w2 = DELIMIT_REND (*srp); 3099 w2 = DELIMIT_REND (*srp);
2978 3100
2979 for (;;) 3101 for (;;)
2980 { 3102 {
2981 for (; col != bound.col; col += dirnadd) 3103 for (; col != bound.col; col += dirnadd)
3015 } 3137 }
3016 break; 3138 break;
3017 } 3139 }
3018 3140
3019Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
3020 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
3021
3022 if (dirn == DN) 3142 if (dirn == DN)
3023 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3024 3144
3025 /* Poke the values back in */ 3145 /* Poke the values back in */
3026 ret->row = row - TermWin.saveLines; 3146 ret->row = row - TermWin.saveLines;
3060 /* select nothing */ 3180 /* select nothing */
3061 selection.beg.row = selection.end.row = 0; 3181 selection.beg.row = selection.end.row = 0;
3062 selection.beg.col = selection.end.col = 0; 3182 selection.beg.col = selection.end.col = 0;
3063 selection.clicks = 4; 3183 selection.clicks = 4;
3064 want_refresh = 1; 3184 want_refresh = 1;
3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3066 return; 3185 return;
3067 } 3186 }
3068 3187
3069 if (selection.clicks == 4) 3188 if (selection.clicks == 4)
3070 selection.clicks = 1; 3189 selection.clicks = 1;
3085 int end_col; 3204 int end_col;
3086 row_col_t pos; 3205 row_col_t pos;
3087 enum { 3206 enum {
3088 LEFT, RIGHT 3207 LEFT, RIGHT
3089 } closeto = RIGHT; 3208 } closeto = RIGHT;
3090
3091 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3092 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3093 3209
3094 want_refresh = 1; 3210 want_refresh = 1;
3095 switch (selection.op) 3211 switch (selection.op)
3096 { 3212 {
3097 case SELECTION_INIT: 3213 case SELECTION_INIT:
3119 && selection.beg.row == selection.end.row 3235 && selection.beg.row == selection.end.row
3120 && selection.beg.row != selection.mark.row) 3236 && selection.beg.row != selection.mark.row)
3121 { 3237 {
3122 selection.beg.col = selection.end.col = selection.mark.col; 3238 selection.beg.col = selection.end.col = selection.mark.col;
3123 selection.beg.row = selection.end.row = selection.mark.row; 3239 selection.beg.row = selection.end.row = selection.mark.row;
3124 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3125 } 3240 }
3126 3241
3127 pos.col = col; 3242 pos.col = col;
3128 pos.row = row; 3243 pos.row = row;
3129 3244
3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3338 selection_delimit_word (DN, & (selection.end), & (selection.end));
3224 } 3339 }
3225 else if (selection.clicks == 3) 3340 else if (selection.clicks == 3)
3226 { 3341 {
3227#ifndef NO_FRILLS 3342#if ENABLE_FRILLS
3228 if ((Options & Opt_tripleclickwords)) 3343 if ((options & Opt_tripleclickwords))
3229 { 3344 {
3230 int end_row; 3345 int end_row;
3231 3346
3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3258 if (button3 && buttonpress) 3373 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3374 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3375 if (closeto == LEFT)
3261 { 3376 {
3262 selection.mark.row = selection.end.row; 3377 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3378 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3379 }
3266 else 3380 else
3267 { 3381 {
3268 selection.mark.row = selection.beg.row; 3382 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3383 selection.mark.col = selection.beg.col;
3270 } 3384 }
3271 } 3385 }
3272 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3273} 3386}
3274 3387
3275#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3276void 3389void
3277rxvt_term::selection_remove_trailing_spaces () 3390rxvt_term::selection_remove_trailing_spaces ()
3278{ 3391{
3279 int32_t end_col, end_row; 3392 int32_t end_col, end_row;
3280 text_t *stp; 3393 text_t *stp;
3465} 3578}
3466 3579
3467/* ------------------------------------------------------------------------- */ 3580/* ------------------------------------------------------------------------- */
3468#ifdef USE_XIM 3581#ifdef USE_XIM
3469void 3582void
3470rxvt_term::im_set_position (XPoint *pos) 3583rxvt_term::im_set_position (XPoint &pos)
3471{ 3584{
3472 XWindowAttributes xwa; 3585 XWindowAttributes xwa;
3473 3586
3474 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3587 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3588
3475 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3589 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3590 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3477} 3591}
3478
3479#endif 3592#endif
3593
3594#if ENABLE_OVERLAY
3595void
3596rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3597{
3598 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3599 return;
3600
3601 want_refresh = 1;
3602
3603 scr_overlay_off ();
3604
3605 if (x < 0) x = TermWin.ncol - w;
3606 if (y < 0) y = TermWin.nrow - h;
3607
3608 // make space for border
3609 w += 2; MIN_IT (w, TermWin.ncol);
3610 h += 2; MIN_IT (h, TermWin.nrow);
3611
3612 x -= 1; MAX_IT (x, 0);
3613 y -= 1; MAX_IT (y, 0);
3614
3615 MIN_IT (x, TermWin.ncol - w);
3616 MIN_IT (y, TermWin.nrow - h);
3617
3618 ov_x = x; ov_y = y;
3619 ov_w = w; ov_h = h;
3620
3621 ov_text = new text_t *[h];
3622 ov_rend = new rend_t *[h];
3623
3624 for (y = 0; y < h; y++)
3625 {
3626 text_t *tp = ov_text[y] = new text_t[w];
3627 rend_t *rp = ov_rend[y] = new rend_t[w];
3628
3629 text_t t0, t1, t2;
3630 rend_t r = OVERLAY_RSTYLE;
3631
3632 if (y == 0)
3633 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3634 else if (y < h - 1)
3635 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3636 else
3637 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3638
3639 *tp++ = t0;
3640 *rp++ = r;
3641
3642 for (x = w - 2; x > 0; --x)
3643 {
3644 *tp++ = t1;
3645 *rp++ = r;
3646 }
3647
3648 *tp = t2;
3649 *rp = r;
3650 }
3651}
3652
3653void
3654rxvt_term::scr_overlay_off ()
3655{
3656 if (!ov_text)
3657 return;
3658
3659 want_refresh = 1;
3660
3661 for (int y = 0; y < ov_h; y++)
3662 {
3663 delete [] ov_text[y];
3664 delete [] ov_rend[y];
3665 }
3666
3667 delete [] ov_text; ov_text = 0;
3668 delete [] ov_rend; ov_rend = 0;
3669}
3670
3671void
3672rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3673{
3674 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3675 return;
3676
3677 x++, y++;
3678
3679 ov_text[y][x] = text;
3680 ov_rend[y][x] = rend;
3681}
3682
3683void
3684rxvt_term::scr_overlay_set (int x, int y, const char *s)
3685{
3686 while (*s)
3687 scr_overlay_set (x++, y, *s++);
3688}
3689
3690void
3691rxvt_term::scr_swap_overlay ()
3692{
3693 if (!ov_text)
3694 return;
3695
3696 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3697
3698 // swap screen mem with overlay
3699 for (int y = ov_h; y--; )
3700 {
3701 text_t *t1 = ov_text[y];
3702 rend_t *r1 = ov_rend[y];
3703
3704 text_t *t2 = screen.text[y + row_offset] + ov_x;
3705 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3706
3707 for (int x = ov_w; x--; )
3708 {
3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3711 }
3712 }
3713}
3714
3715#endif
3480/* ------------------------------------------------------------------------- */ 3716/* ------------------------------------------------------------------------- */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines