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.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 2004 UTC

… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 29
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 31
34#include <inttypes.h> 32#include <inttypes.h>
35#include <wchar.h> 33#include <wchar.h>
… …
48 46
49/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
53 if (Options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 52 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
113 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
114 112
115/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 120{
122 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 123
125 while (width--) 124 while (width--)
126 { 125 {
127 *et++ = ' '; 126 *et++ = ' ';
128 *er++ = efs; 127 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
… …
172 nrow = TermWin.nrow; 173 nrow = TermWin.nrow;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2)
180 {
181 TermWin.saveLines++;
182 prev_nrow--;
183 TermWin.nscrolled++;
184 }
185
177 want_refresh = 1; 186 want_refresh = 1;
178 187
188 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 189 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 190
182 screen.tscroll = 0; 191 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 192 screen.bscroll = nrow - 1;
184 193
185 if (!talloc) 194 if (!talloc)
186 { 195 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 198 }
190 199
191 if (prev_nrow == 0) 200 if (!screen.text)
192 { 201 {
193 /* 202 /*
194 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 205 */
… …
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 226 }
218 227
219 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 233 screen.charset = 0;
… …
408} 417}
409 418
410void 419void
411rxvt_term::scr_reset_realloc () 420rxvt_term::scr_reset_realloc ()
412{ 421{
413 uint16_t total_rows, nrow; 422 unsigned int total_rows, nrow;
414 423
415 nrow = TermWin.nrow; 424 nrow = TermWin.nrow;
416 total_rows = nrow + TermWin.saveLines; 425 total_rows = nrow + TermWin.saveLines;
417 /* *INDENT-OFF* */ 426 /* *INDENT-OFF* */
418 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
435 * Free everything. That way malloc debugging can find leakage. 444 * Free everything. That way malloc debugging can find leakage.
436 */ 445 */
437void 446void
438rxvt_term::scr_release () 447rxvt_term::scr_release ()
439{ 448{
440 uint16_t total_rows; 449 unsigned int total_rows;
441 int i; 450 int i;
442 451
443 total_rows = TermWin.nrow + TermWin.saveLines; 452 total_rows = TermWin.nrow + TermWin.saveLines;
444 453
445 delete talloc; talloc = 0; 454 delete talloc; talloc = 0;
… …
471 * Hard reset 480 * Hard reset
472 */ 481 */
473void 482void
474rxvt_term::scr_poweron () 483rxvt_term::scr_poweron ()
475{ 484{
476 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
477
478 scr_release (); 485 scr_release ();
479 prev_nrow = prev_ncol = 0; 486 prev_nrow = prev_ncol = 0;
480 scr_reset (); 487 scr_reset ();
481 488
482 scr_clear (true); 489 scr_clear (true);
… …
493 */ 500 */
494void 501void
495rxvt_term::scr_cursor (int mode) 502rxvt_term::scr_cursor (int mode)
496{ 503{
497 screen_t *s; 504 screen_t *s;
498
499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
500 505
501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 506#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
502 if (current_screen == SECONDARY) 507 if (current_screen == SECONDARY)
503 s = &swap; 508 s = &swap;
504 else 509 else
… …
506 s = &screen; 511 s = &screen;
507 512
508 switch (mode) 513 switch (mode)
509 { 514 {
510 case SAVE: 515 case SAVE:
511 s->s_cur.row = s->cur.row; 516 s->s_cur.row = screen.cur.row;
512 s->s_cur.col = s->cur.col; 517 s->s_cur.col = screen.cur.col;
513 s->s_rstyle = rstyle; 518 s->s_rstyle = rstyle;
514 s->s_charset = s->charset; 519 s->s_charset = screen.charset;
515 s->s_charset_char = charsets[s->charset]; 520 s->s_charset_char = charsets[screen.charset];
516 break; 521 break;
517 522
518 case RESTORE: 523 case RESTORE:
519 want_refresh = 1; 524 want_refresh = 1;
520 s->cur.row = s->s_cur.row; 525 screen.cur.row = s->s_cur.row;
521 s->cur.col = s->s_cur.col; 526 screen.cur.col = s->s_cur.col;
522 s->flags &= ~Screen_WrapNext; 527 screen.flags &= ~Screen_WrapNext;
523 rstyle = s->s_rstyle; 528 rstyle = s->s_rstyle;
524 s->charset = s->s_charset; 529 screen.charset = s->s_charset;
525 charsets[s->charset] = s->s_charset_char; 530 charsets[screen.charset] = s->s_charset_char;
526 set_font_style (); 531 set_font_style ();
527 break; 532 break;
528 } 533 }
529 534
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 535 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
553 int offset; 558 int offset;
554#endif 559#endif
555 560
556 want_refresh = 1; 561 want_refresh = 1;
557 562
558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
559
560 TermWin.view_start = 0; 563 TermWin.view_start = 0;
561 564
562 if (current_screen == scrn) 565 if (current_screen == scrn)
563 return scrn; 566 return scrn;
564 567
565 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
566 569
567 SWAP_IT (current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
568#if NSCREENS 571#if NSCREENS
569 if (Options & Opt_secondaryScreen) 572 if (options & Opt_secondaryScreen)
570 { 573 {
571 num_scr = 0; 574 num_scr = 0;
572 offset = TermWin.saveLines; 575 offset = TermWin.saveLines;
573 for (i = prev_nrow; i--;) 576 for (i = prev_nrow; i--;)
574 { 577 {
… …
592 screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
593 swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
594 } 597 }
595 else 598 else
596#endif 599#endif
597 if (Options & Opt_secondaryScroll) 600 if (options & Opt_secondaryScroll)
598 //if (current_screen == PRIMARY) 601 //if (current_screen == PRIMARY)
599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
600 return scrn; 603 return scrn;
601} 604}
602 605
606// clear WrapNext indicator, solidifying position on next line
607void
608rxvt_term::scr_do_wrap ()
609{
610 if (!(screen.flags & Screen_WrapNext))
611 return;
612
613 screen.flags &= ~Screen_WrapNext;
614
615 screen.cur.col = 0;
616
617 if (screen.cur.row == screen.bscroll)
618 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
619 else if (screen.cur.row < TermWin.nrow - 1)
620 screen.cur.row++;
621}
622
603/* ------------------------------------------------------------------------- */ 623/* ------------------------------------------------------------------------- */
604/* 624/*
605 * Change the colour for following text 625 * Change the colour for following text
606 */ 626 */
607void 627void
608rxvt_term::scr_color (unsigned int color, int fgbg) 628rxvt_term::scr_color (unsigned int color, int fgbg)
609{ 629{
610 color &= RS_fgMask; 630 if (color > maxTermCOLOR)
631 color = fgbg;
632
611 if (fgbg == Color_fg) 633 if (fgbg == Color_fg)
612 rstyle = SET_FGCOLOR (rstyle, color); 634 rstyle = SET_FGCOLOR (rstyle, color);
613 else 635 else
614 rstyle = SET_BGCOLOR (rstyle, color); 636 rstyle = SET_BGCOLOR (rstyle, color);
615} 637}
… …
644 666
645 if (count == 0 || (row1 > row2)) 667 if (count == 0 || (row1 > row2))
646 return 0; 668 return 0;
647 669
648 want_refresh = 1; 670 want_refresh = 1;
649 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
650 671
651 if (row1 == 0 && count > 0 672 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 673 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
653 { 674 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 675 nscrolled = (long)TermWin.nscrolled + (long)count;
655 676
656 if (nscrolled > (long)TermWin.saveLines) 677 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 678 TermWin.nscrolled = TermWin.saveLines;
658 else 679 else
659 TermWin.nscrolled = (uint16_t)nscrolled; 680 TermWin.nscrolled = (unsigned int)nscrolled;
660 681
661 if ((Options & Opt_scrollWithBuffer) 682 if ((options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0 683 && TermWin.view_start != 0
663 && TermWin.view_start != TermWin.saveLines) 684 && TermWin.view_start != TermWin.saveLines)
664 scr_page (UP, count); 685 scr_page (UP, count);
665 } 686 }
666 else if (!spec) 687 else if (!spec)
… …
757 * Add text given in <str> of length <len> to screen struct 778 * Add text given in <str> of length <len> to screen struct
758 */ 779 */
759void 780void
760rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 781rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
761{ 782{
762 unsigned char checksel, clearsel; 783 unsigned char checksel;
763 unicode_t c; 784 unicode_t c;
764 int i, row, last_col; 785 int i, row, last_col;
765 text_t *stp; 786 text_t *stp;
766 rend_t *srp; 787 rend_t *srp;
767 788
768 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
769 return; 790 return;
770 791
771 want_refresh = 1; 792 want_refresh = 1;
793 ZERO_SCROLLBACK ();
772 last_col = TermWin.ncol; 794 last_col = TermWin.ncol;
773 795
774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
775 ZERO_SCROLLBACK ();
776 if (nlines > 0) 796 if (nlines > 0)
777 { 797 {
778 nlines += screen.cur.row - screen.bscroll; 798 nlines += screen.cur.row - screen.bscroll;
779 if ((nlines > 0) 799 if ((nlines > 0)
780 && (screen.tscroll == 0) 800 && (screen.tscroll == 0)
… …
783 /* _at least_ this many lines need to be scrolled */ 803 /* _at least_ this many lines need to be scrolled */
784 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 804 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
785 screen.cur.row -= nlines; 805 screen.cur.row -= nlines;
786 } 806 }
787 } 807 }
808
788#ifdef DEBUG_STRICT 809#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 810 assert (screen.cur.col < last_col);
790 assert ((screen.cur.row < TermWin.nrow) 811 assert ((screen.cur.row < TermWin.nrow)
791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 812 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
792#else /* drive with your eyes closed */ 813#else /* drive with your eyes closed */
… …
795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 816 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
796#endif 817#endif
797 row = screen.cur.row + TermWin.saveLines; 818 row = screen.cur.row + TermWin.saveLines;
798 819
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 820 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 clearsel = 0;
801 821
802 stp = screen.text[row]; 822 stp = screen.text[row];
803 srp = screen.rend[row]; 823 srp = screen.rend[row];
804 824
805 while (len--) 825 while (len--)
… …
808 828
809 if (c < 0x20) 829 if (c < 0x20)
810 switch (c) 830 switch (c)
811 { 831 {
812 case C0_HT: 832 case C0_HT:
813 scr_tab (1); 833 scr_tab (1, true);
814 continue; 834 continue;
815 835
816 case C0_LF: 836 case C0_LF:
817 if (screen.tlen[row] != -1) /* XXX: think about this */ 837 if (screen.tlen[row] != -1) /* XXX: think about this */
818 MAX_IT (screen.tlen[row], screen.cur.col); 838 MAX_IT (screen.tlen[row], screen.cur.col);
… …
840 if (checksel /* see if we're writing within selection */ 860 if (checksel /* see if we're writing within selection */
841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 861 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
842 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 862 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
843 { 863 {
844 checksel = 0; 864 checksel = 0;
845 clearsel = 1; 865 /*
866 * If we wrote anywhere in the selected area, kill the selection
867 * XXX: should we kill the mark too? Possibly, but maybe that
868 * should be a similar check.
869 */
870 CLEAR_SELECTION ();
846 } 871 }
847 872
848 if (screen.flags & Screen_WrapNext) 873 if (screen.flags & Screen_WrapNext)
849 { 874 {
850 screen.tlen[row] = -1; 875 screen.tlen[row] = -1;
851 if (screen.cur.row == screen.bscroll) 876
852 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
853 else if (screen.cur.row < (TermWin.nrow - 1))
854 row = (++screen.cur.row) + TermWin.saveLines; 877 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
855 878
856 stp = screen.text[row]; /* _must_ refresh */ 879 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 880 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext;
860 } 881 }
861 882
862 if (screen.flags & Screen_Insert) 883 if (screen.flags & Screen_Insert)
863 scr_insdel_chars (1, INSERT); 884 scr_insdel_chars (1, INSERT);
864 885
… …
868 int width = c < 0x100 ? 1 : wcwidth (c); 889 int width = c < 0x100 ? 1 : wcwidth (c);
869 890
870 if (charsets[screen.charset] == '0') // DEC SPECIAL 891 if (charsets[screen.charset] == '0') // DEC SPECIAL
871 { 892 {
872 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[32] = { // 5f .. 7e 896 static uint16_t vt100_0[63] = { // 5f .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
878 }; 905 };
879 906
880 if (c >= 0x5f && c <= 0x7e) 907 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
881 { 908 {
882 c = vt100_0[c - 0x5f]; 909 c = vt100_0[c - 0x40];
883 width = 1; 910 width = 1;
884 } 911 }
885 } 912 }
886 913
887 if (width != 0) 914 if (width != 0)
888 { 915 {
889#if !UNICODE_3 && ENABLE_COMBINING 916 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd;
919
920#if !UNICODE_3
890 // trim characters we can't store directly :( 921 // trim characters we can't store directly :(
891 if (c >= 0x10000) 922 if (c >= 0x10000)
923# if ENABLE_COMBINING
892 c = rxvt_composite.compose (c); // map to lower 16 bits 924 c = rxvt_composite.compose (c); // map to lower 16 bits
925# else
926 c = 0xfffd;
893#endif 927# endif
894 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 928#endif
895 rend_t rend = SET_FONT (rstyle, 929
896 c > 0x7f || bold || c < 0x20 930 // nuke the character at this position, if required
897 ? TermWin.fontset->find_font (c, bold) 931 if (stp[screen.cur.col] == NOCHAR
898 : TermWin.ascii_map [c - 0x20]); 932 || (screen.cur.col < TermWin.ncol - 1
933 && stp[screen.cur.col + 1] == NOCHAR))
934 {
935 int col = screen.cur.col;
936
937 // find begin
938 while (col > 0 && stp[col] == NOCHAR)
939 col--;
940
941 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
942
943 // found begin, nuke
944 do {
945 stp[col] = ' ';
946 srp[col] = rend;
947 col++;
948 } while (col < TermWin.ncol && stp[col] == NOCHAR);
949 }
950
951 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899 952
900 do 953 do
901 { 954 {
902 stp[screen.cur.col] = c; 955 stp[screen.cur.col] = c;
903 srp[screen.cur.col] = rend; 956 srp[screen.cur.col] = rend;
… …
948 else 1001 else
949 continue; 1002 continue;
950 1003
951 // handle double-width-chars by making them look extremely ugly 1004 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR) 1005 if (*tp == NOCHAR)
1006 {
953 *tp = ' '; // hack //D //TODO //--tp, --rp; 1007 // hack //D //TODO //--tp, --rp;
1008 *tp = ' ';
1009 *rp &= ~RS_baseattrMask;
1010 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1011 }
954 1012
955 // first try to find a precomposed character 1013 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c); 1014 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR) 1015 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c); 1016 n = rxvt_composite.compose (*tp, c);
959 1017
960 *tp = n; 1018 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1019 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962#endif 1020#endif
963 } 1021 }
964 } 1022 }
965 1023
966 if (screen.tlen[row] != -1) /* XXX: think about this */ 1024 if (screen.tlen[row] != -1) /* XXX: think about this */
967 MAX_IT (screen.tlen[row], screen.cur.col); 1025 MAX_IT (screen.tlen[row], screen.cur.col);
968
969 /*
970 * If we wrote anywhere in the selected area, kill the selection
971 * XXX: should we kill the mark too? Possibly, but maybe that
972 * should be a similar check.
973 */
974 if (clearsel)
975 CLEAR_SELECTION ();
976 1026
977#ifdef DEBUG_STRICT 1027#ifdef DEBUG_STRICT
978 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
979#else /* drive with your eyes closed */ 1029#else /* drive with your eyes closed */
980 MAX_IT (screen.cur.row, 0); 1030 MAX_IT (screen.cur.row, 0);
… …
998#ifdef TERMCAP_HAS_BW 1048#ifdef TERMCAP_HAS_BW
999 screen.cur.col = TermWin.ncol - 1; 1049 screen.cur.col = TermWin.ncol - 1;
1000 screen.cur.row--; 1050 screen.cur.row--;
1001 return; 1051 return;
1002#endif 1052#endif
1003
1004 } 1053 }
1005 } 1054 }
1006 else if ((screen.flags & Screen_WrapNext) == 0) 1055 else if (!(screen.flags & Screen_WrapNext))
1007 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1008 1057
1009 screen.flags &= ~Screen_WrapNext; 1058 screen.flags &= ~Screen_WrapNext;
1010} 1059}
1011 1060
… …
1014 * Process Horizontal Tab 1063 * Process Horizontal Tab
1015 * count: +ve = forward; -ve = backwards 1064 * count: +ve = forward; -ve = backwards
1016 * XTERM_SEQ: CTRL-I 1065 * XTERM_SEQ: CTRL-I
1017 */ 1066 */
1018void 1067void
1019rxvt_term::scr_tab (int count) 1068rxvt_term::scr_tab (int count, bool ht)
1020{ 1069{
1021 int i, x; 1070 int i, x;
1022 1071
1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1024 want_refresh = 1; 1072 want_refresh = 1;
1025 i = x = screen.cur.col; 1073 i = x = screen.cur.col;
1026 1074
1027 if (count == 0) 1075 if (count == 0)
1028 return; 1076 return;
1029 else if (count > 0) 1077 else if (count > 0)
1030 { 1078 {
1079 int row = TermWin.saveLines + screen.cur.row;
1080 text_t *tp = screen.text[row];
1081 rend_t *rp = screen.rend[row];
1082 rend_t base_rend = rp[i];
1083 ht &= tp[i] == ' ';
1084
1031 for (; ++i < TermWin.ncol; ) 1085 for (; ++i < TermWin.ncol; )
1032 if (tabs[i]) 1086 if (tabs[i])
1033 { 1087 {
1034 x = i; 1088 x = i;
1035 if (!--count) 1089 if (!--count)
1036 break; 1090 break;
1037 } 1091 }
1092 else
1093 ht &= tp[i] == ' '
1094 && RS_SAME (rp[i], base_rend);
1038 1095
1039 if (count) 1096 if (count)
1040 x = TermWin.ncol - 1; 1097 x = TermWin.ncol - 1;
1098
1099 // store horizontal tab commands as characters inside the text
1100 // buffer so they can be selected and pasted.
1101 if (ht)
1102 {
1103 base_rend = SET_FONT (base_rend, 0);
1104
1105 if (screen.tlen[row] != -1) /* XXX: think about this */
1106 MAX_IT (screen.tlen[row], x);
1107
1108 i = screen.cur.col;
1109
1110 tp[i] = '\t';
1111 rp[i] = base_rend;
1112
1113 while (++i < x)
1114 {
1115 tp[i] = NOCHAR;
1116 rp[i] = base_rend;
1117 }
1118 }
1041 } 1119 }
1042 else /* if (count < 0) */ 1120 else /* if (count < 0) */
1043 { 1121 {
1044 for (; --i >= 0; ) 1122 for (; --i >= 0; )
1045 if (tabs[i]) 1123 if (tabs[i])
… …
1062 * Process DEC Back Index 1140 * Process DEC Back Index
1063 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1064 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1065 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1066 */ 1144 */
1067#ifndef NO_FRILLS 1145#if ENABLE_FRILLS
1068void 1146void
1069rxvt_term::scr_backindex () 1147rxvt_term::scr_backindex ()
1070{ 1148{
1071 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1151 else
1074 { 1152 {
1075 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1153 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1076 return; /* um, yeah? */ 1154 return; /* um, yeah? */
1155
1077 scr_insdel_chars (1, INSERT); 1156 scr_insdel_chars (1, INSERT);
1078 } 1157 }
1079} 1158}
1080#endif 1159#endif
1081/* ------------------------------------------------------------------------- */ 1160/* ------------------------------------------------------------------------- */
… …
1083 * Process DEC Forward Index 1162 * Process DEC Forward Index
1084 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1085 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1086 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1087 */ 1166 */
1088#ifndef NO_FRILLS 1167#if ENABLE_FRILLS
1089void 1168void
1090rxvt_term::scr_forwardindex () 1169rxvt_term::scr_forwardindex ()
1091{ 1170{
1092 int row; 1171 int row;
1093 1172
1094 if (screen.cur.col < TermWin.ncol - 1) 1173 if (screen.cur.col < TermWin.ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1175 else
1097 { 1176 {
1098 row = screen.cur.row + TermWin.saveLines; 1177 row = screen.cur.row + TermWin.saveLines;
1178
1099 if (screen.tlen[row] == 0) 1179 if (screen.tlen[row] == 0)
1100 return; /* um, yeah? */ 1180 return; /* um, yeah? */
1101 else if (screen.tlen[row] == -1) 1181 else if (screen.tlen[row] == -1)
1102 screen.tlen[row] = TermWin.ncol; 1182 screen.tlen[row] = TermWin.ncol;
1183
1103 scr_gotorc (0, 0, R_RELATIVE); 1184 scr_gotorc (0, 0, R_RELATIVE);
1104 scr_insdel_chars (1, DELETE); 1185 scr_insdel_chars (1, DELETE);
1105 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1186 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1106 } 1187 }
1107} 1188}
… …
1115rxvt_term::scr_gotorc (int row, int col, int relative) 1196rxvt_term::scr_gotorc (int row, int col, int relative)
1116{ 1197{
1117 want_refresh = 1; 1198 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1119 1200
1120 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));
1121
1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1123 MAX_IT (screen.cur.col, 0); 1202 MAX_IT (screen.cur.col, 0);
1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1203 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1125 1204
1126 screen.flags &= ~Screen_WrapNext; 1205 screen.flags &= ~Screen_WrapNext;
1206
1127 if (relative & R_RELATIVE) 1207 if (relative & R_RELATIVE)
1128 { 1208 {
1129 if (row > 0) 1209 if (row > 0)
1130 { 1210 {
1131 if (screen.cur.row <= screen.bscroll 1211 if (screen.cur.row <= screen.bscroll
… …
1151 MIN_IT (screen.cur.row, screen.bscroll); 1231 MIN_IT (screen.cur.row, screen.bscroll);
1152 } 1232 }
1153 else 1233 else
1154 screen.cur.row = row; 1234 screen.cur.row = row;
1155 } 1235 }
1236
1156 MAX_IT (screen.cur.row, 0); 1237 MAX_IT (screen.cur.row, 0);
1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1238 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1158
1159 while (screen.cur.col > 0
1160 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1161 screen.cur.col--;
1162} 1239}
1163 1240
1164/* ------------------------------------------------------------------------- */ 1241/* ------------------------------------------------------------------------- */
1165/* 1242/*
1166 * direction should be UP or DN 1243 * direction should be UP or DN
1167 */ 1244 */
1168void 1245void
1169rxvt_term::scr_index (enum page_dirn direction) 1246rxvt_term::scr_index (enum page_dirn direction)
1170{ 1247{
1171 int dirn; 1248 int dirn;
1172 1249
1173 want_refresh = 1; 1250 want_refresh = 1;
1251 ZERO_SCROLLBACK ();
1252
1174 dirn = ((direction == UP) ? 1 : -1); 1253 dirn = ((direction == UP) ? 1 : -1);
1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1176
1177 ZERO_SCROLLBACK ();
1178 1254
1179 screen.flags &= ~Screen_WrapNext; 1255 screen.flags &= ~Screen_WrapNext;
1256
1180 if ((screen.cur.row == screen.bscroll && direction == UP) 1257 if ((screen.cur.row == screen.bscroll && direction == UP)
1181 || (screen.cur.row == screen.tscroll && direction == DN)) 1258 || (screen.cur.row == screen.tscroll && direction == DN))
1182 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1259 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1183 else 1260 else
1184 screen.cur.row += dirn; 1261 screen.cur.row += dirn;
1262
1185 MAX_IT (screen.cur.row, 0); 1263 MAX_IT (screen.cur.row, 0);
1186 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1264 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1187 selection_check (0); 1265 selection_check (0);
1188} 1266}
1189 1267
… …
1198rxvt_term::scr_erase_line (int mode) 1276rxvt_term::scr_erase_line (int mode)
1199{ 1277{
1200 unsigned int row, col, num; 1278 unsigned int row, col, num;
1201 1279
1202 want_refresh = 1; 1280 want_refresh = 1;
1203 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1204 ZERO_SCROLLBACK (); 1281 ZERO_SCROLLBACK ();
1205 1282
1206 selection_check (1); 1283 selection_check (1);
1207
1208 screen.flags &= ~Screen_WrapNext;
1209 1284
1210 row = TermWin.saveLines + screen.cur.row; 1285 row = TermWin.saveLines + screen.cur.row;
1211 switch (mode) 1286 switch (mode)
1212 { 1287 {
1213 case 0: /* erase to end of line */ 1288 case 0: /* erase to end of line */
… …
1257 int32_t row, row_offset; 1332 int32_t row, row_offset;
1258 rend_t ren; 1333 rend_t ren;
1259 XGCValues gcvalue; 1334 XGCValues gcvalue;
1260 1335
1261 want_refresh = 1; 1336 want_refresh = 1;
1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1263 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1338
1264 row_offset = (int32_t)TermWin.saveLines; 1339 row_offset = (int32_t)TermWin.saveLines;
1265 1340
1266 switch (mode) 1341 switch (mode)
1267 { 1342 {
1268 case 0: /* erase to end of screen */ 1343 case 0: /* erase to end of screen */
… …
1305 CLEAR_ROWS (row, num); 1380 CLEAR_ROWS (row, num);
1306 } 1381 }
1307 else 1382 else
1308 { 1383 {
1309 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1384 ren = (rstyle & (RS_fgMask | RS_bgMask));
1310 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1385 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1386 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1312 ERASE_ROWS (row, num); 1387 ERASE_ROWS (row, num);
1313 gcvalue.foreground = PixColors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1389 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1315 } 1390 }
1316 1391
1317 for (; num--; row++) 1392 for (; num--; row++)
1318 { 1393 {
… …
1334{ 1409{
1335 int i, j, k; 1410 int i, j, k;
1336 rend_t *r1, fs; 1411 rend_t *r1, fs;
1337 1412
1338 want_refresh = 1; 1413 want_refresh = 1;
1414 ZERO_SCROLLBACK ();
1415
1339 num_scr_allow = 0; 1416 num_scr_allow = 0;
1340 ZERO_SCROLLBACK ();
1341 selection_check (3); 1417 selection_check (3);
1342 1418
1343 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1419 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1344 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1420 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1345 { 1421 {
1346 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1422 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1347 fill_text (screen.text[k], 'E', TermWin.ncol); 1423 fill_text (screen.text[k], 'E', TermWin.ncol);
1348 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1424 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1372 if (insdel == DELETE) 1448 if (insdel == DELETE)
1373 return; 1449 return;
1374 else if (insdel == INSERT) 1450 else if (insdel == INSERT)
1375 count = end; 1451 count = end;
1376 } 1452 }
1377 screen.flags &= ~Screen_WrapNext; 1453
1454 scr_do_wrap ();
1378 1455
1379 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1456 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1380} 1457}
1381 1458
1382/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
… …
1396 ZERO_SCROLLBACK (); 1473 ZERO_SCROLLBACK ();
1397 1474
1398 if (count <= 0) 1475 if (count <= 0)
1399 return; 1476 return;
1400 1477
1478 scr_do_wrap ();
1479
1401 selection_check (1); 1480 selection_check (1);
1402 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1481 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1403 1482
1404 row = screen.cur.row + TermWin.saveLines; 1483 row = screen.cur.row + TermWin.saveLines;
1405 screen.flags &= ~Screen_WrapNext;
1406 1484
1407 stp = screen.text[row]; 1485 stp = screen.text[row];
1408 srp = screen.rend[row]; 1486 srp = screen.rend[row];
1409 slp = & (screen.tlen[row]); 1487 slp = &screen.tlen[row];
1410 1488
1411 switch (insdel) 1489 switch (insdel)
1412 { 1490 {
1413 case INSERT: 1491 case INSERT:
1414 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
… …
1535rxvt_term::scr_autowrap (int mode) 1613rxvt_term::scr_autowrap (int mode)
1536{ 1614{
1537 if (mode) 1615 if (mode)
1538 screen.flags |= Screen_Autowrap; 1616 screen.flags |= Screen_Autowrap;
1539 else 1617 else
1540 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1618 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1541} 1619}
1542 1620
1543/* ------------------------------------------------------------------------- */ 1621/* ------------------------------------------------------------------------- */
1544/* 1622/*
1545 * Set/unset margin origin mode 1623 * Set/unset margin origin mode
… …
1555{ 1633{
1556 if (mode) 1634 if (mode)
1557 screen.flags |= Screen_Relative; 1635 screen.flags |= Screen_Relative;
1558 else 1636 else
1559 screen.flags &= ~Screen_Relative; 1637 screen.flags &= ~Screen_Relative;
1638
1560 scr_gotorc (0, 0, 0); 1639 scr_gotorc (0, 0, 0);
1561} 1640}
1562 1641
1563/* ------------------------------------------------------------------------- */ 1642/* ------------------------------------------------------------------------- */
1564/* 1643/*
… …
1584 */ 1663 */
1585void 1664void
1586rxvt_term::scr_set_tab (int mode) 1665rxvt_term::scr_set_tab (int mode)
1587{ 1666{
1588 if (mode < 0) 1667 if (mode < 0)
1589 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1668 memset (tabs, 0, TermWin.ncol * sizeof (char));
1590 else if (screen.cur.col < TermWin.ncol) 1669 else if (screen.cur.col < TermWin.ncol)
1591 tabs[screen.cur.col] = (mode ? 1 : 0); 1670 tabs[screen.cur.col] = (mode ? 1 : 0);
1592} 1671}
1593 1672
1594/* ------------------------------------------------------------------------- */ 1673/* ------------------------------------------------------------------------- */
… …
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1677 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1678 */
1600void 1679void
1601rxvt_term::scr_rvideo_mode (int mode) 1680rxvt_term::scr_rvideo_mode (int mode)
1602{ 1681{
1603 XGCValues gcvalue; 1682 XGCValues gcvalue;
1604 1683
1605 if (rvideo != mode) 1684 if (rvideo != mode)
1606 { 1685 {
1607 rvideo = mode; 1686 rvideo = mode;
1608 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1687 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1609#if defined(XPM_BACKGROUND) 1688#if XPM_BACKGROUND
1610 if (bgPixmap.pixmap == None) 1689 if (bgPixmap.pixmap == None)
1611#endif 1690#endif
1612#if defined(TRANSPARENT) 1691#if TRANSPARENT
1613 if (! (Options & Opt_transparent) || am_transparent == 0) 1692 if (! (options & Opt_transparent) || am_transparent == 0)
1614#endif 1693#endif
1615 XSetWindowBackground (display->display, TermWin.vt, 1694 XSetWindowBackground (display->display, TermWin.vt,
1616 PixColors[Color_bg]); 1695 pix_colors[Color_bg]);
1617 1696
1618 gcvalue.foreground = PixColors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = PixColors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1699 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1621 &gcvalue); 1700 &gcvalue);
1622 scr_clear (); 1701 scr_clear ();
1623 scr_touch (true); 1702 scr_touch (true);
1624 } 1703 }
… …
1769 { 1848 {
1770 MIN_IT (rc[i].col, TermWin.ncol - 1); 1849 MIN_IT (rc[i].col, TermWin.ncol - 1);
1771 MIN_IT (rc[i].row, TermWin.nrow - 1); 1850 MIN_IT (rc[i].row, TermWin.nrow - 1);
1772 } 1851 }
1773 1852
1774 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1775
1776 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1853 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1777 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1854 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1778 1855
1779 if (refresh) 1856 if (refresh)
1780 scr_refresh (SLOW_REFRESH); 1857 scr_refresh (SLOW_REFRESH);
… …
1797 */ 1874 */
1798int 1875int
1799rxvt_term::scr_move_to (int y, int len) 1876rxvt_term::scr_move_to (int y, int len)
1800{ 1877{
1801 long p = 0; 1878 long p = 0;
1802 uint16_t oldviewstart; 1879 unsigned int oldviewstart;
1803 1880
1804 oldviewstart = TermWin.view_start; 1881 oldviewstart = TermWin.view_start;
1882
1805 if (y < len) 1883 if (y < len)
1806 { 1884 {
1807 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1885 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1808 p -= (long) (TermWin.nrow - 1); 1886 p -= (long) (TermWin.nrow - 1);
1809 p = max (p, 0); 1887 p = max (p, 0);
1810 } 1888 }
1889
1811 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1890 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1812 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1813 1891
1814 return scr_changeview (oldviewstart); 1892 return scr_changeview (oldviewstart);
1815} 1893}
1816 1894
1817/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
… …
1821 */ 1899 */
1822int 1900int
1823rxvt_term::scr_page (enum page_dirn direction, int nlines) 1901rxvt_term::scr_page (enum page_dirn direction, int nlines)
1824{ 1902{
1825 int n; 1903 int n;
1826 uint16_t oldviewstart; 1904 unsigned int oldviewstart;
1827 1905
1828 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1829#ifdef DEBUG_STRICT 1906#ifdef DEBUG_STRICT
1830 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1831#endif 1908#endif
1832 oldviewstart = TermWin.view_start; 1909 oldviewstart = TermWin.view_start;
1833 if (direction == UP) 1910 if (direction == UP)
… …
1842 } 1919 }
1843 return scr_changeview (oldviewstart); 1920 return scr_changeview (oldviewstart);
1844} 1921}
1845 1922
1846int 1923int
1847rxvt_term::scr_changeview (uint16_t oldviewstart) 1924rxvt_term::scr_changeview (unsigned int oldviewstart)
1848{ 1925{
1849 if (TermWin.view_start != oldviewstart) 1926 if (TermWin.view_start != oldviewstart)
1850 { 1927 {
1851 want_refresh = 1; 1928 want_refresh = 1;
1852 num_scr -= (TermWin.view_start - oldviewstart); 1929 num_scr -= (TermWin.view_start - oldviewstart);
… …
1860rxvt_term::scr_bell () 1937rxvt_term::scr_bell ()
1861{ 1938{
1862#ifndef NO_BELL 1939#ifndef NO_BELL
1863# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1864# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1865 if (Options & Opt_mapAlert) 1942 if (options & Opt_mapAlert)
1866# endif 1943# endif
1867 XMapWindow (display->display, TermWin.parent[0]); 1944 XMapWindow (display->display, TermWin.parent[0]);
1868# endif 1945# endif
1869 if (Options & Opt_visualBell) 1946 if (options & Opt_visualBell)
1870 { 1947 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1948 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1950 }
1874 else 1951 else
… …
1880/* ARGSUSED */ 1957/* ARGSUSED */
1881void 1958void
1882rxvt_term::scr_printscreen (int fullhist) 1959rxvt_term::scr_printscreen (int fullhist)
1883{ 1960{
1884#ifdef PRINTPIPE 1961#ifdef PRINTPIPE
1885 int i, r1, nrows, row_offset; 1962 int i, r1, nrows, row_offset;
1886 text_t *t; 1963 FILE *fd;
1887 FILE *fd;
1888 1964
1889 if ((fd = popen_printer ()) == NULL) 1965 if ((fd = popen_printer ()) == NULL)
1890 return; 1966 return;
1967
1891 nrows = TermWin.nrow; 1968 nrows = TermWin.nrow;
1892 row_offset = TermWin.saveLines; 1969 row_offset = TermWin.saveLines;
1970
1893 if (!fullhist) 1971 if (!fullhist)
1894 row_offset -= TermWin.view_start; 1972 row_offset -= TermWin.view_start;
1895 else 1973 else
1896 { 1974 {
1897 nrows += TermWin.nscrolled; 1975 nrows += TermWin.nscrolled;
1898 row_offset -= TermWin.nscrolled; 1976 row_offset -= TermWin.nscrolled;
1899 } 1977 }
1900 1978
1979 wctomb (0, 0);
1980
1901 for (r1 = 0; r1 < nrows; r1++) 1981 for (r1 = 0; r1 < nrows; r1++)
1902 { 1982 {
1903 t = screen.text[r1 + row_offset]; 1983 text_t *tp = screen.text[r1 + row_offset];
1904 for (i = TermWin.ncol - 1; i >= 0; i--) 1984 int len = screen.tlen[r1 + row_offset];
1905 if (!isspace (t[i])) 1985
1906 break; 1986 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1907 fprintf (fd, "%.*s\n", (i + 1), t); 1987 {
1988 char mb[MB_LEN_MAX];
1989 text_t t = *tp++;
1990 if (t == NOCHAR)
1991 continue;
1992
1993 len = wctomb (mb, t);
1994
1995 if (len <= 0)
1996 {
1997 mb[0] = ' ';
1998 len = 1;
1999 }
2000
2001 fwrite (mb, 1, len, fd);
2002 }
2003
2004 fputc ('\n', fd);
1908 } 2005 }
2006
1909 pclose_printer (fd); 2007 pclose_printer (fd);
1910#endif 2008#endif
1911} 2009}
1912 2010
1913/* ------------------------------------------------------------------------- */ 2011/* ------------------------------------------------------------------------- */
… …
1928 2026
1929void 2027void
1930rxvt_term::scr_refresh (unsigned char refresh_type) 2028rxvt_term::scr_refresh (unsigned char refresh_type)
1931{ 2029{
1932 unsigned char must_clear, /* use draw_string not draw_image_string */ 2030 unsigned char must_clear, /* use draw_string not draw_image_string */
1933 rvid, /* reverse video this position */
1934 showcursor; /* show the cursor */ 2031 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1937 int i, /* tmp */ 2034 int i, /* tmp */
1938 row_offset; /* basic offset in screen structure */ 2035 row_offset; /* basic offset in screen structure */
1939#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1940 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
1941#endif 2038#endif
1942 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2039 rend_t *crp; // cursor rendition pointer
1943 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1944 2040
1945 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2041 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1946 return; 2042 return;
1947 2043
1948 /* 2044 /*
1949 * A: set up vars 2045 * A: set up vars
1950 */ 2046 */
1951 must_clear = 0; 2047 must_clear = 0;
1952
1953 refresh_count = 0; 2048 refresh_count = 0;
1954 2049
1955 row_offset = TermWin.saveLines - TermWin.view_start; 2050 row_offset = TermWin.saveLines - TermWin.view_start;
1956 2051
1957#ifdef XPM_BACKGROUND 2052#if XPM_BACKGROUND
1958 must_clear |= (bgPixmap.pixmap != None); 2053 must_clear |= (bgPixmap.pixmap != None);
1959#endif 2054#endif
1960#ifdef TRANSPARENT 2055#if TRANSPARENT
1961 must_clear |= ((Options & Opt_transparent) && am_transparent); 2056 must_clear |= ((options & Opt_transparent) && am_transparent);
1962#endif 2057#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 2059
1965 /* 2060 /*
1966 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
… …
1981 showcursor = 0; 2076 showcursor = 0;
1982#endif 2077#endif
1983 2078
1984 if (showcursor) 2079 if (showcursor)
1985 { 2080 {
2081 int col = screen.cur.col;
2082
2083 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2084 col--;
2085
1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2086 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1987 2087
1988 if (showcursor && TermWin.focus) 2088 if (showcursor && TermWin.focus)
1989 { 2089 {
1990 *srp ^= RS_RVid; 2090 *crp ^= RS_RVid;
1991#ifndef NO_CURSORCOLOR 2091#ifndef NO_CURSORCOLOR
1992 cc1 = *srp & (RS_fgMask | RS_bgMask); 2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
1993 if (ISSET_PIXCOLOR (Color_cursor)) 2093 if (ISSET_PIXCOLOR (Color_cursor))
1994 ccol1 = Color_cursor; 2094 ccol1 = Color_cursor;
1995 else 2095 else
1996#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1997 ccol1 = GET_FGCOLOR (rstyle); 2097 ccol1 = GET_FGCOLOR (rstyle);
… …
2004#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2005 ccol2 = GET_BGCOLOR (rstyle); 2105 ccol2 = GET_BGCOLOR (rstyle);
2006#else 2106#else
2007 ccol2 = Color_bg; 2107 ccol2 = Color_bg;
2008#endif 2108#endif
2009 *srp = SET_FGCOLOR (*srp, ccol1); 2109 *crp = SET_FGCOLOR (*crp, ccol1);
2010 *srp = SET_BGCOLOR (*srp, ccol2); 2110 *crp = SET_BGCOLOR (*crp, ccol2);
2011#endif 2111#endif
2012 } 2112 }
2013 } 2113 }
2014 2114
2015 /* make sure no outline cursor is left around */ 2115 /* make sure no outline cursor is left around */
… …
2042 oldcursor.col = screen.cur.col; 2142 oldcursor.col = screen.cur.col;
2043 } 2143 }
2044 } 2144 }
2045 } 2145 }
2046 2146
2147#if ENABLE_OVERLAY
2148 scr_swap_overlay ();
2149#endif
2150
2151 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2152 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2153
2047#ifndef NO_SLOW_LINK_SUPPORT 2154#ifndef NO_SLOW_LINK_SUPPORT
2048 /* 2155 /*
2049 * D: CopyArea pass - very useful for slower links 2156 * D: CopyArea pass - very useful for slower links
2050 * This has been deliberately kept simple. 2157 * This has been deliberately kept simple.
2051 */ 2158 */
… …
2054 && refresh_type == FAST_REFRESH && num_scr_allow && i 2161 && refresh_type == FAST_REFRESH && num_scr_allow && i
2055 && abs (i) < TermWin.nrow && !must_clear) 2162 && abs (i) < TermWin.nrow && !must_clear)
2056 { 2163 {
2057 int16_t nits; 2164 int16_t nits;
2058 int j; 2165 int j;
2059 rend_t *drp2;
2060 text_t *dtp2;
2061 int len, wlen; 2166 int len, wlen;
2062 2167
2063 j = TermWin.nrow; 2168 j = TermWin.nrow;
2064 wlen = len = -1; 2169 wlen = len = -1;
2065 row = i > 0 ? 0 : j - 1; 2170 row = i > 0 ? 0 : j - 1;
2066 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2171 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2067 { 2172 {
2068 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2173 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2069 { 2174 {
2070 stp = screen.text[row + row_offset]; 2175 text_t *stp = screen.text[row + row_offset];
2071 srp = screen.rend[row + row_offset]; 2176 rend_t *srp = screen.rend[row + row_offset];
2072 dtp = drawn_text[row]; 2177 text_t *dtp = drawn_text[row];
2073 dtp2 = drawn_text[row + i]; 2178 text_t *dtp2 = drawn_text[row + i];
2074 drp = drawn_rend[row]; 2179 rend_t *drp = drawn_rend[row];
2075 drp2 = drawn_rend[row + i]; 2180 rend_t *drp2 = drawn_rend[row + i];
2076 2181
2077 for (nits = 0, col = TermWin.ncol; col--; ) 2182 for (nits = 0, col = TermWin.ncol; col--; )
2078 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2183 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2079 nits--; 2184 nits--;
2080 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2185 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2100 { 2205 {
2101 /* also comes here at end if needed because of >= above */ 2206 /* also comes here at end if needed because of >= above */
2102 if (wlen < len) 2207 if (wlen < len)
2103 SWAP_IT (wlen, len, int); 2208 SWAP_IT (wlen, len, int);
2104 2209
2105 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2106 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2210 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2107 TermWin.gc, 0, Row2Pixel (len + i), 2211 TermWin.gc, 0, Row2Pixel (len + i),
2108 (unsigned int)TermWin_TotalWidth (), 2212 (unsigned int)TermWin_TotalWidth (),
2109 (unsigned int)Height2Pixel (wlen - len + 1), 2213 (unsigned int)Height2Pixel (wlen - len + 1),
2110 0, Row2Pixel (len)); 2214 0, Row2Pixel (len));
… …
2117 /* 2221 /*
2118 * E: main pass across every character 2222 * E: main pass across every character
2119 */ 2223 */
2120 for (row = 0; row < TermWin.nrow; row++) 2224 for (row = 0; row < TermWin.nrow; row++)
2121 { 2225 {
2122 stp = screen.text[row + row_offset]; 2226 text_t *stp = screen.text[row + row_offset];
2123 srp = screen.rend[row + row_offset]; 2227 rend_t *srp = screen.rend[row + row_offset];
2124 dtp = drawn_text[row]; 2228 text_t *dtp = drawn_text[row];
2125 drp = drawn_rend[row]; 2229 rend_t *drp = drawn_rend[row];
2126 2230
2127 /* 2231 /*
2128 * E2: OK, now the real pass 2232 * E2: OK, now the real pass
2129 */ 2233 */
2130 int ypixel = (int)Row2Pixel (row); 2234 int ypixel = (int)Row2Pixel (row);
2131 2235
2132 for (col = 0; col < TermWin.ncol; col++) 2236 for (col = 0; col < TermWin.ncol; col++)
2133 { 2237 {
2134 /* compare new text with old - if exactly the same then continue */ 2238 /* compare new text with old - if exactly the same then continue */
2135 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2239 if (stp[col] == dtp[col] /* Must match characters to skip. */
2136 && (srp[col] == drp[col] /* Either rendition the same or */ 2240 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2137 || (stp[col] == ' ' /* space w/ no background change */ 2241 || (stp[col] == ' ' /* space w/ no background change */
2138 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2139 continue; 2243 continue;
2140 2244
2141 // redraw one or more characters 2245 // redraw one or more characters
… …
2151 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2152 drp[col] = rend; 2256 drp[col] = rend;
2153 2257
2154 int xpixel = Col2Pixel (col); 2258 int xpixel = Col2Pixel (col);
2155 2259
2156 // this loop looks very messy, it can probably be optimized
2157 // and cleaned a bit by you?
2158 for (i = 0; ++col < TermWin.ncol; ) 2260 for (i = 0; ++col < TermWin.ncol; )
2159 { 2261 {
2160 if (stp[col] == NOCHAR) 2262 if (stp[col] == NOCHAR)
2161 { 2263 {
2162 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2163 drp[col] = rend; 2265 drp[col] = rend;
2164 count++; 2266 count++;
2165
2166 if (i) // only possible skip if char unchanged
2167 i++; 2267 i++;
2168 2268
2169 continue; 2269 continue;
2170 } 2270 }
2171 2271
2172 if (rend != srp[col]) 2272 if (!RS_SAME (rend, srp[col]))
2173 break; 2273 break;
2174 2274
2175 count++; 2275 count++;
2176 2276
2177 if (stp[col] != dtp[col] 2277 if (stp[col] != dtp[col]
2178 || srp[col] != drp[col]) 2278 || !RS_SAME (srp[col], drp[col]))
2179 { 2279 {
2180 if (must_clear && (i++ > (count / 2))) 2280 if (must_clear && (i++ > count / 2))
2181 break; 2281 break;
2182 2282
2183 dtp[col] = stp[col]; 2283 dtp[col] = stp[col];
2184 drp[col] = rend; 2284 drp[col] = rend;
2185 i = 0; 2285 i = 0;
2186 } 2286 }
2187 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2287 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2188 break; 2288 break;
2189 } 2289 }
2190 2290
2191 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2192 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2293
2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2295 while (i && text[count] == NOCHAR)
2296 count++, i--;
2297
2298#if ENABLE_STYLES
2299 // force redraw after "careful" characters to avoid pixel droppings
2300 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2301 drp[col + 1] = ~srp[col + 1];
2302
2303 // include previous careful character(s) if possible, looks nicer (best effort...)
2304 while (text > stp
2305 && srp[text - stp - 1] & RS_Careful
2306 && RS_SAME (rend, srp[text - stp - 1]))
2307 text--, count++, xpixel -= TermWin.fwidth;
2308#endif
2193 2309
2194 /* 2310 /*
2195 * Determine the attributes for the string 2311 * Determine the attributes for the string
2196 */ 2312 */
2197 int fid = GET_FONT (rend);
2198 int fore = GET_FGCOLOR (rend); // desired foreground 2313 int fore = GET_FGCOLOR (rend); // desired foreground
2199 int back = GET_BGCOLOR (rend); // desired background 2314 int back = GET_BGCOLOR (rend); // desired background
2200 2315
2201 rend = GET_ATTR (rend); 2316 // only do special processing if ana attributes are set, which is rare
2202 2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2203 rvid = !!(rend & RS_RVid); 2318 {
2319 bool invert = rend & RS_RVid;
2204 2320
2205#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2206 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2322 if (rend & RS_Bold
2323 && fore == Color_fg)
2207 { 2324 {
2208 if (ISSET_PIXCOLOR (Color_BD)) 2325 if (ISSET_PIXCOLOR (Color_BD))
2209 fore = Color_BD; 2326 fore = Color_BD;
2327# if !ENABLE_STYLES
2210 else 2328 else
2211 rvid = !rvid; 2329 invert = !invert;
2330# endif
2331 }
2332
2333 if (rend & RS_Italic
2334 && fore == Color_fg)
2335 {
2336 if (ISSET_PIXCOLOR (Color_IT))
2337 fore = Color_IT;
2338# if !ENABLE_STYLES
2339 else
2340 invert = !invert;
2341# endif
2342 }
2343
2344 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2345 fore = Color_UL;
2346#endif
2347
2348 if (invert)
2349 {
2350 SWAP_IT (fore, back, int);
2351
2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2353 if (ISSET_PIXCOLOR (Color_RV))
2354 back = Color_RV;
2355#endif
2356 }
2357
2358#ifdef TEXT_BLINK
2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2360 {
2361 if (!text_blink_ev.active)
2362 {
2363 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2364 hidden_text = 0;
2365 }
2366 else if (hidden_text)
2367 fore = back;
2368 }
2369#endif
2212 } 2370 }
2213
2214 if (rend & RS_Uline)
2215 if (ISSET_PIXCOLOR (Color_UL))
2216 fore = Color_UL;
2217#endif
2218
2219 if (rvid)
2220 {
2221 SWAP_IT (fore, back, int);
2222
2223#ifndef NO_BOLD_UNDERLINE_REVERSE
2224 if (ISSET_PIXCOLOR (Color_RV)
2225# ifndef NO_CURSORCOLOR
2226 && !ISSET_PIXCOLOR (Color_cursor)
2227# endif
2228 )
2229 back = Color_RV;
2230#endif
2231 }
2232
2233#ifdef TEXT_BLINK
2234 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2235 {
2236 if (!text_blink_ev.active)
2237 {
2238 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2239 hidden_text = 0;
2240 }
2241 else if (hidden_text)
2242 fore = back;
2243 }
2244#endif
2245 2371
2246 /* 2372 /*
2247 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2248 */ 2374 */
2249 rxvt_font *font = (*TermWin.fontset)[fid]; 2375 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2250 2376
2251 if (back == fore) 2377 if (back == fore)
2252 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2378 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2253 TermWin.fwidth * count, TermWin.fheight, 2379 TermWin.fwidth * count, TermWin.fheight,
2254 back); 2380 back);
… …
2276 xpixel, ypixel + font->ascent + 1, 2402 xpixel, ypixel + font->ascent + 1,
2277 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2278 } /* for (col....) */ 2404 } /* for (col....) */
2279 } /* for (row....) */ 2405 } /* for (row....) */
2280 2406
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410
2281 /* 2411 /*
2282 * G: cleanup cursor and display outline cursor if necessary 2412 * G: cleanup cursor and display outline cursor if necessary
2283 */ 2413 */
2284 if (showcursor) 2414 if (showcursor)
2285 { 2415 {
2286 if (TermWin.focus) 2416 if (TermWin.focus)
2287 { 2417 {
2288 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2289 [screen.cur.col]);
2290 *srp ^= RS_RVid; 2418 *crp ^= RS_RVid;
2291#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2292 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2420 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2293#endif 2421#endif
2294 } 2422 }
2295 else if (oldcursor.row >= 0) 2423 else if (oldcursor.row >= 0)
2296 { 2424 {
2297#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2298 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2299 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2427 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2300#endif 2428#endif
2301 int cursorwidth = 1; 2429 int cursorwidth = 1;
2302 while (oldcursor.col + cursorwidth < TermWin.ncol 2430 while (oldcursor.col + cursorwidth < TermWin.ncol
2303 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2431 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2304 cursorwidth++; 2432 cursorwidth++;
… …
2329{ 2457{
2330 if (!rp || !tp) 2458 if (!rp || !tp)
2331 return; 2459 return;
2332 2460
2333 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2461 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2334 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2462 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2335} 2463}
2336 2464
2337void 2465void
2338rxvt_term::scr_remap_chars () 2466rxvt_term::scr_remap_chars ()
2339{ 2467{
… …
2345 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2473 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2346 scr_remap_chars (swap.text[i], swap.rend[i]); 2474 scr_remap_chars (swap.text[i], swap.rend[i]);
2347 } 2475 }
2348} 2476}
2349 2477
2478void
2479rxvt_term::scr_recolour ()
2480{
2481 if (1
2482#if TRANSPARENT
2483 && !am_transparent
2484#endif
2485#if XPM_BACKGROUND
2486 && !bgPixmap.pixmap
2487#endif
2488 )
2489 {
2490 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2491 XClearWindow (display->display, TermWin.parent[0]);
2492 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2493#if HAVE_SCROLLBARS
2494 if (scrollBar.win)
2495 {
2496 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2497 scrollBar.setIdle ();
2498 scrollbar_show (0);
2499 }
2500#endif
2501 }
2502
2503 scr_clear ();
2504 scr_touch (true);
2505 want_refresh = 1;
2506}
2507
2350/* ------------------------------------------------------------------------- */ 2508/* ------------------------------------------------------------------------- */
2351void 2509void
2352rxvt_term::scr_clear (bool really) 2510rxvt_term::scr_clear (bool really)
2353{ 2511{
2354 if (!TermWin.mapped) 2512 if (!TermWin.mapped)
2355 return; 2513 return;
2356 2514
2357 num_scr_allow = 0; 2515 num_scr_allow = 0;
2358 want_refresh = 1; 2516 want_refresh = 1;
2359 2517
2360#ifdef TRANSPARENT 2518#if TRANSPARENT
2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2519 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2362 { 2520 {
2363 int i; 2521 int i;
2364 2522
2365 if (! (Options & Opt_transparent_all)) 2523 if (!(options & Opt_transparent_all))
2366 i = 0; 2524 i = 0;
2367 else 2525 else
2368 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2526 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2369 2527
2370 while (i--) 2528 while (i--)
… …
2447 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2605 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2448 */ 2606 */
2449void 2607void
2450rxvt_term::selection_check (int check_more) 2608rxvt_term::selection_check (int check_more)
2451{ 2609{
2452 row_col_t pos; 2610 row_col_t pos;
2453 2611
2454 if (!selection.op) 2612 if (!selection.op)
2455 return; 2613 return;
2456 2614
2457 pos.row = pos.col = 0; 2615 pos.row = pos.col = 0;
… …
2484rxvt_term::paste (const unsigned char *data, unsigned int len) 2642rxvt_term::paste (const unsigned char *data, unsigned int len)
2485{ 2643{
2486 unsigned int i, j, n; 2644 unsigned int i, j, n;
2487 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2645 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2488 2646
2489#if 0
2490 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2491 ZERO_SCROLLBACK (r);
2492#endif
2493
2494 /* convert normal newline chars into common keyboard Return key sequence */ 2647 /* convert normal newline chars into common keyboard Return key sequence */
2495 for (i = 0; i < len; i += PROP_SIZE) 2648 for (i = 0; i < len; i += PROP_SIZE)
2496 { 2649 {
2497 n = min (len - i, PROP_SIZE); 2650 n = min (len - i, PROP_SIZE);
2498 MEMCPY (ds, data + i, n); 2651 memcpy (ds, data + i, n);
2499 2652
2500 for (j = 0; j < n; j++) 2653 for (j = 0; j < n; j++)
2501 if (ds[j] == C0_LF) 2654 if (ds[j] == C0_LF)
2502 ds[j] = C0_CR; 2655 ds[j] = C0_CR;
2503 2656
… …
2516rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2517{ 2670{
2518 long nread = 0; 2671 long nread = 0;
2519 unsigned long bytes_after; 2672 unsigned long bytes_after;
2520 XTextProperty ct; 2673 XTextProperty ct;
2521
2522 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2523 2674
2524 if (prop == None) /* check for failed XConvertSelection */ 2675 if (prop == None) /* check for failed XConvertSelection */
2525 { 2676 {
2526 if ((selection_type & Sel_CompoundText)) 2677 if ((selection_type & Sel_CompoundText))
2527 { 2678 {
… …
2554 &ct.nitems, &bytes_after, 2705 &ct.nitems, &bytes_after,
2555 &ct.value) != Success) 2706 &ct.value) != Success)
2556 break; 2707 break;
2557 2708
2558 if (ct.encoding == 0) 2709 if (ct.encoding == 0)
2710 break;
2711
2712 if (ct.encoding == xa[XA_INCR])
2559 { 2713 {
2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2714 // INCR selection, start handshake
2715 XDeleteProperty (display->display, win, prop);
2716 selection_wait = Sel_incr;
2717 incr_ev.start (NOW + 10);
2561 break; 2718 break;
2562 } 2719 }
2563 2720
2564 if (ct.value == NULL) 2721 if (ct.value == NULL)
2565 {
2566 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2567 continue; 2722 continue;
2568 }
2569 2723
2570 if (ct.nitems == 0) 2724 if (ct.nitems == 0)
2571 { 2725 {
2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2574 if (selection_wait == Sel_normal && nread == 0 2726 if (selection_wait == Sel_normal && nread == 0
2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2576 { 2728 {
2577 /* 2729 /*
2578 * pass through again trying CUT_BUFFER0 if we've come from 2730 * pass through again trying CUT_BUFFER0 if we've come from
2579 * XConvertSelection () but nothing was presented 2731 * XConvertSelection () but nothing was presented
2580 */ 2732 */
2581 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2582 selection_paste (display->root, XA_CUT_BUFFER0, False); 2733 selection_paste (display->root, XA_CUT_BUFFER0, False);
2583 } 2734 }
2584 2735
2585 nread = -1; /* discount any previous stuff */ 2736 nread = -1; /* discount any previous stuff */
2586 break; 2737 break;
… …
2591 char **cl; 2742 char **cl;
2592 int cr; 2743 int cr;
2593 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2594 { 2745 {
2595 for (int i = 0; i < cr; i++) 2746 for (int i = 0; i < cr; i++)
2596 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2747 paste ((unsigned char *)cl[i], strlen (cl[i]));
2597 2748
2598 XFreeStringList (cl); 2749 XFreeStringList (cl);
2599 } 2750 }
2600 else 2751 else
2601 paste (ct.value, ct.nitems); 2752 paste (ct.value, ct.nitems);
… …
2610 XFree (ct.value); 2761 XFree (ct.value);
2611 2762
2612 if (selection_wait == Sel_normal) 2763 if (selection_wait == Sel_normal)
2613 selection_wait = Sel_none; 2764 selection_wait = Sel_none;
2614 2765
2615 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2616 return (int)nread; 2766 return (int)nread;
2617} 2767}
2618 2768
2619void 2769void
2620rxvt_term::incr_cb (time_watcher &w) 2770rxvt_term::incr_cb (time_watcher &w)
… …
2628 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2778 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2629 */ 2779 */
2630void 2780void
2631rxvt_term::selection_property (Window win, Atom prop) 2781rxvt_term::selection_property (Window win, Atom prop)
2632{ 2782{
2633 int reget_time = 0; 2783 if (prop == None || selection_wait != Sel_incr)
2634
2635 if (prop == None)
2636 return; 2784 return;
2637 2785
2638 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2639 if (selection_wait == Sel_normal)
2640 {
2641 int a, afmt;
2642 Atom atype;
2643 unsigned long bytes_after, nitems;
2644 unsigned char *s = NULL;
2645
2646 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2647 xa[XA_INCR], &atype, &afmt, &nitems,
2648 &bytes_after, &s);
2649 if (s)
2650 XFree (s);
2651 if (a != Success)
2652 return;
2653
2654#ifndef __CYGWIN32__
2655 if (atype == xa[XA_INCR])
2656 { /* start an INCR transfer */
2657 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2658 XDeleteProperty (display->display, win, prop);
2659 XFlush (display->display);
2660 reget_time = 1;
2661 selection_wait = Sel_incr;
2662 }
2663#endif
2664
2665 }
2666 else if (selection_wait == Sel_incr)
2667 {
2668 reget_time = 1;
2669
2670 if (selection_paste (win, prop, True) == -1) 2786 if (selection_paste (win, prop, 1) > 0)
2671 {
2672 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2673 selection_wait = Sel_none;
2674 incr_ev.stop ();
2675 }
2676 }
2677 if (reget_time) /* received more data so reget time */
2678 incr_ev.start (NOW + 10); 2787 incr_ev.start (NOW + 10);
2788 else
2789 {
2790 selection_wait = Sel_none;
2791 incr_ev.stop ();
2792 }
2679} 2793}
2680 2794
2681/* ------------------------------------------------------------------------- */ 2795/* ------------------------------------------------------------------------- */
2682/* 2796/*
2683 * Request the current selection: 2797 * Request the current selection:
… …
2689 * EXT: button 2 release 2803 * EXT: button 2 release
2690 */ 2804 */
2691void 2805void
2692rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm, int x, int y)
2693{ 2807{
2694 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2695
2696 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2808 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2697 return; /* outside window */ 2809 return; /* outside window */
2698 2810
2699 if (selection.text) 2811 if (selection.text)
2700 { /* internal selection */ 2812 { /* internal selection */
2701 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2702 char *str = rxvt_wcstombs (selection.text, selection.len); 2813 char *str = rxvt_wcstombs (selection.text, selection.len);
2703 paste ((unsigned char *)str, strlen (str)); 2814 paste ((unsigned char *)str, strlen (str));
2704 free (str); 2815 free (str);
2705 return; 2816 return;
2706 } 2817 }
… …
2725 2836
2726 } 2837 }
2727 } 2838 }
2728 2839
2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2731 selection_paste (display->root, XA_CUT_BUFFER0, False); 2841 selection_paste (display->root, XA_CUT_BUFFER0, False);
2732} 2842}
2733 2843
2734int 2844int
2735rxvt_term::selection_request_other (Atom target, int selnum) 2845rxvt_term::selection_request_other (Atom target, int selnum)
… …
2748 else 2858 else
2749 sel = xa[XA_CLIPBOARD]; 2859 sel = xa[XA_CLIPBOARD];
2750 2860
2751 if (XGetSelectionOwner (display->display, sel) != None) 2861 if (XGetSelectionOwner (display->display, sel) != None)
2752 { 2862 {
2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2863 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2755 TermWin.vt, selection_request_time); 2864 TermWin.vt, selection_request_time);
2756 return 1; 2865 return 1;
2757 } 2866 }
2758 2867
… …
2765 * EXT: SelectionClear 2874 * EXT: SelectionClear
2766 */ 2875 */
2767void 2876void
2768rxvt_term::selection_clear () 2877rxvt_term::selection_clear ()
2769{ 2878{
2770 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2771
2772 want_refresh = 1; 2879 want_refresh = 1;
2773 free (selection.text); 2880 free (selection.text);
2774 selection.text = NULL; 2881 selection.text = NULL;
2775 selection.len = 0; 2882 selection.len = 0;
2776 CLEAR_SELECTION (); 2883 CLEAR_SELECTION ();
… …
2789{ 2896{
2790 int i, col, end_col, row, end_row; 2897 int i, col, end_col, row, end_row;
2791 wchar_t *new_selection_text; 2898 wchar_t *new_selection_text;
2792 text_t *t; 2899 text_t *t;
2793 2900
2794 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2795 switch (selection.op) 2901 switch (selection.op)
2796 { 2902 {
2797 case SELECTION_CONT: 2903 case SELECTION_CONT:
2798 break; 2904 break;
2799 case SELECTION_INIT: 2905 case SELECTION_INIT:
… …
2821 int ofs = 0; 2927 int ofs = 0;
2822 int extra = 0; 2928 int extra = 0;
2823 2929
2824 for (; row <= end_row; row++, col = 0) 2930 for (; row <= end_row; row++, col = 0)
2825 { 2931 {
2826 t = &(screen.text[row][col]); 2932 t = &screen.text[row][col];
2827 2933
2828 end_col = screen.tlen[row]; 2934 end_col = screen.tlen[row];
2829 2935
2830 if (end_col == -1) 2936 if (end_col == -1)
2831 end_col = TermWin.ncol; 2937 end_col = TermWin.ncol;
… …
2895 XFree (ct.value); 3001 XFree (ct.value);
2896 } 3002 }
2897#endif 3003#endif
2898 3004
2899 selection_time = tm; 3005 selection_time = tm;
2900 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2901} 3006}
2902 3007
2903/* ------------------------------------------------------------------------- */ 3008/* ------------------------------------------------------------------------- */
2904/* 3009/*
2905 * Mark or select text based upon number of clicks: 1, 2, or 3 3010 * Mark or select text based upon number of clicks: 1, 2, or 3
2906 * EXT: button 1 press 3011 * EXT: button 1 press
2907 */ 3012 */
2908void 3013void
2909rxvt_term::selection_click (int clicks, int x, int y) 3014rxvt_term::selection_click (int clicks, int x, int y)
2910{ 3015{
2911 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2912
2913 clicks = ((clicks - 1) % 3) + 1; 3016 clicks = ((clicks - 1) % 3) + 1;
2914 selection.clicks = clicks; /* save clicks so extend will work */ 3017 selection.clicks = clicks; /* save clicks so extend will work */
2915 3018
2916 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3019 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2917 3020
… …
2959 * We now only find out the boundary in one direction 3062 * We now only find out the boundary in one direction
2960 */ 3063 */
2961 3064
2962/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3065/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2963#define DELIMIT_TEXT(x) \ 3066#define DELIMIT_TEXT(x) \
2964 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3067 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2965#define DELIMIT_REND(x) 1 3068#define DELIMIT_REND(x) 1
2966 3069
2967void 3070void
2968rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3071rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2969{ 3072{
… …
2987 3090
2988 row = mark->row + TermWin.saveLines; 3091 row = mark->row + TermWin.saveLines;
2989 col = mark->col; 3092 col = mark->col;
2990 MAX_IT (col, 0); 3093 MAX_IT (col, 0);
2991 /* find the edge of a word */ 3094 /* find the edge of a word */
2992 stp = & (screen.text[row][col]); 3095 stp = &screen.text[row][col];
2993 w1 = DELIMIT_TEXT (*stp); 3096 w1 = DELIMIT_TEXT (*stp);
2994 3097
2995 srp = (&screen.rend[row][col]); 3098 srp = &screen.rend[row][col];
2996 w2 = DELIMIT_REND (*srp); 3099 w2 = DELIMIT_REND (*srp);
2997 3100
2998 for (;;) 3101 for (;;)
2999 { 3102 {
3000 for (; col != bound.col; col += dirnadd) 3103 for (; col != bound.col; col += dirnadd)
… …
3034 } 3137 }
3035 break; 3138 break;
3036 } 3139 }
3037 3140
3038Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
3039 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));
3040
3041 if (dirn == DN) 3142 if (dirn == DN)
3042 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3043 3144
3044 /* Poke the values back in */ 3145 /* Poke the values back in */
3045 ret->row = row - TermWin.saveLines; 3146 ret->row = row - TermWin.saveLines;
… …
3079 /* select nothing */ 3180 /* select nothing */
3080 selection.beg.row = selection.end.row = 0; 3181 selection.beg.row = selection.end.row = 0;
3081 selection.beg.col = selection.end.col = 0; 3182 selection.beg.col = selection.end.col = 0;
3082 selection.clicks = 4; 3183 selection.clicks = 4;
3083 want_refresh = 1; 3184 want_refresh = 1;
3084 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3085 return; 3185 return;
3086 } 3186 }
3087 3187
3088 if (selection.clicks == 4) 3188 if (selection.clicks == 4)
3089 selection.clicks = 1; 3189 selection.clicks = 1;
… …
3104 int end_col; 3204 int end_col;
3105 row_col_t pos; 3205 row_col_t pos;
3106 enum { 3206 enum {
3107 LEFT, RIGHT 3207 LEFT, RIGHT
3108 } closeto = RIGHT; 3208 } closeto = RIGHT;
3109
3110 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));
3111 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));
3112 3209
3113 want_refresh = 1; 3210 want_refresh = 1;
3114 switch (selection.op) 3211 switch (selection.op)
3115 { 3212 {
3116 case SELECTION_INIT: 3213 case SELECTION_INIT:
… …
3138 && selection.beg.row == selection.end.row 3235 && selection.beg.row == selection.end.row
3139 && selection.beg.row != selection.mark.row) 3236 && selection.beg.row != selection.mark.row)
3140 { 3237 {
3141 selection.beg.col = selection.end.col = selection.mark.col; 3238 selection.beg.col = selection.end.col = selection.mark.col;
3142 selection.beg.row = selection.end.row = selection.mark.row; 3239 selection.beg.row = selection.end.row = selection.mark.row;
3143 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));
3144 } 3240 }
3145 3241
3146 pos.col = col; 3242 pos.col = col;
3147 pos.row = row; 3243 pos.row = row;
3148 3244
… …
3241 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3242 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3338 selection_delimit_word (DN, & (selection.end), & (selection.end));
3243 } 3339 }
3244 else if (selection.clicks == 3) 3340 else if (selection.clicks == 3)
3245 { 3341 {
3246#ifndef NO_FRILLS 3342#if ENABLE_FRILLS
3247 if ((Options & Opt_tripleclickwords)) 3343 if ((options & Opt_tripleclickwords))
3248 { 3344 {
3249 int end_row; 3345 int end_row;
3250 3346
3251 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3252 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3277 if (button3 && buttonpress) 3373 if (button3 && buttonpress)
3278 { /* mark may need to be changed */ 3374 { /* mark may need to be changed */
3279 if (closeto == LEFT) 3375 if (closeto == LEFT)
3280 { 3376 {
3281 selection.mark.row = selection.end.row; 3377 selection.mark.row = selection.end.row;
3282 selection.mark.col = selection.end.col 3378 selection.mark.col = selection.end.col - (selection.clicks == 2);
3283 - (selection.clicks == 2);
3284 } 3379 }
3285 else 3380 else
3286 { 3381 {
3287 selection.mark.row = selection.beg.row; 3382 selection.mark.row = selection.beg.row;
3288 selection.mark.col = selection.beg.col; 3383 selection.mark.col = selection.beg.col;
3289 } 3384 }
3290 } 3385 }
3291 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));
3292} 3386}
3293 3387
3294#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3295void 3389void
3296rxvt_term::selection_remove_trailing_spaces () 3390rxvt_term::selection_remove_trailing_spaces ()
3297{ 3391{
3298 int32_t end_col, end_row; 3392 int32_t end_col, end_row;
3299 text_t *stp; 3393 text_t *stp;
… …
3388 (8 * sizeof (target_list[0])), PropModeReplace, 3482 (8 * sizeof (target_list[0])), PropModeReplace,
3389 (unsigned char *)target_list, 3483 (unsigned char *)target_list,
3390 target - target_list); 3484 target - target_list);
3391 ev.property = rq.property; 3485 ev.property = rq.property;
3392 } 3486 }
3487#if TODO // TODO
3393 else if (rq.target == xa[XA_MULTIPLE]) 3488 else if (rq.target == xa[XA_MULTIPLE])
3394 { 3489 {
3395 /* TODO: Handle MULTIPLE */ 3490 /* TODO: Handle MULTIPLE */
3396 } 3491 }
3492#endif
3397 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3493 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3398 { 3494 {
3399 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3495 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3400 (8 * sizeof (Time)), PropModeReplace, 3496 (8 * sizeof (Time)), PropModeReplace,
3401 (unsigned char *)&selection_time, 1); 3497 (unsigned char *)&selection_time, 1);
… …
3482} 3578}
3483 3579
3484/* ------------------------------------------------------------------------- */ 3580/* ------------------------------------------------------------------------- */
3485#ifdef USE_XIM 3581#ifdef USE_XIM
3486void 3582void
3487rxvt_term::im_set_position (XPoint *pos) 3583rxvt_term::im_set_position (XPoint &pos)
3488{ 3584{
3489 XWindowAttributes xwa; 3585 XWindowAttributes xwa;
3490 3586
3491 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3587 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3588
3492 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3589 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3493 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3590 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3494} 3591}
3495
3496#endif 3592#endif
3593
3594#if ENABLE_OVERLAY
3595void
3596rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3597{
3598 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3599 return;
3600
3601 want_refresh = 1;
3602
3603 scr_overlay_off ();
3604
3605 if (x < 0) x = TermWin.ncol - w;
3606 if (y < 0) y = TermWin.nrow - h;
3607
3608 // make space for border
3609 w += 2; MIN_IT (w, TermWin.ncol);
3610 h += 2; MIN_IT (h, TermWin.nrow);
3611
3612 x -= 1; MAX_IT (x, 0);
3613 y -= 1; MAX_IT (y, 0);
3614
3615 MIN_IT (x, TermWin.ncol - w);
3616 MIN_IT (y, TermWin.nrow - h);
3617
3618 ov_x = x; ov_y = y;
3619 ov_w = w; ov_h = h;
3620
3621 ov_text = new text_t *[h];
3622 ov_rend = new rend_t *[h];
3623
3624 for (y = 0; y < h; y++)
3625 {
3626 text_t *tp = ov_text[y] = new text_t[w];
3627 rend_t *rp = ov_rend[y] = new rend_t[w];
3628
3629 text_t t0, t1, t2;
3630 rend_t r = OVERLAY_RSTYLE;
3631
3632 if (y == 0)
3633 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3634 else if (y < h - 1)
3635 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3636 else
3637 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3638
3639 *tp++ = t0;
3640 *rp++ = r;
3641
3642 for (x = w - 2; x > 0; --x)
3643 {
3644 *tp++ = t1;
3645 *rp++ = r;
3646 }
3647
3648 *tp = t2;
3649 *rp = r;
3650 }
3651}
3652
3653void
3654rxvt_term::scr_overlay_off ()
3655{
3656 if (!ov_text)
3657 return;
3658
3659 want_refresh = 1;
3660
3661 for (int y = 0; y < ov_h; y++)
3662 {
3663 delete [] ov_text[y];
3664 delete [] ov_rend[y];
3665 }
3666
3667 delete [] ov_text; ov_text = 0;
3668 delete [] ov_rend; ov_rend = 0;
3669}
3670
3671void
3672rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3673{
3674 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3675 return;
3676
3677 x++, y++;
3678
3679 ov_text[y][x] = text;
3680 ov_rend[y][x] = rend;
3681}
3682
3683void
3684rxvt_term::scr_overlay_set (int x, int y, const char *s)
3685{
3686 while (*s)
3687 scr_overlay_set (x++, y, *s++);
3688}
3689
3690void
3691rxvt_term::scr_swap_overlay ()
3692{
3693 if (!ov_text)
3694 return;
3695
3696 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3697
3698 // swap screen mem with overlay
3699 for (int y = ov_h; y--; )
3700 {
3701 text_t *t1 = ov_text[y];
3702 rend_t *r1 = ov_rend[y];
3703
3704 text_t *t2 = screen.text[y + row_offset] + ov_x;
3705 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3706
3707 for (int x = ov_w; x--; )
3708 {
3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3711 }
3712 }
3713}
3714
3715#endif
3497/* ------------------------------------------------------------------------- */ 3716/* ------------------------------------------------------------------------- */

Diff Legend

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