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.129 by root, Wed Aug 25 03:52:09 2004 UTC vs.
Revision 1.162 by root, Sun Apr 17 22:36:13 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++)
… …
878 873
879 stp = screen.text[row]; /* _must_ refresh */ 874 stp = screen.text[row]; /* _must_ refresh */
880 srp = screen.rend[row]; /* _must_ refresh */ 875 srp = screen.rend[row]; /* _must_ refresh */
881 } 876 }
882 877
883 if (screen.flags & Screen_Insert)
884 scr_insdel_chars (1, INSERT);
885
886 // rely on wcwidth to tell us the character width, at least for non-latin1 878 // 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 879 // do wcwidth before further replacements, as wcwidth says that line-drawing
888 // characters have width -1 (DOH!) on GNU/Linux sometimes. 880 // characters have width -1 (DOH!) on GNU/Linux sometimes.
889 int width = c < 0x100 ? 1 : wcwidth (c); 881 int width = c < 0x100 ? 1 : wcwidth (c);
890 882
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 883 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 { 884 {
893 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 886 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[63] = { // 5f .. 7e 888 static uint16_t vt100_0[63] = { // 40 .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
909 c = vt100_0[c - 0x40]; 901 c = vt100_0[c - 0x40];
910 width = 1; 902 width = 1;
911 } 903 }
912 } 904 }
913 905
906 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT);
908
914 if (width != 0) 909 if (width != 0)
915 { 910 {
916 // some utf-8 decoders decode surrogate characters. 911 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff) 912 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd; 913 c = 0xfffd;
… …
968 c = NOCHAR; 963 c = NOCHAR;
969 } 964 }
970 while (--width > 0); 965 while (--width > 0);
971 966
972 // pad with spaces when overwriting wide character with smaller one 967 // pad with spaces when overwriting wide character with smaller one
968 if (!width)
973 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
974 { 970 {
975 stp[c] = ' '; 971 stp[c] = ' ';
976 srp[c] = rend; 972 srp[c] = rend;
977 } 973 }
978 } 974 }
979 else if (width == 0) 975 else if (width == 0)
980 { 976 {
981#if ENABLE_COMBINING 977#if ENABLE_COMBINING
982 // handle combining characters 978 // handle combining characters
… …
989 985
990 if (screen.cur.col > 0) 986 if (screen.cur.col > 0)
991 { 987 {
992 tp = stp + screen.cur.col - 1; 988 tp = stp + screen.cur.col - 1;
993 rp = srp + screen.cur.col - 1; 989 rp = srp + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
994 } 993 }
995 else if (screen.cur.row > 0 994 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
997 { 996 {
998 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 997 int line = screen.cur.row - 1 + TermWin.saveLines;
999 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 998
999 tp = screen.text[line] + last_col - 1;
1000 rp = screen.rend[line] + last_col - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
1000 } 1004 }
1001 else 1005 else
1002 continue; 1006 continue;
1003
1004 // handle double-width-chars by making them look extremely ugly
1005 if (*tp == NOCHAR)
1006 {
1007 // hack //D //TODO //--tp, --rp;
1008 *tp = ' ';
1009 *rp &= ~RS_baseattrMask;
1010 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1011 }
1012 1007
1013 // first try to find a precomposed character 1008 // first try to find a precomposed character
1014 unicode_t n = rxvt_compose (*tp, c); 1009 unicode_t n = rxvt_compose (*tp, c);
1015 if (n == NOCHAR) 1010 if (n == NOCHAR)
1016 n = rxvt_composite.compose (*tp, c); 1011 n = rxvt_composite.compose (*tp, c);
… …
1096 if (count) 1091 if (count)
1097 x = TermWin.ncol - 1; 1092 x = TermWin.ncol - 1;
1098 1093
1099 // store horizontal tab commands as characters inside the text 1094 // store horizontal tab commands as characters inside the text
1100 // buffer so they can be selected and pasted. 1095 // buffer so they can be selected and pasted.
1101 if (ht) 1096 if (ht && options & Opt_pastableTabs)
1102 { 1097 {
1103 base_rend = SET_FONT (base_rend, 0); 1098 base_rend = SET_FONT (base_rend, 0);
1104 1099
1105 if (screen.tlen[row] != -1) /* XXX: think about this */ 1100 if (screen.tlen[row] != -1) /* XXX: think about this */
1106 MAX_IT (screen.tlen[row], x); 1101 MAX_IT (screen.tlen[row], x);
… …
1166 */ 1161 */
1167#if ENABLE_FRILLS 1162#if ENABLE_FRILLS
1168void 1163void
1169rxvt_term::scr_forwardindex () 1164rxvt_term::scr_forwardindex ()
1170{ 1165{
1171 int row; 1166 int row;
1172 1167
1173 if (screen.cur.col < TermWin.ncol - 1) 1168 if (screen.cur.col < TermWin.ncol - 1)
1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1175 else 1170 else
1176 { 1171 {
… …
1379 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1380 CLEAR_ROWS (row, num); 1375 CLEAR_ROWS (row, num);
1381 } 1376 }
1382 else 1377 else
1383 { 1378 {
1384 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1385 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1386 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1387 ERASE_ROWS (row, num); 1382 ERASE_ROWS (row, num);
1388 gcvalue.foreground = pix_colors[Color_fg]; 1383 gcvalue.foreground = pix_colors[Color_fg];
1389 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1390 } 1385 }
1391 1386
1392 for (; num--; row++) 1387 for (; num--; row++)
1393 { 1388 {
1394 scr_blank_screen_mem (screen.text, screen.rend, 1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1395 (unsigned int) (row + row_offset), rstyle);
1396 screen.tlen[row + row_offset] = 0; 1390 screen.tlen[row + row_offset] = 0;
1397 scr_blank_line (drawn_text[row], drawn_rend[row], 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1398 (unsigned int)TermWin.ncol, ren);
1399 } 1392 }
1400} 1393}
1394
1395#if ENABLE_FRILLS
1396void
1397rxvt_term::scr_erase_savelines ()
1398{
1399 want_refresh = 1;
1400 ZERO_SCROLLBACK ();
1401
1402 TermWin.nscrolled = 0;
1403}
1404#endif
1401 1405
1402/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1403/* 1407/*
1404 * Fill the screen with `E's 1408 * Fill the screen with `E's
1405 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1406 */ 1410 */
1407void 1411void
1408rxvt_term::scr_E () 1412rxvt_term::scr_E ()
1409{ 1413{
1410 int i, j, k; 1414 int i, j, k;
1411 rend_t *r1, fs; 1415 rend_t *r1, fs;
1412 1416
1413 want_refresh = 1; 1417 want_refresh = 1;
1414 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1415 1419
1416 num_scr_allow = 0; 1420 num_scr_allow = 0;
… …
1487 slp = &screen.tlen[row]; 1491 slp = &screen.tlen[row];
1488 1492
1489 switch (insdel) 1493 switch (insdel)
1490 { 1494 {
1491 case INSERT: 1495 case INSERT:
1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1496 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1493 col--)
1494 { 1497 {
1495 stp[col] = stp[col - count]; 1498 stp[col] = stp[col - count];
1496 srp[col] = srp[col - count]; 1499 srp[col] = srp[col - count];
1497 } 1500 }
1498 1501
… …
1508 if (selection.end.row != screen.cur.row 1511 if (selection.end.row != screen.cur.row
1509 || (selection.end.col + count >= TermWin.ncol)) 1512 || (selection.end.col + count >= TermWin.ncol))
1510 CLEAR_SELECTION (); 1513 CLEAR_SELECTION ();
1511 else 1514 else
1512 { /* shift selection */ 1515 { /* shift selection */
1513 selection.beg.col += count; 1516 selection.beg.col += count;
1514 selection.mark.col += count; /* XXX: yes? */ 1517 selection.mark.col += count; /* XXX: yes? */
1515 selection.end.col += count; 1518 selection.end.col += count;
1516 } 1519 }
1517 } 1520 }
1518 1521
1519 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1522 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1520 (unsigned int)count, rstyle); 1523 (unsigned int)count, rstyle);
1521 break; 1524 break;
1522 1525
1523 case ERASE: 1526 case ERASE:
1524 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1527 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1525 selection_check (1); 1528 selection_check (1);
1526 screen.cur.col -= count; 1529 screen.cur.col -= count;
1527 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1530 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1528 (unsigned int)count, rstyle); 1531 (unsigned int)count, rstyle);
1529 break; 1532 break;
1530 1533
1531 case DELETE: 1534 case DELETE:
1532 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1535 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1535 { 1538 {
1536 stp[col] = stp[col + count]; 1539 stp[col] = stp[col + count];
1537 srp[col] = srp[col + count]; 1540 srp[col] = srp[col + count];
1538 } 1541 }
1539 1542
1540 scr_blank_line (& (stp[TermWin.ncol - count]), 1543 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1541 & (srp[TermWin.ncol - count]),
1542 (unsigned int)count, tr); 1544 (unsigned int)count, tr);
1543 1545
1544 if (*slp == -1) /* break line continuation */ 1546 if (*slp == -1) /* break line continuation */
1545 *slp = TermWin.ncol; 1547 *slp = TermWin.ncol;
1546 1548
… …
1555 || selection.end.col >= TermWin.ncol) 1557 || selection.end.col >= TermWin.ncol)
1556 CLEAR_SELECTION (); 1558 CLEAR_SELECTION ();
1557 else 1559 else
1558 { 1560 {
1559 /* shift selection */ 1561 /* shift selection */
1560 selection.beg.col -= count; 1562 selection.beg.col -= count;
1561 selection.mark.col -= count; /* XXX: yes? */ 1563 selection.mark.col -= count; /* XXX: yes? */
1562 selection.end.col -= count; 1564 selection.end.col -= count;
1563 } 1565 }
1564 } 1566 }
1565 1567
1566 break; 1568 break;
1567 } 1569 }
… …
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1753 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1754 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1755 */
1754void 1756void
1755rxvt_term::scr_charset_choose (int set) 1757rxvt_term::scr_charset_choose (int set)
1756 { 1758{
1757 screen.charset = set; 1759 screen.charset = set;
1758 set_font_style (); 1760 set_font_style ();
1759 } 1761}
1760 1762
1761/* ------------------------------------------------------------------------- */ 1763/* ------------------------------------------------------------------------- */
1762/* 1764/*
1763 * Set a font 1765 * Set a font
1764 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1766 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1767 * XTERM_SEQ: Set G3 character set: ESC + <C> 1769 * XTERM_SEQ: Set G3 character set: ESC + <C>
1768 * See set_font_style for possible values for <C> 1770 * See set_font_style for possible values for <C>
1769 */ 1771 */
1770void 1772void
1771rxvt_term::scr_charset_set (int set, unsigned int ch) 1773rxvt_term::scr_charset_set (int set, unsigned int ch)
1772 { 1774{
1773 charsets[set] = (unsigned char)ch; 1775 charsets[set] = (unsigned char)ch;
1774 set_font_style (); 1776 set_font_style ();
1775 } 1777}
1776 1778
1777 1779
1778/* ------------------------------------------------------------------------- * 1780/* ------------------------------------------------------------------------- *
1779 * MAJOR SCREEN MANIPULATION * 1781 * MAJOR SCREEN MANIPULATION *
1780 * ------------------------------------------------------------------------- */ 1782 * ------------------------------------------------------------------------- */
… …
1901rxvt_term::scr_page (enum page_dirn direction, int nlines) 1903rxvt_term::scr_page (enum page_dirn direction, int nlines)
1902{ 1904{
1903 int n; 1905 int n;
1904 unsigned int oldviewstart; 1906 unsigned int oldviewstart;
1905 1907
1906#ifdef DEBUG_STRICT
1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1908#endif
1909 oldviewstart = TermWin.view_start; 1908 oldviewstart = TermWin.view_start;
1909
1910 if (direction == UP) 1910 if (direction == UP)
1911 { 1911 {
1912 n = TermWin.view_start + nlines; 1912 n = TermWin.view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled); 1913 TermWin.view_start = min (n, TermWin.nscrolled);
1914 } 1914 }
1915 else 1915 else
1916 { 1916 {
1917 n = TermWin.view_start - nlines; 1917 n = TermWin.view_start - nlines;
1918 TermWin.view_start = max (n, 0); 1918 TermWin.view_start = max (n, 0);
1919 } 1919 }
1920
1920 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1921} 1922}
1922 1923
1923int 1924int
1924rxvt_term::scr_changeview (unsigned int oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
2012/* 2013/*
2013 * Refresh the screen 2014 * Refresh the screen
2014 * drawn_text/drawn_rend contain the screen information before the update. 2015 * drawn_text/drawn_rend contain the screen information before the update.
2015 * screen.text/screen.rend contain what the screen will change to. 2016 * screen.text/screen.rend contain what the screen will change to.
2016 */ 2017 */
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 2018void
2028rxvt_term::scr_refresh (unsigned char refresh_type) 2019rxvt_term::scr_refresh (unsigned char refresh_type)
2029{ 2020{
2030 unsigned char must_clear, /* use draw_string not draw_image_string */ 2021 unsigned char must_clear, /* use draw_string not draw_image_string */
2031 showcursor; /* show the cursor */ 2022 showcursor; /* show the cursor */
… …
2036#ifndef NO_CURSORCOLOR 2027#ifndef NO_CURSORCOLOR
2037 rend_t cc1; /* store colours at cursor position (s) */ 2028 rend_t cc1; /* store colours at cursor position (s) */
2038#endif 2029#endif
2039 rend_t *crp; // cursor rendition pointer 2030 rend_t *crp; // cursor rendition pointer
2040 2031
2032 want_refresh = 0; /* screen is current */
2033
2041 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2034 if (refresh_type == NO_REFRESH || !TermWin.mapped)
2042 return; 2035 return;
2043 2036
2044 /* 2037 /*
2045 * A: set up vars 2038 * A: set up vars
… …
2048 refresh_count = 0; 2041 refresh_count = 0;
2049 2042
2050 row_offset = TermWin.saveLines - TermWin.view_start; 2043 row_offset = TermWin.saveLines - TermWin.view_start;
2051 2044
2052#if XPM_BACKGROUND 2045#if XPM_BACKGROUND
2053 must_clear |= (bgPixmap.pixmap != None); 2046 must_clear |= bgPixmap.pixmap != None;
2054#endif 2047#endif
2055#if TRANSPARENT 2048#if TRANSPARENT
2056 must_clear |= ((options & Opt_transparent) && am_transparent); 2049 must_clear |= (options & Opt_transparent) && am_transparent;
2057#endif 2050#endif
2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2059 2052
2060 /* 2053 /*
2061 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
… …
2085 2078
2086 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2079 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2087 2080
2088 if (showcursor && TermWin.focus) 2081 if (showcursor && TermWin.focus)
2089 { 2082 {
2083 if (options & Opt_cursorUnderline)
2084 *crp ^= RS_Uline;
2085 else
2086 {
2090 *crp ^= RS_RVid; 2087 *crp ^= RS_RVid;
2088
2091#ifndef NO_CURSORCOLOR 2089#ifndef NO_CURSORCOLOR
2092 cc1 = *crp & (RS_fgMask | RS_bgMask); 2090 cc1 = *crp & (RS_fgMask | RS_bgMask);
2093 if (ISSET_PIXCOLOR (Color_cursor)) 2091 if (ISSET_PIXCOLOR (Color_cursor))
2094 ccol1 = Color_cursor; 2092 ccol1 = Color_cursor;
2095 else 2093 else
2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2097 ccol1 = GET_FGCOLOR (rstyle); 2095 ccol1 = GET_FGCOLOR (rstyle);
2098#else 2096#else
2099 ccol1 = Color_fg; 2097 ccol1 = Color_fg;
2100#endif 2098#endif
2101 if (ISSET_PIXCOLOR (Color_cursor2)) 2099 if (ISSET_PIXCOLOR (Color_cursor2))
2102 ccol2 = Color_cursor2; 2100 ccol2 = Color_cursor2;
2103 else 2101 else
2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2105 ccol2 = GET_BGCOLOR (rstyle); 2103 ccol2 = GET_BGCOLOR (rstyle);
2106#else 2104#else
2107 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2108#endif 2106#endif
2109 *crp = SET_FGCOLOR (*crp, ccol1); 2107 *crp = SET_FGCOLOR (*crp, ccol1);
2110 *crp = SET_BGCOLOR (*crp, ccol2); 2108 *crp = SET_BGCOLOR (*crp, ccol2);
2111#endif 2109#endif
2110 }
2112 } 2111 }
2113 } 2112 }
2114 2113
2115 /* make sure no outline cursor is left around */ 2114 /* make sure no outline cursor is left around */
2116 setoldcursor = 0; 2115 setoldcursor = 0;
… …
2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2241 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2243 continue; 2242 continue;
2244 2243
2245 // redraw one or more characters 2244 // redraw one or more characters
2246 2245
2247 // seek to the beginning if wide characters 2246 // seek to the beginning of wide characters
2248 while (stp[col] == NOCHAR && col > 0) 2247 while (stp[col] == NOCHAR && col > 0)
2249 --col; 2248 --col;
2250 2249
2251 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2250 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2252 text_t *text = stp + col; 2251 text_t *text = stp + col;
… …
2396 } 2395 }
2397 else 2396 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2399 2398
2400 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (rend & RS_Uline && font->descent > 1 && fore != back)
2400 {
2401#if ENABLE_FRILLS
2402 if (ISSET_PIXCOLOR (Color_underline))
2403 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2404 else
2405#endif
2406 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2407
2401 XDrawLine (display->display, drawBuffer, TermWin.gc, 2408 XDrawLine (display->display, drawBuffer, TermWin.gc,
2402 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411 }
2404 } /* for (col....) */ 2412 } /* for (col....) */
2405 } /* for (row....) */ 2413 } /* for (row....) */
2406 2414
2407#if ENABLE_OVERLAY 2415#if ENABLE_OVERLAY
2408 scr_swap_overlay (); 2416 scr_swap_overlay ();
… …
2413 */ 2421 */
2414 if (showcursor) 2422 if (showcursor)
2415 { 2423 {
2416 if (TermWin.focus) 2424 if (TermWin.focus)
2417 { 2425 {
2426 if (options & Opt_cursorUnderline)
2427 *crp ^= RS_Uline;
2428 else
2429 {
2418 *crp ^= RS_RVid; 2430 *crp ^= RS_RVid;
2419#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2420 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2421#endif 2433#endif
2434 }
2422 } 2435 }
2423 else if (oldcursor.row >= 0) 2436 else if (oldcursor.row >= 0)
2424 { 2437 {
2425#ifndef NO_CURSORCOLOR 2438#ifndef NO_CURSORCOLOR
2426 if (ISSET_PIXCOLOR (Color_cursor)) 2439 if (ISSET_PIXCOLOR (Color_cursor))
… …
2447 if (refresh_type & SMOOTH_REFRESH) 2460 if (refresh_type & SMOOTH_REFRESH)
2448 XFlush (display->display); 2461 XFlush (display->display);
2449 2462
2450 num_scr = 0; 2463 num_scr = 0;
2451 num_scr_allow = 1; 2464 num_scr_allow = 1;
2452 want_refresh = 0; /* screen is current */
2453} 2465}
2454 2466
2455void 2467void
2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2468rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2457{ 2469{
… …
2544 int end_row = TermWin.saveLines - TermWin.view_start; 2556 int end_row = TermWin.saveLines - TermWin.view_start;
2545 int i = selection.beg.row + TermWin.saveLines; 2557 int i = selection.beg.row + TermWin.saveLines;
2546 int col, row = selection.end.row + TermWin.saveLines; 2558 int col, row = selection.end.row + TermWin.saveLines;
2547 rend_t *srp; 2559 rend_t *srp;
2548 2560
2549 if (i >= end_row) 2561#if ENABLE_FRILLS
2550 col = selection.beg.col; 2562 if (selection.rect)
2563 {
2564 end_row += TermWin.nrow;
2565
2566 for (; i <= row && i <= end_row; i++)
2567 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2568 srp[col] ^= RS_RVid;
2569 }
2551 else 2570 else
2571#endif
2572 {
2573 if (i >= end_row)
2574 col = selection.beg.col;
2575 else
2552 { 2576 {
2553 col = 0; 2577 col = 0;
2554 i = end_row; 2578 i = end_row;
2555 } 2579 }
2556 2580
2557 end_row += TermWin.nrow; 2581 end_row += TermWin.nrow;
2582
2558 for (; i < row && i < end_row; i++, col = 0) 2583 for (; i < row && i < end_row; i++, col = 0)
2559 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2584 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2560 srp[col] ^= RS_RVid; 2585 srp[col] ^= RS_RVid;
2561 2586
2562 if (i == row && i < end_row) 2587 if (i == row && i < end_row)
2563 for (srp = screen.rend[i]; col < selection.end.col; col++) 2588 for (srp = screen.rend[i]; col < selection.end.col; col++)
2564 srp[col] ^= RS_RVid; 2589 srp[col] ^= RS_RVid;
2590 }
2565 } 2591 }
2566} 2592}
2567 2593
2568/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2569/* 2595/*
… …
2637/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2638/* 2664/*
2639 * Paste a selection direct to the command fd 2665 * Paste a selection direct to the command fd
2640 */ 2666 */
2641void 2667void
2642rxvt_term::paste (const unsigned char *data, unsigned int len) 2668rxvt_term::paste (unsigned char *data, unsigned int len)
2643{ 2669{
2644 unsigned int i, j, n;
2645 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2646
2647 /* convert normal newline chars into common keyboard Return key sequence */ 2670 /* convert normal newline chars into common keyboard Return key sequence */
2648 for (i = 0; i < len; i += PROP_SIZE) 2671 for (unsigned int i = 0; i < len; i++)
2649 {
2650 n = min (len - i, PROP_SIZE);
2651 memcpy (ds, data + i, n);
2652
2653 for (j = 0; j < n; j++)
2654 if (ds[j] == C0_LF) 2672 if (data[i] == C0_LF)
2655 ds[j] = C0_CR; 2673 data[i] = C0_CR;
2656 2674
2657 tt_write (ds, (int)n); 2675 tt_write (data, len);
2658 }
2659
2660 free (ds);
2661} 2676}
2662 2677
2663/* ------------------------------------------------------------------------- */ 2678/* ------------------------------------------------------------------------- */
2664/* 2679/*
2665 * Respond to a notification that a primary selection has been sent 2680 * Respond to a notification that a primary selection has been sent
2666 * EXT: SelectionNotify 2681 * EXT: SelectionNotify
2667 */ 2682 */
2668int 2683void
2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2670{ 2685{
2671 long nread = 0;
2672 unsigned long bytes_after;
2673 XTextProperty ct;
2674
2675 if (prop == None) /* check for failed XConvertSelection */ 2686 if (prop == None) /* check for failed XConvertSelection */
2676 { 2687 {
2677 if ((selection_type & Sel_CompoundText)) 2688 if ((selection_type & Sel_CompoundText))
2678 { 2689 {
2679 int selnum = selection_type & Sel_whereMask; 2690 int selnum = selection_type & Sel_whereMask;
… …
2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2703 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2693 else 2704 else
2694 selection_type = 0; 2705 selection_type = 0;
2695 } 2706 }
2696 2707
2697 return 0; 2708 return;
2698 }
2699
2700 for (;;)
2701 { 2709 }
2710
2711 unsigned long bytes_after;
2712 XTextProperty ct;
2713
2714 if (XGetWindowProperty (display->display, win, prop,
2715 0, PROP_SIZE / 4,
2716 delete_prop, AnyPropertyType,
2717 &ct.encoding, &ct.format,
2718 &ct.nitems, &bytes_after,
2719 &ct.value) != Success)
2720 {
2721 ct.value = 0;
2722 goto bailout;
2723 }
2724
2725 if (ct.encoding == None)
2726 goto bailout;
2727
2728 if (bytes_after)
2729 {
2730 // fetch and append remaining data
2731 XTextProperty ct2;
2732
2702 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2733 if (XGetWindowProperty (display->display, win, prop,
2703 (long) (PROP_SIZE / 4), delete_prop, 2734 ct.nitems / 4, (bytes_after + 3) / 4,
2735 delete_prop, AnyPropertyType,
2704 AnyPropertyType, &ct.encoding, &ct.format, 2736 &ct2.encoding, &ct2.format,
2705 &ct.nitems, &bytes_after, 2737 &ct2.nitems, &bytes_after,
2706 &ct.value) != Success) 2738 &ct2.value) != Success)
2707 break; 2739 goto bailout;
2708 2740
2709 if (ct.encoding == 0) 2741 // realloc should be compatible to XFree, here, and elsewhere, too
2710 break; 2742 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2743 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2744 ct.nitems += ct2.nitems;
2711 2745
2746 XFree (ct2.value);
2747 }
2748
2749 if (ct.value == 0)
2750 goto bailout;
2751
2712 if (ct.encoding == xa[XA_INCR]) 2752 if (ct.encoding == xa[XA_INCR])
2713 { 2753 {
2714 // INCR selection, start handshake 2754 // INCR selection, start handshake
2755 if (!delete_prop)
2715 XDeleteProperty (display->display, win, prop); 2756 XDeleteProperty (display->display, win, prop);
2757
2716 selection_wait = Sel_incr; 2758 selection_wait = Sel_incr;
2759 incr_buf_fill = 0;
2717 incr_ev.start (NOW + 10); 2760 incr_ev.start (NOW + 10);
2718 break;
2719 }
2720 2761
2721 if (ct.value == NULL) 2762 goto bailout;
2722 continue; 2763 }
2723 2764
2724 if (ct.nitems == 0) 2765 if (ct.nitems == 0)
2766 {
2767 if (selection_wait == Sel_incr)
2768 {
2769 XFree (ct.value);
2770
2771 // finally complete, now paste the whole thing
2772 selection_wait = Sel_normal;
2773 ct.value = (unsigned char *)incr_buf;
2774 ct.nitems = incr_buf_fill;
2775 incr_buf = 0;
2776 incr_buf_size = 0;
2777 incr_ev.stop ();
2725 { 2778 }
2779 else
2780 {
2726 if (selection_wait == Sel_normal && nread == 0 2781 if (selection_wait == Sel_normal
2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2782 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2728 { 2783 {
2729 /* 2784 /*
2730 * pass through again trying CUT_BUFFER0 if we've come from 2785 * pass through again trying CUT_BUFFER0 if we've come from
2731 * XConvertSelection () but nothing was presented 2786 * XConvertSelection () but nothing was presented
2732 */ 2787 */
2733 selection_paste (display->root, XA_CUT_BUFFER0, False); 2788 selection_paste (display->root, XA_CUT_BUFFER0, False);
2734 } 2789 }
2735 2790
2736 nread = -1; /* discount any previous stuff */ 2791 goto bailout;
2737 break; 2792 }
2793 }
2794 else if (selection_wait == Sel_incr)
2795 {
2796 incr_ev.start (NOW + 10);
2797
2798 while (incr_buf_fill + ct.nitems > incr_buf_size)
2738 } 2799 {
2800 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2801 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2802 }
2739 2803
2804 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2740 nread += ct.nitems; 2805 incr_buf_fill += ct.nitems;
2741 2806
2807 goto bailout;
2808 }
2809
2742 char **cl; 2810 char **cl;
2743 int cr; 2811 int cr;
2812
2813#if ENABLE_FRILLS
2814 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2815 // so recode it manually
2816 if (ct.encoding == xa[XA_UTF8_STRING])
2817 {
2818 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2819 char *s = rxvt_wcstombs (w);
2820 free (w);
2821 // TODO: strlen == only the first element will be converted. well...
2822 paste ((unsigned char *)s, strlen (s));
2823 free (s);
2824 }
2825 else
2826#endif
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2827 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 { 2828 && cl)
2829 {
2746 for (int i = 0; i < cr; i++) 2830 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2831 paste ((unsigned char *)cl[i], strlen (cl[i]));
2748 2832
2749 XFreeStringList (cl); 2833 XFreeStringList (cl);
2750 } 2834 }
2751 else 2835 else
2752 paste (ct.value, ct.nitems); 2836 paste (ct.value, ct.nitems); // paste raw
2753 2837
2754 if (bytes_after == 0) 2838bailout:
2755 break;
2756
2757 XFree (ct.value);
2758 }
2759
2760 if (ct.value)
2761 XFree (ct.value); 2839 XFree (ct.value);
2762 2840
2763 if (selection_wait == Sel_normal) 2841 if (selection_wait == Sel_normal)
2764 selection_wait = Sel_none; 2842 selection_wait = Sel_none;
2765
2766 return (int)nread;
2767} 2843}
2768 2844
2769void 2845void
2770rxvt_term::incr_cb (time_watcher &w) 2846rxvt_term::incr_cb (time_watcher &w)
2771{ 2847{
2772 selection_wait = Sel_none; 2848 selection_wait = Sel_none;
2773 2849
2850 incr_buf_size = 0;
2851 free (incr_buf);
2852
2774 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2853 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2775} 2854}
2776 2855
2777/*
2778 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2779 */
2780void 2856void
2781rxvt_term::selection_property (Window win, Atom prop) 2857rxvt_term::selection_property (Window win, Atom prop)
2782{ 2858{
2783 if (prop == None || selection_wait != Sel_incr) 2859 if (prop == None || selection_wait != Sel_incr)
2784 return; 2860 return;
2785 2861
2786 if (selection_paste (win, prop, 1) > 0) 2862 selection_paste (win, prop, true);
2787 incr_ev.start (NOW + 10);
2788 else
2789 {
2790 selection_wait = Sel_none;
2791 incr_ev.stop ();
2792 }
2793} 2863}
2794 2864
2795/* ------------------------------------------------------------------------- */ 2865/* ------------------------------------------------------------------------- */
2796/* 2866/*
2797 * Request the current selection: 2867 * Request the current selection:
… …
2831#else 2901#else
2832 selection_type = Sel_CompoundText; 2902 selection_type = Sel_CompoundText;
2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2903 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2834 return; 2904 return;
2835#endif 2905#endif
2836
2837 } 2906 }
2838 } 2907 }
2839 2908
2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2909 selection_wait = Sel_none; /* don't loop in selection_paste () */
2841 selection_paste (display->root, XA_CUT_BUFFER0, False); 2910 selection_paste (display->root, XA_CUT_BUFFER0, false);
2842} 2911}
2843 2912
2844int 2913int
2845rxvt_term::selection_request_other (Atom target, int selnum) 2914rxvt_term::selection_request_other (Atom target, int selnum)
2846{ 2915{
2847 Atom sel; 2916 Atom sel;
2848#ifdef DEBUG_SELECT
2849 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2850#endif
2851 2917
2852 selection_type |= selnum; 2918 selection_type |= selnum;
2853 2919
2854 if (selnum == Sel_Primary) 2920 if (selnum == Sel_Primary)
2855 sel = XA_PRIMARY; 2921 sel = XA_PRIMARY;
… …
2919 2985
2920 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2986 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2921 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2987 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2922 2988
2923 col = selection.beg.col; 2989 col = selection.beg.col;
2924 MAX_IT (col, 0);
2925 row = selection.beg.row + TermWin.saveLines; 2990 row = selection.beg.row + TermWin.saveLines;
2926 end_row = selection.end.row + TermWin.saveLines; 2991 end_row = selection.end.row + TermWin.saveLines;
2927 int ofs = 0; 2992 int ofs = 0;
2928 int extra = 0; 2993 int extra = 0;
2929 2994
2930 for (; row <= end_row; row++, col = 0) 2995 for (; row <= end_row; row++, col = 0)
2931 { 2996 {
2932 t = &screen.text[row][col];
2933
2934 end_col = screen.tlen[row]; 2997 end_col = screen.tlen[row];
2998
2999#if ENABLE_FRILLS
3000 if (selection.rect)
3001 {
3002 col = selection.beg.col;
3003 end_col = TermWin.ncol + 1;
3004 }
3005#endif
3006
3007 MAX_IT (col, 0);
2935 3008
2936 if (end_col == -1) 3009 if (end_col == -1)
2937 end_col = TermWin.ncol; 3010 end_col = TermWin.ncol;
2938 3011
2939 if (row == end_row) 3012 if (row == end_row || selection.rect)
2940 MIN_IT (end_col, selection.end.col); 3013 MIN_IT (end_col, selection.end.col);
2941 3014
3015 t = &screen.text[row][col];
2942 for (; col < end_col; col++) 3016 for (; col < end_col; col++)
2943 { 3017 {
2944 if (*t == NOCHAR) 3018 if (*t == NOCHAR)
2945 t++; 3019 t++;
2946#if ENABLE_COMBINING 3020#if ENABLE_COMBINING
… …
2994#if 0 3068#if 0
2995 XTextProperty ct; 3069 XTextProperty ct;
2996 3070
2997 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3071 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2998 { 3072 {
2999 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3073 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3000 PropModeReplace, ct.value, ct.nitems);
3001 XFree (ct.value); 3074 XFree (ct.value);
3002 } 3075 }
3003#endif 3076#endif
3004 3077
3005 selection_time = tm; 3078 selection_time = tm;
… …
3206 enum { 3279 enum {
3207 LEFT, RIGHT 3280 LEFT, RIGHT
3208 } closeto = RIGHT; 3281 } closeto = RIGHT;
3209 3282
3210 want_refresh = 1; 3283 want_refresh = 1;
3284
3211 switch (selection.op) 3285 switch (selection.op)
3212 { 3286 {
3213 case SELECTION_INIT: 3287 case SELECTION_INIT:
3214 CLEAR_SELECTION (); 3288 CLEAR_SELECTION ();
3215 selection.op = SELECTION_BEGIN; 3289 selection.op = SELECTION_BEGIN;
… …
3228 selection_start_colrow (col, row); 3302 selection_start_colrow (col, row);
3229 /* FALLTHROUGH */ 3303 /* FALLTHROUGH */
3230 default: 3304 default:
3231 return; 3305 return;
3232 } 3306 }
3307
3233 if (selection.beg.col == selection.end.col 3308 if (selection.beg.col == selection.end.col
3234 && selection.beg.col != selection.mark.col 3309 && selection.beg.col != selection.mark.col
3235 && selection.beg.row == selection.end.row 3310 && selection.beg.row == selection.end.row
3236 && selection.beg.row != selection.mark.row) 3311 && selection.beg.row != selection.mark.row)
3237 { 3312 {
… …
3287 } 3362 }
3288 else 3363 else
3289 { /* button1 drag or button3 drag */ 3364 { /* button1 drag or button3 drag */
3290 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3365 if (ROWCOL_IS_AFTER (selection.mark, pos))
3291 { 3366 {
3292 if ((selection.mark.row == selection.end.row) 3367 if (selection.mark.row == selection.end.row
3293 && (selection.mark.col == selection.end.col) 3368 && selection.mark.col == selection.end.col
3369 && clickchange
3294 && clickchange && selection.clicks == 2) 3370 && selection.clicks == 2)
3295 selection.mark.col--; 3371 selection.mark.col--;
3296 3372
3297 selection.beg.row = pos.row; 3373 selection.beg.row = pos.row;
3298 selection.beg.col = pos.col; 3374 selection.beg.col = pos.col;
3299 selection.end.row = selection.mark.row; 3375 selection.end.row = selection.mark.row;
… …
3310 3386
3311 if (selection.clicks == 1) 3387 if (selection.clicks == 1)
3312 { 3388 {
3313 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3389 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3314 3390
3315 if (end_col != -1 && selection.beg.col > end_col) 3391 if (selection.beg.col > end_col
3392 && end_col != -1
3393#if ENABLE_FRILLS
3394 && !selection.rect
3395#endif
3316 { 3396 )
3317#if 1
3318 selection.beg.col = ncol; 3397 selection.beg.col = ncol;
3319#else
3320 if (selection.beg.row != selection.end.row)
3321 selection.beg.col = ncol;
3322 else
3323 selection.beg.col = selection.mark.col;
3324#endif
3325 }
3326 3398
3327 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3399 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3328 3400
3329 if (end_col != -1 && selection.end.col > end_col) 3401 if (
3402 selection.end.col > end_col
3403 && end_col != -1
3404#if ENABLE_FRILLS
3405 && !selection.rect
3406#endif
3407 )
3330 selection.end.col = ncol; 3408 selection.end.col = ncol;
3331 } 3409 }
3332 else if (selection.clicks == 2) 3410 else if (selection.clicks == 2)
3333 { 3411 {
3334 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3412 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3335 selection.end.col--; 3413 selection.end.col--;
3336 3414
3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3338 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3415 selection_delimit_word (UP, &selection.beg, &selection.beg);
3416 selection_delimit_word (DN, &selection.end, &selection.end);
3339 } 3417 }
3340 else if (selection.clicks == 3) 3418 else if (selection.clicks == 3)
3341 { 3419 {
3342#if ENABLE_FRILLS 3420#if ENABLE_FRILLS
3343 if ((options & Opt_tripleclickwords)) 3421 if (options & Opt_tripleclickwords)
3344 { 3422 {
3345 int end_row; 3423 int end_row;
3346 3424
3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3425 selection_delimit_word (UP, &selection.beg, &selection.beg);
3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3426 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3349 3427
3350 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3428 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3351 { 3429 {
3352 end_col = screen.tlen[end_row + TermWin.saveLines]; 3430 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3363 else 3441 else
3364#endif 3442#endif
3365 { 3443 {
3366 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3444 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3367 selection.mark.col++; 3445 selection.mark.col++;
3446
3368 selection.beg.col = 0; 3447 selection.beg.col = 0;
3369 selection.end.col = ncol; 3448 selection.end.col = ncol;
3449
3450 // select a complete logical line
3451 while (selection.beg.row > -TermWin.saveLines
3452 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3453 selection.beg.row--;
3454
3455 while (selection.end.row < TermWin.nrow
3456 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3457 selection.end.row++;
3370 } 3458 }
3371 } 3459 }
3372 3460
3373 if (button3 && buttonpress) 3461 if (button3 && buttonpress)
3374 { /* mark may need to be changed */ 3462 { /* mark may need to be changed */
… …
3381 { 3469 {
3382 selection.mark.row = selection.beg.row; 3470 selection.mark.row = selection.beg.row;
3383 selection.mark.col = selection.beg.col; 3471 selection.mark.col = selection.beg.col;
3384 } 3472 }
3385 } 3473 }
3386}
3387 3474
3388#if ENABLE_FRILLS 3475#if ENABLE_FRILLS
3476 if (selection.rect && selection.beg.col > selection.end.col)
3477 SWAP_IT (selection.beg.col, selection.end.col, int);
3478#endif
3479}
3480
3481#if ENABLE_FRILLS
3389void 3482void
3390rxvt_term::selection_remove_trailing_spaces () 3483rxvt_term::selection_remove_trailing_spaces ()
3391{ 3484{
3392 int32_t end_col, end_row; 3485 int32_t end_col, end_row;
3393 text_t *stp; 3486 text_t *stp;
3394 3487
3395 end_col = selection.end.col; 3488 end_col = selection.end.col;
3396 end_row = selection.end.row; 3489 end_row = selection.end.row;
3490
3397 for ( ; end_row >= selection.beg.row; ) 3491 for ( ; end_row >= selection.beg.row; )
3398 { 3492 {
3399 stp = screen.text[end_row + TermWin.saveLines]; 3493 stp = screen.text[end_row + TermWin.saveLines];
3494
3400 while (--end_col >= 0) 3495 while (--end_col >= 0)
3401 { 3496 {
3402 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3497 if (stp[end_col] != ' '
3498 && stp[end_col] != '\t'
3499 && stp[end_col] != NOCHAR)
3403 break; 3500 break;
3404 } 3501 }
3502
3405 if (end_col >= 0 3503 if (end_col >= 0
3406 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3504 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3407 { 3505 {
3408 selection.end.col = end_col + 1; 3506 selection.end.col = end_col + 1;
3409 selection.end.row = end_row; 3507 selection.end.row = end_row;
3410 break; 3508 break;
3411 } 3509 }
3510
3412 end_row--; 3511 end_row--;
3413 end_col = TermWin.ncol; 3512 end_col = TermWin.ncol;
3414 } 3513 }
3514
3415 if (selection.mark.row > selection.end.row) 3515 if (selection.mark.row > selection.end.row)
3416 { 3516 {
3417 selection.mark.row = selection.end.row; 3517 selection.mark.row = selection.end.row;
3418 selection.mark.col = selection.end.col; 3518 selection.mark.col = selection.end.col;
3419 } 3519 }
… …
3435 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3535 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3436} 3536}
3437 3537
3438/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3439/* 3539/*
3440 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3441 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3442 * the X11 protocol.
3443 */
3444typedef CARD32 Atom32;
3445
3446/* ------------------------------------------------------------------------- */
3447/*
3448 * Respond to a request for our current selection 3540 * Respond to a request for our current selection
3449 * EXT: SelectionRequest 3541 * EXT: SelectionRequest
3450 */ 3542 */
3451void 3543void
3452rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3544rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3453{ 3545{
3454 XSelectionEvent ev; 3546 XSelectionEvent ev;
3455 XTextProperty ct; 3547 dDisp;
3456 XICCEncodingStyle style;
3457 Atom target;
3458 3548
3459 ev.type = SelectionNotify; 3549 ev.type = SelectionNotify;
3460 ev.property = None; 3550 ev.property = None;
3461 ev.display = rq.display; 3551 ev.display = rq.display;
3462 ev.requestor = rq.requestor; 3552 ev.requestor = rq.requestor;
… …
3464 ev.target = rq.target; 3554 ev.target = rq.target;
3465 ev.time = rq.time; 3555 ev.time = rq.time;
3466 3556
3467 if (rq.target == xa[XA_TARGETS]) 3557 if (rq.target == xa[XA_TARGETS])
3468 { 3558 {
3469 Atom32 target_list[6]; 3559 Atom target_list[6];
3470 Atom32 *target = target_list; 3560 Atom *target = target_list;
3471 3561
3472 *target++ = (Atom32) xa[XA_TARGETS]; 3562 *target++ = xa[XA_TARGETS];
3473 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3563 *target++ = xa[XA_TIMESTAMP];
3474 *target++ = (Atom32) XA_STRING; 3564 *target++ = XA_STRING;
3475 *target++ = (Atom32) xa[XA_TEXT]; 3565 *target++ = xa[XA_TEXT];
3476 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3566 *target++ = xa[XA_COMPOUND_TEXT];
3477#if X_HAVE_UTF8_STRING 3567#if X_HAVE_UTF8_STRING
3478 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3568 *target++ = xa[XA_UTF8_STRING];
3479#endif 3569#endif
3480 3570
3481 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3571 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3482 (8 * sizeof (target_list[0])), PropModeReplace, 3572 32, PropModeReplace,
3483 (unsigned char *)target_list, 3573 (unsigned char *)target_list, target - target_list);
3484 target - target_list);
3485 ev.property = rq.property; 3574 ev.property = rq.property;
3486 } 3575 }
3487#if TODO // TODO 3576#if TODO // TODO
3488 else if (rq.target == xa[XA_MULTIPLE]) 3577 else if (rq.target == xa[XA_MULTIPLE])
3489 { 3578 {
3490 /* TODO: Handle MULTIPLE */ 3579 /* TODO: Handle MULTIPLE */
3491 } 3580 }
3492#endif 3581#endif
3493 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3582 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3494 { 3583 {
3495 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3584 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3496 (8 * sizeof (Time)), PropModeReplace,
3497 (unsigned char *)&selection_time, 1); 3585 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3498 ev.property = rq.property; 3586 ev.property = rq.property;
3499 } 3587 }
3500 else if (rq.target == XA_STRING 3588 else if (rq.target == XA_STRING
3501 || rq.target == xa[XA_TEXT] 3589 || rq.target == xa[XA_TEXT]
3502 || rq.target == xa[XA_COMPOUND_TEXT] 3590 || rq.target == xa[XA_COMPOUND_TEXT]
3503 || rq.target == xa[XA_UTF8_STRING] 3591 || rq.target == xa[XA_UTF8_STRING]
3504 ) 3592 )
3505 { 3593 {
3594 XTextProperty ct;
3595 Atom target = rq.target;
3506 short freect = 0; 3596 short freect = 0;
3507 int selectlen; 3597 int selectlen;
3508 wchar_t *cl; 3598 wchar_t *cl;
3509 3599 enum {
3510 target = rq.target; 3600 enc_string = XStringStyle,
3601 enc_text = XStdICCTextStyle,
3602 enc_compound_text = XCompoundTextStyle,
3603#ifdef X_HAVE_UTF8_STRING
3604 enc_utf8 = XUTF8StringStyle,
3605#else
3606 enc_utf8 = -1,
3607#endif
3608 } style;
3511 3609
3512 if (target == XA_STRING) 3610 if (target == XA_STRING)
3513 // we actually don't do XA_STRING, but who cares, as i18n clients 3611 // we actually don't do XA_STRING, but who cares, as i18n clients
3514 // will ask for another format anyways. 3612 // will ask for another format anyways.
3515 style = XStringStyle; 3613 style = enc_string;
3516 else if (target == xa[XA_TEXT]) 3614 else if (target == xa[XA_TEXT])
3517 style = XStdICCTextStyle; 3615 style = enc_text;
3518 else if (target == xa[XA_COMPOUND_TEXT]) 3616 else if (target == xa[XA_COMPOUND_TEXT])
3519 style = XCompoundTextStyle; 3617 style = enc_compound_text;
3520#if X_HAVE_UTF8_STRING 3618#if ENABLE_FRILLS
3521 else if (target == xa[XA_UTF8_STRING]) 3619 else if (target == xa[XA_UTF8_STRING])
3522 style = XUTF8StringStyle; 3620 style = enc_utf8;
3523#endif 3621#endif
3524 else 3622 else
3525 { 3623 {
3526 target = xa[XA_COMPOUND_TEXT]; 3624 target = xa[XA_COMPOUND_TEXT];
3527 style = XCompoundTextStyle; 3625 style = enc_compound_text;
3528 } 3626 }
3529 3627
3530 if (selection.text) 3628 if (selection.text)
3531 { 3629 {
3532 cl = selection.text; 3630 cl = selection.text;
… …
3536 { 3634 {
3537 cl = L""; 3635 cl = L"";
3538 selectlen = 0; 3636 selectlen = 0;
3539 } 3637 }
3540 3638
3541 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3639#if ENABLE_FRILLS
3542 // manually for XUTF8StringStyle. 3640 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3641 // so recode it manually
3642 if (style == enc_utf8)
3643 {
3644 freect = 1;
3645 ct.encoding = target;
3646 ct.format = 8;
3647 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3648 ct.nitems = strlen ((char *)ct.value);
3649 }
3650 else
3651#endif
3543 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3652 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3544 freect = 1; 3653 freect = 1;
3545 else 3654 else
3546 { 3655 {
3547 /* if we failed to convert then send it raw */ 3656 /* if we failed to convert then send it raw */
3548 ct.value = (unsigned char *)cl; 3657 ct.value = (unsigned char *)cl;
3549 ct.nitems = selectlen; 3658 ct.nitems = selectlen;
3659 ct.encoding = target;
3550 } 3660 }
3551 3661
3552 XChangeProperty (display->display, rq.requestor, rq.property, 3662 XChangeProperty (disp, rq.requestor, rq.property,
3553 target, 8, PropModeReplace, 3663 ct.encoding, 8, PropModeReplace,
3554 ct.value, (int)ct.nitems); 3664 ct.value, (int)ct.nitems);
3555 ev.property = rq.property; 3665 ev.property = rq.property;
3556 3666
3557 if (freect) 3667 if (freect)
3558 XFree (ct.value); 3668 XFree (ct.value);
3559 } 3669 }
3560 3670
3561 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3671 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3562} 3672}
3563 3673
3564/* ------------------------------------------------------------------------- * 3674/* ------------------------------------------------------------------------- *
3565 * MOUSE ROUTINES * 3675 * MOUSE ROUTINES *
3566 * ------------------------------------------------------------------------- */ 3676 * ------------------------------------------------------------------------- */

Diff Legend

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