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.77 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.151 by root, Wed Dec 15 00:53:23 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 <stdint.h> 32#include <inttypes.h>
35#include <wchar.h> 33#include <wchar.h>
36 34
37#include "salloc.C" // HACK, should be a seperate compile! 35#include "salloc.C" // HACK, should be a seperate compile!
38 36
39inline void fill_text (text_t *start, text_t value, int len) 37inline void fill_text (text_t *start, text_t value, int len)
… …
41 while (len--) 39 while (len--)
42 *start++ = value; 40 *start++ = value;
43} 41}
44 42
45/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
48 47
49/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
53 if (Options & Opt_scrollTtyOutput) \ 52 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 53 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
113 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
114 113
115/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 121{
122 efs &= ~RS_baseattrMask; 122 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 123 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 124
125 while (width--) 125 while (width--)
126 { 126 {
127 *et++ = ' '; 127 *et++ = ' ';
128 *er++ = efs; 128 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 155 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 156 unsigned int p, q;
157 int k; 157 int k;
158 rend_t setrstyle; 158 rend_t setrstyle;
159 159
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
161 163
162 TermWin.view_start = 0; 164 TermWin.view_start = 0;
163 num_scr = 0; 165 num_scr = 0;
164 166
165 if (TermWin.ncol == 0) 167 if (TermWin.ncol == 0)
… …
172 nrow = TermWin.nrow; 174 nrow = TermWin.nrow;
173 175
174 if (ncol == prev_ncol && nrow == prev_nrow) 176 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 177 return;
176 178
179 // we need at least two lines for wrapping to work correctly
180 if (nrow + TermWin.saveLines < 2)
181 {
182 TermWin.saveLines++;
183 prev_nrow--;
184 TermWin.nscrolled++;
185 }
186
177 want_refresh = 1; 187 want_refresh = 1;
178 188
189 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 190 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 191
182 screen.tscroll = 0; 192 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
184 194
185 if (!talloc) 195 if (!talloc)
186 { 196 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 197 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 198 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 199 }
190 200
191 if (prev_nrow == 0) 201 if (!screen.text)
192 { 202 {
193 /* 203 /*
194 * first time called so just malloc everything: don't rely on realloc 204 * 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 205 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 206 */
… …
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 224 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0; 225 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 226 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 227 }
218 228
219 MEMSET (charsets, 'B', sizeof (charsets)); 229 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */ 230 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 231 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 232 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 233 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 234 screen.charset = 0;
… …
408} 418}
409 419
410void 420void
411rxvt_term::scr_reset_realloc () 421rxvt_term::scr_reset_realloc ()
412{ 422{
413 uint16_t total_rows, nrow; 423 unsigned int total_rows, nrow;
414 424
415 nrow = TermWin.nrow; 425 nrow = TermWin.nrow;
416 total_rows = nrow + TermWin.saveLines; 426 total_rows = nrow + TermWin.saveLines;
417 /* *INDENT-OFF* */ 427 /* *INDENT-OFF* */
418 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 428 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
435 * Free everything. That way malloc debugging can find leakage. 445 * Free everything. That way malloc debugging can find leakage.
436 */ 446 */
437void 447void
438rxvt_term::scr_release () 448rxvt_term::scr_release ()
439{ 449{
440 uint16_t total_rows; 450 unsigned int total_rows;
441 int i; 451 int i;
442 452
443 total_rows = TermWin.nrow + TermWin.saveLines; 453 total_rows = TermWin.nrow + TermWin.saveLines;
444 454
445 delete talloc; talloc = 0; 455 delete talloc; talloc = 0;
… …
471 * Hard reset 481 * Hard reset
472 */ 482 */
473void 483void
474rxvt_term::scr_poweron () 484rxvt_term::scr_poweron ()
475{ 485{
476 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
477
478 scr_release (); 486 scr_release ();
479 prev_nrow = prev_ncol = 0; 487 prev_nrow = prev_ncol = 0;
480 scr_reset (); 488 scr_reset ();
481 489
482 scr_clear (true); 490 scr_clear (true);
… …
493 */ 501 */
494void 502void
495rxvt_term::scr_cursor (int mode) 503rxvt_term::scr_cursor (int mode)
496{ 504{
497 screen_t *s; 505 screen_t *s;
498
499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
500 506
501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
502 if (current_screen == SECONDARY) 508 if (current_screen == SECONDARY)
503 s = &swap; 509 s = &swap;
504 else 510 else
… …
506 s = &screen; 512 s = &screen;
507 513
508 switch (mode) 514 switch (mode)
509 { 515 {
510 case SAVE: 516 case SAVE:
511 s->s_cur.row = s->cur.row; 517 s->s_cur.row = screen.cur.row;
512 s->s_cur.col = s->cur.col; 518 s->s_cur.col = screen.cur.col;
513 s->s_rstyle = rstyle; 519 s->s_rstyle = rstyle;
514 s->s_charset = s->charset; 520 s->s_charset = screen.charset;
515 s->s_charset_char = charsets[s->charset]; 521 s->s_charset_char = charsets[screen.charset];
516 break; 522 break;
517 523
518 case RESTORE: 524 case RESTORE:
519 want_refresh = 1; 525 want_refresh = 1;
520 s->cur.row = s->s_cur.row; 526 screen.cur.row = s->s_cur.row;
521 s->cur.col = s->s_cur.col; 527 screen.cur.col = s->s_cur.col;
522 s->flags &= ~Screen_WrapNext; 528 screen.flags &= ~Screen_WrapNext;
523 rstyle = s->s_rstyle; 529 rstyle = s->s_rstyle;
524 s->charset = s->s_charset; 530 screen.charset = s->s_charset;
525 charsets[s->charset] = s->s_charset_char; 531 charsets[screen.charset] = s->s_charset_char;
526 set_font_style (); 532 set_font_style ();
527 break; 533 break;
528 } 534 }
529 535
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 536 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
553 int offset; 559 int offset;
554#endif 560#endif
555 561
556 want_refresh = 1; 562 want_refresh = 1;
557 563
558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
559
560 TermWin.view_start = 0; 564 TermWin.view_start = 0;
561 565
562 if (current_screen == scrn) 566 if (current_screen == scrn)
563 return scrn; 567 return scrn;
564 568
565 selection_check (2); /* check for boundary cross */ 569 selection_check (2); /* check for boundary cross */
566 570
567 SWAP_IT (current_screen, scrn, int); 571 SWAP_IT (current_screen, scrn, int);
572
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584
568#if NSCREENS 585#if NSCREENS
569 if (Options & Opt_secondaryScreen) 586 if (options & Opt_secondaryScreen)
570 { 587 {
571 num_scr = 0; 588 num_scr = 0;
572 offset = TermWin.saveLines; 589 offset = TermWin.saveLines;
590
573 for (i = prev_nrow; i--;) 591 for (i = prev_nrow; i--;)
574 { 592 {
575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 593 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 594 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 595 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
578 } 596 }
579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 597
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); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
591 SWAP_IT (screen.flags, swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
592 screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
593 swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
594 } 602 }
595 else 603 else
596#endif 604#endif
597 if (Options & Opt_secondaryScroll) 605 if (options & Opt_secondaryScroll)
598 //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)
… …
705 if (j > 0) 731 if (j > 0)
706 { 732 {
707 /* A: scroll up */ 733 /* A: scroll up */
708 734
709 /* A1: Copy lines that will get clobbered by the rotation */ 735 /* A1: Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738
739 /* A2: Rotate lines */
740 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744
745 j = row2 - count + 1, i = count;
746 }
747 else /* if (j < 0) */
748 {
749 /* B: scroll down */
750
751 /* B1: Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++) 752 for (i = 0, j = row2; i < count; i++, j--)
711 { 753 {
712 buf_text[i] = screen.text[j]; 754 buf_text[i] = screen.text[j];
713 buf_rend[i] = screen.rend[j]; 755 buf_rend[i] = screen.rend[j];
714 } 756 }
715 757
716 /* A2: Rotate lines */ 758 /* B2: Rotate lines */
717 for (j = row1, i = j + count; i <= row2; i++, j++) 759 for (j = row2, i = j - count; i >= row1; i--, j--)
718 { 760 {
719 screen.tlen[j] = screen.tlen[i]; 761 screen.tlen[j] = screen.tlen[i];
720 screen.text[j] = screen.text[i]; 762 screen.text[j] = screen.text[i];
721 screen.rend[j] = screen.rend[i]; 763 screen.rend[j] = screen.rend[i];
722 } 764 }
723 765
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729
730 /* B1: Copy lines that will get clobbered by the rotation */
731 for (i = 0, j = row2; i < count; i++, j--)
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736
737 /* B2: Rotate lines */
738 for (j = row2, i = j - count; i >= row1; i--, j--)
739 {
740 screen.tlen[j] = screen.tlen[i];
741 screen.text[j] = screen.text[i];
742 screen.rend[j] = screen.rend[i];
743 }
744
745 j = row1, i = count; 766 j = row1, i = count;
746 count = -count; 767 count = -count;
747 } 768 }
748 769
749 /* C: Resurrect lines */ 770 /* C: Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */
750 for (; i--; j++) 775 for (; i--; j++)
751 {
752 screen.tlen[j] = 0;
753 screen.text[j] = buf_text[i];
754 screen.rend[j] = buf_rend[i];
755
756 if (!spec) /* line length may not equal TermWin.ncol */
757 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 776 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
758 }
759 777
760 return count; 778 return count;
761} 779}
762 780
763/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
… …
765 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
766 */ 784 */
767void 785void
768rxvt_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)
769{ 787{
770 unsigned char checksel, clearsel; 788 unsigned char checksel;
771 unicode_t c; 789 unicode_t c;
772 int i, row, last_col; 790 int i, row, last_col;
773 text_t *stp; 791 text_t *stp;
774 rend_t *srp; 792 rend_t *srp;
775 793
776 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
777 return; 795 return;
778 796
779 want_refresh = 1; 797 want_refresh = 1;
798 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 799 last_col = TermWin.ncol;
781 800
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 801 if (nlines > 0)
785 { 802 {
786 nlines += (screen.cur.row - screen.bscroll); 803 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 804 if ((nlines > 0)
788 && (screen.tscroll == 0) 805 && (screen.tscroll == 0)
789 && (screen.bscroll == (TermWin.nrow - 1))) 806 && (screen.bscroll == (TermWin.nrow - 1)))
790 { 807 {
791 /* _at least_ this many lines need to be scrolled */ 808 /* _at least_ this many lines need to be scrolled */
792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
793 screen.cur.row -= nlines; 810 screen.cur.row -= nlines;
794 } 811 }
795 } 812 }
813
796#ifdef DEBUG_STRICT 814#ifdef DEBUG_STRICT
797 assert (screen.cur.col < last_col); 815 assert (screen.cur.col < last_col);
798 assert ((screen.cur.row < TermWin.nrow) 816 assert ((screen.cur.row < TermWin.nrow)
799 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
800#else /* drive with your eyes closed */ 818#else /* drive with your eyes closed */
801 MIN_IT (screen.cur.col, last_col - 1); 819 MIN_IT (screen.cur.col, last_col - 1);
802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 820 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
804#endif 822#endif
805 row = screen.cur.row + TermWin.saveLines; 823 row = screen.cur.row + TermWin.saveLines;
806 824
807 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
808 clearsel = 0;
809 826
810 stp = screen.text[row]; 827 stp = screen.text[row];
811 srp = screen.rend[row]; 828 srp = screen.rend[row];
812 829
813 while (len--) 830 while (len--)
… …
816 833
817 if (c < 0x20) 834 if (c < 0x20)
818 switch (c) 835 switch (c)
819 { 836 {
820 case C0_HT: 837 case C0_HT:
821 scr_tab (1); 838 scr_tab (1, true);
822 continue; 839 continue;
823 840
824 case C0_LF: 841 case C0_LF:
825 if (screen.tlen[row] != -1) /* XXX: think about this */ 842 if (screen.tlen[row] != -1) /* XXX: think about this */
826 MAX_IT (screen.tlen[row], screen.cur.col); 843 MAX_IT (screen.tlen[row], screen.cur.col);
… …
848 if (checksel /* see if we're writing within selection */ 865 if (checksel /* see if we're writing within selection */
849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
851 { 868 {
852 checksel = 0; 869 checksel = 0;
853 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 ();
854 } 876 }
855 877
856 if (screen.flags & Screen_WrapNext) 878 if (screen.flags & Screen_WrapNext)
857 { 879 {
858 screen.tlen[row] = -1; 880 screen.tlen[row] = -1;
859 if (screen.cur.row == screen.bscroll) 881
860 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
861 else if (screen.cur.row < (TermWin.nrow - 1))
862 row = (++screen.cur.row) + TermWin.saveLines; 882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
863 883
864 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
865 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
866 screen.cur.col = 0;
867 screen.flags &= ~Screen_WrapNext;
868 } 886 }
869
870 if (screen.flags & Screen_Insert)
871 scr_insdel_chars (1, INSERT);
872 887
873 // 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
874 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
875 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
876 int width = c < 256 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
877 892
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
879 { 894 {
880 // 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
881 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
882 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
883 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
884 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
885 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
886 }; 907 };
887 908
888 if (c >= 0x5f && c <= 0x7e) 909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
889 { 910 {
890 c = vt100_0[c - 0x5f]; 911 c = vt100_0[c - 0x40];
891 width = 1; 912 width = 1;
892 } 913 }
893 } 914 }
894 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
895 if (width != 0) 919 if (width != 0)
896 { 920 {
897#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
898 // trim characters we can't store directly :( 926 // trim characters we can't store directly :(
899 if (c >= 0x10000) 927 if (c >= 0x10000)
928# if ENABLE_COMBINING
900 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;
901#endif 932# endif
902 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 933#endif
934
935 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR
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
903 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c, bold)); 956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 957
905 do 958 do
906 { 959 {
907 stp[screen.cur.col] = c; 960 stp[screen.cur.col] = c;
908 srp[screen.cur.col] = rend; 961 srp[screen.cur.col] = rend;
… …
920 c = NOCHAR; 973 c = NOCHAR;
921 } 974 }
922 while (--width > 0); 975 while (--width > 0);
923 976
924 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
925 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
926 { 980 {
927 stp[c] = ' '; 981 stp[c] = ' ';
928 srp[c] = rend; 982 srp[c] = rend;
929 } 983 }
930 } 984 }
931 else if (width == 0) 985 else if (width == 0)
932 { 986 {
933#if ENABLE_COMBINING 987#if ENABLE_COMBINING
934 // handle combining characters 988 // handle combining characters
… …
941 995
942 if (screen.cur.col > 0) 996 if (screen.cur.col > 0)
943 { 997 {
944 tp = stp + screen.cur.col - 1; 998 tp = stp + screen.cur.col - 1;
945 rp = srp + screen.cur.col - 1; 999 rp = srp + screen.cur.col - 1;
1000
1001 while (*tp == NOCHAR && tp > stp)
1002 tp--, rp--;
946 } 1003 }
947 else if (screen.cur.row > 0 1004 else if (screen.cur.row > 0
948 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
949 { 1006 {
950 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1007 int line = screen.cur.row - 1 + TermWin.saveLines;
951 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1008
1009 tp = screen.text[line] + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1;
1011
1012 while (*tp == NOCHAR && tp > screen.text[line])
1013 tp--, rp--;
952 } 1014 }
953 else 1015 else
954 continue; 1016 continue;
955
956 // handle double-width-chars by making them look extremely ugly
957 if (*tp == NOCHAR)
958 *tp = ' '; // hack //D //TODO //--tp, --rp;
959 1017
960 // first try to find a precomposed character 1018 // first try to find a precomposed character
961 unicode_t n = rxvt_compose (*tp, c); 1019 unicode_t n = rxvt_compose (*tp, c);
962 if (n == NOCHAR) 1020 if (n == NOCHAR)
963 n = rxvt_composite.compose (*tp, c); 1021 n = rxvt_composite.compose (*tp, c);
964 1022
965 *tp = n; 1023 *tp = n;
966 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
967#endif 1025#endif
968 } 1026 }
969 } 1027 }
970 1028
971 if (screen.tlen[row] != -1) /* XXX: think about this */ 1029 if (screen.tlen[row] != -1) /* XXX: think about this */
972 MAX_IT (screen.tlen[row], screen.cur.col); 1030 MAX_IT (screen.tlen[row], screen.cur.col);
973
974 /*
975 * If we wrote anywhere in the selected area, kill the selection
976 * XXX: should we kill the mark too? Possibly, but maybe that
977 * should be a similar check.
978 */
979 if (clearsel)
980 CLEAR_SELECTION ();
981 1031
982#ifdef DEBUG_STRICT 1032#ifdef DEBUG_STRICT
983 assert (screen.cur.row >= 0); 1033 assert (screen.cur.row >= 0);
984#else /* drive with your eyes closed */ 1034#else /* drive with your eyes closed */
985 MAX_IT (screen.cur.row, 0); 1035 MAX_IT (screen.cur.row, 0);
… …
1003#ifdef TERMCAP_HAS_BW 1053#ifdef TERMCAP_HAS_BW
1004 screen.cur.col = TermWin.ncol - 1; 1054 screen.cur.col = TermWin.ncol - 1;
1005 screen.cur.row--; 1055 screen.cur.row--;
1006 return; 1056 return;
1007#endif 1057#endif
1008
1009 } 1058 }
1010 } 1059 }
1011 else if ((screen.flags & Screen_WrapNext) == 0) 1060 else if (!(screen.flags & Screen_WrapNext))
1012 scr_gotorc (0, -1, RELATIVE); 1061 scr_gotorc (0, -1, RELATIVE);
1013 1062
1014 screen.flags &= ~Screen_WrapNext; 1063 screen.flags &= ~Screen_WrapNext;
1015} 1064}
1016 1065
… …
1019 * Process Horizontal Tab 1068 * Process Horizontal Tab
1020 * count: +ve = forward; -ve = backwards 1069 * count: +ve = forward; -ve = backwards
1021 * XTERM_SEQ: CTRL-I 1070 * XTERM_SEQ: CTRL-I
1022 */ 1071 */
1023void 1072void
1024rxvt_term::scr_tab (int count) 1073rxvt_term::scr_tab (int count, bool ht)
1025{ 1074{
1026 int i, x; 1075 int i, x;
1027 1076
1028 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1029 want_refresh = 1; 1077 want_refresh = 1;
1030 i = x = screen.cur.col; 1078 i = x = screen.cur.col;
1031 1079
1032 if (count == 0) 1080 if (count == 0)
1033 return; 1081 return;
1034 else if (count > 0) 1082 else if (count > 0)
1035 { 1083 {
1084 int row = TermWin.saveLines + screen.cur.row;
1085 text_t *tp = screen.text[row];
1086 rend_t *rp = screen.rend[row];
1087 rend_t base_rend = rp[i];
1088 ht &= tp[i] == ' ';
1089
1036 for (; ++i < TermWin.ncol; ) 1090 for (; ++i < TermWin.ncol; )
1037 if (tabs[i]) 1091 if (tabs[i])
1038 { 1092 {
1039 x = i; 1093 x = i;
1040 if (!--count) 1094 if (!--count)
1041 break; 1095 break;
1042 } 1096 }
1097 else
1098 ht &= tp[i] == ' '
1099 && RS_SAME (rp[i], base_rend);
1043 1100
1044 if (count) 1101 if (count)
1045 x = TermWin.ncol - 1; 1102 x = TermWin.ncol - 1;
1103
1104 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs)
1107 {
1108 base_rend = SET_FONT (base_rend, 0);
1109
1110 if (screen.tlen[row] != -1) /* XXX: think about this */
1111 MAX_IT (screen.tlen[row], x);
1112
1113 i = screen.cur.col;
1114
1115 tp[i] = '\t';
1116 rp[i] = base_rend;
1117
1118 while (++i < x)
1119 {
1120 tp[i] = NOCHAR;
1121 rp[i] = base_rend;
1122 }
1123 }
1046 } 1124 }
1047 else /* if (count < 0) */ 1125 else /* if (count < 0) */
1048 { 1126 {
1049 for (; --i >= 0; ) 1127 for (; --i >= 0; )
1050 if (tabs[i]) 1128 if (tabs[i])
… …
1067 * Process DEC Back Index 1145 * Process DEC Back Index
1068 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1069 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1070 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1071 */ 1149 */
1072#ifndef NO_FRILLS 1150#if ENABLE_FRILLS
1073void 1151void
1074rxvt_term::scr_backindex () 1152rxvt_term::scr_backindex ()
1075{ 1153{
1076 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1156 else
1079 { 1157 {
1080 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1081 return; /* um, yeah? */ 1159 return; /* um, yeah? */
1160
1082 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
1083 } 1162 }
1084} 1163}
1085#endif 1164#endif
1086/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
… …
1088 * Process DEC Forward Index 1167 * Process DEC Forward Index
1089 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1090 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1091 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1092 */ 1171 */
1093#ifndef NO_FRILLS 1172#if ENABLE_FRILLS
1094void 1173void
1095rxvt_term::scr_forwardindex () 1174rxvt_term::scr_forwardindex ()
1096{ 1175{
1097 int row; 1176 int row;
1098 1177
1099 if (screen.cur.col < TermWin.ncol - 1) 1178 if (screen.cur.col < TermWin.ncol - 1)
1100 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1101 else 1180 else
1102 { 1181 {
1103 row = screen.cur.row + TermWin.saveLines; 1182 row = screen.cur.row + TermWin.saveLines;
1183
1104 if (screen.tlen[row] == 0) 1184 if (screen.tlen[row] == 0)
1105 return; /* um, yeah? */ 1185 return; /* um, yeah? */
1106 else if (screen.tlen[row] == -1) 1186 else if (screen.tlen[row] == -1)
1107 screen.tlen[row] = TermWin.ncol; 1187 screen.tlen[row] = TermWin.ncol;
1188
1108 scr_gotorc (0, 0, R_RELATIVE); 1189 scr_gotorc (0, 0, R_RELATIVE);
1109 scr_insdel_chars (1, DELETE); 1190 scr_insdel_chars (1, DELETE);
1110 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1111 } 1192 }
1112} 1193}
… …
1120rxvt_term::scr_gotorc (int row, int col, int relative) 1201rxvt_term::scr_gotorc (int row, int col, int relative)
1121{ 1202{
1122 want_refresh = 1; 1203 want_refresh = 1;
1123 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1124 1205
1125 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));
1126
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1128 MAX_IT (screen.cur.col, 0); 1207 MAX_IT (screen.cur.col, 0);
1129 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1130 1209
1131 screen.flags &= ~Screen_WrapNext; 1210 screen.flags &= ~Screen_WrapNext;
1211
1132 if (relative & R_RELATIVE) 1212 if (relative & R_RELATIVE)
1133 { 1213 {
1134 if (row > 0) 1214 if (row > 0)
1135 { 1215 {
1136 if (screen.cur.row <= screen.bscroll 1216 if (screen.cur.row <= screen.bscroll
… …
1156 MIN_IT (screen.cur.row, screen.bscroll); 1236 MIN_IT (screen.cur.row, screen.bscroll);
1157 } 1237 }
1158 else 1238 else
1159 screen.cur.row = row; 1239 screen.cur.row = row;
1160 } 1240 }
1241
1161 MAX_IT (screen.cur.row, 0); 1242 MAX_IT (screen.cur.row, 0);
1162 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1163
1164 while (screen.cur.col > 0
1165 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1166 screen.cur.col--;
1167} 1244}
1168 1245
1169/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1170/* 1247/*
1171 * direction should be UP or DN 1248 * direction should be UP or DN
1172 */ 1249 */
1173void 1250void
1174rxvt_term::scr_index (enum page_dirn direction) 1251rxvt_term::scr_index (enum page_dirn direction)
1175{ 1252{
1176 int dirn; 1253 int dirn;
1177 1254
1178 want_refresh = 1; 1255 want_refresh = 1;
1256 ZERO_SCROLLBACK ();
1257
1179 dirn = ((direction == UP) ? 1 : -1); 1258 dirn = ((direction == UP) ? 1 : -1);
1180 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1181
1182 ZERO_SCROLLBACK ();
1183 1259
1184 screen.flags &= ~Screen_WrapNext; 1260 screen.flags &= ~Screen_WrapNext;
1261
1185 if ((screen.cur.row == screen.bscroll && direction == UP) 1262 if ((screen.cur.row == screen.bscroll && direction == UP)
1186 || (screen.cur.row == screen.tscroll && direction == DN)) 1263 || (screen.cur.row == screen.tscroll && direction == DN))
1187 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1188 else 1265 else
1189 screen.cur.row += dirn; 1266 screen.cur.row += dirn;
1267
1190 MAX_IT (screen.cur.row, 0); 1268 MAX_IT (screen.cur.row, 0);
1191 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1192 selection_check (0); 1270 selection_check (0);
1193} 1271}
1194 1272
… …
1203rxvt_term::scr_erase_line (int mode) 1281rxvt_term::scr_erase_line (int mode)
1204{ 1282{
1205 unsigned int row, col, num; 1283 unsigned int row, col, num;
1206 1284
1207 want_refresh = 1; 1285 want_refresh = 1;
1208 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1209 ZERO_SCROLLBACK (); 1286 ZERO_SCROLLBACK ();
1210 1287
1211 selection_check (1); 1288 selection_check (1);
1212
1213 screen.flags &= ~Screen_WrapNext;
1214 1289
1215 row = TermWin.saveLines + screen.cur.row; 1290 row = TermWin.saveLines + screen.cur.row;
1216 switch (mode) 1291 switch (mode)
1217 { 1292 {
1218 case 0: /* erase to end of line */ 1293 case 0: /* erase to end of line */
… …
1262 int32_t row, row_offset; 1337 int32_t row, row_offset;
1263 rend_t ren; 1338 rend_t ren;
1264 XGCValues gcvalue; 1339 XGCValues gcvalue;
1265 1340
1266 want_refresh = 1; 1341 want_refresh = 1;
1267 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1268 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1343
1269 row_offset = (int32_t)TermWin.saveLines; 1344 row_offset = (int32_t)TermWin.saveLines;
1270 1345
1271 switch (mode) 1346 switch (mode)
1272 { 1347 {
1273 case 0: /* erase to end of screen */ 1348 case 0: /* erase to end of screen */
… …
1289 break; 1364 break;
1290 default: 1365 default:
1291 return; 1366 return;
1292 } 1367 }
1293 1368
1294 refresh_type |= REFRESH_BOUNDS;
1295
1296 if (selection.op && current_screen == selection.screen 1369 if (selection.op && current_screen == selection.screen
1297 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1370 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1298 || (selection.end.row >= row 1371 || (selection.end.row >= row
1299 && selection.end.row <= row + num))) 1372 && selection.end.row <= row + num)))
1300 CLEAR_SELECTION (); 1373 CLEAR_SELECTION ();
… …
1311 ren = DEFAULT_RSTYLE; 1384 ren = DEFAULT_RSTYLE;
1312 CLEAR_ROWS (row, num); 1385 CLEAR_ROWS (row, num);
1313 } 1386 }
1314 else 1387 else
1315 { 1388 {
1316 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1317 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1318 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1319 ERASE_ROWS (row, num); 1392 ERASE_ROWS (row, num);
1320 gcvalue.foreground = PixColors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1322 } 1395 }
1323 1396
1324 for (; num--; row++) 1397 for (; num--; row++)
1325 { 1398 {
1326 scr_blank_screen_mem (screen.text, screen.rend, 1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1327 (unsigned int) (row + row_offset), rstyle);
1328 screen.tlen[row + row_offset] = 0; 1400 screen.tlen[row + row_offset] = 0;
1329 scr_blank_line (drawn_text[row], drawn_rend[row], 1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1330 (unsigned int)TermWin.ncol, ren);
1331 } 1402 }
1332} 1403}
1333 1404
1334/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1335/* 1406/*
… …
1341{ 1412{
1342 int i, j, k; 1413 int i, j, k;
1343 rend_t *r1, fs; 1414 rend_t *r1, fs;
1344 1415
1345 want_refresh = 1; 1416 want_refresh = 1;
1417 ZERO_SCROLLBACK ();
1418
1346 num_scr_allow = 0; 1419 num_scr_allow = 0;
1347 ZERO_SCROLLBACK ();
1348 selection_check (3); 1420 selection_check (3);
1349 1421
1350 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1351 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1352 { 1424 {
1353 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1354 fill_text (screen.text[k], 'E', TermWin.ncol); 1426 fill_text (screen.text[k], 'E', TermWin.ncol);
1355 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1379 if (insdel == DELETE) 1451 if (insdel == DELETE)
1380 return; 1452 return;
1381 else if (insdel == INSERT) 1453 else if (insdel == INSERT)
1382 count = end; 1454 count = end;
1383 } 1455 }
1384 screen.flags &= ~Screen_WrapNext; 1456
1457 scr_do_wrap ();
1385 1458
1386 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1387} 1460}
1388 1461
1389/* ------------------------------------------------------------------------- */ 1462/* ------------------------------------------------------------------------- */
… …
1403 ZERO_SCROLLBACK (); 1476 ZERO_SCROLLBACK ();
1404 1477
1405 if (count <= 0) 1478 if (count <= 0)
1406 return; 1479 return;
1407 1480
1481 scr_do_wrap ();
1482
1408 selection_check (1); 1483 selection_check (1);
1409 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1484 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1410 1485
1411 row = screen.cur.row + TermWin.saveLines; 1486 row = screen.cur.row + TermWin.saveLines;
1412 screen.flags &= ~Screen_WrapNext;
1413 1487
1414 stp = screen.text[row]; 1488 stp = screen.text[row];
1415 srp = screen.rend[row]; 1489 srp = screen.rend[row];
1416 slp = & (screen.tlen[row]); 1490 slp = &screen.tlen[row];
1417 1491
1418 switch (insdel) 1492 switch (insdel)
1419 { 1493 {
1420 case INSERT: 1494 case INSERT:
1421 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1422 col--)
1423 { 1496 {
1424 stp[col] = stp[col - count]; 1497 stp[col] = stp[col - count];
1425 srp[col] = srp[col - count]; 1498 srp[col] = srp[col - count];
1426 } 1499 }
1427 1500
… …
1437 if (selection.end.row != screen.cur.row 1510 if (selection.end.row != screen.cur.row
1438 || (selection.end.col + count >= TermWin.ncol)) 1511 || (selection.end.col + count >= TermWin.ncol))
1439 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1440 else 1513 else
1441 { /* shift selection */ 1514 { /* shift selection */
1442 selection.beg.col += count; 1515 selection.beg.col += count;
1443 selection.mark.col += count; /* XXX: yes? */ 1516 selection.mark.col += count; /* XXX: yes? */
1444 selection.end.col += count; 1517 selection.end.col += count;
1445 } 1518 }
1446 } 1519 }
1447 1520
1448 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1449 (unsigned int)count, rstyle); 1522 (unsigned int)count, rstyle);
1450 break; 1523 break;
1451 1524
1452 case ERASE: 1525 case ERASE:
1453 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1454 selection_check (1); 1527 selection_check (1);
1455 screen.cur.col -= count; 1528 screen.cur.col -= count;
1456 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1457 (unsigned int)count, rstyle); 1530 (unsigned int)count, rstyle);
1458 break; 1531 break;
1459 1532
1460 case DELETE: 1533 case DELETE:
1461 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1464 { 1537 {
1465 stp[col] = stp[col + count]; 1538 stp[col] = stp[col + count];
1466 srp[col] = srp[col + count]; 1539 srp[col] = srp[col + count];
1467 } 1540 }
1468 1541
1469 scr_blank_line (& (stp[TermWin.ncol - count]), 1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1470 & (srp[TermWin.ncol - count]),
1471 (unsigned int)count, tr); 1543 (unsigned int)count, tr);
1472 1544
1473 if (*slp == -1) /* break line continuation */ 1545 if (*slp == -1) /* break line continuation */
1474 *slp = TermWin.ncol; 1546 *slp = TermWin.ncol;
1475 1547
… …
1484 || selection.end.col >= TermWin.ncol) 1556 || selection.end.col >= TermWin.ncol)
1485 CLEAR_SELECTION (); 1557 CLEAR_SELECTION ();
1486 else 1558 else
1487 { 1559 {
1488 /* shift selection */ 1560 /* shift selection */
1489 selection.beg.col -= count; 1561 selection.beg.col -= count;
1490 selection.mark.col -= count; /* XXX: yes? */ 1562 selection.mark.col -= count; /* XXX: yes? */
1491 selection.end.col -= count; 1563 selection.end.col -= count;
1492 } 1564 }
1493 } 1565 }
1494 1566
1495 break; 1567 break;
1496 } 1568 }
… …
1542rxvt_term::scr_autowrap (int mode) 1614rxvt_term::scr_autowrap (int mode)
1543{ 1615{
1544 if (mode) 1616 if (mode)
1545 screen.flags |= Screen_Autowrap; 1617 screen.flags |= Screen_Autowrap;
1546 else 1618 else
1547 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1619 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1548} 1620}
1549 1621
1550/* ------------------------------------------------------------------------- */ 1622/* ------------------------------------------------------------------------- */
1551/* 1623/*
1552 * Set/unset margin origin mode 1624 * Set/unset margin origin mode
… …
1562{ 1634{
1563 if (mode) 1635 if (mode)
1564 screen.flags |= Screen_Relative; 1636 screen.flags |= Screen_Relative;
1565 else 1637 else
1566 screen.flags &= ~Screen_Relative; 1638 screen.flags &= ~Screen_Relative;
1639
1567 scr_gotorc (0, 0, 0); 1640 scr_gotorc (0, 0, 0);
1568} 1641}
1569 1642
1570/* ------------------------------------------------------------------------- */ 1643/* ------------------------------------------------------------------------- */
1571/* 1644/*
… …
1591 */ 1664 */
1592void 1665void
1593rxvt_term::scr_set_tab (int mode) 1666rxvt_term::scr_set_tab (int mode)
1594{ 1667{
1595 if (mode < 0) 1668 if (mode < 0)
1596 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1669 memset (tabs, 0, TermWin.ncol * sizeof (char));
1597 else if (screen.cur.col < TermWin.ncol) 1670 else if (screen.cur.col < TermWin.ncol)
1598 tabs[screen.cur.col] = (mode ? 1 : 0); 1671 tabs[screen.cur.col] = (mode ? 1 : 0);
1599} 1672}
1600 1673
1601/* ------------------------------------------------------------------------- */ 1674/* ------------------------------------------------------------------------- */
… …
1605 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1678 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1606 */ 1679 */
1607void 1680void
1608rxvt_term::scr_rvideo_mode (int mode) 1681rxvt_term::scr_rvideo_mode (int mode)
1609{ 1682{
1610 XGCValues gcvalue; 1683 XGCValues gcvalue;
1611 1684
1612 if (rvideo != mode) 1685 if (rvideo != mode)
1613 { 1686 {
1614 rvideo = mode; 1687 rvideo = mode;
1615 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1616#if defined(XPM_BACKGROUND) 1689#if XPM_BACKGROUND
1617 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1618#endif 1691#endif
1619#if defined(TRANSPARENT) 1692#if TRANSPARENT
1620 if (! (Options & Opt_transparent) || am_transparent == 0) 1693 if (! (options & Opt_transparent) || am_transparent == 0)
1621#endif 1694#endif
1622 XSetWindowBackground (display->display, TermWin.vt, 1695 XSetWindowBackground (display->display, TermWin.vt,
1623 PixColors[Color_bg]); 1696 pix_colors[Color_bg]);
1624 1697
1625 gcvalue.foreground = PixColors[Color_fg]; 1698 gcvalue.foreground = pix_colors[Color_fg];
1626 gcvalue.background = PixColors[Color_bg]; 1699 gcvalue.background = pix_colors[Color_bg];
1627 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1628 &gcvalue); 1701 &gcvalue);
1629 scr_clear (); 1702 scr_clear ();
1630 scr_touch (true); 1703 scr_touch (true);
1631 } 1704 }
… …
1679 * XTERM_SEQ: Invoke G2 character set: ESC N 1752 * XTERM_SEQ: Invoke G2 character set: ESC N
1680 * XTERM_SEQ: Invoke G3 character set: ESC O 1753 * XTERM_SEQ: Invoke G3 character set: ESC O
1681 */ 1754 */
1682void 1755void
1683rxvt_term::scr_charset_choose (int set) 1756rxvt_term::scr_charset_choose (int set)
1684 { 1757{
1685 screen.charset = set; 1758 screen.charset = set;
1686 set_font_style (); 1759 set_font_style ();
1687 } 1760}
1688 1761
1689/* ------------------------------------------------------------------------- */ 1762/* ------------------------------------------------------------------------- */
1690/* 1763/*
1691 * Set a font 1764 * Set a font
1692 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1765 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1695 * XTERM_SEQ: Set G3 character set: ESC + <C> 1768 * XTERM_SEQ: Set G3 character set: ESC + <C>
1696 * See set_font_style for possible values for <C> 1769 * See set_font_style for possible values for <C>
1697 */ 1770 */
1698void 1771void
1699rxvt_term::scr_charset_set (int set, unsigned int ch) 1772rxvt_term::scr_charset_set (int set, unsigned int ch)
1700 { 1773{
1701 charsets[set] = (unsigned char)ch; 1774 charsets[set] = (unsigned char)ch;
1702 set_font_style (); 1775 set_font_style ();
1703 } 1776}
1704 1777
1705 1778
1706/* ------------------------------------------------------------------------- * 1779/* ------------------------------------------------------------------------- *
1707 * MAJOR SCREEN MANIPULATION * 1780 * MAJOR SCREEN MANIPULATION *
1708 * ------------------------------------------------------------------------- */ 1781 * ------------------------------------------------------------------------- */
… …
1747 row_col_t rc[RC_COUNT]; 1820 row_col_t rc[RC_COUNT];
1748 1821
1749 if (drawn_text == NULL) /* sanity check */ 1822 if (drawn_text == NULL) /* sanity check */
1750 return; 1823 return;
1751 1824
1825#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 {
1828 y = 0;
1829 height = TermWin.height;
1830 }
1831#endif
1832
1752#ifdef DEBUG_STRICT 1833#ifdef DEBUG_STRICT
1753 x = max (x, 0); 1834 x = max (x, 0);
1754 x = min (x, (int)TermWin.width); 1835 x = min (x, (int)TermWin.width);
1755 y = max (y, 0); 1836 y = max (y, 0);
1756 y = min (y, (int)TermWin.height); 1837 y = min (y, (int)TermWin.height);
… …
1768 { 1849 {
1769 MIN_IT (rc[i].col, TermWin.ncol - 1); 1850 MIN_IT (rc[i].col, TermWin.ncol - 1);
1770 MIN_IT (rc[i].row, TermWin.nrow - 1); 1851 MIN_IT (rc[i].row, TermWin.nrow - 1);
1771 } 1852 }
1772 1853
1773 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));
1774
1775 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1776 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1855 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1777 1856
1778 if (refresh) 1857 if (refresh)
1779 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1858 scr_refresh (SLOW_REFRESH);
1780} 1859}
1781 1860
1782/* ------------------------------------------------------------------------- */ 1861/* ------------------------------------------------------------------------- */
1783/* 1862/*
1784 * Refresh the entire screen 1863 * Refresh the entire screen
… …
1796 */ 1875 */
1797int 1876int
1798rxvt_term::scr_move_to (int y, int len) 1877rxvt_term::scr_move_to (int y, int len)
1799{ 1878{
1800 long p = 0; 1879 long p = 0;
1801 uint16_t oldviewstart; 1880 unsigned int oldviewstart;
1802 1881
1803 oldviewstart = TermWin.view_start; 1882 oldviewstart = TermWin.view_start;
1883
1804 if (y < len) 1884 if (y < len)
1805 { 1885 {
1806 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1807 p -= (long) (TermWin.nrow - 1); 1887 p -= (long) (TermWin.nrow - 1);
1808 p = max (p, 0); 1888 p = max (p, 0);
1809 } 1889 }
1890
1810 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1811 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1812 1892
1813 return scr_changeview (oldviewstart); 1893 return scr_changeview (oldviewstart);
1814} 1894}
1815 1895
1816/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
… …
1819 * direction should be UP or DN 1899 * direction should be UP or DN
1820 */ 1900 */
1821int 1901int
1822rxvt_term::scr_page (enum page_dirn direction, int nlines) 1902rxvt_term::scr_page (enum page_dirn direction, int nlines)
1823{ 1903{
1824 int n; 1904 int n;
1825 uint16_t oldviewstart; 1905 unsigned int oldviewstart;
1826 1906
1827 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1828#ifdef DEBUG_STRICT 1907#ifdef DEBUG_STRICT
1829 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1830#endif 1909#endif
1831 oldviewstart = TermWin.view_start; 1910 oldviewstart = TermWin.view_start;
1832 if (direction == UP) 1911 if (direction == UP)
… …
1841 } 1920 }
1842 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1843} 1922}
1844 1923
1845int 1924int
1846rxvt_term::scr_changeview (uint16_t oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
1847{ 1926{
1848 if (TermWin.view_start != oldviewstart) 1927 if (TermWin.view_start != oldviewstart)
1849 { 1928 {
1850 want_refresh = 1; 1929 want_refresh = 1;
1851 num_scr -= (TermWin.view_start - oldviewstart); 1930 num_scr -= (TermWin.view_start - oldviewstart);
… …
1859rxvt_term::scr_bell () 1938rxvt_term::scr_bell ()
1860{ 1939{
1861#ifndef NO_BELL 1940#ifndef NO_BELL
1862# ifndef NO_MAPALERT 1941# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1942# ifdef MAPALERT_OPTION
1864 if (Options & Opt_mapAlert) 1943 if (options & Opt_mapAlert)
1865# endif 1944# endif
1866 XMapWindow (display->display, TermWin.parent[0]); 1945 XMapWindow (display->display, TermWin.parent[0]);
1867# endif 1946# endif
1868 if (Options & Opt_visualBell) 1947 if (options & Opt_visualBell)
1869 { 1948 {
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1950 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 } 1951 }
1873 else 1952 else
… …
1879/* ARGSUSED */ 1958/* ARGSUSED */
1880void 1959void
1881rxvt_term::scr_printscreen (int fullhist) 1960rxvt_term::scr_printscreen (int fullhist)
1882{ 1961{
1883#ifdef PRINTPIPE 1962#ifdef PRINTPIPE
1884 int i, r1, nrows, row_offset; 1963 int i, r1, nrows, row_offset;
1885 text_t *t; 1964 FILE *fd;
1886 FILE *fd;
1887 1965
1888 if ((fd = popen_printer ()) == NULL) 1966 if ((fd = popen_printer ()) == NULL)
1889 return; 1967 return;
1968
1890 nrows = TermWin.nrow; 1969 nrows = TermWin.nrow;
1891 row_offset = TermWin.saveLines; 1970 row_offset = TermWin.saveLines;
1971
1892 if (!fullhist) 1972 if (!fullhist)
1893 row_offset -= TermWin.view_start; 1973 row_offset -= TermWin.view_start;
1894 else 1974 else
1895 { 1975 {
1896 nrows += TermWin.nscrolled; 1976 nrows += TermWin.nscrolled;
1897 row_offset -= TermWin.nscrolled; 1977 row_offset -= TermWin.nscrolled;
1898 } 1978 }
1899 1979
1980 wctomb (0, 0);
1981
1900 for (r1 = 0; r1 < nrows; r1++) 1982 for (r1 = 0; r1 < nrows; r1++)
1901 { 1983 {
1902 t = screen.text[r1 + row_offset]; 1984 text_t *tp = screen.text[r1 + row_offset];
1903 for (i = TermWin.ncol - 1; i >= 0; i--) 1985 int len = screen.tlen[r1 + row_offset];
1904 if (!isspace (t[i])) 1986
1905 break; 1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1906 fprintf (fd, "%.*s\n", (i + 1), t); 1988 {
1989 char mb[MB_LEN_MAX];
1990 text_t t = *tp++;
1991 if (t == NOCHAR)
1992 continue;
1993
1994 len = wctomb (mb, t);
1995
1996 if (len <= 0)
1997 {
1998 mb[0] = ' ';
1999 len = 1;
2000 }
2001
2002 fwrite (mb, 1, len, fd);
2003 }
2004
2005 fputc ('\n', fd);
1907 } 2006 }
2007
1908 pclose_printer (fd); 2008 pclose_printer (fd);
1909#endif 2009#endif
1910} 2010}
1911 2011
1912/* ------------------------------------------------------------------------- */ 2012/* ------------------------------------------------------------------------- */
… …
1926 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1927 2027
1928void 2028void
1929rxvt_term::scr_refresh (unsigned char refresh_type) 2029rxvt_term::scr_refresh (unsigned char refresh_type)
1930{ 2030{
1931 unsigned char clearfirst, /* first character writes before cell */
1932 clearlast, /* last character writes beyond cell */
1933 must_clear, /* use draw_string not draw_image_string */ 2031 unsigned char must_clear, /* use draw_string not draw_image_string */
1934 rvid, /* reverse video this position */
1935 showcursor; /* show the cursor */ 2032 showcursor; /* show the cursor */
1936 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
1937 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
1938 int i, /* tmp */ 2035 int i, /* tmp */
1939 row_offset; /* basic offset in screen structure */ 2036 row_offset; /* basic offset in screen structure */
1940#ifndef NO_CURSORCOLOR 2037#ifndef NO_CURSORCOLOR
1941 rend_t cc1; /* store colours at cursor position (s) */ 2038 rend_t cc1; /* store colours at cursor position (s) */
1942#endif 2039#endif
1943 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2040 rend_t *crp; // cursor rendition pointer
1944 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2041
2042 want_refresh = 0; /* screen is current */
1945 2043
1946 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2044 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1947 return; 2045 return;
1948 2046
1949 /* 2047 /*
1950 * A: set up vars 2048 * A: set up vars
1951 */ 2049 */
1952 clearfirst = clearlast = must_clear = 0; 2050 must_clear = 0;
1953
1954 refresh_count = 0; 2051 refresh_count = 0;
1955 2052
1956 row_offset = TermWin.saveLines - TermWin.view_start; 2053 row_offset = TermWin.saveLines - TermWin.view_start;
1957 2054
1958 if ((refresh_type & REFRESH_BOUNDS))
1959 {
1960 clearfirst = clearlast = 1;
1961 refresh_type &= ~REFRESH_BOUNDS;
1962 }
1963
1964#ifdef XPM_BACKGROUND 2055#if XPM_BACKGROUND
1965 must_clear |= (bgPixmap.pixmap != None); 2056 must_clear |= (bgPixmap.pixmap != None);
1966#endif 2057#endif
1967#ifdef TRANSPARENT 2058#if TRANSPARENT
1968 must_clear |= ((Options & Opt_transparent) && am_transparent); 2059 must_clear |= ((options & Opt_transparent) && am_transparent);
1969#endif 2060#endif
1970 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1971 2062
1972 /* 2063 /*
1973 * B: reverse any characters which are selected 2064 * B: reverse any characters which are selected
… …
1988 showcursor = 0; 2079 showcursor = 0;
1989#endif 2080#endif
1990 2081
1991 if (showcursor) 2082 if (showcursor)
1992 { 2083 {
2084 int col = screen.cur.col;
2085
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2087 col--;
2088
1993 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1994 2090
1995 if (showcursor && TermWin.focus) 2091 if (showcursor && TermWin.focus)
1996 { 2092 {
1997 *srp ^= RS_RVid; 2093 *crp ^= RS_RVid;
1998#ifndef NO_CURSORCOLOR 2094#ifndef NO_CURSORCOLOR
1999 cc1 = *srp & (RS_fgMask | RS_bgMask); 2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2000 if (ISSET_PIXCOLOR (Color_cursor)) 2096 if (ISSET_PIXCOLOR (Color_cursor))
2001 ccol1 = Color_cursor; 2097 ccol1 = Color_cursor;
2002 else 2098 else
2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2004 ccol1 = GET_FGCOLOR (rstyle); 2100 ccol1 = GET_FGCOLOR (rstyle);
… …
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol2 = GET_BGCOLOR (rstyle); 2108 ccol2 = GET_BGCOLOR (rstyle);
2013#else 2109#else
2014 ccol2 = Color_bg; 2110 ccol2 = Color_bg;
2015#endif 2111#endif
2016 *srp = SET_FGCOLOR (*srp, ccol1); 2112 *crp = SET_FGCOLOR (*crp, ccol1);
2017 *srp = SET_BGCOLOR (*srp, ccol2); 2113 *crp = SET_BGCOLOR (*crp, ccol2);
2018#endif 2114#endif
2019 } 2115 }
2020 } 2116 }
2021 2117
2022 /* make sure no outline cursor is left around */ 2118 /* make sure no outline cursor is left around */
… …
2049 oldcursor.col = screen.cur.col; 2145 oldcursor.col = screen.cur.col;
2050 } 2146 }
2051 } 2147 }
2052 } 2148 }
2053 2149
2150#if ENABLE_OVERLAY
2151 scr_swap_overlay ();
2152#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156
2054#ifndef NO_SLOW_LINK_SUPPORT 2157#ifndef NO_SLOW_LINK_SUPPORT
2055 /* 2158 /*
2056 * D: CopyArea pass - very useful for slower links 2159 * D: CopyArea pass - very useful for slower links
2057 * This has been deliberately kept simple. 2160 * This has been deliberately kept simple.
2058 */ 2161 */
2059 i = num_scr; 2162 i = num_scr;
2163 if (!display->is_local
2060 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2164 && refresh_type == FAST_REFRESH && num_scr_allow && i
2061 && abs (i) < TermWin.nrow && !must_clear) 2165 && abs (i) < TermWin.nrow && !must_clear)
2062 { 2166 {
2063 int16_t nits; 2167 int16_t nits;
2064 int j; 2168 int j;
2065 rend_t *drp2;
2066 text_t *dtp2;
2067 int len, wlen; 2169 int len, wlen;
2068 2170
2069 j = TermWin.nrow; 2171 j = TermWin.nrow;
2070 wlen = len = -1; 2172 wlen = len = -1;
2071 row = i > 0 ? 0 : j - 1; 2173 row = i > 0 ? 0 : j - 1;
2072 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2073 { 2175 {
2074 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2075 { 2177 {
2076 stp = screen.text[row + row_offset]; 2178 text_t *stp = screen.text[row + row_offset];
2077 srp = screen.rend[row + row_offset]; 2179 rend_t *srp = screen.rend[row + row_offset];
2078 dtp = drawn_text[row]; 2180 text_t *dtp = drawn_text[row];
2079 dtp2 = drawn_text[row + i]; 2181 text_t *dtp2 = drawn_text[row + i];
2080 drp = drawn_rend[row]; 2182 rend_t *drp = drawn_rend[row];
2081 drp2 = drawn_rend[row + i]; 2183 rend_t *drp2 = drawn_rend[row + i];
2082 2184
2083 for (nits = 0, col = TermWin.ncol; col--; ) 2185 for (nits = 0, col = TermWin.ncol; col--; )
2084 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2085 nits--; 2187 nits--;
2086 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2188 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2106 { 2208 {
2107 /* also comes here at end if needed because of >= above */ 2209 /* also comes here at end if needed because of >= above */
2108 if (wlen < len) 2210 if (wlen < len)
2109 SWAP_IT (wlen, len, int); 2211 SWAP_IT (wlen, len, int);
2110 2212
2111 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2112 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2213 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2113 TermWin.gc, 0, Row2Pixel (len + i), 2214 TermWin.gc, 0, Row2Pixel (len + i),
2114 (unsigned int)TermWin_TotalWidth (), 2215 (unsigned int)TermWin_TotalWidth (),
2115 (unsigned int)Height2Pixel (wlen - len + 1), 2216 (unsigned int)Height2Pixel (wlen - len + 1),
2116 0, Row2Pixel (len)); 2217 0, Row2Pixel (len));
… …
2123 /* 2224 /*
2124 * E: main pass across every character 2225 * E: main pass across every character
2125 */ 2226 */
2126 for (row = 0; row < TermWin.nrow; row++) 2227 for (row = 0; row < TermWin.nrow; row++)
2127 { 2228 {
2128 stp = screen.text[row + row_offset]; 2229 text_t *stp = screen.text[row + row_offset];
2129 srp = screen.rend[row + row_offset]; 2230 rend_t *srp = screen.rend[row + row_offset];
2130 dtp = drawn_text[row]; 2231 text_t *dtp = drawn_text[row];
2131 drp = drawn_rend[row]; 2232 rend_t *drp = drawn_rend[row];
2132 2233
2133 /* 2234 /*
2134 * E2: OK, now the real pass 2235 * E2: OK, now the real pass
2135 */ 2236 */
2136 int ypixel = (int)Row2Pixel (row); 2237 int ypixel = (int)Row2Pixel (row);
2137 2238
2138 for (col = 0; col < TermWin.ncol; col++) 2239 for (col = 0; col < TermWin.ncol; col++)
2139 { 2240 {
2140 /* compare new text with old - if exactly the same then continue */ 2241 /* compare new text with old - if exactly the same then continue */
2141 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2242 if (stp[col] == dtp[col] /* Must match characters to skip. */
2142 && (srp[col] == drp[col] /* Either rendition the same or */ 2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2143 || (stp[col] == ' ' /* space w/ no background change */ 2244 || (stp[col] == ' ' /* space w/ no background change */
2144 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2145 continue; 2246 continue;
2146 2247
2147 // redraw one or more characters 2248 // redraw one or more characters
2148 2249
2149 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2150 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2151 --col; 2252 --col;
2152 2253
2153 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2154 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2157 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2158 drp[col] = rend; 2259 drp[col] = rend;
2159 2260
2160 int xpixel = Col2Pixel (col); 2261 int xpixel = Col2Pixel (col);
2161 2262
2162 // this loop looks very messy, it can probably be optimized
2163 // and cleaned a bit by you?
2164 for (i = 0; ++col < TermWin.ncol; ) 2263 for (i = 0; ++col < TermWin.ncol; )
2165 { 2264 {
2166 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2167 { 2266 {
2168 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2169 drp[col] = rend; 2268 drp[col] = rend;
2170 count++; 2269 count++;
2171
2172 if (i) // only possible skip if char unchanged
2173 i++; 2270 i++;
2174 2271
2175 continue; 2272 continue;
2176 } 2273 }
2177 2274
2178 if (rend != srp[col]) 2275 if (!RS_SAME (rend, srp[col]))
2179 break; 2276 break;
2180 2277
2181 count++; 2278 count++;
2182 2279
2183 if (stp[col] != dtp[col] 2280 if (stp[col] != dtp[col]
2184 || srp[col] != drp[col]) 2281 || !RS_SAME (srp[col], drp[col]))
2185 { 2282 {
2186 if (must_clear && (i++ > (count / 2))) 2283 if (must_clear && (i++ > count / 2))
2187 break; 2284 break;
2188 2285
2189 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2190 drp[col] = rend; 2287 drp[col] = rend;
2191 i = 0; 2288 i = 0;
2192 } 2289 }
2193 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2290 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2194 break; 2291 break;
2195 } 2292 }
2196 2293
2197 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2198 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2296
2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR)
2299 count++, i--;
2300
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2199 2312
2200 /* 2313 /*
2201 * Determine the attributes for the string 2314 * Determine the attributes for the string
2202 */ 2315 */
2203 int fid = GET_FONT (rend);
2204 int fore = GET_FGCOLOR (rend); // desired foreground 2316 int fore = GET_FGCOLOR (rend); // desired foreground
2205 int back = GET_BGCOLOR (rend); // desired background 2317 int back = GET_BGCOLOR (rend); // desired background
2206 2318
2207 rend = GET_ATTR (rend); 2319 // only do special processing if ana attributes are set, which is rare
2208 2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2209 rvid = !!(rend & RS_RVid); 2321 {
2322 bool invert = rend & RS_RVid;
2210 2323
2211#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2212 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2325 if (rend & RS_Bold
2326 && fore == Color_fg)
2213 { 2327 {
2214 if (ISSET_PIXCOLOR (Color_BD)) 2328 if (ISSET_PIXCOLOR (Color_BD))
2215 fore = Color_BD; 2329 fore = Color_BD;
2330# if !ENABLE_STYLES
2216 else 2331 else
2217 rvid = !rvid; 2332 invert = !invert;
2333# endif
2334 }
2335
2336 if (rend & RS_Italic
2337 && fore == Color_fg)
2338 {
2339 if (ISSET_PIXCOLOR (Color_IT))
2340 fore = Color_IT;
2341# if !ENABLE_STYLES
2342 else
2343 invert = !invert;
2344# endif
2345 }
2346
2347 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2348 fore = Color_UL;
2349#endif
2350
2351 if (invert)
2352 {
2353 SWAP_IT (fore, back, int);
2354
2355#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV;
2358#endif
2359 }
2360
2361#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2363 {
2364 if (!text_blink_ev.active)
2365 {
2366 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2367 hidden_text = 0;
2368 }
2369 else if (hidden_text)
2370 fore = back;
2371 }
2372#endif
2218 } 2373 }
2219
2220 if (rend & RS_Uline)
2221 if (ISSET_PIXCOLOR (Color_UL))
2222 fore = Color_UL;
2223#endif
2224
2225 if (rvid)
2226 {
2227 SWAP_IT (fore, back, int);
2228
2229#ifndef NO_BOLD_UNDERLINE_REVERSE
2230 if (ISSET_PIXCOLOR (Color_RV)
2231# ifndef NO_CURSORCOLOR
2232 && !ISSET_PIXCOLOR (Color_cursor)
2233# endif
2234 )
2235 back = Color_RV;
2236#endif
2237 }
2238
2239#ifdef TEXT_BLINK
2240 if (rend & RS_Blink && back == Color_bg)
2241 {
2242 if (!text_blink_ev.active)
2243 {
2244 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2245 hidden_text = 0;
2246 }
2247 else if (hidden_text)
2248 fore = back;
2249 }
2250#endif
2251 2374
2252 /* 2375 /*
2253 * Actually do the drawing of the string here 2376 * Actually do the drawing of the string here
2254 */ 2377 */
2255 rxvt_font *font = (*TermWin.fontset)[fid]; 2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2256 2379
2257 if (back == fore) 2380 if (back == fore)
2258 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2259 TermWin.fwidth * count, TermWin.fheight, 2382 TermWin.fwidth * count, TermWin.fheight,
2260 back); 2383 back);
… …
2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2276 } 2399 }
2277 else 2400 else
2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2279 2402
2280 if ((rend & RS_Uline) && (font->descent > 1)) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405#if ENABLE_FRILLS
2406 if (ISSET_PIXCOLOR (Color_underline))
2407 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2408 else
2409#endif
2410 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2411
2281 XDrawLine (display->display, drawBuffer, TermWin.gc, 2412 XDrawLine (display->display, drawBuffer, TermWin.gc,
2282 xpixel, ypixel + font->ascent + 1, 2413 xpixel, ypixel + font->ascent + 1,
2283 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2414 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2415 }
2284 } /* for (col....) */ 2416 } /* for (col....) */
2285 } /* for (row....) */ 2417 } /* for (row....) */
2418
2419#if ENABLE_OVERLAY
2420 scr_swap_overlay ();
2421#endif
2286 2422
2287 /* 2423 /*
2288 * G: cleanup cursor and display outline cursor if necessary 2424 * G: cleanup cursor and display outline cursor if necessary
2289 */ 2425 */
2290 if (showcursor) 2426 if (showcursor)
2291 { 2427 {
2292 if (TermWin.focus) 2428 if (TermWin.focus)
2293 { 2429 {
2294 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2295 [screen.cur.col]);
2296 *srp ^= RS_RVid; 2430 *crp ^= RS_RVid;
2297#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2298 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2299#endif 2433#endif
2300 } 2434 }
2301 else if (oldcursor.row >= 0) 2435 else if (oldcursor.row >= 0)
2302 { 2436 {
2303#ifndef NO_CURSORCOLOR 2437#ifndef NO_CURSORCOLOR
2304 if (ISSET_PIXCOLOR (Color_cursor)) 2438 if (ISSET_PIXCOLOR (Color_cursor))
2305 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2439 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2306#endif 2440#endif
2307 int cursorwidth = 1; 2441 int cursorwidth = 1;
2308 while (oldcursor.col + cursorwidth < TermWin.ncol 2442 while (oldcursor.col + cursorwidth < TermWin.ncol
2309 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2443 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2310 cursorwidth++; 2444 cursorwidth++;
… …
2320 /* 2454 /*
2321 * H: cleanup selection 2455 * H: cleanup selection
2322 */ 2456 */
2323 scr_reverse_selection (); 2457 scr_reverse_selection ();
2324 2458
2325 /*
2326 * I: other general cleanup
2327 */
2328#if 0
2329 if (clearfirst && TermWin.int_bwidth)
2330 /*
2331 * clear the whole screen height, note that width == 0 is treated
2332 * specially by XClearArea
2333 */
2334 XClearArea (display->display, TermWin.vt, 0, 0,
2335 (unsigned int)TermWin.int_bwidth,
2336 (unsigned int)TermWin_TotalHeight (), False);
2337
2338 if (clearlast && TermWin.int_bwidth)
2339 /*
2340 * clear the whole screen height, note that width == 0 is treated
2341 * specially by XClearArea
2342 */
2343 XClearArea (display->display, TermWin.vt,
2344 TermWin.width + TermWin.int_bwidth, 0,
2345 (unsigned int)TermWin.int_bwidth,
2346 (unsigned int)TermWin_TotalHeight (), False);
2347#endif
2348
2349 if (refresh_type & SMOOTH_REFRESH) 2459 if (refresh_type & SMOOTH_REFRESH)
2350 XSync (display->display, False); 2460 XFlush (display->display);
2351 2461
2352 num_scr = 0; 2462 num_scr = 0;
2353 num_scr_allow = 1; 2463 num_scr_allow = 1;
2354 want_refresh = 0; /* screen is current */
2355} 2464}
2356 2465
2357void 2466void
2358rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2467rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2359{ 2468{
2360 if (!rp || !tp) 2469 if (!rp || !tp)
2361 return; 2470 return;
2362 2471
2363 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2472 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2364 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2473 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2365} 2474}
2366 2475
2367void 2476void
2368rxvt_term::scr_remap_chars () 2477rxvt_term::scr_remap_chars ()
2369{ 2478{
… …
2375 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2484 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2376 scr_remap_chars (swap.text[i], swap.rend[i]); 2485 scr_remap_chars (swap.text[i], swap.rend[i]);
2377 } 2486 }
2378} 2487}
2379 2488
2489void
2490rxvt_term::scr_recolour ()
2491{
2492 if (1
2493#if TRANSPARENT
2494 && !am_transparent
2495#endif
2496#if XPM_BACKGROUND
2497 && !bgPixmap.pixmap
2498#endif
2499 )
2500 {
2501 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2502 XClearWindow (display->display, TermWin.parent[0]);
2503 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2504#if HAVE_SCROLLBARS
2505 if (scrollBar.win)
2506 {
2507 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2508 scrollBar.setIdle ();
2509 scrollbar_show (0);
2510 }
2511#endif
2512 }
2513
2514 scr_clear ();
2515 scr_touch (true);
2516 want_refresh = 1;
2517}
2518
2380/* ------------------------------------------------------------------------- */ 2519/* ------------------------------------------------------------------------- */
2381void 2520void
2382rxvt_term::scr_clear (bool really) 2521rxvt_term::scr_clear (bool really)
2383{ 2522{
2384 if (!TermWin.mapped) 2523 if (!TermWin.mapped)
2385 return; 2524 return;
2386 2525
2387 num_scr_allow = 0; 2526 num_scr_allow = 0;
2388 want_refresh = 1; 2527 want_refresh = 1;
2389 2528
2390#ifdef TRANSPARENT 2529#if TRANSPARENT
2391 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2530 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2392 { 2531 {
2393 int i; 2532 int i;
2394 2533
2395 if (! (Options & Opt_transparent_all)) 2534 if (!(options & Opt_transparent_all))
2396 i = 0; 2535 i = 0;
2397 else 2536 else
2398 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2537 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2399 2538
2400 while (i--) 2539 while (i--)
… …
2416 int end_row = TermWin.saveLines - TermWin.view_start; 2555 int end_row = TermWin.saveLines - TermWin.view_start;
2417 int i = selection.beg.row + TermWin.saveLines; 2556 int i = selection.beg.row + TermWin.saveLines;
2418 int col, row = selection.end.row + TermWin.saveLines; 2557 int col, row = selection.end.row + TermWin.saveLines;
2419 rend_t *srp; 2558 rend_t *srp;
2420 2559
2421 if (i >= end_row) 2560#if ENABLE_FRILLS
2422 col = selection.beg.col; 2561 if (selection.rect)
2562 {
2563 end_row += TermWin.nrow;
2564
2565 for (; i <= row && i <= end_row; i++)
2566 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2567 srp[col] ^= RS_RVid;
2568 }
2423 else 2569 else
2570#endif
2571 {
2572 if (i >= end_row)
2573 col = selection.beg.col;
2574 else
2424 { 2575 {
2425 col = 0; 2576 col = 0;
2426 i = end_row; 2577 i = end_row;
2427 } 2578 }
2428 2579
2429 end_row += TermWin.nrow; 2580 end_row += TermWin.nrow;
2581
2430 for (; i < row && i < end_row; i++, col = 0) 2582 for (; i < row && i < end_row; i++, col = 0)
2431 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2583 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2432 srp[col] ^= RS_RVid; 2584 srp[col] ^= RS_RVid;
2433 2585
2434 if (i == row && i < end_row) 2586 if (i == row && i < end_row)
2435 for (srp = screen.rend[i]; col < selection.end.col; col++) 2587 for (srp = screen.rend[i]; col < selection.end.col; col++)
2436 srp[col] ^= RS_RVid; 2588 srp[col] ^= RS_RVid;
2589 }
2437 } 2590 }
2438} 2591}
2439 2592
2440/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2441/* 2594/*
… …
2477 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2630 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2478 */ 2631 */
2479void 2632void
2480rxvt_term::selection_check (int check_more) 2633rxvt_term::selection_check (int check_more)
2481{ 2634{
2482 row_col_t pos; 2635 row_col_t pos;
2483 2636
2484 if (!selection.op) 2637 if (!selection.op)
2485 return; 2638 return;
2486 2639
2487 pos.row = pos.col = 0; 2640 pos.row = pos.col = 0;
… …
2509/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2510/* 2663/*
2511 * Paste a selection direct to the command fd 2664 * Paste a selection direct to the command fd
2512 */ 2665 */
2513void 2666void
2514rxvt_term::paste (const unsigned char *data, unsigned int len) 2667rxvt_term::paste (unsigned char *data, unsigned int len)
2515{ 2668{
2516 unsigned int i, j, n;
2517 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2518
2519#if 0
2520 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2521 ZERO_SCROLLBACK (r);
2522#endif
2523
2524 /* convert normal newline chars into common keyboard Return key sequence */ 2669 /* convert normal newline chars into common keyboard Return key sequence */
2525 for (i = 0; i < len; i += PROP_SIZE) 2670 for (unsigned int i = 0; i < len; i++)
2526 {
2527 n = min (len - i, PROP_SIZE);
2528 MEMCPY (ds, data + i, n);
2529
2530 for (j = 0; j < n; j++)
2531 if (ds[j] == C0_LF) 2671 if (data[i] == C0_LF)
2532 ds[j] = C0_CR; 2672 data[i] = C0_CR;
2533 2673
2534 tt_write (ds, (int)n); 2674 tt_write (data, len);
2535 }
2536
2537 free (ds);
2538} 2675}
2539 2676
2540/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2541/* 2678/*
2542 * Respond to a notification that a primary selection has been sent 2679 * Respond to a notification that a primary selection has been sent
2543 * EXT: SelectionNotify 2680 * EXT: SelectionNotify
2544 */ 2681 */
2545int 2682void
2546rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2683rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2547{ 2684{
2548 long nread = 0;
2549 unsigned long bytes_after;
2550 XTextProperty ct;
2551
2552 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2553
2554 if (prop == None) /* check for failed XConvertSelection */ 2685 if (prop == None) /* check for failed XConvertSelection */
2555 { 2686 {
2556 if ((selection_type & Sel_CompoundText)) 2687 if ((selection_type & Sel_CompoundText))
2557 { 2688 {
2558 int selnum = selection_type & Sel_whereMask; 2689 int selnum = selection_type & Sel_whereMask;
… …
2571 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2702 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2572 else 2703 else
2573 selection_type = 0; 2704 selection_type = 0;
2574 } 2705 }
2575 2706
2576 return 0; 2707 return;
2577 }
2578
2579 for (;;)
2580 { 2708 }
2709
2710 unsigned long bytes_after;
2711 XTextProperty ct;
2712
2713 if (XGetWindowProperty (display->display, win, prop,
2714 0, PROP_SIZE / 4,
2715 delete_prop, AnyPropertyType,
2716 &ct.encoding, &ct.format,
2717 &ct.nitems, &bytes_after,
2718 &ct.value) != Success)
2719 {
2720 ct.value = 0;
2721 goto bailout;
2722 }
2723
2724 if (ct.encoding == None)
2725 goto bailout;
2726
2727 if (bytes_after)
2728 {
2729 // fetch and append remaining data
2730 XTextProperty ct2;
2731
2581 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2732 if (XGetWindowProperty (display->display, win, prop,
2582 (long) (PROP_SIZE / 4), delete_prop, 2733 ct.nitems / 4, (bytes_after + 3) / 4,
2734 delete_prop, AnyPropertyType,
2583 AnyPropertyType, &ct.encoding, &ct.format, 2735 &ct2.encoding, &ct2.format,
2584 &ct.nitems, &bytes_after, 2736 &ct2.nitems, &bytes_after,
2585 &ct.value) != Success) 2737 &ct2.value) != Success)
2586 break; 2738 goto bailout;
2587 2739
2588 if (ct.encoding == 0) 2740 // realloc should be compatible to XFree, here, and elsewhere, too
2589 { 2741 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2590 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2742 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2591 break; 2743 ct.nitems += ct2.nitems;
2592 }
2593 2744
2745 XFree (ct2.value);
2746 }
2747
2594 if (ct.value == NULL) 2748 if (ct.value == 0)
2595 { 2749 goto bailout;
2596 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2597 continue;
2598 }
2599 2750
2751 if (ct.encoding == xa[XA_INCR])
2752 {
2753 // INCR selection, start handshake
2754 if (!delete_prop)
2755 XDeleteProperty (display->display, win, prop);
2756
2757 selection_wait = Sel_incr;
2758 incr_buf_fill = 0;
2759 incr_ev.start (NOW + 10);
2760
2761 goto bailout;
2762 }
2763
2600 if (ct.nitems == 0) 2764 if (ct.nitems == 0)
2765 {
2766 if (selection_wait == Sel_incr)
2767 {
2768 XFree (ct.value);
2769
2770 // finally complete, now paste the whole thing
2771 selection_wait = Sel_normal;
2772 ct.value = (unsigned char *)incr_buf;
2773 ct.nitems = incr_buf_fill;
2774 incr_buf = 0;
2775 incr_buf_size = 0;
2776 incr_ev.stop ();
2601 { 2777 }
2602 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2778 else
2603 2779 {
2604 if (selection_wait == Sel_normal && nread == 0 2780 if (selection_wait == Sel_normal
2605 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2781 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2606 { 2782 {
2607 /* 2783 /*
2608 * pass through again trying CUT_BUFFER0 if we've come from 2784 * pass through again trying CUT_BUFFER0 if we've come from
2609 * XConvertSelection () but nothing was presented 2785 * XConvertSelection () but nothing was presented
2610 */ 2786 */
2611 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2612 selection_paste (display->root, XA_CUT_BUFFER0, False); 2787 selection_paste (display->root, XA_CUT_BUFFER0, False);
2613 } 2788 }
2614 2789
2615 nread = -1; /* discount any previous stuff */ 2790 goto bailout;
2616 break; 2791 }
2792 }
2793 else if (selection_wait == Sel_incr)
2794 {
2795 incr_ev.start (NOW + 10);
2796
2797 while (incr_buf_fill + ct.nitems > incr_buf_size)
2617 } 2798 {
2799 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2800 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2801 }
2618 2802
2803 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2619 nread += ct.nitems; 2804 incr_buf_fill += ct.nitems;
2620 2805
2806 goto bailout;
2807 }
2808
2621 char **cl; 2809 char **cl;
2622 int cr; 2810 int cr;
2811
2812#if ENABLE_FRILLS
2813 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2814 // so recode it manually
2815 if (ct.encoding == xa[XA_UTF8_STRING])
2816 {
2817 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2818 char *s = rxvt_wcstombs (w);
2819 free (w);
2820 // TODO: strlen == only the first element will be converted. well...
2821 paste ((unsigned char *)s, strlen (s));
2822 free (s);
2823 }
2824 else
2825#endif
2623 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2826 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2624 { 2827 && cl)
2828 {
2625 for (int i = 0; i < cr; i++) 2829 for (int i = 0; i < cr; i++)
2626 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2830 paste ((unsigned char *)cl[i], strlen (cl[i]));
2627 2831
2628 XFreeStringList (cl); 2832 XFreeStringList (cl);
2629 } 2833 }
2630 else 2834 else
2631 paste (ct.value, ct.nitems); 2835 paste (ct.value, ct.nitems); // paste raw
2632 2836
2633 if (bytes_after == 0) 2837bailout:
2634 break;
2635
2636 XFree (ct.value);
2637 }
2638
2639 if (ct.value)
2640 XFree (ct.value); 2838 XFree (ct.value);
2641 2839
2642 if (selection_wait == Sel_normal) 2840 if (selection_wait == Sel_normal)
2643 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2644
2645 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2646 return (int)nread;
2647} 2842}
2648 2843
2649void 2844void
2650rxvt_term::incr_cb (time_watcher &w) 2845rxvt_term::incr_cb (time_watcher &w)
2651{ 2846{
2652 selection_wait = Sel_none; 2847 selection_wait = Sel_none;
2653 2848
2849 incr_buf_size = 0;
2850 free (incr_buf);
2851
2654 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2852 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2655} 2853}
2656 2854
2657/*
2658 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2659 */
2660void 2855void
2661rxvt_term::selection_property (Window win, Atom prop) 2856rxvt_term::selection_property (Window win, Atom prop)
2662{ 2857{
2663 int reget_time = 0; 2858 if (prop == None || selection_wait != Sel_incr)
2664
2665 if (prop == None)
2666 return; 2859 return;
2667 2860
2668 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2669 if (selection_wait == Sel_normal)
2670 {
2671 int a, afmt;
2672 Atom atype;
2673 unsigned long bytes_after, nitems;
2674 unsigned char *s = NULL;
2675
2676 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2677 xa[XA_INCR], &atype, &afmt, &nitems,
2678 &bytes_after, &s);
2679 if (s)
2680 XFree (s);
2681 if (a != Success)
2682 return;
2683
2684#ifndef __CYGWIN32__
2685 if (atype == xa[XA_INCR])
2686 { /* start an INCR transfer */
2687 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2688 XDeleteProperty (display->display, win, prop);
2689 XFlush (display->display);
2690 reget_time = 1;
2691 selection_wait = Sel_incr;
2692 }
2693#endif
2694
2695 }
2696 else if (selection_wait == Sel_incr)
2697 {
2698 reget_time = 1;
2699
2700 if (selection_paste (win, prop, True) == -1) 2861 selection_paste (win, prop, true);
2701 {
2702 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2703 selection_wait = Sel_none;
2704 incr_ev.stop ();
2705 }
2706 }
2707 if (reget_time) /* received more data so reget time */
2708 incr_ev.start (NOW + 10);
2709} 2862}
2710 2863
2711/* ------------------------------------------------------------------------- */ 2864/* ------------------------------------------------------------------------- */
2712/* 2865/*
2713 * Request the current selection: 2866 * Request the current selection:
… …
2719 * EXT: button 2 release 2872 * EXT: button 2 release
2720 */ 2873 */
2721void 2874void
2722rxvt_term::selection_request (Time tm, int x, int y) 2875rxvt_term::selection_request (Time tm, int x, int y)
2723{ 2876{
2724 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2725
2726 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2877 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2727 return; /* outside window */ 2878 return; /* outside window */
2728 2879
2729 if (selection.text) 2880 if (selection.text)
2730 { /* internal selection */ 2881 { /* internal selection */
2731 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2732 char *str = rxvt_wcstombs (selection.text, selection.len); 2882 char *str = rxvt_wcstombs (selection.text, selection.len);
2733 paste ((unsigned char *)str, strlen (str)); 2883 paste ((unsigned char *)str, strlen (str));
2734 free (str); 2884 free (str);
2735 return; 2885 return;
2736 } 2886 }
… …
2750#else 2900#else
2751 selection_type = Sel_CompoundText; 2901 selection_type = Sel_CompoundText;
2752 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2902 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2753 return; 2903 return;
2754#endif 2904#endif
2755
2756 } 2905 }
2757 } 2906 }
2758 2907
2759 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2908 selection_wait = Sel_none; /* don't loop in selection_paste () */
2760 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2761 selection_paste (display->root, XA_CUT_BUFFER0, False); 2909 selection_paste (display->root, XA_CUT_BUFFER0, false);
2762} 2910}
2763 2911
2764int 2912int
2765rxvt_term::selection_request_other (Atom target, int selnum) 2913rxvt_term::selection_request_other (Atom target, int selnum)
2766{ 2914{
… …
2778 else 2926 else
2779 sel = xa[XA_CLIPBOARD]; 2927 sel = xa[XA_CLIPBOARD];
2780 2928
2781 if (XGetSelectionOwner (display->display, sel) != None) 2929 if (XGetSelectionOwner (display->display, sel) != None)
2782 { 2930 {
2783 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2784 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2931 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2785 TermWin.vt, selection_request_time); 2932 TermWin.vt, selection_request_time);
2786 return 1; 2933 return 1;
2787 } 2934 }
2788 2935
… …
2795 * EXT: SelectionClear 2942 * EXT: SelectionClear
2796 */ 2943 */
2797void 2944void
2798rxvt_term::selection_clear () 2945rxvt_term::selection_clear ()
2799{ 2946{
2800 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2801
2802 want_refresh = 1; 2947 want_refresh = 1;
2803 free (selection.text); 2948 free (selection.text);
2804 selection.text = NULL; 2949 selection.text = NULL;
2805 selection.len = 0; 2950 selection.len = 0;
2806 CLEAR_SELECTION (); 2951 CLEAR_SELECTION ();
… …
2819{ 2964{
2820 int i, col, end_col, row, end_row; 2965 int i, col, end_col, row, end_row;
2821 wchar_t *new_selection_text; 2966 wchar_t *new_selection_text;
2822 text_t *t; 2967 text_t *t;
2823 2968
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2825 switch (selection.op) 2969 switch (selection.op)
2826 { 2970 {
2827 case SELECTION_CONT: 2971 case SELECTION_CONT:
2828 break; 2972 break;
2829 case SELECTION_INIT: 2973 case SELECTION_INIT:
… …
2843 2987
2844 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2988 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2845 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2989 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2846 2990
2847 col = selection.beg.col; 2991 col = selection.beg.col;
2848 MAX_IT (col, 0);
2849 row = selection.beg.row + TermWin.saveLines; 2992 row = selection.beg.row + TermWin.saveLines;
2850 end_row = selection.end.row + TermWin.saveLines; 2993 end_row = selection.end.row + TermWin.saveLines;
2851 int ofs = 0; 2994 int ofs = 0;
2852 int extra = 0; 2995 int extra = 0;
2853 2996
2854 for (; row <= end_row; row++, col = 0) 2997 for (; row <= end_row; row++, col = 0)
2855 { 2998 {
2856 t = &(screen.text[row][col]);
2857
2858 end_col = screen.tlen[row]; 2999 end_col = screen.tlen[row];
3000
3001#if ENABLE_FRILLS
3002 if (selection.rect)
3003 {
3004 col = selection.beg.col;
3005 end_col = TermWin.ncol + 1;
3006 }
3007#endif
3008
3009 MAX_IT (col, 0);
2859 3010
2860 if (end_col == -1) 3011 if (end_col == -1)
2861 end_col = TermWin.ncol; 3012 end_col = TermWin.ncol;
2862 3013
2863 if (row == end_row) 3014 if (row == end_row || selection.rect)
2864 MIN_IT (end_col, selection.end.col); 3015 MIN_IT (end_col, selection.end.col);
2865 3016
3017 t = &screen.text[row][col];
2866 for (; col < end_col; col++) 3018 for (; col < end_col; col++)
2867 { 3019 {
2868 if (*t == NOCHAR) 3020 if (*t == NOCHAR)
2869 t++; 3021 t++;
2870#if ENABLE_COMBINING 3022#if ENABLE_COMBINING
… …
2918#if 0 3070#if 0
2919 XTextProperty ct; 3071 XTextProperty ct;
2920 3072
2921 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3073 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2922 { 3074 {
2923 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3075 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2924 PropModeReplace, ct.value, ct.nitems);
2925 XFree (ct.value); 3076 XFree (ct.value);
2926 } 3077 }
2927#endif 3078#endif
2928 3079
2929 selection_time = tm; 3080 selection_time = tm;
2930 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2931} 3081}
2932 3082
2933/* ------------------------------------------------------------------------- */ 3083/* ------------------------------------------------------------------------- */
2934/* 3084/*
2935 * Mark or select text based upon number of clicks: 1, 2, or 3 3085 * Mark or select text based upon number of clicks: 1, 2, or 3
2936 * EXT: button 1 press 3086 * EXT: button 1 press
2937 */ 3087 */
2938void 3088void
2939rxvt_term::selection_click (int clicks, int x, int y) 3089rxvt_term::selection_click (int clicks, int x, int y)
2940{ 3090{
2941 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2942
2943 clicks = ((clicks - 1) % 3) + 1; 3091 clicks = ((clicks - 1) % 3) + 1;
2944 selection.clicks = clicks; /* save clicks so extend will work */ 3092 selection.clicks = clicks; /* save clicks so extend will work */
2945 3093
2946 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3094 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2947 3095
… …
2989 * We now only find out the boundary in one direction 3137 * We now only find out the boundary in one direction
2990 */ 3138 */
2991 3139
2992/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3140/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2993#define DELIMIT_TEXT(x) \ 3141#define DELIMIT_TEXT(x) \
2994 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3142 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2995#define DELIMIT_REND(x) 1 3143#define DELIMIT_REND(x) 1
2996 3144
2997void 3145void
2998rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3146rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2999{ 3147{
… …
3017 3165
3018 row = mark->row + TermWin.saveLines; 3166 row = mark->row + TermWin.saveLines;
3019 col = mark->col; 3167 col = mark->col;
3020 MAX_IT (col, 0); 3168 MAX_IT (col, 0);
3021 /* find the edge of a word */ 3169 /* find the edge of a word */
3022 stp = & (screen.text[row][col]); 3170 stp = &screen.text[row][col];
3023 w1 = DELIMIT_TEXT (*stp); 3171 w1 = DELIMIT_TEXT (*stp);
3024 3172
3025 srp = (&screen.rend[row][col]); 3173 srp = &screen.rend[row][col];
3026 w2 = DELIMIT_REND (*srp); 3174 w2 = DELIMIT_REND (*srp);
3027 3175
3028 for (;;) 3176 for (;;)
3029 { 3177 {
3030 for (; col != bound.col; col += dirnadd) 3178 for (; col != bound.col; col += dirnadd)
… …
3064 } 3212 }
3065 break; 3213 break;
3066 } 3214 }
3067 3215
3068Old_Word_Selection_You_Die: 3216Old_Word_Selection_You_Die:
3069 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));
3070
3071 if (dirn == DN) 3217 if (dirn == DN)
3072 col++; /* put us on one past the end */ 3218 col++; /* put us on one past the end */
3073 3219
3074 /* Poke the values back in */ 3220 /* Poke the values back in */
3075 ret->row = row - TermWin.saveLines; 3221 ret->row = row - TermWin.saveLines;
… …
3109 /* select nothing */ 3255 /* select nothing */
3110 selection.beg.row = selection.end.row = 0; 3256 selection.beg.row = selection.end.row = 0;
3111 selection.beg.col = selection.end.col = 0; 3257 selection.beg.col = selection.end.col = 0;
3112 selection.clicks = 4; 3258 selection.clicks = 4;
3113 want_refresh = 1; 3259 want_refresh = 1;
3114 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3115 return; 3260 return;
3116 } 3261 }
3117 3262
3118 if (selection.clicks == 4) 3263 if (selection.clicks == 4)
3119 selection.clicks = 1; 3264 selection.clicks = 1;
… …
3135 row_col_t pos; 3280 row_col_t pos;
3136 enum { 3281 enum {
3137 LEFT, RIGHT 3282 LEFT, RIGHT
3138 } closeto = RIGHT; 3283 } closeto = RIGHT;
3139 3284
3140 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));
3141 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));
3142
3143 want_refresh = 1; 3285 want_refresh = 1;
3286
3144 switch (selection.op) 3287 switch (selection.op)
3145 { 3288 {
3146 case SELECTION_INIT: 3289 case SELECTION_INIT:
3147 CLEAR_SELECTION (); 3290 CLEAR_SELECTION ();
3148 selection.op = SELECTION_BEGIN; 3291 selection.op = SELECTION_BEGIN;
… …
3161 selection_start_colrow (col, row); 3304 selection_start_colrow (col, row);
3162 /* FALLTHROUGH */ 3305 /* FALLTHROUGH */
3163 default: 3306 default:
3164 return; 3307 return;
3165 } 3308 }
3309
3166 if (selection.beg.col == selection.end.col 3310 if (selection.beg.col == selection.end.col
3167 && selection.beg.col != selection.mark.col 3311 && selection.beg.col != selection.mark.col
3168 && selection.beg.row == selection.end.row 3312 && selection.beg.row == selection.end.row
3169 && selection.beg.row != selection.mark.row) 3313 && selection.beg.row != selection.mark.row)
3170 { 3314 {
3171 selection.beg.col = selection.end.col = selection.mark.col; 3315 selection.beg.col = selection.end.col = selection.mark.col;
3172 selection.beg.row = selection.end.row = selection.mark.row; 3316 selection.beg.row = selection.end.row = selection.mark.row;
3173 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));
3174 } 3317 }
3175 3318
3176 pos.col = col; 3319 pos.col = col;
3177 pos.row = row; 3320 pos.row = row;
3178 3321
… …
3221 } 3364 }
3222 else 3365 else
3223 { /* button1 drag or button3 drag */ 3366 { /* button1 drag or button3 drag */
3224 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3367 if (ROWCOL_IS_AFTER (selection.mark, pos))
3225 { 3368 {
3226 if ((selection.mark.row == selection.end.row) 3369 if (selection.mark.row == selection.end.row
3227 && (selection.mark.col == selection.end.col) 3370 && selection.mark.col == selection.end.col
3371 && clickchange
3228 && clickchange && selection.clicks == 2) 3372 && selection.clicks == 2)
3229 selection.mark.col--; 3373 selection.mark.col--;
3230 3374
3231 selection.beg.row = pos.row; 3375 selection.beg.row = pos.row;
3232 selection.beg.col = pos.col; 3376 selection.beg.col = pos.col;
3233 selection.end.row = selection.mark.row; 3377 selection.end.row = selection.mark.row;
… …
3244 3388
3245 if (selection.clicks == 1) 3389 if (selection.clicks == 1)
3246 { 3390 {
3247 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3391 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3248 3392
3249 if (end_col != -1 && selection.beg.col > end_col) 3393 if (selection.beg.col > end_col
3394 && end_col != -1
3395#if ENABLE_FRILLS
3396 && !selection.rect
3397#endif
3250 { 3398 )
3251#if 1
3252 selection.beg.col = ncol; 3399 selection.beg.col = ncol;
3253#else
3254 if (selection.beg.row != selection.end.row)
3255 selection.beg.col = ncol;
3256 else
3257 selection.beg.col = selection.mark.col;
3258#endif
3259 }
3260 3400
3261 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3401 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3262 3402
3263 if (end_col != -1 && selection.end.col > end_col) 3403 if (
3404 selection.end.col > end_col
3405 && end_col != -1
3406#if ENABLE_FRILLS
3407 && !selection.rect
3408#endif
3409 )
3264 selection.end.col = ncol; 3410 selection.end.col = ncol;
3265 } 3411 }
3266 else if (selection.clicks == 2) 3412 else if (selection.clicks == 2)
3267 { 3413 {
3268 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3414 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3269 selection.end.col--; 3415 selection.end.col--;
3270 3416
3271 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3272 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3418 selection_delimit_word (DN, &selection.end, &selection.end);
3273 } 3419 }
3274 else if (selection.clicks == 3) 3420 else if (selection.clicks == 3)
3275 { 3421 {
3276#ifndef NO_FRILLS 3422#if ENABLE_FRILLS
3277 if ((Options & Opt_tripleclickwords)) 3423 if ((options & Opt_tripleclickwords))
3278 { 3424 {
3279 int end_row; 3425 int end_row;
3280 3426
3281 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3427 selection_delimit_word (UP, &selection.beg, &selection.beg);
3282 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3428 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3283 3429
3284 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3430 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3285 { 3431 {
3286 end_col = screen.tlen[end_row + TermWin.saveLines]; 3432 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3297 else 3443 else
3298#endif 3444#endif
3299 { 3445 {
3300 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3446 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3301 selection.mark.col++; 3447 selection.mark.col++;
3448
3302 selection.beg.col = 0; 3449 selection.beg.col = 0;
3303 selection.end.col = ncol; 3450 selection.end.col = ncol;
3304 } 3451 }
3305 } 3452 }
3306 3453
3307 if (button3 && buttonpress) 3454 if (button3 && buttonpress)
3308 { /* mark may need to be changed */ 3455 { /* mark may need to be changed */
3309 if (closeto == LEFT) 3456 if (closeto == LEFT)
3310 { 3457 {
3311 selection.mark.row = selection.end.row; 3458 selection.mark.row = selection.end.row;
3312 selection.mark.col = selection.end.col 3459 selection.mark.col = selection.end.col - (selection.clicks == 2);
3313 - (selection.clicks == 2);
3314 } 3460 }
3315 else 3461 else
3316 { 3462 {
3317 selection.mark.row = selection.beg.row; 3463 selection.mark.row = selection.beg.row;
3318 selection.mark.col = selection.beg.col; 3464 selection.mark.col = selection.beg.col;
3319 } 3465 }
3320 } 3466 }
3321 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));
3322}
3323 3467
3324#ifndef NO_FRILLS 3468#if ENABLE_FRILLS
3469 if (selection.rect && selection.beg.col > selection.end.col)
3470 SWAP_IT (selection.beg.col, selection.end.col, int);
3471#endif
3472}
3473
3474#if ENABLE_FRILLS
3325void 3475void
3326rxvt_term::selection_remove_trailing_spaces () 3476rxvt_term::selection_remove_trailing_spaces ()
3327{ 3477{
3328 int32_t end_col, end_row; 3478 int32_t end_col, end_row;
3329 text_t *stp; 3479 text_t *stp;
3330 3480
3331 end_col = selection.end.col; 3481 end_col = selection.end.col;
3332 end_row = selection.end.row; 3482 end_row = selection.end.row;
3483
3333 for ( ; end_row >= selection.beg.row; ) 3484 for ( ; end_row >= selection.beg.row; )
3334 { 3485 {
3335 stp = screen.text[end_row + TermWin.saveLines]; 3486 stp = screen.text[end_row + TermWin.saveLines];
3487
3336 while (--end_col >= 0) 3488 while (--end_col >= 0)
3337 { 3489 {
3338 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3490 if (stp[end_col] != ' '
3491 && stp[end_col] != '\t'
3492 && stp[end_col] != NOCHAR)
3339 break; 3493 break;
3340 } 3494 }
3495
3341 if (end_col >= 0 3496 if (end_col >= 0
3342 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3497 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3343 { 3498 {
3344 selection.end.col = end_col + 1; 3499 selection.end.col = end_col + 1;
3345 selection.end.row = end_row; 3500 selection.end.row = end_row;
3346 break; 3501 break;
3347 } 3502 }
3503
3348 end_row--; 3504 end_row--;
3349 end_col = TermWin.ncol; 3505 end_col = TermWin.ncol;
3350 } 3506 }
3507
3351 if (selection.mark.row > selection.end.row) 3508 if (selection.mark.row > selection.end.row)
3352 { 3509 {
3353 selection.mark.row = selection.end.row; 3510 selection.mark.row = selection.end.row;
3354 selection.mark.col = selection.end.col; 3511 selection.mark.col = selection.end.col;
3355 } 3512 }
… …
3371 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3528 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3372} 3529}
3373 3530
3374/* ------------------------------------------------------------------------- */ 3531/* ------------------------------------------------------------------------- */
3375/* 3532/*
3376 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3377 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3378 * the X11 protocol.
3379 */
3380typedef CARD32 Atom32;
3381
3382/* ------------------------------------------------------------------------- */
3383/*
3384 * Respond to a request for our current selection 3533 * Respond to a request for our current selection
3385 * EXT: SelectionRequest 3534 * EXT: SelectionRequest
3386 */ 3535 */
3387void 3536void
3388rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3537rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3389{ 3538{
3390 XSelectionEvent ev; 3539 XSelectionEvent ev;
3391 XTextProperty ct;
3392 XICCEncodingStyle style;
3393 Atom target;
3394 3540
3395 ev.type = SelectionNotify; 3541 ev.type = SelectionNotify;
3396 ev.property = None; 3542 ev.property = None;
3397 ev.display = rq.display; 3543 ev.display = rq.display;
3398 ev.requestor = rq.requestor; 3544 ev.requestor = rq.requestor;
… …
3400 ev.target = rq.target; 3546 ev.target = rq.target;
3401 ev.time = rq.time; 3547 ev.time = rq.time;
3402 3548
3403 if (rq.target == xa[XA_TARGETS]) 3549 if (rq.target == xa[XA_TARGETS])
3404 { 3550 {
3405 Atom32 target_list[6]; 3551 Atom target_list[6];
3406 Atom32 *target = target_list; 3552 Atom *target = target_list;
3407 3553
3408 *target++ = (Atom32) xa[XA_TARGETS]; 3554 *target++ = xa[XA_TARGETS];
3409 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3555 *target++ = xa[XA_TIMESTAMP];
3410 *target++ = (Atom32) XA_STRING; 3556 *target++ = XA_STRING;
3411 *target++ = (Atom32) xa[XA_TEXT]; 3557 *target++ = xa[XA_TEXT];
3412 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3558 *target++ = xa[XA_COMPOUND_TEXT];
3413#if X_HAVE_UTF8_STRING 3559#if X_HAVE_UTF8_STRING
3414 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3560 *target++ = xa[XA_UTF8_STRING];
3415#endif 3561#endif
3416 3562
3417 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3563 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3418 (8 * sizeof (target_list[0])), PropModeReplace, 3564 32, PropModeReplace,
3419 (unsigned char *)target_list, 3565 (unsigned char *)target_list, target - target_list);
3420 target - target_list);
3421 ev.property = rq.property; 3566 ev.property = rq.property;
3422 } 3567 }
3568#if TODO // TODO
3423 else if (rq.target == xa[XA_MULTIPLE]) 3569 else if (rq.target == xa[XA_MULTIPLE])
3424 { 3570 {
3425 /* TODO: Handle MULTIPLE */ 3571 /* TODO: Handle MULTIPLE */
3426 } 3572 }
3573#endif
3427 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3428 { 3575 {
3429 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3576 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3430 (8 * sizeof (Time)), PropModeReplace,
3431 (unsigned char *)&selection_time, 1); 3577 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3432 ev.property = rq.property; 3578 ev.property = rq.property;
3433 } 3579 }
3434 else if (rq.target == XA_STRING 3580 else if (rq.target == XA_STRING
3435 || rq.target == xa[XA_TEXT] 3581 || rq.target == xa[XA_TEXT]
3436 || rq.target == xa[XA_COMPOUND_TEXT] 3582 || rq.target == xa[XA_COMPOUND_TEXT]
3437 || rq.target == xa[XA_UTF8_STRING] 3583 || rq.target == xa[XA_UTF8_STRING]
3438 ) 3584 )
3439 { 3585 {
3586 XTextProperty ct;
3587 Atom target = rq.target;
3440 short freect = 0; 3588 short freect = 0;
3441 int selectlen; 3589 int selectlen;
3442 wchar_t *cl; 3590 wchar_t *cl;
3443 3591 enum {
3444 target = rq.target; 3592 enc_string = XStringStyle,
3593 enc_text = XStdICCTextStyle,
3594 enc_compound_text = XCompoundTextStyle,
3595#ifdef X_HAVE_UTF8_STRING
3596 enc_utf8 = XUTF8StringStyle,
3597#else
3598 enc_utf8 = -1,
3599#endif
3600 } style;
3445 3601
3446 if (target == XA_STRING) 3602 if (target == XA_STRING)
3447 // we actually don't do XA_STRING, but who cares, as i18n clients 3603 // we actually don't do XA_STRING, but who cares, as i18n clients
3448 // will ask for another format anyways. 3604 // will ask for another format anyways.
3449 style = XStringStyle; 3605 style = enc_string;
3450 else if (target == xa[XA_TEXT]) 3606 else if (target == xa[XA_TEXT])
3451 style = XStdICCTextStyle; 3607 style = enc_text;
3452 else if (target == xa[XA_COMPOUND_TEXT]) 3608 else if (target == xa[XA_COMPOUND_TEXT])
3453 style = XCompoundTextStyle; 3609 style = enc_compound_text;
3454#if X_HAVE_UTF8_STRING 3610#if ENABLE_FRILLS
3455 else if (target == xa[XA_UTF8_STRING]) 3611 else if (target == xa[XA_UTF8_STRING])
3456 style = XUTF8StringStyle; 3612 style = enc_utf8;
3457#endif 3613#endif
3458 else 3614 else
3459 { 3615 {
3460 target = xa[XA_COMPOUND_TEXT]; 3616 target = xa[XA_COMPOUND_TEXT];
3461 style = XCompoundTextStyle; 3617 style = enc_compound_text;
3462 } 3618 }
3463 3619
3464 if (selection.text) 3620 if (selection.text)
3465 { 3621 {
3466 cl = selection.text; 3622 cl = selection.text;
… …
3470 { 3626 {
3471 cl = L""; 3627 cl = L"";
3472 selectlen = 0; 3628 selectlen = 0;
3473 } 3629 }
3474 3630
3475 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3631#if ENABLE_FRILLS
3476 // manually for XUTF8StringStyle. 3632 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3633 // so recode it manually
3634 if (style == enc_utf8)
3635 {
3636 freect = 1;
3637 ct.encoding = target;
3638 ct.format = 8;
3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640 ct.nitems = strlen ((char *)ct.value);
3641 }
3642 else
3643#endif
3477 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3644 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3478 freect = 1; 3645 freect = 1;
3479 else 3646 else
3480 { 3647 {
3481 /* if we failed to convert then send it raw */ 3648 /* if we failed to convert then send it raw */
3482 ct.value = (unsigned char *)cl; 3649 ct.value = (unsigned char *)cl;
3483 ct.nitems = selectlen; 3650 ct.nitems = selectlen;
3651 ct.encoding = target;
3484 } 3652 }
3485 3653
3486 XChangeProperty (display->display, rq.requestor, rq.property, 3654 XChangeProperty (display->display, rq.requestor, rq.property,
3487 target, 8, PropModeReplace, 3655 ct.encoding, 8, PropModeReplace,
3488 ct.value, (int)ct.nitems); 3656 ct.value, (int)ct.nitems);
3489 ev.property = rq.property; 3657 ev.property = rq.property;
3490 3658
3491 if (freect) 3659 if (freect)
3492 XFree (ct.value); 3660 XFree (ct.value);
… …
3512} 3680}
3513 3681
3514/* ------------------------------------------------------------------------- */ 3682/* ------------------------------------------------------------------------- */
3515#ifdef USE_XIM 3683#ifdef USE_XIM
3516void 3684void
3517rxvt_term::im_set_position (XPoint *pos) 3685rxvt_term::im_set_position (XPoint &pos)
3518{ 3686{
3519 XWindowAttributes xwa; 3687 XWindowAttributes xwa;
3520 3688
3521 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3689 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3690
3522 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3691 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3523 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3692 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3524} 3693}
3525
3526#endif 3694#endif
3695
3696#if ENABLE_OVERLAY
3697void
3698rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3699{
3700 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3701 return;
3702
3703 want_refresh = 1;
3704
3705 scr_overlay_off ();
3706
3707 if (x < 0) x = TermWin.ncol - w;
3708 if (y < 0) y = TermWin.nrow - h;
3709
3710 // make space for border
3711 w += 2; MIN_IT (w, TermWin.ncol);
3712 h += 2; MIN_IT (h, TermWin.nrow);
3713
3714 x -= 1; MAX_IT (x, 0);
3715 y -= 1; MAX_IT (y, 0);
3716
3717 MIN_IT (x, TermWin.ncol - w);
3718 MIN_IT (y, TermWin.nrow - h);
3719
3720 ov_x = x; ov_y = y;
3721 ov_w = w; ov_h = h;
3722
3723 ov_text = new text_t *[h];
3724 ov_rend = new rend_t *[h];
3725
3726 for (y = 0; y < h; y++)
3727 {
3728 text_t *tp = ov_text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w];
3730
3731 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE;
3733
3734 if (y == 0)
3735 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3736 else if (y < h - 1)
3737 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3738 else
3739 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3740
3741 *tp++ = t0;
3742 *rp++ = r;
3743
3744 for (x = w - 2; x > 0; --x)
3745 {
3746 *tp++ = t1;
3747 *rp++ = r;
3748 }
3749
3750 *tp = t2;
3751 *rp = r;
3752 }
3753}
3754
3755void
3756rxvt_term::scr_overlay_off ()
3757{
3758 if (!ov_text)
3759 return;
3760
3761 want_refresh = 1;
3762
3763 for (int y = 0; y < ov_h; y++)
3764 {
3765 delete [] ov_text[y];
3766 delete [] ov_rend[y];
3767 }
3768
3769 delete [] ov_text; ov_text = 0;
3770 delete [] ov_rend; ov_rend = 0;
3771}
3772
3773void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3775{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3777 return;
3778
3779 x++, y++;
3780
3781 ov_text[y][x] = text;
3782 ov_rend[y][x] = rend;
3783}
3784
3785void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s)
3787{
3788 while (*s)
3789 scr_overlay_set (x++, y, *s++);
3790}
3791
3792void
3793rxvt_term::scr_swap_overlay ()
3794{
3795 if (!ov_text)
3796 return;
3797
3798 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3799
3800 // swap screen mem with overlay
3801 for (int y = ov_h; y--; )
3802 {
3803 text_t *t1 = ov_text[y];
3804 rend_t *r1 = ov_rend[y];
3805
3806 text_t *t2 = screen.text[y + row_offset] + ov_x;
3807 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3808
3809 for (int x = ov_w; x--; )
3810 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 }
3814 }
3815}
3816
3817#endif
3527/* ------------------------------------------------------------------------- */ 3818/* ------------------------------------------------------------------------- */

Diff Legend

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