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.143 by root, Sat Dec 4 04:06:03 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);
571
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574# ifdef DEBUG_STRICT
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583
568#if NSCREENS 584#if NSCREENS
569 if (Options & Opt_secondaryScreen) 585 if (options & Opt_secondaryScreen)
570 { 586 {
571 num_scr = 0; 587 num_scr = 0;
572 offset = TermWin.saveLines; 588 offset = TermWin.saveLines;
589
573 for (i = prev_nrow; i--;) 590 for (i = prev_nrow; i--;)
574 { 591 {
575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 592 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 593 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 594 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
578 } 595 }
579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 596
580 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
581# ifdef DEBUG_STRICT
582 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
583 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
584# else /* drive with your eyes closed */
585 MAX_IT (screen.cur.row, 0);
586 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
587 MAX_IT (screen.cur.col, 0);
588 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
589# endif
590 SWAP_IT (screen.charset, swap.charset, int16_t); 597 SWAP_IT (screen.charset, swap.charset, int16_t);
591 SWAP_IT (screen.flags, swap.flags, int); 598 SWAP_IT (screen.flags, swap.flags, int);
592 screen.flags |= Screen_VisibleCursor; 599 screen.flags |= Screen_VisibleCursor;
593 swap.flags |= Screen_VisibleCursor; 600 swap.flags |= Screen_VisibleCursor;
594 } 601 }
595 else 602 else
596#endif 603#endif
597 if (Options & Opt_secondaryScroll) 604 if (options & Opt_secondaryScroll)
598 //if (current_screen == PRIMARY) 605 //if (current_screen == PRIMARY)
599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
600 return scrn; 608 return scrn;
601} 609}
602 610
611// clear WrapNext indicator, solidifying position on next line
612void
613rxvt_term::scr_do_wrap ()
614{
615 if (!(screen.flags & Screen_WrapNext))
616 return;
617
618 screen.flags &= ~Screen_WrapNext;
619
620 screen.cur.col = 0;
621
622 if (screen.cur.row == screen.bscroll)
623 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
624 else if (screen.cur.row < TermWin.nrow - 1)
625 screen.cur.row++;
626}
627
603/* ------------------------------------------------------------------------- */ 628/* ------------------------------------------------------------------------- */
604/* 629/*
605 * Change the colour for following text 630 * Change the colour for following text
606 */ 631 */
607void 632void
608rxvt_term::scr_color (unsigned int color, int fgbg) 633rxvt_term::scr_color (unsigned int color, int fgbg)
609{ 634{
610 color &= RS_fgMask; 635 if (color > maxTermCOLOR)
636 color = fgbg;
637
611 if (fgbg == Color_fg) 638 if (fgbg == Color_fg)
612 rstyle = SET_FGCOLOR (rstyle, color); 639 rstyle = SET_FGCOLOR (rstyle, color);
613 else 640 else
614 rstyle = SET_BGCOLOR (rstyle, color); 641 rstyle = SET_BGCOLOR (rstyle, color);
615} 642}
… …
644 671
645 if (count == 0 || (row1 > row2)) 672 if (count == 0 || (row1 > row2))
646 return 0; 673 return 0;
647 674
648 want_refresh = 1; 675 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 676
651 if (row1 == 0 && count > 0 677 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 678 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
653 { 679 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 680 nscrolled = (long)TermWin.nscrolled + (long)count;
655 681
656 if (nscrolled > (long)TermWin.saveLines) 682 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 683 TermWin.nscrolled = TermWin.saveLines;
658 else 684 else
659 TermWin.nscrolled = (uint16_t)nscrolled; 685 TermWin.nscrolled = (unsigned int)nscrolled;
660 686
661 if ((Options & Opt_scrollWithBuffer) 687 if ((options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0 688 && TermWin.view_start != 0
663 && TermWin.view_start != TermWin.saveLines) 689 && TermWin.view_start != TermWin.saveLines)
664 scr_page (UP, count); 690 scr_page (UP, count);
665 } 691 }
666 else if (!spec) 692 else if (!spec)
… …
757 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
758 */ 784 */
759void 785void
760rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 786rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
761{ 787{
762 unsigned char checksel, clearsel; 788 unsigned char checksel;
763 unicode_t c; 789 unicode_t c;
764 int i, row, last_col; 790 int i, row, last_col;
765 text_t *stp; 791 text_t *stp;
766 rend_t *srp; 792 rend_t *srp;
767 793
768 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
769 return; 795 return;
770 796
771 want_refresh = 1; 797 want_refresh = 1;
798 ZERO_SCROLLBACK ();
772 last_col = TermWin.ncol; 799 last_col = TermWin.ncol;
773 800
774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
775 ZERO_SCROLLBACK ();
776 if (nlines > 0) 801 if (nlines > 0)
777 { 802 {
778 nlines += screen.cur.row - screen.bscroll; 803 nlines += screen.cur.row - screen.bscroll;
779 if ((nlines > 0) 804 if ((nlines > 0)
780 && (screen.tscroll == 0) 805 && (screen.tscroll == 0)
… …
783 /* _at least_ this many lines need to be scrolled */ 808 /* _at least_ this many lines need to be scrolled */
784 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
785 screen.cur.row -= nlines; 810 screen.cur.row -= nlines;
786 } 811 }
787 } 812 }
813
788#ifdef DEBUG_STRICT 814#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 815 assert (screen.cur.col < last_col);
790 assert ((screen.cur.row < TermWin.nrow) 816 assert ((screen.cur.row < TermWin.nrow)
791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
792#else /* drive with your eyes closed */ 818#else /* drive with your eyes closed */
… …
795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
796#endif 822#endif
797 row = screen.cur.row + TermWin.saveLines; 823 row = screen.cur.row + TermWin.saveLines;
798 824
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 clearsel = 0;
801 826
802 stp = screen.text[row]; 827 stp = screen.text[row];
803 srp = screen.rend[row]; 828 srp = screen.rend[row];
804 829
805 while (len--) 830 while (len--)
… …
808 833
809 if (c < 0x20) 834 if (c < 0x20)
810 switch (c) 835 switch (c)
811 { 836 {
812 case C0_HT: 837 case C0_HT:
813 scr_tab (1); 838 scr_tab (1, true);
814 continue; 839 continue;
815 840
816 case C0_LF: 841 case C0_LF:
817 if (screen.tlen[row] != -1) /* XXX: think about this */ 842 if (screen.tlen[row] != -1) /* XXX: think about this */
818 MAX_IT (screen.tlen[row], screen.cur.col); 843 MAX_IT (screen.tlen[row], screen.cur.col);
… …
840 if (checksel /* see if we're writing within selection */ 865 if (checksel /* see if we're writing within selection */
841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
842 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
843 { 868 {
844 checksel = 0; 869 checksel = 0;
845 clearsel = 1; 870 /*
871 * If we wrote anywhere in the selected area, kill the selection
872 * XXX: should we kill the mark too? Possibly, but maybe that
873 * should be a similar check.
874 */
875 CLEAR_SELECTION ();
846 } 876 }
847 877
848 if (screen.flags & Screen_WrapNext) 878 if (screen.flags & Screen_WrapNext)
849 { 879 {
850 screen.tlen[row] = -1; 880 screen.tlen[row] = -1;
851 if (screen.cur.row == screen.bscroll) 881
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; 882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
855 883
856 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext;
860 } 886 }
861
862 if (screen.flags & Screen_Insert)
863 scr_insdel_chars (1, INSERT);
864 887
865 // rely on wcwidth to tell us the character width, at least for non-latin1 888 // rely on wcwidth to tell us the character width, at least for non-latin1
866 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
867 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
868 int width = c < 0x100 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
869 892
870 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
871 { 894 {
872 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[32] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
878 }; 907 };
879 908
880 if (c >= 0x5f && c <= 0x7e) 909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
881 { 910 {
882 c = vt100_0[c - 0x5f]; 911 c = vt100_0[c - 0x40];
883 width = 1; 912 width = 1;
884 } 913 }
885 } 914 }
886 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
887 if (width != 0) 919 if (width != 0)
888 { 920 {
889#if !UNICODE_3 && ENABLE_COMBINING 921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3
890 // trim characters we can't store directly :( 926 // trim characters we can't store directly :(
891 if (c >= 0x10000) 927 if (c >= 0x10000)
928# if ENABLE_COMBINING
892 c = rxvt_composite.compose (c); // map to lower 16 bits 929 c = rxvt_composite.compose (c); // map to lower 16 bits
930# else
931 c = 0xfffd;
893#endif 932# endif
894 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 933#endif
895 rend_t rend = SET_FONT (rstyle, 934
896 c > 0x7f || bold || c < 0x20 935 // nuke the character at this position, if required
897 ? TermWin.fontset->find_font (c, bold) 936 if (stp[screen.cur.col] == NOCHAR
898 : TermWin.ascii_map [c - 0x20]); 937 || (screen.cur.col < TermWin.ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR))
939 {
940 int col = screen.cur.col;
941
942 // find begin
943 while (col > 0 && stp[col] == NOCHAR)
944 col--;
945
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
947
948 // found begin, nuke
949 do {
950 stp[col] = ' ';
951 srp[col] = rend;
952 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR);
954 }
955
956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899 957
900 do 958 do
901 { 959 {
902 stp[screen.cur.col] = c; 960 stp[screen.cur.col] = c;
903 srp[screen.cur.col] = rend; 961 srp[screen.cur.col] = rend;
… …
936 994
937 if (screen.cur.col > 0) 995 if (screen.cur.col > 0)
938 { 996 {
939 tp = stp + screen.cur.col - 1; 997 tp = stp + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1; 998 rp = srp + screen.cur.col - 1;
999
1000 while (*tp == NOCHAR && tp > stp)
1001 tp--, rp--;
941 } 1002 }
942 else if (screen.cur.row > 0 1003 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1004 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
944 { 1005 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1006 int line = screen.cur.row - 1 + TermWin.saveLines;
946 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1007
1008 tp = screen.text[line] + last_col - 1;
1009 rp = screen.rend[line] + last_col - 1;
1010
1011 while (*tp == NOCHAR && tp > screen.text[line])
1012 tp--, rp--;
947 } 1013 }
948 else 1014 else
949 continue; 1015 continue;
950
951 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp;
954 1016
955 // first try to find a precomposed character 1017 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c); 1018 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR) 1019 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c); 1020 n = rxvt_composite.compose (*tp, c);
959 1021
960 *tp = n; 1022 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1023 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962#endif 1024#endif
963 } 1025 }
964 } 1026 }
965 1027
966 if (screen.tlen[row] != -1) /* XXX: think about this */ 1028 if (screen.tlen[row] != -1) /* XXX: think about this */
967 MAX_IT (screen.tlen[row], screen.cur.col); 1029 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 1030
977#ifdef DEBUG_STRICT 1031#ifdef DEBUG_STRICT
978 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
979#else /* drive with your eyes closed */ 1033#else /* drive with your eyes closed */
980 MAX_IT (screen.cur.row, 0); 1034 MAX_IT (screen.cur.row, 0);
… …
998#ifdef TERMCAP_HAS_BW 1052#ifdef TERMCAP_HAS_BW
999 screen.cur.col = TermWin.ncol - 1; 1053 screen.cur.col = TermWin.ncol - 1;
1000 screen.cur.row--; 1054 screen.cur.row--;
1001 return; 1055 return;
1002#endif 1056#endif
1003
1004 } 1057 }
1005 } 1058 }
1006 else if ((screen.flags & Screen_WrapNext) == 0) 1059 else if (!(screen.flags & Screen_WrapNext))
1007 scr_gotorc (0, -1, RELATIVE); 1060 scr_gotorc (0, -1, RELATIVE);
1008 1061
1009 screen.flags &= ~Screen_WrapNext; 1062 screen.flags &= ~Screen_WrapNext;
1010} 1063}
1011 1064
… …
1014 * Process Horizontal Tab 1067 * Process Horizontal Tab
1015 * count: +ve = forward; -ve = backwards 1068 * count: +ve = forward; -ve = backwards
1016 * XTERM_SEQ: CTRL-I 1069 * XTERM_SEQ: CTRL-I
1017 */ 1070 */
1018void 1071void
1019rxvt_term::scr_tab (int count) 1072rxvt_term::scr_tab (int count, bool ht)
1020{ 1073{
1021 int i, x; 1074 int i, x;
1022 1075
1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1024 want_refresh = 1; 1076 want_refresh = 1;
1025 i = x = screen.cur.col; 1077 i = x = screen.cur.col;
1026 1078
1027 if (count == 0) 1079 if (count == 0)
1028 return; 1080 return;
1029 else if (count > 0) 1081 else if (count > 0)
1030 { 1082 {
1083 int row = TermWin.saveLines + screen.cur.row;
1084 text_t *tp = screen.text[row];
1085 rend_t *rp = screen.rend[row];
1086 rend_t base_rend = rp[i];
1087 ht &= tp[i] == ' ';
1088
1031 for (; ++i < TermWin.ncol; ) 1089 for (; ++i < TermWin.ncol; )
1032 if (tabs[i]) 1090 if (tabs[i])
1033 { 1091 {
1034 x = i; 1092 x = i;
1035 if (!--count) 1093 if (!--count)
1036 break; 1094 break;
1037 } 1095 }
1096 else
1097 ht &= tp[i] == ' '
1098 && RS_SAME (rp[i], base_rend);
1038 1099
1039 if (count) 1100 if (count)
1040 x = TermWin.ncol - 1; 1101 x = TermWin.ncol - 1;
1102
1103 // store horizontal tab commands as characters inside the text
1104 // buffer so they can be selected and pasted.
1105 if (ht && options & Opt_pastableTabs)
1106 {
1107 base_rend = SET_FONT (base_rend, 0);
1108
1109 if (screen.tlen[row] != -1) /* XXX: think about this */
1110 MAX_IT (screen.tlen[row], x);
1111
1112 i = screen.cur.col;
1113
1114 tp[i] = '\t';
1115 rp[i] = base_rend;
1116
1117 while (++i < x)
1118 {
1119 tp[i] = NOCHAR;
1120 rp[i] = base_rend;
1121 }
1122 }
1041 } 1123 }
1042 else /* if (count < 0) */ 1124 else /* if (count < 0) */
1043 { 1125 {
1044 for (; --i >= 0; ) 1126 for (; --i >= 0; )
1045 if (tabs[i]) 1127 if (tabs[i])
… …
1062 * Process DEC Back Index 1144 * Process DEC Back Index
1063 * XTERM_SEQ: ESC 6 1145 * XTERM_SEQ: ESC 6
1064 * Move cursor left in row. If we're at the left boundary, shift everything 1146 * Move cursor left in row. If we're at the left boundary, shift everything
1065 * in that row right. Clear left column. 1147 * in that row right. Clear left column.
1066 */ 1148 */
1067#ifndef NO_FRILLS 1149#if ENABLE_FRILLS
1068void 1150void
1069rxvt_term::scr_backindex () 1151rxvt_term::scr_backindex ()
1070{ 1152{
1071 if (screen.cur.col > 0) 1153 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1154 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1155 else
1074 { 1156 {
1075 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1157 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1076 return; /* um, yeah? */ 1158 return; /* um, yeah? */
1159
1077 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
1078 } 1161 }
1079} 1162}
1080#endif 1163#endif
1081/* ------------------------------------------------------------------------- */ 1164/* ------------------------------------------------------------------------- */
… …
1083 * Process DEC Forward Index 1166 * Process DEC Forward Index
1084 * XTERM_SEQ: ESC 9 1167 * XTERM_SEQ: ESC 9
1085 * Move cursor right in row. If we're at the right boundary, shift everything 1168 * Move cursor right in row. If we're at the right boundary, shift everything
1086 * in that row left. Clear right column. 1169 * in that row left. Clear right column.
1087 */ 1170 */
1088#ifndef NO_FRILLS 1171#if ENABLE_FRILLS
1089void 1172void
1090rxvt_term::scr_forwardindex () 1173rxvt_term::scr_forwardindex ()
1091{ 1174{
1092 int row; 1175 int row;
1093 1176
1094 if (screen.cur.col < TermWin.ncol - 1) 1177 if (screen.cur.col < TermWin.ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1178 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1179 else
1097 { 1180 {
1098 row = screen.cur.row + TermWin.saveLines; 1181 row = screen.cur.row + TermWin.saveLines;
1182
1099 if (screen.tlen[row] == 0) 1183 if (screen.tlen[row] == 0)
1100 return; /* um, yeah? */ 1184 return; /* um, yeah? */
1101 else if (screen.tlen[row] == -1) 1185 else if (screen.tlen[row] == -1)
1102 screen.tlen[row] = TermWin.ncol; 1186 screen.tlen[row] = TermWin.ncol;
1187
1103 scr_gotorc (0, 0, R_RELATIVE); 1188 scr_gotorc (0, 0, R_RELATIVE);
1104 scr_insdel_chars (1, DELETE); 1189 scr_insdel_chars (1, DELETE);
1105 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1190 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1106 } 1191 }
1107} 1192}
… …
1115rxvt_term::scr_gotorc (int row, int col, int relative) 1200rxvt_term::scr_gotorc (int row, int col, int relative)
1116{ 1201{
1117 want_refresh = 1; 1202 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1203 ZERO_SCROLLBACK ();
1119 1204
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; 1205 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1123 MAX_IT (screen.cur.col, 0); 1206 MAX_IT (screen.cur.col, 0);
1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1207 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1125 1208
1126 screen.flags &= ~Screen_WrapNext; 1209 screen.flags &= ~Screen_WrapNext;
1210
1127 if (relative & R_RELATIVE) 1211 if (relative & R_RELATIVE)
1128 { 1212 {
1129 if (row > 0) 1213 if (row > 0)
1130 { 1214 {
1131 if (screen.cur.row <= screen.bscroll 1215 if (screen.cur.row <= screen.bscroll
… …
1151 MIN_IT (screen.cur.row, screen.bscroll); 1235 MIN_IT (screen.cur.row, screen.bscroll);
1152 } 1236 }
1153 else 1237 else
1154 screen.cur.row = row; 1238 screen.cur.row = row;
1155 } 1239 }
1240
1156 MAX_IT (screen.cur.row, 0); 1241 MAX_IT (screen.cur.row, 0);
1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1242 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} 1243}
1163 1244
1164/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1165/* 1246/*
1166 * direction should be UP or DN 1247 * direction should be UP or DN
1167 */ 1248 */
1168void 1249void
1169rxvt_term::scr_index (enum page_dirn direction) 1250rxvt_term::scr_index (enum page_dirn direction)
1170{ 1251{
1171 int dirn; 1252 int dirn;
1172 1253
1173 want_refresh = 1; 1254 want_refresh = 1;
1255 ZERO_SCROLLBACK ();
1256
1174 dirn = ((direction == UP) ? 1 : -1); 1257 dirn = ((direction == UP) ? 1 : -1);
1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1176
1177 ZERO_SCROLLBACK ();
1178 1258
1179 screen.flags &= ~Screen_WrapNext; 1259 screen.flags &= ~Screen_WrapNext;
1260
1180 if ((screen.cur.row == screen.bscroll && direction == UP) 1261 if ((screen.cur.row == screen.bscroll && direction == UP)
1181 || (screen.cur.row == screen.tscroll && direction == DN)) 1262 || (screen.cur.row == screen.tscroll && direction == DN))
1182 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1263 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1183 else 1264 else
1184 screen.cur.row += dirn; 1265 screen.cur.row += dirn;
1266
1185 MAX_IT (screen.cur.row, 0); 1267 MAX_IT (screen.cur.row, 0);
1186 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1268 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1187 selection_check (0); 1269 selection_check (0);
1188} 1270}
1189 1271
… …
1198rxvt_term::scr_erase_line (int mode) 1280rxvt_term::scr_erase_line (int mode)
1199{ 1281{
1200 unsigned int row, col, num; 1282 unsigned int row, col, num;
1201 1283
1202 want_refresh = 1; 1284 want_refresh = 1;
1203 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1204 ZERO_SCROLLBACK (); 1285 ZERO_SCROLLBACK ();
1205 1286
1206 selection_check (1); 1287 selection_check (1);
1207
1208 screen.flags &= ~Screen_WrapNext;
1209 1288
1210 row = TermWin.saveLines + screen.cur.row; 1289 row = TermWin.saveLines + screen.cur.row;
1211 switch (mode) 1290 switch (mode)
1212 { 1291 {
1213 case 0: /* erase to end of line */ 1292 case 0: /* erase to end of line */
… …
1257 int32_t row, row_offset; 1336 int32_t row, row_offset;
1258 rend_t ren; 1337 rend_t ren;
1259 XGCValues gcvalue; 1338 XGCValues gcvalue;
1260 1339
1261 want_refresh = 1; 1340 want_refresh = 1;
1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1263 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1342
1264 row_offset = (int32_t)TermWin.saveLines; 1343 row_offset = (int32_t)TermWin.saveLines;
1265 1344
1266 switch (mode) 1345 switch (mode)
1267 { 1346 {
1268 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
… …
1304 ren = DEFAULT_RSTYLE; 1383 ren = DEFAULT_RSTYLE;
1305 CLEAR_ROWS (row, num); 1384 CLEAR_ROWS (row, num);
1306 } 1385 }
1307 else 1386 else
1308 { 1387 {
1309 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1310 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1389 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1390 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1312 ERASE_ROWS (row, num); 1391 ERASE_ROWS (row, num);
1313 gcvalue.foreground = PixColors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1315 } 1394 }
1316 1395
1317 for (; num--; row++) 1396 for (; num--; row++)
1318 { 1397 {
1319 scr_blank_screen_mem (screen.text, screen.rend, 1398 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1320 (unsigned int) (row + row_offset), rstyle);
1321 screen.tlen[row + row_offset] = 0; 1399 screen.tlen[row + row_offset] = 0;
1322 scr_blank_line (drawn_text[row], drawn_rend[row], 1400 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1323 (unsigned int)TermWin.ncol, ren);
1324 } 1401 }
1325} 1402}
1326 1403
1327/* ------------------------------------------------------------------------- */ 1404/* ------------------------------------------------------------------------- */
1328/* 1405/*
… …
1334{ 1411{
1335 int i, j, k; 1412 int i, j, k;
1336 rend_t *r1, fs; 1413 rend_t *r1, fs;
1337 1414
1338 want_refresh = 1; 1415 want_refresh = 1;
1416 ZERO_SCROLLBACK ();
1417
1339 num_scr_allow = 0; 1418 num_scr_allow = 0;
1340 ZERO_SCROLLBACK ();
1341 selection_check (3); 1419 selection_check (3);
1342 1420
1343 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1421 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1344 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1422 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1345 { 1423 {
1346 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1424 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1347 fill_text (screen.text[k], 'E', TermWin.ncol); 1425 fill_text (screen.text[k], 'E', TermWin.ncol);
1348 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1426 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1372 if (insdel == DELETE) 1450 if (insdel == DELETE)
1373 return; 1451 return;
1374 else if (insdel == INSERT) 1452 else if (insdel == INSERT)
1375 count = end; 1453 count = end;
1376 } 1454 }
1377 screen.flags &= ~Screen_WrapNext; 1455
1456 scr_do_wrap ();
1378 1457
1379 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1458 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1380} 1459}
1381 1460
1382/* ------------------------------------------------------------------------- */ 1461/* ------------------------------------------------------------------------- */
… …
1396 ZERO_SCROLLBACK (); 1475 ZERO_SCROLLBACK ();
1397 1476
1398 if (count <= 0) 1477 if (count <= 0)
1399 return; 1478 return;
1400 1479
1480 scr_do_wrap ();
1481
1401 selection_check (1); 1482 selection_check (1);
1402 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1483 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1403 1484
1404 row = screen.cur.row + TermWin.saveLines; 1485 row = screen.cur.row + TermWin.saveLines;
1405 screen.flags &= ~Screen_WrapNext;
1406 1486
1407 stp = screen.text[row]; 1487 stp = screen.text[row];
1408 srp = screen.rend[row]; 1488 srp = screen.rend[row];
1409 slp = & (screen.tlen[row]); 1489 slp = &screen.tlen[row];
1410 1490
1411 switch (insdel) 1491 switch (insdel)
1412 { 1492 {
1413 case INSERT: 1493 case INSERT:
1414 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1494 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1415 col--)
1416 { 1495 {
1417 stp[col] = stp[col - count]; 1496 stp[col] = stp[col - count];
1418 srp[col] = srp[col - count]; 1497 srp[col] = srp[col - count];
1419 } 1498 }
1420 1499
… …
1430 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
1431 || (selection.end.col + count >= TermWin.ncol)) 1510 || (selection.end.col + count >= TermWin.ncol))
1432 CLEAR_SELECTION (); 1511 CLEAR_SELECTION ();
1433 else 1512 else
1434 { /* shift selection */ 1513 { /* shift selection */
1435 selection.beg.col += count; 1514 selection.beg.col += count;
1436 selection.mark.col += count; /* XXX: yes? */ 1515 selection.mark.col += count; /* XXX: yes? */
1437 selection.end.col += count; 1516 selection.end.col += count;
1438 } 1517 }
1439 } 1518 }
1440 1519
1441 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1520 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1442 (unsigned int)count, rstyle); 1521 (unsigned int)count, rstyle);
1443 break; 1522 break;
1444 1523
1445 case ERASE: 1524 case ERASE:
1446 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1525 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1447 selection_check (1); 1526 selection_check (1);
1448 screen.cur.col -= count; 1527 screen.cur.col -= count;
1449 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1528 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1450 (unsigned int)count, rstyle); 1529 (unsigned int)count, rstyle);
1451 break; 1530 break;
1452 1531
1453 case DELETE: 1532 case DELETE:
1454 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1457 { 1536 {
1458 stp[col] = stp[col + count]; 1537 stp[col] = stp[col + count];
1459 srp[col] = srp[col + count]; 1538 srp[col] = srp[col + count];
1460 } 1539 }
1461 1540
1462 scr_blank_line (& (stp[TermWin.ncol - count]), 1541 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1463 & (srp[TermWin.ncol - count]),
1464 (unsigned int)count, tr); 1542 (unsigned int)count, tr);
1465 1543
1466 if (*slp == -1) /* break line continuation */ 1544 if (*slp == -1) /* break line continuation */
1467 *slp = TermWin.ncol; 1545 *slp = TermWin.ncol;
1468 1546
… …
1477 || selection.end.col >= TermWin.ncol) 1555 || selection.end.col >= TermWin.ncol)
1478 CLEAR_SELECTION (); 1556 CLEAR_SELECTION ();
1479 else 1557 else
1480 { 1558 {
1481 /* shift selection */ 1559 /* shift selection */
1482 selection.beg.col -= count; 1560 selection.beg.col -= count;
1483 selection.mark.col -= count; /* XXX: yes? */ 1561 selection.mark.col -= count; /* XXX: yes? */
1484 selection.end.col -= count; 1562 selection.end.col -= count;
1485 } 1563 }
1486 } 1564 }
1487 1565
1488 break; 1566 break;
1489 } 1567 }
… …
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 }
… …
1672 * XTERM_SEQ: Invoke G2 character set: ESC N 1751 * XTERM_SEQ: Invoke G2 character set: ESC N
1673 * XTERM_SEQ: Invoke G3 character set: ESC O 1752 * XTERM_SEQ: Invoke G3 character set: ESC O
1674 */ 1753 */
1675void 1754void
1676rxvt_term::scr_charset_choose (int set) 1755rxvt_term::scr_charset_choose (int set)
1677 { 1756{
1678 screen.charset = set; 1757 screen.charset = set;
1679 set_font_style (); 1758 set_font_style ();
1680 } 1759}
1681 1760
1682/* ------------------------------------------------------------------------- */ 1761/* ------------------------------------------------------------------------- */
1683/* 1762/*
1684 * Set a font 1763 * Set a font
1685 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1764 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1688 * XTERM_SEQ: Set G3 character set: ESC + <C> 1767 * XTERM_SEQ: Set G3 character set: ESC + <C>
1689 * See set_font_style for possible values for <C> 1768 * See set_font_style for possible values for <C>
1690 */ 1769 */
1691void 1770void
1692rxvt_term::scr_charset_set (int set, unsigned int ch) 1771rxvt_term::scr_charset_set (int set, unsigned int ch)
1693 { 1772{
1694 charsets[set] = (unsigned char)ch; 1773 charsets[set] = (unsigned char)ch;
1695 set_font_style (); 1774 set_font_style ();
1696 } 1775}
1697 1776
1698 1777
1699/* ------------------------------------------------------------------------- * 1778/* ------------------------------------------------------------------------- *
1700 * MAJOR SCREEN MANIPULATION * 1779 * MAJOR SCREEN MANIPULATION *
1701 * ------------------------------------------------------------------------- */ 1780 * ------------------------------------------------------------------------- */
… …
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 */ 2040
2041 want_refresh = 0; /* screen is current */
1944 2042
1945 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2043 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1946 return; 2044 return;
1947 2045
1948 /* 2046 /*
1949 * A: set up vars 2047 * A: set up vars
1950 */ 2048 */
1951 must_clear = 0; 2049 must_clear = 0;
1952
1953 refresh_count = 0; 2050 refresh_count = 0;
1954 2051
1955 row_offset = TermWin.saveLines - TermWin.view_start; 2052 row_offset = TermWin.saveLines - TermWin.view_start;
1956 2053
1957#ifdef XPM_BACKGROUND 2054#if XPM_BACKGROUND
1958 must_clear |= (bgPixmap.pixmap != None); 2055 must_clear |= (bgPixmap.pixmap != None);
1959#endif 2056#endif
1960#ifdef TRANSPARENT 2057#if TRANSPARENT
1961 must_clear |= ((Options & Opt_transparent) && am_transparent); 2058 must_clear |= ((options & Opt_transparent) && am_transparent);
1962#endif 2059#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 2061
1965 /* 2062 /*
1966 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
1981 showcursor = 0; 2078 showcursor = 0;
1982#endif 2079#endif
1983 2080
1984 if (showcursor) 2081 if (showcursor)
1985 { 2082 {
2083 int col = screen.cur.col;
2084
2085 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2086 col--;
2087
1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2088 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1987 2089
1988 if (showcursor && TermWin.focus) 2090 if (showcursor && TermWin.focus)
1989 { 2091 {
1990 *srp ^= RS_RVid; 2092 *crp ^= RS_RVid;
1991#ifndef NO_CURSORCOLOR 2093#ifndef NO_CURSORCOLOR
1992 cc1 = *srp & (RS_fgMask | RS_bgMask); 2094 cc1 = *crp & (RS_fgMask | RS_bgMask);
1993 if (ISSET_PIXCOLOR (Color_cursor)) 2095 if (ISSET_PIXCOLOR (Color_cursor))
1994 ccol1 = Color_cursor; 2096 ccol1 = Color_cursor;
1995 else 2097 else
1996#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1997 ccol1 = GET_FGCOLOR (rstyle); 2099 ccol1 = GET_FGCOLOR (rstyle);
… …
2004#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2005 ccol2 = GET_BGCOLOR (rstyle); 2107 ccol2 = GET_BGCOLOR (rstyle);
2006#else 2108#else
2007 ccol2 = Color_bg; 2109 ccol2 = Color_bg;
2008#endif 2110#endif
2009 *srp = SET_FGCOLOR (*srp, ccol1); 2111 *crp = SET_FGCOLOR (*crp, ccol1);
2010 *srp = SET_BGCOLOR (*srp, ccol2); 2112 *crp = SET_BGCOLOR (*crp, ccol2);
2011#endif 2113#endif
2012 } 2114 }
2013 } 2115 }
2014 2116
2015 /* make sure no outline cursor is left around */ 2117 /* make sure no outline cursor is left around */
… …
2042 oldcursor.col = screen.cur.col; 2144 oldcursor.col = screen.cur.col;
2043 } 2145 }
2044 } 2146 }
2045 } 2147 }
2046 2148
2149#if ENABLE_OVERLAY
2150 scr_swap_overlay ();
2151#endif
2152
2153 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2154 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2155
2047#ifndef NO_SLOW_LINK_SUPPORT 2156#ifndef NO_SLOW_LINK_SUPPORT
2048 /* 2157 /*
2049 * D: CopyArea pass - very useful for slower links 2158 * D: CopyArea pass - very useful for slower links
2050 * This has been deliberately kept simple. 2159 * This has been deliberately kept simple.
2051 */ 2160 */
… …
2054 && refresh_type == FAST_REFRESH && num_scr_allow && i 2163 && refresh_type == FAST_REFRESH && num_scr_allow && i
2055 && abs (i) < TermWin.nrow && !must_clear) 2164 && abs (i) < TermWin.nrow && !must_clear)
2056 { 2165 {
2057 int16_t nits; 2166 int16_t nits;
2058 int j; 2167 int j;
2059 rend_t *drp2;
2060 text_t *dtp2;
2061 int len, wlen; 2168 int len, wlen;
2062 2169
2063 j = TermWin.nrow; 2170 j = TermWin.nrow;
2064 wlen = len = -1; 2171 wlen = len = -1;
2065 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2066 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2173 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2067 { 2174 {
2068 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2175 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2069 { 2176 {
2070 stp = screen.text[row + row_offset]; 2177 text_t *stp = screen.text[row + row_offset];
2071 srp = screen.rend[row + row_offset]; 2178 rend_t *srp = screen.rend[row + row_offset];
2072 dtp = drawn_text[row]; 2179 text_t *dtp = drawn_text[row];
2073 dtp2 = drawn_text[row + i]; 2180 text_t *dtp2 = drawn_text[row + i];
2074 drp = drawn_rend[row]; 2181 rend_t *drp = drawn_rend[row];
2075 drp2 = drawn_rend[row + i]; 2182 rend_t *drp2 = drawn_rend[row + i];
2076 2183
2077 for (nits = 0, col = TermWin.ncol; col--; ) 2184 for (nits = 0, col = TermWin.ncol; col--; )
2078 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2185 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2079 nits--; 2186 nits--;
2080 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2187 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2100 { 2207 {
2101 /* also comes here at end if needed because of >= above */ 2208 /* also comes here at end if needed because of >= above */
2102 if (wlen < len) 2209 if (wlen < len)
2103 SWAP_IT (wlen, len, int); 2210 SWAP_IT (wlen, len, int);
2104 2211
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, 2212 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2107 TermWin.gc, 0, Row2Pixel (len + i), 2213 TermWin.gc, 0, Row2Pixel (len + i),
2108 (unsigned int)TermWin_TotalWidth (), 2214 (unsigned int)TermWin_TotalWidth (),
2109 (unsigned int)Height2Pixel (wlen - len + 1), 2215 (unsigned int)Height2Pixel (wlen - len + 1),
2110 0, Row2Pixel (len)); 2216 0, Row2Pixel (len));
… …
2117 /* 2223 /*
2118 * E: main pass across every character 2224 * E: main pass across every character
2119 */ 2225 */
2120 for (row = 0; row < TermWin.nrow; row++) 2226 for (row = 0; row < TermWin.nrow; row++)
2121 { 2227 {
2122 stp = screen.text[row + row_offset]; 2228 text_t *stp = screen.text[row + row_offset];
2123 srp = screen.rend[row + row_offset]; 2229 rend_t *srp = screen.rend[row + row_offset];
2124 dtp = drawn_text[row]; 2230 text_t *dtp = drawn_text[row];
2125 drp = drawn_rend[row]; 2231 rend_t *drp = drawn_rend[row];
2126 2232
2127 /* 2233 /*
2128 * E2: OK, now the real pass 2234 * E2: OK, now the real pass
2129 */ 2235 */
2130 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2131 2237
2132 for (col = 0; col < TermWin.ncol; col++) 2238 for (col = 0; col < TermWin.ncol; col++)
2133 { 2239 {
2134 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2135 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] /* Must match characters to skip. */
2136 && (srp[col] == drp[col] /* Either rendition the same or */ 2242 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2137 || (stp[col] == ' ' /* space w/ no background change */ 2243 || (stp[col] == ' ' /* space w/ no background change */
2138 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2244 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2139 continue; 2245 continue;
2140 2246
2141 // redraw one or more characters 2247 // redraw one or more characters
2142 2248
2143 // seek to the beginning if wide characters 2249 // seek to the beginning of wide characters
2144 while (stp[col] == NOCHAR && col > 0) 2250 while (stp[col] == NOCHAR && col > 0)
2145 --col; 2251 --col;
2146 2252
2147 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2253 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2148 text_t *text = stp + col; 2254 text_t *text = stp + col;
… …
2151 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2152 drp[col] = rend; 2258 drp[col] = rend;
2153 2259
2154 int xpixel = Col2Pixel (col); 2260 int xpixel = Col2Pixel (col);
2155 2261
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; ) 2262 for (i = 0; ++col < TermWin.ncol; )
2159 { 2263 {
2160 if (stp[col] == NOCHAR) 2264 if (stp[col] == NOCHAR)
2161 { 2265 {
2162 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2163 drp[col] = rend; 2267 drp[col] = rend;
2164 count++; 2268 count++;
2165
2166 if (i) // only possible skip if char unchanged
2167 i++; 2269 i++;
2168 2270
2169 continue; 2271 continue;
2170 } 2272 }
2171 2273
2172 if (rend != srp[col]) 2274 if (!RS_SAME (rend, srp[col]))
2173 break; 2275 break;
2174 2276
2175 count++; 2277 count++;
2176 2278
2177 if (stp[col] != dtp[col] 2279 if (stp[col] != dtp[col]
2178 || srp[col] != drp[col]) 2280 || !RS_SAME (srp[col], drp[col]))
2179 { 2281 {
2180 if (must_clear && (i++ > (count / 2))) 2282 if (must_clear && (i++ > count / 2))
2181 break; 2283 break;
2182 2284
2183 dtp[col] = stp[col]; 2285 dtp[col] = stp[col];
2184 drp[col] = rend; 2286 drp[col] = rend;
2185 i = 0; 2287 i = 0;
2186 } 2288 }
2187 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2289 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2188 break; 2290 break;
2189 } 2291 }
2190 2292
2191 col--; /* went one too far. move back */ 2293 col--; /* went one too far. move back */
2192 count -= i; /* dump any matching trailing chars */ 2294 count -= i; /* dump any matching trailing chars */
2295
2296 // sometimes we optimize away the trailing NOCHAR's, add them back
2297 while (i && text[count] == NOCHAR)
2298 count++, i--;
2299
2300#if ENABLE_STYLES
2301 // force redraw after "careful" characters to avoid pixel droppings
2302 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2303 drp[col + 1] = ~srp[col + 1];
2304
2305 // include previous careful character(s) if possible, looks nicer (best effort...)
2306 while (text > stp
2307 && srp[text - stp - 1] & RS_Careful
2308 && RS_SAME (rend, srp[text - stp - 1]))
2309 text--, count++, xpixel -= TermWin.fwidth;
2310#endif
2193 2311
2194 /* 2312 /*
2195 * Determine the attributes for the string 2313 * Determine the attributes for the string
2196 */ 2314 */
2197 int fid = GET_FONT (rend);
2198 int fore = GET_FGCOLOR (rend); // desired foreground 2315 int fore = GET_FGCOLOR (rend); // desired foreground
2199 int back = GET_BGCOLOR (rend); // desired background 2316 int back = GET_BGCOLOR (rend); // desired background
2200 2317
2201 rend = GET_ATTR (rend); 2318 // only do special processing if ana attributes are set, which is rare
2202 2319 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2203 rvid = !!(rend & RS_RVid); 2320 {
2321 bool invert = rend & RS_RVid;
2204 2322
2205#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2206 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2324 if (rend & RS_Bold
2325 && fore == Color_fg)
2207 { 2326 {
2208 if (ISSET_PIXCOLOR (Color_BD)) 2327 if (ISSET_PIXCOLOR (Color_BD))
2209 fore = Color_BD; 2328 fore = Color_BD;
2329# if !ENABLE_STYLES
2210 else 2330 else
2211 rvid = !rvid; 2331 invert = !invert;
2332# endif
2333 }
2334
2335 if (rend & RS_Italic
2336 && fore == Color_fg)
2337 {
2338 if (ISSET_PIXCOLOR (Color_IT))
2339 fore = Color_IT;
2340# if !ENABLE_STYLES
2341 else
2342 invert = !invert;
2343# endif
2344 }
2345
2346 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2347 fore = Color_UL;
2348#endif
2349
2350 if (invert)
2351 {
2352 SWAP_IT (fore, back, int);
2353
2354#ifndef NO_BOLD_UNDERLINE_REVERSE
2355 if (ISSET_PIXCOLOR (Color_RV))
2356 back = Color_RV;
2357#endif
2358 }
2359
2360#ifdef TEXT_BLINK
2361 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2362 {
2363 if (!text_blink_ev.active)
2364 {
2365 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2366 hidden_text = 0;
2367 }
2368 else if (hidden_text)
2369 fore = back;
2370 }
2371#endif
2212 } 2372 }
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 2373
2246 /* 2374 /*
2247 * Actually do the drawing of the string here 2375 * Actually do the drawing of the string here
2248 */ 2376 */
2249 rxvt_font *font = (*TermWin.fontset)[fid]; 2377 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2250 2378
2251 if (back == fore) 2379 if (back == fore)
2252 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2380 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2253 TermWin.fwidth * count, TermWin.fheight, 2381 TermWin.fwidth * count, TermWin.fheight,
2254 back); 2382 back);
… …
2276 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2277 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2278 } /* for (col....) */ 2406 } /* for (col....) */
2279 } /* for (row....) */ 2407 } /* for (row....) */
2280 2408
2409#if ENABLE_OVERLAY
2410 scr_swap_overlay ();
2411#endif
2412
2281 /* 2413 /*
2282 * G: cleanup cursor and display outline cursor if necessary 2414 * G: cleanup cursor and display outline cursor if necessary
2283 */ 2415 */
2284 if (showcursor) 2416 if (showcursor)
2285 { 2417 {
2286 if (TermWin.focus) 2418 if (TermWin.focus)
2287 { 2419 {
2288 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2289 [screen.cur.col]);
2290 *srp ^= RS_RVid; 2420 *crp ^= RS_RVid;
2291#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2292 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2422 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2293#endif 2423#endif
2294 } 2424 }
2295 else if (oldcursor.row >= 0) 2425 else if (oldcursor.row >= 0)
2296 { 2426 {
2297#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
2298 if (ISSET_PIXCOLOR (Color_cursor)) 2428 if (ISSET_PIXCOLOR (Color_cursor))
2299 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2429 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2300#endif 2430#endif
2301 int cursorwidth = 1; 2431 int cursorwidth = 1;
2302 while (oldcursor.col + cursorwidth < TermWin.ncol 2432 while (oldcursor.col + cursorwidth < TermWin.ncol
2303 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2433 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2304 cursorwidth++; 2434 cursorwidth++;
… …
2319 if (refresh_type & SMOOTH_REFRESH) 2449 if (refresh_type & SMOOTH_REFRESH)
2320 XFlush (display->display); 2450 XFlush (display->display);
2321 2451
2322 num_scr = 0; 2452 num_scr = 0;
2323 num_scr_allow = 1; 2453 num_scr_allow = 1;
2324 want_refresh = 0; /* screen is current */
2325} 2454}
2326 2455
2327void 2456void
2328rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2457rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2329{ 2458{
2330 if (!rp || !tp) 2459 if (!rp || !tp)
2331 return; 2460 return;
2332 2461
2333 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2462 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2334 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2463 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2335} 2464}
2336 2465
2337void 2466void
2338rxvt_term::scr_remap_chars () 2467rxvt_term::scr_remap_chars ()
2339{ 2468{
… …
2345 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2474 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2346 scr_remap_chars (swap.text[i], swap.rend[i]); 2475 scr_remap_chars (swap.text[i], swap.rend[i]);
2347 } 2476 }
2348} 2477}
2349 2478
2479void
2480rxvt_term::scr_recolour ()
2481{
2482 if (1
2483#if TRANSPARENT
2484 && !am_transparent
2485#endif
2486#if XPM_BACKGROUND
2487 && !bgPixmap.pixmap
2488#endif
2489 )
2490 {
2491 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2492 XClearWindow (display->display, TermWin.parent[0]);
2493 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2494#if HAVE_SCROLLBARS
2495 if (scrollBar.win)
2496 {
2497 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2498 scrollBar.setIdle ();
2499 scrollbar_show (0);
2500 }
2501#endif
2502 }
2503
2504 scr_clear ();
2505 scr_touch (true);
2506 want_refresh = 1;
2507}
2508
2350/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2351void 2510void
2352rxvt_term::scr_clear (bool really) 2511rxvt_term::scr_clear (bool really)
2353{ 2512{
2354 if (!TermWin.mapped) 2513 if (!TermWin.mapped)
2355 return; 2514 return;
2356 2515
2357 num_scr_allow = 0; 2516 num_scr_allow = 0;
2358 want_refresh = 1; 2517 want_refresh = 1;
2359 2518
2360#ifdef TRANSPARENT 2519#if TRANSPARENT
2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2520 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2362 { 2521 {
2363 int i; 2522 int i;
2364 2523
2365 if (! (Options & Opt_transparent_all)) 2524 if (!(options & Opt_transparent_all))
2366 i = 0; 2525 i = 0;
2367 else 2526 else
2368 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2527 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2369 2528
2370 while (i--) 2529 while (i--)
… …
2386 int end_row = TermWin.saveLines - TermWin.view_start; 2545 int end_row = TermWin.saveLines - TermWin.view_start;
2387 int i = selection.beg.row + TermWin.saveLines; 2546 int i = selection.beg.row + TermWin.saveLines;
2388 int col, row = selection.end.row + TermWin.saveLines; 2547 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp; 2548 rend_t *srp;
2390 2549
2391 if (i >= end_row) 2550#if ENABLE_FRILLS
2392 col = selection.beg.col; 2551 if (selection.rect)
2552 {
2553 end_row += TermWin.nrow;
2554
2555 for (; i <= row && i <= end_row; i++)
2556 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2557 srp[col] ^= RS_RVid;
2558 }
2393 else 2559 else
2560#endif
2561 {
2562 if (i >= end_row)
2563 col = selection.beg.col;
2564 else
2394 { 2565 {
2395 col = 0; 2566 col = 0;
2396 i = end_row; 2567 i = end_row;
2397 } 2568 }
2398 2569
2399 end_row += TermWin.nrow; 2570 end_row += TermWin.nrow;
2571
2400 for (; i < row && i < end_row; i++, col = 0) 2572 for (; i < row && i < end_row; i++, col = 0)
2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2573 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2402 srp[col] ^= RS_RVid; 2574 srp[col] ^= RS_RVid;
2403 2575
2404 if (i == row && i < end_row) 2576 if (i == row && i < end_row)
2405 for (srp = screen.rend[i]; col < selection.end.col; col++) 2577 for (srp = screen.rend[i]; col < selection.end.col; col++)
2406 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2579 }
2407 } 2580 }
2408} 2581}
2409 2582
2410/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2411/* 2584/*
… …
2447 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2620 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2448 */ 2621 */
2449void 2622void
2450rxvt_term::selection_check (int check_more) 2623rxvt_term::selection_check (int check_more)
2451{ 2624{
2452 row_col_t pos; 2625 row_col_t pos;
2453 2626
2454 if (!selection.op) 2627 if (!selection.op)
2455 return; 2628 return;
2456 2629
2457 pos.row = pos.col = 0; 2630 pos.row = pos.col = 0;
… …
2484rxvt_term::paste (const unsigned char *data, unsigned int len) 2657rxvt_term::paste (const unsigned char *data, unsigned int len)
2485{ 2658{
2486 unsigned int i, j, n; 2659 unsigned int i, j, n;
2487 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2660 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2488 2661
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 */ 2662 /* convert normal newline chars into common keyboard Return key sequence */
2495 for (i = 0; i < len; i += PROP_SIZE) 2663 for (i = 0; i < len; i += PROP_SIZE)
2496 { 2664 {
2497 n = min (len - i, PROP_SIZE); 2665 n = min (len - i, PROP_SIZE);
2498 MEMCPY (ds, data + i, n); 2666 memcpy (ds, data + i, n);
2499 2667
2500 for (j = 0; j < n; j++) 2668 for (j = 0; j < n; j++)
2501 if (ds[j] == C0_LF) 2669 if (ds[j] == C0_LF)
2502 ds[j] = C0_CR; 2670 ds[j] = C0_CR;
2503 2671
… …
2516rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2517{ 2685{
2518 long nread = 0; 2686 long nread = 0;
2519 unsigned long bytes_after; 2687 unsigned long bytes_after;
2520 XTextProperty ct; 2688 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 2689
2524 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2525 { 2691 {
2526 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2527 { 2693 {
… …
2554 &ct.nitems, &bytes_after, 2720 &ct.nitems, &bytes_after,
2555 &ct.value) != Success) 2721 &ct.value) != Success)
2556 break; 2722 break;
2557 2723
2558 if (ct.encoding == 0) 2724 if (ct.encoding == 0)
2725 break;
2726
2727 if (ct.encoding == xa[XA_INCR])
2559 { 2728 {
2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2729 // INCR selection, start handshake
2730 XDeleteProperty (display->display, win, prop);
2731 selection_wait = Sel_incr;
2732 incr_ev.start (NOW + 10);
2561 break; 2733 break;
2562 } 2734 }
2563 2735
2564 if (ct.value == NULL) 2736 if (ct.value == NULL)
2565 {
2566 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2567 continue; 2737 continue;
2568 }
2569 2738
2570 if (ct.nitems == 0) 2739 if (ct.nitems == 0)
2571 { 2740 {
2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2574 if (selection_wait == Sel_normal && nread == 0 2741 if (selection_wait == Sel_normal && nread == 0
2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2576 { 2743 {
2577 /* 2744 /*
2578 * pass through again trying CUT_BUFFER0 if we've come from 2745 * pass through again trying CUT_BUFFER0 if we've come from
2579 * XConvertSelection () but nothing was presented 2746 * XConvertSelection () but nothing was presented
2580 */ 2747 */
2581 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2582 selection_paste (display->root, XA_CUT_BUFFER0, False); 2748 selection_paste (display->root, XA_CUT_BUFFER0, False);
2583 } 2749 }
2584 2750
2585 nread = -1; /* discount any previous stuff */ 2751 nread = -1; /* discount any previous stuff */
2586 break; 2752 break;
… …
2591 char **cl; 2757 char **cl;
2592 int cr; 2758 int cr;
2593 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2594 { 2760 {
2595 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2596 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2762 paste ((unsigned char *)cl[i], strlen (cl[i]));
2597 2763
2598 XFreeStringList (cl); 2764 XFreeStringList (cl);
2599 } 2765 }
2600 else 2766 else
2601 paste (ct.value, ct.nitems); 2767 paste (ct.value, ct.nitems);
… …
2610 XFree (ct.value); 2776 XFree (ct.value);
2611 2777
2612 if (selection_wait == Sel_normal) 2778 if (selection_wait == Sel_normal)
2613 selection_wait = Sel_none; 2779 selection_wait = Sel_none;
2614 2780
2615 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2616 return (int)nread; 2781 return (int)nread;
2617} 2782}
2618 2783
2619void 2784void
2620rxvt_term::incr_cb (time_watcher &w) 2785rxvt_term::incr_cb (time_watcher &w)
… …
2628 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2629 */ 2794 */
2630void 2795void
2631rxvt_term::selection_property (Window win, Atom prop) 2796rxvt_term::selection_property (Window win, Atom prop)
2632{ 2797{
2633 int reget_time = 0; 2798 if (prop == None || selection_wait != Sel_incr)
2634
2635 if (prop == None)
2636 return; 2799 return;
2637 2800
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) 2801 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); 2802 incr_ev.start (NOW + 10);
2803 else
2804 {
2805 selection_wait = Sel_none;
2806 incr_ev.stop ();
2807 }
2679} 2808}
2680 2809
2681/* ------------------------------------------------------------------------- */ 2810/* ------------------------------------------------------------------------- */
2682/* 2811/*
2683 * Request the current selection: 2812 * Request the current selection:
… …
2689 * EXT: button 2 release 2818 * EXT: button 2 release
2690 */ 2819 */
2691void 2820void
2692rxvt_term::selection_request (Time tm, int x, int y) 2821rxvt_term::selection_request (Time tm, int x, int y)
2693{ 2822{
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) 2823 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2697 return; /* outside window */ 2824 return; /* outside window */
2698 2825
2699 if (selection.text) 2826 if (selection.text)
2700 { /* internal selection */ 2827 { /* internal selection */
2701 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2702 char *str = rxvt_wcstombs (selection.text, selection.len); 2828 char *str = rxvt_wcstombs (selection.text, selection.len);
2703 paste ((unsigned char *)str, strlen (str)); 2829 paste ((unsigned char *)str, strlen (str));
2704 free (str); 2830 free (str);
2705 return; 2831 return;
2706 } 2832 }
… …
2725 2851
2726 } 2852 }
2727 } 2853 }
2728 2854
2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2855 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); 2856 selection_paste (display->root, XA_CUT_BUFFER0, False);
2732} 2857}
2733 2858
2734int 2859int
2735rxvt_term::selection_request_other (Atom target, int selnum) 2860rxvt_term::selection_request_other (Atom target, int selnum)
… …
2748 else 2873 else
2749 sel = xa[XA_CLIPBOARD]; 2874 sel = xa[XA_CLIPBOARD];
2750 2875
2751 if (XGetSelectionOwner (display->display, sel) != None) 2876 if (XGetSelectionOwner (display->display, sel) != None)
2752 { 2877 {
2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2878 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2755 TermWin.vt, selection_request_time); 2879 TermWin.vt, selection_request_time);
2756 return 1; 2880 return 1;
2757 } 2881 }
2758 2882
… …
2765 * EXT: SelectionClear 2889 * EXT: SelectionClear
2766 */ 2890 */
2767void 2891void
2768rxvt_term::selection_clear () 2892rxvt_term::selection_clear ()
2769{ 2893{
2770 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2771
2772 want_refresh = 1; 2894 want_refresh = 1;
2773 free (selection.text); 2895 free (selection.text);
2774 selection.text = NULL; 2896 selection.text = NULL;
2775 selection.len = 0; 2897 selection.len = 0;
2776 CLEAR_SELECTION (); 2898 CLEAR_SELECTION ();
… …
2789{ 2911{
2790 int i, col, end_col, row, end_row; 2912 int i, col, end_col, row, end_row;
2791 wchar_t *new_selection_text; 2913 wchar_t *new_selection_text;
2792 text_t *t; 2914 text_t *t;
2793 2915
2794 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2795 switch (selection.op) 2916 switch (selection.op)
2796 { 2917 {
2797 case SELECTION_CONT: 2918 case SELECTION_CONT:
2798 break; 2919 break;
2799 case SELECTION_INIT: 2920 case SELECTION_INIT:
… …
2813 2934
2814 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2935 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2815 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2936 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2816 2937
2817 col = selection.beg.col; 2938 col = selection.beg.col;
2818 MAX_IT (col, 0);
2819 row = selection.beg.row + TermWin.saveLines; 2939 row = selection.beg.row + TermWin.saveLines;
2820 end_row = selection.end.row + TermWin.saveLines; 2940 end_row = selection.end.row + TermWin.saveLines;
2821 int ofs = 0; 2941 int ofs = 0;
2822 int extra = 0; 2942 int extra = 0;
2823 2943
2824 for (; row <= end_row; row++, col = 0) 2944 for (; row <= end_row; row++, col = 0)
2825 { 2945 {
2826 t = &(screen.text[row][col]);
2827
2828 end_col = screen.tlen[row]; 2946 end_col = screen.tlen[row];
2947
2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 col = selection.beg.col;
2952 end_col = TermWin.ncol + 1;
2953 }
2954#endif
2955
2956 MAX_IT (col, 0);
2829 2957
2830 if (end_col == -1) 2958 if (end_col == -1)
2831 end_col = TermWin.ncol; 2959 end_col = TermWin.ncol;
2832 2960
2833 if (row == end_row) 2961 if (row == end_row || selection.rect)
2834 MIN_IT (end_col, selection.end.col); 2962 MIN_IT (end_col, selection.end.col);
2835 2963
2964 t = &screen.text[row][col];
2836 for (; col < end_col; col++) 2965 for (; col < end_col; col++)
2837 { 2966 {
2838 if (*t == NOCHAR) 2967 if (*t == NOCHAR)
2839 t++; 2968 t++;
2840#if ENABLE_COMBINING 2969#if ENABLE_COMBINING
… …
2895 XFree (ct.value); 3024 XFree (ct.value);
2896 } 3025 }
2897#endif 3026#endif
2898 3027
2899 selection_time = tm; 3028 selection_time = tm;
2900 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2901} 3029}
2902 3030
2903/* ------------------------------------------------------------------------- */ 3031/* ------------------------------------------------------------------------- */
2904/* 3032/*
2905 * Mark or select text based upon number of clicks: 1, 2, or 3 3033 * Mark or select text based upon number of clicks: 1, 2, or 3
2906 * EXT: button 1 press 3034 * EXT: button 1 press
2907 */ 3035 */
2908void 3036void
2909rxvt_term::selection_click (int clicks, int x, int y) 3037rxvt_term::selection_click (int clicks, int x, int y)
2910{ 3038{
2911 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2912
2913 clicks = ((clicks - 1) % 3) + 1; 3039 clicks = ((clicks - 1) % 3) + 1;
2914 selection.clicks = clicks; /* save clicks so extend will work */ 3040 selection.clicks = clicks; /* save clicks so extend will work */
2915 3041
2916 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3042 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2917 3043
… …
2959 * We now only find out the boundary in one direction 3085 * We now only find out the boundary in one direction
2960 */ 3086 */
2961 3087
2962/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3088/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2963#define DELIMIT_TEXT(x) \ 3089#define DELIMIT_TEXT(x) \
2964 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3090 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2965#define DELIMIT_REND(x) 1 3091#define DELIMIT_REND(x) 1
2966 3092
2967void 3093void
2968rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3094rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2969{ 3095{
… …
2987 3113
2988 row = mark->row + TermWin.saveLines; 3114 row = mark->row + TermWin.saveLines;
2989 col = mark->col; 3115 col = mark->col;
2990 MAX_IT (col, 0); 3116 MAX_IT (col, 0);
2991 /* find the edge of a word */ 3117 /* find the edge of a word */
2992 stp = & (screen.text[row][col]); 3118 stp = &screen.text[row][col];
2993 w1 = DELIMIT_TEXT (*stp); 3119 w1 = DELIMIT_TEXT (*stp);
2994 3120
2995 srp = (&screen.rend[row][col]); 3121 srp = &screen.rend[row][col];
2996 w2 = DELIMIT_REND (*srp); 3122 w2 = DELIMIT_REND (*srp);
2997 3123
2998 for (;;) 3124 for (;;)
2999 { 3125 {
3000 for (; col != bound.col; col += dirnadd) 3126 for (; col != bound.col; col += dirnadd)
… …
3034 } 3160 }
3035 break; 3161 break;
3036 } 3162 }
3037 3163
3038Old_Word_Selection_You_Die: 3164Old_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) 3165 if (dirn == DN)
3042 col++; /* put us on one past the end */ 3166 col++; /* put us on one past the end */
3043 3167
3044 /* Poke the values back in */ 3168 /* Poke the values back in */
3045 ret->row = row - TermWin.saveLines; 3169 ret->row = row - TermWin.saveLines;
… …
3079 /* select nothing */ 3203 /* select nothing */
3080 selection.beg.row = selection.end.row = 0; 3204 selection.beg.row = selection.end.row = 0;
3081 selection.beg.col = selection.end.col = 0; 3205 selection.beg.col = selection.end.col = 0;
3082 selection.clicks = 4; 3206 selection.clicks = 4;
3083 want_refresh = 1; 3207 want_refresh = 1;
3084 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3085 return; 3208 return;
3086 } 3209 }
3087 3210
3088 if (selection.clicks == 4) 3211 if (selection.clicks == 4)
3089 selection.clicks = 1; 3212 selection.clicks = 1;
… …
3105 row_col_t pos; 3228 row_col_t pos;
3106 enum { 3229 enum {
3107 LEFT, RIGHT 3230 LEFT, RIGHT
3108 } closeto = RIGHT; 3231 } closeto = RIGHT;
3109 3232
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
3113 want_refresh = 1; 3233 want_refresh = 1;
3234
3114 switch (selection.op) 3235 switch (selection.op)
3115 { 3236 {
3116 case SELECTION_INIT: 3237 case SELECTION_INIT:
3117 CLEAR_SELECTION (); 3238 CLEAR_SELECTION ();
3118 selection.op = SELECTION_BEGIN; 3239 selection.op = SELECTION_BEGIN;
… …
3131 selection_start_colrow (col, row); 3252 selection_start_colrow (col, row);
3132 /* FALLTHROUGH */ 3253 /* FALLTHROUGH */
3133 default: 3254 default:
3134 return; 3255 return;
3135 } 3256 }
3257
3136 if (selection.beg.col == selection.end.col 3258 if (selection.beg.col == selection.end.col
3137 && selection.beg.col != selection.mark.col 3259 && selection.beg.col != selection.mark.col
3138 && selection.beg.row == selection.end.row 3260 && selection.beg.row == selection.end.row
3139 && selection.beg.row != selection.mark.row) 3261 && selection.beg.row != selection.mark.row)
3140 { 3262 {
3141 selection.beg.col = selection.end.col = selection.mark.col; 3263 selection.beg.col = selection.end.col = selection.mark.col;
3142 selection.beg.row = selection.end.row = selection.mark.row; 3264 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 } 3265 }
3145 3266
3146 pos.col = col; 3267 pos.col = col;
3147 pos.row = row; 3268 pos.row = row;
3148 3269
… …
3191 } 3312 }
3192 else 3313 else
3193 { /* button1 drag or button3 drag */ 3314 { /* button1 drag or button3 drag */
3194 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3315 if (ROWCOL_IS_AFTER (selection.mark, pos))
3195 { 3316 {
3196 if ((selection.mark.row == selection.end.row) 3317 if (selection.mark.row == selection.end.row
3197 && (selection.mark.col == selection.end.col) 3318 && selection.mark.col == selection.end.col
3319 && clickchange
3198 && clickchange && selection.clicks == 2) 3320 && selection.clicks == 2)
3199 selection.mark.col--; 3321 selection.mark.col--;
3200 3322
3201 selection.beg.row = pos.row; 3323 selection.beg.row = pos.row;
3202 selection.beg.col = pos.col; 3324 selection.beg.col = pos.col;
3203 selection.end.row = selection.mark.row; 3325 selection.end.row = selection.mark.row;
… …
3214 3336
3215 if (selection.clicks == 1) 3337 if (selection.clicks == 1)
3216 { 3338 {
3217 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3339 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3218 3340
3219 if (end_col != -1 && selection.beg.col > end_col) 3341 if (selection.beg.col > end_col
3342 && end_col != -1
3343#if ENABLE_FRILLS
3344 && !selection.rect
3345#endif
3220 { 3346 )
3221#if 1
3222 selection.beg.col = ncol; 3347 selection.beg.col = ncol;
3223#else
3224 if (selection.beg.row != selection.end.row)
3225 selection.beg.col = ncol;
3226 else
3227 selection.beg.col = selection.mark.col;
3228#endif
3229 }
3230 3348
3231 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3349 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3232 3350
3233 if (end_col != -1 && selection.end.col > end_col) 3351 if (
3352 selection.end.col > end_col
3353 && end_col != -1
3354#if ENABLE_FRILLS
3355 && !selection.rect
3356#endif
3357 )
3234 selection.end.col = ncol; 3358 selection.end.col = ncol;
3235 } 3359 }
3236 else if (selection.clicks == 2) 3360 else if (selection.clicks == 2)
3237 { 3361 {
3238 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3362 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3239 selection.end.col--; 3363 selection.end.col--;
3240 3364
3241 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3242 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3365 selection_delimit_word (UP, &selection.beg, &selection.beg);
3366 selection_delimit_word (DN, &selection.end, &selection.end);
3243 } 3367 }
3244 else if (selection.clicks == 3) 3368 else if (selection.clicks == 3)
3245 { 3369 {
3246#ifndef NO_FRILLS 3370#if ENABLE_FRILLS
3247 if ((Options & Opt_tripleclickwords)) 3371 if ((options & Opt_tripleclickwords))
3248 { 3372 {
3249 int end_row; 3373 int end_row;
3250 3374
3251 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3375 selection_delimit_word (UP, &selection.beg, &selection.beg);
3252 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3376 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3253 3377
3254 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3378 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3255 { 3379 {
3256 end_col = screen.tlen[end_row + TermWin.saveLines]; 3380 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3267 else 3391 else
3268#endif 3392#endif
3269 { 3393 {
3270 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3394 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3271 selection.mark.col++; 3395 selection.mark.col++;
3396
3272 selection.beg.col = 0; 3397 selection.beg.col = 0;
3273 selection.end.col = ncol; 3398 selection.end.col = ncol;
3274 } 3399 }
3275 } 3400 }
3276 3401
3277 if (button3 && buttonpress) 3402 if (button3 && buttonpress)
3278 { /* mark may need to be changed */ 3403 { /* mark may need to be changed */
3279 if (closeto == LEFT) 3404 if (closeto == LEFT)
3280 { 3405 {
3281 selection.mark.row = selection.end.row; 3406 selection.mark.row = selection.end.row;
3282 selection.mark.col = selection.end.col 3407 selection.mark.col = selection.end.col - (selection.clicks == 2);
3283 - (selection.clicks == 2);
3284 } 3408 }
3285 else 3409 else
3286 { 3410 {
3287 selection.mark.row = selection.beg.row; 3411 selection.mark.row = selection.beg.row;
3288 selection.mark.col = selection.beg.col; 3412 selection.mark.col = selection.beg.col;
3289 } 3413 }
3290 } 3414 }
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}
3293 3415
3294#ifndef NO_FRILLS 3416#if ENABLE_FRILLS
3417 if (selection.rect && selection.beg.col > selection.end.col)
3418 SWAP_IT (selection.beg.col, selection.end.col, int);
3419#endif
3420}
3421
3422#if ENABLE_FRILLS
3295void 3423void
3296rxvt_term::selection_remove_trailing_spaces () 3424rxvt_term::selection_remove_trailing_spaces ()
3297{ 3425{
3298 int32_t end_col, end_row; 3426 int32_t end_col, end_row;
3299 text_t *stp; 3427 text_t *stp;
3300 3428
3301 end_col = selection.end.col; 3429 end_col = selection.end.col;
3302 end_row = selection.end.row; 3430 end_row = selection.end.row;
3431
3303 for ( ; end_row >= selection.beg.row; ) 3432 for ( ; end_row >= selection.beg.row; )
3304 { 3433 {
3305 stp = screen.text[end_row + TermWin.saveLines]; 3434 stp = screen.text[end_row + TermWin.saveLines];
3435
3306 while (--end_col >= 0) 3436 while (--end_col >= 0)
3307 { 3437 {
3308 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3438 if (stp[end_col] != ' '
3439 && stp[end_col] != '\t'
3440 && stp[end_col] != NOCHAR)
3309 break; 3441 break;
3310 } 3442 }
3443
3311 if (end_col >= 0 3444 if (end_col >= 0
3312 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3445 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3313 { 3446 {
3314 selection.end.col = end_col + 1; 3447 selection.end.col = end_col + 1;
3315 selection.end.row = end_row; 3448 selection.end.row = end_row;
3316 break; 3449 break;
3317 } 3450 }
3451
3318 end_row--; 3452 end_row--;
3319 end_col = TermWin.ncol; 3453 end_col = TermWin.ncol;
3320 } 3454 }
3455
3321 if (selection.mark.row > selection.end.row) 3456 if (selection.mark.row > selection.end.row)
3322 { 3457 {
3323 selection.mark.row = selection.end.row; 3458 selection.mark.row = selection.end.row;
3324 selection.mark.col = selection.end.col; 3459 selection.mark.col = selection.end.col;
3325 } 3460 }
… …
3338rxvt_term::selection_rotate (int x, int y) 3473rxvt_term::selection_rotate (int x, int y)
3339{ 3474{
3340 selection.clicks = selection.clicks % 3 + 1; 3475 selection.clicks = selection.clicks % 3 + 1;
3341 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3476 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3342} 3477}
3343
3344/* ------------------------------------------------------------------------- */
3345/*
3346 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3347 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3348 * the X11 protocol.
3349 */
3350typedef CARD32 Atom32;
3351 3478
3352/* ------------------------------------------------------------------------- */ 3479/* ------------------------------------------------------------------------- */
3353/* 3480/*
3354 * Respond to a request for our current selection 3481 * Respond to a request for our current selection
3355 * EXT: SelectionRequest 3482 * EXT: SelectionRequest
… …
3370 ev.target = rq.target; 3497 ev.target = rq.target;
3371 ev.time = rq.time; 3498 ev.time = rq.time;
3372 3499
3373 if (rq.target == xa[XA_TARGETS]) 3500 if (rq.target == xa[XA_TARGETS])
3374 { 3501 {
3375 Atom32 target_list[6]; 3502 Atom target_list[6];
3376 Atom32 *target = target_list; 3503 Atom *target = target_list;
3377 3504
3378 *target++ = (Atom32) xa[XA_TARGETS]; 3505 *target++ = xa[XA_TARGETS];
3379 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3506 *target++ = xa[XA_TIMESTAMP];
3380 *target++ = (Atom32) XA_STRING; 3507 *target++ = XA_STRING;
3381 *target++ = (Atom32) xa[XA_TEXT]; 3508 *target++ = xa[XA_TEXT];
3382 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3509 *target++ = xa[XA_COMPOUND_TEXT];
3383#if X_HAVE_UTF8_STRING 3510#if X_HAVE_UTF8_STRING
3384 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3511 *target++ = xa[XA_UTF8_STRING];
3385#endif 3512#endif
3386 3513
3387 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3514 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3388 (8 * sizeof (target_list[0])), PropModeReplace, 3515 32, PropModeReplace,
3389 (unsigned char *)target_list, 3516 (unsigned char *)target_list, target - target_list);
3390 target - target_list);
3391 ev.property = rq.property; 3517 ev.property = rq.property;
3392 } 3518 }
3519#if TODO // TODO
3393 else if (rq.target == xa[XA_MULTIPLE]) 3520 else if (rq.target == xa[XA_MULTIPLE])
3394 { 3521 {
3395 /* TODO: Handle MULTIPLE */ 3522 /* TODO: Handle MULTIPLE */
3396 } 3523 }
3524#endif
3397 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3398 { 3526 {
3399 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3527 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3400 (8 * sizeof (Time)), PropModeReplace,
3401 (unsigned char *)&selection_time, 1); 3528 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3402 ev.property = rq.property; 3529 ev.property = rq.property;
3403 } 3530 }
3404 else if (rq.target == XA_STRING 3531 else if (rq.target == XA_STRING
3405 || rq.target == xa[XA_TEXT] 3532 || rq.target == xa[XA_TEXT]
3406 || rq.target == xa[XA_COMPOUND_TEXT] 3533 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3482} 3609}
3483 3610
3484/* ------------------------------------------------------------------------- */ 3611/* ------------------------------------------------------------------------- */
3485#ifdef USE_XIM 3612#ifdef USE_XIM
3486void 3613void
3487rxvt_term::im_set_position (XPoint *pos) 3614rxvt_term::im_set_position (XPoint &pos)
3488{ 3615{
3489 XWindowAttributes xwa; 3616 XWindowAttributes xwa;
3490 3617
3491 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3618 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3619
3492 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3620 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3493 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3621 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3494} 3622}
3495
3496#endif 3623#endif
3624
3625#if ENABLE_OVERLAY
3626void
3627rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3628{
3629 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3630 return;
3631
3632 want_refresh = 1;
3633
3634 scr_overlay_off ();
3635
3636 if (x < 0) x = TermWin.ncol - w;
3637 if (y < 0) y = TermWin.nrow - h;
3638
3639 // make space for border
3640 w += 2; MIN_IT (w, TermWin.ncol);
3641 h += 2; MIN_IT (h, TermWin.nrow);
3642
3643 x -= 1; MAX_IT (x, 0);
3644 y -= 1; MAX_IT (y, 0);
3645
3646 MIN_IT (x, TermWin.ncol - w);
3647 MIN_IT (y, TermWin.nrow - h);
3648
3649 ov_x = x; ov_y = y;
3650 ov_w = w; ov_h = h;
3651
3652 ov_text = new text_t *[h];
3653 ov_rend = new rend_t *[h];
3654
3655 for (y = 0; y < h; y++)
3656 {
3657 text_t *tp = ov_text[y] = new text_t[w];
3658 rend_t *rp = ov_rend[y] = new rend_t[w];
3659
3660 text_t t0, t1, t2;
3661 rend_t r = OVERLAY_RSTYLE;
3662
3663 if (y == 0)
3664 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3665 else if (y < h - 1)
3666 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3667 else
3668 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3669
3670 *tp++ = t0;
3671 *rp++ = r;
3672
3673 for (x = w - 2; x > 0; --x)
3674 {
3675 *tp++ = t1;
3676 *rp++ = r;
3677 }
3678
3679 *tp = t2;
3680 *rp = r;
3681 }
3682}
3683
3684void
3685rxvt_term::scr_overlay_off ()
3686{
3687 if (!ov_text)
3688 return;
3689
3690 want_refresh = 1;
3691
3692 for (int y = 0; y < ov_h; y++)
3693 {
3694 delete [] ov_text[y];
3695 delete [] ov_rend[y];
3696 }
3697
3698 delete [] ov_text; ov_text = 0;
3699 delete [] ov_rend; ov_rend = 0;
3700}
3701
3702void
3703rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3704{
3705 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3706 return;
3707
3708 x++, y++;
3709
3710 ov_text[y][x] = text;
3711 ov_rend[y][x] = rend;
3712}
3713
3714void
3715rxvt_term::scr_overlay_set (int x, int y, const char *s)
3716{
3717 while (*s)
3718 scr_overlay_set (x++, y, *s++);
3719}
3720
3721void
3722rxvt_term::scr_swap_overlay ()
3723{
3724 if (!ov_text)
3725 return;
3726
3727 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3728
3729 // swap screen mem with overlay
3730 for (int y = ov_h; y--; )
3731 {
3732 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y];
3734
3735 text_t *t2 = screen.text[y + row_offset] + ov_x;
3736 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3737
3738 for (int x = ov_w; x--; )
3739 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3742 }
3743 }
3744}
3745
3746#endif
3497/* ------------------------------------------------------------------------- */ 3747/* ------------------------------------------------------------------------- */

Diff Legend

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