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.143 by root, Sat Dec 4 04:06:03 2004 UTC vs.
Revision 1.167 by root, Fri Aug 5 16:42:44 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;
571 567
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574# ifdef DEBUG_STRICT
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0); 570 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0); 572 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583 574
584#if NSCREENS 575#if NSCREENS
585 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
586 { 577 {
587 num_scr = 0; 578 num_scr = 0;
… …
600 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
601 } 592 }
602 else 593 else
603#endif 594#endif
604 if (options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
605 //if (current_screen == PRIMARY)
606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607 597
608 return scrn; 598 return scrn;
609} 599}
610 600
611// clear WrapNext indicator, solidifying position on next line 601// clear WrapNext indicator, solidifying position on next line
… …
709 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710 } 700 }
711 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
712 { 702 {
713 /* move selected region too */ 703 /* move selected region too */
714 selection.beg.row -= count; 704 selection.beg.row -= count;
715 selection.end.row -= count; 705 selection.end.row -= count;
716 selection.mark.row -= count; 706 selection.mark.row -= count;
717 } 707 }
718 } 708 }
719 709
720 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
728 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
729 MIN_IT (count, i); 719 MIN_IT (count, i);
730 720
731 if (j > 0) 721 if (j > 0)
732 { 722 {
733 /* A: scroll up */ 723 /* scroll up */
734 724
735 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738 728
739 /* A2: Rotate lines */ 729 /* Rotate lines */
740 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
741 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));
742 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 *));
743 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 *));
744 734
745 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
746 } 736 }
747 else /* if (j < 0) */ 737 else /* if (j < 0) */
748 { 738 {
749 /* B: scroll down */ 739 /* scroll down */
750 740
751 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
752 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
753 { 743 {
754 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
755 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
756 } 746 }
757 747
758 /* B2: Rotate lines */ 748 /* Rotate lines */
759 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
760 { 750 {
761 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
762 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
763 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
765 755
766 j = row1, i = count; 756 j = row1, i = count;
767 count = -count; 757 count = -count;
768 } 758 }
769 759
770 /* C: Resurrect lines */ 760 /* Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
775 for (; i--; j++) 765 for (; i--; j++)
… …
783 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
784 */ 774 */
785void 775void
786rxvt_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)
787{ 777{
778 if (len <= 0) /* sanity */
779 return;
780
788 unsigned char checksel; 781 unsigned char checksel;
789 unicode_t c; 782 unicode_t c;
790 int i, row, last_col; 783 int i, row, last_col;
791 text_t *stp; 784 text_t *stp;
792 rend_t *srp; 785 rend_t *srp;
793 786 const unicode_t *strend = str + len;
794 if (len <= 0) /* sanity */
795 return;
796 787
797 want_refresh = 1; 788 want_refresh = 1;
798 ZERO_SCROLLBACK (); 789 ZERO_SCROLLBACK ();
799 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
800 791
… …
825 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
826 817
827 stp = screen.text[row]; 818 stp = screen.text[row];
828 srp = screen.rend[row]; 819 srp = screen.rend[row];
829 820
830 while (len--) 821 while (str < strend)
831 { 822 {
832 c = *str++; 823 c = *str++;
833 824
834 if (c < 0x20) 825 if (c < 0x20)
835 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)
836 { 843 {
837 case C0_HT:
838 scr_tab (1, true);
839 continue;
840
841 case C0_LF:
842 if (screen.tlen[row] != -1) /* XXX: think about this */ 844 if (screen.tlen[row] != -1) /* XXX: think about this */
843 MAX_IT (screen.tlen[row], screen.cur.col); 845 MAX_IT (screen.tlen[row], screen.cur.col);
844 846
845 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
846
847 if (screen.cur.row == screen.bscroll)
848 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
849 else if (screen.cur.row < (TermWin.nrow - 1))
850 row = (++screen.cur.row) + TermWin.saveLines;
851
852 stp = screen.text[row]; /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */
854 continue;
855
856 case C0_CR:
857 if (screen.tlen[row] != -1) /* XXX: think about this */
858 MAX_IT (screen.tlen[row], screen.cur.col);
859
860 screen.flags &= ~Screen_WrapNext;
861 screen.cur.col = 0; 848 screen.cur.col = 0;
862 continue; 849 continue;
850 }
851 else if (c == C0_HT)
852 {
853 scr_tab (1, true);
854 continue;
863 } 855 }
864 856
865 if (checksel /* see if we're writing within selection */ 857 if (checksel /* see if we're writing within selection */
866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
877 869
878 if (screen.flags & Screen_WrapNext) 870 if (screen.flags & Screen_WrapNext)
879 { 871 {
880 screen.tlen[row] = -1; 872 screen.tlen[row] = -1;
881 873
874 scr_do_wrap ();
875
882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 876 row = screen.cur.row + TermWin.saveLines;
883
884 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
885 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
886 } 879 }
887 880
881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff))
883 c = 0xfffd;
884
888 // 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
889 // do wcwidth before further replacements, as wcwidth says that line-drawing 886 // do wcwidth before further replacements, as wcwidth might return -1
890 // 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.
891 int width = c < 0x100 ? 1 : wcwidth (c); 889 int width = c < 0x100 ? 1 : wcwidth (c);
892 890
893 if (charsets[screen.charset] == '0') // DEC SPECIAL 891 if (charsets[screen.charset] == '0') // DEC SPECIAL
894 { 892 {
895 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100 894 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
898 static uint16_t vt100_0[63] = { // 40 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
899 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!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 898 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 899 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 900 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
907 }; 905 };
908 906
909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 907 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
910 { 908 {
911 c = vt100_0[c - 0x40]; 909 c = vt100_0[c - 0x41];
912 width = 1; 910 width = 1; // vt100 line drawing characters are always single-width
913 } 911 }
914 } 912 }
915 913
916 if (screen.flags & Screen_Insert) 914 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
918 916
919 if (width != 0) 917 if (width != 0)
920 { 918 {
921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3 919#if !UNICODE_3
926 // trim characters we can't store directly :( 920 // trim characters we can't store directly :(
927 if (c >= 0x10000) 921 if (c >= 0x10000)
928# if ENABLE_COMBINING 922# if ENABLE_COMBINING
929 c = rxvt_composite.compose (c); // map to lower 16 bits 923 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
952 col++; 946 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR); 947 } while (col < TermWin.ncol && stp[col] == NOCHAR);
954 } 948 }
955 949
956 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 }
957 960
958 do 961 do
959 { 962 {
960 stp[screen.cur.col] = c; 963 stp[screen.cur.col] = c;
961 srp[screen.cur.col] = rend; 964 srp[screen.cur.col] = rend;
… …
973 c = NOCHAR; 976 c = NOCHAR;
974 } 977 }
975 while (--width > 0); 978 while (--width > 0);
976 979
977 // pad with spaces when overwriting wide character with smaller one 980 // pad with spaces when overwriting wide character with smaller one
981 if (!width)
978 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++)
979 { 983 {
980 stp[c] = ' '; 984 stp[c] = ' ';
981 srp[c] = rend; 985 srp[c] = rend;
982 } 986 }
983 } 987 }
984 else if (width == 0) 988 else // width == 0
985 { 989 {
986#if ENABLE_COMBINING 990#if ENABLE_COMBINING
987 // handle combining characters 991 // handle combining characters
988 // we just tag the accent on the previous on-screen character. 992 // we just tag the accent on the previous on-screen character.
989 // this is arguably not correct, but also arguably not wrong. 993 // this is arguably not correct, but also arguably not wrong.
990 // we don't handle double-width characters nicely yet. 994 // we don't handle double-width characters nicely yet.
991
992 text_t *tp; 995 text_t *tp;
993 rend_t *rp; 996 rend_t *rp;
994 997
995 if (screen.cur.col > 0) 998 if (screen.cur.col > 0)
996 { 999 {
… …
1170 */ 1173 */
1171#if ENABLE_FRILLS 1174#if ENABLE_FRILLS
1172void 1175void
1173rxvt_term::scr_forwardindex () 1176rxvt_term::scr_forwardindex ()
1174{ 1177{
1175 int row; 1178 int row;
1176 1179
1177 if (screen.cur.col < TermWin.ncol - 1) 1180 if (screen.cur.col < TermWin.ncol - 1)
1178 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1179 else 1182 else
1180 { 1183 {
… …
1399 screen.tlen[row + row_offset] = 0; 1402 screen.tlen[row + row_offset] = 0;
1400 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1401 } 1404 }
1402} 1405}
1403 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
1417
1404/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1405/* 1419/*
1406 * Fill the screen with `E's 1420 * Fill the screen with `E's
1407 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1408 */ 1422 */
1409void 1423void
1410rxvt_term::scr_E () 1424rxvt_term::scr_E ()
1411{ 1425{
1412 int i, j, k; 1426 int i, j, k;
1413 rend_t *r1, fs; 1427 rend_t *r1, fs;
1414 1428
1415 want_refresh = 1; 1429 want_refresh = 1;
1416 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1417 1431
1418 num_scr_allow = 0; 1432 num_scr_allow = 0;
… …
1901rxvt_term::scr_page (enum page_dirn direction, int nlines) 1915rxvt_term::scr_page (enum page_dirn direction, int nlines)
1902{ 1916{
1903 int n; 1917 int n;
1904 unsigned int oldviewstart; 1918 unsigned int oldviewstart;
1905 1919
1906#ifdef DEBUG_STRICT
1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1908#endif
1909 oldviewstart = TermWin.view_start; 1920 oldviewstart = TermWin.view_start;
1921
1910 if (direction == UP) 1922 if (direction == UP)
1911 { 1923 {
1912 n = TermWin.view_start + nlines; 1924 n = TermWin.view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled); 1925 TermWin.view_start = min (n, TermWin.nscrolled);
1914 } 1926 }
1915 else 1927 else
1916 { 1928 {
1917 n = TermWin.view_start - nlines; 1929 n = TermWin.view_start - nlines;
1918 TermWin.view_start = max (n, 0); 1930 TermWin.view_start = max (n, 0);
1919 } 1931 }
1932
1920 return scr_changeview (oldviewstart); 1933 return scr_changeview (oldviewstart);
1921} 1934}
1922 1935
1923int 1936int
1924rxvt_term::scr_changeview (unsigned int oldviewstart) 1937rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
1935/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1936void 1949void
1937rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1938{ 1951{
1939#ifndef NO_BELL 1952#ifndef NO_BELL
1953
1940# ifndef NO_MAPALERT 1954# ifndef NO_MAPALERT
1941# ifdef MAPALERT_OPTION 1955# ifdef MAPALERT_OPTION
1942 if (options & Opt_mapAlert) 1956 if (options & Opt_mapAlert)
1943# endif 1957# endif
1944 XMapWindow (display->display, TermWin.parent[0]); 1958 XMapWindow (display->display, TermWin.parent[0]);
1945# endif 1959# endif
1960
1946 if (options & Opt_visualBell) 1961 if (options & Opt_visualBell)
1947 { 1962 {
1948 scr_rvideo_mode (!rvideo); /* refresh also done */ 1963 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION);
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1965 scr_rvideo_mode (!rvideo); /* refresh also done */
1950 } 1966 }
1951 else 1967 else
1952 XBell (display->display, 0); 1968 XBell (display->display, 0);
1969
1953#endif 1970#endif
1954} 1971}
1955 1972
1956/* ------------------------------------------------------------------------- */ 1973/* ------------------------------------------------------------------------- */
1957/* ARGSUSED */ 1974/* ARGSUSED */
… …
2012/* 2029/*
2013 * Refresh the screen 2030 * Refresh the screen
2014 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
2015 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2016 */ 2033 */
2017
2018#define FONT_WIDTH(X, Y) \
2019 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2020#define FONT_RBEAR(X, Y) \
2021 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2022#define FONT_LBEAR(X, Y) \
2023 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2024#define IS_FONT_CHAR(X, Y) \
2025 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2026
2027void 2034void
2028rxvt_term::scr_refresh (unsigned char refresh_type) 2035rxvt_term::scr_refresh (unsigned char refresh_type)
2029{ 2036{
2030 unsigned char must_clear, /* use draw_string not draw_image_string */ 2037 unsigned char must_clear, /* use draw_string not draw_image_string */
2031 showcursor; /* show the cursor */ 2038 showcursor; /* show the cursor */
… …
2050 refresh_count = 0; 2057 refresh_count = 0;
2051 2058
2052 row_offset = TermWin.saveLines - TermWin.view_start; 2059 row_offset = TermWin.saveLines - TermWin.view_start;
2053 2060
2054#if XPM_BACKGROUND 2061#if XPM_BACKGROUND
2055 must_clear |= (bgPixmap.pixmap != None); 2062 must_clear |= bgPixmap.pixmap != None;
2056#endif 2063#endif
2057#if TRANSPARENT 2064#if TRANSPARENT
2058 must_clear |= ((options & Opt_transparent) && am_transparent); 2065 must_clear |= (options & Opt_transparent) && am_transparent;
2059#endif 2066#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2068
2062 /* 2069 /*
2063 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
2087 2094
2088 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2089 2096
2090 if (showcursor && TermWin.focus) 2097 if (showcursor && TermWin.focus)
2091 { 2098 {
2099 if (options & Opt_cursorUnderline)
2100 *crp ^= RS_Uline;
2101 else
2102 {
2092 *crp ^= RS_RVid; 2103 *crp ^= RS_RVid;
2104
2093#ifndef NO_CURSORCOLOR 2105#ifndef NO_CURSORCOLOR
2094 cc1 = *crp & (RS_fgMask | RS_bgMask); 2106 cc1 = *crp & (RS_fgMask | RS_bgMask);
2095 if (ISSET_PIXCOLOR (Color_cursor)) 2107 if (ISSET_PIXCOLOR (Color_cursor))
2096 ccol1 = Color_cursor; 2108 ccol1 = Color_cursor;
2097 else 2109 else
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099 ccol1 = GET_FGCOLOR (rstyle); 2111 ccol1 = GET_FGCOLOR (rstyle);
2100#else 2112#else
2101 ccol1 = Color_fg; 2113 ccol1 = Color_fg;
2102#endif 2114#endif
2103 if (ISSET_PIXCOLOR (Color_cursor2)) 2115 if (ISSET_PIXCOLOR (Color_cursor2))
2104 ccol2 = Color_cursor2; 2116 ccol2 = Color_cursor2;
2105 else 2117 else
2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2118#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2107 ccol2 = GET_BGCOLOR (rstyle); 2119 ccol2 = GET_BGCOLOR (rstyle);
2108#else 2120#else
2109 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2110#endif 2122#endif
2111 *crp = SET_FGCOLOR (*crp, ccol1); 2123 *crp = SET_FGCOLOR (*crp, ccol1);
2112 *crp = SET_BGCOLOR (*crp, ccol2); 2124 *crp = SET_BGCOLOR (*crp, ccol2);
2113#endif 2125#endif
2126 }
2114 } 2127 }
2115 } 2128 }
2116 2129
2117 /* make sure no outline cursor is left around */ 2130 /* make sure no outline cursor is left around */
2118 setoldcursor = 0; 2131 setoldcursor = 0;
… …
2398 } 2411 }
2399 else 2412 else
2400 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2401 2414
2402 if (rend & RS_Uline && font->descent > 1 && fore != back) 2415 if (rend & RS_Uline && font->descent > 1 && fore != back)
2416 {
2417#if ENABLE_FRILLS
2418 if (ISSET_PIXCOLOR (Color_underline))
2419 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2420 else
2421#endif
2422 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2423
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2424 XDrawLine (display->display, drawBuffer, TermWin.gc,
2404 xpixel, ypixel + font->ascent + 1, 2425 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2427 }
2406 } /* for (col....) */ 2428 } /* for (col....) */
2407 } /* for (row....) */ 2429 } /* for (row....) */
2408 2430
2409#if ENABLE_OVERLAY 2431#if ENABLE_OVERLAY
2410 scr_swap_overlay (); 2432 scr_swap_overlay ();
… …
2415 */ 2437 */
2416 if (showcursor) 2438 if (showcursor)
2417 { 2439 {
2418 if (TermWin.focus) 2440 if (TermWin.focus)
2419 { 2441 {
2442 if (options & Opt_cursorUnderline)
2443 *crp ^= RS_Uline;
2444 else
2445 {
2420 *crp ^= RS_RVid; 2446 *crp ^= RS_RVid;
2421#ifndef NO_CURSORCOLOR 2447#ifndef NO_CURSORCOLOR
2422 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2448 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2423#endif 2449#endif
2450 }
2424 } 2451 }
2425 else if (oldcursor.row >= 0) 2452 else if (oldcursor.row >= 0)
2426 { 2453 {
2454 int cursorwidth = 1;
2455 int col = oldcursor.col;
2456
2457 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2458 col--;
2459
2460 while (col + cursorwidth < TermWin.ncol
2461 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2462 cursorwidth++;
2463
2427#ifndef NO_CURSORCOLOR 2464#ifndef NO_CURSORCOLOR
2428 if (ISSET_PIXCOLOR (Color_cursor)) 2465 if (ISSET_PIXCOLOR (Color_cursor))
2429 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2466 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2430#endif 2467#endif
2431 int cursorwidth = 1;
2432 while (oldcursor.col + cursorwidth < TermWin.ncol
2433 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2434 cursorwidth++;
2435 2468
2436 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2469 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2437 Col2Pixel (oldcursor.col), 2470 Col2Pixel (col),
2438 Row2Pixel (oldcursor.row), 2471 Row2Pixel (oldcursor.row),
2439 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2472 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2440 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2473 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2441 } 2474 }
2442 } 2475 }
… …
2652/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2653/* 2686/*
2654 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2655 */ 2688 */
2656void 2689void
2657rxvt_term::paste (const unsigned char *data, unsigned int len) 2690rxvt_term::paste (unsigned char *data, unsigned int len)
2658{ 2691{
2659 unsigned int i, j, n;
2660 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2661
2662 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2663 for (i = 0; i < len; i += PROP_SIZE) 2693 for (unsigned int i = 0; i < len; i++)
2664 {
2665 n = min (len - i, PROP_SIZE);
2666 memcpy (ds, data + i, n);
2667
2668 for (j = 0; j < n; j++)
2669 if (ds[j] == C0_LF) 2694 if (data[i] == C0_LF)
2670 ds[j] = C0_CR; 2695 data[i] = C0_CR;
2671 2696
2672 tt_write (ds, (int)n); 2697 tt_write (data, len);
2673 }
2674
2675 free (ds);
2676} 2698}
2677 2699
2678/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2679/* 2701/*
2680 * Respond to a notification that a primary selection has been sent 2702 * Respond to a notification that a primary selection has been sent
2681 * EXT: SelectionNotify 2703 * EXT: SelectionNotify
2682 */ 2704 */
2683int 2705void
2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2685{ 2707{
2686 long nread = 0;
2687 unsigned long bytes_after;
2688 XTextProperty ct;
2689
2690 if (prop == None) /* check for failed XConvertSelection */ 2708 if (prop == None) /* check for failed XConvertSelection */
2691 { 2709 {
2692 if ((selection_type & Sel_CompoundText)) 2710 if ((selection_type & Sel_CompoundText))
2693 { 2711 {
2694 int selnum = selection_type & Sel_whereMask; 2712 int selnum = selection_type & Sel_whereMask;
… …
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else 2726 else
2709 selection_type = 0; 2727 selection_type = 0;
2710 } 2728 }
2711 2729
2712 return 0; 2730 return;
2713 }
2714
2715 for (;;)
2716 { 2731 }
2732
2733 unsigned long bytes_after;
2734 XTextProperty ct;
2735
2736 if (XGetWindowProperty (display->display, win, prop,
2737 0, PROP_SIZE / 4,
2738 delete_prop, AnyPropertyType,
2739 &ct.encoding, &ct.format,
2740 &ct.nitems, &bytes_after,
2741 &ct.value) != Success)
2742 {
2743 ct.value = 0;
2744 goto bailout;
2745 }
2746
2747 if (ct.encoding == None)
2748 goto bailout;
2749
2750 if (bytes_after)
2751 {
2752 // fetch and append remaining data
2753 XTextProperty ct2;
2754
2717 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2755 if (XGetWindowProperty (display->display, win, prop,
2718 (long) (PROP_SIZE / 4), delete_prop, 2756 ct.nitems / 4, (bytes_after + 3) / 4,
2757 delete_prop, AnyPropertyType,
2719 AnyPropertyType, &ct.encoding, &ct.format, 2758 &ct2.encoding, &ct2.format,
2720 &ct.nitems, &bytes_after, 2759 &ct2.nitems, &bytes_after,
2721 &ct.value) != Success) 2760 &ct2.value) != Success)
2722 break; 2761 goto bailout;
2723 2762
2724 if (ct.encoding == 0) 2763 // realloc should be compatible to XFree, here, and elsewhere, too
2725 break; 2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems;
2726 2767
2768 XFree (ct2.value);
2769 }
2770
2771 if (ct.value == 0)
2772 goto bailout;
2773
2727 if (ct.encoding == xa[XA_INCR]) 2774 if (ct.encoding == xa[XA_INCR])
2728 { 2775 {
2729 // INCR selection, start handshake 2776 // INCR selection, start handshake
2777 if (!delete_prop)
2730 XDeleteProperty (display->display, win, prop); 2778 XDeleteProperty (display->display, win, prop);
2779
2731 selection_wait = Sel_incr; 2780 selection_wait = Sel_incr;
2781 incr_buf_fill = 0;
2732 incr_ev.start (NOW + 10); 2782 incr_ev.start (NOW + 10);
2733 break;
2734 }
2735 2783
2736 if (ct.value == NULL) 2784 goto bailout;
2737 continue; 2785 }
2738 2786
2739 if (ct.nitems == 0) 2787 if (ct.nitems == 0)
2788 {
2789 if (selection_wait == Sel_incr)
2790 {
2791 XFree (ct.value);
2792
2793 // finally complete, now paste the whole thing
2794 selection_wait = Sel_normal;
2795 ct.value = (unsigned char *)incr_buf;
2796 ct.nitems = incr_buf_fill;
2797 incr_buf = 0;
2798 incr_buf_size = 0;
2799 incr_ev.stop ();
2740 { 2800 }
2801 else
2802 {
2741 if (selection_wait == Sel_normal && nread == 0 2803 if (selection_wait == Sel_normal
2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2743 { 2805 {
2744 /* 2806 /*
2745 * pass through again trying CUT_BUFFER0 if we've come from 2807 * pass through again trying CUT_BUFFER0 if we've come from
2746 * XConvertSelection () but nothing was presented 2808 * XConvertSelection () but nothing was presented
2747 */ 2809 */
2748 selection_paste (display->root, XA_CUT_BUFFER0, False); 2810 selection_paste (display->root, XA_CUT_BUFFER0, False);
2749 } 2811 }
2750 2812
2751 nread = -1; /* discount any previous stuff */ 2813 goto bailout;
2752 break; 2814 }
2815 }
2816 else if (selection_wait == Sel_incr)
2817 {
2818 incr_ev.start (NOW + 10);
2819
2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2753 } 2821 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2824 }
2754 2825
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2755 nread += ct.nitems; 2827 incr_buf_fill += ct.nitems;
2756 2828
2829 goto bailout;
2830 }
2831
2757 char **cl; 2832 char **cl;
2758 int cr; 2833 int cr;
2834
2835#if ENABLE_FRILLS
2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2837 // so recode it manually
2838 if (ct.encoding == xa[XA_UTF8_STRING])
2839 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w);
2842 free (w);
2843 // TODO: strlen == only the first element will be converted. well...
2844 paste ((unsigned char *)s, strlen (s));
2845 free (s);
2846 }
2847 else
2848#endif
2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2849 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2760 { 2850 && cl)
2851 {
2761 for (int i = 0; i < cr; i++) 2852 for (int i = 0; i < cr; i++)
2762 paste ((unsigned char *)cl[i], strlen (cl[i])); 2853 paste ((unsigned char *)cl[i], strlen (cl[i]));
2763 2854
2764 XFreeStringList (cl); 2855 XFreeStringList (cl);
2765 } 2856 }
2766 else 2857 else
2767 paste (ct.value, ct.nitems); 2858 paste (ct.value, ct.nitems); // paste raw
2768 2859
2769 if (bytes_after == 0) 2860bailout:
2770 break;
2771
2772 XFree (ct.value);
2773 }
2774
2775 if (ct.value)
2776 XFree (ct.value); 2861 XFree (ct.value);
2777 2862
2778 if (selection_wait == Sel_normal) 2863 if (selection_wait == Sel_normal)
2779 selection_wait = Sel_none; 2864 selection_wait = Sel_none;
2780
2781 return (int)nread;
2782} 2865}
2783 2866
2784void 2867void
2785rxvt_term::incr_cb (time_watcher &w) 2868rxvt_term::incr_cb (time_watcher &w)
2786{ 2869{
2787 selection_wait = Sel_none; 2870 selection_wait = Sel_none;
2788 2871
2872 incr_buf_size = 0;
2873 free (incr_buf);
2874
2789 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2790} 2876}
2791 2877
2792/*
2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2794 */
2795void 2878void
2796rxvt_term::selection_property (Window win, Atom prop) 2879rxvt_term::selection_property (Window win, Atom prop)
2797{ 2880{
2798 if (prop == None || selection_wait != Sel_incr) 2881 if (prop == None || selection_wait != Sel_incr)
2799 return; 2882 return;
2800 2883
2801 if (selection_paste (win, prop, 1) > 0) 2884 selection_paste (win, prop, true);
2802 incr_ev.start (NOW + 10);
2803 else
2804 {
2805 selection_wait = Sel_none;
2806 incr_ev.stop ();
2807 }
2808} 2885}
2809 2886
2810/* ------------------------------------------------------------------------- */ 2887/* ------------------------------------------------------------------------- */
2811/* 2888/*
2812 * Request the current selection: 2889 * Request the current selection:
… …
2846#else 2923#else
2847 selection_type = Sel_CompoundText; 2924 selection_type = Sel_CompoundText;
2848 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849 return; 2926 return;
2850#endif 2927#endif
2851
2852 } 2928 }
2853 } 2929 }
2854 2930
2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2931 selection_wait = Sel_none; /* don't loop in selection_paste () */
2856 selection_paste (display->root, XA_CUT_BUFFER0, False); 2932 selection_paste (display->root, XA_CUT_BUFFER0, false);
2857} 2933}
2858 2934
2859int 2935int
2860rxvt_term::selection_request_other (Atom target, int selnum) 2936rxvt_term::selection_request_other (Atom target, int selnum)
2861{ 2937{
2862 Atom sel; 2938 Atom sel;
2863#ifdef DEBUG_SELECT
2864 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2865#endif
2866 2939
2867 selection_type |= selnum; 2940 selection_type |= selnum;
2868 2941
2869 if (selnum == Sel_Primary) 2942 if (selnum == Sel_Primary)
2870 sel = XA_PRIMARY; 2943 sel = XA_PRIMARY;
… …
3017#if 0 3090#if 0
3018 XTextProperty ct; 3091 XTextProperty ct;
3019 3092
3020 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3093 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021 { 3094 {
3022 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023 PropModeReplace, ct.value, ct.nitems);
3024 XFree (ct.value); 3096 XFree (ct.value);
3025 } 3097 }
3026#endif 3098#endif
3027 3099
3028 selection_time = tm; 3100 selection_time = tm;
… …
3366 selection_delimit_word (DN, &selection.end, &selection.end); 3438 selection_delimit_word (DN, &selection.end, &selection.end);
3367 } 3439 }
3368 else if (selection.clicks == 3) 3440 else if (selection.clicks == 3)
3369 { 3441 {
3370#if ENABLE_FRILLS 3442#if ENABLE_FRILLS
3371 if ((options & Opt_tripleclickwords)) 3443 if (options & Opt_tripleclickwords)
3372 { 3444 {
3373 int end_row; 3445 int end_row;
3374 3446
3375 selection_delimit_word (UP, &selection.beg, &selection.beg); 3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3376 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3448 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3394 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3466 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3395 selection.mark.col++; 3467 selection.mark.col++;
3396 3468
3397 selection.beg.col = 0; 3469 selection.beg.col = 0;
3398 selection.end.col = ncol; 3470 selection.end.col = ncol;
3471
3472 // select a complete logical line
3473 while (selection.beg.row > -TermWin.saveLines
3474 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3475 selection.beg.row--;
3476
3477 while (selection.end.row < TermWin.nrow
3478 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3479 selection.end.row++;
3399 } 3480 }
3400 } 3481 }
3401 3482
3402 if (button3 && buttonpress) 3483 if (button3 && buttonpress)
3403 { /* mark may need to be changed */ 3484 { /* mark may need to be changed */
… …
3483 */ 3564 */
3484void 3565void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3566rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486{ 3567{
3487 XSelectionEvent ev; 3568 XSelectionEvent ev;
3488 XTextProperty ct; 3569 dDisp;
3489 XICCEncodingStyle style;
3490 Atom target;
3491 3570
3492 ev.type = SelectionNotify; 3571 ev.type = SelectionNotify;
3493 ev.property = None; 3572 ev.property = None;
3494 ev.display = rq.display; 3573 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3574 ev.requestor = rq.requestor;
… …
3509 *target++ = xa[XA_COMPOUND_TEXT]; 3588 *target++ = xa[XA_COMPOUND_TEXT];
3510#if X_HAVE_UTF8_STRING 3589#if X_HAVE_UTF8_STRING
3511 *target++ = xa[XA_UTF8_STRING]; 3590 *target++ = xa[XA_UTF8_STRING];
3512#endif 3591#endif
3513 3592
3514 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3593 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3515 32, PropModeReplace, 3594 32, PropModeReplace,
3516 (unsigned char *)target_list, target - target_list); 3595 (unsigned char *)target_list, target - target_list);
3517 ev.property = rq.property; 3596 ev.property = rq.property;
3518 } 3597 }
3519#if TODO // TODO 3598#if TODO // TODO
… …
3522 /* TODO: Handle MULTIPLE */ 3601 /* TODO: Handle MULTIPLE */
3523 } 3602 }
3524#endif 3603#endif
3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3604 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526 { 3605 {
3527 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3606 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3528 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3607 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529 ev.property = rq.property; 3608 ev.property = rq.property;
3530 } 3609 }
3531 else if (rq.target == XA_STRING 3610 else if (rq.target == XA_STRING
3532 || rq.target == xa[XA_TEXT] 3611 || rq.target == xa[XA_TEXT]
3533 || rq.target == xa[XA_COMPOUND_TEXT] 3612 || rq.target == xa[XA_COMPOUND_TEXT]
3534 || rq.target == xa[XA_UTF8_STRING] 3613 || rq.target == xa[XA_UTF8_STRING]
3535 ) 3614 )
3536 { 3615 {
3616 XTextProperty ct;
3617 Atom target = rq.target;
3537 short freect = 0; 3618 short freect = 0;
3538 int selectlen; 3619 int selectlen;
3539 wchar_t *cl; 3620 wchar_t *cl;
3540 3621 enum {
3541 target = rq.target; 3622 enc_string = XStringStyle,
3623 enc_text = XStdICCTextStyle,
3624 enc_compound_text = XCompoundTextStyle,
3625#ifdef X_HAVE_UTF8_STRING
3626 enc_utf8 = XUTF8StringStyle,
3627#else
3628 enc_utf8 = -1,
3629#endif
3630 } style;
3542 3631
3543 if (target == XA_STRING) 3632 if (target == XA_STRING)
3544 // we actually don't do XA_STRING, but who cares, as i18n clients 3633 // we actually don't do XA_STRING, but who cares, as i18n clients
3545 // will ask for another format anyways. 3634 // will ask for another format anyways.
3546 style = XStringStyle; 3635 style = enc_string;
3547 else if (target == xa[XA_TEXT]) 3636 else if (target == xa[XA_TEXT])
3548 style = XStdICCTextStyle; 3637 style = enc_text;
3549 else if (target == xa[XA_COMPOUND_TEXT]) 3638 else if (target == xa[XA_COMPOUND_TEXT])
3550 style = XCompoundTextStyle; 3639 style = enc_compound_text;
3551#if X_HAVE_UTF8_STRING 3640#if ENABLE_FRILLS
3552 else if (target == xa[XA_UTF8_STRING]) 3641 else if (target == xa[XA_UTF8_STRING])
3553 style = XUTF8StringStyle; 3642 style = enc_utf8;
3554#endif 3643#endif
3555 else 3644 else
3556 { 3645 {
3557 target = xa[XA_COMPOUND_TEXT]; 3646 target = xa[XA_COMPOUND_TEXT];
3558 style = XCompoundTextStyle; 3647 style = enc_compound_text;
3559 } 3648 }
3560 3649
3561 if (selection.text) 3650 if (selection.text)
3562 { 3651 {
3563 cl = selection.text; 3652 cl = selection.text;
… …
3567 { 3656 {
3568 cl = L""; 3657 cl = L"";
3569 selectlen = 0; 3658 selectlen = 0;
3570 } 3659 }
3571 3660
3572 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3661#if ENABLE_FRILLS
3573 // manually for XUTF8StringStyle. 3662 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3663 // so recode it manually
3664 if (style == enc_utf8)
3665 {
3666 freect = 1;
3667 ct.encoding = target;
3668 ct.format = 8;
3669 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3670 ct.nitems = strlen ((char *)ct.value);
3671 }
3672 else
3673#endif
3574 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3674 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575 freect = 1; 3675 freect = 1;
3576 else 3676 else
3577 { 3677 {
3578 /* if we failed to convert then send it raw */ 3678 /* if we failed to convert then send it raw */
3579 ct.value = (unsigned char *)cl; 3679 ct.value = (unsigned char *)cl;
3580 ct.nitems = selectlen; 3680 ct.nitems = selectlen;
3681 ct.encoding = target;
3581 } 3682 }
3582 3683
3583 XChangeProperty (display->display, rq.requestor, rq.property, 3684 XChangeProperty (disp, rq.requestor, rq.property,
3584 target, 8, PropModeReplace, 3685 ct.encoding, 8, PropModeReplace,
3585 ct.value, (int)ct.nitems); 3686 ct.value, (int)ct.nitems);
3586 ev.property = rq.property; 3687 ev.property = rq.property;
3587 3688
3588 if (freect) 3689 if (freect)
3589 XFree (ct.value); 3690 XFree (ct.value);
3590 } 3691 }
3591 3692
3592 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3693 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3593} 3694}
3594 3695
3595/* ------------------------------------------------------------------------- * 3696/* ------------------------------------------------------------------------- *
3596 * MOUSE ROUTINES * 3697 * MOUSE ROUTINES *
3597 * ------------------------------------------------------------------------- */ 3698 * ------------------------------------------------------------------------- */
… …
3717 while (*s) 3818 while (*s)
3718 scr_overlay_set (x++, y, *s++); 3819 scr_overlay_set (x++, y, *s++);
3719} 3820}
3720 3821
3721void 3822void
3823rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3824{
3825 while (*s)
3826 {
3827 text_t t = *s++;
3828 int width = wcwidth (t);
3829
3830 while (width--)
3831 {
3832 scr_overlay_set (x++, y, t);
3833 t = NOCHAR;
3834 }
3835 }
3836}
3837
3838void
3722rxvt_term::scr_swap_overlay () 3839rxvt_term::scr_swap_overlay ()
3723{ 3840{
3724 if (!ov_text) 3841 if (!ov_text)
3725 return; 3842 return;
3726 3843

Diff Legend

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