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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.169 by root, Tue Oct 25 19:04:46 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
… …
202 /* 202 /*
203 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 205 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213 213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 218
219 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
220 { 220 {
221 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
… …
293 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
294 } 294 }
295 295
296 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 298
300 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
301 } 300 }
302 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
303 { 302 {
… …
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k; 334 screen.cur.row += k;
336 screen.s_cur.row += k; 335 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
338 } 337 }
338
339#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 343#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348 } 345 }
349 346
350 /* resize columns */ 347 /* resize columns */
… …
393 } 390 }
394 391
395 } 392 }
396 393
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399 395
400 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
401 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
402 } 398 }
403 399
… …
565 if (current_screen == scrn) 561 if (current_screen == scrn)
566 return scrn; 562 return scrn;
567 563
568 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
569 565
570 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
571#if NSCREENS 575#if NSCREENS
572 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
573 { 577 {
574 num_scr = 0; 578 num_scr = 0;
575 offset = TermWin.saveLines; 579 offset = TermWin.saveLines;
580
576 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
577 { 582 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 586 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
597 } 592 }
598 else 593 else
599#endif 594#endif
600 if (options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
597
603 return scrn; 598 return scrn;
604} 599}
605 600
606// clear WrapNext indicator, solidifying position on next line 601// clear WrapNext indicator, solidifying position on next line
607void 602void
… …
704 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
705 } 700 }
706 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
707 { 702 {
708 /* move selected region too */ 703 /* move selected region too */
709 selection.beg.row -= count; 704 selection.beg.row -= count;
710 selection.end.row -= count; 705 selection.end.row -= count;
711 selection.mark.row -= count; 706 selection.mark.row -= count;
712 } 707 }
713 } 708 }
714 709
715 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
723 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
724 MIN_IT (count, i); 719 MIN_IT (count, i);
725 720
726 if (j > 0) 721 if (j > 0)
727 { 722 {
728 /* A: scroll up */ 723 /* scroll up */
729 724
730 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
731 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
732 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
733 728
734 /* A2: Rotate lines */ 729 /* Rotate lines */
735 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
736 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
737 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
738 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
739 734
740 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
741 } 736 }
742 else /* if (j < 0) */ 737 else /* if (j < 0) */
743 { 738 {
744 /* B: scroll down */ 739 /* scroll down */
745 740
746 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
747 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
748 { 743 {
749 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
750 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
751 } 746 }
752 747
753 /* B2: Rotate lines */ 748 /* Rotate lines */
754 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
755 { 750 {
756 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
757 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
758 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
760 755
761 j = row1, i = count; 756 j = row1, i = count;
762 count = -count; 757 count = -count;
763 } 758 }
764 759
765 /* C: Resurrect lines */ 760 /* Resurrect lines */
766 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
767 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
768 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
769 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
770 for (; i--; j++) 765 for (; i--; j++)
… …
778 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
779 */ 774 */
780void 775void
781rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
782{ 777{
778 if (len <= 0) /* sanity */
779 return;
780
783 unsigned char checksel; 781 unsigned char checksel;
784 unicode_t c; 782 unicode_t c;
785 int i, row, last_col; 783 int i, row, last_col;
786 text_t *stp; 784 text_t *stp;
787 rend_t *srp; 785 rend_t *srp;
788 786 const unicode_t *strend = str + len;
789 if (len <= 0) /* sanity */
790 return;
791 787
792 want_refresh = 1; 788 want_refresh = 1;
793 ZERO_SCROLLBACK (); 789 ZERO_SCROLLBACK ();
794 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
795 791
… …
820 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
821 817
822 stp = screen.text[row]; 818 stp = screen.text[row];
823 srp = screen.rend[row]; 819 srp = screen.rend[row];
824 820
825 while (len--) 821 while (str < strend)
826 { 822 {
827 c = *str++; 823 c = *str++;
828 824
829 if (c < 0x20) 825 if (c < 0x20)
830 switch (c) 826 if (c == C0_LF)
827 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col);
830
831 screen.flags &= ~Screen_WrapNext;
832
833 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines;
837
838 stp = screen.text[row]; /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue;
841 }
842 else if (c == C0_CR)
831 { 843 {
832 case C0_HT:
833 scr_tab (1, true);
834 continue;
835
836 case C0_LF:
837 if (screen.tlen[row] != -1) /* XXX: think about this */ 844 if (screen.tlen[row] != -1) /* XXX: think about this */
838 MAX_IT (screen.tlen[row], screen.cur.col); 845 MAX_IT (screen.tlen[row], screen.cur.col);
839 846
840 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
841
842 if (screen.cur.row == screen.bscroll)
843 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
844 else if (screen.cur.row < (TermWin.nrow - 1))
845 row = (++screen.cur.row) + TermWin.saveLines;
846
847 stp = screen.text[row]; /* _must_ refresh */
848 srp = screen.rend[row]; /* _must_ refresh */
849 continue;
850
851 case C0_CR:
852 if (screen.tlen[row] != -1) /* XXX: think about this */
853 MAX_IT (screen.tlen[row], screen.cur.col);
854
855 screen.flags &= ~Screen_WrapNext;
856 screen.cur.col = 0; 848 screen.cur.col = 0;
857 continue; 849 continue;
850 }
851 else if (c == C0_HT)
852 {
853 scr_tab (1, true);
854 continue;
858 } 855 }
859 856
860 if (checksel /* see if we're writing within selection */ 857 if (checksel /* see if we're writing within selection */
861 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
862 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
872 869
873 if (screen.flags & Screen_WrapNext) 870 if (screen.flags & Screen_WrapNext)
874 { 871 {
875 screen.tlen[row] = -1; 872 screen.tlen[row] = -1;
876 873
874 scr_do_wrap ();
875
877 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 876 row = screen.cur.row + TermWin.saveLines;
878
879 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
880 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
881 } 879 }
882 880
883 if (screen.flags & Screen_Insert) 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
884 scr_insdel_chars (1, INSERT); 882 if (IN_RANGE (c, 0xd800, 0xdfff))
883 c = 0xfffd;
885 884
886 // rely on wcwidth to tell us the character width, at least for non-latin1 885 // rely on wcwidth to tell us the character width, at least for non-latin1
887 // do wcwidth before further replacements, as wcwidth says that line-drawing 886 // do wcwidth before further replacements, as wcwidth might return -1
888 // characters have width -1 (DOH!) on GNU/Linux sometimes. 887 // for the line drawing characters below as they might be invalid in the current
888 // locale.
889 int width = c < 0x100 ? 1 : wcwidth (c); 889 int width = c < 0x100 ? 1 : wcwidth (c);
890 890
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 891 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 { 892 {
893 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 894 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[63] = { // 5f .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 897 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 898 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 899 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 900 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
905 }; 905 };
906 906
907 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 907 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
908 { 908 {
909 c = vt100_0[c - 0x40]; 909 c = vt100_0[c - 0x41];
910 width = 1; 910 width = 1; // vt100 line drawing characters are always single-width
911 } 911 }
912 } 912 }
913 913
914 if (screen.flags & Screen_Insert)
915 scr_insdel_chars (width, INSERT);
916
914 if (width != 0) 917 if (width != 0)
915 { 918 {
916 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd;
919
920#if !UNICODE_3 919#if !UNICODE_3
921 // trim characters we can't store directly :( 920 // trim characters we can't store directly :(
922 if (c >= 0x10000) 921 if (c >= 0x10000)
923# if ENABLE_COMBINING 922# if ENABLE_COMBINING
924 c = rxvt_composite.compose (c); // map to lower 16 bits 923 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
947 col++; 946 col++;
948 } while (col < TermWin.ncol && stp[col] == NOCHAR); 947 } while (col < TermWin.ncol && stp[col] == NOCHAR);
949 } 948 }
950 949
951 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951
952 // if the character doesn't fit into the remaining columns...
953 if (screen.cur.col > last_col - width && last_col >= width)
954 {
955 // ...output spaces
956 c = ' ';
957 // and try the same character next loop iteration
958 --str;
959 }
952 960
953 do 961 do
954 { 962 {
955 stp[screen.cur.col] = c; 963 stp[screen.cur.col] = c;
956 srp[screen.cur.col] = rend; 964 srp[screen.cur.col] = rend;
… …
968 c = NOCHAR; 976 c = NOCHAR;
969 } 977 }
970 while (--width > 0); 978 while (--width > 0);
971 979
972 // pad with spaces when overwriting wide character with smaller one 980 // pad with spaces when overwriting wide character with smaller one
981 if (!width)
973 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 982 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
974 { 983 {
975 stp[c] = ' '; 984 stp[c] = ' ';
976 srp[c] = rend; 985 srp[c] = rend;
977 } 986 }
978 } 987 }
979 else if (width == 0) 988 else // width == 0
980 { 989 {
981#if ENABLE_COMBINING 990#if ENABLE_COMBINING
982 // handle combining characters 991 // handle combining characters
983 // we just tag the accent on the previous on-screen character. 992 // we just tag the accent on the previous on-screen character.
984 // this is arguably not correct, but also arguably not wrong. 993 // this is arguably not correct, but also arguably not wrong.
985 // we don't handle double-width characters nicely yet. 994 // we don't handle double-width characters nicely yet.
986
987 text_t *tp; 995 text_t *tp;
988 rend_t *rp; 996 rend_t *rp;
989 997
990 if (screen.cur.col > 0) 998 if (screen.cur.col > 0)
991 { 999 {
… …
1095 if (count) 1103 if (count)
1096 x = TermWin.ncol - 1; 1104 x = TermWin.ncol - 1;
1097 1105
1098 // store horizontal tab commands as characters inside the text 1106 // store horizontal tab commands as characters inside the text
1099 // buffer so they can be selected and pasted. 1107 // buffer so they can be selected and pasted.
1100 if (ht) 1108 if (ht && options & Opt_pastableTabs)
1101 { 1109 {
1102 base_rend = SET_FONT (base_rend, 0); 1110 base_rend = SET_FONT (base_rend, 0);
1103 1111
1104 if (screen.tlen[row] != -1) /* XXX: think about this */ 1112 if (screen.tlen[row] != -1) /* XXX: think about this */
1105 MAX_IT (screen.tlen[row], x); 1113 MAX_IT (screen.tlen[row], x);
… …
1165 */ 1173 */
1166#if ENABLE_FRILLS 1174#if ENABLE_FRILLS
1167void 1175void
1168rxvt_term::scr_forwardindex () 1176rxvt_term::scr_forwardindex ()
1169{ 1177{
1170 int row; 1178 int row;
1171 1179
1172 if (screen.cur.col < TermWin.ncol - 1) 1180 if (screen.cur.col < TermWin.ncol - 1)
1173 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1174 else 1182 else
1175 { 1183 {
… …
1378 ren = DEFAULT_RSTYLE; 1386 ren = DEFAULT_RSTYLE;
1379 CLEAR_ROWS (row, num); 1387 CLEAR_ROWS (row, num);
1380 } 1388 }
1381 else 1389 else
1382 { 1390 {
1383 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1384 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1386 ERASE_ROWS (row, num); 1394 ERASE_ROWS (row, num);
1387 gcvalue.foreground = pix_colors[Color_fg]; 1395 gcvalue.foreground = pix_colors[Color_fg];
1388 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1389 } 1397 }
1390 1398
1391 for (; num--; row++) 1399 for (; num--; row++)
1392 { 1400 {
1393 scr_blank_screen_mem (screen.text, screen.rend, 1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1394 (unsigned int) (row + row_offset), rstyle);
1395 screen.tlen[row + row_offset] = 0; 1402 screen.tlen[row + row_offset] = 0;
1396 scr_blank_line (drawn_text[row], drawn_rend[row], 1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1397 (unsigned int)TermWin.ncol, ren);
1398 } 1404 }
1399} 1405}
1406
1407#if ENABLE_FRILLS
1408void
1409rxvt_term::scr_erase_savelines ()
1410{
1411 want_refresh = 1;
1412 ZERO_SCROLLBACK ();
1413
1414 TermWin.nscrolled = 0;
1415}
1416#endif
1400 1417
1401/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1402/* 1419/*
1403 * Fill the screen with `E's 1420 * Fill the screen with `E's
1404 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1405 */ 1422 */
1406void 1423void
1407rxvt_term::scr_E () 1424rxvt_term::scr_E ()
1408{ 1425{
1409 int i, j, k; 1426 int i, j, k;
1410 rend_t *r1, fs; 1427 rend_t *r1, fs;
1411 1428
1412 want_refresh = 1; 1429 want_refresh = 1;
1413 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1414 1431
1415 num_scr_allow = 0; 1432 num_scr_allow = 0;
… …
1898rxvt_term::scr_page (enum page_dirn direction, int nlines) 1915rxvt_term::scr_page (enum page_dirn direction, int nlines)
1899{ 1916{
1900 int n; 1917 int n;
1901 unsigned int oldviewstart; 1918 unsigned int oldviewstart;
1902 1919
1903#ifdef DEBUG_STRICT
1904 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1905#endif
1906 oldviewstart = TermWin.view_start; 1920 oldviewstart = TermWin.view_start;
1921
1907 if (direction == UP) 1922 if (direction == UP)
1908 { 1923 {
1909 n = TermWin.view_start + nlines; 1924 n = TermWin.view_start + nlines;
1910 TermWin.view_start = min (n, TermWin.nscrolled); 1925 TermWin.view_start = min (n, TermWin.nscrolled);
1911 } 1926 }
1912 else 1927 else
1913 { 1928 {
1914 n = TermWin.view_start - nlines; 1929 n = TermWin.view_start - nlines;
1915 TermWin.view_start = max (n, 0); 1930 TermWin.view_start = max (n, 0);
1916 } 1931 }
1932
1917 return scr_changeview (oldviewstart); 1933 return scr_changeview (oldviewstart);
1918} 1934}
1919 1935
1920int 1936int
1921rxvt_term::scr_changeview (unsigned int oldviewstart) 1937rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
1932/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1933void 1949void
1934rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1935{ 1951{
1936#ifndef NO_BELL 1952#ifndef NO_BELL
1953
1937# ifndef NO_MAPALERT 1954# ifndef NO_MAPALERT
1938# ifdef MAPALERT_OPTION 1955# ifdef MAPALERT_OPTION
1939 if (options & Opt_mapAlert) 1956 if (options & Opt_mapAlert)
1940# endif 1957# endif
1941 XMapWindow (display->display, TermWin.parent[0]); 1958 XMapWindow (display->display, TermWin.parent[0]);
1942# endif 1959# endif
1960
1943 if (options & Opt_visualBell) 1961 if (options & Opt_visualBell)
1944 { 1962 {
1945 scr_rvideo_mode (!rvideo); /* refresh also done */ 1963 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION);
1946 scr_rvideo_mode (!rvideo); /* refresh also done */ 1965 scr_rvideo_mode (!rvideo); /* refresh also done */
1947 } 1966 }
1948 else 1967 else
1949 XBell (display->display, 0); 1968 XBell (display->display, 0);
1969
1950#endif 1970#endif
1951} 1971}
1952 1972
1953/* ------------------------------------------------------------------------- */ 1973/* ------------------------------------------------------------------------- */
1954/* ARGSUSED */ 1974/* ARGSUSED */
… …
2009/* 2029/*
2010 * Refresh the screen 2030 * Refresh the screen
2011 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
2012 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2013 */ 2033 */
2014
2015#define FONT_WIDTH(X, Y) \
2016 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2017#define FONT_RBEAR(X, Y) \
2018 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2019#define FONT_LBEAR(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2021#define IS_FONT_CHAR(X, Y) \
2022 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2023
2024void 2034void
2025rxvt_term::scr_refresh (unsigned char refresh_type) 2035rxvt_term::scr_refresh (unsigned char refresh_type)
2026{ 2036{
2027 unsigned char must_clear, /* use draw_string not draw_image_string */ 2037 unsigned char must_clear, /* use draw_string not draw_image_string */
2028 showcursor; /* show the cursor */ 2038 showcursor; /* show the cursor */
… …
2047 refresh_count = 0; 2057 refresh_count = 0;
2048 2058
2049 row_offset = TermWin.saveLines - TermWin.view_start; 2059 row_offset = TermWin.saveLines - TermWin.view_start;
2050 2060
2051#if XPM_BACKGROUND 2061#if XPM_BACKGROUND
2052 must_clear |= (bgPixmap.pixmap != None); 2062 must_clear |= bgPixmap.pixmap != None;
2053#endif 2063#endif
2054#if TRANSPARENT 2064#if TRANSPARENT
2055 must_clear |= ((options & Opt_transparent) && am_transparent); 2065 must_clear |= (options & Opt_transparent) && am_transparent;
2056#endif 2066#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2068
2059 /* 2069 /*
2060 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
2084 2094
2085 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2086 2096
2087 if (showcursor && TermWin.focus) 2097 if (showcursor && TermWin.focus)
2088 { 2098 {
2099 if (options & Opt_cursorUnderline)
2100 *crp ^= RS_Uline;
2101 else
2102 {
2089 *crp ^= RS_RVid; 2103 *crp ^= RS_RVid;
2104
2090#ifndef NO_CURSORCOLOR 2105#ifndef NO_CURSORCOLOR
2091 cc1 = *crp & (RS_fgMask | RS_bgMask); 2106 cc1 = *crp & (RS_fgMask | RS_bgMask);
2092 if (ISSET_PIXCOLOR (Color_cursor)) 2107 if (ISSET_PIXCOLOR (Color_cursor))
2093 ccol1 = Color_cursor; 2108 ccol1 = Color_cursor;
2094 else 2109 else
2095#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2096 ccol1 = GET_FGCOLOR (rstyle); 2111 ccol1 = GET_FGCOLOR (rstyle);
2097#else 2112#else
2098 ccol1 = Color_fg; 2113 ccol1 = Color_fg;
2099#endif 2114#endif
2100 if (ISSET_PIXCOLOR (Color_cursor2)) 2115 if (ISSET_PIXCOLOR (Color_cursor2))
2101 ccol2 = Color_cursor2; 2116 ccol2 = Color_cursor2;
2102 else 2117 else
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2118#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2104 ccol2 = GET_BGCOLOR (rstyle); 2119 ccol2 = GET_BGCOLOR (rstyle);
2105#else 2120#else
2106 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2107#endif 2122#endif
2108 *crp = SET_FGCOLOR (*crp, ccol1); 2123 *crp = SET_FGCOLOR (*crp, ccol1);
2109 *crp = SET_BGCOLOR (*crp, ccol2); 2124 *crp = SET_BGCOLOR (*crp, ccol2);
2110#endif 2125#endif
2126 }
2111 } 2127 }
2112 } 2128 }
2113 2129
2114 /* make sure no outline cursor is left around */ 2130 /* make sure no outline cursor is left around */
2115 setoldcursor = 0; 2131 setoldcursor = 0;
… …
2241 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2257 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2242 continue; 2258 continue;
2243 2259
2244 // redraw one or more characters 2260 // redraw one or more characters
2245 2261
2246 // seek to the beginning if wide characters 2262 // seek to the beginning of wide characters
2247 while (stp[col] == NOCHAR && col > 0) 2263 while (stp[col] == NOCHAR && col > 0)
2248 --col; 2264 --col;
2249 2265
2250 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2266 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2251 text_t *text = stp + col; 2267 text_t *text = stp + col;
… …
2292 2308
2293 // sometimes we optimize away the trailing NOCHAR's, add them back 2309 // sometimes we optimize away the trailing NOCHAR's, add them back
2294 while (i && text[count] == NOCHAR) 2310 while (i && text[count] == NOCHAR)
2295 count++, i--; 2311 count++, i--;
2296 2312
2297#if ENABLE_STYLES
2298 // force redraw after "careful" characters to avoid pixel droppings
2299 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2300 drp[col + 1] = ~srp[col + 1];
2301
2302 // include previous careful character(s) if possible, looks nicer (best effort...)
2303 while (text > stp
2304 && srp[text - stp - 1] & RS_Careful
2305 && RS_SAME (rend, srp[text - stp - 1]))
2306 text--, count++, xpixel -= TermWin.fwidth;
2307#endif
2308
2309 /* 2313 /*
2310 * Determine the attributes for the string 2314 * Determine the attributes for the string
2311 */ 2315 */
2312 int fore = GET_FGCOLOR (rend); // desired foreground 2316 int fore = GET_FGCOLOR (rend); // desired foreground
2313 int back = GET_BGCOLOR (rend); // desired background 2317 int back = GET_BGCOLOR (rend); // desired background
2314 2318
2315 // only do special processing if ana attributes are set, which is rare 2319 // only do special processing if any attributes are set, which is rare
2316 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2317 { 2321 {
2322#if ENABLE_STYLES
2323 // force redraw after "careful" characters to avoid pixel droppings
2324 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2325 drp[col + 1] = ~srp[col + 1];
2326
2327 // include previous careful character(s) if possible, looks nicer (best effort...)
2328 while (text > stp
2329 && srp[text - stp - 1] & RS_Careful
2330 && RS_SAME (rend, srp[text - stp - 1]))
2331 text--, count++, xpixel -= TermWin.fwidth;
2332#endif
2333
2318 bool invert = rend & RS_RVid; 2334 bool invert = rend & RS_RVid;
2319 2335
2320#ifndef NO_BOLD_UNDERLINE_REVERSE 2336#ifndef NO_BOLD_UNDERLINE_REVERSE
2321 if (rend & RS_Bold 2337 if (rend & RS_Bold
2322 && fore == Color_fg) 2338 && fore == Color_fg)
… …
2349 SWAP_IT (fore, back, int); 2365 SWAP_IT (fore, back, int);
2350 2366
2351#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2352 if (ISSET_PIXCOLOR (Color_RV)) 2368 if (ISSET_PIXCOLOR (Color_RV))
2353 back = Color_RV; 2369 back = Color_RV;
2370
2371 if (fore == back)
2372 {
2373 fore = Color_bg;
2374 back = Color_fg;
2375 }
2354#endif 2376#endif
2355 } 2377 }
2356 2378
2357#ifdef TEXT_BLINK 2379#ifdef TEXT_BLINK
2358 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2380 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2395 } 2417 }
2396 else 2418 else
2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2398 2420
2399 if (rend & RS_Uline && font->descent > 1 && fore != back) 2421 if (rend & RS_Uline && font->descent > 1 && fore != back)
2422 {
2423#if ENABLE_FRILLS
2424 if (ISSET_PIXCOLOR (Color_underline))
2425 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2426 else
2427#endif
2428 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2429
2400 XDrawLine (display->display, drawBuffer, TermWin.gc, 2430 XDrawLine (display->display, drawBuffer, TermWin.gc,
2401 xpixel, ypixel + font->ascent + 1, 2431 xpixel, ypixel + font->ascent + 1,
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2432 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2433 }
2403 } /* for (col....) */ 2434 } /* for (col....) */
2404 } /* for (row....) */ 2435 } /* for (row....) */
2405 2436
2406#if ENABLE_OVERLAY 2437#if ENABLE_OVERLAY
2407 scr_swap_overlay (); 2438 scr_swap_overlay ();
… …
2412 */ 2443 */
2413 if (showcursor) 2444 if (showcursor)
2414 { 2445 {
2415 if (TermWin.focus) 2446 if (TermWin.focus)
2416 { 2447 {
2448 if (options & Opt_cursorUnderline)
2449 *crp ^= RS_Uline;
2450 else
2451 {
2417 *crp ^= RS_RVid; 2452 *crp ^= RS_RVid;
2418#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
2419 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2420#endif 2455#endif
2456 }
2421 } 2457 }
2422 else if (oldcursor.row >= 0) 2458 else if (oldcursor.row >= 0)
2423 { 2459 {
2460 int cursorwidth = 1;
2461 int col = oldcursor.col;
2462
2463 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2464 col--;
2465
2466 while (col + cursorwidth < TermWin.ncol
2467 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2468 cursorwidth++;
2469
2424#ifndef NO_CURSORCOLOR 2470#ifndef NO_CURSORCOLOR
2425 if (ISSET_PIXCOLOR (Color_cursor)) 2471 if (ISSET_PIXCOLOR (Color_cursor))
2426 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2472 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2427#endif 2473#endif
2428 int cursorwidth = 1;
2429 while (oldcursor.col + cursorwidth < TermWin.ncol
2430 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2431 cursorwidth++;
2432 2474
2433 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2475 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2434 Col2Pixel (oldcursor.col), 2476 Col2Pixel (col),
2435 Row2Pixel (oldcursor.row), 2477 Row2Pixel (oldcursor.row),
2436 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2478 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2437 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2479 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2438 } 2480 }
2439 } 2481 }
… …
2510 if (!TermWin.mapped) 2552 if (!TermWin.mapped)
2511 return; 2553 return;
2512 2554
2513 num_scr_allow = 0; 2555 num_scr_allow = 0;
2514 want_refresh = 1; 2556 want_refresh = 1;
2515
2516#if TRANSPARENT
2517 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2518 {
2519 int i;
2520
2521 if (!(options & Opt_transparent_all))
2522 i = 0;
2523 else
2524 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2525
2526 while (i--)
2527 if (TermWin.parent[i] != None)
2528 XClearWindow (display->display, TermWin.parent[i]);
2529 }
2530#endif
2531 2557
2532 if (really) 2558 if (really)
2533 XClearWindow (display->display, TermWin.vt); 2559 XClearWindow (display->display, TermWin.vt);
2534} 2560}
2535 2561
… …
2649/* ------------------------------------------------------------------------- */ 2675/* ------------------------------------------------------------------------- */
2650/* 2676/*
2651 * Paste a selection direct to the command fd 2677 * Paste a selection direct to the command fd
2652 */ 2678 */
2653void 2679void
2654rxvt_term::paste (const unsigned char *data, unsigned int len) 2680rxvt_term::paste (unsigned char *data, unsigned int len)
2655{ 2681{
2656 unsigned int i, j, n;
2657 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2658
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2682 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (i = 0; i < len; i += PROP_SIZE) 2683 for (unsigned int i = 0; i < len; i++)
2661 {
2662 n = min (len - i, PROP_SIZE);
2663 memcpy (ds, data + i, n);
2664
2665 for (j = 0; j < n; j++)
2666 if (ds[j] == C0_LF) 2684 if (data[i] == C0_LF)
2667 ds[j] = C0_CR; 2685 data[i] = C0_CR;
2668 2686
2669 tt_write (ds, (int)n); 2687 tt_write (data, len);
2670 }
2671
2672 free (ds);
2673} 2688}
2674 2689
2675/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2676/* 2691/*
2677 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
2678 * EXT: SelectionNotify 2693 * EXT: SelectionNotify
2679 */ 2694 */
2680int 2695void
2681rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2682{ 2697{
2683 long nread = 0;
2684 unsigned long bytes_after;
2685 XTextProperty ct;
2686
2687 if (prop == None) /* check for failed XConvertSelection */ 2698 if (prop == None) /* check for failed XConvertSelection */
2688 { 2699 {
2689 if ((selection_type & Sel_CompoundText)) 2700 if ((selection_type & Sel_CompoundText))
2690 { 2701 {
2691 int selnum = selection_type & Sel_whereMask; 2702 int selnum = selection_type & Sel_whereMask;
… …
2704 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2715 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2705 else 2716 else
2706 selection_type = 0; 2717 selection_type = 0;
2707 } 2718 }
2708 2719
2709 return 0; 2720 return;
2710 }
2711
2712 for (;;)
2713 { 2721 }
2722
2723 unsigned long bytes_after;
2724 XTextProperty ct;
2725
2726 if (XGetWindowProperty (display->display, win, prop,
2727 0, PROP_SIZE / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct.encoding, &ct.format,
2730 &ct.nitems, &bytes_after,
2731 &ct.value) != Success)
2732 {
2733 ct.value = 0;
2734 goto bailout;
2735 }
2736
2737 if (ct.encoding == None)
2738 goto bailout;
2739
2740 if (bytes_after)
2741 {
2742 // fetch and append remaining data
2743 XTextProperty ct2;
2744
2714 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2745 if (XGetWindowProperty (display->display, win, prop,
2715 (long) (PROP_SIZE / 4), delete_prop, 2746 ct.nitems / 4, (bytes_after + 3) / 4,
2747 delete_prop, AnyPropertyType,
2716 AnyPropertyType, &ct.encoding, &ct.format, 2748 &ct2.encoding, &ct2.format,
2717 &ct.nitems, &bytes_after, 2749 &ct2.nitems, &bytes_after,
2718 &ct.value) != Success) 2750 &ct2.value) != Success)
2719 break; 2751 goto bailout;
2720 2752
2721 if (ct.encoding == 0) 2753 // realloc should be compatible to XFree, here, and elsewhere, too
2722 break; 2754 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2755 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2756 ct.nitems += ct2.nitems;
2723 2757
2758 XFree (ct2.value);
2759 }
2760
2761 if (ct.value == 0)
2762 goto bailout;
2763
2724 if (ct.encoding == xa[XA_INCR]) 2764 if (ct.encoding == xa[XA_INCR])
2725 { 2765 {
2726 // INCR selection, start handshake 2766 // INCR selection, start handshake
2767 if (!delete_prop)
2727 XDeleteProperty (display->display, win, prop); 2768 XDeleteProperty (display->display, win, prop);
2769
2728 selection_wait = Sel_incr; 2770 selection_wait = Sel_incr;
2771 incr_buf_fill = 0;
2729 incr_ev.start (NOW + 10); 2772 incr_ev.start (NOW + 10);
2730 break;
2731 }
2732 2773
2733 if (ct.value == NULL) 2774 goto bailout;
2734 continue; 2775 }
2735 2776
2736 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
2778 {
2779 if (selection_wait == Sel_incr)
2780 {
2781 XFree (ct.value);
2782
2783 // finally complete, now paste the whole thing
2784 selection_wait = Sel_normal;
2785 ct.value = (unsigned char *)incr_buf;
2786 ct.nitems = incr_buf_fill;
2787 incr_buf = 0;
2788 incr_buf_size = 0;
2789 incr_ev.stop ();
2737 { 2790 }
2791 else
2792 {
2738 if (selection_wait == Sel_normal && nread == 0 2793 if (selection_wait == Sel_normal
2739 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2740 { 2795 {
2741 /* 2796 /*
2742 * pass through again trying CUT_BUFFER0 if we've come from 2797 * pass through again trying CUT_BUFFER0 if we've come from
2743 * XConvertSelection () but nothing was presented 2798 * XConvertSelection () but nothing was presented
2744 */ 2799 */
2745 selection_paste (display->root, XA_CUT_BUFFER0, False); 2800 selection_paste (display->root, XA_CUT_BUFFER0, False);
2746 } 2801 }
2747 2802
2748 nread = -1; /* discount any previous stuff */ 2803 goto bailout;
2749 break; 2804 }
2805 }
2806 else if (selection_wait == Sel_incr)
2807 {
2808 incr_ev.start (NOW + 10);
2809
2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2750 } 2811 {
2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814 }
2751 2815
2816 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2752 nread += ct.nitems; 2817 incr_buf_fill += ct.nitems;
2753 2818
2819 goto bailout;
2820 }
2821
2754 char **cl; 2822 char **cl;
2755 int cr; 2823 int cr;
2824
2825#if ENABLE_FRILLS
2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827 // so recode it manually
2828 if (ct.encoding == xa[XA_UTF8_STRING])
2829 {
2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831 char *s = rxvt_wcstombs (w);
2832 free (w);
2833 // TODO: strlen == only the first element will be converted. well...
2834 paste ((unsigned char *)s, strlen (s));
2835 free (s);
2836 }
2837 else
2838#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2839 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2757 { 2840 && cl)
2841 {
2758 for (int i = 0; i < cr; i++) 2842 for (int i = 0; i < cr; i++)
2759 paste ((unsigned char *)cl[i], strlen (cl[i])); 2843 paste ((unsigned char *)cl[i], strlen (cl[i]));
2760 2844
2761 XFreeStringList (cl); 2845 XFreeStringList (cl);
2762 } 2846 }
2763 else 2847 else
2764 paste (ct.value, ct.nitems); 2848 paste (ct.value, ct.nitems); // paste raw
2765 2849
2766 if (bytes_after == 0) 2850bailout:
2767 break;
2768
2769 XFree (ct.value);
2770 }
2771
2772 if (ct.value)
2773 XFree (ct.value); 2851 XFree (ct.value);
2774 2852
2775 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2776 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2777
2778 return (int)nread;
2779} 2855}
2780 2856
2781void 2857void
2782rxvt_term::incr_cb (time_watcher &w) 2858rxvt_term::incr_cb (time_watcher &w)
2783{ 2859{
2784 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2785 2861
2862 incr_buf_size = 0;
2863 free (incr_buf);
2864
2786 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2787} 2866}
2788 2867
2789/*
2790 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2791 */
2792void 2868void
2793rxvt_term::selection_property (Window win, Atom prop) 2869rxvt_term::selection_property (Window win, Atom prop)
2794{ 2870{
2795 if (prop == None || selection_wait != Sel_incr) 2871 if (prop == None || selection_wait != Sel_incr)
2796 return; 2872 return;
2797 2873
2798 if (selection_paste (win, prop, 1) > 0) 2874 selection_paste (win, prop, true);
2799 incr_ev.start (NOW + 10);
2800 else
2801 {
2802 selection_wait = Sel_none;
2803 incr_ev.stop ();
2804 }
2805} 2875}
2806 2876
2807/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2808/* 2878/*
2809 * Request the current selection: 2879 * Request the current selection:
… …
2843#else 2913#else
2844 selection_type = Sel_CompoundText; 2914 selection_type = Sel_CompoundText;
2845 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2846 return; 2916 return;
2847#endif 2917#endif
2848
2849 } 2918 }
2850 } 2919 }
2851 2920
2852 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2921 selection_wait = Sel_none; /* don't loop in selection_paste () */
2853 selection_paste (display->root, XA_CUT_BUFFER0, False); 2922 selection_paste (display->root, XA_CUT_BUFFER0, false);
2854} 2923}
2855 2924
2856int 2925int
2857rxvt_term::selection_request_other (Atom target, int selnum) 2926rxvt_term::selection_request_other (Atom target, int selnum)
2858{ 2927{
2859 Atom sel; 2928 Atom sel;
2860#ifdef DEBUG_SELECT
2861 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2862#endif
2863 2929
2864 selection_type |= selnum; 2930 selection_type |= selnum;
2865 2931
2866 if (selnum == Sel_Primary) 2932 if (selnum == Sel_Primary)
2867 sel = XA_PRIMARY; 2933 sel = XA_PRIMARY;
… …
3014#if 0 3080#if 0
3015 XTextProperty ct; 3081 XTextProperty ct;
3016 3082
3017 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3083 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3018 { 3084 {
3019 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3085 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3020 PropModeReplace, ct.value, ct.nitems);
3021 XFree (ct.value); 3086 XFree (ct.value);
3022 } 3087 }
3023#endif 3088#endif
3024 3089
3025 selection_time = tm; 3090 selection_time = tm;
… …
3363 selection_delimit_word (DN, &selection.end, &selection.end); 3428 selection_delimit_word (DN, &selection.end, &selection.end);
3364 } 3429 }
3365 else if (selection.clicks == 3) 3430 else if (selection.clicks == 3)
3366 { 3431 {
3367#if ENABLE_FRILLS 3432#if ENABLE_FRILLS
3368 if ((options & Opt_tripleclickwords)) 3433 if (options & Opt_tripleclickwords)
3369 { 3434 {
3370 int end_row; 3435 int end_row;
3371 3436
3372 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3437 selection_delimit_word (UP, &selection.beg, &selection.beg);
3373 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3438 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3374 3439
3375 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3440 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3376 { 3441 {
3377 end_col = screen.tlen[end_row + TermWin.saveLines]; 3442 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3391 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3456 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3392 selection.mark.col++; 3457 selection.mark.col++;
3393 3458
3394 selection.beg.col = 0; 3459 selection.beg.col = 0;
3395 selection.end.col = ncol; 3460 selection.end.col = ncol;
3461
3462 // select a complete logical line
3463 while (selection.beg.row > -TermWin.saveLines
3464 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3465 selection.beg.row--;
3466
3467 while (selection.end.row < TermWin.nrow
3468 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3469 selection.end.row++;
3396 } 3470 }
3397 } 3471 }
3398 3472
3399 if (button3 && buttonpress) 3473 if (button3 && buttonpress)
3400 { /* mark may need to be changed */ 3474 { /* mark may need to be changed */
… …
3473 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3547 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3474} 3548}
3475 3549
3476/* ------------------------------------------------------------------------- */ 3550/* ------------------------------------------------------------------------- */
3477/* 3551/*
3478 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3479 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3480 * the X11 protocol.
3481 */
3482typedef CARD32 Atom32;
3483
3484/* ------------------------------------------------------------------------- */
3485/*
3486 * Respond to a request for our current selection 3552 * Respond to a request for our current selection
3487 * EXT: SelectionRequest 3553 * EXT: SelectionRequest
3488 */ 3554 */
3489void 3555void
3490rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3556rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3491{ 3557{
3492 XSelectionEvent ev; 3558 XSelectionEvent ev;
3493 XTextProperty ct; 3559 dDisp;
3494 XICCEncodingStyle style;
3495 Atom target;
3496 3560
3497 ev.type = SelectionNotify; 3561 ev.type = SelectionNotify;
3498 ev.property = None; 3562 ev.property = None;
3499 ev.display = rq.display; 3563 ev.display = rq.display;
3500 ev.requestor = rq.requestor; 3564 ev.requestor = rq.requestor;
… …
3502 ev.target = rq.target; 3566 ev.target = rq.target;
3503 ev.time = rq.time; 3567 ev.time = rq.time;
3504 3568
3505 if (rq.target == xa[XA_TARGETS]) 3569 if (rq.target == xa[XA_TARGETS])
3506 { 3570 {
3507 Atom32 target_list[6]; 3571 Atom target_list[6];
3508 Atom32 *target = target_list; 3572 Atom *target = target_list;
3509 3573
3510 *target++ = (Atom32) xa[XA_TARGETS]; 3574 *target++ = xa[XA_TARGETS];
3511 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3575 *target++ = xa[XA_TIMESTAMP];
3512 *target++ = (Atom32) XA_STRING; 3576 *target++ = XA_STRING;
3513 *target++ = (Atom32) xa[XA_TEXT]; 3577 *target++ = xa[XA_TEXT];
3514 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3578 *target++ = xa[XA_COMPOUND_TEXT];
3515#if X_HAVE_UTF8_STRING 3579#if X_HAVE_UTF8_STRING
3516 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3580 *target++ = xa[XA_UTF8_STRING];
3517#endif 3581#endif
3518 3582
3519 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3583 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3520 (8 * sizeof (target_list[0])), PropModeReplace, 3584 32, PropModeReplace,
3521 (unsigned char *)target_list, 3585 (unsigned char *)target_list, target - target_list);
3522 target - target_list);
3523 ev.property = rq.property; 3586 ev.property = rq.property;
3524 } 3587 }
3525#if TODO // TODO 3588#if TODO // TODO
3526 else if (rq.target == xa[XA_MULTIPLE]) 3589 else if (rq.target == xa[XA_MULTIPLE])
3527 { 3590 {
3528 /* TODO: Handle MULTIPLE */ 3591 /* TODO: Handle MULTIPLE */
3529 } 3592 }
3530#endif 3593#endif
3531 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3532 { 3595 {
3533 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3596 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3534 (8 * sizeof (Time)), PropModeReplace,
3535 (unsigned char *)&selection_time, 1); 3597 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3536 ev.property = rq.property; 3598 ev.property = rq.property;
3537 } 3599 }
3538 else if (rq.target == XA_STRING 3600 else if (rq.target == XA_STRING
3539 || rq.target == xa[XA_TEXT] 3601 || rq.target == xa[XA_TEXT]
3540 || rq.target == xa[XA_COMPOUND_TEXT] 3602 || rq.target == xa[XA_COMPOUND_TEXT]
3541 || rq.target == xa[XA_UTF8_STRING] 3603 || rq.target == xa[XA_UTF8_STRING]
3542 ) 3604 )
3543 { 3605 {
3606 XTextProperty ct;
3607 Atom target = rq.target;
3544 short freect = 0; 3608 short freect = 0;
3545 int selectlen; 3609 int selectlen;
3546 wchar_t *cl; 3610 wchar_t *cl;
3547 3611 enum {
3548 target = rq.target; 3612 enc_string = XStringStyle,
3613 enc_text = XStdICCTextStyle,
3614 enc_compound_text = XCompoundTextStyle,
3615#ifdef X_HAVE_UTF8_STRING
3616 enc_utf8 = XUTF8StringStyle,
3617#else
3618 enc_utf8 = -1,
3619#endif
3620 } style;
3549 3621
3550 if (target == XA_STRING) 3622 if (target == XA_STRING)
3551 // we actually don't do XA_STRING, but who cares, as i18n clients 3623 // we actually don't do XA_STRING, but who cares, as i18n clients
3552 // will ask for another format anyways. 3624 // will ask for another format anyways.
3553 style = XStringStyle; 3625 style = enc_string;
3554 else if (target == xa[XA_TEXT]) 3626 else if (target == xa[XA_TEXT])
3555 style = XStdICCTextStyle; 3627 style = enc_text;
3556 else if (target == xa[XA_COMPOUND_TEXT]) 3628 else if (target == xa[XA_COMPOUND_TEXT])
3557 style = XCompoundTextStyle; 3629 style = enc_compound_text;
3558#if X_HAVE_UTF8_STRING 3630#if ENABLE_FRILLS
3559 else if (target == xa[XA_UTF8_STRING]) 3631 else if (target == xa[XA_UTF8_STRING])
3560 style = XUTF8StringStyle; 3632 style = enc_utf8;
3561#endif 3633#endif
3562 else 3634 else
3563 { 3635 {
3564 target = xa[XA_COMPOUND_TEXT]; 3636 target = xa[XA_COMPOUND_TEXT];
3565 style = XCompoundTextStyle; 3637 style = enc_compound_text;
3566 } 3638 }
3567 3639
3568 if (selection.text) 3640 if (selection.text)
3569 { 3641 {
3570 cl = selection.text; 3642 cl = selection.text;
… …
3574 { 3646 {
3575 cl = L""; 3647 cl = L"";
3576 selectlen = 0; 3648 selectlen = 0;
3577 } 3649 }
3578 3650
3579 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3651#if ENABLE_FRILLS
3580 // manually for XUTF8StringStyle. 3652 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3653 // so recode it manually
3654 if (style == enc_utf8)
3655 {
3656 freect = 1;
3657 ct.encoding = target;
3658 ct.format = 8;
3659 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3660 ct.nitems = strlen ((char *)ct.value);
3661 }
3662 else
3663#endif
3581 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3664 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3582 freect = 1; 3665 freect = 1;
3583 else 3666 else
3584 { 3667 {
3585 /* if we failed to convert then send it raw */ 3668 /* if we failed to convert then send it raw */
3586 ct.value = (unsigned char *)cl; 3669 ct.value = (unsigned char *)cl;
3587 ct.nitems = selectlen; 3670 ct.nitems = selectlen;
3671 ct.encoding = target;
3588 } 3672 }
3589 3673
3590 XChangeProperty (display->display, rq.requestor, rq.property, 3674 XChangeProperty (disp, rq.requestor, rq.property,
3591 target, 8, PropModeReplace, 3675 ct.encoding, 8, PropModeReplace,
3592 ct.value, (int)ct.nitems); 3676 ct.value, (int)ct.nitems);
3593 ev.property = rq.property; 3677 ev.property = rq.property;
3594 3678
3595 if (freect) 3679 if (freect)
3596 XFree (ct.value); 3680 XFree (ct.value);
3597 } 3681 }
3598 3682
3599 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3683 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3600} 3684}
3601 3685
3602/* ------------------------------------------------------------------------- * 3686/* ------------------------------------------------------------------------- *
3603 * MOUSE ROUTINES * 3687 * MOUSE ROUTINES *
3604 * ------------------------------------------------------------------------- */ 3688 * ------------------------------------------------------------------------- */
… …
3724 while (*s) 3808 while (*s)
3725 scr_overlay_set (x++, y, *s++); 3809 scr_overlay_set (x++, y, *s++);
3726} 3810}
3727 3811
3728void 3812void
3813rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3814{
3815 while (*s)
3816 {
3817 text_t t = *s++;
3818 int width = wcwidth (t);
3819
3820 while (width--)
3821 {
3822 scr_overlay_set (x++, y, t);
3823 t = NOCHAR;
3824 }
3825 }
3826}
3827
3828void
3729rxvt_term::scr_swap_overlay () 3829rxvt_term::scr_swap_overlay ()
3730{ 3830{
3731 if (!ov_text) 3831 if (!ov_text)
3732 return; 3832 return;
3733 3833

Diff Legend

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