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.24 by pcg, Sat Jan 31 04:12:10 2004 UTC vs.
Revision 1.25 by pcg, Sun Feb 1 01:34:41 2004 UTC

… …
183 if (!talloc) 183 if (!talloc)
184 { 184 {
185 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 185 talloc = new rxvt_salloc (ncol * sizeof (text_t));
186 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 186 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
187 } 187 }
188 188
189 if (prev_nrow == 0) 189 if (prev_nrow == 0)
190 { 190 {
191 /* 191 /*
192 * first time called so just malloc everything : don't rely on realloc 192 * first time called so just malloc everything : don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL 193 * Note: this is still needed so that all the scrollback lines are NULL
… …
337 if (ncol != prev_ncol) 337 if (ncol != prev_ncol)
338 { 338 {
339 int common = min (prev_ncol, ncol); 339 int common = min (prev_ncol, ncol);
340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
342 342
343 for (p = 0; p < total_rows; p++) 343 for (p = 0; p < total_rows; p++)
344 { 344 {
345 if (screen.text[p]) 345 if (screen.text[p])
346 { 346 {
347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
… …
501 * XTERM_SEQ: Restore cursor: ESC 8 501 * XTERM_SEQ: Restore cursor: ESC 8
502 */ 502 */
503void 503void
504rxvt_term::scr_cursor (int mode) 504rxvt_term::scr_cursor (int mode)
505{ 505{
506 screen_t *s; 506 screen_t *s;
507 507
508 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); 508 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode));
509 509
510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
511 if (current_screen == SECONDARY) 511 if (current_screen == SECONDARY)
512 s = &(swap); 512 s = &(swap);
513 else 513 else
514#endif 514#endif
515 s = &(screen); 515 s = &(screen);
516 switch (mode) { 516 switch (mode)
517 {
517 case SAVE: 518 case SAVE:
518 s->s_cur.row = s->cur.row; 519 s->s_cur.row = s->cur.row;
519 s->s_cur.col = s->cur.col; 520 s->s_cur.col = s->cur.col;
520 s->s_rstyle = rstyle; 521 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 522 s->s_charset = s->charset;
522 s->s_charset_char = charsets[s->charset]; 523 s->s_charset_char = charsets[s->charset];
523 break; 524 break;
524 case RESTORE: 525 case RESTORE:
525 want_refresh = 1; 526 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 527 s->cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 528 s->cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 529 s->flags &= ~Screen_WrapNext;
529 rstyle = s->s_rstyle; 530 rstyle = s->s_rstyle;
530 s->charset = s->s_charset; 531 s->charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 532 charsets[s->charset] = s->s_charset_char;
532 set_font_style (); 533 set_font_style ();
533 break; 534 break;
534 } 535 }
535/* boundary check in case screen size changed between SAVE and RESTORE */ 536 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT(s->cur.row, TermWin.nrow - 1); 537 MIN_IT(s->cur.row, TermWin.nrow - 1);
537 MIN_IT(s->cur.col, TermWin.ncol - 1); 538 MIN_IT(s->cur.col, TermWin.ncol - 1);
538#ifdef DEBUG_STRICT 539#ifdef DEBUG_STRICT
539 assert(s->cur.row >= 0); 540 assert(s->cur.row >= 0);
540 assert(s->cur.col >= 0); 541 assert(s->cur.col >= 0);
541#else /* drive with your eyes closed */ 542#else /* drive with your eyes closed */
542 MAX_IT(s->cur.row, 0); 543 MAX_IT(s->cur.row, 0);
543 MAX_IT(s->cur.col, 0); 544 MAX_IT(s->cur.col, 0);
544#endif 545#endif
545} 546}
546 547
547/* ------------------------------------------------------------------------- */ 548/* ------------------------------------------------------------------------- */
548/* 549/*
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 552 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 553 */
553int 554int
554rxvt_term::scr_change_screen (int scrn) 555rxvt_term::scr_change_screen (int scrn)
555{ 556{
556 int i; 557 int i;
557#if NSCREENS 558#if NSCREENS
558 int offset; 559 int offset;
559#endif 560#endif
560 561
561 want_refresh = 1; 562 want_refresh = 1;
562 563
563 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); 564 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn));
564 565
565 TermWin.view_start = 0; 566 TermWin.view_start = 0;
566 567
567 if (current_screen == scrn) 568 if (current_screen == scrn)
568 return current_screen; 569 return current_screen;
569 570
570 selection_check (2); /* check for boundary cross */ 571 selection_check (2); /* check for boundary cross */
571 572
572 SWAP_IT(current_screen, scrn, int); 573 SWAP_IT(current_screen, scrn, int);
573#if NSCREENS 574#if NSCREENS
574 num_scr = 0; 575 num_scr = 0;
575 offset = TermWin.saveLines; 576 offset = TermWin.saveLines;
576 for (i = prev_nrow; i--;) { 577 for (i = prev_nrow; i--;)
578 {
577 SWAP_IT(screen.text[i + offset], swap.text[i], text_t *); 579 SWAP_IT(screen.text[i + offset], swap.text[i], text_t *);
578 SWAP_IT(screen.tlen[i + offset], swap.tlen[i], int16_t); 580 SWAP_IT(screen.tlen[i + offset], swap.tlen[i], int16_t);
579 SWAP_IT(screen.rend[i + offset], swap.rend[i], rend_t *); 581 SWAP_IT(screen.rend[i + offset], swap.rend[i], rend_t *);
580 } 582 }
581 SWAP_IT(screen.cur.row, swap.cur.row, int16_t); 583 SWAP_IT(screen.cur.row, swap.cur.row, int16_t);
582 SWAP_IT(screen.cur.col, swap.cur.col, int16_t); 584 SWAP_IT(screen.cur.col, swap.cur.col, int16_t);
583# ifdef DEBUG_STRICT 585# ifdef DEBUG_STRICT
584 assert((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 586 assert((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
585 assert((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 587 assert((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
586# else /* drive with your eyes closed */ 588# else /* drive with your eyes closed */
587 MAX_IT(screen.cur.row, 0); 589 MAX_IT(screen.cur.row, 0);
588 MIN_IT(screen.cur.row, (int32_t)prev_nrow - 1); 590 MIN_IT(screen.cur.row, (int32_t)prev_nrow - 1);
589 MAX_IT(screen.cur.col, 0); 591 MAX_IT(screen.cur.col, 0);
590 MIN_IT(screen.cur.col, (int32_t)prev_ncol - 1); 592 MIN_IT(screen.cur.col, (int32_t)prev_ncol - 1);
591# endif 593# endif
592 SWAP_IT(screen.charset, swap.charset, int16_t); 594 SWAP_IT(screen.charset, swap.charset, int16_t);
593 SWAP_IT(screen.flags, swap.flags, int); 595 SWAP_IT(screen.flags, swap.flags, int);
594 screen.flags |= Screen_VisibleCursor; 596 screen.flags |= Screen_VisibleCursor;
595 swap.flags |= Screen_VisibleCursor; 597 swap.flags |= Screen_VisibleCursor;
596 598
597# ifdef RXVT_GRAPHICS 599# ifdef RXVT_GRAPHICS
598 600
599 if (Gr_Displayed ()) { 601 if (Gr_Displayed ())
602 {
600 Gr_scroll (0); 603 Gr_scroll (0);
601 Gr_ChangeScreen (); 604 Gr_ChangeScreen ();
602 } 605 }
603# endif 606# endif
604#else 607#else
605# ifdef SCROLL_ON_NO_SECONDARY 608# ifdef SCROLL_ON_NO_SECONDARY
606# ifdef RXVT_GRAPHICS 609# ifdef RXVT_GRAPHICS
607 if (Gr_Displayed ()) 610 if (Gr_Displayed ())
608 Gr_ClearScreen (); 611 Gr_ClearScreen ();
609# endif 612# endif
610 if (current_screen == PRIMARY 613 if (current_screen == PRIMARY
611# ifdef RXVT_GRAPHICS 614# ifdef RXVT_GRAPHICS
612 && !Gr_Displayed () 615 && !Gr_Displayed ()
613# endif 616# endif
614 ) 617 )
615 scr_scroll_text(0, (prev_nrow - 1), prev_nrow, 0); 618 scr_scroll_text(0, (prev_nrow - 1), prev_nrow, 0);
616# endif 619# endif
617#endif 620#endif
618 return scrn; 621 return scrn;
619} 622}
620 623
621/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
622/* 625/*
623 * Change the colour for following text 626 * Change the colour for following text
624 */ 627 */
625void 628void
626rxvt_term::scr_color (unsigned int color, int fgbg) 629rxvt_term::scr_color (unsigned int color, int fgbg)
627{ 630{
628 color &= RS_fgMask; 631 color &= RS_fgMask;
629 if (fgbg == Color_fg) 632 if (fgbg == Color_fg)
630 rstyle = SET_FGCOLOR(rstyle, color); 633 rstyle = SET_FGCOLOR(rstyle, color);
631 else 634 else
632 rstyle = SET_BGCOLOR(rstyle, color); 635 rstyle = SET_BGCOLOR(rstyle, color);
633} 636}
634 637
635/* ------------------------------------------------------------------------- */ 638/* ------------------------------------------------------------------------- */
636/* 639/*
637 * Change the rendition style for following text 640 * Change the rendition style for following text
638 */ 641 */
639void 642void
640rxvt_term::scr_rendition (int set, int style) 643rxvt_term::scr_rendition (int set, int style)
641{ 644 {
642 if (set) 645 if (set)
643 rstyle |= style; 646 rstyle |= style;
644 else if (style == ~RS_None) 647 else if (style == ~RS_None)
645 rstyle = DEFAULT_RSTYLE; 648 rstyle = DEFAULT_RSTYLE;
646 else 649 else
647 rstyle &= ~style; 650 rstyle &= ~style;
648} 651 }
649 652
650/* ------------------------------------------------------------------------- */ 653/* ------------------------------------------------------------------------- */
651/* 654/*
652 * Scroll text between <row1> and <row2> inclusive, by <count> lines 655 * Scroll text between <row1> and <row2> inclusive, by <count> lines
653 * count positive ==> scroll up 656 * count positive ==> scroll up
… …
784 * Add text given in <str> of length <len> to screen struct 787 * Add text given in <str> of length <len> to screen struct
785 */ 788 */
786void 789void
787rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 790rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
788{ 791{
789 unsigned char checksel, clearsel; 792 unsigned char checksel, clearsel;
790 uint32_t c; 793 uint32_t c;
791 int i, row, last_col; 794 int i, row, last_col;
792 text_t *stp; 795 text_t *stp;
793 rend_t *srp; 796 rend_t *srp;
794 797
795 if (len <= 0) /* sanity */ 798 if (len <= 0) /* sanity */
796 return; 799 return;
797 800
798 want_refresh = 1; 801 want_refresh = 1;
799 last_col = TermWin.ncol; 802 last_col = TermWin.ncol;
800 803
801 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); 804 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len));
802 ZERO_SCROLLBACK(); 805 ZERO_SCROLLBACK();
803 if (nlines > 0) { 806 if (nlines > 0)
807 {
804 nlines += (screen.cur.row - screen.bscroll); 808 nlines += (screen.cur.row - screen.bscroll);
805 if ((nlines > 0) 809 if ((nlines > 0)
806 && (screen.tscroll == 0) 810 && (screen.tscroll == 0)
807 && (screen.bscroll == (TermWin.nrow - 1))) { 811 && (screen.bscroll == (TermWin.nrow - 1)))
812 {
808 /* _at least_ this many lines need to be scrolled */ 813 /* _at least_ this many lines need to be scrolled */
809 scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0); 814 scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0);
810 screen.cur.row -= nlines; 815 screen.cur.row -= nlines;
811 } 816 }
812 } 817 }
813#ifdef DEBUG_STRICT 818#ifdef DEBUG_STRICT
814 assert(screen.cur.col < last_col); 819 assert(screen.cur.col < last_col);
815 assert((screen.cur.row < TermWin.nrow) 820 assert((screen.cur.row < TermWin.nrow)
816 && (screen.cur.row >= -(int32_t)TermWin.nscrolled)); 821 && (screen.cur.row >= -(int32_t)TermWin.nscrolled));
817#else /* drive with your eyes closed */ 822#else /* drive with your eyes closed */
818 MIN_IT(screen.cur.col, last_col - 1); 823 MIN_IT(screen.cur.col, last_col - 1);
819 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 824 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1);
820 MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled); 825 MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled);
821#endif 826#endif
822 row = screen.cur.row + TermWin.saveLines; 827 row = screen.cur.row + TermWin.saveLines;
823 828
824 checksel = (selection.op 829 checksel = (selection.op
825 && current_screen == selection.screen) ? 1 : 0; 830 && current_screen == selection.screen) ? 1 : 0;
826 clearsel = 0; 831 clearsel = 0;
827 832
828 stp = screen.text[row]; 833 stp = screen.text[row];
829 srp = screen.rend[row]; 834 srp = screen.rend[row];
830 835
831 for (i = 0; i < len;) { 836 for (i = 0; i < len;)
837 {
832 c = str[i++]; 838 c = str[i++];
833 switch (c) { 839 switch (c)
840 {
834 case '\t': 841 case '\t':
835 scr_tab (1); 842 scr_tab (1);
836 continue; 843 continue;
837 case '\n': 844 case '\n':
838 if (screen.tlen[row] != -1) /* XXX: think about this */ 845 if (screen.tlen[row] != -1) /* XXX: think about this */
839 MAX_IT(screen.tlen[row], screen.cur.col); 846 MAX_IT(screen.tlen[row], screen.cur.col);
840 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
841 if (screen.cur.row == screen.bscroll) 848 if (screen.cur.row == screen.bscroll)
842 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 849 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
843 else if (screen.cur.row < (TermWin.nrow - 1)) 850 else if (screen.cur.row < (TermWin.nrow - 1))
844 row = (++screen.cur.row) + TermWin.saveLines; 851 row = (++screen.cur.row) + TermWin.saveLines;
845 stp = screen.text[row]; /* _must_ refresh */ 852 stp = screen.text[row]; /* _must_ refresh */
846 srp = screen.rend[row]; /* _must_ refresh */ 853 srp = screen.rend[row]; /* _must_ refresh */
847 continue; 854 continue;
848 case '\r': 855 case '\r':
849 if (screen.tlen[row] != -1) /* XXX: think about this */ 856 if (screen.tlen[row] != -1) /* XXX: think about this */
850 MAX_IT(screen.tlen[row], screen.cur.col); 857 MAX_IT(screen.tlen[row], screen.cur.col);
851 screen.flags &= ~Screen_WrapNext; 858 screen.flags &= ~Screen_WrapNext;
852 screen.cur.col = 0; 859 screen.cur.col = 0;
853 continue; 860 continue;
854 default: 861 default:
855 if (c == 127) 862 if (c == 127)
856 continue; /* yummmm..... */ 863 continue; /* yummmm..... */
857 break; 864 break;
858 } 865 }
859 866
860 if (checksel /* see if we're writing within selection */ 867 if (checksel /* see if we're writing within selection */
861 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 868 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg)
862 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) { 869 && ROWCOL_IS_BEFORE(screen.cur, selection.end))
870 {
863 checksel = 0; 871 checksel = 0;
864 clearsel = 1; 872 clearsel = 1;
865 } 873 }
866 if (screen.flags & Screen_WrapNext) { 874 if (screen.flags & Screen_WrapNext)
875 {
867 screen.tlen[row] = -1; 876 screen.tlen[row] = -1;
868 if (screen.cur.row == screen.bscroll) 877 if (screen.cur.row == screen.bscroll)
869 scr_scroll_text(screen.tscroll, screen.bscroll, 1, 0); 878 scr_scroll_text(screen.tscroll, screen.bscroll, 1, 0);
870 else if (screen.cur.row < (TermWin.nrow - 1)) 879 else if (screen.cur.row < (TermWin.nrow - 1))
871 row = (++screen.cur.row) + TermWin.saveLines; 880 row = (++screen.cur.row) + TermWin.saveLines;
872 stp = screen.text[row]; /* _must_ refresh */ 881 stp = screen.text[row]; /* _must_ refresh */
873 srp = screen.rend[row]; /* _must_ refresh */ 882 srp = screen.rend[row]; /* _must_ refresh */
874 screen.cur.col = 0; 883 screen.cur.col = 0;
875 screen.flags &= ~Screen_WrapNext; 884 screen.flags &= ~Screen_WrapNext;
876 } 885 }
877 if (screen.flags & Screen_Insert) 886 if (screen.flags & Screen_Insert)
878 scr_insdel_chars (1, INSERT); 887 scr_insdel_chars (1, INSERT);
879 888
880 if (charsets[screen.charset] == '0') // DEC SPECIAL 889 if (charsets[screen.charset] == '0') // DEC SPECIAL
881 switch (c) 890 switch (c)
882 { 891 {
883 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 892 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
884 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 893 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break;
885 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 894 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
886 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 895 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
887 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 896 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
888 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 897 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
889 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 898 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
890 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 899 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
891 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 900 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
892 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 901 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
893 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 902 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
894 } 903 }
895 904
896 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
897 // rely on wcwidth to tell us the character width, at least for non-ascii 906 // rely on wcwidth to tell us the character width, at least for non-ascii
898 int width = c <= 128 ? 1 : wcwidth (c); 907 int width = c <= 128 ? 1 : wcwidth (c);
899 908
900 // width -1 characters (e.g. combining chars) are ignored currently. 909 // width -1 characters (e.g. combining chars) are ignored currently.
901 if (width > 0) 910 if (width > 0)
902 do 911 do
903 { 912 {
904 stp[screen.cur.col] = c; 913 stp[screen.cur.col] = c;
905 srp[screen.cur.col] = rend; 914 srp[screen.cur.col] = rend;
906 915
907 if (screen.cur.col < last_col - 1) 916 if (screen.cur.col < last_col - 1)
908 screen.cur.col++; 917 screen.cur.col++;
909 else 918 else
910 { 919 {
911 screen.tlen[row] = last_col; 920 screen.tlen[row] = last_col;
912 if (screen.flags & Screen_Autowrap) 921 if (screen.flags & Screen_Autowrap)
913 screen.flags |= Screen_WrapNext; 922 screen.flags |= Screen_WrapNext;
914 break; 923 break;
915 } 924 }
916 925
917 c = NOCHAR; 926 c = NOCHAR;
918 } 927 }
919 while (--width > 0); 928 while (--width > 0);
920 else 929 else
921 (void)0; /* handle combining character etc. here. */ 930 (void)0; /* handle combining character etc. here. */
922 } 931 }
923 932
924 if (screen.tlen[row] != -1) /* XXX: think about this */ 933 if (screen.tlen[row] != -1) /* XXX: think about this */
925 MAX_IT(screen.tlen[row], screen.cur.col); 934 MAX_IT(screen.tlen[row], screen.cur.col);
926 935
927/* 936 /*
928 * If we wrote anywhere in the selected area, kill the selection 937 * If we wrote anywhere in the selected area, kill the selection
929 * XXX: should we kill the mark too? Possibly, but maybe that 938 * XXX: should we kill the mark too? Possibly, but maybe that
930 * should be a similar check. 939 * should be a similar check.
931 */ 940 */
932 if (clearsel) 941 if (clearsel)
933 CLEAR_SELECTION(); 942 CLEAR_SELECTION();
934 943
935#ifdef DEBUG_STRICT 944#ifdef DEBUG_STRICT
936 assert(screen.cur.row >= 0); 945 assert(screen.cur.row >= 0);
937#else /* drive with your eyes closed */ 946#else /* drive with your eyes closed */
938 MAX_IT(screen.cur.row, 0); 947 MAX_IT(screen.cur.row, 0);
939#endif 948#endif
940} 949}
941 950
942/* ------------------------------------------------------------------------- */ 951/* ------------------------------------------------------------------------- */
943/* 952/*
… …
945 * XTERM_SEQ: CTRL-H 954 * XTERM_SEQ: CTRL-H
946 */ 955 */
947void 956void
948rxvt_term::scr_backspace () 957rxvt_term::scr_backspace ()
949{ 958{
950 want_refresh = 1; 959 want_refresh = 1;
951 if (screen.cur.col == 0) { 960 if (screen.cur.col == 0)
961 {
952 if (screen.cur.row > 0) { 962 if (screen.cur.row > 0)
963 {
953#ifdef TERMCAP_HAS_BW 964#ifdef TERMCAP_HAS_BW
954 screen.cur.col = TermWin.ncol - 1; 965 screen.cur.col = TermWin.ncol - 1;
955 screen.cur.row--; 966 screen.cur.row--;
956 return; 967 return;
957#endif 968#endif
969
958 } 970 }
971 }
959 } else if ((screen.flags & Screen_WrapNext) == 0) 972 else if ((screen.flags & Screen_WrapNext) == 0)
960 scr_gotorc (0, -1, RELATIVE); 973 scr_gotorc (0, -1, RELATIVE);
961 screen.flags &= ~Screen_WrapNext; 974 screen.flags &= ~Screen_WrapNext;
962} 975}
963 976
964/* ------------------------------------------------------------------------- */ 977/* ------------------------------------------------------------------------- */
965/* 978/*
966 * Process Horizontal Tab 979 * Process Horizontal Tab
… …
968 * XTERM_SEQ: CTRL-I 981 * XTERM_SEQ: CTRL-I
969 */ 982 */
970void 983void
971rxvt_term::scr_tab (int count) 984rxvt_term::scr_tab (int count)
972{ 985{
973 int i, x; 986 int i, x;
974 987
975 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 988 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
976 want_refresh = 1; 989 want_refresh = 1;
977 i = x = screen.cur.col; 990 i = x = screen.cur.col;
978 if (count == 0) 991 if (count == 0)
979 return; 992 return;
980 else if (count > 0) { 993 else if (count > 0)
994 {
981 for (; ++i < TermWin.ncol; ) 995 for (; ++i < TermWin.ncol; )
982 if (tabs[i]) { 996 if (tabs[i])
997 {
983 x = i; 998 x = i;
984 if (!--count) 999 if (!--count)
985 break; 1000 break;
986 } 1001 }
987 if (count) 1002 if (count)
988 x = TermWin.ncol - 1; 1003 x = TermWin.ncol - 1;
1004 }
989 } else /* if (count < 0) */ { 1005 else /* if (count < 0) */
1006 {
990 for (; --i >= 0; ) 1007 for (; --i >= 0; )
991 if (tabs[i]) { 1008 if (tabs[i])
992 x = i;
993 if (!++count)
994 break;
995 } 1009 {
996 if (count)
997 x = 0; 1010 x = i;
1011 if (!++count)
1012 break;
1013 }
1014 if (count)
1015 x = 0;
998 } 1016 }
999 if (x != screen.cur.col) 1017 if (x != screen.cur.col)
1000 scr_gotorc (0, x, R_RELATIVE); 1018 scr_gotorc (0, x, R_RELATIVE);
1001} 1019}
1002 1020
1003/* ------------------------------------------------------------------------- */ 1021/* ------------------------------------------------------------------------- */
1004/* 1022/*
1005 * Process DEC Back Index 1023 * Process DEC Back Index
… …
1009 */ 1027 */
1010#ifndef NO_FRILLS 1028#ifndef NO_FRILLS
1011void 1029void
1012rxvt_term::scr_backindex () 1030rxvt_term::scr_backindex ()
1013{ 1031{
1014 if (screen.cur.col > 0) 1032 if (screen.cur.col > 0)
1015 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1033 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1016 else { 1034 else
1035 {
1017 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1036 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1018 return; /* um, yeah? */ 1037 return; /* um, yeah? */
1019 scr_insdel_chars (1, INSERT); 1038 scr_insdel_chars (1, INSERT);
1020 } 1039 }
1021} 1040}
1022#endif 1041#endif
1023/* ------------------------------------------------------------------------- */ 1042/* ------------------------------------------------------------------------- */
1024/* 1043/*
… …
1029 */ 1048 */
1030#ifndef NO_FRILLS 1049#ifndef NO_FRILLS
1031void 1050void
1032rxvt_term::scr_forwardindex () 1051rxvt_term::scr_forwardindex ()
1033{ 1052{
1034 int row; 1053 int row;
1035 1054
1036 if (screen.cur.col < TermWin.ncol - 1) 1055 if (screen.cur.col < TermWin.ncol - 1)
1037 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1056 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1038 else { 1057 else
1058 {
1039 row = screen.cur.row + TermWin.saveLines; 1059 row = screen.cur.row + TermWin.saveLines;
1040 if (screen.tlen[row] == 0) 1060 if (screen.tlen[row] == 0)
1041 return; /* um, yeah? */ 1061 return; /* um, yeah? */
1042 else if (screen.tlen[row] == -1) 1062 else if (screen.tlen[row] == -1)
1043 screen.tlen[row] = TermWin.ncol; 1063 screen.tlen[row] = TermWin.ncol;
1044 scr_gotorc (0, 0, R_RELATIVE); 1064 scr_gotorc (0, 0, R_RELATIVE);
1045 scr_insdel_chars (1, DELETE); 1065 scr_insdel_chars (1, DELETE);
1046 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1066 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1047 } 1067 }
1048} 1068}
1049#endif 1069#endif
1050 1070
1051/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
… …
1053 * Goto Row/Column 1073 * Goto Row/Column
1054 */ 1074 */
1055void 1075void
1056rxvt_term::scr_gotorc (int row, int col, int relative) 1076rxvt_term::scr_gotorc (int row, int col, int relative)
1057{ 1077{
1058 want_refresh = 1; 1078 want_refresh = 1;
1059 ZERO_SCROLLBACK(); 1079 ZERO_SCROLLBACK();
1060#ifdef RXVT_GRAPHICS 1080#ifdef RXVT_GRAPHICS
1061 if (Gr_Displayed ()) 1081 if (Gr_Displayed ())
1062 Gr_scroll (0); 1082 Gr_scroll (0);
1063#endif 1083#endif
1064 1084
1065 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)); 1085 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));
1066 1086
1067 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1068 : col); 1088 : col);
1069 MAX_IT(screen.cur.col, 0); 1089 MAX_IT(screen.cur.col, 0);
1070 MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1); 1090 MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1);
1071 1091
1072 screen.flags &= ~Screen_WrapNext; 1092 screen.flags &= ~Screen_WrapNext;
1073 if (relative & R_RELATIVE) { 1093 if (relative & R_RELATIVE)
1094 {
1074 if (row > 0) { 1095 if (row > 0)
1096 {
1075 if (screen.cur.row <= screen.bscroll 1097 if (screen.cur.row <= screen.bscroll
1076 && (screen.cur.row + row) > screen.bscroll) 1098 && (screen.cur.row + row) > screen.bscroll)
1077 screen.cur.row = screen.bscroll; 1099 screen.cur.row = screen.bscroll;
1078 else 1100 else
1079 screen.cur.row += row;
1080 } else if (row < 0) {
1081 if (screen.cur.row >= screen.tscroll
1082 && (screen.cur.row + row) < screen.tscroll)
1083 screen.cur.row = screen.tscroll;
1084 else
1085 screen.cur.row += row;
1086 }
1087 } else {
1088 if (screen.flags & Screen_Relative) { /* relative origin mode */
1089 screen.cur.row = row + screen.tscroll;
1090 MIN_IT(screen.cur.row, screen.bscroll);
1091 } else
1092 screen.cur.row = row; 1101 screen.cur.row += row;
1102 }
1103 else if (row < 0)
1104 {
1105 if (screen.cur.row >= screen.tscroll
1106 && (screen.cur.row + row) < screen.tscroll)
1107 screen.cur.row = screen.tscroll;
1108 else
1109 screen.cur.row += row;
1110 }
1111 }
1112 else
1093 } 1113 {
1114 if (screen.flags & Screen_Relative)
1115 { /* relative origin mode */
1116 screen.cur.row = row + screen.tscroll;
1117 MIN_IT(screen.cur.row, screen.bscroll);
1118 }
1119 else
1120 screen.cur.row = row;
1121 }
1094 MAX_IT(screen.cur.row, 0); 1122 MAX_IT(screen.cur.row, 0);
1095 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1123 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1);
1096} 1124}
1097 1125
1098/* ------------------------------------------------------------------------- */ 1126/* ------------------------------------------------------------------------- */
1099/* 1127/*
1100 * direction should be UP or DN 1128 * direction should be UP or DN
1101 */ 1129 */
1102void 1130void
1103rxvt_term::scr_index (enum page_dirn direction) 1131rxvt_term::scr_index (enum page_dirn direction)
1104{ 1132{
1105 int dirn; 1133 int dirn;
1106 1134
1107 want_refresh = 1; 1135 want_refresh = 1;
1108 dirn = ((direction == UP) ? 1 : -1); 1136 dirn = ((direction == UP) ? 1 : -1);
1109 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1137 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1110 1138
1111 ZERO_SCROLLBACK(); 1139 ZERO_SCROLLBACK();
1112 1140
1113#ifdef RXVT_GRAPHICS 1141#ifdef RXVT_GRAPHICS
1114 if (Gr_Displayed ()) 1142 if (Gr_Displayed ())
1115 Gr_scroll (0); 1143 Gr_scroll (0);
1116#endif 1144#endif
1117 1145
1118 screen.flags &= ~Screen_WrapNext; 1146 screen.flags &= ~Screen_WrapNext;
1119 if ((screen.cur.row == screen.bscroll && direction == UP) 1147 if ((screen.cur.row == screen.bscroll && direction == UP)
1120 || (screen.cur.row == screen.tscroll && direction == DN)) 1148 || (screen.cur.row == screen.tscroll && direction == DN))
1121 scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0); 1149 scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0);
1122 else 1150 else
1123 screen.cur.row += dirn; 1151 screen.cur.row += dirn;
1124 MAX_IT(screen.cur.row, 0); 1152 MAX_IT(screen.cur.row, 0);
1125 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1153 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1);
1126 selection_check (0); 1154 selection_check (0);
1127} 1155}
1128 1156
1129/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1130/* 1158/*
1131 * Erase part or whole of a line 1159 * Erase part or whole of a line
… …
1181 return; 1209 return;
1182 } 1210 }
1183 1211
1184 if (screen.text[row]) 1212 if (screen.text[row])
1185 scr_blank_line (&(screen.text[row][col]), 1213 scr_blank_line (&(screen.text[row][col]),
1186 &(screen.rend[row][col]), num, rstyle); 1214 &(screen.rend[row][col]), num, rstyle);
1187 else 1215 else
1188 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1216 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1189} 1217}
1190 1218
1191/* ------------------------------------------------------------------------- */ 1219/* ------------------------------------------------------------------------- */
… …
1196 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1224 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1197 */ 1225 */
1198void 1226void
1199rxvt_term::scr_erase_screen (int mode) 1227rxvt_term::scr_erase_screen (int mode)
1200{ 1228{
1201 int num; 1229 int num;
1202 int32_t row, row_offset; 1230 int32_t row, row_offset;
1203 rend_t ren; 1231 rend_t ren;
1204 XGCValues gcvalue; 1232 XGCValues gcvalue;
1205 1233
1206 want_refresh = 1; 1234 want_refresh = 1;
1207 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row)); 1235 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row));
1208 ZERO_SCROLLBACK (); 1236 ZERO_SCROLLBACK ();
1209 row_offset = (int32_t)TermWin.saveLines; 1237 row_offset = (int32_t)TermWin.saveLines;
1210 1238
1211 switch (mode) { 1239 switch (mode)
1240 {
1212 case 0: /* erase to end of screen */ 1241 case 0: /* erase to end of screen */
1213 selection_check (1); 1242 selection_check (1);
1214 scr_erase_line (0); 1243 scr_erase_line (0);
1215 row = screen.cur.row + 1; /* possible OOB */ 1244 row = screen.cur.row + 1; /* possible OOB */
1216 num = TermWin.nrow - row; 1245 num = TermWin.nrow - row;
1217 break; 1246 break;
1218 case 1: /* erase to beginning of screen */ 1247 case 1: /* erase to beginning of screen */
1219 selection_check (3); 1248 selection_check (3);
1220 scr_erase_line (1); 1249 scr_erase_line (1);
1221 row = 0; 1250 row = 0;
1222 num = screen.cur.row; 1251 num = screen.cur.row;
1223 break; 1252 break;
1224 case 2: /* erase whole screen */ 1253 case 2: /* erase whole screen */
1225 selection_check (3); 1254 selection_check (3);
1226#ifdef RXVT_GRAPHICS 1255#ifdef RXVT_GRAPHICS
1227 Gr_ClearScreen (); 1256 Gr_ClearScreen ();
1228#endif 1257#endif
1229 row = 0; 1258 row = 0;
1230 num = TermWin.nrow; 1259 num = TermWin.nrow;
1231 break; 1260 break;
1232 default: 1261 default:
1233 return; 1262 return;
1234 } 1263 }
1235 refresh_type |= REFRESH_BOUNDS; 1264 refresh_type |= REFRESH_BOUNDS;
1236 if (selection.op && current_screen == selection.screen 1265 if (selection.op && current_screen == selection.screen
1237 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1266 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1238 || (selection.end.row >= row 1267 || (selection.end.row >= row
1239 && selection.end.row <= row + num))) 1268 && selection.end.row <= row + num)))
1240 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1241 if (row >= TermWin.nrow) /* Out Of Bounds */ 1270 if (row >= TermWin.nrow) /* Out Of Bounds */
1242 return; 1271 return;
1243 MIN_IT(num, (TermWin.nrow - row)); 1272 MIN_IT(num, (TermWin.nrow - row));
1244 if (rstyle & (RS_RVid | RS_Uline)) 1273 if (rstyle & (RS_RVid | RS_Uline))
1245 ren = (rend_t) ~RS_None; 1274 ren = (rend_t) ~RS_None;
1246 else if (GET_BASEBG(rstyle) == Color_bg) { 1275 else if (GET_BASEBG(rstyle) == Color_bg)
1276 {
1247 ren = DEFAULT_RSTYLE; 1277 ren = DEFAULT_RSTYLE;
1248 CLEAR_ROWS(row, num); 1278 CLEAR_ROWS(row, num);
1249 } else { 1279 }
1280 else
1281 {
1250 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1282 ren = (rstyle & (RS_fgMask | RS_bgMask));
1251 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; 1283 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)];
1252 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1284 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1253 ERASE_ROWS(row, num); 1285 ERASE_ROWS(row, num);
1254 gcvalue.foreground = PixColors[Color_fg]; 1286 gcvalue.foreground = PixColors[Color_fg];
1255 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1287 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1256 } 1288 }
1257 for (; num--; row++) { 1289 for (; num--; row++)
1290 {
1258 scr_blank_screen_mem (screen.text, screen.rend, 1291 scr_blank_screen_mem (screen.text, screen.rend,
1259 (unsigned int)(row + row_offset), rstyle); 1292 (unsigned int)(row + row_offset), rstyle);
1260 screen.tlen[row + row_offset] = 0; 1293 screen.tlen[row + row_offset] = 0;
1261 scr_blank_line (drawn_text[row], drawn_rend[row], 1294 scr_blank_line (drawn_text[row], drawn_rend[row],
1262 (unsigned int)TermWin.ncol, ren); 1295 (unsigned int)TermWin.ncol, ren);
1263 } 1296 }
1264} 1297}
1265 1298
1266/* ------------------------------------------------------------------------- */ 1299/* ------------------------------------------------------------------------- */
1267/* 1300/*
… …
1269 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1302 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1270 */ 1303 */
1271void 1304void
1272rxvt_term::scr_E () 1305rxvt_term::scr_E ()
1273{ 1306{
1274 int i, j, k; 1307 int i, j, k;
1275 rend_t *r1, fs; 1308 rend_t *r1, fs;
1276 1309
1277 want_refresh = 1; 1310 want_refresh = 1;
1278 num_scr_allow = 0; 1311 num_scr_allow = 0;
1279 ZERO_SCROLLBACK(); 1312 ZERO_SCROLLBACK();
1280 selection_check (3); 1313 selection_check (3);
1281 1314
1282 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1315 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1283 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) { 1316 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1317 {
1284 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1318 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1285 fill_text (screen.text[k], 'E', TermWin.ncol); 1319 fill_text (screen.text[k], 'E', TermWin.ncol);
1286 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1320 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1287 *r1++ = fs; 1321 *r1++ = fs;
1288 } 1322 }
1289} 1323}
1290 1324
1291/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1292/* 1326/*
1293 * Insert/Delete <count> lines 1327 * Insert/Delete <count> lines
1294 */ 1328 */
1295void 1329void
1296rxvt_term::scr_insdel_lines (int count, int insdel) 1330rxvt_term::scr_insdel_lines (int count, int insdel)
1297{ 1331{
1298 int end; 1332 int end;
1299 1333
1300 ZERO_SCROLLBACK(); 1334 ZERO_SCROLLBACK();
1301 1335
1302#ifdef RXVT_GRAPHICS 1336#ifdef RXVT_GRAPHICS
1303 if (Gr_Displayed ()) 1337 if (Gr_Displayed ())
1304 Gr_scroll (0); 1338 Gr_scroll (0);
1305#endif 1339#endif
1306 1340
1307 selection_check (1); 1341 selection_check (1);
1308 1342
1309 if (screen.cur.row > screen.bscroll) 1343 if (screen.cur.row > screen.bscroll)
1344 return;
1345
1346 end = screen.bscroll - screen.cur.row + 1;
1347 if (count > end)
1348 {
1349 if (insdel == DELETE)
1310 return; 1350 return;
1311
1312 end = screen.bscroll - screen.cur.row + 1;
1313 if (count > end) {
1314 if (insdel == DELETE)
1315 return;
1316 else if (insdel == INSERT) 1351 else if (insdel == INSERT)
1317 count = end; 1352 count = end;
1318 } 1353 }
1319 screen.flags &= ~Screen_WrapNext; 1354 screen.flags &= ~Screen_WrapNext;
1320 1355
1321 scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0); 1356 scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0);
1322} 1357}
1323 1358
1324/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1325/* 1360/*
1326 * Insert/Delete <count> characters from the current position 1361 * Insert/Delete <count> characters from the current position
1327 */ 1362 */
1328void 1363void
1329rxvt_term::scr_insdel_chars (int count, int insdel) 1364rxvt_term::scr_insdel_chars (int count, int insdel)
1330{ 1365{
1331 int col, row; 1366 int col, row;
1332 rend_t tr; 1367 rend_t tr;
1333 text_t *stp; 1368 text_t *stp;
1334 rend_t *srp; 1369 rend_t *srp;
1335 int16_t *slp; 1370 int16_t *slp;
1336 1371
1337 want_refresh = 1; 1372 want_refresh = 1;
1338 ZERO_SCROLLBACK(); 1373 ZERO_SCROLLBACK();
1339 1374
1340#ifdef RXVT_GRAPHICS 1375#ifdef RXVT_GRAPHICS
1341 if (Gr_Displayed ()) 1376 if (Gr_Displayed ())
1342 Gr_scroll (0); 1377 Gr_scroll (0);
1343#endif 1378#endif
1344 1379
1345 if (count <= 0) 1380 if (count <= 0)
1346 return; 1381 return;
1347 1382
1348 selection_check (1); 1383 selection_check (1);
1349 MIN_IT(count, (TermWin.ncol - screen.cur.col)); 1384 MIN_IT(count, (TermWin.ncol - screen.cur.col));
1350 1385
1351 row = screen.cur.row + TermWin.saveLines; 1386 row = screen.cur.row + TermWin.saveLines;
1352 screen.flags &= ~Screen_WrapNext; 1387 screen.flags &= ~Screen_WrapNext;
1353 1388
1354 stp = screen.text[row]; 1389 stp = screen.text[row];
1355 srp = screen.rend[row]; 1390 srp = screen.rend[row];
1356 slp = &(screen.tlen[row]); 1391 slp = &(screen.tlen[row]);
1357 switch (insdel) { 1392 switch (insdel)
1393 {
1358 case INSERT: 1394 case INSERT:
1359 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1395 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1360 col--) { 1396 col--)
1397 {
1361 stp[col] = stp[col - count]; 1398 stp[col] = stp[col - count];
1362 srp[col] = srp[col - count]; 1399 srp[col] = srp[col - count];
1363 } 1400 }
1364 if (*slp != -1) { 1401 if (*slp != -1)
1402 {
1365 *slp += count; 1403 *slp += count;
1366 MIN_IT(*slp, TermWin.ncol); 1404 MIN_IT(*slp, TermWin.ncol);
1367 } 1405 }
1368 if (selection.op && current_screen == selection.screen 1406 if (selection.op && current_screen == selection.screen
1369 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) { 1407 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur))
1408 {
1370 if (selection.end.row != screen.cur.row 1409 if (selection.end.row != screen.cur.row
1371 || (selection.end.col + count >= TermWin.ncol)) 1410 || (selection.end.col + count >= TermWin.ncol))
1372 CLEAR_SELECTION(); 1411 CLEAR_SELECTION();
1412 else
1373 else { /* shift selection */ 1413 { /* shift selection */
1374 selection.beg.col += count; 1414 selection.beg.col += count;
1375 selection.mark.col += count; /* XXX: yes? */ 1415 selection.mark.col += count; /* XXX: yes? */
1376 selection.end.col += count; 1416 selection.end.col += count;
1377 } 1417 }
1378 } 1418 }
1379 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1419 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]),
1380 (unsigned int)count, rstyle); 1420 (unsigned int)count, rstyle);
1381 break; 1421 break;
1382 case ERASE: 1422 case ERASE:
1383 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1423 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1384 selection_check (1); 1424 selection_check (1);
1385 screen.cur.col -= count; 1425 screen.cur.col -= count;
1386 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1426 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]),
1387 (unsigned int)count, rstyle); 1427 (unsigned int)count, rstyle);
1388 break; 1428 break;
1389 case DELETE: 1429 case DELETE:
1390 tr = srp[TermWin.ncol - 1] 1430 tr = srp[TermWin.ncol - 1]
1391 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1431 & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1392 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) { 1432 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1433 {
1393 stp[col] = stp[col + count]; 1434 stp[col] = stp[col + count];
1394 srp[col] = srp[col + count]; 1435 srp[col] = srp[col + count];
1395 } 1436 }
1396 scr_blank_line (&(stp[TermWin.ncol - count]), 1437 scr_blank_line (&(stp[TermWin.ncol - count]),
1397 &(srp[TermWin.ncol - count]), 1438 &(srp[TermWin.ncol - count]),
1398 (unsigned int)count, tr); 1439 (unsigned int)count, tr);
1399 if (*slp == -1) /* break line continuation */ 1440 if (*slp == -1) /* break line continuation */
1400 *slp = TermWin.ncol; 1441 *slp = TermWin.ncol;
1401 *slp -= count; 1442 *slp -= count;
1402 MAX_IT(*slp, 0); 1443 MAX_IT(*slp, 0);
1403 if (selection.op && current_screen == selection.screen 1444 if (selection.op && current_screen == selection.screen
1404 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) { 1445 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur))
1446 {
1405 if (selection.end.row != screen.cur.row 1447 if (selection.end.row != screen.cur.row
1406 || (screen.cur.col >= selection.beg.col - count) 1448 || (screen.cur.col >= selection.beg.col - count)
1407 || selection.end.col >= TermWin.ncol) 1449 || selection.end.col >= TermWin.ncol)
1408 CLEAR_SELECTION(); 1450 CLEAR_SELECTION();
1409 else { 1451 else
1452 {
1410 /* shift selection */ 1453 /* shift selection */
1411 selection.beg.col -= count; 1454 selection.beg.col -= count;
1412 selection.mark.col -= count; /* XXX: yes? */ 1455 selection.mark.col -= count; /* XXX: yes? */
1413 selection.end.col -= count; 1456 selection.end.col -= count;
1414 } 1457 }
1415 } 1458 }
1416 break; 1459 break;
1417 } 1460 }
1418} 1461}
1419 1462
1420/* ------------------------------------------------------------------------- */ 1463/* ------------------------------------------------------------------------- */
… …
1423 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1424 */ 1467 */
1425void 1468void
1426rxvt_term::scr_scroll_region (int top, int bot) 1469rxvt_term::scr_scroll_region (int top, int bot)
1427{ 1470{
1428 MAX_IT(top, 0); 1471 MAX_IT(top, 0);
1429 MIN_IT(bot, (int)TermWin.nrow - 1); 1472 MIN_IT(bot, (int)TermWin.nrow - 1);
1430 if (top > bot) 1473 if (top > bot)
1431 return; 1474 return;
1432 screen.tscroll = top; 1475 screen.tscroll = top;
1433 screen.bscroll = bot; 1476 screen.bscroll = bot;
1434 scr_gotorc (0, 0, 0); 1477 scr_gotorc (0, 0, 0);
1435} 1478}
1436 1479
1437/* ------------------------------------------------------------------------- */ 1480/* ------------------------------------------------------------------------- */
1438/* 1481/*
1439 * Make the cursor visible/invisible 1482 * Make the cursor visible/invisible
… …
1441 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1484 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1442 */ 1485 */
1443void 1486void
1444rxvt_term::scr_cursor_visible (int mode) 1487rxvt_term::scr_cursor_visible (int mode)
1445{ 1488{
1446 want_refresh = 1; 1489 want_refresh = 1;
1447 if (mode) 1490 if (mode)
1448 screen.flags |= Screen_VisibleCursor; 1491 screen.flags |= Screen_VisibleCursor;
1449 else 1492 else
1450 screen.flags &= ~Screen_VisibleCursor; 1493 screen.flags &= ~Screen_VisibleCursor;
1451} 1494}
1452 1495
1453/* ------------------------------------------------------------------------- */ 1496/* ------------------------------------------------------------------------- */
1454/* 1497/*
1455 * Set/unset automatic wrapping 1498 * Set/unset automatic wrapping
… …
1457 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1500 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1458 */ 1501 */
1459void 1502void
1460rxvt_term::scr_autowrap (int mode) 1503rxvt_term::scr_autowrap (int mode)
1461{ 1504{
1462 if (mode) 1505 if (mode)
1463 screen.flags |= Screen_Autowrap; 1506 screen.flags |= Screen_Autowrap;
1464 else 1507 else
1465 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1508 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1466} 1509}
1467 1510
1468/* ------------------------------------------------------------------------- */ 1511/* ------------------------------------------------------------------------- */
1469/* 1512/*
1470 * Set/unset margin origin mode 1513 * Set/unset margin origin mode
… …
1476 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1519 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1477 */ 1520 */
1478void 1521void
1479rxvt_term::scr_relative_origin (int mode) 1522rxvt_term::scr_relative_origin (int mode)
1480{ 1523{
1481 if (mode) 1524 if (mode)
1482 screen.flags |= Screen_Relative; 1525 screen.flags |= Screen_Relative;
1483 else 1526 else
1484 screen.flags &= ~Screen_Relative; 1527 screen.flags &= ~Screen_Relative;
1485 scr_gotorc (0, 0, 0); 1528 scr_gotorc (0, 0, 0);
1486} 1529}
1487 1530
1488/* ------------------------------------------------------------------------- */ 1531/* ------------------------------------------------------------------------- */
1489/* 1532/*
1490 * Set insert/replace mode 1533 * Set insert/replace mode
… …
1492 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1535 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1493 */ 1536 */
1494void 1537void
1495rxvt_term::scr_insert_mode (int mode) 1538rxvt_term::scr_insert_mode (int mode)
1496{ 1539{
1497 if (mode) 1540 if (mode)
1498 screen.flags |= Screen_Insert; 1541 screen.flags |= Screen_Insert;
1499 else 1542 else
1500 screen.flags &= ~Screen_Insert; 1543 screen.flags &= ~Screen_Insert;
1501} 1544}
1502 1545
1503/* ------------------------------------------------------------------------- */ 1546/* ------------------------------------------------------------------------- */
1504/* 1547/*
1505 * Set/Unset tabs 1548 * Set/Unset tabs
… …
1508 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1551 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1509 */ 1552 */
1510void 1553void
1511rxvt_term::scr_set_tab (int mode) 1554rxvt_term::scr_set_tab (int mode)
1512{ 1555{
1513 if (mode < 0) 1556 if (mode < 0)
1514 MEMSET(tabs, 0, TermWin.ncol * sizeof(char)); 1557 MEMSET(tabs, 0, TermWin.ncol * sizeof(char));
1515 else if (screen.cur.col < TermWin.ncol) 1558 else if (screen.cur.col < TermWin.ncol)
1516 tabs[screen.cur.col] = (mode ? 1 : 0); 1559 tabs[screen.cur.col] = (mode ? 1 : 0);
1517} 1560}
1518 1561
1519/* ------------------------------------------------------------------------- */ 1562/* ------------------------------------------------------------------------- */
1520/* 1563/*
1521 * Set reverse/normal video 1564 * Set reverse/normal video
… …
1523 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1566 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1524 */ 1567 */
1525void 1568void
1526rxvt_term::scr_rvideo_mode (int mode) 1569rxvt_term::scr_rvideo_mode (int mode)
1527{ 1570{
1528 XGCValues gcvalue; 1571 XGCValues gcvalue;
1529 1572
1530 if (rvideo != mode) { 1573 if (rvideo != mode)
1574 {
1531 rvideo = mode; 1575 rvideo = mode;
1532 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1576 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1533#if defined(XPM_BACKGROUND) 1577#if defined(XPM_BACKGROUND)
1534 if (bgPixmap.pixmap == None) 1578 if (bgPixmap.pixmap == None)
1535#endif 1579#endif
1536#if defined(TRANSPARENT) 1580#if defined(TRANSPARENT)
1537 if (!(Options & Opt_transparent) || am_transparent == 0) 1581 if (!(Options & Opt_transparent) || am_transparent == 0)
1538#endif 1582#endif
1539 XSetWindowBackground(Xdisplay, TermWin.vt, 1583 XSetWindowBackground(Xdisplay, TermWin.vt,
1540 PixColors[Color_bg]); 1584 PixColors[Color_bg]);
1541 1585
1542 gcvalue.foreground = PixColors[Color_fg]; 1586 gcvalue.foreground = PixColors[Color_fg];
1543 gcvalue.background = PixColors[Color_bg]; 1587 gcvalue.background = PixColors[Color_bg];
1544 XChangeGC(Xdisplay, TermWin.gc, GCBackground | GCForeground, 1588 XChangeGC(Xdisplay, TermWin.gc, GCBackground | GCForeground,
1545 &gcvalue); 1589 &gcvalue);
1546 scr_clear (); 1590 scr_clear ();
1547 scr_touch (true); 1591 scr_touch (true);
1548 } 1592 }
1549} 1593}
1550 1594
1551/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1552/* 1596/*
… …
1554 * XTERM_SEQ: Report position: ESC [ 6 n 1598 * XTERM_SEQ: Report position: ESC [ 6 n
1555 */ 1599 */
1556void 1600void
1557rxvt_term::scr_report_position () 1601rxvt_term::scr_report_position ()
1558{ 1602{
1559 tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1603 tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1560} 1604}
1561 1605
1562/* ------------------------------------------------------------------------- * 1606/* ------------------------------------------------------------------------- *
1563 * FONTS * 1607 * FONTS *
1564 * ------------------------------------------------------------------------- */ 1608 * ------------------------------------------------------------------------- */
… …
1567 * Set font style 1611 * Set font style
1568 */ 1612 */
1569void 1613void
1570rxvt_term::set_font_style () 1614rxvt_term::set_font_style ()
1571{ 1615{
1572 switch (charsets[screen.charset]) { 1616 switch (charsets[screen.charset])
1617 {
1573 case '0': /* DEC Special Character & Line Drawing Set */ 1618 case '0': /* DEC Special Character & Line Drawing Set */
1574 break; 1619 break;
1575 case 'A': /* United Kingdom (UK) */ 1620 case 'A': /* United Kingdom (UK) */
1576 break; 1621 break;
1577 case 'B': /* United States (USASCII) */ 1622 case 'B': /* United States (USASCII) */
1578 break; 1623 break;
1579 case '<': /* Multinational character set */ 1624 case '<': /* Multinational character set */
1580 break; 1625 break;
1581 case '5': /* Finnish character set */ 1626 case '5': /* Finnish character set */
1582 break; 1627 break;
1583 case 'C': /* Finnish character set */ 1628 case 'C': /* Finnish character set */
1584 break; 1629 break;
1585 case 'K': /* German character set */ 1630 case 'K': /* German character set */
1586 break; 1631 break;
1587 } 1632 }
1588} 1633}
1589 1634
1590/* ------------------------------------------------------------------------- */ 1635/* ------------------------------------------------------------------------- */
… …
1595 * XTERM_SEQ: Invoke G2 character set: ESC N 1640 * XTERM_SEQ: Invoke G2 character set: ESC N
1596 * XTERM_SEQ: Invoke G3 character set: ESC O 1641 * XTERM_SEQ: Invoke G3 character set: ESC O
1597 */ 1642 */
1598void 1643void
1599rxvt_term::scr_charset_choose (int set) 1644rxvt_term::scr_charset_choose (int set)
1600{ 1645 {
1601 screen.charset = set; 1646 screen.charset = set;
1602 set_font_style (); 1647 set_font_style ();
1603} 1648 }
1604 1649
1605/* ------------------------------------------------------------------------- */ 1650/* ------------------------------------------------------------------------- */
1606/* 1651/*
1607 * Set a font 1652 * Set a font
1608 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1653 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1611 * XTERM_SEQ: Set G3 character set: ESC + <C> 1656 * XTERM_SEQ: Set G3 character set: ESC + <C>
1612 * See set_font_style for possible values for <C> 1657 * See set_font_style for possible values for <C>
1613 */ 1658 */
1614void 1659void
1615rxvt_term::scr_charset_set (int set, unsigned int ch) 1660rxvt_term::scr_charset_set (int set, unsigned int ch)
1616{ 1661 {
1617 charsets[set] = (unsigned char)ch; 1662 charsets[set] = (unsigned char)ch;
1618 set_font_style (); 1663 set_font_style ();
1619} 1664 }
1620 1665
1621 1666
1622/* ------------------------------------------------------------------------- * 1667/* ------------------------------------------------------------------------- *
1623 * MAJOR SCREEN MANIPULATION * 1668 * MAJOR SCREEN MANIPULATION *
1624 * ------------------------------------------------------------------------- */ 1669 * ------------------------------------------------------------------------- */
… …
1649 1694
1650/* 1695/*
1651 * Refresh an area 1696 * Refresh an area
1652 */ 1697 */
1653enum { 1698enum {
1654 PART_BEG = 0, 1699 PART_BEG = 0,
1655 PART_END, 1700 PART_END,
1656 RC_COUNT 1701 RC_COUNT
1657}; 1702};
1658 1703
1659void 1704void
1660rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1705rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1661{ 1706{
… …
1670 x = min(x, (int)TermWin.width); 1715 x = min(x, (int)TermWin.width);
1671 y = max(y, (int)TermWin.int_bwidth); 1716 y = max(y, (int)TermWin.int_bwidth);
1672 y = min(y, (int)TermWin.height); 1717 y = min(y, (int)TermWin.height);
1673#endif 1718#endif
1674 1719
1675/* round down */ 1720 /* round down */
1676 rc[PART_BEG].col = Pixel2Col(x); 1721 rc[PART_BEG].col = Pixel2Col(x);
1677 rc[PART_BEG].row = Pixel2Row(y); 1722 rc[PART_BEG].row = Pixel2Row(y);
1678/* round up */ 1723 /* round up */
1679 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1724 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1);
1680 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1725 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1);
1681 1726
1682/* sanity checks */ 1727 /* sanity checks */
1683 for (i = PART_BEG; i < RC_COUNT; i++) 1728 for (i = PART_BEG; i < RC_COUNT; i++)
1684 { 1729 {
1685 MIN_IT(rc[i].col, TermWin.ncol - 1); 1730 MIN_IT(rc[i].col, TermWin.ncol - 1);
1686 MIN_IT(rc[i].row, TermWin.nrow - 1); 1731 MIN_IT(rc[i].row, TermWin.nrow - 1);
1687 } 1732 }
… …
1712 * the top of the screen 1757 * the top of the screen
1713 */ 1758 */
1714int 1759int
1715rxvt_term::scr_move_to (int y, int len) 1760rxvt_term::scr_move_to (int y, int len)
1716{ 1761{
1717 long p = 0; 1762 long p = 0;
1718 uint16_t oldviewstart; 1763 uint16_t oldviewstart;
1719 1764
1720 oldviewstart = TermWin.view_start; 1765 oldviewstart = TermWin.view_start;
1721 if (y < len) { 1766 if (y < len)
1767 {
1722 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1768 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1723 p -= (long)(TermWin.nrow - 1); 1769 p -= (long)(TermWin.nrow - 1);
1724 p = max(p, 0); 1770 p = max(p, 0);
1725 } 1771 }
1726 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled); 1772 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled);
1727 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); 1773 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start));
1728 1774
1729 return scr_changeview (oldviewstart); 1775 return scr_changeview (oldviewstart);
1730} 1776}
1731 1777
1732/* ------------------------------------------------------------------------- */ 1778/* ------------------------------------------------------------------------- */
1733/* 1779/*
1734 * Page the screen up/down nlines 1780 * Page the screen up/down nlines
1735 * direction should be UP or DN 1781 * direction should be UP or DN
1736 */ 1782 */
1737int 1783int
1738rxvt_term::scr_page (enum page_dirn direction, int nlines) 1784rxvt_term::scr_page (enum page_dirn direction, int nlines)
1739{ 1785{
1740 int n; 1786 int n;
1741 uint16_t oldviewstart; 1787 uint16_t oldviewstart;
1742 1788
1743 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1789 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1744#ifdef DEBUG_STRICT 1790#ifdef DEBUG_STRICT
1745 assert((nlines >= 0) && (nlines <= TermWin.nrow)); 1791 assert((nlines >= 0) && (nlines <= TermWin.nrow));
1746#endif 1792#endif
1747 oldviewstart = TermWin.view_start; 1793 oldviewstart = TermWin.view_start;
1748 if (direction == UP) { 1794 if (direction == UP)
1795 {
1749 n = TermWin.view_start + nlines; 1796 n = TermWin.view_start + nlines;
1750 TermWin.view_start = min(n, TermWin.nscrolled); 1797 TermWin.view_start = min(n, TermWin.nscrolled);
1751 } else { 1798 }
1799 else
1800 {
1752 n = TermWin.view_start - nlines; 1801 n = TermWin.view_start - nlines;
1753 TermWin.view_start = max(n, 0); 1802 TermWin.view_start = max(n, 0);
1754 } 1803 }
1755 return scr_changeview (oldviewstart); 1804 return scr_changeview (oldviewstart);
1756} 1805}
1757 1806
1758int 1807int
1759rxvt_term::scr_changeview (uint16_t oldviewstart) 1808rxvt_term::scr_changeview (uint16_t oldviewstart)
1760{ 1809{
1761 if (TermWin.view_start != oldviewstart) { 1810 if (TermWin.view_start != oldviewstart)
1811 {
1762 want_refresh = 1; 1812 want_refresh = 1;
1763#ifdef RXVT_GRAPHICS 1813#ifdef RXVT_GRAPHICS
1764 if (Gr_Displayed ()) 1814 if (Gr_Displayed ())
1765 Gr_scroll (0); 1815 Gr_scroll (0);
1766#endif 1816#endif
1767 num_scr -= (TermWin.view_start - oldviewstart); 1817 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1818 }
1769 return (int)(TermWin.view_start - oldviewstart); 1819 return (int)(TermWin.view_start - oldviewstart);
1770} 1820}
1771 1821
1772/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1773void 1823void
1774rxvt_term::scr_bell () 1824rxvt_term::scr_bell ()
1775{ 1825{
1776#ifndef NO_BELL 1826#ifndef NO_BELL
1777# ifndef NO_MAPALERT 1827# ifndef NO_MAPALERT
1778# ifdef MAPALERT_OPTION 1828# ifdef MAPALERT_OPTION
1779 if (Options & Opt_mapAlert) 1829 if (Options & Opt_mapAlert)
1780# endif 1830# endif
1781 XMapWindow(Xdisplay, TermWin.parent[0]); 1831 XMapWindow(Xdisplay, TermWin.parent[0]);
1782# endif 1832# endif
1783 if (Options & Opt_visualBell) { 1833 if (Options & Opt_visualBell)
1834 {
1784 scr_rvideo_mode (!rvideo); /* refresh also done */ 1835 scr_rvideo_mode (!rvideo); /* refresh also done */
1785 scr_rvideo_mode (!rvideo); /* refresh also done */ 1836 scr_rvideo_mode (!rvideo); /* refresh also done */
1837 }
1786 } else 1838 else
1787 XBell(Xdisplay, 0); 1839 XBell(Xdisplay, 0);
1788#endif 1840#endif
1789} 1841}
1790 1842
1791/* ------------------------------------------------------------------------- */ 1843/* ------------------------------------------------------------------------- */
1792/* ARGSUSED */ 1844/* ARGSUSED */
1793void 1845void
1794rxvt_term::scr_printscreen (int fullhist) 1846rxvt_term::scr_printscreen (int fullhist)
1795{ 1847{
1796#ifdef PRINTPIPE 1848#ifdef PRINTPIPE
1797 int i, r1, nrows, row_offset; 1849 int i, r1, nrows, row_offset;
1798 text_t *t; 1850 text_t *t;
1799 FILE *fd; 1851 FILE *fd;
1800 1852
1801 if ((fd = popen_printer ()) == NULL) 1853 if ((fd = popen_printer ()) == NULL)
1802 return; 1854 return;
1803 nrows = TermWin.nrow; 1855 nrows = TermWin.nrow;
1804 row_offset = TermWin.saveLines; 1856 row_offset = TermWin.saveLines;
1805 if (!fullhist) 1857 if (!fullhist)
1806 row_offset -= TermWin.view_start; 1858 row_offset -= TermWin.view_start;
1807 else { 1859 else
1860 {
1808 nrows += TermWin.nscrolled; 1861 nrows += TermWin.nscrolled;
1809 row_offset -= TermWin.nscrolled; 1862 row_offset -= TermWin.nscrolled;
1810 } 1863 }
1811 1864
1812 for (r1 = 0; r1 < nrows; r1++) { 1865 for (r1 = 0; r1 < nrows; r1++)
1866 {
1813 t = screen.text[r1 + row_offset]; 1867 t = screen.text[r1 + row_offset];
1814 for (i = TermWin.ncol - 1; i >= 0; i--) 1868 for (i = TermWin.ncol - 1; i >= 0; i--)
1815 if (!isspace(t[i])) 1869 if (!isspace(t[i]))
1816 break; 1870 break;
1817 fprintf(fd, "%.*s\n", (i + 1), t); 1871 fprintf(fd, "%.*s\n", (i + 1), t);
1818 } 1872 }
1819 pclose_printer (fd); 1873 pclose_printer (fd);
1820#endif 1874#endif
1821} 1875}
1822 1876
1823/* ------------------------------------------------------------------------- */ 1877/* ------------------------------------------------------------------------- */
1824/* 1878/*
… …
1837 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1838 1892
1839void 1893void
1840rxvt_term::scr_refresh (unsigned char refresh_type) 1894rxvt_term::scr_refresh (unsigned char refresh_type)
1841{ 1895{
1842 unsigned char clearfirst, /* first character writes before cell */ 1896 unsigned char clearfirst, /* first character writes before cell */
1843 clearlast, /* last character writes beyond cell */ 1897 clearlast, /* last character writes beyond cell */
1844 must_clear, /* use draw_string not draw_image_string */ 1898 must_clear, /* use draw_string not draw_image_string */
1845 rvid, /* reverse video this position */ 1899 rvid, /* reverse video this position */
1846 showcursor; /* show the cursor */ 1900 showcursor; /* show the cursor */
1847 int16_t col, row, /* column/row we're processing */ 1901 int16_t col, row, /* column/row we're processing */
1848 ocrow; /* old cursor row */ 1902 ocrow; /* old cursor row */
1849 int cursorwidth; 1903 int cursorwidth;
1850 int i, /* tmp */ 1904 int i, /* tmp */
1851 row_offset; /* basic offset in screen structure */ 1905 row_offset; /* basic offset in screen structure */
1852#ifndef NO_CURSORCOLOR 1906#ifndef NO_CURSORCOLOR
1853 rend_t cc1; /* store colours at cursor position(s) */ 1907 rend_t cc1; /* store colours at cursor position(s) */
1854#endif 1908#endif
1855 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1856 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1857 1911
1858 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1912 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1859 return; 1913 return;
1860 1914
1861 /* 1915 /*
1862 * A: set up vars 1916 * A: set up vars
1863 */ 1917 */
1864 clearfirst = clearlast = must_clear = 0; 1918 clearfirst = clearlast = must_clear = 0;
1865 1919
1866 refresh_count = 0; 1920 refresh_count = 0;
1867 1921
1868 row_offset = TermWin.saveLines - TermWin.view_start; 1922 row_offset = TermWin.saveLines - TermWin.view_start;
1869 1923
1870 if ((refresh_type & REFRESH_BOUNDS)) 1924 if ((refresh_type & REFRESH_BOUNDS))
1925 {
1926 clearfirst = clearlast = 1;
1927 refresh_type &= ~REFRESH_BOUNDS;
1928 }
1929
1930#ifdef XPM_BACKGROUND
1931 must_clear |= (bgPixmap.pixmap != None);
1932#endif
1933#ifdef TRANSPARENT
1934 must_clear |= ((Options & Opt_transparent) && am_transparent);
1935#endif
1936 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1937
1938 /*
1939 * B: reverse any characters which are selected
1940 */
1941 scr_reverse_selection ();
1942
1943 /*
1944 * C: set the cursor character(s)
1945 */
1946 {
1947 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */
1950
1951 showcursor = (screen.flags & Screen_VisibleCursor);
1952 cursorwidth = 0;
1953#ifdef CURSOR_BLINK
1954 if (hidden_cursor)
1955 showcursor = 0;
1956#endif
1957
1958 cursorwidth = 0;
1959
1960 if (showcursor)
1871 { 1961 {
1872 clearfirst = clearlast = 1;
1873 refresh_type &= ~REFRESH_BOUNDS;
1874 }
1875
1876#ifdef XPM_BACKGROUND
1877 must_clear |= (bgPixmap.pixmap != None);
1878#endif
1879#ifdef TRANSPARENT
1880 must_clear |= ((Options & Opt_transparent) && am_transparent);
1881#endif
1882 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1883
1884 /*
1885 * B: reverse any characters which are selected
1886 */
1887 scr_reverse_selection ();
1888
1889 /*
1890 * C: set the cursor character(s)
1891 */
1892 {
1893 unsigned char setoldcursor;
1894 rend_t ccol1, /* Cursor colour */
1895 ccol2; /* Cursor colour2 */
1896
1897 showcursor = (screen.flags & Screen_VisibleCursor);
1898 cursorwidth = 0;
1899#ifdef CURSOR_BLINK
1900 if (hidden_cursor)
1901 showcursor = 0;
1902#endif
1903
1904 cursorwidth = 0;
1905
1906 if (showcursor)
1907 {
1908 cursorwidth++; 1962 cursorwidth++;
1909 1963
1910 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 1964 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
1911 [screen.cur.col]); 1965 [screen.cur.col]);
1912 1966
1913 if (showcursor && TermWin.focus) 1967 if (showcursor && TermWin.focus)
1914 { 1968 {
1915 *srp ^= RS_RVid; 1969 *srp ^= RS_RVid;
1916#ifndef NO_CURSORCOLOR 1970#ifndef NO_CURSORCOLOR
1917 cc1 = *srp & (RS_fgMask | RS_bgMask); 1971 cc1 = *srp & (RS_fgMask | RS_bgMask);
1918 if (ISSET_PIXCOLOR (Color_cursor)) 1972 if (ISSET_PIXCOLOR (Color_cursor))
1919 ccol1 = Color_cursor; 1973 ccol1 = Color_cursor;
1920 else 1974 else
1921#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1975#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1922 ccol1 = GET_FGCOLOR(rstyle); 1976 ccol1 = GET_FGCOLOR(rstyle);
1923#else 1977#else
1924 ccol1 = Color_fg; 1978 ccol1 = Color_fg;
1925#endif 1979#endif
1926 if (ISSET_PIXCOLOR (Color_cursor2)) 1980 if (ISSET_PIXCOLOR (Color_cursor2))
1927 ccol2 = Color_cursor2; 1981 ccol2 = Color_cursor2;
1928 else 1982 else
1929#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1983#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1930 ccol2 = GET_BGCOLOR(rstyle); 1984 ccol2 = GET_BGCOLOR(rstyle);
1931#else 1985#else
1932 ccol2 = Color_bg; 1986 ccol2 = Color_bg;
1933#endif 1987#endif
1934 *srp = SET_FGCOLOR(*srp, ccol1); 1988 *srp = SET_FGCOLOR(*srp, ccol1);
1935 *srp = SET_BGCOLOR(*srp, ccol2); 1989 *srp = SET_BGCOLOR(*srp, ccol2);
1936#endif 1990#endif
1937 }
1938 }
1939 1991
1940 /* make sure no outline cursor is left around */
1941 setoldcursor = 0;
1942 if (ocrow != -1) {
1943 if (screen.cur.row + TermWin.view_start != ocrow
1944 || screen.cur.col != oldcursor.col) {
1945 if (ocrow < TermWin.nrow
1946 && oldcursor.col < TermWin.ncol) {
1947 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1948 }
1949 if (TermWin.focus || !showcursor)
1950 oldcursor.row = -1;
1951 else
1952 setoldcursor = 1;
1953 }
1954 } else if (!TermWin.focus)
1955 setoldcursor = 1;
1956 if (setoldcursor) {
1957 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1958 oldcursor.row = -1;
1959 else {
1960 oldcursor.row = screen.cur.row + TermWin.view_start;
1961 oldcursor.col = screen.cur.col;
1962 } 1992 }
1963 } 1993 }
1994
1995 /* make sure no outline cursor is left around */
1996 setoldcursor = 0;
1997 if (ocrow != -1)
1998 {
1999 if (screen.cur.row + TermWin.view_start != ocrow
2000 || screen.cur.col != oldcursor.col)
2001 {
2002 if (ocrow < TermWin.nrow
2003 && oldcursor.col < TermWin.ncol)
2004 {
2005 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2006 }
2007 if (TermWin.focus || !showcursor)
2008 oldcursor.row = -1;
2009 else
2010 setoldcursor = 1;
2011 }
1964 } 2012 }
2013 else if (!TermWin.focus)
2014 setoldcursor = 1;
2015 if (setoldcursor)
2016 {
2017 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2018 oldcursor.row = -1;
2019 else
2020 {
2021 oldcursor.row = screen.cur.row + TermWin.view_start;
2022 oldcursor.col = screen.cur.col;
2023 }
2024 }
2025 }
1965 2026
1966#ifndef NO_SLOW_LINK_SUPPORT 2027#ifndef NO_SLOW_LINK_SUPPORT
2028 /*
2029 * D: CopyArea pass - very useful for slower links
2030 * This has been deliberately kept simple.
2031 */
2032 i = num_scr;
2033 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2034 && abs(i) < TermWin.nrow && !must_clear)
2035 {
2036 int16_t nits;
2037 int j;
2038 rend_t *drp2;
2039 text_t *dtp2;
2040 int len, wlen;
2041
2042 j = TermWin.nrow;
2043 wlen = len = -1;
2044 row = i > 0 ? 0 : j - 1;
2045 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2046 {
2047 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2048 {
2049 stp = screen.text[row + row_offset];
2050 srp = screen.rend[row + row_offset];
2051 dtp = drawn_text[row];
2052 dtp2 = drawn_text[row + i];
2053 drp = drawn_rend[row];
2054 drp2 = drawn_rend[row + i];
2055
2056 for (nits = 0, col = TermWin.ncol; col--; )
2057 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2058 nits--;
2059 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2060 nits++;
2061
2062 if (nits > 8) /* XXX: arbitrary choice */
2063 {
2064 for (col = TermWin.ncol; col--; )
2065 {
2066 *dtp++ = *dtp2++;
2067 *drp++ = *drp2++;
2068 }
2069
2070 if (len == -1)
2071 len = row;
2072
2073 wlen = row;
2074 continue;
2075 }
2076 }
2077
2078 if (len != -1)
2079 {
2080 /* also comes here at end if needed because of >= above */
2081 if (wlen < len)
2082 SWAP_IT(wlen, len, int);
2083
2084 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2085 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2086 TermWin.gc, 0, Row2Pixel (len + i),
2087 (unsigned int)TermWin_TotalWidth (),
2088 (unsigned int)Height2Pixel (wlen - len + 1),
2089 0, Row2Pixel (len));
2090 len = -1;
2091 }
2092 }
2093 }
2094#endif
2095
2096 /*
2097 * E: main pass across every character
2098 */
2099 for (row = 0; row < TermWin.nrow; row++)
2100 {
2101 stp = screen.text[row + row_offset];
2102 srp = screen.rend[row + row_offset];
2103 dtp = drawn_text[row];
2104 drp = drawn_rend[row];
2105
2106 /*
2107 * E2: OK, now the real pass
2108 */
2109 int ypixel = (int)Row2Pixel(row);
2110
2111 for (col = 0; col < TermWin.ncol; col++)
2112 {
2113 /* compare new text with old - if exactly the same then continue */
2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2115
2116 if (stp[col] == dtp[col] /* Must match characters to skip. */
2117 && (rend == drp[col] /* Either rendition the same or */
2118 || (stp[col] == ' ' /* space w/ no background change */
2119 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2120 continue;
2121
2122 text_t *text = stp + col;
2123 int count = 1;
2124
2125 /* redraw one or more characters */
2126
2127 dtp[col] = stp[col];
2128 drp[col] = rend;
2129
2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2131 continue;
2132
2133 int xpixel = Col2Pixel(col);
2134
2135 // this loop looks very messy, it can probably be optimized
2136 // and cleaned a bit by you?
2137 for (i = 0; ++col < TermWin.ncol; )
2138 {
2139 if (stp[col] == NOCHAR)
2140 {
2141 dtp[col] = stp[col];
2142 drp[col] = rend;
2143 count++;
2144
2145 if (i) // only possible skip if char unchanged
2146 i++;
2147
2148 continue;
2149 }
2150
2151 if (rend != srp[col])
2152 break;
2153
2154 count++;
2155
2156 if (stp[col] != dtp[col]
2157 || srp[col] != drp[col])
2158 {
2159 if (must_clear && (i++ > (count / 2)))
2160 break;
2161
2162 dtp[col] = stp[col];
2163 drp[col] = rend;
2164 i = 0;
2165 }
2166 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2167 break;
2168 }
2169
2170 col--; /* went one too far. move back */
2171 count -= i; /* dump any matching trailing chars */
2172
2173 /*
2174 * Determine the attributes for the string
2175 */
2176 int fid = GET_FONT (rend);
2177 int fore = GET_FGCOLOR (rend); // desired foreground
2178 int back = GET_BGCOLOR (rend); // desired background
2179
2180 rend = GET_ATTR (rend);
2181
2182 rvid = !!(rend & RS_RVid);
2183 if (rvid)
2184 {
2185 SWAP_IT(fore, back, int);
2186
2187#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (ISSET_PIXCOLOR (Color_RV)
2189# ifndef NO_CURSORCOLOR
2190 && !ISSET_PIXCOLOR (Color_cursor)
2191# endif
2192 )
2193 back = Color_RV;
2194#endif
2195
2196 }
2197#ifdef TEXT_BLINK
2198 if (rend & RS_Blink)
2199 {
2200 if (!text_blink_ev.active)
2201 {
2202 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2203 hidden_text = 0;
2204 }
2205 else if (hidden_text)
2206 fore = back;
2207 }
2208#endif
2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2210 else if (rend & RS_Bold)
2211 {
2212 if (ISSET_PIXCOLOR (Color_BD))
2213 fore = Color_BD;
2214 else if (fore == Color_fg)
2215 fore = Color_White;
2216 }
2217 else if (rend & RS_Uline)
2218 {
2219 if (ISSET_PIXCOLOR (Color_UL))
2220 fore = Color_UL;
2221 }
2222#endif
2223
2224 /*
2225 * Actually do the drawing of the string here
2226 */
2227 rxvt_font *font = (*TermWin.fontset)[fid];
2228
2229 if (back == fore)
2230 font->clear_rect (xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight,
2232 back);
2233 else if (back == Color_bg)
2234 {
2235 if (must_clear)
2236 {
2237 CLEAR_CHARS (xpixel, ypixel, count);
2238
2239 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ')
2241 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1);
2243 break;
2244 }
2245 }
2246 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2248 }
2249 else
2250 font->draw (xpixel, ypixel, text, count, fore, back);
2251
2252 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2256 } /* for (col....) */
2257 } /* for (row....) */
2258
2259 /*
2260 * G: cleanup cursor and display outline cursor if necessary
2261 */
2262 if (showcursor)
2263 {
2264 if (TermWin.focus)
2265 {
2266 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
2267 [screen.cur.col]);
2268 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2271#endif
2272
2273 }
2274 else if (oldcursor.row >= 0)
2275 {
2276#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2279#endif
2280 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2281 Col2Pixel(oldcursor.col),
2282 Row2Pixel(oldcursor.row),
2283 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2284 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1));
2285 }
2286 }
2287
2288 /*
2289 * H: cleanup selection
2290 */
2291 scr_reverse_selection ();
2292
2293 /*
2294 * I: other general cleanup
2295 */
2296 if (clearfirst && TermWin.int_bwidth)
1967 /* 2297 /*
1968 * D: CopyArea pass - very useful for slower links 2298 * clear the whole screen height, note that width == 0 is treated
1969 * This has been deliberately kept simple. 2299 * specially by XClearArea
1970 */ 2300 */
1971 i = num_scr; 2301 XClearArea(Xdisplay, TermWin.vt, 0, 0,
1972 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2302 (unsigned int)TermWin.int_bwidth,
1973 && abs(i) < TermWin.nrow && !must_clear)
1974 {
1975 int16_t nits;
1976 int j;
1977 rend_t *drp2;
1978 text_t *dtp2;
1979 int len, wlen;
1980
1981 j = TermWin.nrow;
1982 wlen = len = -1;
1983 row = i > 0 ? 0 : j - 1;
1984 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1985 {
1986 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
1987 {
1988 stp = screen.text[row + row_offset];
1989 srp = screen.rend[row + row_offset];
1990 dtp = drawn_text[row];
1991 dtp2 = drawn_text[row + i];
1992 drp = drawn_rend[row];
1993 drp2 = drawn_rend[row + i];
1994
1995 for (nits = 0, col = TermWin.ncol; col--; )
1996 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
1997 nits--;
1998 else if (stp[col] != dtp[col] || srp[col] != drp[col])
1999 nits++;
2000
2001 if (nits > 8) /* XXX: arbitrary choice */
2002 {
2003 for (col = TermWin.ncol; col--; )
2004 {
2005 *dtp++ = *dtp2++;
2006 *drp++ = *drp2++;
2007 }
2008
2009 if (len == -1)
2010 len = row;
2011
2012 wlen = row;
2013 continue;
2014 }
2015 }
2016
2017 if (len != -1)
2018 {
2019 /* also comes here at end if needed because of >= above */
2020 if (wlen < len)
2021 SWAP_IT(wlen, len, int);
2022
2023 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2024 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2025 TermWin.gc, 0, Row2Pixel (len + i),
2026 (unsigned int)TermWin_TotalWidth (), 2303 (unsigned int)TermWin_TotalHeight(), False);
2027 (unsigned int)Height2Pixel (wlen - len + 1), 2304 if (clearlast && TermWin.int_bwidth)
2028 0, Row2Pixel (len));
2029 len = -1;
2030 }
2031 }
2032 }
2033#endif
2034
2035 /* 2305 /*
2036 * E: main pass across every character 2306 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea
2037 */ 2308 */
2038 for (row = 0; row < TermWin.nrow; row++)
2039 {
2040 stp = screen.text[row + row_offset];
2041 srp = screen.rend[row + row_offset];
2042 dtp = drawn_text[row];
2043 drp = drawn_rend[row];
2044
2045 /*
2046 * E2: OK, now the real pass
2047 */
2048 int ypixel = (int)Row2Pixel(row);
2049
2050 for (col = 0; col < TermWin.ncol; col++)
2051 {
2052 /* compare new text with old - if exactly the same then continue */
2053 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2054
2055 if (stp[col] == dtp[col] /* Must match characters to skip. */
2056 && (rend == drp[col] /* Either rendition the same or */
2057 || (stp[col] == ' ' /* space w/ no background change */
2058 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2059 continue;
2060
2061 text_t *text = stp + col;
2062 int count = 1;
2063
2064 /* redraw one or more characters */
2065
2066 dtp[col] = stp[col];
2067 drp[col] = rend;
2068
2069 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2070 continue;
2071
2072 int xpixel = Col2Pixel(col);
2073
2074 // this loop looks very messy, it can probably be optimized
2075 // and cleaned a bit by you?
2076 for (i = 0; ++col < TermWin.ncol; )
2077 {
2078 if (stp[col] == NOCHAR)
2079 {
2080 dtp[col] = stp[col];
2081 drp[col] = rend;
2082 count++;
2083
2084 if (i) // only possible skip if char unchanged
2085 i++;
2086
2087 continue;
2088 }
2089
2090 if (rend != srp[col])
2091 break;
2092
2093 count++;
2094
2095 if (stp[col] != dtp[col]
2096 || srp[col] != drp[col])
2097 {
2098 if (must_clear && (i++ > (count / 2)))
2099 break;
2100
2101 dtp[col] = stp[col];
2102 drp[col] = rend;
2103 i = 0;
2104 }
2105 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2106 break;
2107 }
2108
2109 col--; /* went one too far. move back */
2110 count -= i; /* dump any matching trailing chars */
2111
2112 /*
2113 * Determine the attributes for the string
2114 */
2115 int fid = GET_FONT (rend);
2116 int fore = GET_FGCOLOR (rend); // desired foreground
2117 int back = GET_BGCOLOR (rend); // desired background
2118
2119 rend = GET_ATTR (rend);
2120
2121 rvid = !!(rend & RS_RVid);
2122 if (rvid)
2123 {
2124 SWAP_IT(fore, back, int);
2125
2126#ifndef NO_BOLD_UNDERLINE_REVERSE
2127 if (ISSET_PIXCOLOR (Color_RV)
2128# ifndef NO_CURSORCOLOR
2129 && !ISSET_PIXCOLOR (Color_cursor)
2130# endif
2131 )
2132 back = Color_RV;
2133#endif
2134 }
2135#ifdef TEXT_BLINK
2136 if (rend & RS_Blink)
2137 {
2138 if (!text_blink_ev.active)
2139 {
2140 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2141 hidden_text = 0;
2142 }
2143 else if (hidden_text)
2144 fore = back;
2145 }
2146#endif
2147#ifndef NO_BOLD_UNDERLINE_REVERSE
2148 else if (rend & RS_Bold)
2149 {
2150 if (ISSET_PIXCOLOR (Color_BD))
2151 fore = Color_BD;
2152 else if (fore == Color_fg)
2153 fore = Color_White;
2154 }
2155 else if (rend & RS_Uline)
2156 {
2157 if (ISSET_PIXCOLOR (Color_UL))
2158 fore = Color_UL;
2159 }
2160#endif
2161
2162 /*
2163 * Actually do the drawing of the string here
2164 */
2165 rxvt_font *font = (*TermWin.fontset)[fid];
2166
2167 if (back == fore)
2168 font->clear_rect (xpixel, ypixel,
2169 TermWin.fwidth * count, TermWin.fheight,
2170 back);
2171 else if (back == Color_bg)
2172 {
2173 if (must_clear)
2174 {
2175 CLEAR_CHARS (xpixel, ypixel, count);
2176
2177 for (i = 0; i < count; i++) /* don't draw empty strings */
2178 if (text[i] != ' ')
2179 {
2180 font->draw (xpixel, ypixel, text, count, fore, -1);
2181 break;
2182 }
2183 }
2184 else
2185 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2186 }
2187 else
2188 font->draw (xpixel, ypixel, text, count, fore, back);
2189
2190 if ((rend & RS_Uline) && (font->descent > 1))
2191 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2192 xpixel, ypixel + font->ascent + 1,
2193 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2194 } /* for (col....) */
2195 } /* for (row....) */
2196
2197 /*
2198 * G: cleanup cursor and display outline cursor if necessary
2199 */
2200 if (showcursor) {
2201 if (TermWin.focus) {
2202 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
2203 [screen.cur.col]);
2204 *srp ^= RS_RVid;
2205#ifndef NO_CURSORCOLOR
2206 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2207#endif
2208 } else if (oldcursor.row >= 0) {
2209#ifndef NO_CURSORCOLOR
2210 if (ISSET_PIXCOLOR (Color_cursor))
2211 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2212#endif
2213 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2214 Col2Pixel(oldcursor.col),
2215 Row2Pixel(oldcursor.row),
2216 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2217 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1));
2218 }
2219 }
2220
2221 /*
2222 * H: cleanup selection
2223 */
2224 scr_reverse_selection ();
2225
2226 /*
2227 * I: other general cleanup
2228 */
2229 if (clearfirst && TermWin.int_bwidth)
2230 /*
2231 * clear the whole screen height, note that width == 0 is treated
2232 * specially by XClearArea
2233 */
2234 XClearArea(Xdisplay, TermWin.vt, 0, 0, 2309 XClearArea(Xdisplay, TermWin.vt,
2310 TermWin.width + TermWin.int_bwidth, 0,
2235 (unsigned int)TermWin.int_bwidth, 2311 (unsigned int)TermWin.int_bwidth,
2236 (unsigned int)TermWin_TotalHeight(), False); 2312 (unsigned int)TermWin_TotalHeight(), False);
2237 if (clearlast && TermWin.int_bwidth)
2238 /*
2239 * clear the whole screen height, note that width == 0 is treated
2240 * specially by XClearArea
2241 */
2242 XClearArea(Xdisplay, TermWin.vt,
2243 TermWin.width + TermWin.int_bwidth, 0,
2244 (unsigned int)TermWin.int_bwidth,
2245 (unsigned int)TermWin_TotalHeight(), False);
2246 if (refresh_type & SMOOTH_REFRESH) 2313 if (refresh_type & SMOOTH_REFRESH)
2247 XSync(Xdisplay, False); 2314 XSync(Xdisplay, False);
2248 2315
2249 num_scr = 0; 2316 num_scr = 0;
2250 num_scr_allow = 1; 2317 num_scr_allow = 1;
2251 want_refresh = 0; /* screen is current */ 2318 want_refresh = 0; /* screen is current */
2252} 2319}
2253 2320
2254/* ------------------------------------------------------------------------- */ 2321/* ------------------------------------------------------------------------- */
2255void 2322void
2256rxvt_term::scr_clear() 2323rxvt_term::scr_clear()
… …
2281 2348
2282/* ------------------------------------------------------------------------- */ 2349/* ------------------------------------------------------------------------- */
2283void 2350void
2284rxvt_term::scr_reverse_selection () 2351rxvt_term::scr_reverse_selection ()
2285{ 2352{
2286 int i, col, row, end_row; 2353 int i, col, row, end_row;
2287 rend_t *srp; 2354 rend_t *srp;
2288 2355
2289 if (selection.op && current_screen == selection.screen) { 2356 if (selection.op && current_screen == selection.screen)
2357 {
2290 end_row = TermWin.saveLines - TermWin.view_start; 2358 end_row = TermWin.saveLines - TermWin.view_start;
2291 i = selection.beg.row + TermWin.saveLines; 2359 i = selection.beg.row + TermWin.saveLines;
2292 row = selection.end.row + TermWin.saveLines; 2360 row = selection.end.row + TermWin.saveLines;
2293 if (i >= end_row) 2361 if (i >= end_row)
2294 col = selection.beg.col; 2362 col = selection.beg.col;
2295 else { 2363 else
2364 {
2296 col = 0; 2365 col = 0;
2297 i = end_row; 2366 i = end_row;
2298 } 2367 }
2299 end_row += TermWin.nrow; 2368 end_row += TermWin.nrow;
2300 for (; i < row && i < end_row; i++, col = 0) 2369 for (; i < row && i < end_row; i++, col = 0)
2301 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2370 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2302 srp[col] ^= RS_RVid; 2371 srp[col] ^= RS_RVid;
2303 if (i == row && i < end_row) 2372 if (i == row && i < end_row)
2304 for (srp = screen.rend[i]; col < selection.end.col; col++) 2373 for (srp = screen.rend[i]; col < selection.end.col; col++)
2305 srp[col] ^= RS_RVid; 2374 srp[col] ^= RS_RVid;
2306 } 2375 }
2307} 2376}
2308 2377
2309/* ------------------------------------------------------------------------- */ 2378/* ------------------------------------------------------------------------- */
2310/* 2379/*
… …
2313 */ 2382 */
2314#if 0 2383#if 0
2315void 2384void
2316rxvt_term::scr_dump (int fd) 2385rxvt_term::scr_dump (int fd)
2317{ 2386{
2318 int row, wrote; 2387 int row, wrote;
2319 unsigned int width, towrite; 2388 unsigned int width, towrite;
2320 char r1[] = "\n"; 2389 char r1[] = "\n";
2321 2390
2322 for (row = TermWin.saveLines - TermWin.nscrolled; 2391 for (row = TermWin.saveLines - TermWin.nscrolled;
2323 row < TermWin.saveLines + TermWin.nrow - 1; row++) { 2392 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2393 {
2324 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2394 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2325 : TermWin.ncol; 2395 : TermWin.ncol;
2326 for (towrite = width; towrite; towrite -= wrote) { 2396 for (towrite = width; towrite; towrite -= wrote)
2397 {
2327 wrote = write(fd, &(screen.text[row][width - towrite]), 2398 wrote = write(fd, &(screen.text[row][width - towrite]),
2328 towrite); 2399 towrite);
2329 if (wrote < 0) 2400 if (wrote < 0)
2330 return; /* XXX: death, no report */ 2401 return; /* XXX: death, no report */
2331 } 2402 }
2332 if (screen.tlen[row] >= 0) 2403 if (screen.tlen[row] >= 0)
2333 if (write(fd, r1, 1) <= 0) 2404 if (write(fd, r1, 1) <= 0)
2334 return; /* XXX: death, no report */ 2405 return; /* XXX: death, no report */
2335 } 2406 }
2336} 2407}
2337#endif 2408#endif
2338 2409
2339/* ------------------------------------------------------------------------- * 2410/* ------------------------------------------------------------------------- *
… …
2344 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2415 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2345 */ 2416 */
2346void 2417void
2347rxvt_term::selection_check (int check_more) 2418rxvt_term::selection_check (int check_more)
2348{ 2419{
2349 row_col_t pos; 2420 row_col_t pos;
2350 2421
2351 if (!selection.op) 2422 if (!selection.op)
2352 return; 2423 return;
2353 2424
2354 pos.row = pos.col = 0; 2425 pos.row = pos.col = 0;
2355 if ((selection.beg.row < -(int32_t)TermWin.nscrolled) 2426 if ((selection.beg.row < -(int32_t)TermWin.nscrolled)
2356 || (selection.beg.row >= TermWin.nrow) 2427 || (selection.beg.row >= TermWin.nrow)
2357 || (selection.mark.row < -(int32_t)TermWin.nscrolled) 2428 || (selection.mark.row < -(int32_t)TermWin.nscrolled)
2358 || (selection.mark.row >= TermWin.nrow) 2429 || (selection.mark.row >= TermWin.nrow)
2359 || (selection.end.row < -(int32_t)TermWin.nscrolled) 2430 || (selection.end.row < -(int32_t)TermWin.nscrolled)
2360 || (selection.end.row >= TermWin.nrow) 2431 || (selection.end.row >= TermWin.nrow)
2361 || (check_more == 1 2432 || (check_more == 1
2362 && current_screen == selection.screen 2433 && current_screen == selection.screen
2363 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 2434 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg)
2364 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) 2435 && ROWCOL_IS_BEFORE(screen.cur, selection.end))
2365 || (check_more == 2 2436 || (check_more == 2
2366 && ROWCOL_IS_BEFORE(selection.beg, pos) 2437 && ROWCOL_IS_BEFORE(selection.beg, pos)
2367 && ROWCOL_IS_AFTER(selection.end, pos)) 2438 && ROWCOL_IS_AFTER(selection.end, pos))
2368 || (check_more == 3 2439 || (check_more == 3
2369 && ROWCOL_IS_AFTER(selection.end, pos)) 2440 && ROWCOL_IS_AFTER(selection.end, pos))
2370 || (check_more == 4 /* screen width change */ 2441 || (check_more == 4 /* screen width change */
2371 && (selection.beg.row != selection.end.row 2442 && (selection.beg.row != selection.end.row
2372 || selection.end.col > TermWin.ncol))) 2443 || selection.end.col > TermWin.ncol)))
2373 CLEAR_SELECTION(); 2444 CLEAR_SELECTION();
2374} 2445}
2375 2446
2376/* ------------------------------------------------------------------------- */ 2447/* ------------------------------------------------------------------------- */
2377/* 2448/*
2378 * Paste a selection direct to the command fd 2449 * Paste a selection direct to the command fd
… …
2380void 2451void
2381rxvt_term::paste (const unsigned char *data, unsigned int len) 2452rxvt_term::paste (const unsigned char *data, unsigned int len)
2382{ 2453{
2383 unsigned int i, j, n; 2454 unsigned int i, j, n;
2384 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2455 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2385 2456
2386#if 0 2457#if 0
2387 /* a paste should act like the user is typing, so check scrollTtyKeypress */ 2458 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2388 ZERO_SCROLLBACK (r); 2459 ZERO_SCROLLBACK (r);
2389#endif 2460#endif
2390 2461
… …
2426 2497
2427 selection_type = 0; 2498 selection_type = 0;
2428 if (selnum != Sel_direct) 2499 if (selnum != Sel_direct)
2429 selection_request_other (XA_STRING, selnum); 2500 selection_request_other (XA_STRING, selnum);
2430 } 2501 }
2431 2502
2432 if ((selection_type & Sel_UTF8String)) 2503 if ((selection_type & Sel_UTF8String))
2433 { 2504 {
2434 int selnum = selection_type & Sel_whereMask; 2505 int selnum = selection_type & Sel_whereMask;
2435 2506
2436 selection_type = Sel_CompoundText; 2507 selection_type = Sel_CompoundText;
2437 if (selnum != Sel_direct) 2508 if (selnum != Sel_direct)
2438 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2509 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2439 else 2510 else
2440 selection_type = 0; 2511 selection_type = 0;
2441 } 2512 }
2442 2513
2443 return 0; 2514 return 0;
2444 } 2515 }
2445 2516
2446 for (;;) 2517 for (;;)
2447 { 2518 {
… …
2524 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2595 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2525 */ 2596 */
2526void 2597void
2527rxvt_term::selection_property (Window win, Atom prop) 2598rxvt_term::selection_property (Window win, Atom prop)
2528{ 2599{
2529 int reget_time = 0; 2600 int reget_time = 0;
2530 2601
2531 if (prop == None) 2602 if (prop == None)
2603 return;
2604 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2605 if (selection_wait == Sel_normal)
2606 {
2607 int a, afmt;
2608 Atom atype;
2609 unsigned long bytes_after, nitems;
2610 unsigned char *s = NULL;
2611
2612 a = XGetWindowProperty(Xdisplay, win, prop, 0L, 1L, False,
2613 xa[XA_INCR], &atype, &afmt, &nitems,
2614 &bytes_after, &s);
2615 if (s)
2616 XFree(s);
2617 if (a != Success)
2532 return; 2618 return;
2533 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2534 if (selection_wait == Sel_normal) {
2535 int a, afmt;
2536 Atom atype;
2537 unsigned long bytes_after, nitems;
2538 unsigned char *s = NULL;
2539
2540 a = XGetWindowProperty(Xdisplay, win, prop, 0L, 1L, False,
2541 xa[XA_INCR], &atype, &afmt, &nitems,
2542 &bytes_after, &s);
2543 if (s)
2544 XFree(s);
2545 if (a != Success)
2546 return;
2547#ifndef __CYGWIN32__ 2619#ifndef __CYGWIN32__
2620 if (atype == xa[XA_INCR])
2548 if (atype == xa[XA_INCR]) { /* start an INCR transfer */ 2621 { /* start an INCR transfer */
2549 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2622 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2550 XDeleteProperty(Xdisplay, win, prop); 2623 XDeleteProperty(Xdisplay, win, prop);
2551 XFlush(Xdisplay); 2624 XFlush(Xdisplay);
2552 reget_time = 1; 2625 reget_time = 1;
2553 selection_wait = Sel_incr; 2626 selection_wait = Sel_incr;
2554 } 2627 }
2555#endif 2628#endif
2629
2630 }
2556 } else if (selection_wait == Sel_incr) { 2631 else if (selection_wait == Sel_incr)
2632 {
2557 reget_time = 1; 2633 reget_time = 1;
2558 if (selection_paste (win, prop, True) == -1) { 2634 if (selection_paste (win, prop, True) == -1)
2635 {
2559 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2636 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2560 selection_wait = Sel_none; 2637 selection_wait = Sel_none;
2561 incr_ev.stop (); 2638 incr_ev.stop ();
2562 } 2639 }
2563 } 2640 }
2564 if (reget_time) /* received more data so reget time */ 2641 if (reget_time) /* received more data so reget time */
2565 incr_ev.start (NOW + 10); 2642 incr_ev.start (NOW + 10);
2566} 2643}
2567/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2568/* 2645/*
2569 * Request the current selection: 2646 * Request the current selection:
2570 * Order: > internal selection if available 2647 * Order: > internal selection if available
… …
2575 * EXT: button 2 release 2652 * EXT: button 2 release
2576 */ 2653 */
2577void 2654void
2578rxvt_term::selection_request (Time tm, int x, int y) 2655rxvt_term::selection_request (Time tm, int x, int y)
2579{ 2656{
2580 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2657 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2581 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2582 return; /* outside window */ 2659 return; /* outside window */
2583 2660
2584 if (selection.text != NULL) { /* internal selection */ 2661 if (selection.text != NULL)
2662 { /* internal selection */
2585 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2663 D_SELECT((stderr, "rxvt_selection_request: pasting internal"));
2586 paste (selection.text, selection.len); 2664 paste (selection.text, selection.len);
2587 return; 2665 return;
2588 } else { 2666 }
2667 else
2668 {
2589 int i; 2669 int i;
2590 2670
2591 selection_request_time = tm; 2671 selection_request_time = tm;
2592 selection_wait = Sel_normal; 2672 selection_wait = Sel_normal;
2593 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2673 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2674 {
2594#if X_HAVE_UTF8_STRING 2675#if X_HAVE_UTF8_STRING
2595 selection_type = Sel_UTF8String; 2676 selection_type = Sel_UTF8String;
2596 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2677 if (selection_request_other (xa[XA_UTF8_STRING], i))
2597 return; 2678 return;
2598#else 2679#else
2599 selection_type = Sel_CompoundText; 2680 selection_type = Sel_CompoundText;
2600 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2681 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2601 return; 2682 return;
2602#endif 2683#endif
2684
2603 } 2685 }
2604 } 2686 }
2605 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */
2606 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2688 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2607 selection_paste (Xroot, XA_CUT_BUFFER0, False); 2689 selection_paste (Xroot, XA_CUT_BUFFER0, False);
2608} 2690}
2609 2691
2610int 2692int
2611rxvt_term::selection_request_other (Atom target, int selnum) 2693rxvt_term::selection_request_other (Atom target, int selnum)
2612{ 2694{
2613 Atom sel; 2695 Atom sel;
2614#ifdef DEBUG_SELECT 2696#ifdef DEBUG_SELECT
2615 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2697 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2616#endif 2698#endif
2617 2699
2618 selection_type |= selnum; 2700 selection_type |= selnum;
2619 if (selnum == Sel_Primary) 2701 if (selnum == Sel_Primary)
2620 sel = XA_PRIMARY; 2702 sel = XA_PRIMARY;
2621 else if (selnum == Sel_Secondary) 2703 else if (selnum == Sel_Secondary)
2622 sel = XA_SECONDARY; 2704 sel = XA_SECONDARY;
2623 else 2705 else
2624 sel = xa[XA_CLIPBOARD]; 2706 sel = xa[XA_CLIPBOARD];
2625 if (XGetSelectionOwner(Xdisplay, sel) != None) { 2707 if (XGetSelectionOwner(Xdisplay, sel) != None)
2708 {
2626 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2709 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2627 XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION], 2710 XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION],
2628 TermWin.vt, selection_request_time); 2711 TermWin.vt, selection_request_time);
2629 return 1; 2712 return 1;
2630 } 2713 }
2631 return 0; 2714 return 0;
2632} 2715}
2633 2716
2634/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2635/* 2718/*
2636 * Clear all selected text 2719 * Clear all selected text
2637 * EXT: SelectionClear 2720 * EXT: SelectionClear
2638 */ 2721 */
2639void 2722void
2640rxvt_term::selection_clear () 2723rxvt_term::selection_clear ()
2641{ 2724{
2642 D_SELECT((stderr, "rxvt_selection_clear()")); 2725 D_SELECT((stderr, "rxvt_selection_clear()"));
2643 2726
2644 want_refresh = 1; 2727 want_refresh = 1;
2645 if (selection.text) 2728 if (selection.text)
2646 free(selection.text); 2729 free(selection.text);
2647 selection.text = NULL; 2730 selection.text = NULL;
2648 selection.len = 0; 2731 selection.len = 0;
2649 CLEAR_SELECTION(); 2732 CLEAR_SELECTION();
2650} 2733}
2651 2734
2652/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2653/* 2736/*
2654 * Copy a selection into the cut buffer 2737 * Copy a selection into the cut buffer
2655 * EXT: button 1 or 3 release 2738 * EXT: button 1 or 3 release
2656 */ 2739 */
2657void 2740void
2658rxvt_term::selection_make (Time tm) 2741rxvt_term::selection_make (Time tm)
2659{ 2742{
2660 int i, col, end_col, row, end_row; 2743 int i, col, end_col, row, end_row;
2661 unsigned char *new_selection_text; 2744 unsigned char *new_selection_text;
2662 char *str; 2745 char *str;
2663 text_t *t; 2746 text_t *t;
2664#ifdef ACS_ASCII 2747#ifdef ACS_ASCII
2665 rend_t *re; 2748 rend_t *re;
2666#endif 2749#endif
2667 2750
2668 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2751 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2669 switch (selection.op) { 2752 switch (selection.op)
2753 {
2670 case SELECTION_CONT: 2754 case SELECTION_CONT:
2671 break; 2755 break;
2672 case SELECTION_INIT: 2756 case SELECTION_INIT:
2673 CLEAR_SELECTION(); 2757 CLEAR_SELECTION();
2674 /* FALLTHROUGH */ 2758 /* FALLTHROUGH */
2675 case SELECTION_BEGIN: 2759 case SELECTION_BEGIN:
2676 selection.op = SELECTION_DONE; 2760 selection.op = SELECTION_DONE;
2677 /* FALLTHROUGH */ 2761 /* FALLTHROUGH */
2678 default: 2762 default:
2679 return; 2763 return;
2680 } 2764 }
2681 selection.op = SELECTION_DONE; 2765 selection.op = SELECTION_DONE;
2682 2766
2683 if (selection.clicks == 4) 2767 if (selection.clicks == 4)
2684 return; /* nothing selected, go away */ 2768 return; /* nothing selected, go away */
2685 2769
2686 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1;
2687 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2771 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1);
2688 2772
2689 new_selection_text = (unsigned char *)str; 2773 new_selection_text = (unsigned char *)str;
2690 2774
2691 col = selection.beg.col; 2775 col = selection.beg.col;
2692 MAX_IT(col, 0); 2776 MAX_IT(col, 0);
2693 row = selection.beg.row + TermWin.saveLines; 2777 row = selection.beg.row + TermWin.saveLines;
2694 end_row = selection.end.row + TermWin.saveLines; 2778 end_row = selection.end.row + TermWin.saveLines;
2695 2779
2696 for (; row <= end_row; row++, col = 0) 2780 for (; row <= end_row; row++, col = 0)
2781 {
2782 t = &(screen.text[row][col]);
2783
2784 end_col = screen.tlen[row];
2785
2786 if (end_col == -1)
2787 end_col = TermWin.ncol;
2788
2789 if (row == end_row)
2790 MIN_IT (end_col, selection.end.col);
2791
2792 for (; col < end_col; col++)
2793 if (*t == NOCHAR)
2794 t++;
2795 else
2796 {
2797 int len = wctomb (str, *t++);
2798 if (len > 0)
2799 str += len;
2800 }
2801
2802 if (screen.tlen[row] != -1 && row != end_row)
2803 *str++ = '\n';
2804 }
2805
2806#ifndef NO_OLD_SELECTION
2807 if (selection_style == OLD_SELECT)
2808 if (end_col == TermWin.ncol)
2809 *str++ = '\n';
2810#endif
2811#ifndef NO_NEW_SELECTION
2812 if (selection_style != OLD_SELECT)
2813 if (end_col != selection.end.col)
2814 *str++ = '\n';
2815#endif
2816 *str = '\0';
2817
2818 i = str - (char *)new_selection_text;
2819 if (i == 0)
2820 {
2821 free (new_selection_text);
2822 return;
2823 }
2824
2825 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2826 if (str - (char *)new_selection_text > 1024)
2827 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2828
2829 selection.len = i;
2830
2831 if (selection.text)
2832 free (selection.text);
2833
2834 selection.text = new_selection_text;
2835
2836 XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
2837 if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt)
2838 rxvt_print_error("can't get primary selection");
2839
2840
2841 {
2842 XTextProperty ct;
2843 char *cl = (char *)selection.text;
2844
2845 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2697 { 2846 {
2698 t = &(screen.text[row][col]); 2847 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2699 2848 PropModeReplace, ct.value, ct.nitems);
2700 end_col = screen.tlen[row]; 2849 XFree (ct.value);
2701
2702 if (end_col == -1)
2703 end_col = TermWin.ncol;
2704
2705 if (row == end_row)
2706 MIN_IT (end_col, selection.end.col);
2707
2708 for (; col < end_col; col++)
2709 if (*t == NOCHAR)
2710 t++;
2711 else
2712 {
2713 int len = wctomb (str, *t++);
2714 if (len > 0)
2715 str += len;
2716 }
2717
2718 if (screen.tlen[row] != -1 && row != end_row)
2719 *str++ = '\n';
2720 } 2850 }
2721
2722#ifndef NO_OLD_SELECTION
2723 if (selection_style == OLD_SELECT)
2724 if (end_col == TermWin.ncol)
2725 *str++ = '\n';
2726#endif
2727#ifndef NO_NEW_SELECTION
2728 if (selection_style != OLD_SELECT)
2729 if (end_col != selection.end.col)
2730 *str++ = '\n';
2731#endif
2732 *str = '\0';
2733
2734 i = str - (char *)new_selection_text;
2735 if (i == 0)
2736 {
2737 free (new_selection_text);
2738 return;
2739 }
2740
2741 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2742 if (str - (char *)new_selection_text > 1024)
2743 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2744
2745 selection.len = i;
2746
2747 if (selection.text)
2748 free (selection.text);
2749
2750 selection.text = new_selection_text;
2751
2752 XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
2753 if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt)
2754 rxvt_print_error("can't get primary selection");
2755
2756
2757 {
2758 XTextProperty ct;
2759 char *cl = (char *)selection.text;
2760
2761 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2762 {
2763 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2764 PropModeReplace, ct.value, ct.nitems);
2765 XFree (ct.value);
2766 }
2767 else 2851 else
2768 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2852 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2769 PropModeReplace, selection.text, (int)selection.len); 2853 PropModeReplace, selection.text, (int)selection.len);
2770 } 2854 }
2771 2855
2772 selection_time = tm; 2856 selection_time = tm;
2773 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len)); 2857 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len));
2774} 2858}
2775 2859
2776/* ------------------------------------------------------------------------- */ 2860/* ------------------------------------------------------------------------- */
2777/* 2861/*
2778 * Mark or select text based upon number of clicks: 1, 2, or 3 2862 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2788 2872
2789 selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); 2873 selection_start_colrow (Pixel2Col(x), Pixel2Row(y));
2790 2874
2791 if (clicks == 2 || clicks == 3) 2875 if (clicks == 2 || clicks == 3)
2792 selection_extend_colrow (selection.mark.col, 2876 selection_extend_colrow (selection.mark.col,
2793 selection.mark.row + TermWin.view_start, 2877 selection.mark.row + TermWin.view_start,
2794 0, /* button 3 */ 2878 0, /* button 3 */
2795 1, /* button press */ 2879 1, /* button press */
2796 0); /* click change */ 2880 0); /* click change */
2797} 2881}
2798 2882
2799/* ------------------------------------------------------------------------- */ 2883/* ------------------------------------------------------------------------- */
2800/* 2884/*
2801 * Mark a selection at the specified col/row 2885 * Mark a selection at the specified col/row
2802 */ 2886 */
2803void 2887void
2804rxvt_term::selection_start_colrow (int col, int row) 2888rxvt_term::selection_start_colrow (int col, int row)
2805{ 2889{
2806 want_refresh = 1; 2890 want_refresh = 1;
2807 selection.mark.col = col; 2891 selection.mark.col = col;
2808 selection.mark.row = row - TermWin.view_start; 2892 selection.mark.row = row - TermWin.view_start;
2809 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled); 2893 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled);
2810 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1); 2894 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1);
2811 MAX_IT(selection.mark.col, 0); 2895 MAX_IT(selection.mark.col, 0);
2812 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1); 2896 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1);
2813 2897
2814 if (selection.op) { /* clear the old selection */ 2898 if (selection.op)
2899 { /* clear the old selection */
2815 selection.beg.row = selection.end.row = selection.mark.row; 2900 selection.beg.row = selection.end.row = selection.mark.row;
2816 selection.beg.col = selection.end.col = selection.mark.col; 2901 selection.beg.col = selection.end.col = selection.mark.col;
2817 } 2902 }
2818 selection.op = SELECTION_INIT; 2903 selection.op = SELECTION_INIT;
2819 selection.screen = current_screen; 2904 selection.screen = current_screen;
2820} 2905}
2821 2906
2822/* ------------------------------------------------------------------------- */ 2907/* ------------------------------------------------------------------------- */
2823/* 2908/*
2824 * Word select: select text for 2 clicks 2909 * Word select: select text for 2 clicks
… …
2831#define DELIMIT_REND(x) 1 2916#define DELIMIT_REND(x) 1
2832 2917
2833void 2918void
2834rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2919rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2835{ 2920{
2836 int col, row, dirnadd, tcol, trow, w1, w2; 2921 int col, row, dirnadd, tcol, trow, w1, w2;
2837 row_col_t bound; 2922 row_col_t bound;
2838 text_t *stp; 2923 text_t *stp;
2839 rend_t *srp; 2924 rend_t *srp;
2840 2925
2841 if (dirn == UP) { 2926 if (dirn == UP)
2927 {
2842 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2928 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2843 bound.col = 0; 2929 bound.col = 0;
2844 dirnadd = -1; 2930 dirnadd = -1;
2845 } else { 2931 }
2932 else
2933 {
2846 bound.row = TermWin.saveLines + TermWin.nrow; 2934 bound.row = TermWin.saveLines + TermWin.nrow;
2847 bound.col = TermWin.ncol - 1; 2935 bound.col = TermWin.ncol - 1;
2848 dirnadd = 1; 2936 dirnadd = 1;
2849 } 2937 }
2850 row = mark->row + TermWin.saveLines; 2938 row = mark->row + TermWin.saveLines;
2851 col = mark->col; 2939 col = mark->col;
2852 MAX_IT(col, 0); 2940 MAX_IT(col, 0);
2853/* find the edge of a word */ 2941 /* find the edge of a word */
2854 stp = &(screen.text[row][col]); 2942 stp = &(screen.text[row][col]);
2855 w1 = DELIMIT_TEXT(*stp); 2943 w1 = DELIMIT_TEXT(*stp);
2856 2944
2857 if (selection_style != NEW_SELECT) { 2945 if (selection_style != NEW_SELECT)
2946 {
2858 if (w1 == 1) { 2947 if (w1 == 1)
2948 {
2859 stp += dirnadd; 2949 stp += dirnadd;
2860 if (DELIMIT_TEXT(*stp) == 1) 2950 if (DELIMIT_TEXT(*stp) == 1)
2861 goto Old_Word_Selection_You_Die; 2951 goto Old_Word_Selection_You_Die;
2862 col += dirnadd; 2952 col += dirnadd;
2863 } 2953 }
2864 w1 = 0; 2954 w1 = 0;
2865 } 2955 }
2866 srp = (&screen.rend[row][col]); 2956 srp = (&screen.rend[row][col]);
2867 w2 = DELIMIT_REND(*srp); 2957 w2 = DELIMIT_REND(*srp);
2868 2958
2869 for (;;) { 2959 for (;;)
2960 {
2870 for (; col != bound.col; col += dirnadd) { 2961 for (; col != bound.col; col += dirnadd)
2962 {
2871 stp += dirnadd; 2963 stp += dirnadd;
2872 if (DELIMIT_TEXT(*stp) != w1) 2964 if (DELIMIT_TEXT(*stp) != w1)
2965 break;
2966 srp += dirnadd;
2967 if (DELIMIT_REND(*srp) != w2)
2968 break;
2969 }
2970 if ((col == bound.col) && (row != bound.row))
2971 {
2972 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1)
2973 {
2974 trow = row + dirnadd;
2975 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2976 if (screen.text[trow] == NULL)
2873 break; 2977 break;
2874 srp += dirnadd; 2978 stp = &(screen.text[trow][tcol]);
2875 if (DELIMIT_REND(*srp) != w2) 2979 srp = &(screen.rend[trow][tcol]);
2980 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2876 break; 2981 break;
2877 }
2878 if ((col == bound.col) && (row != bound.row)) {
2879 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2880 trow = row + dirnadd;
2881 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2882 if (screen.text[trow] == NULL)
2883 break;
2884 stp = &(screen.text[trow][tcol]);
2885 srp = &(screen.rend[trow][tcol]);
2886 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2887 break;
2888 row = trow; 2982 row = trow;
2889 col = tcol; 2983 col = tcol;
2890 continue; 2984 continue;
2891 } 2985 }
2892 } 2986 }
2893 break; 2987 break;
2894 } 2988 }
2895 Old_Word_Selection_You_Die: 2989Old_Word_Selection_You_Die:
2896 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)); 2990 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));
2897 2991
2898 if (dirn == DN) 2992 if (dirn == DN)
2899 col++; /* put us on one past the end */ 2993 col++; /* put us on one past the end */
2900 2994
2901/* Poke the values back in */ 2995 /* Poke the values back in */
2902 ret->row = row - TermWin.saveLines; 2996 ret->row = row - TermWin.saveLines;
2903 ret->col = col; 2997 ret->col = col;
2904} 2998}
2905 2999
2906/* ------------------------------------------------------------------------- */ 3000/* ------------------------------------------------------------------------- */
2907/* 3001/*
2908 * Extend the selection to the specified x/y pixel location 3002 * Extend the selection to the specified x/y pixel location
… …
2948#endif 3042#endif
2949 if (selection.clicks == 4) 3043 if (selection.clicks == 4)
2950 selection.clicks = 1; 3044 selection.clicks = 1;
2951 3045
2952 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3046 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2953 flag == 1 ? 1 : 0, /* ? button press */ 3047 flag == 1 ? 1 : 0, /* ? button press */
2954 0); /* no click change */ 3048 0); /* no click change */
2955} 3049}
2956 3050
2957/* ------------------------------------------------------------------------- */ 3051/* ------------------------------------------------------------------------- */
2958/* 3052/*
2959 * Extend the selection to the specified col/row 3053 * Extend the selection to the specified col/row
2960 */ 3054 */
2961void 3055void
2962rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3056rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
2963{ 3057{
2964 int16_t ncol = TermWin.ncol; 3058 int16_t ncol = TermWin.ncol;
2965 int end_col; 3059 int end_col;
2966 row_col_t pos; 3060 row_col_t pos;
2967 enum { 3061 enum {
2968 LEFT, RIGHT 3062 LEFT, RIGHT
2969 } closeto = RIGHT; 3063 } closeto = RIGHT;
2970 3064
2971 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)); 3065 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));
2972 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)); 3066 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));
2973 3067
2974 want_refresh = 1; 3068 want_refresh = 1;
2975 switch (selection.op) { 3069 switch (selection.op)
3070 {
2976 case SELECTION_INIT: 3071 case SELECTION_INIT:
2977 CLEAR_SELECTION(); 3072 CLEAR_SELECTION();
2978 selection.op = SELECTION_BEGIN; 3073 selection.op = SELECTION_BEGIN;
2979 /* FALLTHROUGH */ 3074 /* FALLTHROUGH */
2980 case SELECTION_BEGIN: 3075 case SELECTION_BEGIN:
2981 if (row != selection.mark.row || col != selection.mark.col 3076 if (row != selection.mark.row || col != selection.mark.col
2982 || (!button3 && buttonpress)) 3077 || (!button3 && buttonpress))
2983 selection.op = SELECTION_CONT; 3078 selection.op = SELECTION_CONT;
2984 break; 3079 break;
2985 case SELECTION_DONE: 3080 case SELECTION_DONE:
2986 selection.op = SELECTION_CONT; 3081 selection.op = SELECTION_CONT;
2987 /* FALLTHROUGH */ 3082 /* FALLTHROUGH */
2988 case SELECTION_CONT: 3083 case SELECTION_CONT:
2989 break; 3084 break;
2990 case SELECTION_CLEAR: 3085 case SELECTION_CLEAR:
2991 selection_start_colrow (col, row); 3086 selection_start_colrow (col, row);
2992 /* FALLTHROUGH */ 3087 /* FALLTHROUGH */
2993 default: 3088 default:
2994 return; 3089 return;
2995 } 3090 }
2996 if (selection.beg.col == selection.end.col 3091 if (selection.beg.col == selection.end.col
2997 && selection.beg.col != selection.mark.col 3092 && selection.beg.col != selection.mark.col
2998 && selection.beg.row == selection.end.row 3093 && selection.beg.row == selection.end.row
2999 && selection.beg.row != selection.mark.row) { 3094 && selection.beg.row != selection.mark.row)
3095 {
3000 selection.beg.col = selection.end.col = selection.mark.col; 3096 selection.beg.col = selection.end.col = selection.mark.col;
3001 selection.beg.row = selection.end.row = selection.mark.row; 3097 selection.beg.row = selection.end.row = selection.mark.row;
3002 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)); 3098 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));
3003 } 3099 }
3004 3100
3005 pos.col = col; 3101 pos.col = col;
3006 pos.row = row; 3102 pos.row = row;
3007 3103
3008 pos.row -= TermWin.view_start; /* adjust for scroll */ 3104 pos.row -= TermWin.view_start; /* adjust for scroll */
3009 3105
3010#ifndef NO_OLD_SELECTION 3106#ifndef NO_OLD_SELECTION
3011/* 3107 /*
3012 * This mimics some of the selection behaviour of version 2.20 and before. 3108 * This mimics some of the selection behaviour of version 2.20 and before.
3013 * There are no ``selection modes'', button3 is always character extension. 3109 * There are no ``selection modes'', button3 is always character extension.
3014 * Note: button3 drag is always available, c.f. v2.20 3110 * Note: button3 drag is always available, c.f. v2.20
3015 * Selection always terminates (left or right as appropriate) at the mark. 3111 * Selection always terminates (left or right as appropriate) at the mark.
3016 */ 3112 */
3017 if (selection_style == OLD_SELECT) { 3113 if (selection_style == OLD_SELECT)
3114 {
3018 if (selection.clicks == 1 || button3) { 3115 if (selection.clicks == 1 || button3)
3116 {
3019 if (hate_those_clicks) { 3117 if (hate_those_clicks)
3118 {
3020 hate_those_clicks = 0; 3119 hate_those_clicks = 0;
3021 if (selection.clicks == 1) { 3120 if (selection.clicks == 1)
3121 {
3022 selection.beg.row = selection.mark.row; 3122 selection.beg.row = selection.mark.row;
3023 selection.beg.col = selection.mark.col; 3123 selection.beg.col = selection.mark.col;
3124 }
3024 } else { 3125 else
3126 {
3025 selection.mark.row = selection.beg.row; 3127 selection.mark.row = selection.beg.row;
3026 selection.mark.col = selection.beg.col; 3128 selection.mark.col = selection.beg.col;
3027 } 3129 }
3028 } 3130 }
3029 if (ROWCOL_IS_BEFORE(pos, selection.mark)) { 3131 if (ROWCOL_IS_BEFORE(pos, selection.mark))
3132 {
3030 selection.end.row = selection.mark.row; 3133 selection.end.row = selection.mark.row;
3031 selection.end.col = selection.mark.col + 1; 3134 selection.end.col = selection.mark.col + 1;
3032 selection.beg.row = pos.row; 3135 selection.beg.row = pos.row;
3033 selection.beg.col = pos.col; 3136 selection.beg.col = pos.col;
3034 } else {
3035 selection.beg.row = selection.mark.row;
3036 selection.beg.col = selection.mark.col;
3037 selection.end.row = pos.row;
3038 selection.end.col = pos.col + 1;
3039 } 3137 }
3138 else
3139 {
3140 selection.beg.row = selection.mark.row;
3141 selection.beg.col = selection.mark.col;
3142 selection.end.row = pos.row;
3143 selection.end.col = pos.col + 1;
3144 }
3145 }
3040 } else if (selection.clicks == 2) { 3146 else if (selection.clicks == 2)
3147 {
3041 selection_delimit_word (UP, &(selection.mark), 3148 selection_delimit_word (UP, &(selection.mark),
3042 &(selection.beg)); 3149 &(selection.beg));
3043 selection_delimit_word (DN, &(selection.mark), 3150 selection_delimit_word (DN, &(selection.mark),
3044 &(selection.end)); 3151 &(selection.end));
3045 hate_those_clicks = 1; 3152 hate_those_clicks = 1;
3153 }
3046 } else if (selection.clicks == 3) { 3154 else if (selection.clicks == 3)
3155 {
3047 selection.beg.row = selection.end.row = selection.mark.row; 3156 selection.beg.row = selection.end.row = selection.mark.row;
3048 selection.beg.col = 0; 3157 selection.beg.col = 0;
3049 selection.end.col = ncol; 3158 selection.end.col = ncol;
3050 hate_those_clicks = 1; 3159 hate_those_clicks = 1;
3051 } 3160 }
3052 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)); 3161 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));
3053 return; 3162 return;
3054 } 3163 }
3055#endif /* ! NO_OLD_SELECTION */ 3164#endif /* ! NO_OLD_SELECTION */
3056#ifndef NO_NEW_SELECTION 3165#ifndef NO_NEW_SELECTION
3057/* selection_style must not be OLD_SELECT to get here */ 3166 /* selection_style must not be OLD_SELECT to get here */
3058/* 3167 /*
3059 * This is mainly xterm style selection with a couple of differences, mainly 3168 * This is mainly xterm style selection with a couple of differences, mainly
3060 * in the way button3 drag extension works. 3169 * in the way button3 drag extension works.
3061 * We're either doing: button1 drag; button3 press; or button3 drag 3170 * We're either doing: button1 drag; button3 press; or button3 drag
3062 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3171 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3063 * is always at the left/right edge of the selection. 3172 * is always at the left/right edge of the selection.
3064 * b) button3 press: extend/contract character/word/line at whichever edge of 3173 * b) button3 press: extend/contract character/word/line at whichever edge of
3065 * the selection we are closest to. 3174 * the selection we are closest to.
3066 * c) button3 drag : extend/contract character/word/line - we select around 3175 * c) button3 drag : extend/contract character/word/line - we select around
3067 * a point/word/line which is either the start or end of the selection 3176 * a point/word/line which is either the start or end of the selection
3068 * and it was decided by whichever point/word/line was `fixed' at the 3177 * and it was decided by whichever point/word/line was `fixed' at the
3069 * time of the most recent button3 press 3178 * time of the most recent button3 press
3070 */ 3179 */
3071 if (button3 && buttonpress) { /* button3 press */ 3180 if (button3 && buttonpress)
3181 { /* button3 press */
3072 /* 3182 /*
3073 * first determine which edge of the selection we are closest to 3183 * first determine which edge of the selection we are closest to
3074 */ 3184 */
3075 if (ROWCOL_IS_BEFORE(pos, selection.beg) 3185 if (ROWCOL_IS_BEFORE(pos, selection.beg)
3076 || (!ROWCOL_IS_AFTER(pos, selection.end) 3186 || (!ROWCOL_IS_AFTER(pos, selection.end)
3077 && (((pos.col - selection.beg.col) 3187 && (((pos.col - selection.beg.col)
3078 + ((pos.row - selection.beg.row) * ncol)) 3188 + ((pos.row - selection.beg.row) * ncol))
3079 < ((selection.end.col - pos.col) 3189 < ((selection.end.col - pos.col)
3080 + ((selection.end.row - pos.row) * ncol))))) 3190 + ((selection.end.row - pos.row) * ncol)))))
3081 closeto = LEFT; 3191 closeto = LEFT;
3082 if (closeto == LEFT) { 3192 if (closeto == LEFT)
3193 {
3083 selection.beg.row = pos.row; 3194 selection.beg.row = pos.row;
3084 selection.beg.col = pos.col; 3195 selection.beg.col = pos.col;
3085 selection.mark.row = selection.end.row; 3196 selection.mark.row = selection.end.row;
3086 selection.mark.col = selection.end.col 3197 selection.mark.col = selection.end.col
3087 - (selection.clicks == 2); 3198 - (selection.clicks == 2);
3199 }
3088 } else { 3200 else
3201 {
3089 selection.end.row = pos.row; 3202 selection.end.row = pos.row;
3090 selection.end.col = pos.col; 3203 selection.end.col = pos.col;
3091 selection.mark.row = selection.beg.row; 3204 selection.mark.row = selection.beg.row;
3092 selection.mark.col = selection.beg.col; 3205 selection.mark.col = selection.beg.col;
3093 } 3206 }
3207 }
3208 else
3094 } else { /* button1 drag or button3 drag */ 3209 { /* button1 drag or button3 drag */
3095 if (ROWCOL_IS_AFTER(selection.mark, pos)) { 3210 if (ROWCOL_IS_AFTER(selection.mark, pos))
3211 {
3096 if ((selection.mark.row == selection.end.row) 3212 if ((selection.mark.row == selection.end.row)
3097 && (selection.mark.col == selection.end.col) 3213 && (selection.mark.col == selection.end.col)
3098 && clickchange && selection.clicks == 2) 3214 && clickchange && selection.clicks == 2)
3099 selection.mark.col--; 3215 selection.mark.col--;
3100 selection.beg.row = pos.row; 3216 selection.beg.row = pos.row;
3101 selection.beg.col = pos.col; 3217 selection.beg.col = pos.col;
3102 selection.end.row = selection.mark.row; 3218 selection.end.row = selection.mark.row;
3103 selection.end.col = selection.mark.col 3219 selection.end.col = selection.mark.col
3104 + (selection.clicks == 2); 3220 + (selection.clicks == 2);
3221 }
3105 } else { 3222 else
3223 {
3106 selection.beg.row = selection.mark.row; 3224 selection.beg.row = selection.mark.row;
3225 selection.beg.col = selection.mark.col;
3226 selection.end.row = pos.row;
3227 selection.end.col = pos.col;
3228 }
3229 }
3230
3231 if (selection.clicks == 1)
3232 {
3233 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3234 if (end_col != -1 && selection.beg.col > end_col)
3235 {
3236#if 1
3237 selection.beg.col = ncol;
3238#else
3239 if (selection.beg.row != selection.end.row)
3240 selection.beg.col = ncol;
3241 else
3107 selection.beg.col = selection.mark.col; 3242 selection.beg.col = selection.mark.col;
3108 selection.end.row = pos.row;
3109 selection.end.col = pos.col;
3110 }
3111 }
3112
3113 if (selection.clicks == 1) {
3114 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3115 if (end_col != -1 && selection.beg.col > end_col) {
3116#if 1
3117 selection.beg.col = ncol;
3118#else
3119 if (selection.beg.row != selection.end.row)
3120 selection.beg.col = ncol;
3121 else
3122 selection.beg.col = selection.mark.col;
3123#endif 3243#endif
3244
3124 } 3245 }
3125 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3246 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3126 if (end_col != -1 && selection.end.col > end_col) 3247 if (end_col != -1 && selection.end.col > end_col)
3127 selection.end.col = ncol; 3248 selection.end.col = ncol;
3128 3249
3250 }
3129 } else if (selection.clicks == 2) { 3251 else if (selection.clicks == 2)
3252 {
3130 if (ROWCOL_IS_AFTER(selection.end, selection.beg)) 3253 if (ROWCOL_IS_AFTER(selection.end, selection.beg))
3131 selection.end.col--; 3254 selection.end.col--;
3132 selection_delimit_word (UP, &(selection.beg), 3255 selection_delimit_word (UP, &(selection.beg),
3133 &(selection.beg)); 3256 &(selection.beg));
3134 selection_delimit_word (DN, &(selection.end), 3257 selection_delimit_word (DN, &(selection.end),
3135 &(selection.end)); 3258 &(selection.end));
3259 }
3136 } else if (selection.clicks == 3) { 3260 else if (selection.clicks == 3)
3261 {
3137#ifndef NO_FRILLS 3262#ifndef NO_FRILLS
3138 if ((Options & Opt_tripleclickwords)) { 3263 if ((Options & Opt_tripleclickwords))
3264 {
3139 int end_row; 3265 int end_row;
3140 3266
3141 selection_delimit_word (UP, &(selection.beg), 3267 selection_delimit_word (UP, &(selection.beg),
3142 &(selection.beg)); 3268 &(selection.beg));
3143 end_row = screen.tlen[selection.mark.row 3269 end_row = screen.tlen[selection.mark.row
3144 + TermWin.saveLines]; 3270 + TermWin.saveLines];
3145 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3271 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3146 end_row++) { 3272 end_row++)
3273 {
3147 end_col = screen.tlen[end_row + TermWin.saveLines]; 3274 end_col = screen.tlen[end_row + TermWin.saveLines];
3148 if (end_col != -1) { 3275 if (end_col != -1)
3276 {
3149 selection.end.row = end_row; 3277 selection.end.row = end_row;
3150 selection.end.col = end_col; 3278 selection.end.col = end_col;
3151 selection_remove_trailing_spaces (); 3279 selection_remove_trailing_spaces ();
3152 break; 3280 break;
3153 } 3281 }
3154 } 3282 }
3155 } else
3156#endif
3157 { 3283 }
3284 else
3285#endif
3286
3287 {
3158 if (ROWCOL_IS_AFTER(selection.mark, selection.beg)) 3288 if (ROWCOL_IS_AFTER(selection.mark, selection.beg))
3159 selection.mark.col++; 3289 selection.mark.col++;
3160 selection.beg.col = 0; 3290 selection.beg.col = 0;
3161 selection.end.col = ncol; 3291 selection.end.col = ncol;
3162 } 3292 }
3163 } 3293 }
3294 if (button3 && buttonpress)
3164 if (button3 && buttonpress) { /* mark may need to be changed */ 3295 { /* mark may need to be changed */
3165 if (closeto == LEFT) { 3296 if (closeto == LEFT)
3297 {
3166 selection.mark.row = selection.end.row; 3298 selection.mark.row = selection.end.row;
3167 selection.mark.col = selection.end.col 3299 selection.mark.col = selection.end.col
3168 - (selection.clicks == 2); 3300 - (selection.clicks == 2);
3301 }
3169 } else { 3302 else
3303 {
3170 selection.mark.row = selection.beg.row; 3304 selection.mark.row = selection.beg.row;
3171 selection.mark.col = selection.beg.col; 3305 selection.mark.col = selection.beg.col;
3172 } 3306 }
3173 } 3307 }
3174 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)); 3308 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));
3175#endif /* ! NO_NEW_SELECTION */ 3309#endif /* ! NO_NEW_SELECTION */
3176} 3310}
3177 3311
3178#ifndef NO_FRILLS 3312#ifndef NO_FRILLS
3179void 3313void
3180rxvt_term::selection_remove_trailing_spaces () 3314rxvt_term::selection_remove_trailing_spaces ()
3181{ 3315{
3182 int32_t end_col, end_row; 3316 int32_t end_col, end_row;
3183 text_t *stp; 3317 text_t *stp;
3184 3318
3185 end_col = selection.end.col; 3319 end_col = selection.end.col;
3186 end_row = selection.end.row; 3320 end_row = selection.end.row;
3187 for ( ; end_row >= selection.beg.row; ) { 3321 for ( ; end_row >= selection.beg.row; )
3322 {
3188 stp = screen.text[end_row + TermWin.saveLines]; 3323 stp = screen.text[end_row + TermWin.saveLines];
3189 while (--end_col >= 0) { 3324 while (--end_col >= 0)
3325 {
3190 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3326 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3191 break;
3192 }
3193 if (end_col >= 0
3194 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) {
3195 selection.end.col = end_col + 1;
3196 selection.end.row = end_row;
3197 break; 3327 break;
3198 } 3328 }
3329 if (end_col >= 0
3330 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3331 {
3332 selection.end.col = end_col + 1;
3333 selection.end.row = end_row;
3334 break;
3335 }
3199 end_row--; 3336 end_row--;
3200 end_col = TermWin.ncol; 3337 end_col = TermWin.ncol;
3201 } 3338 }
3202 if (selection.mark.row > selection.end.row) { 3339 if (selection.mark.row > selection.end.row)
3340 {
3203 selection.mark.row = selection.end.row; 3341 selection.mark.row = selection.end.row;
3204 selection.mark.col = selection.end.col; 3342 selection.mark.col = selection.end.col;
3343 }
3205 } else if (selection.mark.row == selection.end.row 3344 else if (selection.mark.row == selection.end.row
3206 && selection.mark.col > selection.end.col) 3345 && selection.mark.col > selection.end.col)
3207 selection.mark.col = selection.end.col; 3346 selection.mark.col = selection.end.col;
3208} 3347}
3209#endif 3348#endif
3210 3349
3211/* ------------------------------------------------------------------------- */ 3350/* ------------------------------------------------------------------------- */
3212/* 3351/*
… …
3234 * EXT: SelectionRequest 3373 * EXT: SelectionRequest
3235 */ 3374 */
3236void 3375void
3237rxvt_term::selection_send (const XSelectionRequestEvent *rq) 3376rxvt_term::selection_send (const XSelectionRequestEvent *rq)
3238{ 3377{
3239 XSelectionEvent ev; 3378 XSelectionEvent ev;
3240 XTextProperty ct; 3379 XTextProperty ct;
3241 XICCEncodingStyle style; 3380 XICCEncodingStyle style;
3242 Atom target; 3381 Atom target;
3243 3382
3244 ev.type = SelectionNotify; 3383 ev.type = SelectionNotify;
3245 ev.property = None; 3384 ev.property = None;
3246 ev.display = rq->display; 3385 ev.display = rq->display;
3247 ev.requestor = rq->requestor; 3386 ev.requestor = rq->requestor;
3248 ev.selection = rq->selection; 3387 ev.selection = rq->selection;
3249 ev.target = rq->target; 3388 ev.target = rq->target;
3250 ev.time = rq->time; 3389 ev.time = rq->time;
3251 3390
3252 if (rq->target == xa[XA_TARGETS]) { 3391 if (rq->target == xa[XA_TARGETS])
3392 {
3253 Atom32 target_list[5]; 3393 Atom32 target_list[5];
3254 Atom32 *target = target_list; 3394 Atom32 *target = target_list;
3255 3395
3256 *target++ = (Atom32) xa[XA_TARGETS]; 3396 *target++ = (Atom32) xa[XA_TARGETS];
3257 *target++ = (Atom32) XA_STRING; 3397 *target++ = (Atom32) XA_STRING;
3258 *target++ = (Atom32) xa[XA_TEXT]; 3398 *target++ = (Atom32) xa[XA_TEXT];
3259 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3399 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3260#if X_HAVE_UTF8_STRING 3400#if X_HAVE_UTF8_STRING
3261 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3401 *target++ = (Atom32) xa[XA_UTF8_STRING];
3262#endif 3402#endif
3263 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM, 3403 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM,
3264 (8 * sizeof(target_list[0])), PropModeReplace, 3404 (8 * sizeof(target_list[0])), PropModeReplace,
3265 (unsigned char *)target_list, 3405 (unsigned char *)target_list,
3266 target - target_list); 3406 target - target_list);
3267 ev.property = rq->property; 3407 ev.property = rq->property;
3408 }
3268 } else if (rq->target == xa[XA_MULTIPLE]) { 3409 else if (rq->target == xa[XA_MULTIPLE])
3410 {
3269 /* TODO: Handle MULTIPLE */ 3411 /* TODO: Handle MULTIPLE */
3412 }
3270 } else if (rq->target == xa[XA_TIMESTAMP] && selection.text) { 3413 else if (rq->target == xa[XA_TIMESTAMP] && selection.text)
3414 {
3271 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3415 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3272 (8 * sizeof(Time)), PropModeReplace, 3416 (8 * sizeof(Time)), PropModeReplace,
3273 (unsigned char *)&selection_time, 1); 3417 (unsigned char *)&selection_time, 1);
3274 ev.property = rq->property; 3418 ev.property = rq->property;
3419 }
3275 } else if (rq->target == XA_STRING 3420 else if (rq->target == XA_STRING
3276 || rq->target == xa[XA_TEXT] 3421 || rq->target == xa[XA_TEXT]
3277 || rq->target == xa[XA_COMPOUND_TEXT] 3422 || rq->target == xa[XA_COMPOUND_TEXT]
3278 || rq->target == xa[XA_UTF8_STRING] 3423 || rq->target == xa[XA_UTF8_STRING]
3279 ) { 3424 )
3425 {
3280 short freect = 0; 3426 short freect = 0;
3281 int selectlen; 3427 int selectlen;
3282 char *cl; 3428 char *cl;
3283 3429
3284 target = rq->target; 3430 target = rq->target;
3285 3431
3286 if (target == XA_STRING) 3432 if (target == XA_STRING)
3287 // we actually don't do XA_STRING, but who cares, as i18n clients 3433 // we actually don't do XA_STRING, but who cares, as i18n clients
3288 // will ask for another format anyways. 3434 // will ask for another format anyways.
3289 style = XStringStyle; 3435 style = XStringStyle;
3290 else if (target == xa[XA_TEXT]) 3436 else if (target == xa[XA_TEXT])
3291 style = XTextStyle; 3437 style = XTextStyle;
3292 else if (target == xa[XA_COMPOUND_TEXT]) 3438 else if (target == xa[XA_COMPOUND_TEXT])
3439 style = XCompoundTextStyle;
3440#if X_HAVE_UTF8_STRING
3441 else if (target == xa[XA_UTF8_STRING])
3442 style = XUTF8StringStyle;
3443#endif
3444 else
3445 {
3446 target = xa[XA_COMPOUND_TEXT];
3293 style = XCompoundTextStyle; 3447 style = XCompoundTextStyle;
3294#if X_HAVE_UTF8_STRING
3295 else if (target == xa[XA_UTF8_STRING])
3296 style = XUTF8StringStyle;
3297#endif
3298 else
3299 {
3300 target = xa[XA_COMPOUND_TEXT];
3301 style = XCompoundTextStyle;
3302 } 3448 }
3303 3449
3304 if (selection.text) { 3450 if (selection.text)
3451 {
3305 cl = (char *)selection.text; 3452 cl = (char *)selection.text;
3306 selectlen = selection.len; 3453 selectlen = selection.len;
3454 }
3307 } else { 3455 else
3456 {
3308 cl = ""; 3457 cl = "";
3309 selectlen = 0; 3458 selectlen = 0;
3310 } 3459 }
3311 3460
3312 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, style, &ct) >= 0) 3461 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, style, &ct) >= 0)
3313 freect = 1; 3462 freect = 1;
3314 else 3463 else
3315 { 3464 {
3316 /* if we failed to convert then send it raw */ 3465 /* if we failed to convert then send it raw */
3317 ct.value = (unsigned char *)cl; 3466 ct.value = (unsigned char *)cl;
3318 ct.nitems = selectlen; 3467 ct.nitems = selectlen;
3319 } 3468 }
3320 3469
3321 XChangeProperty(Xdisplay, rq->requestor, rq->property, 3470 XChangeProperty(Xdisplay, rq->requestor, rq->property,
3322 target, 8, PropModeReplace, 3471 target, 8, PropModeReplace,
3323 ct.value, (int)ct.nitems); 3472 ct.value, (int)ct.nitems);
3324 ev.property = rq->property; 3473 ev.property = rq->property;
3325 3474
3326 if (freect) 3475 if (freect)
3327 XFree (ct.value); 3476 XFree (ct.value);
3328 } 3477 }
3329 XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3478 XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev);
3330} 3479}
3331 3480
3332/* ------------------------------------------------------------------------- * 3481/* ------------------------------------------------------------------------- *
3333 * MOUSE ROUTINES * 3482 * MOUSE ROUTINES *
3334 * ------------------------------------------------------------------------- */ 3483 * ------------------------------------------------------------------------- */
… …
3365 * ------------------------------------------------------------------------- */ 3514 * ------------------------------------------------------------------------- */
3366#if 0 3515#if 0
3367void 3516void
3368rxvt_debug_colors(void) 3517rxvt_debug_colors(void)
3369{ 3518{
3370 int color; 3519 int color;
3371 const char *name[] = { 3520 const char *name[] =
3521 {
3372 "fg", "bg", 3522 "fg", "bg",
3373 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" 3523 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3374 }; 3524 };
3375 3525
3376 fprintf(stderr, "Color ( "); 3526 fprintf(stderr, "Color ( ");
3377 if (rstyle & RS_RVid) 3527 if (rstyle & RS_RVid)
3378 fprintf(stderr, "rvid "); 3528 fprintf(stderr, "rvid ");
3379 if (rstyle & RS_Bold) 3529 if (rstyle & RS_Bold)
3380 fprintf(stderr, "bold "); 3530 fprintf(stderr, "bold ");
3381 if (rstyle & RS_Blink) 3531 if (rstyle & RS_Blink)
3382 fprintf(stderr, "blink "); 3532 fprintf(stderr, "blink ");
3383 if (rstyle & RS_Uline) 3533 if (rstyle & RS_Uline)
3384 fprintf(stderr, "uline "); 3534 fprintf(stderr, "uline ");
3385 fprintf(stderr, "): "); 3535 fprintf(stderr, "): ");
3386 3536
3387 color = GET_FGCOLOR(rstyle); 3537 color = GET_FGCOLOR(rstyle);
3388#ifndef NO_BRIGHTCOLOR 3538#ifndef NO_BRIGHTCOLOR
3389 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3539 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3540 {
3390 color -= (minBrightCOLOR - minCOLOR); 3541 color -= (minBrightCOLOR - minCOLOR);
3391 fprintf(stderr, "bright "); 3542 fprintf(stderr, "bright ");
3392 } 3543 }
3393#endif 3544#endif
3394 fprintf(stderr, "%s on ", name[color]); 3545 fprintf(stderr, "%s on ", name[color]);
3395 3546
3396 color = GET_BGCOLOR(rstyle); 3547 color = GET_BGCOLOR(rstyle);
3397#ifndef NO_BRIGHTCOLOR 3548#ifndef NO_BRIGHTCOLOR
3398 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3549 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3550 {
3399 color -= (minBrightCOLOR - minCOLOR); 3551 color -= (minBrightCOLOR - minCOLOR);
3400 fprintf(stderr, "bright "); 3552 fprintf(stderr, "bright ");
3401 } 3553 }
3402#endif 3554#endif
3403 fprintf(stderr, "%s\n", name[color]); 3555 fprintf(stderr, "%s\n", name[color]);
3404} 3556}
3405#endif 3557#endif

Diff Legend

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