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.136 by root, Tue Sep 7 21:05:41 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;
… …
945 989
946 if (screen.cur.col > 0) 990 if (screen.cur.col > 0)
947 { 991 {
948 tp = stp + screen.cur.col - 1; 992 tp = stp + screen.cur.col - 1;
949 rp = srp + screen.cur.col - 1; 993 rp = srp + screen.cur.col - 1;
994
995 while (*tp == NOCHAR && tp > stp)
996 tp--, rp--;
950 } 997 }
951 else if (screen.cur.row > 0 998 else if (screen.cur.row > 0
952 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 999 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
953 { 1000 {
954 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1001 int line = screen.cur.row - 1 + TermWin.saveLines;
955 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1002
1003 tp = screen.text[line] + last_col - 1;
1004 rp = screen.rend[line] + last_col - 1;
1005
1006 while (*tp == NOCHAR && tp > screen.text[line])
1007 tp--, rp--;
956 } 1008 }
957 else 1009 else
958 continue; 1010 continue;
959
960 // handle double-width-chars by making them look extremely ugly
961 if (*tp == NOCHAR)
962 *tp = ' '; // hack //D //TODO //--tp, --rp;
963 1011
964 // first try to find a precomposed character 1012 // first try to find a precomposed character
965 unicode_t n = rxvt_compose (*tp, c); 1013 unicode_t n = rxvt_compose (*tp, c);
966 if (n == NOCHAR) 1014 if (n == NOCHAR)
967 n = rxvt_composite.compose (*tp, c); 1015 n = rxvt_composite.compose (*tp, c);
968 1016
969 *tp = n; 1017 *tp = n;
970 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1018 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
971#endif 1019#endif
972 } 1020 }
973 } 1021 }
974 1022
975 if (screen.tlen[row] != -1) /* XXX: think about this */ 1023 if (screen.tlen[row] != -1) /* XXX: think about this */
976 MAX_IT (screen.tlen[row], screen.cur.col); 1024 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 1025
986#ifdef DEBUG_STRICT 1026#ifdef DEBUG_STRICT
987 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
988#else /* drive with your eyes closed */ 1028#else /* drive with your eyes closed */
989 MAX_IT (screen.cur.row, 0); 1029 MAX_IT (screen.cur.row, 0);
… …
1007#ifdef TERMCAP_HAS_BW 1047#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = TermWin.ncol - 1; 1048 screen.cur.col = TermWin.ncol - 1;
1009 screen.cur.row--; 1049 screen.cur.row--;
1010 return; 1050 return;
1011#endif 1051#endif
1012
1013 } 1052 }
1014 } 1053 }
1015 else if ((screen.flags & Screen_WrapNext) == 0) 1054 else if (!(screen.flags & Screen_WrapNext))
1016 scr_gotorc (0, -1, RELATIVE); 1055 scr_gotorc (0, -1, RELATIVE);
1017 1056
1018 screen.flags &= ~Screen_WrapNext; 1057 screen.flags &= ~Screen_WrapNext;
1019} 1058}
1020 1059
… …
1023 * Process Horizontal Tab 1062 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1063 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1064 * XTERM_SEQ: CTRL-I
1026 */ 1065 */
1027void 1066void
1028rxvt_term::scr_tab (int count) 1067rxvt_term::scr_tab (int count, bool ht)
1029{ 1068{
1030 int i, x; 1069 int i, x;
1031 1070
1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1033 want_refresh = 1; 1071 want_refresh = 1;
1034 i = x = screen.cur.col; 1072 i = x = screen.cur.col;
1035 1073
1036 if (count == 0) 1074 if (count == 0)
1037 return; 1075 return;
1038 else if (count > 0) 1076 else if (count > 0)
1039 { 1077 {
1078 int row = TermWin.saveLines + screen.cur.row;
1079 text_t *tp = screen.text[row];
1080 rend_t *rp = screen.rend[row];
1081 rend_t base_rend = rp[i];
1082 ht &= tp[i] == ' ';
1083
1040 for (; ++i < TermWin.ncol; ) 1084 for (; ++i < TermWin.ncol; )
1041 if (tabs[i]) 1085 if (tabs[i])
1042 { 1086 {
1043 x = i; 1087 x = i;
1044 if (!--count) 1088 if (!--count)
1045 break; 1089 break;
1046 } 1090 }
1091 else
1092 ht &= tp[i] == ' '
1093 && RS_SAME (rp[i], base_rend);
1047 1094
1048 if (count) 1095 if (count)
1049 x = TermWin.ncol - 1; 1096 x = TermWin.ncol - 1;
1097
1098 // store horizontal tab commands as characters inside the text
1099 // buffer so they can be selected and pasted.
1100 if (ht)
1101 {
1102 base_rend = SET_FONT (base_rend, 0);
1103
1104 if (screen.tlen[row] != -1) /* XXX: think about this */
1105 MAX_IT (screen.tlen[row], x);
1106
1107 i = screen.cur.col;
1108
1109 tp[i] = '\t';
1110 rp[i] = base_rend;
1111
1112 while (++i < x)
1113 {
1114 tp[i] = NOCHAR;
1115 rp[i] = base_rend;
1116 }
1117 }
1050 } 1118 }
1051 else /* if (count < 0) */ 1119 else /* if (count < 0) */
1052 { 1120 {
1053 for (; --i >= 0; ) 1121 for (; --i >= 0; )
1054 if (tabs[i]) 1122 if (tabs[i])
… …
1071 * Process DEC Back Index 1139 * Process DEC Back Index
1072 * XTERM_SEQ: ESC 6 1140 * XTERM_SEQ: ESC 6
1073 * Move cursor left in row. If we're at the left boundary, shift everything 1141 * Move cursor left in row. If we're at the left boundary, shift everything
1074 * in that row right. Clear left column. 1142 * in that row right. Clear left column.
1075 */ 1143 */
1076#ifndef NO_FRILLS 1144#if ENABLE_FRILLS
1077void 1145void
1078rxvt_term::scr_backindex () 1146rxvt_term::scr_backindex ()
1079{ 1147{
1080 if (screen.cur.col > 0) 1148 if (screen.cur.col > 0)
1081 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1149 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1082 else 1150 else
1083 { 1151 {
1084 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1152 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1085 return; /* um, yeah? */ 1153 return; /* um, yeah? */
1154
1086 scr_insdel_chars (1, INSERT); 1155 scr_insdel_chars (1, INSERT);
1087 } 1156 }
1088} 1157}
1089#endif 1158#endif
1090/* ------------------------------------------------------------------------- */ 1159/* ------------------------------------------------------------------------- */
… …
1092 * Process DEC Forward Index 1161 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1162 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1163 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1164 * in that row left. Clear right column.
1096 */ 1165 */
1097#ifndef NO_FRILLS 1166#if ENABLE_FRILLS
1098void 1167void
1099rxvt_term::scr_forwardindex () 1168rxvt_term::scr_forwardindex ()
1100{ 1169{
1101 int row; 1170 int row;
1102 1171
1103 if (screen.cur.col < TermWin.ncol - 1) 1172 if (screen.cur.col < TermWin.ncol - 1)
1104 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1173 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1105 else 1174 else
1106 { 1175 {
1107 row = screen.cur.row + TermWin.saveLines; 1176 row = screen.cur.row + TermWin.saveLines;
1177
1108 if (screen.tlen[row] == 0) 1178 if (screen.tlen[row] == 0)
1109 return; /* um, yeah? */ 1179 return; /* um, yeah? */
1110 else if (screen.tlen[row] == -1) 1180 else if (screen.tlen[row] == -1)
1111 screen.tlen[row] = TermWin.ncol; 1181 screen.tlen[row] = TermWin.ncol;
1182
1112 scr_gotorc (0, 0, R_RELATIVE); 1183 scr_gotorc (0, 0, R_RELATIVE);
1113 scr_insdel_chars (1, DELETE); 1184 scr_insdel_chars (1, DELETE);
1114 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1185 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1115 } 1186 }
1116} 1187}
… …
1124rxvt_term::scr_gotorc (int row, int col, int relative) 1195rxvt_term::scr_gotorc (int row, int col, int relative)
1125{ 1196{
1126 want_refresh = 1; 1197 want_refresh = 1;
1127 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1128 1199
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; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1132 MAX_IT (screen.cur.col, 0); 1201 MAX_IT (screen.cur.col, 0);
1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1202 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1134 1203
1135 screen.flags &= ~Screen_WrapNext; 1204 screen.flags &= ~Screen_WrapNext;
1205
1136 if (relative & R_RELATIVE) 1206 if (relative & R_RELATIVE)
1137 { 1207 {
1138 if (row > 0) 1208 if (row > 0)
1139 { 1209 {
1140 if (screen.cur.row <= screen.bscroll 1210 if (screen.cur.row <= screen.bscroll
… …
1160 MIN_IT (screen.cur.row, screen.bscroll); 1230 MIN_IT (screen.cur.row, screen.bscroll);
1161 } 1231 }
1162 else 1232 else
1163 screen.cur.row = row; 1233 screen.cur.row = row;
1164 } 1234 }
1235
1165 MAX_IT (screen.cur.row, 0); 1236 MAX_IT (screen.cur.row, 0);
1166 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1237 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} 1238}
1172 1239
1173/* ------------------------------------------------------------------------- */ 1240/* ------------------------------------------------------------------------- */
1174/* 1241/*
1175 * direction should be UP or DN 1242 * direction should be UP or DN
1176 */ 1243 */
1177void 1244void
1178rxvt_term::scr_index (enum page_dirn direction) 1245rxvt_term::scr_index (enum page_dirn direction)
1179{ 1246{
1180 int dirn; 1247 int dirn;
1181 1248
1182 want_refresh = 1; 1249 want_refresh = 1;
1250 ZERO_SCROLLBACK ();
1251
1183 dirn = ((direction == UP) ? 1 : -1); 1252 dirn = ((direction == UP) ? 1 : -1);
1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1185
1186 ZERO_SCROLLBACK ();
1187 1253
1188 screen.flags &= ~Screen_WrapNext; 1254 screen.flags &= ~Screen_WrapNext;
1255
1189 if ((screen.cur.row == screen.bscroll && direction == UP) 1256 if ((screen.cur.row == screen.bscroll && direction == UP)
1190 || (screen.cur.row == screen.tscroll && direction == DN)) 1257 || (screen.cur.row == screen.tscroll && direction == DN))
1191 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1258 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1192 else 1259 else
1193 screen.cur.row += dirn; 1260 screen.cur.row += dirn;
1261
1194 MAX_IT (screen.cur.row, 0); 1262 MAX_IT (screen.cur.row, 0);
1195 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1263 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1196 selection_check (0); 1264 selection_check (0);
1197} 1265}
1198 1266
… …
1207rxvt_term::scr_erase_line (int mode) 1275rxvt_term::scr_erase_line (int mode)
1208{ 1276{
1209 unsigned int row, col, num; 1277 unsigned int row, col, num;
1210 1278
1211 want_refresh = 1; 1279 want_refresh = 1;
1212 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1213 ZERO_SCROLLBACK (); 1280 ZERO_SCROLLBACK ();
1214 1281
1215 selection_check (1); 1282 selection_check (1);
1216
1217 screen.flags &= ~Screen_WrapNext;
1218 1283
1219 row = TermWin.saveLines + screen.cur.row; 1284 row = TermWin.saveLines + screen.cur.row;
1220 switch (mode) 1285 switch (mode)
1221 { 1286 {
1222 case 0: /* erase to end of line */ 1287 case 0: /* erase to end of line */
… …
1266 int32_t row, row_offset; 1331 int32_t row, row_offset;
1267 rend_t ren; 1332 rend_t ren;
1268 XGCValues gcvalue; 1333 XGCValues gcvalue;
1269 1334
1270 want_refresh = 1; 1335 want_refresh = 1;
1271 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1272 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1337
1273 row_offset = (int32_t)TermWin.saveLines; 1338 row_offset = (int32_t)TermWin.saveLines;
1274 1339
1275 switch (mode) 1340 switch (mode)
1276 { 1341 {
1277 case 0: /* erase to end of screen */ 1342 case 0: /* erase to end of screen */
… …
1314 CLEAR_ROWS (row, num); 1379 CLEAR_ROWS (row, num);
1315 } 1380 }
1316 else 1381 else
1317 { 1382 {
1318 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1383 ren = (rstyle & (RS_fgMask | RS_bgMask));
1319 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1384 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1386 ERASE_ROWS (row, num);
1322 gcvalue.foreground = PixColors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1388 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1324 } 1389 }
1325 1390
1326 for (; num--; row++) 1391 for (; num--; row++)
1327 { 1392 {
… …
1343{ 1408{
1344 int i, j, k; 1409 int i, j, k;
1345 rend_t *r1, fs; 1410 rend_t *r1, fs;
1346 1411
1347 want_refresh = 1; 1412 want_refresh = 1;
1413 ZERO_SCROLLBACK ();
1414
1348 num_scr_allow = 0; 1415 num_scr_allow = 0;
1349 ZERO_SCROLLBACK ();
1350 selection_check (3); 1416 selection_check (3);
1351 1417
1352 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1418 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1353 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1419 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1354 { 1420 {
1355 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1421 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1356 fill_text (screen.text[k], 'E', TermWin.ncol); 1422 fill_text (screen.text[k], 'E', TermWin.ncol);
1357 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1423 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1381 if (insdel == DELETE) 1447 if (insdel == DELETE)
1382 return; 1448 return;
1383 else if (insdel == INSERT) 1449 else if (insdel == INSERT)
1384 count = end; 1450 count = end;
1385 } 1451 }
1386 screen.flags &= ~Screen_WrapNext; 1452
1453 scr_do_wrap ();
1387 1454
1388 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1455 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1389} 1456}
1390 1457
1391/* ------------------------------------------------------------------------- */ 1458/* ------------------------------------------------------------------------- */
… …
1405 ZERO_SCROLLBACK (); 1472 ZERO_SCROLLBACK ();
1406 1473
1407 if (count <= 0) 1474 if (count <= 0)
1408 return; 1475 return;
1409 1476
1477 scr_do_wrap ();
1478
1410 selection_check (1); 1479 selection_check (1);
1411 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1480 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1412 1481
1413 row = screen.cur.row + TermWin.saveLines; 1482 row = screen.cur.row + TermWin.saveLines;
1414 screen.flags &= ~Screen_WrapNext;
1415 1483
1416 stp = screen.text[row]; 1484 stp = screen.text[row];
1417 srp = screen.rend[row]; 1485 srp = screen.rend[row];
1418 slp = & (screen.tlen[row]); 1486 slp = &screen.tlen[row];
1419 1487
1420 switch (insdel) 1488 switch (insdel)
1421 { 1489 {
1422 case INSERT: 1490 case INSERT:
1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1491 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1424 col--)
1425 { 1492 {
1426 stp[col] = stp[col - count]; 1493 stp[col] = stp[col - count];
1427 srp[col] = srp[col - count]; 1494 srp[col] = srp[col - count];
1428 } 1495 }
1429 1496
… …
1439 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
1440 || (selection.end.col + count >= TermWin.ncol)) 1507 || (selection.end.col + count >= TermWin.ncol))
1441 CLEAR_SELECTION (); 1508 CLEAR_SELECTION ();
1442 else 1509 else
1443 { /* shift selection */ 1510 { /* shift selection */
1444 selection.beg.col += count; 1511 selection.beg.col += count;
1445 selection.mark.col += count; /* XXX: yes? */ 1512 selection.mark.col += count; /* XXX: yes? */
1446 selection.end.col += count; 1513 selection.end.col += count;
1447 } 1514 }
1448 } 1515 }
1449 1516
1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1517 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1451 (unsigned int)count, rstyle); 1518 (unsigned int)count, rstyle);
1452 break; 1519 break;
1453 1520
1454 case ERASE: 1521 case ERASE:
1455 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1522 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1456 selection_check (1); 1523 selection_check (1);
1457 screen.cur.col -= count; 1524 screen.cur.col -= count;
1458 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1525 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1459 (unsigned int)count, rstyle); 1526 (unsigned int)count, rstyle);
1460 break; 1527 break;
1461 1528
1462 case DELETE: 1529 case DELETE:
1463 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1530 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1466 { 1533 {
1467 stp[col] = stp[col + count]; 1534 stp[col] = stp[col + count];
1468 srp[col] = srp[col + count]; 1535 srp[col] = srp[col + count];
1469 } 1536 }
1470 1537
1471 scr_blank_line (& (stp[TermWin.ncol - count]), 1538 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1472 & (srp[TermWin.ncol - count]),
1473 (unsigned int)count, tr); 1539 (unsigned int)count, tr);
1474 1540
1475 if (*slp == -1) /* break line continuation */ 1541 if (*slp == -1) /* break line continuation */
1476 *slp = TermWin.ncol; 1542 *slp = TermWin.ncol;
1477 1543
… …
1486 || selection.end.col >= TermWin.ncol) 1552 || selection.end.col >= TermWin.ncol)
1487 CLEAR_SELECTION (); 1553 CLEAR_SELECTION ();
1488 else 1554 else
1489 { 1555 {
1490 /* shift selection */ 1556 /* shift selection */
1491 selection.beg.col -= count; 1557 selection.beg.col -= count;
1492 selection.mark.col -= count; /* XXX: yes? */ 1558 selection.mark.col -= count; /* XXX: yes? */
1493 selection.end.col -= count; 1559 selection.end.col -= count;
1494 } 1560 }
1495 } 1561 }
1496 1562
1497 break; 1563 break;
1498 } 1564 }
… …
1544rxvt_term::scr_autowrap (int mode) 1610rxvt_term::scr_autowrap (int mode)
1545{ 1611{
1546 if (mode) 1612 if (mode)
1547 screen.flags |= Screen_Autowrap; 1613 screen.flags |= Screen_Autowrap;
1548 else 1614 else
1549 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1615 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1550} 1616}
1551 1617
1552/* ------------------------------------------------------------------------- */ 1618/* ------------------------------------------------------------------------- */
1553/* 1619/*
1554 * Set/unset margin origin mode 1620 * Set/unset margin origin mode
… …
1564{ 1630{
1565 if (mode) 1631 if (mode)
1566 screen.flags |= Screen_Relative; 1632 screen.flags |= Screen_Relative;
1567 else 1633 else
1568 screen.flags &= ~Screen_Relative; 1634 screen.flags &= ~Screen_Relative;
1635
1569 scr_gotorc (0, 0, 0); 1636 scr_gotorc (0, 0, 0);
1570} 1637}
1571 1638
1572/* ------------------------------------------------------------------------- */ 1639/* ------------------------------------------------------------------------- */
1573/* 1640/*
… …
1593 */ 1660 */
1594void 1661void
1595rxvt_term::scr_set_tab (int mode) 1662rxvt_term::scr_set_tab (int mode)
1596{ 1663{
1597 if (mode < 0) 1664 if (mode < 0)
1598 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1665 memset (tabs, 0, TermWin.ncol * sizeof (char));
1599 else if (screen.cur.col < TermWin.ncol) 1666 else if (screen.cur.col < TermWin.ncol)
1600 tabs[screen.cur.col] = (mode ? 1 : 0); 1667 tabs[screen.cur.col] = (mode ? 1 : 0);
1601} 1668}
1602 1669
1603/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
… …
1607 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1674 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1608 */ 1675 */
1609void 1676void
1610rxvt_term::scr_rvideo_mode (int mode) 1677rxvt_term::scr_rvideo_mode (int mode)
1611{ 1678{
1612 XGCValues gcvalue; 1679 XGCValues gcvalue;
1613 1680
1614 if (rvideo != mode) 1681 if (rvideo != mode)
1615 { 1682 {
1616 rvideo = mode; 1683 rvideo = mode;
1617 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1684 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1618#if defined(XPM_BACKGROUND) 1685#if XPM_BACKGROUND
1619 if (bgPixmap.pixmap == None) 1686 if (bgPixmap.pixmap == None)
1620#endif 1687#endif
1621#if defined(TRANSPARENT) 1688#if TRANSPARENT
1622 if (! (Options & Opt_transparent) || am_transparent == 0) 1689 if (! (options & Opt_transparent) || am_transparent == 0)
1623#endif 1690#endif
1624 XSetWindowBackground (display->display, TermWin.vt, 1691 XSetWindowBackground (display->display, TermWin.vt,
1625 PixColors[Color_bg]); 1692 pix_colors[Color_bg]);
1626 1693
1627 gcvalue.foreground = PixColors[Color_fg]; 1694 gcvalue.foreground = pix_colors[Color_fg];
1628 gcvalue.background = PixColors[Color_bg]; 1695 gcvalue.background = pix_colors[Color_bg];
1629 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1696 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1630 &gcvalue); 1697 &gcvalue);
1631 scr_clear (); 1698 scr_clear ();
1632 scr_touch (true); 1699 scr_touch (true);
1633 } 1700 }
… …
1681 * XTERM_SEQ: Invoke G2 character set: ESC N 1748 * XTERM_SEQ: Invoke G2 character set: ESC N
1682 * XTERM_SEQ: Invoke G3 character set: ESC O 1749 * XTERM_SEQ: Invoke G3 character set: ESC O
1683 */ 1750 */
1684void 1751void
1685rxvt_term::scr_charset_choose (int set) 1752rxvt_term::scr_charset_choose (int set)
1686 { 1753{
1687 screen.charset = set; 1754 screen.charset = set;
1688 set_font_style (); 1755 set_font_style ();
1689 } 1756}
1690 1757
1691/* ------------------------------------------------------------------------- */ 1758/* ------------------------------------------------------------------------- */
1692/* 1759/*
1693 * Set a font 1760 * Set a font
1694 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1761 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1697 * XTERM_SEQ: Set G3 character set: ESC + <C> 1764 * XTERM_SEQ: Set G3 character set: ESC + <C>
1698 * See set_font_style for possible values for <C> 1765 * See set_font_style for possible values for <C>
1699 */ 1766 */
1700void 1767void
1701rxvt_term::scr_charset_set (int set, unsigned int ch) 1768rxvt_term::scr_charset_set (int set, unsigned int ch)
1702 { 1769{
1703 charsets[set] = (unsigned char)ch; 1770 charsets[set] = (unsigned char)ch;
1704 set_font_style (); 1771 set_font_style ();
1705 } 1772}
1706 1773
1707 1774
1708/* ------------------------------------------------------------------------- * 1775/* ------------------------------------------------------------------------- *
1709 * MAJOR SCREEN MANIPULATION * 1776 * MAJOR SCREEN MANIPULATION *
1710 * ------------------------------------------------------------------------- */ 1777 * ------------------------------------------------------------------------- */
… …
1778 { 1845 {
1779 MIN_IT (rc[i].col, TermWin.ncol - 1); 1846 MIN_IT (rc[i].col, TermWin.ncol - 1);
1780 MIN_IT (rc[i].row, TermWin.nrow - 1); 1847 MIN_IT (rc[i].row, TermWin.nrow - 1);
1781 } 1848 }
1782 1849
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++) 1850 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); 1851 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1787 1852
1788 if (refresh) 1853 if (refresh)
1789 scr_refresh (SLOW_REFRESH); 1854 scr_refresh (SLOW_REFRESH);
… …
1806 */ 1871 */
1807int 1872int
1808rxvt_term::scr_move_to (int y, int len) 1873rxvt_term::scr_move_to (int y, int len)
1809{ 1874{
1810 long p = 0; 1875 long p = 0;
1811 uint16_t oldviewstart; 1876 unsigned int oldviewstart;
1812 1877
1813 oldviewstart = TermWin.view_start; 1878 oldviewstart = TermWin.view_start;
1879
1814 if (y < len) 1880 if (y < len)
1815 { 1881 {
1816 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1882 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1817 p -= (long) (TermWin.nrow - 1); 1883 p -= (long) (TermWin.nrow - 1);
1818 p = max (p, 0); 1884 p = max (p, 0);
1819 } 1885 }
1886
1820 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1887 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 1888
1823 return scr_changeview (oldviewstart); 1889 return scr_changeview (oldviewstart);
1824} 1890}
1825 1891
1826/* ------------------------------------------------------------------------- */ 1892/* ------------------------------------------------------------------------- */
… …
1830 */ 1896 */
1831int 1897int
1832rxvt_term::scr_page (enum page_dirn direction, int nlines) 1898rxvt_term::scr_page (enum page_dirn direction, int nlines)
1833{ 1899{
1834 int n; 1900 int n;
1835 uint16_t oldviewstart; 1901 unsigned int oldviewstart;
1836 1902
1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1838#ifdef DEBUG_STRICT 1903#ifdef DEBUG_STRICT
1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1904 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1840#endif 1905#endif
1841 oldviewstart = TermWin.view_start; 1906 oldviewstart = TermWin.view_start;
1842 if (direction == UP) 1907 if (direction == UP)
… …
1851 } 1916 }
1852 return scr_changeview (oldviewstart); 1917 return scr_changeview (oldviewstart);
1853} 1918}
1854 1919
1855int 1920int
1856rxvt_term::scr_changeview (uint16_t oldviewstart) 1921rxvt_term::scr_changeview (unsigned int oldviewstart)
1857{ 1922{
1858 if (TermWin.view_start != oldviewstart) 1923 if (TermWin.view_start != oldviewstart)
1859 { 1924 {
1860 want_refresh = 1; 1925 want_refresh = 1;
1861 num_scr -= (TermWin.view_start - oldviewstart); 1926 num_scr -= (TermWin.view_start - oldviewstart);
… …
1869rxvt_term::scr_bell () 1934rxvt_term::scr_bell ()
1870{ 1935{
1871#ifndef NO_BELL 1936#ifndef NO_BELL
1872# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1873# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1874 if (Options & Opt_mapAlert) 1939 if (options & Opt_mapAlert)
1875# endif 1940# endif
1876 XMapWindow (display->display, TermWin.parent[0]); 1941 XMapWindow (display->display, TermWin.parent[0]);
1877# endif 1942# endif
1878 if (Options & Opt_visualBell) 1943 if (options & Opt_visualBell)
1879 { 1944 {
1880 scr_rvideo_mode (!rvideo); /* refresh also done */ 1945 scr_rvideo_mode (!rvideo); /* refresh also done */
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1946 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 } 1947 }
1883 else 1948 else
… …
1889/* ARGSUSED */ 1954/* ARGSUSED */
1890void 1955void
1891rxvt_term::scr_printscreen (int fullhist) 1956rxvt_term::scr_printscreen (int fullhist)
1892{ 1957{
1893#ifdef PRINTPIPE 1958#ifdef PRINTPIPE
1894 int i, r1, nrows, row_offset; 1959 int i, r1, nrows, row_offset;
1895 text_t *t; 1960 FILE *fd;
1896 FILE *fd;
1897 1961
1898 if ((fd = popen_printer ()) == NULL) 1962 if ((fd = popen_printer ()) == NULL)
1899 return; 1963 return;
1964
1900 nrows = TermWin.nrow; 1965 nrows = TermWin.nrow;
1901 row_offset = TermWin.saveLines; 1966 row_offset = TermWin.saveLines;
1967
1902 if (!fullhist) 1968 if (!fullhist)
1903 row_offset -= TermWin.view_start; 1969 row_offset -= TermWin.view_start;
1904 else 1970 else
1905 { 1971 {
1906 nrows += TermWin.nscrolled; 1972 nrows += TermWin.nscrolled;
1907 row_offset -= TermWin.nscrolled; 1973 row_offset -= TermWin.nscrolled;
1908 } 1974 }
1909 1975
1976 wctomb (0, 0);
1977
1910 for (r1 = 0; r1 < nrows; r1++) 1978 for (r1 = 0; r1 < nrows; r1++)
1911 { 1979 {
1912 t = screen.text[r1 + row_offset]; 1980 text_t *tp = screen.text[r1 + row_offset];
1913 for (i = TermWin.ncol - 1; i >= 0; i--) 1981 int len = screen.tlen[r1 + row_offset];
1914 if (!isspace (t[i])) 1982
1915 break; 1983 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1916 fprintf (fd, "%.*s\n", (i + 1), t); 1984 {
1985 char mb[MB_LEN_MAX];
1986 text_t t = *tp++;
1987 if (t == NOCHAR)
1988 continue;
1989
1990 len = wctomb (mb, t);
1991
1992 if (len <= 0)
1993 {
1994 mb[0] = ' ';
1995 len = 1;
1996 }
1997
1998 fwrite (mb, 1, len, fd);
1999 }
2000
2001 fputc ('\n', fd);
1917 } 2002 }
2003
1918 pclose_printer (fd); 2004 pclose_printer (fd);
1919#endif 2005#endif
1920} 2006}
1921 2007
1922/* ------------------------------------------------------------------------- */ 2008/* ------------------------------------------------------------------------- */
… …
1937 2023
1938void 2024void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 2025rxvt_term::scr_refresh (unsigned char refresh_type)
1940{ 2026{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 2027 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 rvid, /* reverse video this position */
1943 showcursor; /* show the cursor */ 2028 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
1946 int i, /* tmp */ 2031 int i, /* tmp */
1947 row_offset; /* basic offset in screen structure */ 2032 row_offset; /* basic offset in screen structure */
1948#ifndef NO_CURSORCOLOR 2033#ifndef NO_CURSORCOLOR
1949 rend_t cc1; /* store colours at cursor position (s) */ 2034 rend_t cc1; /* store colours at cursor position (s) */
1950#endif 2035#endif
1951 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2036 rend_t *crp; // cursor rendition pointer
1952 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2037
2038 want_refresh = 0; /* screen is current */
1953 2039
1954 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2040 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1955 return; 2041 return;
1956 2042
1957 /* 2043 /*
1958 * A: set up vars 2044 * A: set up vars
1959 */ 2045 */
1960 must_clear = 0; 2046 must_clear = 0;
1961
1962 refresh_count = 0; 2047 refresh_count = 0;
1963 2048
1964 row_offset = TermWin.saveLines - TermWin.view_start; 2049 row_offset = TermWin.saveLines - TermWin.view_start;
1965 2050
1966#ifdef XPM_BACKGROUND 2051#if XPM_BACKGROUND
1967 must_clear |= (bgPixmap.pixmap != None); 2052 must_clear |= (bgPixmap.pixmap != None);
1968#endif 2053#endif
1969#ifdef TRANSPARENT 2054#if TRANSPARENT
1970 must_clear |= ((Options & Opt_transparent) && am_transparent); 2055 must_clear |= ((options & Opt_transparent) && am_transparent);
1971#endif 2056#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2058
1974 /* 2059 /*
1975 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
… …
1990 showcursor = 0; 2075 showcursor = 0;
1991#endif 2076#endif
1992 2077
1993 if (showcursor) 2078 if (showcursor)
1994 { 2079 {
2080 int col = screen.cur.col;
2081
2082 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2083 col--;
2084
1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2085 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1996 2086
1997 if (showcursor && TermWin.focus) 2087 if (showcursor && TermWin.focus)
1998 { 2088 {
1999 *srp ^= RS_RVid; 2089 *crp ^= RS_RVid;
2000#ifndef NO_CURSORCOLOR 2090#ifndef NO_CURSORCOLOR
2001 cc1 = *srp & (RS_fgMask | RS_bgMask); 2091 cc1 = *crp & (RS_fgMask | RS_bgMask);
2002 if (ISSET_PIXCOLOR (Color_cursor)) 2092 if (ISSET_PIXCOLOR (Color_cursor))
2003 ccol1 = Color_cursor; 2093 ccol1 = Color_cursor;
2004 else 2094 else
2005#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2095#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2006 ccol1 = GET_FGCOLOR (rstyle); 2096 ccol1 = GET_FGCOLOR (rstyle);
… …
2013#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014 ccol2 = GET_BGCOLOR (rstyle); 2104 ccol2 = GET_BGCOLOR (rstyle);
2015#else 2105#else
2016 ccol2 = Color_bg; 2106 ccol2 = Color_bg;
2017#endif 2107#endif
2018 *srp = SET_FGCOLOR (*srp, ccol1); 2108 *crp = SET_FGCOLOR (*crp, ccol1);
2019 *srp = SET_BGCOLOR (*srp, ccol2); 2109 *crp = SET_BGCOLOR (*crp, ccol2);
2020#endif 2110#endif
2021 } 2111 }
2022 } 2112 }
2023 2113
2024 /* make sure no outline cursor is left around */ 2114 /* make sure no outline cursor is left around */
… …
2051 oldcursor.col = screen.cur.col; 2141 oldcursor.col = screen.cur.col;
2052 } 2142 }
2053 } 2143 }
2054 } 2144 }
2055 2145
2146#if ENABLE_OVERLAY
2147 scr_swap_overlay ();
2148#endif
2149
2150 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2151 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2152
2056#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2057 /* 2154 /*
2058 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2059 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
2060 */ 2157 */
… …
2063 && refresh_type == FAST_REFRESH && num_scr_allow && i 2160 && refresh_type == FAST_REFRESH && num_scr_allow && i
2064 && abs (i) < TermWin.nrow && !must_clear) 2161 && abs (i) < TermWin.nrow && !must_clear)
2065 { 2162 {
2066 int16_t nits; 2163 int16_t nits;
2067 int j; 2164 int j;
2068 rend_t *drp2;
2069 text_t *dtp2;
2070 int len, wlen; 2165 int len, wlen;
2071 2166
2072 j = TermWin.nrow; 2167 j = TermWin.nrow;
2073 wlen = len = -1; 2168 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2170 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2171 {
2077 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2172 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2078 { 2173 {
2079 stp = screen.text[row + row_offset]; 2174 text_t *stp = screen.text[row + row_offset];
2080 srp = screen.rend[row + row_offset]; 2175 rend_t *srp = screen.rend[row + row_offset];
2081 dtp = drawn_text[row]; 2176 text_t *dtp = drawn_text[row];
2082 dtp2 = drawn_text[row + i]; 2177 text_t *dtp2 = drawn_text[row + i];
2083 drp = drawn_rend[row]; 2178 rend_t *drp = drawn_rend[row];
2084 drp2 = drawn_rend[row + i]; 2179 rend_t *drp2 = drawn_rend[row + i];
2085 2180
2086 for (nits = 0, col = TermWin.ncol; col--; ) 2181 for (nits = 0, col = TermWin.ncol; col--; )
2087 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2182 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2088 nits--; 2183 nits--;
2089 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2184 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2109 { 2204 {
2110 /* also comes here at end if needed because of >= above */ 2205 /* also comes here at end if needed because of >= above */
2111 if (wlen < len) 2206 if (wlen < len)
2112 SWAP_IT (wlen, len, int); 2207 SWAP_IT (wlen, len, int);
2113 2208
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, 2209 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2116 TermWin.gc, 0, Row2Pixel (len + i), 2210 TermWin.gc, 0, Row2Pixel (len + i),
2117 (unsigned int)TermWin_TotalWidth (), 2211 (unsigned int)TermWin_TotalWidth (),
2118 (unsigned int)Height2Pixel (wlen - len + 1), 2212 (unsigned int)Height2Pixel (wlen - len + 1),
2119 0, Row2Pixel (len)); 2213 0, Row2Pixel (len));
… …
2126 /* 2220 /*
2127 * E: main pass across every character 2221 * E: main pass across every character
2128 */ 2222 */
2129 for (row = 0; row < TermWin.nrow; row++) 2223 for (row = 0; row < TermWin.nrow; row++)
2130 { 2224 {
2131 stp = screen.text[row + row_offset]; 2225 text_t *stp = screen.text[row + row_offset];
2132 srp = screen.rend[row + row_offset]; 2226 rend_t *srp = screen.rend[row + row_offset];
2133 dtp = drawn_text[row]; 2227 text_t *dtp = drawn_text[row];
2134 drp = drawn_rend[row]; 2228 rend_t *drp = drawn_rend[row];
2135 2229
2136 /* 2230 /*
2137 * E2: OK, now the real pass 2231 * E2: OK, now the real pass
2138 */ 2232 */
2139 int ypixel = (int)Row2Pixel (row); 2233 int ypixel = (int)Row2Pixel (row);
2140 2234
2141 for (col = 0; col < TermWin.ncol; col++) 2235 for (col = 0; col < TermWin.ncol; col++)
2142 { 2236 {
2143 /* compare new text with old - if exactly the same then continue */ 2237 /* compare new text with old - if exactly the same then continue */
2144 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2238 if (stp[col] == dtp[col] /* Must match characters to skip. */
2145 && (srp[col] == drp[col] /* Either rendition the same or */ 2239 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2146 || (stp[col] == ' ' /* space w/ no background change */ 2240 || (stp[col] == ' ' /* space w/ no background change */
2147 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2241 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2148 continue; 2242 continue;
2149 2243
2150 // redraw one or more characters 2244 // redraw one or more characters
… …
2160 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2161 drp[col] = rend; 2255 drp[col] = rend;
2162 2256
2163 int xpixel = Col2Pixel (col); 2257 int xpixel = Col2Pixel (col);
2164 2258
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; ) 2259 for (i = 0; ++col < TermWin.ncol; )
2168 { 2260 {
2169 if (stp[col] == NOCHAR) 2261 if (stp[col] == NOCHAR)
2170 { 2262 {
2171 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2172 drp[col] = rend; 2264 drp[col] = rend;
2173 count++; 2265 count++;
2174
2175 if (i) // only possible skip if char unchanged
2176 i++; 2266 i++;
2177 2267
2178 continue; 2268 continue;
2179 } 2269 }
2180 2270
2181 if (rend != srp[col]) 2271 if (!RS_SAME (rend, srp[col]))
2182 break; 2272 break;
2183 2273
2184 count++; 2274 count++;
2185 2275
2186 if (stp[col] != dtp[col] 2276 if (stp[col] != dtp[col]
2187 || srp[col] != drp[col]) 2277 || !RS_SAME (srp[col], drp[col]))
2188 { 2278 {
2189 if (must_clear && (i++ > (count / 2))) 2279 if (must_clear && (i++ > count / 2))
2190 break; 2280 break;
2191 2281
2192 dtp[col] = stp[col]; 2282 dtp[col] = stp[col];
2193 drp[col] = rend; 2283 drp[col] = rend;
2194 i = 0; 2284 i = 0;
2195 } 2285 }
2196 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2286 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2197 break; 2287 break;
2198 } 2288 }
2199 2289
2200 col--; /* went one too far. move back */ 2290 col--; /* went one too far. move back */
2201 count -= i; /* dump any matching trailing chars */ 2291 count -= i; /* dump any matching trailing chars */
2292
2293 // sometimes we optimize away the trailing NOCHAR's, add them back
2294 while (i && text[count] == NOCHAR)
2295 count++, i--;
2296
2297#if ENABLE_STYLES
2298 // force redraw after "careful" characters to avoid pixel droppings
2299 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2300 drp[col + 1] = ~srp[col + 1];
2301
2302 // include previous careful character(s) if possible, looks nicer (best effort...)
2303 while (text > stp
2304 && srp[text - stp - 1] & RS_Careful
2305 && RS_SAME (rend, srp[text - stp - 1]))
2306 text--, count++, xpixel -= TermWin.fwidth;
2307#endif
2202 2308
2203 /* 2309 /*
2204 * Determine the attributes for the string 2310 * Determine the attributes for the string
2205 */ 2311 */
2206 int fid = GET_FONT (rend);
2207 int fore = GET_FGCOLOR (rend); // desired foreground 2312 int fore = GET_FGCOLOR (rend); // desired foreground
2208 int back = GET_BGCOLOR (rend); // desired background 2313 int back = GET_BGCOLOR (rend); // desired background
2209 2314
2210 rend = GET_ATTR (rend); 2315 // only do special processing if ana attributes are set, which is rare
2211 2316 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2212 rvid = !!(rend & RS_RVid); 2317 {
2318 bool invert = rend & RS_RVid;
2213 2319
2214#ifndef NO_BOLD_UNDERLINE_REVERSE 2320#ifndef NO_BOLD_UNDERLINE_REVERSE
2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2321 if (rend & RS_Bold
2322 && fore == Color_fg)
2216 { 2323 {
2217 if (ISSET_PIXCOLOR (Color_BD)) 2324 if (ISSET_PIXCOLOR (Color_BD))
2218 fore = Color_BD; 2325 fore = Color_BD;
2326# if !ENABLE_STYLES
2219 else 2327 else
2220 rvid = !rvid; 2328 invert = !invert;
2329# endif
2330 }
2331
2332 if (rend & RS_Italic
2333 && fore == Color_fg)
2334 {
2335 if (ISSET_PIXCOLOR (Color_IT))
2336 fore = Color_IT;
2337# if !ENABLE_STYLES
2338 else
2339 invert = !invert;
2340# endif
2341 }
2342
2343 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2344 fore = Color_UL;
2345#endif
2346
2347 if (invert)
2348 {
2349 SWAP_IT (fore, back, int);
2350
2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2352 if (ISSET_PIXCOLOR (Color_RV))
2353 back = Color_RV;
2354#endif
2355 }
2356
2357#ifdef TEXT_BLINK
2358 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2359 {
2360 if (!text_blink_ev.active)
2361 {
2362 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2363 hidden_text = 0;
2364 }
2365 else if (hidden_text)
2366 fore = back;
2367 }
2368#endif
2221 } 2369 }
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 2370
2255 /* 2371 /*
2256 * Actually do the drawing of the string here 2372 * Actually do the drawing of the string here
2257 */ 2373 */
2258 rxvt_font *font = (*TermWin.fontset)[fid]; 2374 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2259 2375
2260 if (back == fore) 2376 if (back == fore)
2261 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2377 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2262 TermWin.fwidth * count, TermWin.fheight, 2378 TermWin.fwidth * count, TermWin.fheight,
2263 back); 2379 back);
… …
2285 xpixel, ypixel + font->ascent + 1, 2401 xpixel, ypixel + font->ascent + 1,
2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2287 } /* for (col....) */ 2403 } /* for (col....) */
2288 } /* for (row....) */ 2404 } /* for (row....) */
2289 2405
2406#if ENABLE_OVERLAY
2407 scr_swap_overlay ();
2408#endif
2409
2290 /* 2410 /*
2291 * G: cleanup cursor and display outline cursor if necessary 2411 * G: cleanup cursor and display outline cursor if necessary
2292 */ 2412 */
2293 if (showcursor) 2413 if (showcursor)
2294 { 2414 {
2295 if (TermWin.focus) 2415 if (TermWin.focus)
2296 { 2416 {
2297 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2298 [screen.cur.col]);
2299 *srp ^= RS_RVid; 2417 *crp ^= RS_RVid;
2300#ifndef NO_CURSORCOLOR 2418#ifndef NO_CURSORCOLOR
2301 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2419 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2302#endif 2420#endif
2303 } 2421 }
2304 else if (oldcursor.row >= 0) 2422 else if (oldcursor.row >= 0)
2305 { 2423 {
2306#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
2307 if (ISSET_PIXCOLOR (Color_cursor)) 2425 if (ISSET_PIXCOLOR (Color_cursor))
2308 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2426 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2309#endif 2427#endif
2310 int cursorwidth = 1; 2428 int cursorwidth = 1;
2311 while (oldcursor.col + cursorwidth < TermWin.ncol 2429 while (oldcursor.col + cursorwidth < TermWin.ncol
2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2430 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2313 cursorwidth++; 2431 cursorwidth++;
… …
2328 if (refresh_type & SMOOTH_REFRESH) 2446 if (refresh_type & SMOOTH_REFRESH)
2329 XFlush (display->display); 2447 XFlush (display->display);
2330 2448
2331 num_scr = 0; 2449 num_scr = 0;
2332 num_scr_allow = 1; 2450 num_scr_allow = 1;
2333 want_refresh = 0; /* screen is current */
2334} 2451}
2335 2452
2336void 2453void
2337rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2454rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2338{ 2455{
2339 if (!rp || !tp) 2456 if (!rp || !tp)
2340 return; 2457 return;
2341 2458
2342 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2459 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2343 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2460 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2344} 2461}
2345 2462
2346void 2463void
2347rxvt_term::scr_remap_chars () 2464rxvt_term::scr_remap_chars ()
2348{ 2465{
… …
2354 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2471 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2355 scr_remap_chars (swap.text[i], swap.rend[i]); 2472 scr_remap_chars (swap.text[i], swap.rend[i]);
2356 } 2473 }
2357} 2474}
2358 2475
2476void
2477rxvt_term::scr_recolour ()
2478{
2479 if (1
2480#if TRANSPARENT
2481 && !am_transparent
2482#endif
2483#if XPM_BACKGROUND
2484 && !bgPixmap.pixmap
2485#endif
2486 )
2487 {
2488 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2489 XClearWindow (display->display, TermWin.parent[0]);
2490 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2491#if HAVE_SCROLLBARS
2492 if (scrollBar.win)
2493 {
2494 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2495 scrollBar.setIdle ();
2496 scrollbar_show (0);
2497 }
2498#endif
2499 }
2500
2501 scr_clear ();
2502 scr_touch (true);
2503 want_refresh = 1;
2504}
2505
2359/* ------------------------------------------------------------------------- */ 2506/* ------------------------------------------------------------------------- */
2360void 2507void
2361rxvt_term::scr_clear (bool really) 2508rxvt_term::scr_clear (bool really)
2362{ 2509{
2363 if (!TermWin.mapped) 2510 if (!TermWin.mapped)
2364 return; 2511 return;
2365 2512
2366 num_scr_allow = 0; 2513 num_scr_allow = 0;
2367 want_refresh = 1; 2514 want_refresh = 1;
2368 2515
2369#ifdef TRANSPARENT 2516#if TRANSPARENT
2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2517 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2371 { 2518 {
2372 int i; 2519 int i;
2373 2520
2374 if (! (Options & Opt_transparent_all)) 2521 if (!(options & Opt_transparent_all))
2375 i = 0; 2522 i = 0;
2376 else 2523 else
2377 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2524 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2378 2525
2379 while (i--) 2526 while (i--)
… …
2395 int end_row = TermWin.saveLines - TermWin.view_start; 2542 int end_row = TermWin.saveLines - TermWin.view_start;
2396 int i = selection.beg.row + TermWin.saveLines; 2543 int i = selection.beg.row + TermWin.saveLines;
2397 int col, row = selection.end.row + TermWin.saveLines; 2544 int col, row = selection.end.row + TermWin.saveLines;
2398 rend_t *srp; 2545 rend_t *srp;
2399 2546
2400 if (i >= end_row) 2547#if ENABLE_FRILLS
2401 col = selection.beg.col; 2548 if (selection.rect)
2549 {
2550 end_row += TermWin.nrow;
2551
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid;
2555 }
2402 else 2556 else
2557#endif
2558 {
2559 if (i >= end_row)
2560 col = selection.beg.col;
2561 else
2403 { 2562 {
2404 col = 0; 2563 col = 0;
2405 i = end_row; 2564 i = end_row;
2406 } 2565 }
2407 2566
2408 end_row += TermWin.nrow; 2567 end_row += TermWin.nrow;
2568
2409 for (; i < row && i < end_row; i++, col = 0) 2569 for (; i < row && i < end_row; i++, col = 0)
2410 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2570 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2411 srp[col] ^= RS_RVid; 2571 srp[col] ^= RS_RVid;
2412 2572
2413 if (i == row && i < end_row) 2573 if (i == row && i < end_row)
2414 for (srp = screen.rend[i]; col < selection.end.col; col++) 2574 for (srp = screen.rend[i]; col < selection.end.col; col++)
2415 srp[col] ^= RS_RVid; 2575 srp[col] ^= RS_RVid;
2576 }
2416 } 2577 }
2417} 2578}
2418 2579
2419/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2420/* 2581/*
… …
2456 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2617 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2457 */ 2618 */
2458void 2619void
2459rxvt_term::selection_check (int check_more) 2620rxvt_term::selection_check (int check_more)
2460{ 2621{
2461 row_col_t pos; 2622 row_col_t pos;
2462 2623
2463 if (!selection.op) 2624 if (!selection.op)
2464 return; 2625 return;
2465 2626
2466 pos.row = pos.col = 0; 2627 pos.row = pos.col = 0;
… …
2493rxvt_term::paste (const unsigned char *data, unsigned int len) 2654rxvt_term::paste (const unsigned char *data, unsigned int len)
2494{ 2655{
2495 unsigned int i, j, n; 2656 unsigned int i, j, n;
2496 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2657 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2497 2658
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 */ 2659 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (i = 0; i < len; i += PROP_SIZE) 2660 for (i = 0; i < len; i += PROP_SIZE)
2505 { 2661 {
2506 n = min (len - i, PROP_SIZE); 2662 n = min (len - i, PROP_SIZE);
2507 MEMCPY (ds, data + i, n); 2663 memcpy (ds, data + i, n);
2508 2664
2509 for (j = 0; j < n; j++) 2665 for (j = 0; j < n; j++)
2510 if (ds[j] == C0_LF) 2666 if (ds[j] == C0_LF)
2511 ds[j] = C0_CR; 2667 ds[j] = C0_CR;
2512 2668
… …
2525rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2681rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2526{ 2682{
2527 long nread = 0; 2683 long nread = 0;
2528 unsigned long bytes_after; 2684 unsigned long bytes_after;
2529 XTextProperty ct; 2685 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 2686
2533 if (prop == None) /* check for failed XConvertSelection */ 2687 if (prop == None) /* check for failed XConvertSelection */
2534 { 2688 {
2535 if ((selection_type & Sel_CompoundText)) 2689 if ((selection_type & Sel_CompoundText))
2536 { 2690 {
… …
2563 &ct.nitems, &bytes_after, 2717 &ct.nitems, &bytes_after,
2564 &ct.value) != Success) 2718 &ct.value) != Success)
2565 break; 2719 break;
2566 2720
2567 if (ct.encoding == 0) 2721 if (ct.encoding == 0)
2568 {
2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2570 break; 2722 break;
2571 } 2723
2572 else if (ct.encoding == xa[XA_INCR]) 2724 if (ct.encoding == xa[XA_INCR])
2573 { 2725 {
2574 // INCR selection, start handshake 2726 // INCR selection, start handshake
2575 XDeleteProperty (display->display, win, prop); 2727 XDeleteProperty (display->display, win, prop);
2576 selection_wait = Sel_incr; 2728 selection_wait = Sel_incr;
2577 incr_ev.start (NOW + 10); 2729 incr_ev.start (NOW + 10);
2578 break; 2730 break;
2579 } 2731 }
2580 2732
2581 if (ct.value == NULL) 2733 if (ct.value == NULL)
2582 {
2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2584 continue; 2734 continue;
2585 }
2586 2735
2587 if (ct.nitems == 0) 2736 if (ct.nitems == 0)
2588 { 2737 {
2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2590
2591 if (selection_wait == Sel_normal && nread == 0 2738 if (selection_wait == Sel_normal && nread == 0
2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2739 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2593 { 2740 {
2594 /* 2741 /*
2595 * pass through again trying CUT_BUFFER0 if we've come from 2742 * pass through again trying CUT_BUFFER0 if we've come from
2596 * XConvertSelection () but nothing was presented 2743 * XConvertSelection () but nothing was presented
2597 */ 2744 */
2598 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2599 selection_paste (display->root, XA_CUT_BUFFER0, False); 2745 selection_paste (display->root, XA_CUT_BUFFER0, False);
2600 } 2746 }
2601 2747
2602 nread = -1; /* discount any previous stuff */ 2748 nread = -1; /* discount any previous stuff */
2603 break; 2749 break;
… …
2608 char **cl; 2754 char **cl;
2609 int cr; 2755 int cr;
2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2611 { 2757 {
2612 for (int i = 0; i < cr; i++) 2758 for (int i = 0; i < cr; i++)
2613 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2759 paste ((unsigned char *)cl[i], strlen (cl[i]));
2614 2760
2615 XFreeStringList (cl); 2761 XFreeStringList (cl);
2616 } 2762 }
2617 else 2763 else
2618 paste (ct.value, ct.nitems); 2764 paste (ct.value, ct.nitems);
… …
2627 XFree (ct.value); 2773 XFree (ct.value);
2628 2774
2629 if (selection_wait == Sel_normal) 2775 if (selection_wait == Sel_normal)
2630 selection_wait = Sel_none; 2776 selection_wait = Sel_none;
2631 2777
2632 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2633 return (int)nread; 2778 return (int)nread;
2634} 2779}
2635 2780
2636void 2781void
2637rxvt_term::incr_cb (time_watcher &w) 2782rxvt_term::incr_cb (time_watcher &w)
… …
2670 * EXT: button 2 release 2815 * EXT: button 2 release
2671 */ 2816 */
2672void 2817void
2673rxvt_term::selection_request (Time tm, int x, int y) 2818rxvt_term::selection_request (Time tm, int x, int y)
2674{ 2819{
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) 2820 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2678 return; /* outside window */ 2821 return; /* outside window */
2679 2822
2680 if (selection.text) 2823 if (selection.text)
2681 { /* internal selection */ 2824 { /* internal selection */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2683 char *str = rxvt_wcstombs (selection.text, selection.len); 2825 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str)); 2826 paste ((unsigned char *)str, strlen (str));
2685 free (str); 2827 free (str);
2686 return; 2828 return;
2687 } 2829 }
… …
2706 2848
2707 } 2849 }
2708 } 2850 }
2709 2851
2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2852 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); 2853 selection_paste (display->root, XA_CUT_BUFFER0, False);
2713} 2854}
2714 2855
2715int 2856int
2716rxvt_term::selection_request_other (Atom target, int selnum) 2857rxvt_term::selection_request_other (Atom target, int selnum)
… …
2729 else 2870 else
2730 sel = xa[XA_CLIPBOARD]; 2871 sel = xa[XA_CLIPBOARD];
2731 2872
2732 if (XGetSelectionOwner (display->display, sel) != None) 2873 if (XGetSelectionOwner (display->display, sel) != None)
2733 { 2874 {
2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2875 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2736 TermWin.vt, selection_request_time); 2876 TermWin.vt, selection_request_time);
2737 return 1; 2877 return 1;
2738 } 2878 }
2739 2879
… …
2746 * EXT: SelectionClear 2886 * EXT: SelectionClear
2747 */ 2887 */
2748void 2888void
2749rxvt_term::selection_clear () 2889rxvt_term::selection_clear ()
2750{ 2890{
2751 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2752
2753 want_refresh = 1; 2891 want_refresh = 1;
2754 free (selection.text); 2892 free (selection.text);
2755 selection.text = NULL; 2893 selection.text = NULL;
2756 selection.len = 0; 2894 selection.len = 0;
2757 CLEAR_SELECTION (); 2895 CLEAR_SELECTION ();
… …
2770{ 2908{
2771 int i, col, end_col, row, end_row; 2909 int i, col, end_col, row, end_row;
2772 wchar_t *new_selection_text; 2910 wchar_t *new_selection_text;
2773 text_t *t; 2911 text_t *t;
2774 2912
2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2776 switch (selection.op) 2913 switch (selection.op)
2777 { 2914 {
2778 case SELECTION_CONT: 2915 case SELECTION_CONT:
2779 break; 2916 break;
2780 case SELECTION_INIT: 2917 case SELECTION_INIT:
… …
2794 2931
2795 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2932 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2796 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2933 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2797 2934
2798 col = selection.beg.col; 2935 col = selection.beg.col;
2799 MAX_IT (col, 0);
2800 row = selection.beg.row + TermWin.saveLines; 2936 row = selection.beg.row + TermWin.saveLines;
2801 end_row = selection.end.row + TermWin.saveLines; 2937 end_row = selection.end.row + TermWin.saveLines;
2802 int ofs = 0; 2938 int ofs = 0;
2803 int extra = 0; 2939 int extra = 0;
2804 2940
2805 for (; row <= end_row; row++, col = 0) 2941 for (; row <= end_row; row++, col = 0)
2806 { 2942 {
2807 t = &(screen.text[row][col]);
2808
2809 end_col = screen.tlen[row]; 2943 end_col = screen.tlen[row];
2944
2945#if ENABLE_FRILLS
2946 if (selection.rect)
2947 {
2948 col = selection.beg.col;
2949 end_col = TermWin.ncol + 1;
2950 }
2951#endif
2952
2953 MAX_IT (col, 0);
2810 2954
2811 if (end_col == -1) 2955 if (end_col == -1)
2812 end_col = TermWin.ncol; 2956 end_col = TermWin.ncol;
2813 2957
2814 if (row == end_row) 2958 if (row == end_row || selection.rect)
2815 MIN_IT (end_col, selection.end.col); 2959 MIN_IT (end_col, selection.end.col);
2816 2960
2961 t = &screen.text[row][col];
2817 for (; col < end_col; col++) 2962 for (; col < end_col; col++)
2818 { 2963 {
2819 if (*t == NOCHAR) 2964 if (*t == NOCHAR)
2820 t++; 2965 t++;
2821#if ENABLE_COMBINING 2966#if ENABLE_COMBINING
… …
2876 XFree (ct.value); 3021 XFree (ct.value);
2877 } 3022 }
2878#endif 3023#endif
2879 3024
2880 selection_time = tm; 3025 selection_time = tm;
2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2882} 3026}
2883 3027
2884/* ------------------------------------------------------------------------- */ 3028/* ------------------------------------------------------------------------- */
2885/* 3029/*
2886 * Mark or select text based upon number of clicks: 1, 2, or 3 3030 * Mark or select text based upon number of clicks: 1, 2, or 3
2887 * EXT: button 1 press 3031 * EXT: button 1 press
2888 */ 3032 */
2889void 3033void
2890rxvt_term::selection_click (int clicks, int x, int y) 3034rxvt_term::selection_click (int clicks, int x, int y)
2891{ 3035{
2892 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2893
2894 clicks = ((clicks - 1) % 3) + 1; 3036 clicks = ((clicks - 1) % 3) + 1;
2895 selection.clicks = clicks; /* save clicks so extend will work */ 3037 selection.clicks = clicks; /* save clicks so extend will work */
2896 3038
2897 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3039 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2898 3040
… …
2940 * We now only find out the boundary in one direction 3082 * We now only find out the boundary in one direction
2941 */ 3083 */
2942 3084
2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3085/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2944#define DELIMIT_TEXT(x) \ 3086#define DELIMIT_TEXT(x) \
2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3087 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2946#define DELIMIT_REND(x) 1 3088#define DELIMIT_REND(x) 1
2947 3089
2948void 3090void
2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3091rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2950{ 3092{
… …
2968 3110
2969 row = mark->row + TermWin.saveLines; 3111 row = mark->row + TermWin.saveLines;
2970 col = mark->col; 3112 col = mark->col;
2971 MAX_IT (col, 0); 3113 MAX_IT (col, 0);
2972 /* find the edge of a word */ 3114 /* find the edge of a word */
2973 stp = & (screen.text[row][col]); 3115 stp = &screen.text[row][col];
2974 w1 = DELIMIT_TEXT (*stp); 3116 w1 = DELIMIT_TEXT (*stp);
2975 3117
2976 srp = (&screen.rend[row][col]); 3118 srp = &screen.rend[row][col];
2977 w2 = DELIMIT_REND (*srp); 3119 w2 = DELIMIT_REND (*srp);
2978 3120
2979 for (;;) 3121 for (;;)
2980 { 3122 {
2981 for (; col != bound.col; col += dirnadd) 3123 for (; col != bound.col; col += dirnadd)
… …
3015 } 3157 }
3016 break; 3158 break;
3017 } 3159 }
3018 3160
3019Old_Word_Selection_You_Die: 3161Old_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) 3162 if (dirn == DN)
3023 col++; /* put us on one past the end */ 3163 col++; /* put us on one past the end */
3024 3164
3025 /* Poke the values back in */ 3165 /* Poke the values back in */
3026 ret->row = row - TermWin.saveLines; 3166 ret->row = row - TermWin.saveLines;
… …
3060 /* select nothing */ 3200 /* select nothing */
3061 selection.beg.row = selection.end.row = 0; 3201 selection.beg.row = selection.end.row = 0;
3062 selection.beg.col = selection.end.col = 0; 3202 selection.beg.col = selection.end.col = 0;
3063 selection.clicks = 4; 3203 selection.clicks = 4;
3064 want_refresh = 1; 3204 want_refresh = 1;
3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3066 return; 3205 return;
3067 } 3206 }
3068 3207
3069 if (selection.clicks == 4) 3208 if (selection.clicks == 4)
3070 selection.clicks = 1; 3209 selection.clicks = 1;
… …
3086 row_col_t pos; 3225 row_col_t pos;
3087 enum { 3226 enum {
3088 LEFT, RIGHT 3227 LEFT, RIGHT
3089 } closeto = RIGHT; 3228 } closeto = RIGHT;
3090 3229
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
3094 want_refresh = 1; 3230 want_refresh = 1;
3231
3095 switch (selection.op) 3232 switch (selection.op)
3096 { 3233 {
3097 case SELECTION_INIT: 3234 case SELECTION_INIT:
3098 CLEAR_SELECTION (); 3235 CLEAR_SELECTION ();
3099 selection.op = SELECTION_BEGIN; 3236 selection.op = SELECTION_BEGIN;
… …
3112 selection_start_colrow (col, row); 3249 selection_start_colrow (col, row);
3113 /* FALLTHROUGH */ 3250 /* FALLTHROUGH */
3114 default: 3251 default:
3115 return; 3252 return;
3116 } 3253 }
3254
3117 if (selection.beg.col == selection.end.col 3255 if (selection.beg.col == selection.end.col
3118 && selection.beg.col != selection.mark.col 3256 && selection.beg.col != selection.mark.col
3119 && selection.beg.row == selection.end.row 3257 && selection.beg.row == selection.end.row
3120 && selection.beg.row != selection.mark.row) 3258 && selection.beg.row != selection.mark.row)
3121 { 3259 {
3122 selection.beg.col = selection.end.col = selection.mark.col; 3260 selection.beg.col = selection.end.col = selection.mark.col;
3123 selection.beg.row = selection.end.row = selection.mark.row; 3261 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 } 3262 }
3126 3263
3127 pos.col = col; 3264 pos.col = col;
3128 pos.row = row; 3265 pos.row = row;
3129 3266
… …
3172 } 3309 }
3173 else 3310 else
3174 { /* button1 drag or button3 drag */ 3311 { /* button1 drag or button3 drag */
3175 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3312 if (ROWCOL_IS_AFTER (selection.mark, pos))
3176 { 3313 {
3177 if ((selection.mark.row == selection.end.row) 3314 if (selection.mark.row == selection.end.row
3178 && (selection.mark.col == selection.end.col) 3315 && selection.mark.col == selection.end.col
3316 && clickchange
3179 && clickchange && selection.clicks == 2) 3317 && selection.clicks == 2)
3180 selection.mark.col--; 3318 selection.mark.col--;
3181 3319
3182 selection.beg.row = pos.row; 3320 selection.beg.row = pos.row;
3183 selection.beg.col = pos.col; 3321 selection.beg.col = pos.col;
3184 selection.end.row = selection.mark.row; 3322 selection.end.row = selection.mark.row;
… …
3195 3333
3196 if (selection.clicks == 1) 3334 if (selection.clicks == 1)
3197 { 3335 {
3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3336 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199 3337
3200 if (end_col != -1 && selection.beg.col > end_col) 3338 if (selection.beg.col > end_col
3339 && end_col != -1
3340#if ENABLE_FRILLS
3341 && !selection.rect
3342#endif
3201 { 3343 )
3202#if 1
3203 selection.beg.col = ncol; 3344 selection.beg.col = ncol;
3204#else
3205 if (selection.beg.row != selection.end.row)
3206 selection.beg.col = ncol;
3207 else
3208 selection.beg.col = selection.mark.col;
3209#endif
3210 }
3211 3345
3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3346 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213 3347
3214 if (end_col != -1 && selection.end.col > end_col) 3348 if (
3349 selection.end.col > end_col
3350 && end_col != -1
3351#if ENABLE_FRILLS
3352 && !selection.rect
3353#endif
3354 )
3215 selection.end.col = ncol; 3355 selection.end.col = ncol;
3216 } 3356 }
3217 else if (selection.clicks == 2) 3357 else if (selection.clicks == 2)
3218 { 3358 {
3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3359 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3220 selection.end.col--; 3360 selection.end.col--;
3221 3361
3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3362 selection_delimit_word (UP, &selection.beg, &selection.beg);
3363 selection_delimit_word (DN, &selection.end, &selection.end);
3224 } 3364 }
3225 else if (selection.clicks == 3) 3365 else if (selection.clicks == 3)
3226 { 3366 {
3227#ifndef NO_FRILLS 3367#if ENABLE_FRILLS
3228 if ((Options & Opt_tripleclickwords)) 3368 if ((options & Opt_tripleclickwords))
3229 { 3369 {
3230 int end_row; 3370 int end_row;
3231 3371
3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3372 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3373 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3248 else 3388 else
3249#endif 3389#endif
3250 { 3390 {
3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3391 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3252 selection.mark.col++; 3392 selection.mark.col++;
3393
3253 selection.beg.col = 0; 3394 selection.beg.col = 0;
3254 selection.end.col = ncol; 3395 selection.end.col = ncol;
3255 } 3396 }
3256 } 3397 }
3257 3398
3258 if (button3 && buttonpress) 3399 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3400 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3401 if (closeto == LEFT)
3261 { 3402 {
3262 selection.mark.row = selection.end.row; 3403 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3404 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3405 }
3266 else 3406 else
3267 { 3407 {
3268 selection.mark.row = selection.beg.row; 3408 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3409 selection.mark.col = selection.beg.col;
3270 } 3410 }
3271 } 3411 }
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}
3274 3412
3275#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
3414 if (selection.rect && selection.beg.col > selection.end.col)
3415 SWAP_IT (selection.beg.col, selection.end.col, int);
3416#endif
3417}
3418
3419#if ENABLE_FRILLS
3276void 3420void
3277rxvt_term::selection_remove_trailing_spaces () 3421rxvt_term::selection_remove_trailing_spaces ()
3278{ 3422{
3279 int32_t end_col, end_row; 3423 int32_t end_col, end_row;
3280 text_t *stp; 3424 text_t *stp;
3281 3425
3282 end_col = selection.end.col; 3426 end_col = selection.end.col;
3283 end_row = selection.end.row; 3427 end_row = selection.end.row;
3428
3284 for ( ; end_row >= selection.beg.row; ) 3429 for ( ; end_row >= selection.beg.row; )
3285 { 3430 {
3286 stp = screen.text[end_row + TermWin.saveLines]; 3431 stp = screen.text[end_row + TermWin.saveLines];
3432
3287 while (--end_col >= 0) 3433 while (--end_col >= 0)
3288 { 3434 {
3289 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3435 if (stp[end_col] != ' '
3436 && stp[end_col] != '\t'
3437 && stp[end_col] != NOCHAR)
3290 break; 3438 break;
3291 } 3439 }
3440
3292 if (end_col >= 0 3441 if (end_col >= 0
3293 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3442 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3294 { 3443 {
3295 selection.end.col = end_col + 1; 3444 selection.end.col = end_col + 1;
3296 selection.end.row = end_row; 3445 selection.end.row = end_row;
3297 break; 3446 break;
3298 } 3447 }
3448
3299 end_row--; 3449 end_row--;
3300 end_col = TermWin.ncol; 3450 end_col = TermWin.ncol;
3301 } 3451 }
3452
3302 if (selection.mark.row > selection.end.row) 3453 if (selection.mark.row > selection.end.row)
3303 { 3454 {
3304 selection.mark.row = selection.end.row; 3455 selection.mark.row = selection.end.row;
3305 selection.mark.col = selection.end.col; 3456 selection.mark.col = selection.end.col;
3306 } 3457 }
… …
3465} 3616}
3466 3617
3467/* ------------------------------------------------------------------------- */ 3618/* ------------------------------------------------------------------------- */
3468#ifdef USE_XIM 3619#ifdef USE_XIM
3469void 3620void
3470rxvt_term::im_set_position (XPoint *pos) 3621rxvt_term::im_set_position (XPoint &pos)
3471{ 3622{
3472 XWindowAttributes xwa; 3623 XWindowAttributes xwa;
3473 3624
3474 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3625 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3626
3475 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3627 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3628 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3477} 3629}
3478
3479#endif 3630#endif
3631
3632#if ENABLE_OVERLAY
3633void
3634rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3635{
3636 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3637 return;
3638
3639 want_refresh = 1;
3640
3641 scr_overlay_off ();
3642
3643 if (x < 0) x = TermWin.ncol - w;
3644 if (y < 0) y = TermWin.nrow - h;
3645
3646 // make space for border
3647 w += 2; MIN_IT (w, TermWin.ncol);
3648 h += 2; MIN_IT (h, TermWin.nrow);
3649
3650 x -= 1; MAX_IT (x, 0);
3651 y -= 1; MAX_IT (y, 0);
3652
3653 MIN_IT (x, TermWin.ncol - w);
3654 MIN_IT (y, TermWin.nrow - h);
3655
3656 ov_x = x; ov_y = y;
3657 ov_w = w; ov_h = h;
3658
3659 ov_text = new text_t *[h];
3660 ov_rend = new rend_t *[h];
3661
3662 for (y = 0; y < h; y++)
3663 {
3664 text_t *tp = ov_text[y] = new text_t[w];
3665 rend_t *rp = ov_rend[y] = new rend_t[w];
3666
3667 text_t t0, t1, t2;
3668 rend_t r = OVERLAY_RSTYLE;
3669
3670 if (y == 0)
3671 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3672 else if (y < h - 1)
3673 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3674 else
3675 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3676
3677 *tp++ = t0;
3678 *rp++ = r;
3679
3680 for (x = w - 2; x > 0; --x)
3681 {
3682 *tp++ = t1;
3683 *rp++ = r;
3684 }
3685
3686 *tp = t2;
3687 *rp = r;
3688 }
3689}
3690
3691void
3692rxvt_term::scr_overlay_off ()
3693{
3694 if (!ov_text)
3695 return;
3696
3697 want_refresh = 1;
3698
3699 for (int y = 0; y < ov_h; y++)
3700 {
3701 delete [] ov_text[y];
3702 delete [] ov_rend[y];
3703 }
3704
3705 delete [] ov_text; ov_text = 0;
3706 delete [] ov_rend; ov_rend = 0;
3707}
3708
3709void
3710rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3711{
3712 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3713 return;
3714
3715 x++, y++;
3716
3717 ov_text[y][x] = text;
3718 ov_rend[y][x] = rend;
3719}
3720
3721void
3722rxvt_term::scr_overlay_set (int x, int y, const char *s)
3723{
3724 while (*s)
3725 scr_overlay_set (x++, y, *s++);
3726}
3727
3728void
3729rxvt_term::scr_swap_overlay ()
3730{
3731 if (!ov_text)
3732 return;
3733
3734 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3735
3736 // swap screen mem with overlay
3737 for (int y = ov_h; y--; )
3738 {
3739 text_t *t1 = ov_text[y];
3740 rend_t *r1 = ov_rend[y];
3741
3742 text_t *t2 = screen.text[y + row_offset] + ov_x;
3743 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3744
3745 for (int x = ov_w; x--; )
3746 {
3747 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3748 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3749 }
3750 }
3751}
3752
3753#endif
3480/* ------------------------------------------------------------------------- */ 3754/* ------------------------------------------------------------------------- */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines